{"commit":"3661d8fc36c37a6b97ee4754dc19e0534291d46d","subject":"Force little endian order for filetypes module.","message":"Force little endian order for filetypes module.","repos":"166MMX\/redhorizon,166MMX\/redhorizon,166MMX\/redhorizon,ultraq\/redhorizon,166MMX\/redhorizon","old_file":"Projects\/Red Horizon - Filetypes\/Java\/redhorizon\/utilities\/ByteBufferOrdering.aj","new_file":"Projects\/Red Horizon - Filetypes\/Java\/redhorizon\/utilities\/ByteBufferOrdering.aj","new_contents":"","old_contents":"","returncode":0,"stderr":"unknown","license":"apache-2.0","lang":"AspectJ"}
{"commit":"67366d5a8ad56f68e873744408768fe4fe7d22e0","subject":"remove field masking issues","message":"remove field masking issues\n","repos":"mebigfatguy\/hashshmash","old_file":"aj\/com\/mebigfatguy\/hashshmash\/HashCollector.aj","new_file":"aj\/com\/mebigfatguy\/hashshmash\/HashCollector.aj","new_contents":"\/*\n * hashshmash - An aspect to record HashMap\/Set allocations\n * Copyright 2013 MeBigFatGuy.com\n * Copyright 2013 Dave Brosius\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *    http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing,\n * software distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and limitations\n * under the License.\n *\/\npackage com.mebigfatguy.hashshmash;\n\nimport java.io.BufferedWriter;\nimport java.io.File;\nimport java.io.FileOutputStream;\nimport java.io.OutputStreamWriter;\nimport java.io.PrintWriter;\nimport java.lang.reflect.Field;\nimport java.text.SimpleDateFormat;\nimport java.util.Date;\nimport java.util.HashMap;\nimport java.util.HashSet;\nimport java.util.LinkedHashMap;\nimport java.util.LinkedHashSet;\nimport java.util.Map;\nimport java.util.Map.Entry;\nimport java.util.Set;\nimport java.util.concurrent.ConcurrentHashMap;\n\npublic aspect HashCollector {\n    \n    private static final Journaller journaller = new Journaller();\n\n    after() returning (Map<?,?> m): call(HashMap.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashMapDetails details = new HashMapDetails(m, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    after() returning (Map<?,?> m): call(LinkedHashMap.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashMapDetails details = new LinkedHashMapDetails(m, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    after() returning (Map<?,?> m): call(ConcurrentHashMapMap.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashMapDetails details = new ConcurrentHashMapDetails(m, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    after() returning (Set<?> s): call(HashSet.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashSetDetails details = new HashSetDetails(s, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    after() returning (Set<?> s): call(LinkedHashSet.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashSetDetails details = new LinkedHashSetDetails(s, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    before(): execution(public static void *.main(String[])) {\n        Class<?> c = HashCollector.class;\n    }\n}\n\nfinal class Journaller implements Runnable {\n    \n    private static final int SLEEP_TIME = 5 * 1000;\n    \n    private Field tableField;\n    private ConcurrentHashMap<HashDetails, HashDetails> hDetails = new ConcurrentHashMap<HashDetails, HashDetails>();\n    private PrintWriter writer;\n    private boolean operational = false;\n\n    public Journaller() {\n        try {\n            System.out.println(\"*************************\");\n            System.out.println(\"HASHSHMASH ASPECT ENABLED\");\n            System.out.println(\"*************************\");\n            \n            tableField = HashMap.class.getDeclaredField(\"table\");\n            tableField.setAccessible(true);\n              \n            File dir = new File(System.getProperty(\"user.home\"), \".hashshmash\");\n            dir.mkdirs();  \n            \n            writer = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(new File(dir, new Date().toString() + \".txt\")))));\n            \n            Thread t = new Thread(this);\n            t.setDaemon(true);\n            operational = true;\n            t.start();\n        } catch (Exception e) {\n        }\n    }\n    \n    public void add(HashDetails details) {\n        if (operational)\n            hDetails.put(details,  details);\n    }\n    \n    public void run() {\n        try {\n            while (!Thread.interrupted()) {\n                Thread.sleep(SLEEP_TIME);\n                \n                for (HashDetails details : hDetails.keySet()) {\n                    try {\n                        Map<?, ?> map = details.getMap();\n                        if (map != null) {\n                            int newSize = details.getMap().size();\n                            if (newSize == details.size) {\n                                Entry<?, ?>[] table = (Entry<?, ?>[])tableField.get(map);\n                                details.totalSlots = table.length;\n                                for (Entry<?, ?> e : table) {\n                                    if (e != null) {\n                                        details.usedSlots++;\n                                    }\n                                }\n                                writer.println(details);\n                                hDetails.remove(details);\n                            } else\n                                details.size = newSize;\n                        } else {\n                            hDetails.remove(details);\n                        }\n                    } catch (Exception e) {\n                        \/\/might get ConcurrentModificationException or such, just ignore\n                    }\n                }\n                writer.flush();\n            }\n        } catch (InterruptedException ie) {    \n        }\n    }\n}\n\nabstract class HashDetails {\n    private static SimpleDateFormat FORMATTER = new SimpleDateFormat(\"MM\/dd\/yyyy HH:mm:ss-SSS\");\n    \n    public Date allocTime;\n    public String caller;\n    public int size;\n    public int usedSlots;\n    public int totalSlots;\n    \n    public abstract Map<?,?> getMap();\n    \n    public abstract String getDetailType();\n    \n    public String toString() {\n        return getDetailType() + \"\\t\" + FORMATTER.format(allocTime) + \"\\t\" + caller + \"\\t\" + getMap().size() + \"\\t\" + totalSlots + \"\\t\" + usedSlots;\n    }\n}\n\nclass HashMapDetails extends HashDetails {\n    public Map<?, ?> map;\n\n    public HashMapDetails(Map<?, ?> m, Date d, String c) {\n        map = m;\n        allocTime = d;\n        caller = c;\n        size = map.size();\n    }\n    \n    public Map<?,?> getMap() {\n        return map;\n    }\n    \n    public String getDetailType() {\n        return map.getClass().getSimpleName();\n    }\n}\n\nclass LinkedHashMapDetails extends HashMapDetails {\n\n    public LinkedHashMapDetails(Map<?, ?> m, Date d, String c) {\n       super(m, d, c);\n    }\n    \n    public String getDetailType() {\n        return map.getClass().getSimpleName();\n    }\n}\n\nclass ConcurrentHashMapDetails extends HashMapDetails {\n    \n    public ConcurrentHashMapDetails(Map<?, ?> m, Date d, String c) {\n       super(m, d, c);\n    }\n    \n    public String getDetailType() {\n        return map.getClass().getSimpleName();\n    }\n}\n\nclass HashSetDetails extends HashDetails {\n    private static Field MAP_FIELD;\n    static {\n        try {\n            MAP_FIELD = HashSet.class.getDeclaredField(\"map\");\n            MAP_FIELD.setAccessible(true);\n        } catch (Exception e) {\n            MAP_FIELD = null;\n        }\n    }\n    \n    public Set<?> set;\n\n    public HashSetDetails(Set<?> s, Date d, String c) {\n        set = s;\n        allocTime = d;\n        caller = c;\n        size = set.size();\n    }\n    \n    public Map<?,?> getMap() {\n        try {\n            if (MAP_FIELD == null)\n                return null;\n            \n            return (Map<?,?>) MAP_FIELD.get(set);\n        } catch (Exception e) {\n            return null;\n        }\n    }\n    \n    public String getDetailType() {\n        return set.getClass().getSimpleName();\n    }\n}\n\nclass LinkedHashSetDetails extends HashSetDetails {\n    public Map<?, ?> map;\n\n    public LinkedHashSetDetails(Set<?> s, Date d, String c) {\n       super(s, d, c);\n    }\n    \n    public String getDetailType() {\n        return map.getClass().getSimpleName();\n    }\n}\n","old_contents":"\/*\n * hashshmash - An aspect to record HashMap\/Set allocations\n * Copyright 2013 MeBigFatGuy.com\n * Copyright 2013 Dave Brosius\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *    http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing,\n * software distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and limitations\n * under the License.\n *\/\npackage com.mebigfatguy.hashshmash;\n\nimport java.io.BufferedWriter;\nimport java.io.File;\nimport java.io.FileOutputStream;\nimport java.io.OutputStreamWriter;\nimport java.io.PrintWriter;\nimport java.lang.reflect.Field;\nimport java.text.SimpleDateFormat;\nimport java.util.Date;\nimport java.util.HashMap;\nimport java.util.HashSet;\nimport java.util.LinkedHashMap;\nimport java.util.LinkedHashSet;\nimport java.util.Map;\nimport java.util.Map.Entry;\nimport java.util.Set;\nimport java.util.concurrent.ConcurrentHashMap;\n\npublic aspect HashCollector {\n    \n    private static final Journaller journaller = new Journaller();\n\n    after() returning (Map<?,?> m): call(HashMap.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashMapDetails details = new HashMapDetails(m, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    after() returning (Map<?,?> m): call(LinkedHashMap.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashMapDetails details = new LinkedHashMapDetails(m, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    after() returning (Map<?,?> m): call(ConcurrentHashMapMap.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashMapDetails details = new ConcurrentHashMapDetails(m, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    after() returning (Set<?> s): call(HashSet.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashSetDetails details = new HashSetDetails(s, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    after() returning (Set<?> s): call(LinkedHashSet.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashSetDetails details = new LinkedHashSetDetails(s, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    before(): execution(public static void *.main(String[])) {\n        Class<?> c = HashCollector.class;\n    }\n}\n\nfinal class Journaller implements Runnable {\n    \n    private static final int SLEEP_TIME = 5 * 1000;\n    \n    private Field tableField;\n    private ConcurrentHashMap<HashDetails, HashDetails> hDetails = new ConcurrentHashMap<HashDetails, HashDetails>();\n    private PrintWriter writer;\n    private boolean operational = false;\n\n    public Journaller() {\n        try {\n            System.out.println(\"*************************\");\n            System.out.println(\"HASHSHMASH ASPECT ENABLED\");\n            System.out.println(\"*************************\");\n            \n            tableField = HashMap.class.getDeclaredField(\"table\");\n            tableField.setAccessible(true);\n              \n            File dir = new File(System.getProperty(\"user.home\"), \".hashshmash\");\n            dir.mkdirs();  \n            \n            writer = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(new File(dir, new Date().toString() + \".txt\")))));\n            \n            Thread t = new Thread(this);\n            t.setDaemon(true);\n            operational = true;\n            t.start();\n        } catch (Exception e) {\n        }\n    }\n    \n    public void add(HashDetails details) {\n        if (operational)\n            hDetails.put(details,  details);\n    }\n    \n    public void run() {\n        try {\n            while (!Thread.interrupted()) {\n                Thread.sleep(SLEEP_TIME);\n                \n                for (HashDetails details : hDetails.keySet()) {\n                    try {\n                        Map<?, ?> map = details.getMap();\n                        if (map != null) {\n                            int newSize = details.getMap().size();\n                            if (newSize == details.size) {\n                                Entry<?, ?>[] table = (Entry<?, ?>[])tableField.get(map);\n                                details.totalSlots = table.length;\n                                for (Entry<?, ?> e : table) {\n                                    if (e != null) {\n                                        details.usedSlots++;\n                                    }\n                                }\n                                writer.println(details);\n                                hDetails.remove(details);\n                            } else\n                                details.size = newSize;\n                        } else {\n                            hDetails.remove(details);\n                        }\n                    } catch (Exception e) {\n                        \/\/might get ConcurrentModificationException or such, just ignore\n                    }\n                }\n                writer.flush();\n            }\n        } catch (InterruptedException ie) {    \n        }\n    }\n}\n\nabstract class HashDetails {\n    private static SimpleDateFormat FORMATTER = new SimpleDateFormat(\"MM\/dd\/yyyy HH:mm:ss-SSS\");\n    \n    public Date allocTime;\n    public String caller;\n    public int size;\n    public int usedSlots;\n    public int totalSlots;\n    \n    public abstract Map<?,?> getMap();\n    \n    public abstract String getDetailType();\n    \n    public String toString() {\n        return getDetailType() + \"\\t\" + FORMATTER.format(allocTime) + \"\\t\" + caller + \"\\t\" + getMap().size() + \"\\t\" + totalSlots + \"\\t\" + usedSlots;\n    }\n}\n\nclass HashMapDetails extends HashDetails {\n    public Map<?, ?> map;\n\n    public HashMapDetails(Map<?, ?> m, Date d, String c) {\n        map = m;\n        allocTime = d;\n        caller = c;\n        size = map.size();\n    }\n    \n    public Map<?,?> getMap() {\n        return map;\n    }\n    \n    public String getDetailType() {\n        return map.getClass().getSimpleName();\n    }\n}\n\nclass LinkedHashMapDetails extends HashMapDetails {\n    public Map<?, ?> map;\n\n    public LinkedHashMapDetails(Map<?, ?> m, Date d, String c) {\n       super(m, d, c);\n    }\n    \n    public String getDetailType() {\n        return map.getClass().getSimpleName();\n    }\n}\n\nclass ConcurrentHashMapDetails extends HashMapDetails {\n    public Map<?, ?> map;\n    \n        public ConcurrentHashMapDetails(Map<?, ?> m, Date d, String c) {\n           super(m, d, c);\n        }\n        \n        public String getDetailType() {\n            return map.getClass().getSimpleName();\n        }\n}\n\nclass HashSetDetails extends HashDetails {\n    private static Field MAP_FIELD;\n    static {\n        try {\n            MAP_FIELD = HashSet.class.getDeclaredField(\"map\");\n            MAP_FIELD.setAccessible(true);\n        } catch (Exception e) {\n            MAP_FIELD = null;\n        }\n    }\n    \n    public Set<?> set;\n\n    public HashSetDetails(Set<?> s, Date d, String c) {\n        set = s;\n        allocTime = d;\n        caller = c;\n        size = set.size();\n    }\n    \n    public Map<?,?> getMap() {\n        try {\n            if (MAP_FIELD == null)\n                return null;\n            \n            return (Map<?,?>) MAP_FIELD.get(set);\n        } catch (Exception e) {\n            return null;\n        }\n    }\n    \n    public String getDetailType() {\n        return set.getClass().getSimpleName();\n    }\n}\n\nclass LinkedHashSetDetails extends HashSetDetails {\n    public Map<?, ?> map;\n\n    public LinkedHashSetDetails(Set<?> s, Date d, String c) {\n       super(s, d, c);\n    }\n    \n    public String getDetailType() {\n        return map.getClass().getSimpleName();\n    }\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"be1a59a9c7d8790beac785fb2a343feb0a379ab5","subject":"First version of the statistics export to pdf","message":"First version of the statistics export to pdf\n","repos":"stieglma\/Schafkopfauswerter","old_file":"src\/StatisticsExport.aj","new_file":"src\/StatisticsExport.aj","new_contents":"import java.io.IOException;\n\nimport org.apache.pdfbox.pdmodel.PDDocument;\nimport org.apache.pdfbox.pdmodel.PDPage;\nimport org.apache.pdfbox.pdmodel.edit.PDPageContentStream;\nimport org.apache.pdfbox.pdmodel.font.PDType1Font;\n\nimport view.GUI;\n\npublic privileged aspect StatisticsExport {\n\t\n\tprivate GUI gui;\n\n    \/**\n     * catch constructor call, so that we have the correct gui, to refer to everywhere\n     *\/\n    after() returning(GUI gui): call(GUI.new(*)) {\n        this.gui = gui;\n    }\n    \n    \/**\n     * Catch the call on {@link PDFReportListener.drawTable(PDDocument)} to get the pdf\n     * creator object.\n     * \n     * @param document\n     * @throws IOException\n     *\/\n\tvoid around(PDDocument document) throws IOException\n\t\t: execution (* PDFReportListener.drawTable(PDDocument))\n\t\t&& args(document) {\n\t\tPDPage page = new PDPage();\n\t\tdocument.addPage(page);\n\t\tPDPageContentStream contentStream = new PDPageContentStream(document, page);\n\t\tcontentStream.setFont(PDType1Font.HELVETICA_BOLD, 10);\n\t\tcontentStream.beginText();\n\t\tcreateContent(contentStream);\n\t\tcontentStream.endText();\n\t\tcontentStream.close();\n\t}\n\t\n\t\/**\n\t * Write statistics to given <code>contentStream<\/code> of a pdf page.\n\t * \n\t * @param contentStream The <code>contentStream<\/code> of the pdf page to write on.\n\t * @throws IOException\n\t *\/\n\tprivate void createContent(PDPageContentStream contentStream) throws IOException {\n\t\tOverallStatistics data = gui.model.gameDB.getOverallStatistics();\n\t\t\n\t\tint anzahlSpieleGesamt = data.getAnzahlSpieleGesamt();\n        int anzahlSpieleGesamtGewonnen = data.getAnzahlSpieleGesamtGewonnen();\n        int teuerstesRufspiel = data.getTeuerstesRufspiel();\n        int teuerstesSolo = data.getTeuerstesSolo();\n        int teuerstesSoloTout = data.getTeuerstesSoloTout();\n        int teuerstesSoloSie = data.getTeuerstesSoloSie();\n        int anzahlRufspiele = data.getAnzahlRufspiele();\n        int anzahlSoli = data.getAnzahlSoli();\n        int anzahlSoliTout = data.getAnzahlSoliTout();\n        int anzahlSoliSie = data.getAnzahlSoliSie();\n        int anzahlSoliGesamt = data.getAnzahlSoliGesamt();\n        int anzahlGewonneneSoliGesamt = data.getAnzahlGewonneneSoliGesamt();\n        int anzahlGewonneneRufspiele = data.getAnzahlGewonneneRufspiele();\n        int anzahlGewonneneSoli = data.getAnzahlGewonneneSoli();\n        int anzahlGewonneneSoliTout = data.getAnzahlGewonneneSoliTout();\n        int anzahlGewonneneSoliSie = data.getAnzahlGewonneneSoliSie();\n        int anzahlWeiter = data.getAnzahlWeiter();\n\n        double sologesamtwin = (anzahlSoliGesamt) > 0 ? ((double) (anzahlGewonneneSoliGesamt) \/ (anzahlSoliGesamt))\n                : 0;\n        \n        contentStream.moveTextPositionByAmount(50, 650);\n        contentStream.drawString(\"#Spiele (ohne weiter): \"\n                + anzahlSpieleGesamt\n                + \" (gewonnen: \"\n                + String.format(\"%.2f\",\n                        (anzahlSpieleGesamt > 0 ? anzahlSpieleGesamtGewonnen\n                                \/ ((double) anzahlSpieleGesamt) : 0) * 100)\n                + \"%)\");\n        \n        contentStream.moveTextPositionByAmount(0, -20);\n        contentStream.drawString(\"#Rufspiele: \"\n                + anzahlRufspiele\n                + \" (gewonnen: \"\n                + String.format(\"%.2f\",\n                        (anzahlRufspiele > 0 ? anzahlGewonneneRufspiele\n                                \/ ((double) anzahlRufspiele) : 0) * 100)\n                + \"%)\");\n        \n        contentStream.moveTextPositionByAmount(0, -20);\n        contentStream.drawString(\"          -> teuerstes Rufspiel: \"\n                + teuerstesRufspiel);\n        \n        contentStream.moveTextPositionByAmount(0, -20);\n        contentStream.drawString(\"#Soli gesamt: \"\n                + (anzahlSoli + anzahlSoliTout + anzahlSoliSie)\n                + \" (gewonnen: \"\n                + String.format(\"%.2f\", sologesamtwin * 100)\n                + \"%)\");\n        \n        contentStream.moveTextPositionByAmount(0, -20);\n        contentStream.drawString(\"#Soli normal: \"\n                + anzahlSoli\n                + \" (gewonnen: \"\n                + String.format(\"%.2f\", (anzahlSoli > 0 ? anzahlGewonneneSoli\n                        \/ ((double) anzahlSoli) : 0) * 100)\n                + \"%)\");\n        \n        contentStream.moveTextPositionByAmount(0, -20);\n        contentStream.drawString(\"            -> teuerstes Solo: \"\n                + teuerstesSolo);\n        \n        contentStream.moveTextPositionByAmount(0, -20);\n        contentStream.drawString(\"#Solo Tout: \"\n                + anzahlSoliTout\n                + \" (gewonnen: \"\n                + String.format(\"%.2f\",\n                        (anzahlSoliTout > 0 ? anzahlGewonneneSoliTout\n                                \/ ((double) anzahlSoliTout) : 0) * 100)\n                + \"%)\");\n        \n        contentStream.moveTextPositionByAmount(0, -20);\n        contentStream.drawString(\"          -> teuerstes Solo Tout: \"\n                + teuerstesSoloTout);\n        \n        contentStream.moveTextPositionByAmount(0, -20);\n        contentStream.drawString(\"#Solo Sie: \"\n                + anzahlSoliSie\n                + \" (gewonnen: \"\n                + String.format(\"%.2f\",\n                        (anzahlSoliSie > 0 ? anzahlGewonneneSoliSie\n                                \/ ((double) anzahlSoliSie) : 0) * 100) + \"%)\");\n        \n        contentStream.moveTextPositionByAmount(0, -20);\n        contentStream.drawString(\"         -> teuerstes Solo Sie: \" + teuerstesSoloSie);\n        \n        contentStream.moveTextPositionByAmount(0, -20);\n        contentStream.drawString(\"#Weiter: \" + anzahlWeiter);\n\t}\n}\n","old_contents":"\n\npublic aspect StatisticsExport {\n\t\/\/ TODO Auto-generated aspect\n}\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"c622b56101847d13a738bf029b7205a6f83ec724","subject":"remove debug output","message":"remove debug output\n","repos":"stieglma\/Schafkopfauswerter","old_file":"src\/StatPlayerWiseTxt.aj","new_file":"src\/StatPlayerWiseTxt.aj","new_contents":"import java.awt.GridLayout;\nimport java.util.Iterator;\n\nimport javax.swing.JPanel;\nimport javax.swing.JTabbedPane;\nimport javax.swing.JTextArea;\n\nimport view.GUI;\nimport view.UIUpdater;\nimport model.db.GameData;\nimport model.SystemValues.Games;\nimport model.SystemValues.Players;\nimport model.SystemValues.WIN;\nimport model.db.DataObject;\n\npublic privileged aspect StatPlayerWiseTxt {\n    declare precedence : StatPlayerWiseTxt, StatOverallGraph, StatOverallTxt;\n\n    private static GUI gui;\n    private static JPanel panel = new JPanel();\n    private static JTextArea statText = new JTextArea();\n\n    after() returning(GUI gui): call(GUI.new(*)) {\n        StatPlayerWiseTxt.gui = gui;\n    }\n\n    after(JTabbedPane tabbedPane): \n                        execution(public static void StatisticsHelper.StatisticsPaneCreated(JTabbedPane))\n                        && args(tabbedPane) {\n        statText.setEditable(false);\n        panel.setLayout(new GridLayout(0, 1));\n        panel.add(statText);\n        ((JTabbedPane) tabbedPane).addTab(\"PlayerWiseText\", panel);\n    }\n\n    after() : execution(* UIUpdater.run()) {\n        statText.setText(gui.model.getGameData()\n                .getPlayerWiseStatisticsString());\n    }\n\n    public String GameData.getPlayerWiseStatisticsString() {\n        StringBuilder result = new StringBuilder();\n\n        for (Players player : Players.values()) {\n            result.append(player);\n            result.append(\":\" + System.lineSeparator() + System.lineSeparator());\n\n            int gamesPlayedTot = 0;\n            int gamesWonTot = 0;\n            int highestAcc = 0;\n            int lowestAcc = 0;\n            int highestWin = 0;\n            int highestLoss = 0;\n\n            int[] gamesPlayedPerType = new int[Games.values().length];\n            int[] gamesWonPerType = new int[Games.values().length];\n\n            Iterator<DataObject> it = data.iterator();\n            DataObject lastObj = it.next();\n\n            while (it.hasNext()) {\n                DataObject dataObj = it.next();\n\n                if (dataObj.getPlayer().equals(player.toString())) {\n                    gamesPlayedTot++;\n                    gamesPlayedPerType[dataObj.getGameKind().ordinal()]++;\n                    if (dataObj.getGameWon() == WIN.PLAYER) {\n                        gamesWonTot++;\n                        gamesWonPerType[dataObj.getGameKind().ordinal()]++;\n                    }\n                }\n                int gameVal = dataObj.getPlayerVal(player) - lastObj.getPlayerVal(player);\n                if (gameVal > highestWin) {\n                    highestWin = gameVal;\n                } else if (gameVal < highestLoss) {\n                    highestLoss = gameVal;\n                }\n\n                int accVal = dataObj.getPlayerVal(player);\n                if (accVal > highestAcc) {\n                    highestAcc = accVal;\n                } else if (accVal < lowestAcc) {\n                    lowestAcc = accVal;\n                }\n                \n                lastObj = dataObj;\n            }\n\n            double gamesWonPerc = ((gamesPlayedTot + gamesWonTot) > 0 ? (double) gamesWonTot\n                    \/ gamesPlayedTot\n                    : 0.0) * 100;\n\n            double gamesWonPerTypePerc[] = new double[Games.values().length];\n            for (Games game : Games.values()) {\n                int i = game.ordinal();\n                gamesWonPerTypePerc[i] = ((gamesPlayedPerType[i] + gamesWonPerType[i]) > 0 ? (double) gamesWonPerType[i]\n                        \/ gamesPlayedPerType[i]\n                        : 0.0) * 100;\n            }\n\n            result.append(\n                    \"Gespielte Spiele:\" + System.lineSeparator() + \"\\t\"\n                            + \"- Gesamt: \" + gamesPlayedTot)\n                    .append(\", davon gewonnen: \" + gamesWonTot)\n                    .append(\" (\" + String.format(\"%.2f\", gamesWonPerc) + \"%)\"\n                            + System.lineSeparator());\n\n            for (Games game : Games.values()) {\n                if (game != Games.WEITER) {\n                    int i = game.ordinal();\n                    result.append(\n                            \"\\t- \" + game.toString() + \": \"\n                                    + gamesPlayedPerType[i])\n                            .append(\", davon gewonnen: \" + gamesWonPerType[i])\n                            .append(\" (\"\n                                    + String.format(\"%.2f\",\n                                            gamesWonPerTypePerc[i]) + \"%)\"\n                                    + System.lineSeparator());\n                }\n            }\n\n            result.append(\"H\u00f6chster Kontostand: \" + highestAcc\n                    + System.lineSeparator() + \"Niedrigster Kontostand: \"\n                    + lowestAcc + System.lineSeparator());\n\n            result.append(\"Gr\u00f6\u00dfter Gewinn: \" + highestWin\n                    + System.lineSeparator());\n            result.append(\"Gr\u00f6\u00dfter Verlust: \" + highestLoss\n                    + System.lineSeparator());\n\n            result.append(System.lineSeparator());\n        }\n        return result.toString();\n    }\n}","old_contents":"import java.awt.GridLayout;\nimport java.util.Iterator;\n\nimport javax.swing.JPanel;\nimport javax.swing.JTabbedPane;\nimport javax.swing.JTextArea;\n\nimport view.GUI;\nimport view.UIUpdater;\nimport model.db.GameData;\nimport model.SystemValues.Games;\nimport model.SystemValues.Players;\nimport model.SystemValues.WIN;\nimport model.db.DataObject;\n\npublic privileged aspect StatPlayerWiseTxt {\n    declare precedence : StatPlayerWiseTxt, StatOverallGraph, StatOverallTxt;\n\n    private static GUI gui;\n    private static JPanel panel = new JPanel();\n    private static JTextArea statText = new JTextArea();\n\n    after() returning(GUI gui): call(GUI.new(*)) {\n        StatPlayerWiseTxt.gui = gui;\n    }\n\n    after(JTabbedPane tabbedPane): \n                        execution(public static void StatisticsHelper.StatisticsPaneCreated(JTabbedPane))\n                        && args(tabbedPane) {\n        statText.setEditable(false);\n        panel.setLayout(new GridLayout(0, 1));\n        panel.add(statText);\n        ((JTabbedPane) tabbedPane).addTab(\"PlayerWiseText\", panel);\n    }\n\n    after() : execution(* UIUpdater.run()) {\n        statText.setText(gui.model.getGameData()\n                .getPlayerWiseStatisticsString());\n    }\n\n    public String GameData.getPlayerWiseStatisticsString() {\n        StringBuilder result = new StringBuilder();\n\n        for (Players player : Players.values()) {\n            result.append(player);\n            result.append(\":\" + System.lineSeparator() + System.lineSeparator());\n\n            int gamesPlayedTot = 0;\n            int gamesWonTot = 0;\n            int highestAcc = 0;\n            int lowestAcc = 0;\n            int highestWin = 0;\n            int highestLoss = 0;\n\n            int[] gamesPlayedPerType = new int[Games.values().length];\n            int[] gamesWonPerType = new int[Games.values().length];\n\n            Iterator<DataObject> it = data.iterator();\n            DataObject lastObj = it.next();\n\n            while (it.hasNext()) {\n                DataObject dataObj = it.next();\n\n                if (dataObj.getPlayer().equals(player.toString())) {\n                    gamesPlayedTot++;\n                    gamesPlayedPerType[dataObj.getGameKind().ordinal()]++;\n                    if (dataObj.getGameWon() == WIN.PLAYER) {\n                        gamesWonTot++;\n                        gamesWonPerType[dataObj.getGameKind().ordinal()]++;\n                    }\n                }\n                int gameVal = dataObj.getPlayerVal(player) - lastObj.getPlayerVal(player);\n                if (gameVal > highestWin) {\n                    highestWin = gameVal;\n                } else if (gameVal < highestLoss) {\n                    highestLoss = gameVal;\n                }\n\n                int accVal = dataObj.getPlayerVal(player);\n                System.out.println(player + \": \" + accVal);\n                if (accVal > highestAcc) {\n                    highestAcc = accVal;\n                } else if (accVal < lowestAcc) {\n                    lowestAcc = accVal;\n                }\n                \n                lastObj = dataObj;\n            }\n\n            double gamesWonPerc = ((gamesPlayedTot + gamesWonTot) > 0 ? (double) gamesWonTot\n                    \/ gamesPlayedTot\n                    : 0.0) * 100;\n\n            double gamesWonPerTypePerc[] = new double[Games.values().length];\n            for (Games game : Games.values()) {\n                int i = game.ordinal();\n                gamesWonPerTypePerc[i] = ((gamesPlayedPerType[i] + gamesWonPerType[i]) > 0 ? (double) gamesWonPerType[i]\n                        \/ gamesPlayedPerType[i]\n                        : 0.0) * 100;\n            }\n\n            result.append(\n                    \"Gespielte Spiele:\" + System.lineSeparator() + \"\\t\"\n                            + \"- Gesamt: \" + gamesPlayedTot)\n                    .append(\", davon gewonnen: \" + gamesWonTot)\n                    .append(\" (\" + String.format(\"%.2f\", gamesWonPerc) + \"%)\"\n                            + System.lineSeparator());\n\n            for (Games game : Games.values()) {\n                if (game != Games.WEITER) {\n                    int i = game.ordinal();\n                    result.append(\n                            \"\\t- \" + game.toString() + \": \"\n                                    + gamesPlayedPerType[i])\n                            .append(\", davon gewonnen: \" + gamesWonPerType[i])\n                            .append(\" (\"\n                                    + String.format(\"%.2f\",\n                                            gamesWonPerTypePerc[i]) + \"%)\"\n                                    + System.lineSeparator());\n                }\n            }\n\n            result.append(\"H\u00f6chster Kontostand: \" + highestAcc\n                    + System.lineSeparator() + \"Niedrigster Kontostand: \"\n                    + lowestAcc + System.lineSeparator());\n\n            result.append(\"Gr\u00f6\u00dfter Gewinn: \" + highestWin\n                    + System.lineSeparator());\n            result.append(\"Gr\u00f6\u00dfter Verlust: \" + highestLoss\n                    + System.lineSeparator());\n\n            result.append(System.lineSeparator());\n        }\n        return result.toString();\n    }\n}","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"dc90fdeefccb9401f69157eca47d816e8efac071","subject":"Add the ProcessHelper in the Quart JobDataMap.","message":"Add the ProcessHelper in the Quart JobDataMap.\n","repos":"awltech\/org.parallelj,christophe-w\/parallelj.runtime","old_file":"parallelj-launching\/src\/main\/java\/org\/parallelj\/launching\/quartz\/ProgramJobsAdapter.aj","new_file":"parallelj-launching\/src\/main\/java\/org\/parallelj\/launching\/quartz\/ProgramJobsAdapter.aj","new_contents":"\/*\n *     ParallelJ, framework for parallel computing\n *\n *     Copyright (C) 2010, 2011, 2012 Atos Worldline or third-party contributors as\n *     indicated by the @author tags or express copyright attribution\n *     statements applied by the authors.\n *\n *     This library is free software; you can redistribute it and\/or\n *     modify it under the terms of the GNU Lesser General Public\n *     License as published by the Free Software Foundation; either\n *     version 2.1 of the License.\n *\n *     This library is distributed in the hope that it will be useful,\n *     but WITHOUT ANY WARRANTY; without even the implied warranty of\n *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n *     Lesser General Public License for more details.\n *\n *     You should have received a copy of the GNU Lesser General Public\n *     License along with this library; if not, write to the Free Software\n *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n *\/\npackage org.parallelj.launching.quartz;\n\nimport java.util.concurrent.ExecutorService;\nimport java.util.concurrent.Executors;\n\nimport org.parallelj.Programs;\nimport org.parallelj.Programs.ProcessHelper;\nimport org.parallelj.internal.kernel.KProgram;\nimport org.parallelj.internal.reflect.ProgramAdapter.Adapter;\nimport org.parallelj.launching.LaunchingMessageKind;\nimport org.parallelj.launching.ProgramReturnCodes;\nimport org.parallelj.launching.internal.LaunchingObservable;\nimport org.parallelj.mirror.ProgramType;\nimport org.quartz.Job;\nimport org.quartz.JobDataMap;\nimport org.quartz.JobExecutionContext;\nimport org.quartz.JobExecutionException;\n\n\/**\n * Implements the Job.execute(..) method\n * \n * \n *\/\nprivileged public aspect ProgramJobsAdapter {\n\n\t\/*\n\t * The Aspect JobsAdapter must be passed before this.\n\t *\/\n\tdeclare precedence :\n\t\torg.parallelj.internal.kernel.Identifiers,\n\t\torg.parallelj.internal.reflect.ProgramAdapter,\n\t\torg.parallelj.internal.util.sm.impl.KStateMachines,\n\t\torg.parallelj.internal.util.sm.impl.KStateMachines.PerMachine,\n\t\torg.parallelj.Executables$PerExecutable,\n\t\torg.parallelj.internal.reflect.ProgramAdapter.PerProgram,\n\t\torg.parallelj.internal.log.Logs,\n\t\torg.parallelj.launching.quartz.JobsAdapter;\n\n\t\/**\n\t * Launch a Program and initialize the Result as a JobDataMap.\n\t * \n\t * @param self\n\t * @param context\n\t * @throws JobExecutionException\n\t *\/\n\tvoid around(Job self, JobExecutionContext context)\n\t\t\tthrows JobExecutionException : \n\t\texecution( public void  Job+.execute(..) throws JobExecutionException) \n\t\t\t&& (within(@org.parallelj.Program *) || within(JobsAdapter)) \n\t\t\t\t&& args(context) && this(self) {\n\t\tJobDataMap jobDataMap = context.getJobDetail().getJobDataMap();\n\t\tcontext.setResult(jobDataMap);\n\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ProgramReturnCodes.SUCCESS);\n\n\t\tproceed(self, context);\n\n\t\ttry {\n\t\t\t\/\/ Initialize an ExecutorService with the Capacity of the Program\n\t\t\tProcessHelper<?> processHelper = Programs.as((Adapter) self);\n\t\t\tif (processHelper == null) {\n\t\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ProgramReturnCodes.NOTSTARTED);\n\t\t\t\tthrow new JobExecutionException(LaunchingMessageKind.ELAUNCH0003.getFormatedMessage(self));\n\t\t\t}\n\t\t\tProgramType programType = processHelper.getProcess().getProgram();\n\n\t\t\tLaunchingObservable observable = new LaunchingObservable();\n\t\t\tobservable.prepareLaunching((Adapter) self, processHelper, context);\n\t\t\t\n\t\t\t\/*\n\t\t\t * ExecutorService\n\t\t\t * \n\t\t\t * If an executorService was specified, we use it\n\t\t\t *\/\n\t\t\tExecutorService service = null;\n\t\t\tif (context.getJobDetail().getJobDataMap().get(Launch.DEFAULT_EXECUTOR_KEY) != null) {\n\t\t\t\tservice = (ExecutorService)context.getJobDetail().getJobDataMap().get(Launch.DEFAULT_EXECUTOR_KEY);\n\t\t\t} else \n\t\t\tif (programType instanceof KProgram) {\n\t\t\t\t\/\/ Initialize an ExecutorService with the Program Capacity\n\t\t\t\tshort programCapacity = ((KProgram) programType)\n\t\t\t\t\t\t.getCapacity();\n\t\t\t\tservice = (programCapacity == Short.MAX_VALUE) ? Executors\n\t\t\t\t\t\t.newCachedThreadPool() : Executors\n\t\t\t\t\t\t.newFixedThreadPool(programCapacity);\n\t\t\t} else {\n\t\t\t\tservice = Executors\n\t\t\t\t\t\t.newCachedThreadPool();\n\t\t\t}\n\t\t\t\n\t\t\t\/*\n\t\t\t *  Launch the program with the initialized ExecutorService\n\t\t\t *\/\n\t\t\tprocessHelper.execute(service).join();\n\t\t\tjobDataMap.put(QuartzUtils.CONTEXT, processHelper);\n\t\t\t\n\t\t\tobservable.finalizeLaunching((Adapter) self, processHelper, context);\n\t\t\tservice.shutdown();\n\t\t\t\n\t\t} catch (Exception e) {\n\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ProgramReturnCodes.FAILURE);\n\t\t\tthrow new JobExecutionException(e);\n\t\t}\n\t}\n\t\n}\n","old_contents":"\/*\n *     ParallelJ, framework for parallel computing\n *\n *     Copyright (C) 2010, 2011, 2012 Atos Worldline or third-party contributors as\n *     indicated by the @author tags or express copyright attribution\n *     statements applied by the authors.\n *\n *     This library is free software; you can redistribute it and\/or\n *     modify it under the terms of the GNU Lesser General Public\n *     License as published by the Free Software Foundation; either\n *     version 2.1 of the License.\n *\n *     This library is distributed in the hope that it will be useful,\n *     but WITHOUT ANY WARRANTY; without even the implied warranty of\n *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n *     Lesser General Public License for more details.\n *\n *     You should have received a copy of the GNU Lesser General Public\n *     License along with this library; if not, write to the Free Software\n *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n *\/\npackage org.parallelj.launching.quartz;\n\nimport java.util.concurrent.ExecutorService;\nimport java.util.concurrent.Executors;\n\nimport org.parallelj.Programs;\nimport org.parallelj.Programs.ProcessHelper;\nimport org.parallelj.internal.kernel.KProgram;\nimport org.parallelj.internal.reflect.ProgramAdapter.Adapter;\nimport org.parallelj.launching.LaunchingMessageKind;\nimport org.parallelj.launching.ProgramReturnCodes;\nimport org.parallelj.launching.internal.LaunchingObservable;\nimport org.parallelj.mirror.ProgramType;\nimport org.quartz.Job;\nimport org.quartz.JobDataMap;\nimport org.quartz.JobExecutionContext;\nimport org.quartz.JobExecutionException;\n\n\/**\n * Implements the Job.execute(..) method\n * \n * \n *\/\nprivileged public aspect ProgramJobsAdapter {\n\n\t\/*\n\t * The Aspect JobsAdapter must be passed before this.\n\t *\/\n\tdeclare precedence :\n\t\torg.parallelj.internal.kernel.Identifiers,\n\t\torg.parallelj.internal.reflect.ProgramAdapter,\n\t\torg.parallelj.internal.util.sm.impl.KStateMachines,\n\t\torg.parallelj.internal.util.sm.impl.KStateMachines.PerMachine,\n\t\torg.parallelj.Executables$PerExecutable,\n\t\torg.parallelj.internal.reflect.ProgramAdapter.PerProgram,\n\t\torg.parallelj.internal.log.Logs,\n\t\torg.parallelj.launching.quartz.JobsAdapter;\n\n\t\/**\n\t * Launch a Program and initialize the Result as a JobDataMap.\n\t * \n\t * @param self\n\t * @param context\n\t * @throws JobExecutionException\n\t *\/\n\tvoid around(Job self, JobExecutionContext context)\n\t\t\tthrows JobExecutionException : \n\t\texecution( public void  Job+.execute(..) throws JobExecutionException) \n\t\t\t&& (within(@org.parallelj.Program *) || within(JobsAdapter)) \n\t\t\t\t&& args(context) && this(self) {\n\t\tJobDataMap jobDataMap = context.getJobDetail().getJobDataMap();\n\t\tcontext.setResult(jobDataMap);\n\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ProgramReturnCodes.SUCCESS);\n\n\t\tproceed(self, context);\n\n\t\ttry {\n\t\t\t\/\/ Initialize an ExecutorService with the Capacity of the Program\n\t\t\tProcessHelper<?> processHelper = Programs.as((Adapter) self);\n\t\t\tif (processHelper == null) {\n\t\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ProgramReturnCodes.NOTSTARTED);\n\t\t\t\tthrow new JobExecutionException(LaunchingMessageKind.ELAUNCH0003.getFormatedMessage(self));\n\t\t\t}\n\t\t\tProgramType programType = processHelper.getProcess().getProgram();\n\n\t\t\tLaunchingObservable observable = new LaunchingObservable();\n\t\t\tobservable.prepareLaunching((Adapter) self, processHelper, context);\n\t\t\t\n\t\t\t\/*\n\t\t\t * ExecutorService\n\t\t\t * \n\t\t\t * If an executorService was specified, we use it\n\t\t\t *\/\n\t\t\tExecutorService service = null;\n\t\t\tif (context.getJobDetail().getJobDataMap().get(Launch.DEFAULT_EXECUTOR_KEY) != null) {\n\t\t\t\tservice = (ExecutorService)context.getJobDetail().getJobDataMap().get(Launch.DEFAULT_EXECUTOR_KEY);\n\t\t\t} else \n\t\t\tif (programType instanceof KProgram) {\n\t\t\t\t\/\/ Initialize an ExecutorService with the Program Capacity\n\t\t\t\tshort programCapacity = ((KProgram) programType)\n\t\t\t\t\t\t.getCapacity();\n\t\t\t\tservice = (programCapacity == Short.MAX_VALUE) ? Executors\n\t\t\t\t\t\t.newCachedThreadPool() : Executors\n\t\t\t\t\t\t.newFixedThreadPool(programCapacity);\n\t\t\t} else {\n\t\t\t\tservice = Executors\n\t\t\t\t\t\t.newCachedThreadPool();\n\t\t\t}\n\t\t\t\n\t\t\t\/*\n\t\t\t *  Launch the program with the initialized ExecutorService\n\t\t\t *\/\n\t\t\tprocessHelper.execute(service).join();\n\t\t\tjobDataMap.put(QuartzUtils.CONTEXT, self);\n\t\t\t\n\t\t\tobservable.finalizeLaunching((Adapter) self, processHelper, context);\n\n\t\t\tservice.shutdown();\n\t\t\t\n\t\t} catch (Exception e) {\n\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ProgramReturnCodes.FAILURE);\n\t\t\tthrow new JobExecutionException(e);\n\t\t}\n\t}\n\t\n}\n","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"89552deb7f2764e6ffd75b61f6714bed10f3bfc6","subject":"[Misc] Moved unused code to legacy: added @Deprecated annotation","message":"[Misc] Moved unused code to legacy: added @Deprecated annotation\n","repos":"pbondoer\/xwiki-platform,xwiki\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform","old_file":"xwiki-platform-core\/xwiki-platform-legacy\/xwiki-platform-legacy-oldcore\/src\/main\/aspect\/com\/xpn\/xwiki\/XWikiCompatibilityAspect.aj","new_file":"xwiki-platform-core\/xwiki-platform-legacy\/xwiki-platform-legacy-oldcore\/src\/main\/aspect\/com\/xpn\/xwiki\/XWikiCompatibilityAspect.aj","new_contents":"\/*\n * See the NOTICE file distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This is free software; you can redistribute it and\/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF site: http:\/\/www.fsf.org.\n *\/\npackage com.xpn.xwiki;\n\nimport java.io.UnsupportedEncodingException;\nimport java.io.File;\nimport java.lang.reflect.Type;\nimport java.net.URL;\nimport java.net.URLEncoder;\nimport java.util.ArrayList;\nimport java.util.HashMap;\nimport java.util.List;\nimport java.util.Map;\n\nimport org.apache.commons.lang3.StringUtils;\nimport org.xwiki.cache.CacheException;\nimport org.xwiki.cache.CacheFactory;\nimport org.xwiki.cache.CacheManager;\nimport org.xwiki.cache.config.CacheConfiguration;\nimport org.xwiki.cache.eviction.LRUEvictionConfiguration;\nimport org.xwiki.component.manager.ComponentLookupException;\nimport org.xwiki.context.Execution;\nimport org.xwiki.context.ExecutionContext;\nimport org.xwiki.environment.Environment;\nimport org.xwiki.rendering.syntax.Syntax;\nimport org.xwiki.xml.XMLUtils;\nimport org.xwiki.model.reference.EntityReference;\nimport org.xwiki.model.reference.EntityReferenceResolver;\nimport org.xwiki.model.reference.DocumentReference;\nimport org.xwiki.model.reference.EntityReferenceSerializer;\nimport org.xwiki.model.reference.WikiReference;\nimport org.xwiki.model.EntityType;\nimport org.xwiki.url.XWikiEntityURL;\nimport org.apache.velocity.VelocityContext;\n\nimport com.xpn.xwiki.cache.api.XWikiCache;\nimport com.xpn.xwiki.cache.api.XWikiCacheService;\nimport com.xpn.xwiki.cache.api.internal.XWikiCacheServiceStub;\nimport com.xpn.xwiki.cache.api.internal.XWikiCacheStub;\nimport com.xpn.xwiki.doc.XWikiDocument;\nimport com.xpn.xwiki.notify.XWikiNotificationManager;\nimport com.xpn.xwiki.objects.BaseObject;\nimport com.xpn.xwiki.objects.classes.BaseClass;\nimport com.xpn.xwiki.objects.classes.PropertyClass;\nimport com.xpn.xwiki.plugin.query.QueryPlugin;\nimport com.xpn.xwiki.plugin.query.XWikiCriteria;\nimport com.xpn.xwiki.plugin.query.XWikiQuery;\nimport com.xpn.xwiki.util.Util;\nimport com.xpn.xwiki.web.Utils;\nimport com.xpn.xwiki.web.XWikiMessageTool;\nimport com.xpn.xwiki.web.XWikiRequest;\n\n\/**\n * Add a backward compatibility layer to the {@link com.xpn.xwiki.XWiki} class.\n * \n * @version $Id$\n *\/\npublic privileged aspect XWikiCompatibilityAspect\n{\n    private static Map XWiki.threadMap = new HashMap();\n\n    private XWikiNotificationManager XWiki.notificationManager;\n\n    private EntityReferenceResolver<EntityReference> XWiki.defaultReferenceEntityReferenceResolver = Utils.getComponent(\n        EntityReferenceResolver.TYPE_REFERENCE);\n\n    private EntityReferenceSerializer<String> XWiki.localStringEntityReferenceSerializer = Utils.getComponent(\n        EntityReferenceSerializer.TYPE_STRING, \"local\");\n\n    \n    \/**\n     * Used to get the temporary and permanent directory.\n     *\/\n    private Environment XWiki.environment = Utils.getComponent((Type) Environment.class);\n\n    \/** Is the wiki running in test mode? Deprecated, was used when running Cactus tests. *\/\n    private boolean XWiki.test = false;\n\n    \/**\n     * Transform a text in a URL compatible text\n     *\n     * @param content text to transform\n     * @return encoded result\n     * @deprecated replaced by Util#encodeURI since 1.3M2\n     *\/\n    @Deprecated\n    public String XWiki.getURLEncoded(String content)\n    {\n        try {\n            return URLEncoder.encode(content, this.getEncoding());\n        } catch (UnsupportedEncodingException e) {\n            return content;\n        }\n    }\n\n    \/**\n     * @return true for multi-wiki\/false for mono-wiki\n     * @deprecated replaced by {@link XWiki#isVirtualMode()} since 1.4M1.\n     *\/\n    @Deprecated\n    public boolean XWiki.isVirtual()\n    {\n        return isVirtualMode();\n    }\n\n    \/**\n     * @deprecated Virtual mode is on by default, starting with XWiki 5.0M2. Use\n     *             {@link #getVirtualWikisDatabaseNames(XWikiContext)} to get the list of wikis if needed.\n     * @return true for multi-wiki\/false for mono-wiki\n     *\/\n    @Deprecated\n    public boolean XWiki.isVirtualMode()\n    {\n        return true;\n    }\n\n    \/**\n     * @deprecated Removed since it isn't used; since 1.5M1.\n     *\/\n    @Deprecated\n    public static Map XWiki.getThreadMap()\n    {\n        return XWiki.threadMap;\n    }\n\n    \/**\n     * @deprecated Removed since it isn't used; since 1.5M1.\n     *\/\n    @Deprecated\n    public static void XWiki.setThreadMap(Map threadMap)\n    {\n        XWiki.threadMap = threadMap;\n    }\n\n    \/**\n     * @return the cache service.\n     * @deprecated replaced by {@link XWiki#getCacheFactory(XWikiContext)} or\n     *             {@link XWiki#getLocalCacheFactory(XWikiContext)} since 1.5M2.\n     *\/\n    @Deprecated\n    public XWikiCacheService XWiki.getCacheService()\n    {\n        return new XWikiCacheServiceStub(getCacheFactory(), getLocalCacheFactory());\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getVirtualWikiCache(XWikiContext)} since 1.5M2.\n     *\/\n    @Deprecated\n    public XWikiCache XWiki.getVirtualWikiMap()\n    {\n        return new XWikiCacheStub(this.virtualWikiMap);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpaceCopyright(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebCopyright(XWikiContext context)\n    {\n        return this.getSpaceCopyright(context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, String defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, String, String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, String space, String defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, space, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsLong(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public long XWiki.getWebPreferenceAsLong(String preference, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsLong(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsLong(String, long, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public long XWiki.getWebPreferenceAsLong(String preference, long defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsLong(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsInt(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.getWebPreferenceAsInt(String preference, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsInt(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsInt(String, int, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.getWebPreferenceAsInt(String preference, int defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsInt(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#copySpaceBetweenWikis(String, String, String, String, XWikiContext)} since\n     *             2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.copyWikiWeb(String space, String sourceWiki, String targetWiki, String language, XWikiContext context)\n        throws XWikiException\n    {\n        return this.copySpaceBetweenWikis(space, sourceWiki, targetWiki, language, context);\n    }\n\n    \/**\n     * @deprecated replaced by\n     *             {@link XWiki#copySpaceBetweenWikis(String, String, String, String, boolean, XWikiContext)} since\n     *             2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.copyWikiWeb(String space, String sourceWiki, String targetWiki, String language, boolean clean,\n        XWikiContext context) throws XWikiException\n    {\n        return this.copySpaceBetweenWikis(space, sourceWiki, targetWiki, language, clean, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getDefaultSpace(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getDefaultWeb(XWikiContext context)\n    {\n        return this.getDefaultSpace(context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#skipDefaultSpaceInURLs(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public boolean XWiki.useDefaultWeb(XWikiContext context)\n    {\n        return this.skipDefaultSpaceInURLs(context);\n    }\n\n    \/**\n     * @deprecated use {@link XWikiMessageTool#get(String, List)} instead. You can access message tool using\n     *             {@link XWikiContext#getMessageTool()}.\n     *\/\n    @Deprecated\n    public String XWiki.getMessage(String item, XWikiContext context)\n    {\n        XWikiMessageTool msg = context.getMessageTool();\n        if (msg == null) {\n            return item;\n        } else {\n            return msg.get(item);\n        }\n    }\n\n    \/**\n     * @deprecated Removed since it isn't used; since 3.1M2.\n     *\/\n    @Deprecated\n    public String XWiki.getHTMLArea(String content, XWikiContext context)\n    {\n        StringBuilder result = new StringBuilder();\n\n        String scontent = XMLUtils.escape(content);\n        scontent = scontent.replaceAll(\"\\r?+\\n\", \"<br class=\\\"htmlarea\\\"\/>\");\n\n        result.append(\"<textarea name=\\\"content\\\" id=\\\"content\\\" rows=\\\"25\\\" cols=\\\"80\\\">\");\n        result.append(scontent);\n        result.append(\"<\/textarea>\");\n\n        return result.toString();\n    }\n\n    @Deprecated\n    public XWikiNotificationManager XWiki.getNotificationManager()\n    {\n        if (this.notificationManager == null) {\n          this.notificationManager = new XWikiNotificationManager();\n        }\n\n        return this.notificationManager;\n    }\n\n    @Deprecated\n    public void XWiki.setNotificationManager(XWikiNotificationManager notificationManager)\n    {\n        this.notificationManager = notificationManager;\n    }\n    \n    @Deprecated\n    public String XWiki.displaySearch(String fieldname, String className, XWikiCriteria criteria, XWikiContext context)\n        throws XWikiException\n    {\n        return displaySearch(fieldname, className, \"\", criteria, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearch(String fieldname, String className, XWikiContext context) throws XWikiException\n    {\n        return displaySearch(fieldname, className, \"\", new XWikiCriteria(), context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearch(String fieldname, String className, String prefix, XWikiCriteria criteria,\n        XWikiContext context) throws XWikiException\n    {\n        BaseClass bclass = getDocument(className, context).getXClass();\n        PropertyClass pclass = (PropertyClass) bclass.get(fieldname);\n        if (criteria == null) {\n            criteria = new XWikiCriteria();\n        }\n\n        if (pclass == null) {\n            return \"\";\n        } else {\n            return pclass.displaySearch(fieldname, prefix + className + \"_\", criteria, context);\n        }\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchColumns(String className, XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        return displaySearchColumns(className, \"\", query, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchColumns(String className, String prefix, XWikiQuery query, XWikiContext context)\n        throws XWikiException\n    {\n        BaseClass bclass = getDocument(className, context).getXClass();\n\n        if (query == null) {\n            query = new XWikiQuery();\n        }\n\n        return bclass.displaySearchColumns(className + \"_\" + prefix, query, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchOrder(String className, XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        return displaySearchOrder(className, \"\", query, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchOrder(String className, String prefix, XWikiQuery query, XWikiContext context)\n        throws XWikiException\n    {\n        BaseClass bclass = getDocument(className, context).getXClass();\n\n        if (query == null) {\n            query = new XWikiQuery();\n        }\n\n        return bclass.displaySearchOrder(className + \"_\" + prefix, query, context);\n    }\n\n    @Deprecated\n    public <T> List<T> XWiki.search(XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        QueryPlugin qp = (QueryPlugin) getPlugin(\"query\", context);\n        if (qp == null) {\n            return null;\n        }\n\n        return qp.search(query);\n    }\n\n    @Deprecated\n    public XWikiQuery XWiki.createQueryFromRequest(String className, XWikiContext context) throws XWikiException\n    {\n        return new XWikiQuery(context.getRequest(), className, context);\n    }\n\n    @Deprecated\n    public String XWiki.searchAsTable(XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        QueryPlugin qp = (QueryPlugin) getPlugin(\"query\", context);\n        if (qp == null) {\n            return null;\n        }\n\n        List<String> list = qp.search(query);\n        String result = \"{table}\\r\\n\";\n        List<String> headerColumns = new ArrayList<String>();\n        List<String> displayProperties = query.getDisplayProperties();\n        for (String propname : displayProperties) {\n            PropertyClass pclass = getPropertyClassFromName(propname, context);\n            if (pclass != null) {\n                headerColumns.add(pclass.getPrettyName());\n            } else {\n                if (propname.startsWith(\"doc.\")) {\n                    propname = propname.substring(4);\n                    headerColumns.add(XWikiDocument.getInternalPropertyName(propname, context));\n                } else {\n                    headerColumns.add(propname);\n                }\n\n            }\n        }\n\n        result += StringUtils.join(headerColumns.toArray(), \" | \") + \"\\r\\n\";\n        for (String docname : list) {\n            List<String> rowColumns = new ArrayList<String>();\n            XWikiDocument doc = getDocument(docname, context);\n            for (String propname : displayProperties) {\n                PropertyClass pclass = getPropertyClassFromName(propname, context);\n                if (pclass == null) {\n                    if (propname.startsWith(\"doc.\")) {\n                        propname = propname.substring(4);\n                    }\n                    String value = doc.getInternalProperty(propname);\n                    rowColumns.add((value == null) ? \" \" : value);\n                } else {\n                    BaseObject bobj = doc.getObject(pclass.getObject().getName());\n                    rowColumns.add(doc.display(pclass.getName(), \"view\", bobj, context));\n                }\n            }\n            result += StringUtils.join(rowColumns.toArray(), \" | \") + \"\\r\\n\";\n        }\n\n        result += \"{table}\\r\\n\";\n\n        return result;\n    }\n\n    @Deprecated\n    public String XWiki.getDocLanguagePreference(XWikiContext context)\n    {\n        return getLanguagePreference(context);\n    }\n\n    @Deprecated\n    public void XWiki.flushCache()\n    {\n        Execution execution = Utils.getComponent(Execution.class);\n\n        ExecutionContext ec = execution.getContext();\n\n        flushCache(ec != null ? (XWikiContext) ec.getProperty(\"xwikicontext\") : null);\n    }\n\n    \/**\n     * @deprecated use WikiManager plugin instead\n     *\/\n    @Deprecated\n    public int XWiki.createNewWiki(String wikiName, String wikiUrl, String wikiAdmin, String baseWikiName,\n        String description, String wikilanguage, boolean failOnExist, XWikiContext context) throws XWikiException\n    {\n        String database = context.getDatabase();\n        wikiName = wikiName.toLowerCase();\n\n        try {\n            XWikiDocument userdoc = getDocument(wikiAdmin, context);\n\n            \/\/ User does not exist\n            if (userdoc.isNew()) {\n                if (LOGGER.isErrorEnabled()) {\n                    LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"user does not exist\");\n                }\n                return -2;\n            }\n\n            \/\/ User is not active\n            if (!(userdoc.getIntValue(\"XWiki.XWikiUsers\", \"active\") == 1)) {\n                if (LOGGER.isErrorEnabled()) {\n                    LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"user is not active\");\n                }\n                return -3;\n            }\n\n            String wikiForbiddenList = Param(\"xwiki.virtual.reserved_wikis\");\n            if (Util.contains(wikiName, wikiForbiddenList, \", \")) {\n                if (LOGGER.isErrorEnabled()) {\n                    LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"wiki name is forbidden\");\n                }\n                return -4;\n            }\n\n            String wikiServerPage = \"XWikiServer\" + wikiName.substring(0, 1).toUpperCase() + wikiName.substring(1);\n            \/\/ Verify is server page already exist\n            XWikiDocument serverdoc = getDocument(SYSTEM_SPACE, wikiServerPage, context);\n            if (serverdoc.isNew()) {\n                \/\/ clear entry in virtual wiki cache\n                this.virtualWikiMap.remove(wikiUrl);\n\n                \/\/ Create Wiki Server page\n                serverdoc.setStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"server\", wikiUrl);\n                serverdoc.setStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"owner\", wikiAdmin);\n                if (description != null) {\n                    serverdoc.setLargeStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"description\", description);\n                }\n                if (wikilanguage != null) {\n                    serverdoc.setStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"language\", wikilanguage);\n                }\n                if (!getDefaultDocumentSyntax().equals(Syntax.XWIKI_1_0.toIdString())) {\n                    serverdoc.setContent(\"{{include document=\\\"XWiki.XWikiServerForm\\\"\/}}\\n\");\n                    serverdoc.setSyntax(Syntax.XWIKI_2_0);\n                } else {\n                    serverdoc.setContent(\"#includeForm(\\\"XWiki.XWikiServerForm\\\")\\n\");\n                    serverdoc.setSyntax(Syntax.XWIKI_1_0);\n                }\n                serverdoc.setParentReference(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE);\n                saveDocument(serverdoc, context);\n            } else {\n                \/\/ If we are not allowed to continue if server page already exists\n                if (failOnExist) {\n                    if (LOGGER.isErrorEnabled()) {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki server page already exists\");\n                    }\n                    return -5;\n                } else if (LOGGER.isWarnEnabled()) {\n                    LOGGER.warn(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"wiki server page already exists\");\n                }\n            }\n\n            \/\/ Create wiki database\n            try {\n                context.setDatabase(getDatabase());\n                getStore().createWiki(wikiName, context);\n            } catch (XWikiException e) {\n                if (LOGGER.isErrorEnabled()) {\n                    if (e.getCode() == 10010) {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki database already exists\");\n                    } else if (e.getCode() == 10011) {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki database creation failed\");\n                    } else {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki database creation threw exception\", e);\n                    }\n                }\n            } catch (Exception e) {\n                LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                    + \"wiki database creation threw exception\", e);\n            }\n\n            try {\n                updateDatabase(wikiName, true, false, context);\n            } catch (Exception e) {\n                LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                    + \"wiki database shema update threw exception\", e);\n                return -6;\n            }\n\n            \/\/ Copy base wiki\n            int nb = copyWiki(baseWikiName, wikiName, wikilanguage, context);\n            \/\/ Save the number of docs copied in the context\n            context.put(\"nbdocs\", Integer.valueOf(nb));\n\n            \/\/ Create user page in his wiki\n            \/\/ Let's not create it anymore.. this makes the creator loose\n            \/\/ super admin rights on his wiki\n            \/\/ copyDocument(wikiAdmin, getDatabase(), wikiName, wikilanguage, context);\n\n            \/\/ Modify rights in user wiki\n            context.setDatabase(wikiName);\n            \/*\n             * XWikiDocument wikiprefdoc = getDocument(\"XWiki.XWikiPreferences\", context);\n             * wikiprefdoc.setStringValue(\"XWiki.XWikiGlobalRights\", \"users\", wikiAdmin);\n             * wikiprefdoc.setStringValue(\"XWiki.XWikiGlobalRights\", \"levels\", \"admin, edit\");\n             * wikiprefdoc.setIntValue(\"XWiki.XWikiGlobalRights\", \"allow\", 1); saveDocument(wikiprefdoc, context);\n             *\/\n            return 1;\n        } catch (Exception e) {\n            LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                + \"wiki creation threw exception\", e);\n            return -10;\n        } finally {\n            context.setDatabase(database);\n        }\n    }\n\n    \/**\n     * Get the XWiki temporary filesystem directory (cleaned up automatically by XWiki).\n     *\n     * @param context\n     * @return temporary directory\n     * @since 1.1 Milestone 4\n     * @deprecated starting with 4.2M1 use {@link org.xwiki.environment.Environment#getTemporaryDirectory()}\n     *\/\n    @Deprecated\n    public File XWiki.getTempDirectory(XWikiContext context)\n    {\n        return this.environment.getTemporaryDirectory();\n    }\n\n    \/**\n     * Get a new directory in the xwiki work directory\n     *\n     * @param subdir desired directory name\n     * @param context\n     * @return work subdirectory\n     * @since 1.1 Milestone 4\n     * @deprecated starting with 4.2M1 use {@link org.xwiki.environment.Environment#getPermanentDirectory()}\n     *\/\n    @Deprecated\n    public File XWiki.getWorkSubdirectory(String subdir, XWikiContext context)\n    {\n        File fdir = new File(this.environment.getPermanentDirectory().getAbsolutePath(), subdir);\n        if (!fdir.exists()) {\n            fdir.mkdir();\n        }\n\n        return fdir;\n    }\n\n    \/**\n     * Get the XWiki work directory\n     *\n     * @param context\n     * @return work directory\n     * @since 1.1 Milestone 4\n     * @deprecated starting with 4.2M1 use {@link org.xwiki.environment.Environment#getPermanentDirectory()}\n     *\/\n    @Deprecated\n    public File XWiki.getWorkDirectory(XWikiContext context)\n    {\n        return this.environment.getPermanentDirectory();\n    }\n\n    \/**\n     * @deprecated starting with 5.1M1 use {@code org.xwiki.url.XWikiURLFactory} instead and starting with 5.3M1 use\n     *             {@link ResourceFactory} and since 6.1M2 use {@link org.xwiki.resource.ResourceReferenceResolver}\n     *\/\n    @Deprecated\n    public XWikiDocument XWiki.getDocumentFromPath(String path, XWikiContext context) throws XWikiException\n    {\n        return getDocument(getDocumentReferenceFromPath(path, context), context);\n    }\n\n    \/**\n     * @since 2.3M1\n     * @deprecated starting with 5.1M1 use {@code org.xwiki.url.XWikiURLFactory} instead and starting with 5.3M1 use\n     *             {@link ResourceFactory} and since 6.1M2 use {@link org.xwiki.resource.ResourceReferenceResolver}\n     *\/\n    @Deprecated\n    public DocumentReference XWiki.getDocumentReferenceFromPath(String path, XWikiContext context)\n    {\n        \/\/ TODO: Remove this and use XWikiURLFactory instead in XWikiAction and all entry points.\n        List<String> segments = new ArrayList<String>();\n        for (String segment : path.split(\"\/\", -1)) {\n            segments.add(Util.decodeURI(segment, context));\n        }\n        \/\/ Remove the first segment if it's empty to cater for cases when the path starts with \"\/\"\n        if (segments.size() > 0 && segments.get(0).length() == 0) {\n            segments.remove(0);\n        }\n\n        XWikiEntityURL entityURL = buildEntityURLFromPathSegments(new WikiReference(context.getDatabase()), segments);\n\n        return new DocumentReference(entityURL.getEntityReference().extractReference(EntityType.DOCUMENT));\n    }\n\n    \/**\n     * @deprecated since 2.3M1 use {@link #getDocumentReferenceFromPath(String, XWikiContext)} instead\n     *\/\n    @Deprecated\n    public String XWiki.getDocumentNameFromPath(String path, XWikiContext context)\n    {\n        return this.localStringEntityReferenceSerializer.serialize(getDocumentReferenceFromPath(path, context));\n    }\n\n    \/**\n     * @deprecated since 2.3M1 use {@link #getDocumentReferenceFromPath(String, XWikiContext)} instead\n     *\/\n    @Deprecated\n    public String XWiki.getDocumentName(XWikiRequest request, XWikiContext context)\n    {\n        return this.localStringEntityReferenceSerializer.serialize(getDocumentReference(request, context));\n    }\n\n    \/**\n     * @deprecated starting with 5.1M1 use {@code org.xwiki.url.XWikiURLFactory} instead and starting with 5.3M1 use\n     *             {@link ResourceFactory} and since 6.1M2 use {@link org.xwiki.resource.ResourceReferenceResolver}\n     *\/\n    @Deprecated\n    private XWikiEntityURL XWiki.buildEntityURLFromPathSegments(WikiReference wikiReference, List<String> pathSegments)\n    {\n        XWikiEntityURL entityURL;\n\n        \/\/ Rules based on counting the url segments:\n        \/\/ - 0 segments (e.g. \"\"): default document reference, \"view\" action\n        \/\/ - 1 segment (e.g. \"\/\", \"\/Document\"): default space, specified document (and default if empty), \"view\" action\n        \/\/ - 2 segments (e.g. \"\/Space\/\", \"\/Space\/Document\"): specified space, document (and default doc if empty),\n        \/\/   \"view\" action\n        \/\/ - 3 segments (e.g. \"\/action\/Space\/Document\"): specified space, document (and default doc if empty),\n        \/\/   specified action\n        \/\/ - 4 segments (e.g. \"\/download\/Space\/Document\/attachment\"): specified space, document and attachment (and\n        \/\/   default doc if empty), \"download\" action\n        \/\/ - 4 segments or more (e.g. \"\/action\/Space\/Document\/whatever\/else\"): specified space, document (and default\n        \/\/     doc if empty), specified \"action\" (if action != \"download\"), trailing segments ignored\n\n        String spaceName = null;\n        String pageName = null;\n        String attachmentName = null;\n        String action = \"view\";\n\n        if (pathSegments.size() == 1) {\n            pageName = pathSegments.get(0);\n        } else if (pathSegments.size() == 2) {\n            spaceName = pathSegments.get(0);\n            pageName = pathSegments.get(1);\n        } else if (pathSegments.size() >= 3) {\n            action = pathSegments.get(0);\n            spaceName = pathSegments.get(1);\n            pageName = pathSegments.get(2);\n            if (action.equals(\"download\") && pathSegments.size() >= 4) {\n                attachmentName = pathSegments.get(3);\n            }\n        }\n\n        \/\/ Normalize the extracted space\/page to resolve empty\/null values and replace them with default values.\n        EntityReference reference = wikiReference;\n        EntityType entityType = EntityType.DOCUMENT;\n        if (!StringUtils.isEmpty(spaceName)) {\n            reference = new EntityReference(spaceName, EntityType.SPACE, reference);\n        }\n        if (!StringUtils.isEmpty(pageName)) {\n            reference = new EntityReference(pageName, EntityType.DOCUMENT, reference);\n        }\n        if (!StringUtils.isEmpty(attachmentName)) {\n            reference = new EntityReference(attachmentName, EntityType.ATTACHMENT, reference);\n            entityType = EntityType.ATTACHMENT;\n        }\n        reference = this.defaultReferenceEntityReferenceResolver.resolve(reference, entityType);\n\n        entityURL = new XWikiEntityURL(reference);\n        entityURL.setAction(action);\n\n        return entityURL;\n    }\n\n    \/**\n     * Extracts the name of the wiki from a context's request. In some cases, including autowww, the main wiki may be\n     * returned instead of what was requested, as a result of some assumptions. Even so, the resulting wiki name is not\n     * guaranteed to exist, it is just what XWiki understood from the request.\n     *\n     * @param context the context which contains the request\n     * @return the name of the wiki that was requested\n     * @throws XWikiException if problems occur\n     * @deprecated starting with 5.2M1 use  use {@link ResourceFactory} instead and since 6.1M2 use\n     *             {@link org.xwiki.resource.ResourceReferenceResolver} instead\n     *\/\n    @Deprecated\n    public String XWiki.getRequestWikiName(XWikiContext context) throws XWikiException\n    {\n        \/\/ Host is full.host.name in DNS-based multiwiki, and wikiname in path-based multiwiki.\n        String host = \"\";\n        \/\/ Canonical name of the wiki (database).\n        String wikiName = \"\";\n        \/\/ wikiDefinition should be the document holding the definition of the virtual wiki, a document in the main\n        \/\/ wiki with a XWiki.XWikiServerClass object attached to it\n        DocumentReference wikiDefinition;\n\n        XWikiRequest request = context.getRequest();\n        try {\n            URL requestURL = context.getURL();\n            host = requestURL.getHost();\n        } catch (Exception e) {\n        }\n\n        \/\/ In path-based multi-wiki, the wiki name is an element of the request path.\n        \/\/ The url is in the form \/xwiki (app name)\/wiki (servlet name)\/wikiname\/\n        if (\"1\".equals(this.Param(\"xwiki.virtual.usepath\", \"1\"))) {\n            String uri = request.getRequestURI();\n            if (LOGGER.isDebugEnabled()) {\n                LOGGER.debug(\"Request uri is: \" + uri);\n            }\n            \/\/ Remove the (eventual) context path from the URI, usually \/xwiki\n            uri = stripSegmentFromPath(uri, request.getContextPath());\n            \/\/ Remove the (eventual) servlet path from the URI, usually \/wiki\n            String servletPath = request.getServletPath();\n            uri = stripSegmentFromPath(uri, servletPath);\n\n            if (servletPath.equals(\"\/\" + this.Param(\"xwiki.virtual.usepath.servletpath\", \"wiki\"))) {\n                \/\/ Requested path corresponds to a path-based wiki, now the wiki name is between the first and\n                \/\/ second \"\/\"\n                host = StringUtils.substringBefore(StringUtils.removeStart(uri, \"\/\"), \"\/\");\n            }\n        }\n\n        if (StringUtils.isEmpty(host) || host.equals(context.getMainXWiki())) {\n            \/\/ Can't find any wiki name, return the main wiki\n            return context.getMainXWiki();\n        }\n\n        \/\/ Try to use the full domain name\/path wiki name and see if it corresponds to any existing wiki descriptors\n        wikiDefinition = this.findWikiServer(host, context);\n\n        if (wikiDefinition == null) {\n            \/\/ No definition found based on the full domain name\/path wiki name, try to use the first part of the domain\n            \/\/ name as the wiki name\n            String servername = StringUtils.substringBefore(host, \".\");\n\n            \/\/ Note: Starting 5.0M2, the autowww behavior is default and the ability to disable it is now removed.\n            if (\"0\".equals(this.Param(\"xwiki.virtual.autowww\"))) {\n                LOGGER.warn(String.format(\"%s %s\", \"'xwiki.virtual.autowww' is no longer supported.\",\n                    \"Please update your configuration and\/or see XWIKI-8877 for more details.\"));\n            }\n\n            \/\/ As a convenience, we do not require the creation of an xwiki:XWiki.XWikiServerXwiki page for the main\n            \/\/ wiki and automatically go to the main wiki in certain cases:\n            \/\/ - \"www.<anyDomain>.<domainExtension>\" - if it starts with www, we first check if a subwiki with that\n            \/\/ name exists; if yes, the go to the \"www\" subwiki, if not, go to the main wiki\n            \/\/ - \"localhost\"\n            \/\/ - IP address\n            if (\"www\".equals(servername)) {\n                \/\/ Check that \"www\" is not actually the name of an existing subwiki.\n                wikiDefinition = this.findWikiServer(servername, context);\n                if (wikiDefinition == null) {\n                    \/\/ Not the case, use the main wiki.\n                    return context.getMainXWiki();\n                }\n            } else if (\"localhost\".equals(host) || host.matches(\"[0-9]{1,3}(?:\\\\.[0-9]{1,3}){3}\")) {\n                \/\/ Direct access to the main wiki.\n                return context.getMainXWiki();\n            }\n\n            \/\/ Use the name from the subdomain\n            wikiName = servername;\n\n            if (!context.isMainWiki(wikiName)\n                && !\"1\".equals(context.getWiki().Param(\"xwiki.virtual.failOnWikiDoesNotExist\", \"0\"))) {\n                \/\/ Check if the wiki really exists\n                if (!exists(getServerWikiPage(wikiName), context)) {\n                    \/\/ Fallback on main wiki\n                    wikiName = context.getMainXWiki();\n                }\n            }\n        } else {\n            \/\/ Use the name from the located wiki descriptor\n            wikiName = StringUtils.removeStart(wikiDefinition.getName(), \"XWikiServer\").toLowerCase();\n        }\n\n        return wikiName;\n    }\n\n    \/**\n     * Searches for the document containing the definition of the virtual wiki corresponding to the specified hostname.\n     *\n     * @param host the hostname, as specified in the request (for example: {@code forge.xwiki.org})\n     * @param context the current context\n     * @return the name of the document containing the wiki definition, or {@code null} if no wiki corresponds to the\n     *         hostname\n     * @throws XWikiException if a problem occurs while searching the storage\n     *\/\n    private DocumentReference XWiki.findWikiServer(String host, XWikiContext context) throws XWikiException\n    {\n        ensureVirtualWikiMapExists();\n        DocumentReference wikiName = this.virtualWikiMap.get(host);\n\n        if (wikiName == null) {\n            \/\/ Not loaded yet, search for it in the main wiki\n            String hql =\n                \", BaseObject as obj, StringProperty as prop WHERE obj.name=doc.fullName\"\n                    + \" AND doc.space='XWiki' AND doc.name LIKE 'XWikiServer%'\"\n                    + \" AND obj.className='XWiki.XWikiServerClass' AND prop.id.id = obj.id\"\n                    + \" AND prop.id.name = 'server' AND prop.value=?\";\n            List<String> parameters = new ArrayList<String>(1);\n            parameters.add(host);\n            try {\n                List<DocumentReference> list =\n                    context.getWiki().getStore().searchDocumentReferences(hql, parameters, context);\n                if ((list != null) && (list.size() > 0)) {\n                    wikiName = list.get(0);\n                }\n\n                this.virtualWikiMap.set(host, wikiName);\n            } catch (XWikiException e) {\n                LOGGER.warn(\"Error when searching for wiki name from URL host [\" + host + \"]\", e);\n            }\n        }\n\n        return wikiName;\n    }\n\n    private void XWiki.ensureVirtualWikiMapExists() throws XWikiException\n    {\n        synchronized (this) {\n            if (this.virtualWikiMap == null) {\n                int iCapacity = 1000;\n                try {\n                    String capacity = Param(\"xwiki.virtual.cache.capacity\");\n                    if (capacity != null) {\n                        iCapacity = Integer.parseInt(capacity);\n                    }\n                } catch (Exception e) {\n                }\n                try {\n                    CacheConfiguration configuration = new CacheConfiguration();\n                    configuration.setConfigurationId(\"xwiki.virtualwikimap\");\n                    LRUEvictionConfiguration lru = new LRUEvictionConfiguration();\n                    lru.setMaxEntries(iCapacity);\n                    configuration.put(LRUEvictionConfiguration.CONFIGURATIONID, lru);\n\n                    this.virtualWikiMap = getCacheFactory().newCache(configuration);\n                } catch (CacheException e) {\n                    throw new XWikiException(XWikiException.MODULE_XWIKI_CACHE,\n                        XWikiException.ERROR_CACHE_INITIALIZING, \"Failed to create new cache\", e);\n                }\n            }\n        }\n    }\n\n    \/**\n     * @deprecated replaced by {@link #setUserDefaultGroup(String fullwikiname, XWikiContext context)}\n     * @param context\n     * @param fullwikiname\n     * @throws XWikiException\n     *\/\n    @Deprecated\n    public void XWiki.SetUserDefaultGroup(XWikiContext context, String fullwikiname) throws XWikiException\n    {\n        this.setUserDefaultGroup(fullwikiname, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link #protectUserPage(String,String,XWikiDocument,XWikiContext)}\n     * @param context\n     * @param fullwikiname\n     * @param userRights\n     * @param doc\n     * @throws XWikiException\n     *\/\n    @Deprecated\n    public void XWiki.ProtectUserPage(XWikiContext context, String fullwikiname, String userRights, XWikiDocument doc)\n        throws XWikiException\n    {\n        this.protectUserPage(fullwikiname, userRights, doc, context);\n    }\n\n    \/**\n     * @return the cache factory.\n     * @since 1.5M2.\n     * @deprecated Since 1.7M1, use {@link CacheManager} component instead using {@link Utils#getComponent(Class)}\n     *\/\n    @Deprecated\n    public CacheFactory XWiki.getCacheFactory()\n    {\n        CacheFactory cacheFactory;\n\n        String cacheHint = Param(\"xwiki.cache.cachefactory.hint\", null);\n\n        if (StringUtils.isEmpty(cacheHint) || Utils.getComponent(CacheFactory.class, cacheHint) == null) {\n            CacheManager cacheManager = Utils.getComponent(CacheManager.class);\n            try {\n                cacheFactory = cacheManager.getCacheFactory();\n            } catch (ComponentLookupException e) {\n                throw new RuntimeException(\"Failed to get cache factory component\", e);\n            }\n        } else {\n            cacheFactory = Utils.getComponent(CacheFactory.class, cacheHint);\n        }\n\n        return cacheFactory;\n    }\n\n    \/**\n     * @return the cache factory creating local caches.\n     * @since 1.5M2.\n     * @deprecated Since 1.7M1, use {@link CacheManager} component instead using {@link Utils#getComponent(Class)}\n     *\/\n    @Deprecated\n    public CacheFactory XWiki.getLocalCacheFactory()\n    {\n        CacheFactory localCacheFactory;\n\n        String localCacheHint = Param(\"xwiki.cache.cachefactory.local.hint\", null);\n\n        if (StringUtils.isEmpty(localCacheHint) || Utils.getComponent(CacheFactory.class, localCacheHint) == null) {\n            CacheManager cacheManager = Utils.getComponent(CacheManager.class);\n            try {\n                localCacheFactory = cacheManager.getLocalCacheFactory();\n            } catch (ComponentLookupException e) {\n                throw new RuntimeException(\"Failed to get local cache factory component\", e);\n            }\n        } else {\n            localCacheFactory = Utils.getComponent(CacheFactory.class, localCacheHint);\n        }\n\n        return localCacheFactory;\n    }\n\n    \/**\n     * @deprecated since 2.3M1 use {@link #hasVersioning(XWikiContext)} instead\n     *\/\n    @Deprecated\n    public boolean XWiki.hasVersioning(String fullName, XWikiContext context)\n    {\n        return hasVersioning(context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link #include(String topic, boolean isForm, XWikiContext context)}\n     * @param topic\n     * @param context\n     * @param isForm\n     * @return\n     * @throws XWikiException\n     *\/\n    @Deprecated\n    public String XWiki.include(String topic, XWikiContext context, boolean isForm) throws XWikiException\n    {\n        return include(topic, isForm, context);\n    }\n    \n    \/**\n     * Checks if the wiki is running in test mode.\n     * \n     * @return {@code true} if the wiki is running Cactus tests, {@code false} otherwise\n     * @deprecated No longer used.\n     *\/\n    @Deprecated\n    public boolean XWiki.isTest()\n    {\n        return this.test;\n    }\n\n    \/**\n     * Marks that the wiki is running in test mode.\n     * \n     * @param test whether tests are being executed\n     * @deprecated No longer used.\n     *\/\n    @Deprecated\n    public void XWiki.setTest(boolean test)\n    {\n        this.test = test;\n    }\n\n    \/**\n     * @deprecated use {@link org.xwiki.localization.LocalizationManager} instead. From velocity you can access it using\n     *             the {@code $services.localization} binding, see {@code LocalizationScriptService}\n     *\/\n    @Deprecated\n    public String XWiki.parseMessage(XWikiContext context)\n    {\n        String message = (String) context.get(\"message\");\n        if (message == null) {\n            return null;\n        }\n\n        return parseMessage(message, context);\n    }\n\n    \/**\n     * @deprecated use {@link org.xwiki.localization.LocalizationManager} instead. From velocity you can access it using\n     *             the {@code $services.localization} binding, see {@code LocalizationScriptService}\n     *\/\n    @Deprecated\n    public String XWiki.parseMessage(String id, XWikiContext context)\n    {\n        XWikiMessageTool msg = context.getMessageTool();\n\n        List<?> parameters = (List<?>) context.get(\"messageParameters\");\n\n        String translatedMessage;\n        if (parameters != null) {\n            translatedMessage = msg.get(id, parameters);\n        } else {\n            translatedMessage = msg.get(id);\n        }\n\n        return parseContent(translatedMessage, context);\n    }\n\n    \/**\n     * @deprecated starting with 6.1M2 this method shouldn't be used. There's no replacement, it's just not the right\n     *             way to do this anymore and the flash.vm template doesn't exist anymore\n     *\/\n    @Deprecated\n    public String XWiki.getFlash(String url, String width, String height, XWikiContext context)\n    {\n        VelocityContext vorigcontext = ((VelocityContext) context.get(\"vcontext\"));\n        try {\n            VelocityContext vcontext = (VelocityContext) vorigcontext.clone();\n            vcontext.put(\"flashurl\", url);\n            vcontext.put(\"width\", width);\n            vcontext.put(\"height\", height);\n            context.put(\"vcontext\", vcontext);\n\n            return parseTemplate(\"flash.vm\", context);\n        } finally {\n            context.put(\"vcontext\", vorigcontext);\n        }\n    }\n\n}\n","old_contents":"\/*\n * See the NOTICE file distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This is free software; you can redistribute it and\/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF site: http:\/\/www.fsf.org.\n *\/\npackage com.xpn.xwiki;\n\nimport java.io.UnsupportedEncodingException;\nimport java.io.File;\nimport java.lang.reflect.Type;\nimport java.net.URL;\nimport java.net.URLEncoder;\nimport java.util.ArrayList;\nimport java.util.HashMap;\nimport java.util.List;\nimport java.util.Map;\n\nimport org.apache.commons.lang3.StringUtils;\nimport org.xwiki.cache.CacheException;\nimport org.xwiki.cache.CacheFactory;\nimport org.xwiki.cache.CacheManager;\nimport org.xwiki.cache.config.CacheConfiguration;\nimport org.xwiki.cache.eviction.LRUEvictionConfiguration;\nimport org.xwiki.component.manager.ComponentLookupException;\nimport org.xwiki.context.Execution;\nimport org.xwiki.context.ExecutionContext;\nimport org.xwiki.environment.Environment;\nimport org.xwiki.rendering.syntax.Syntax;\nimport org.xwiki.xml.XMLUtils;\nimport org.xwiki.model.reference.EntityReference;\nimport org.xwiki.model.reference.EntityReferenceResolver;\nimport org.xwiki.model.reference.DocumentReference;\nimport org.xwiki.model.reference.EntityReferenceSerializer;\nimport org.xwiki.model.reference.WikiReference;\nimport org.xwiki.model.EntityType;\nimport org.xwiki.url.XWikiEntityURL;\nimport org.apache.velocity.VelocityContext;\n\nimport com.xpn.xwiki.cache.api.XWikiCache;\nimport com.xpn.xwiki.cache.api.XWikiCacheService;\nimport com.xpn.xwiki.cache.api.internal.XWikiCacheServiceStub;\nimport com.xpn.xwiki.cache.api.internal.XWikiCacheStub;\nimport com.xpn.xwiki.doc.XWikiDocument;\nimport com.xpn.xwiki.notify.XWikiNotificationManager;\nimport com.xpn.xwiki.objects.BaseObject;\nimport com.xpn.xwiki.objects.classes.BaseClass;\nimport com.xpn.xwiki.objects.classes.PropertyClass;\nimport com.xpn.xwiki.plugin.query.QueryPlugin;\nimport com.xpn.xwiki.plugin.query.XWikiCriteria;\nimport com.xpn.xwiki.plugin.query.XWikiQuery;\nimport com.xpn.xwiki.util.Util;\nimport com.xpn.xwiki.web.Utils;\nimport com.xpn.xwiki.web.XWikiMessageTool;\nimport com.xpn.xwiki.web.XWikiRequest;\n\n\/**\n * Add a backward compatibility layer to the {@link com.xpn.xwiki.XWiki} class.\n * \n * @version $Id$\n *\/\npublic privileged aspect XWikiCompatibilityAspect\n{\n    private static Map XWiki.threadMap = new HashMap();\n\n    private XWikiNotificationManager XWiki.notificationManager;\n\n    private EntityReferenceResolver<EntityReference> XWiki.defaultReferenceEntityReferenceResolver = Utils.getComponent(\n        EntityReferenceResolver.TYPE_REFERENCE);\n\n    private EntityReferenceSerializer<String> XWiki.localStringEntityReferenceSerializer = Utils.getComponent(\n        EntityReferenceSerializer.TYPE_STRING, \"local\");\n\n    \n    \/**\n     * Used to get the temporary and permanent directory.\n     *\/\n    private Environment XWiki.environment = Utils.getComponent((Type) Environment.class);\n\n    \/** Is the wiki running in test mode? Deprecated, was used when running Cactus tests. *\/\n    private boolean XWiki.test = false;\n\n    \/**\n     * Transform a text in a URL compatible text\n     *\n     * @param content text to transform\n     * @return encoded result\n     * @deprecated replaced by Util#encodeURI since 1.3M2\n     *\/\n    @Deprecated\n    public String XWiki.getURLEncoded(String content)\n    {\n        try {\n            return URLEncoder.encode(content, this.getEncoding());\n        } catch (UnsupportedEncodingException e) {\n            return content;\n        }\n    }\n\n    \/**\n     * @return true for multi-wiki\/false for mono-wiki\n     * @deprecated replaced by {@link XWiki#isVirtualMode()} since 1.4M1.\n     *\/\n    @Deprecated\n    public boolean XWiki.isVirtual()\n    {\n        return isVirtualMode();\n    }\n\n    \/**\n     * @deprecated Virtual mode is on by default, starting with XWiki 5.0M2. Use\n     *             {@link #getVirtualWikisDatabaseNames(XWikiContext)} to get the list of wikis if needed.\n     * @return true for multi-wiki\/false for mono-wiki\n     *\/\n    @Deprecated\n    public boolean XWiki.isVirtualMode()\n    {\n        return true;\n    }\n\n    \/**\n     * @deprecated Removed since it isn't used; since 1.5M1.\n     *\/\n    @Deprecated\n    public static Map XWiki.getThreadMap()\n    {\n        return XWiki.threadMap;\n    }\n\n    \/**\n     * @deprecated Removed since it isn't used; since 1.5M1.\n     *\/\n    @Deprecated\n    public static void XWiki.setThreadMap(Map threadMap)\n    {\n        XWiki.threadMap = threadMap;\n    }\n\n    \/**\n     * @return the cache service.\n     * @deprecated replaced by {@link XWiki#getCacheFactory(XWikiContext)} or\n     *             {@link XWiki#getLocalCacheFactory(XWikiContext)} since 1.5M2.\n     *\/\n    @Deprecated\n    public XWikiCacheService XWiki.getCacheService()\n    {\n        return new XWikiCacheServiceStub(getCacheFactory(), getLocalCacheFactory());\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getVirtualWikiCache(XWikiContext)} since 1.5M2.\n     *\/\n    @Deprecated\n    public XWikiCache XWiki.getVirtualWikiMap()\n    {\n        return new XWikiCacheStub(this.virtualWikiMap);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpaceCopyright(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebCopyright(XWikiContext context)\n    {\n        return this.getSpaceCopyright(context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, String defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, String, String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, String space, String defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, space, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsLong(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public long XWiki.getWebPreferenceAsLong(String preference, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsLong(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsLong(String, long, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public long XWiki.getWebPreferenceAsLong(String preference, long defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsLong(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsInt(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.getWebPreferenceAsInt(String preference, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsInt(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsInt(String, int, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.getWebPreferenceAsInt(String preference, int defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsInt(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#copySpaceBetweenWikis(String, String, String, String, XWikiContext)} since\n     *             2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.copyWikiWeb(String space, String sourceWiki, String targetWiki, String language, XWikiContext context)\n        throws XWikiException\n    {\n        return this.copySpaceBetweenWikis(space, sourceWiki, targetWiki, language, context);\n    }\n\n    \/**\n     * @deprecated replaced by\n     *             {@link XWiki#copySpaceBetweenWikis(String, String, String, String, boolean, XWikiContext)} since\n     *             2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.copyWikiWeb(String space, String sourceWiki, String targetWiki, String language, boolean clean,\n        XWikiContext context) throws XWikiException\n    {\n        return this.copySpaceBetweenWikis(space, sourceWiki, targetWiki, language, clean, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getDefaultSpace(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getDefaultWeb(XWikiContext context)\n    {\n        return this.getDefaultSpace(context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#skipDefaultSpaceInURLs(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public boolean XWiki.useDefaultWeb(XWikiContext context)\n    {\n        return this.skipDefaultSpaceInURLs(context);\n    }\n\n    \/**\n     * @deprecated use {@link XWikiMessageTool#get(String, List)} instead. You can access message tool using\n     *             {@link XWikiContext#getMessageTool()}.\n     *\/\n    @Deprecated\n    public String XWiki.getMessage(String item, XWikiContext context)\n    {\n        XWikiMessageTool msg = context.getMessageTool();\n        if (msg == null) {\n            return item;\n        } else {\n            return msg.get(item);\n        }\n    }\n\n    \/**\n     * @deprecated Removed since it isn't used; since 3.1M2.\n     *\/\n    @Deprecated\n    public String XWiki.getHTMLArea(String content, XWikiContext context)\n    {\n        StringBuilder result = new StringBuilder();\n\n        String scontent = XMLUtils.escape(content);\n        scontent = scontent.replaceAll(\"\\r?+\\n\", \"<br class=\\\"htmlarea\\\"\/>\");\n\n        result.append(\"<textarea name=\\\"content\\\" id=\\\"content\\\" rows=\\\"25\\\" cols=\\\"80\\\">\");\n        result.append(scontent);\n        result.append(\"<\/textarea>\");\n\n        return result.toString();\n    }\n\n    @Deprecated\n    public XWikiNotificationManager XWiki.getNotificationManager()\n    {\n        if (this.notificationManager == null) {\n          this.notificationManager = new XWikiNotificationManager();\n        }\n\n        return this.notificationManager;\n    }\n\n    @Deprecated\n    public void XWiki.setNotificationManager(XWikiNotificationManager notificationManager)\n    {\n        this.notificationManager = notificationManager;\n    }\n    \n    @Deprecated\n    public String XWiki.displaySearch(String fieldname, String className, XWikiCriteria criteria, XWikiContext context)\n        throws XWikiException\n    {\n        return displaySearch(fieldname, className, \"\", criteria, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearch(String fieldname, String className, XWikiContext context) throws XWikiException\n    {\n        return displaySearch(fieldname, className, \"\", new XWikiCriteria(), context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearch(String fieldname, String className, String prefix, XWikiCriteria criteria,\n        XWikiContext context) throws XWikiException\n    {\n        BaseClass bclass = getDocument(className, context).getXClass();\n        PropertyClass pclass = (PropertyClass) bclass.get(fieldname);\n        if (criteria == null) {\n            criteria = new XWikiCriteria();\n        }\n\n        if (pclass == null) {\n            return \"\";\n        } else {\n            return pclass.displaySearch(fieldname, prefix + className + \"_\", criteria, context);\n        }\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchColumns(String className, XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        return displaySearchColumns(className, \"\", query, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchColumns(String className, String prefix, XWikiQuery query, XWikiContext context)\n        throws XWikiException\n    {\n        BaseClass bclass = getDocument(className, context).getXClass();\n\n        if (query == null) {\n            query = new XWikiQuery();\n        }\n\n        return bclass.displaySearchColumns(className + \"_\" + prefix, query, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchOrder(String className, XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        return displaySearchOrder(className, \"\", query, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchOrder(String className, String prefix, XWikiQuery query, XWikiContext context)\n        throws XWikiException\n    {\n        BaseClass bclass = getDocument(className, context).getXClass();\n\n        if (query == null) {\n            query = new XWikiQuery();\n        }\n\n        return bclass.displaySearchOrder(className + \"_\" + prefix, query, context);\n    }\n\n    @Deprecated\n    public <T> List<T> XWiki.search(XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        QueryPlugin qp = (QueryPlugin) getPlugin(\"query\", context);\n        if (qp == null) {\n            return null;\n        }\n\n        return qp.search(query);\n    }\n\n    @Deprecated\n    public XWikiQuery XWiki.createQueryFromRequest(String className, XWikiContext context) throws XWikiException\n    {\n        return new XWikiQuery(context.getRequest(), className, context);\n    }\n\n    @Deprecated\n    public String XWiki.searchAsTable(XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        QueryPlugin qp = (QueryPlugin) getPlugin(\"query\", context);\n        if (qp == null) {\n            return null;\n        }\n\n        List<String> list = qp.search(query);\n        String result = \"{table}\\r\\n\";\n        List<String> headerColumns = new ArrayList<String>();\n        List<String> displayProperties = query.getDisplayProperties();\n        for (String propname : displayProperties) {\n            PropertyClass pclass = getPropertyClassFromName(propname, context);\n            if (pclass != null) {\n                headerColumns.add(pclass.getPrettyName());\n            } else {\n                if (propname.startsWith(\"doc.\")) {\n                    propname = propname.substring(4);\n                    headerColumns.add(XWikiDocument.getInternalPropertyName(propname, context));\n                } else {\n                    headerColumns.add(propname);\n                }\n\n            }\n        }\n\n        result += StringUtils.join(headerColumns.toArray(), \" | \") + \"\\r\\n\";\n        for (String docname : list) {\n            List<String> rowColumns = new ArrayList<String>();\n            XWikiDocument doc = getDocument(docname, context);\n            for (String propname : displayProperties) {\n                PropertyClass pclass = getPropertyClassFromName(propname, context);\n                if (pclass == null) {\n                    if (propname.startsWith(\"doc.\")) {\n                        propname = propname.substring(4);\n                    }\n                    String value = doc.getInternalProperty(propname);\n                    rowColumns.add((value == null) ? \" \" : value);\n                } else {\n                    BaseObject bobj = doc.getObject(pclass.getObject().getName());\n                    rowColumns.add(doc.display(pclass.getName(), \"view\", bobj, context));\n                }\n            }\n            result += StringUtils.join(rowColumns.toArray(), \" | \") + \"\\r\\n\";\n        }\n\n        result += \"{table}\\r\\n\";\n\n        return result;\n    }\n\n    @Deprecated\n    public String XWiki.getDocLanguagePreference(XWikiContext context)\n    {\n        return getLanguagePreference(context);\n    }\n\n    @Deprecated\n    public void XWiki.flushCache()\n    {\n        Execution execution = Utils.getComponent(Execution.class);\n\n        ExecutionContext ec = execution.getContext();\n\n        flushCache(ec != null ? (XWikiContext) ec.getProperty(\"xwikicontext\") : null);\n    }\n\n    \/**\n     * @deprecated use WikiManager plugin instead\n     *\/\n    @Deprecated\n    public int XWiki.createNewWiki(String wikiName, String wikiUrl, String wikiAdmin, String baseWikiName,\n        String description, String wikilanguage, boolean failOnExist, XWikiContext context) throws XWikiException\n    {\n        String database = context.getDatabase();\n        wikiName = wikiName.toLowerCase();\n\n        try {\n            XWikiDocument userdoc = getDocument(wikiAdmin, context);\n\n            \/\/ User does not exist\n            if (userdoc.isNew()) {\n                if (LOGGER.isErrorEnabled()) {\n                    LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"user does not exist\");\n                }\n                return -2;\n            }\n\n            \/\/ User is not active\n            if (!(userdoc.getIntValue(\"XWiki.XWikiUsers\", \"active\") == 1)) {\n                if (LOGGER.isErrorEnabled()) {\n                    LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"user is not active\");\n                }\n                return -3;\n            }\n\n            String wikiForbiddenList = Param(\"xwiki.virtual.reserved_wikis\");\n            if (Util.contains(wikiName, wikiForbiddenList, \", \")) {\n                if (LOGGER.isErrorEnabled()) {\n                    LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"wiki name is forbidden\");\n                }\n                return -4;\n            }\n\n            String wikiServerPage = \"XWikiServer\" + wikiName.substring(0, 1).toUpperCase() + wikiName.substring(1);\n            \/\/ Verify is server page already exist\n            XWikiDocument serverdoc = getDocument(SYSTEM_SPACE, wikiServerPage, context);\n            if (serverdoc.isNew()) {\n                \/\/ clear entry in virtual wiki cache\n                this.virtualWikiMap.remove(wikiUrl);\n\n                \/\/ Create Wiki Server page\n                serverdoc.setStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"server\", wikiUrl);\n                serverdoc.setStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"owner\", wikiAdmin);\n                if (description != null) {\n                    serverdoc.setLargeStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"description\", description);\n                }\n                if (wikilanguage != null) {\n                    serverdoc.setStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"language\", wikilanguage);\n                }\n                if (!getDefaultDocumentSyntax().equals(Syntax.XWIKI_1_0.toIdString())) {\n                    serverdoc.setContent(\"{{include document=\\\"XWiki.XWikiServerForm\\\"\/}}\\n\");\n                    serverdoc.setSyntax(Syntax.XWIKI_2_0);\n                } else {\n                    serverdoc.setContent(\"#includeForm(\\\"XWiki.XWikiServerForm\\\")\\n\");\n                    serverdoc.setSyntax(Syntax.XWIKI_1_0);\n                }\n                serverdoc.setParentReference(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE);\n                saveDocument(serverdoc, context);\n            } else {\n                \/\/ If we are not allowed to continue if server page already exists\n                if (failOnExist) {\n                    if (LOGGER.isErrorEnabled()) {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki server page already exists\");\n                    }\n                    return -5;\n                } else if (LOGGER.isWarnEnabled()) {\n                    LOGGER.warn(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"wiki server page already exists\");\n                }\n            }\n\n            \/\/ Create wiki database\n            try {\n                context.setDatabase(getDatabase());\n                getStore().createWiki(wikiName, context);\n            } catch (XWikiException e) {\n                if (LOGGER.isErrorEnabled()) {\n                    if (e.getCode() == 10010) {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki database already exists\");\n                    } else if (e.getCode() == 10011) {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki database creation failed\");\n                    } else {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki database creation threw exception\", e);\n                    }\n                }\n            } catch (Exception e) {\n                LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                    + \"wiki database creation threw exception\", e);\n            }\n\n            try {\n                updateDatabase(wikiName, true, false, context);\n            } catch (Exception e) {\n                LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                    + \"wiki database shema update threw exception\", e);\n                return -6;\n            }\n\n            \/\/ Copy base wiki\n            int nb = copyWiki(baseWikiName, wikiName, wikilanguage, context);\n            \/\/ Save the number of docs copied in the context\n            context.put(\"nbdocs\", Integer.valueOf(nb));\n\n            \/\/ Create user page in his wiki\n            \/\/ Let's not create it anymore.. this makes the creator loose\n            \/\/ super admin rights on his wiki\n            \/\/ copyDocument(wikiAdmin, getDatabase(), wikiName, wikilanguage, context);\n\n            \/\/ Modify rights in user wiki\n            context.setDatabase(wikiName);\n            \/*\n             * XWikiDocument wikiprefdoc = getDocument(\"XWiki.XWikiPreferences\", context);\n             * wikiprefdoc.setStringValue(\"XWiki.XWikiGlobalRights\", \"users\", wikiAdmin);\n             * wikiprefdoc.setStringValue(\"XWiki.XWikiGlobalRights\", \"levels\", \"admin, edit\");\n             * wikiprefdoc.setIntValue(\"XWiki.XWikiGlobalRights\", \"allow\", 1); saveDocument(wikiprefdoc, context);\n             *\/\n            return 1;\n        } catch (Exception e) {\n            LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                + \"wiki creation threw exception\", e);\n            return -10;\n        } finally {\n            context.setDatabase(database);\n        }\n    }\n\n    \/**\n     * Get the XWiki temporary filesystem directory (cleaned up automatically by XWiki).\n     *\n     * @param context\n     * @return temporary directory\n     * @since 1.1 Milestone 4\n     * @deprecated starting with 4.2M1 use {@link org.xwiki.environment.Environment#getTemporaryDirectory()}\n     *\/\n    @Deprecated\n    public File XWiki.getTempDirectory(XWikiContext context)\n    {\n        return this.environment.getTemporaryDirectory();\n    }\n\n    \/**\n     * Get a new directory in the xwiki work directory\n     *\n     * @param subdir desired directory name\n     * @param context\n     * @return work subdirectory\n     * @since 1.1 Milestone 4\n     * @deprecated starting with 4.2M1 use {@link org.xwiki.environment.Environment#getPermanentDirectory()}\n     *\/\n    @Deprecated\n    public File XWiki.getWorkSubdirectory(String subdir, XWikiContext context)\n    {\n        File fdir = new File(this.environment.getPermanentDirectory().getAbsolutePath(), subdir);\n        if (!fdir.exists()) {\n            fdir.mkdir();\n        }\n\n        return fdir;\n    }\n\n    \/**\n     * Get the XWiki work directory\n     *\n     * @param context\n     * @return work directory\n     * @since 1.1 Milestone 4\n     * @deprecated starting with 4.2M1 use {@link org.xwiki.environment.Environment#getPermanentDirectory()}\n     *\/\n    @Deprecated\n    public File XWiki.getWorkDirectory(XWikiContext context)\n    {\n        return this.environment.getPermanentDirectory();\n    }\n\n    \/**\n     * @deprecated starting with 5.1M1 use {@code org.xwiki.url.XWikiURLFactory} instead and starting with 5.3M1 use\n     *             {@link ResourceFactory} and since 6.1M2 use {@link org.xwiki.resource.ResourceReferenceResolver}\n     *\/\n    @Deprecated\n    public XWikiDocument XWiki.getDocumentFromPath(String path, XWikiContext context) throws XWikiException\n    {\n        return getDocument(getDocumentReferenceFromPath(path, context), context);\n    }\n\n    \/**\n     * @since 2.3M1\n     * @deprecated starting with 5.1M1 use {@code org.xwiki.url.XWikiURLFactory} instead and starting with 5.3M1 use\n     *             {@link ResourceFactory} and since 6.1M2 use {@link org.xwiki.resource.ResourceReferenceResolver}\n     *\/\n    @Deprecated\n    public DocumentReference XWiki.getDocumentReferenceFromPath(String path, XWikiContext context)\n    {\n        \/\/ TODO: Remove this and use XWikiURLFactory instead in XWikiAction and all entry points.\n        List<String> segments = new ArrayList<String>();\n        for (String segment : path.split(\"\/\", -1)) {\n            segments.add(Util.decodeURI(segment, context));\n        }\n        \/\/ Remove the first segment if it's empty to cater for cases when the path starts with \"\/\"\n        if (segments.size() > 0 && segments.get(0).length() == 0) {\n            segments.remove(0);\n        }\n\n        XWikiEntityURL entityURL = buildEntityURLFromPathSegments(new WikiReference(context.getDatabase()), segments);\n\n        return new DocumentReference(entityURL.getEntityReference().extractReference(EntityType.DOCUMENT));\n    }\n\n    \/**\n     * @deprecated since 2.3M1 use {@link #getDocumentReferenceFromPath(String, XWikiContext)} instead\n     *\/\n    @Deprecated\n    public String XWiki.getDocumentNameFromPath(String path, XWikiContext context)\n    {\n        return this.localStringEntityReferenceSerializer.serialize(getDocumentReferenceFromPath(path, context));\n    }\n\n    \/**\n     * @deprecated since 2.3M1 use {@link #getDocumentReferenceFromPath(String, XWikiContext)} instead\n     *\/\n    @Deprecated\n    public String XWiki.getDocumentName(XWikiRequest request, XWikiContext context)\n    {\n        return this.localStringEntityReferenceSerializer.serialize(getDocumentReference(request, context));\n    }\n\n    \/**\n     * @deprecated starting with 5.1M1 use {@code org.xwiki.url.XWikiURLFactory} instead and starting with 5.3M1 use\n     *             {@link ResourceFactory} and since 6.1M2 use {@link org.xwiki.resource.ResourceReferenceResolver}\n     *\/\n    @Deprecated\n    private XWikiEntityURL XWiki.buildEntityURLFromPathSegments(WikiReference wikiReference, List<String> pathSegments)\n    {\n        XWikiEntityURL entityURL;\n\n        \/\/ Rules based on counting the url segments:\n        \/\/ - 0 segments (e.g. \"\"): default document reference, \"view\" action\n        \/\/ - 1 segment (e.g. \"\/\", \"\/Document\"): default space, specified document (and default if empty), \"view\" action\n        \/\/ - 2 segments (e.g. \"\/Space\/\", \"\/Space\/Document\"): specified space, document (and default doc if empty),\n        \/\/   \"view\" action\n        \/\/ - 3 segments (e.g. \"\/action\/Space\/Document\"): specified space, document (and default doc if empty),\n        \/\/   specified action\n        \/\/ - 4 segments (e.g. \"\/download\/Space\/Document\/attachment\"): specified space, document and attachment (and\n        \/\/   default doc if empty), \"download\" action\n        \/\/ - 4 segments or more (e.g. \"\/action\/Space\/Document\/whatever\/else\"): specified space, document (and default\n        \/\/     doc if empty), specified \"action\" (if action != \"download\"), trailing segments ignored\n\n        String spaceName = null;\n        String pageName = null;\n        String attachmentName = null;\n        String action = \"view\";\n\n        if (pathSegments.size() == 1) {\n            pageName = pathSegments.get(0);\n        } else if (pathSegments.size() == 2) {\n            spaceName = pathSegments.get(0);\n            pageName = pathSegments.get(1);\n        } else if (pathSegments.size() >= 3) {\n            action = pathSegments.get(0);\n            spaceName = pathSegments.get(1);\n            pageName = pathSegments.get(2);\n            if (action.equals(\"download\") && pathSegments.size() >= 4) {\n                attachmentName = pathSegments.get(3);\n            }\n        }\n\n        \/\/ Normalize the extracted space\/page to resolve empty\/null values and replace them with default values.\n        EntityReference reference = wikiReference;\n        EntityType entityType = EntityType.DOCUMENT;\n        if (!StringUtils.isEmpty(spaceName)) {\n            reference = new EntityReference(spaceName, EntityType.SPACE, reference);\n        }\n        if (!StringUtils.isEmpty(pageName)) {\n            reference = new EntityReference(pageName, EntityType.DOCUMENT, reference);\n        }\n        if (!StringUtils.isEmpty(attachmentName)) {\n            reference = new EntityReference(attachmentName, EntityType.ATTACHMENT, reference);\n            entityType = EntityType.ATTACHMENT;\n        }\n        reference = this.defaultReferenceEntityReferenceResolver.resolve(reference, entityType);\n\n        entityURL = new XWikiEntityURL(reference);\n        entityURL.setAction(action);\n\n        return entityURL;\n    }\n\n    \/**\n     * Extracts the name of the wiki from a context's request. In some cases, including autowww, the main wiki may be\n     * returned instead of what was requested, as a result of some assumptions. Even so, the resulting wiki name is not\n     * guaranteed to exist, it is just what XWiki understood from the request.\n     *\n     * @param context the context which contains the request\n     * @return the name of the wiki that was requested\n     * @throws XWikiException if problems occur\n     * @deprecated starting with 5.2M1 use  use {@link ResourceFactory} instead and since 6.1M2 use\n     *             {@link org.xwiki.resource.ResourceReferenceResolver} instead\n     *\/\n    @Deprecated\n    public String XWiki.getRequestWikiName(XWikiContext context) throws XWikiException\n    {\n        \/\/ Host is full.host.name in DNS-based multiwiki, and wikiname in path-based multiwiki.\n        String host = \"\";\n        \/\/ Canonical name of the wiki (database).\n        String wikiName = \"\";\n        \/\/ wikiDefinition should be the document holding the definition of the virtual wiki, a document in the main\n        \/\/ wiki with a XWiki.XWikiServerClass object attached to it\n        DocumentReference wikiDefinition;\n\n        XWikiRequest request = context.getRequest();\n        try {\n            URL requestURL = context.getURL();\n            host = requestURL.getHost();\n        } catch (Exception e) {\n        }\n\n        \/\/ In path-based multi-wiki, the wiki name is an element of the request path.\n        \/\/ The url is in the form \/xwiki (app name)\/wiki (servlet name)\/wikiname\/\n        if (\"1\".equals(this.Param(\"xwiki.virtual.usepath\", \"1\"))) {\n            String uri = request.getRequestURI();\n            if (LOGGER.isDebugEnabled()) {\n                LOGGER.debug(\"Request uri is: \" + uri);\n            }\n            \/\/ Remove the (eventual) context path from the URI, usually \/xwiki\n            uri = stripSegmentFromPath(uri, request.getContextPath());\n            \/\/ Remove the (eventual) servlet path from the URI, usually \/wiki\n            String servletPath = request.getServletPath();\n            uri = stripSegmentFromPath(uri, servletPath);\n\n            if (servletPath.equals(\"\/\" + this.Param(\"xwiki.virtual.usepath.servletpath\", \"wiki\"))) {\n                \/\/ Requested path corresponds to a path-based wiki, now the wiki name is between the first and\n                \/\/ second \"\/\"\n                host = StringUtils.substringBefore(StringUtils.removeStart(uri, \"\/\"), \"\/\");\n            }\n        }\n\n        if (StringUtils.isEmpty(host) || host.equals(context.getMainXWiki())) {\n            \/\/ Can't find any wiki name, return the main wiki\n            return context.getMainXWiki();\n        }\n\n        \/\/ Try to use the full domain name\/path wiki name and see if it corresponds to any existing wiki descriptors\n        wikiDefinition = this.findWikiServer(host, context);\n\n        if (wikiDefinition == null) {\n            \/\/ No definition found based on the full domain name\/path wiki name, try to use the first part of the domain\n            \/\/ name as the wiki name\n            String servername = StringUtils.substringBefore(host, \".\");\n\n            \/\/ Note: Starting 5.0M2, the autowww behavior is default and the ability to disable it is now removed.\n            if (\"0\".equals(this.Param(\"xwiki.virtual.autowww\"))) {\n                LOGGER.warn(String.format(\"%s %s\", \"'xwiki.virtual.autowww' is no longer supported.\",\n                    \"Please update your configuration and\/or see XWIKI-8877 for more details.\"));\n            }\n\n            \/\/ As a convenience, we do not require the creation of an xwiki:XWiki.XWikiServerXwiki page for the main\n            \/\/ wiki and automatically go to the main wiki in certain cases:\n            \/\/ - \"www.<anyDomain>.<domainExtension>\" - if it starts with www, we first check if a subwiki with that\n            \/\/ name exists; if yes, the go to the \"www\" subwiki, if not, go to the main wiki\n            \/\/ - \"localhost\"\n            \/\/ - IP address\n            if (\"www\".equals(servername)) {\n                \/\/ Check that \"www\" is not actually the name of an existing subwiki.\n                wikiDefinition = this.findWikiServer(servername, context);\n                if (wikiDefinition == null) {\n                    \/\/ Not the case, use the main wiki.\n                    return context.getMainXWiki();\n                }\n            } else if (\"localhost\".equals(host) || host.matches(\"[0-9]{1,3}(?:\\\\.[0-9]{1,3}){3}\")) {\n                \/\/ Direct access to the main wiki.\n                return context.getMainXWiki();\n            }\n\n            \/\/ Use the name from the subdomain\n            wikiName = servername;\n\n            if (!context.isMainWiki(wikiName)\n                && !\"1\".equals(context.getWiki().Param(\"xwiki.virtual.failOnWikiDoesNotExist\", \"0\"))) {\n                \/\/ Check if the wiki really exists\n                if (!exists(getServerWikiPage(wikiName), context)) {\n                    \/\/ Fallback on main wiki\n                    wikiName = context.getMainXWiki();\n                }\n            }\n        } else {\n            \/\/ Use the name from the located wiki descriptor\n            wikiName = StringUtils.removeStart(wikiDefinition.getName(), \"XWikiServer\").toLowerCase();\n        }\n\n        return wikiName;\n    }\n\n    \/**\n     * Searches for the document containing the definition of the virtual wiki corresponding to the specified hostname.\n     *\n     * @param host the hostname, as specified in the request (for example: {@code forge.xwiki.org})\n     * @param context the current context\n     * @return the name of the document containing the wiki definition, or {@code null} if no wiki corresponds to the\n     *         hostname\n     * @throws XWikiException if a problem occurs while searching the storage\n     *\/\n    private DocumentReference XWiki.findWikiServer(String host, XWikiContext context) throws XWikiException\n    {\n        ensureVirtualWikiMapExists();\n        DocumentReference wikiName = this.virtualWikiMap.get(host);\n\n        if (wikiName == null) {\n            \/\/ Not loaded yet, search for it in the main wiki\n            String hql =\n                \", BaseObject as obj, StringProperty as prop WHERE obj.name=doc.fullName\"\n                    + \" AND doc.space='XWiki' AND doc.name LIKE 'XWikiServer%'\"\n                    + \" AND obj.className='XWiki.XWikiServerClass' AND prop.id.id = obj.id\"\n                    + \" AND prop.id.name = 'server' AND prop.value=?\";\n            List<String> parameters = new ArrayList<String>(1);\n            parameters.add(host);\n            try {\n                List<DocumentReference> list =\n                    context.getWiki().getStore().searchDocumentReferences(hql, parameters, context);\n                if ((list != null) && (list.size() > 0)) {\n                    wikiName = list.get(0);\n                }\n\n                this.virtualWikiMap.set(host, wikiName);\n            } catch (XWikiException e) {\n                LOGGER.warn(\"Error when searching for wiki name from URL host [\" + host + \"]\", e);\n            }\n        }\n\n        return wikiName;\n    }\n\n    private void XWiki.ensureVirtualWikiMapExists() throws XWikiException\n    {\n        synchronized (this) {\n            if (this.virtualWikiMap == null) {\n                int iCapacity = 1000;\n                try {\n                    String capacity = Param(\"xwiki.virtual.cache.capacity\");\n                    if (capacity != null) {\n                        iCapacity = Integer.parseInt(capacity);\n                    }\n                } catch (Exception e) {\n                }\n                try {\n                    CacheConfiguration configuration = new CacheConfiguration();\n                    configuration.setConfigurationId(\"xwiki.virtualwikimap\");\n                    LRUEvictionConfiguration lru = new LRUEvictionConfiguration();\n                    lru.setMaxEntries(iCapacity);\n                    configuration.put(LRUEvictionConfiguration.CONFIGURATIONID, lru);\n\n                    this.virtualWikiMap = getCacheFactory().newCache(configuration);\n                } catch (CacheException e) {\n                    throw new XWikiException(XWikiException.MODULE_XWIKI_CACHE,\n                        XWikiException.ERROR_CACHE_INITIALIZING, \"Failed to create new cache\", e);\n                }\n            }\n        }\n    }\n\n    \/**\n     * @deprecated replaced by {@link #setUserDefaultGroup(String fullwikiname, XWikiContext context)}\n     * @param context\n     * @param fullwikiname\n     * @throws XWikiException\n     *\/\n    @Deprecated\n    public void XWiki.SetUserDefaultGroup(XWikiContext context, String fullwikiname) throws XWikiException\n    {\n        this.setUserDefaultGroup(fullwikiname, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link #protectUserPage(String,String,XWikiDocument,XWikiContext)}\n     * @param context\n     * @param fullwikiname\n     * @param userRights\n     * @param doc\n     * @throws XWikiException\n     *\/\n    @Deprecated\n    public void XWiki.ProtectUserPage(XWikiContext context, String fullwikiname, String userRights, XWikiDocument doc)\n        throws XWikiException\n    {\n        this.protectUserPage(fullwikiname, userRights, doc, context);\n    }\n\n    \/**\n     * @return the cache factory.\n     * @since 1.5M2.\n     * @deprecated Since 1.7M1, use {@link CacheManager} component instead using {@link Utils#getComponent(Class)}\n     *\/\n    @Deprecated\n    public CacheFactory XWiki.getCacheFactory()\n    {\n        CacheFactory cacheFactory;\n\n        String cacheHint = Param(\"xwiki.cache.cachefactory.hint\", null);\n\n        if (StringUtils.isEmpty(cacheHint) || Utils.getComponent(CacheFactory.class, cacheHint) == null) {\n            CacheManager cacheManager = Utils.getComponent(CacheManager.class);\n            try {\n                cacheFactory = cacheManager.getCacheFactory();\n            } catch (ComponentLookupException e) {\n                throw new RuntimeException(\"Failed to get cache factory component\", e);\n            }\n        } else {\n            cacheFactory = Utils.getComponent(CacheFactory.class, cacheHint);\n        }\n\n        return cacheFactory;\n    }\n\n    \/**\n     * @return the cache factory creating local caches.\n     * @since 1.5M2.\n     * @deprecated Since 1.7M1, use {@link CacheManager} component instead using {@link Utils#getComponent(Class)}\n     *\/\n    @Deprecated\n    public CacheFactory XWiki.getLocalCacheFactory()\n    {\n        CacheFactory localCacheFactory;\n\n        String localCacheHint = Param(\"xwiki.cache.cachefactory.local.hint\", null);\n\n        if (StringUtils.isEmpty(localCacheHint) || Utils.getComponent(CacheFactory.class, localCacheHint) == null) {\n            CacheManager cacheManager = Utils.getComponent(CacheManager.class);\n            try {\n                localCacheFactory = cacheManager.getLocalCacheFactory();\n            } catch (ComponentLookupException e) {\n                throw new RuntimeException(\"Failed to get local cache factory component\", e);\n            }\n        } else {\n            localCacheFactory = Utils.getComponent(CacheFactory.class, localCacheHint);\n        }\n\n        return localCacheFactory;\n    }\n\n    \/**\n     * @deprecated since 2.3M1 use {@link #hasVersioning(XWikiContext)} instead\n     *\/\n    @Deprecated\n    public boolean XWiki.hasVersioning(String fullName, XWikiContext context)\n    {\n        return hasVersioning(context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link #include(String topic, boolean isForm, XWikiContext context)}\n     * @param topic\n     * @param context\n     * @param isForm\n     * @return\n     * @throws XWikiException\n     *\/\n    @Deprecated\n    public String XWiki.include(String topic, XWikiContext context, boolean isForm) throws XWikiException\n    {\n        return include(topic, isForm, context);\n    }\n    \n    \/**\n     * Checks if the wiki is running in test mode.\n     * \n     * @return {@code true} if the wiki is running Cactus tests, {@code false} otherwise\n     * @deprecated No longer used.\n     *\/\n    @Deprecated\n    public boolean XWiki.isTest()\n    {\n        return this.test;\n    }\n\n    \/**\n     * Marks that the wiki is running in test mode.\n     * \n     * @param test whether tests are being executed\n     * @deprecated No longer used.\n     *\/\n    @Deprecated\n    public void XWiki.setTest(boolean test)\n    {\n        this.test = test;\n    }\n\n    \/**\n     * @deprecated use {@link org.xwiki.localization.LocalizationManager} instead. From velocity you can access it using\n     *             the {@code $services.localization} binding, see {@code LocalizationScriptService}\n     *\/\n    @Deprecated\n    public String XWiki.parseMessage(XWikiContext context)\n    {\n        String message = (String) context.get(\"message\");\n        if (message == null) {\n            return null;\n        }\n\n        return parseMessage(message, context);\n    }\n\n    \/**\n     * @deprecated use {@link org.xwiki.localization.LocalizationManager} instead. From velocity you can access it using\n     *             the {@code $services.localization} binding, see {@code LocalizationScriptService}\n     *\/\n    @Deprecated\n    public String XWiki.parseMessage(String id, XWikiContext context)\n    {\n        XWikiMessageTool msg = context.getMessageTool();\n\n        List<?> parameters = (List<?>) context.get(\"messageParameters\");\n\n        String translatedMessage;\n        if (parameters != null) {\n            translatedMessage = msg.get(id, parameters);\n        } else {\n            translatedMessage = msg.get(id);\n        }\n\n        return parseContent(translatedMessage, context);\n    }\n\n    public String XWiki.getFlash(String url, String width, String height, XWikiContext context)\n    {\n        VelocityContext vorigcontext = ((VelocityContext) context.get(\"vcontext\"));\n        try {\n            VelocityContext vcontext = (VelocityContext) vorigcontext.clone();\n            vcontext.put(\"flashurl\", url);\n            vcontext.put(\"width\", width);\n            vcontext.put(\"height\", height);\n            context.put(\"vcontext\", vcontext);\n\n            return parseTemplate(\"flash.vm\", context);\n        } finally {\n            context.put(\"vcontext\", vorigcontext);\n        }\n    }\n\n}\n","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"37cd8a61665744332bc32efcbe1f5a627c3ac327","subject":"US5156 SecurityEvents not being written to sli.securityEvent","message":"US5156 SecurityEvents not being written to sli.securityEvent\n","repos":"inbloom\/secure-data-service,inbloom\/secure-data-service,inbloom\/secure-data-service,inbloom\/secure-data-service,inbloom\/secure-data-service","old_file":"sli\/api\/src\/main\/java\/org\/slc\/sli\/aspect\/LoggerCarrierAspect.aj","new_file":"sli\/api\/src\/main\/java\/org\/slc\/sli\/aspect\/LoggerCarrierAspect.aj","new_contents":"\/*\n * Copyright 2012 Shared Learning Collaborative, LLC\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.slc.sli.aspect;\n\nimport java.util.HashMap;\nimport java.util.Map;\n\nimport org.slf4j.LoggerFactory;\nimport org.springframework.beans.factory.annotation.Autowired;\n\nimport org.slc.sli.common.util.logging.SecurityEvent;\nimport org.slc.sli.common.util.tenantdb.TenantContext;\nimport org.slc.sli.domain.Entity;\nimport org.slc.sli.domain.Repository;\n\n\n\npublic aspect LoggerCarrierAspect {\n\n    declare parents : (org.slc.sli.api..* && !java.lang.Enum+ && !org.slc.sli.api.util.SecurityUtil.SecurityTask+ && !org.slc.sli.api.util.PATCH && !org.slc.sli.api.security.RightsAllowed)  implements LoggerCarrier;\n\n    @Autowired\n    private Repository<Entity> mongoEntityRepository;\n\n\tpublic void LoggerCarrier.debug(String msg) {\n        LoggerFactory.getLogger(this.getClass()).debug(msg);\n    }\n\n\n\n\tpublic Repository<Entity> getMongoEntityRepository() {\n\t\treturn mongoEntityRepository;\n\t}\n\n\n\n\tpublic void setMongoEntityRepository(Repository<Entity> mongoEntityRepository) {\n\t\tthis.mongoEntityRepository = mongoEntityRepository;\n\t}\n\n\n\n\tpublic void LoggerCarrier.info(String msg) {\n        LoggerFactory.getLogger(this.getClass()).info(msg);\n    }\n\n    public void LoggerCarrier.warn(String msg) {\n        LoggerFactory.getLogger(this.getClass()).warn(msg);\n    }\n\n    public void LoggerCarrier.debug(String msg, Object... params) {\n        LoggerFactory.getLogger(this.getClass()).debug(msg, params);\n    }\n\n    public void LoggerCarrier.info(String msg, Object... params) {\n        LoggerFactory.getLogger(this.getClass()).info(msg, params);\n    }\n\n    public void LoggerCarrier.warn(String msg, Object... params) {\n        LoggerFactory.getLogger(this.getClass()).warn(msg, params);\n    }\n\n    public void LoggerCarrier.error(String msg, Object... params) {\n        LoggerFactory.getLogger(this.getClass()).error(msg, params);\n    }\n\n    public void LoggerCarrier.error(String msg, Throwable x) {\n        LoggerFactory.getLogger(this.getClass()).error(msg, x);\n    }\n\n    public void LoggerCarrier.auditLog(SecurityEvent event) {\n        LoggerFactory.getLogger(\"audit\").info(event.toString());\n    }\n    \n\n    public void LoggerCarrier.audit(SecurityEvent event) {\n        LoggerFactory.getLogger(\"audit\").info(event.toString());\n    \tRepository<Entity> mer= LoggerCarrierAspect.aspectOf().getMongoEntityRepository();\n    \tif(mer != null) {\n    \t\tMap<String, Object> metadata = new HashMap<String, Object>();\n    \t\tmetadata.put(\"tenantId\", event.getTenantId());\n    \t    mer.create(\"securityEvent\", event.getProperties(), metadata, \"securityEvent\");\n    \t} else {\n            LoggerFactory.getLogger(\"audit\").info(\"[Could not log SecurityEvent to mongo!]\");\n        }\n    }\n\n}\n","old_contents":"\/*\n * Copyright 2012 Shared Learning Collaborative, LLC\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.slc.sli.aspect;\n\nimport java.util.HashMap;\nimport java.util.Map;\n\nimport org.slf4j.LoggerFactory;\nimport org.springframework.beans.factory.annotation.Autowired;\n\nimport org.slc.sli.common.util.logging.SecurityEvent;\nimport org.slc.sli.common.util.tenantdb.TenantContext;\nimport org.slc.sli.domain.Entity;\nimport org.slc.sli.domain.Repository;\n\n\n\npublic aspect LoggerCarrierAspect {\n\n    declare parents : (org.slc.sli.api..* && !java.lang.Enum+ && !org.slc.sli.api.util.SecurityUtil.SecurityTask+ && !org.slc.sli.api.util.PATCH && !org.slc.sli.api.security.RightsAllowed)  implements LoggerCarrier;\n\n    @Autowired\n    private Repository<Entity> mongoEntityRepository;\n\n\tpublic void LoggerCarrier.debug(String msg) {\n        LoggerFactory.getLogger(this.getClass()).debug(msg);\n    }\n\n\n\n\tpublic Repository<Entity> getMongoEntityRepository() {\n\t\treturn mongoEntityRepository;\n\t}\n\n\n\n\tpublic void setMongoEntityRepository(Repository<Entity> mongoEntityRepository) {\n\t\tthis.mongoEntityRepository = mongoEntityRepository;\n\t}\n\n\n\n\tpublic void LoggerCarrier.info(String msg) {\n        LoggerFactory.getLogger(this.getClass()).info(msg);\n    }\n\n    public void LoggerCarrier.warn(String msg) {\n        LoggerFactory.getLogger(this.getClass()).warn(msg);\n    }\n\n    public void LoggerCarrier.debug(String msg, Object... params) {\n        LoggerFactory.getLogger(this.getClass()).debug(msg, params);\n    }\n\n    public void LoggerCarrier.info(String msg, Object... params) {\n        LoggerFactory.getLogger(this.getClass()).info(msg, params);\n    }\n\n    public void LoggerCarrier.warn(String msg, Object... params) {\n        LoggerFactory.getLogger(this.getClass()).warn(msg, params);\n    }\n\n    public void LoggerCarrier.error(String msg, Object... params) {\n        LoggerFactory.getLogger(this.getClass()).error(msg, params);\n    }\n\n    public void LoggerCarrier.error(String msg, Throwable x) {\n        LoggerFactory.getLogger(this.getClass()).error(msg, x);\n    }\n\n    public void LoggerCarrier.auditLog(SecurityEvent event) {\n        LoggerFactory.getLogger(\"audit\").info(event.toString());\n    }\n    \n\n    public void LoggerCarrier.audit(SecurityEvent event) {\n    \tRepository<Entity> mer= LoggerCarrierAspect.aspectOf().getMongoEntityRepository();\n    \tif(mer != null) {\n    \t\tMap<String, Object> metadata = new HashMap<String, Object>();\n    \t\tmetadata.put(\"tenantId\", event.getTenantId());\n    \t    mer.create(\"securityEvent\", event.getProperties(), metadata, \"securityEvent\");\n    \t}\n    }\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"2f3a687039cde7c225c9921c551f1f3bc349a2f6","subject":"Check the result is not null before puting something inside","message":"Check the result is not null before puting something inside\n","repos":"christophe-w\/parallelj.runtime,awltech\/org.parallelj","old_file":"org.parallelj\/parallelj\/parallelj-launching\/src\/main\/java\/org\/parallelj\/launching\/quartz\/ProgramJobsAdapter.aj","new_file":"org.parallelj\/parallelj\/parallelj-launching\/src\/main\/java\/org\/parallelj\/launching\/quartz\/ProgramJobsAdapter.aj","new_contents":"\/*\n *     ParallelJ, framework for parallel computing\n *\n *     Copyright (C) 2010, 2011, 2012 Atos Worldline or third-party contributors as\n *     indicated by the @author tags or express copyright attribution\n *     statements applied by the authors.\n *\n *     This library is free software; you can redistribute it and\/or\n *     modify it under the terms of the GNU Lesser General Public\n *     License as published by the Free Software Foundation; either\n *     version 2.1 of the License.\n *\n *     This library is distributed in the hope that it will be useful,\n *     but WITHOUT ANY WARRANTY; without even the implied warranty of\n *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n *     Lesser General Public License for more details.\n *\n *     You should have received a copy of the GNU Lesser General Public\n *     License along with this library; if not, write to the Free Software\n *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n *\/\npackage org.parallelj.launching.quartz;\n\nimport java.lang.reflect.InvocationTargetException;\nimport java.lang.reflect.Method;\n\nimport org.parallelj.Programs;\nimport org.parallelj.internal.kernel.KCall;\nimport org.parallelj.internal.reflect.ProgramAdapter.Adapter;\nimport org.parallelj.launching.LaunchingMessageKind;\nimport org.parallelj.launching.ReturnCodes;\nimport org.quartz.Job;\nimport org.quartz.JobDataMap;\nimport org.quartz.JobExecutionContext;\nimport org.quartz.JobExecutionException;\n\n\/**\n * Implements the Job.execute(..) method\n * \n * \n *\/\nprivileged public aspect ProgramJobsAdapter percflow (execution(public void Job+.execute(..) throws JobExecutionException)) {\n\n\t\/**\n\t * The JobExecutionContext where get Program's arguments ant where to put\n\t * the Result.\n\t *\/\n\tpublic JobExecutionContext context;\n\n\t\/*\n\t * The Aspect JobsAdapter must be passed before this.\n\t *\/\n\tdeclare precedence :\n\t\torg.parallelj.launching.quartz.JobsAdapter;\n\n\tprivate Adapter adpater;\n\n\t\/**\n\t * Launch a Program and initialize the Result as a JobDataMap.\n\t * \n\t * @param self\n\t * @param context\n\t * @throws JobExecutionException\n\t *\/\n\tvoid around(Job self, JobExecutionContext context)\n\t\t\tthrows JobExecutionException : \n\t\texecution( public void  Job+.execute(..) throws JobExecutionException) \n\t\t\t&& (within(@org.parallelj.Program *) || within(JobsAdapter)) \n\t\t\t\t&& args(context) && this(self) {\n\t\tthis.adpater = (Adapter) self;\n\t\tthis.context = context;\n\t\tJobDataMap jobDataMap = new JobDataMap();\n\t\tcontext.setResult(jobDataMap);\n\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.SUCCESS);\n\t\ttry {\n\t\t\tproceed(self, context);\n\n\t\t\ttry {\n\t\t\t\tPrograms.as((Adapter) self).execute().join();\n\t\t\t\tProgramFieldsBinder.getProgramOutputFields(this, context);\n\t\t\t} catch (IllegalAccessException e) {\n\t\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.FAILURE);\n\t\t\t} catch (NoSuchFieldException e) {\n\t\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.FAILURE);\n\t\t\t}\n\t\t} catch (InvocationTargetException e) {\n\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.FAILURE);\n\t\t}\n\t}\n\n\t\/**\n\t * Intercept Exception thrown in RunnableProcedure\/CallableProcedure for tracing. If an\n\t * Exception is thrown, the return code of a Launch becomes FAILURE.\n\t * \n\t * @param self\n\t *\/\n    pointcut enter(KCall _kCall): call(* org.parallelj.internal.kernel.callback.Entry+.enter(KCall)) && args(_kCall);\n    pointcut invoke(): call(public Object Method.invoke(Object, ..)) && !within(ProgramJobsAdapter);\n    after(Object oo, KCall _kCall) throwing (InvocationTargetException ite) : \n    \tinvoke() && args(oo, ..) && cflow(enter(_kCall)) {\n\t\t\n\t\tLaunchingMessageKind.ELAUNCH0002.format(this.adpater, ite);\n\t\tif (this.context.getResult() != null && this.context.getResult() instanceof JobDataMap) {\n\t\t\t((JobDataMap) this.context.getResult()).put(\n\t\t\t\t\tQuartzUtils.RETURN_CODE, ReturnCodes.FAILURE);\n\t\t}\n    }\n}\n","old_contents":"\/*\n *     ParallelJ, framework for parallel computing\n *\n *     Copyright (C) 2010, 2011, 2012 Atos Worldline or third-party contributors as\n *     indicated by the @author tags or express copyright attribution\n *     statements applied by the authors.\n *\n *     This library is free software; you can redistribute it and\/or\n *     modify it under the terms of the GNU Lesser General Public\n *     License as published by the Free Software Foundation; either\n *     version 2.1 of the License.\n *\n *     This library is distributed in the hope that it will be useful,\n *     but WITHOUT ANY WARRANTY; without even the implied warranty of\n *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n *     Lesser General Public License for more details.\n *\n *     You should have received a copy of the GNU Lesser General Public\n *     License along with this library; if not, write to the Free Software\n *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n *\/\npackage org.parallelj.launching.quartz;\n\nimport java.lang.reflect.InvocationTargetException;\nimport java.lang.reflect.Method;\n\nimport org.parallelj.Programs;\nimport org.parallelj.internal.kernel.KCall;\nimport org.parallelj.internal.reflect.ProgramAdapter.Adapter;\nimport org.parallelj.launching.LaunchingMessageKind;\nimport org.parallelj.launching.ReturnCodes;\nimport org.quartz.Job;\nimport org.quartz.JobDataMap;\nimport org.quartz.JobExecutionContext;\nimport org.quartz.JobExecutionException;\n\n\/**\n * Implements the Job.execute(..) method\n * \n * \n *\/\nprivileged public aspect ProgramJobsAdapter percflow (execution(public void Job+.execute(..) throws JobExecutionException)) {\n\n\t\/**\n\t * The JobExecutionContext where get Program's arguments ant where to put\n\t * the Result.\n\t *\/\n\tpublic JobExecutionContext context;\n\n\t\/*\n\t * The Aspect JobsAdapter must be passed before this.\n\t *\/\n\tdeclare precedence :\n\t\torg.parallelj.launching.quartz.JobsAdapter;\n\n\tprivate Adapter adpater;\n\n\t\/**\n\t * Launch a Program and initialize the Result as a JobDataMap.\n\t * \n\t * @param self\n\t * @param context\n\t * @throws JobExecutionException\n\t *\/\n\tvoid around(Job self, JobExecutionContext context)\n\t\t\tthrows JobExecutionException : \n\t\texecution( public void  Job+.execute(..) throws JobExecutionException) \n\t\t\t&& (within(@org.parallelj.Program *) || within(JobsAdapter)) \n\t\t\t\t&& args(context) && this(self) {\n\t\tthis.adpater = (Adapter) self;\n\t\tthis.context = context;\n\t\tJobDataMap jobDataMap = new JobDataMap();\n\t\tcontext.setResult(jobDataMap);\n\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.SUCCESS);\n\t\ttry {\n\t\t\tproceed(self, context);\n\n\t\t\ttry {\n\t\t\t\tPrograms.as((Adapter) self).execute().join();\n\t\t\t\tProgramFieldsBinder.getProgramOutputFields(this, context);\n\t\t\t} catch (IllegalAccessException e) {\n\t\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.FAILURE);\n\t\t\t} catch (NoSuchFieldException e) {\n\t\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.FAILURE);\n\t\t\t}\n\t\t} catch (InvocationTargetException e) {\n\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.FAILURE);\n\t\t}\n\t}\n\n\t\/**\n\t * Intercept Exception thrown in RunnableProcedure\/CallableProcedure for tracing. If an\n\t * Exception is thrown, the return code of a Launch becomes FAILURE.\n\t * \n\t * @param self\n\t *\/\n    pointcut enter(KCall _kCall): call(* org.parallelj.internal.kernel.callback.Entry+.enter(KCall)) && args(_kCall);\n    pointcut invoke(): call(public Object Method.invoke(Object, ..)) && !within(ProgramJobsAdapter);\n    after(Object oo, KCall _kCall) throwing (InvocationTargetException ite) : \n    \tinvoke() && args(oo, ..) && cflow(enter(_kCall)) {\n\t\t\n\t\tLaunchingMessageKind.ELAUNCH0002.format(this.adpater, ite);\n\t\t((JobDataMap) this.context.getResult()).put(\n\t\t\t\tQuartzUtils.RETURN_CODE, ReturnCodes.FAILURE);\n\/\/\t\tthis.result = ReturnCodes.FAILURE.name();\n\/\/\t\ttrack(_kCall, oo, false, ite);\n    }\n}\n","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"f3ecb17542842163e680c4f4b53c3158cdfaa007","subject":"'cflow' changed to 'within' to specify where the method is called","message":"'cflow' changed to 'within' to specify where the method is called","repos":"selig\/qea","old_file":"code\/qea\/src\/benchmark\/competition\/java\/jUnitRV_MMT\/monitoring\/JUnitRV_MMTThreeAspect.aj","new_file":"code\/qea\/src\/benchmark\/competition\/java\/jUnitRV_MMT\/monitoring\/JUnitRV_MMTThreeAspect.aj","new_contents":"package benchmark.competition.java.jUnitRV_MMT.monitoring;\r\n\r\nimport java.util.concurrent.locks.Lock;\r\n\r\nimport monitoring.impl.MonitorFactory;\r\nimport monitoring.intf.Monitor;\r\nimport properties.Property;\r\nimport properties.competition.JavaRV_mmt;\r\nimport structure.impl.other.Verdict;\r\nimport structure.intf.QEA;\r\nimport benchmark.competition.java.jUnitRV_MMT.ExampleLocking;\r\n\r\npublic aspect JUnitRV_MMTThreeAspect {\r\n\r\n\tprivate final Monitor monitor;\r\n\r\n\tprivate final int RUN = 1;\r\n\tprivate final int LOCK_TRUE = 2;\r\n\tprivate final int UNLOCK = 3;\r\n\tprivate final int ACTION = 4;\r\n\r\n\tpublic JUnitRV_MMTThreeAspect() {\r\n\t\tQEA qea = new JavaRV_mmt().make(Property.JAVARV_MMT_THREE);\r\n\t\tmonitor = MonitorFactory.create(qea);\r\n\t}\r\n\r\n\tpointcut run(ExampleLocking thread) : execution(void ExampleLocking.run())\r\n\t\t&& target(thread);\r\n\r\n\tpointcut action(ExampleLocking thread) : call(void ExampleLocking.action())\r\n\t\t&& target(thread);\r\n\r\n\tbefore(ExampleLocking thread) : run(thread) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(RUN, thread);\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [thread=\"\r\n\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t\tSystem.exit(0);\r\n\t\t}\r\n\t};\r\n\r\n\tboolean around(Lock lockObj, ExampleLocking thread) :\r\n\t\tcall(boolean Lock.tryLock()) && target(lockObj) && this(thread) \r\n\t\t&& within(ExampleLocking) {\r\n\r\n\t\tboolean result = false;\r\n\t\t\/\/ We perform the lock and the monitor step as an atomic action\r\n\t\t\/\/ i.e. whilst holding the lockObj, so that we cannot be interrupted\r\n\t\tsynchronized (lockObj) {\r\n\t\t\tresult = proceed(lockObj, thread);\r\n\t\t\tif (result) {\r\n\t\t\t\tVerdict verdict = null;\r\n\t\t\t\t\/\/ Ordering between lockObj and monitor important\r\n\t\t\t\tsynchronized (monitor) {\r\n\t\t\t\t\tverdict = monitor.step(LOCK_TRUE, thread);\r\n\t\t\t\t}\r\n\t\t\t\tif (verdict == Verdict.FAILURE) {\r\n\t\t\t\t\tSystem.err\r\n\t\t\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [thread=\"\r\n\t\t\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t\t\t\tSystem.exit(0);\r\n\t\t\t\t}\r\n\r\n\t\t\t}\r\n\t\t}\r\n\t\treturn result;\r\n\t};\r\n\r\n\tvoid around(Lock lockObj, ExampleLocking thread) :\r\n\t\tcall(void Lock.unlock()) && target(lockObj) && this(thread)\r\n\t\t&& within(ExampleLocking) {\r\n\r\n\t\t\/\/ We perform the unlock and the monitor step as an atomic action\r\n\t\t\/\/ i.e. whilst holding the lockObj, so that we cannot be interrupted\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (lockObj) {\r\n\t\t\tproceed(lockObj, thread);\r\n\t\t\t\/\/ Ordering between lockObj and monitor important\r\n\t\t\tsynchronized (monitor) {\r\n\t\t\t\tverdict = monitor.step(UNLOCK, thread);\r\n\t\t\t}\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [thread=\"\r\n\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t\tSystem.exit(0);\r\n\t\t}\r\n\t};\r\n\r\n\tbefore(ExampleLocking thread) : action(thread) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(ACTION, thread);\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [id=\"\r\n\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t\tSystem.exit(0);\r\n\t\t}\r\n\t};\r\n\r\n\tpointcut endOfProgram() : execution(void ExampleLocking.main(String...));\r\n\r\n\tafter() : endOfProgram() {\r\n\t\tVerdict verdict = monitor.end();\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t} else {\r\n\t\t\tSystem.err.println(\"Property JUnitRV (MMT) 3 satisfied\");\r\n\t\t}\r\n\t}\r\n\r\n}\r\n","old_contents":"package benchmark.competition.java.jUnitRV_MMT.monitoring;\r\n\r\nimport java.util.concurrent.locks.Lock;\r\n\r\nimport monitoring.impl.MonitorFactory;\r\nimport monitoring.intf.Monitor;\r\nimport properties.Property;\r\nimport properties.competition.JavaRV_mmt;\r\nimport structure.impl.other.Verdict;\r\nimport structure.intf.QEA;\r\nimport benchmark.competition.java.jUnitRV_MMT.ExampleLocking;\r\n\r\npublic aspect JUnitRV_MMTThreeAspect {\r\n\r\n\tprivate final Monitor monitor;\r\n\r\n\tprivate final int RUN = 1;\r\n\tprivate final int LOCK_TRUE = 2;\r\n\tprivate final int UNLOCK = 3;\r\n\tprivate final int ACTION = 4;\r\n\r\n\tpublic JUnitRV_MMTThreeAspect() {\r\n\t\tQEA qea = new JavaRV_mmt().make(Property.JAVARV_MMT_THREE);\r\n\t\tmonitor = MonitorFactory.create(qea);\r\n\t}\r\n\r\n\tpointcut run(ExampleLocking thread) : execution(void ExampleLocking.run())\r\n\t\t&& target(thread);\r\n\r\n\tpointcut action(ExampleLocking thread) : call(void ExampleLocking.action())\r\n\t\t&& target(thread);\r\n\r\n\tbefore(ExampleLocking thread) : run(thread) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(RUN, thread);\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [thread=\"\r\n\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t\tSystem.exit(0);\r\n\t\t}\r\n\t};\r\n\r\n\tboolean around(Lock lockObj, ExampleLocking thread) :\r\n\t\t\tcall(boolean Lock.tryLock())\r\n\t\t\t&& cflow(call(boolean ExampleLocking.lock())) && target(lockObj)\r\n\t\t\t&& this(thread) {\r\n\r\n\t\tboolean result = false;\r\n\t\t\/\/ We perform the lock and the monitor step as an atomic action\r\n\t\t\/\/ i.e. whilst holding the lockObj, so that we cannot be interrupted\r\n\t\tsynchronized (lockObj) {\r\n\t\t\tresult = proceed(lockObj, thread);\t\t\r\n\t\t\tif (result) {\r\n\t\t\t\tVerdict verdict = null;\r\n\t\t\t\t\/\/ Ordering between lockObj and monitor important\r\n\t\t\t\tsynchronized (monitor) {\r\n\t\t\t\t\tverdict = monitor.step(LOCK_TRUE, thread);\r\n\t\t\t\t}\r\n\t\t\t\tif (verdict == Verdict.FAILURE) {\r\n\t\t\t\t\tSystem.err\r\n\t\t\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [thread=\"\r\n\t\t\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t\t\t\tSystem.exit(0);\r\n\t\t\t\t}\r\n\t\r\n\t\t\t}\r\n\t\t}\r\n\t\treturn result;\r\n\t};\r\n\r\n\tvoid around(Lock lockObj, ExampleLocking thread) :\r\n\t\tcall(void Lock.unlock()) && cflow(call(void ExampleLocking.unlock()))\r\n\t\t&& target(lockObj) && this(thread) {\r\n\r\n\t\t\/\/ We perform the unlock and the monitor step as an atomic action\r\n\t\t\/\/ i.e. whilst holding the lockObj, so that we cannot be interrupted\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (lockObj) {\r\n\t\t\tproceed(lockObj, thread);\t\r\n\t\t\t\/\/ Ordering between lockObj and monitor important\r\n\t\t\tsynchronized (monitor) {\r\n\t\t\t\tverdict = monitor.step(UNLOCK, thread);\r\n\t\t\t}\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [thread=\"\r\n\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t\tSystem.exit(0);\r\n\t\t}\r\n\t};\r\n\r\n\tbefore(ExampleLocking thread) : action(thread) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(ACTION, thread);\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [id=\"\r\n\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t\tSystem.exit(0);\r\n\t\t}\r\n\t};\r\n\t\r\n\tpointcut endOfProgram() : execution(void ExampleLocking.main(String...));\r\n\r\n\tafter() : endOfProgram() {\r\n\t\tVerdict verdict = monitor.end();\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t} else {\r\n\t\t\tSystem.err.println(\"Property JUnitRV (MMT) 3 satisfied\");\r\n\t\t}\r\n\t}\r\n\r\n}\r\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"74578cfd5a873d5a432c1f1d40b8e3ed205f5de7","subject":"removed comment","message":"removed comment\n","repos":"wpopielarski\/scala-ide,andrey-ilinykh\/scala-ide,Duhemm\/scala-ide,scala-ide\/scala-ide,dragos\/scala-ide,andrey-ilinykh\/scala-ide,romanowski\/scala-ide,wpopielarski\/scala-ide,mlangc\/scala-ide,pilipolio\/scala-ide,aleksi-lukkarinen\/scala-ide,pilipolio\/scala-ide,scala-ide\/scala-ide,Kwestor\/scala-ide,Duhemm\/scala-ide,sschaef\/scala-ide,pilipolio\/scala-ide,mlangc\/scala-ide,sschaef\/scala-ide,wpopielarski\/scala-ide,mlangc\/scala-ide,stephenh\/scala-ide,romanowski\/scala-ide,Kwestor\/scala-ide,Duhemm\/scala-ide,mlangc\/scala-ide,andrey-ilinykh\/scala-ide,dragos\/scala-ide,pilipolio\/scala-ide,romanowski\/scala-ide,dragos\/scala-ide,scala-ide\/scala-ide,sschaef\/scala-ide,stephenh\/scala-ide,Kwestor\/scala-ide,wpopielarski\/scala-ide,romanowski\/scala-ide,aleksi-lukkarinen\/scala-ide,sschaef\/scala-ide,aleksi-lukkarinen\/scala-ide,andrey-ilinykh\/scala-ide,Duhemm\/scala-ide,Kwestor\/scala-ide,aleksi-lukkarinen\/scala-ide,dragos\/scala-ide,scala-ide\/scala-ide,stephenh\/scala-ide,stephenh\/scala-ide","old_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/debug\/JDIModelPresentationAspect.aj","new_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/debug\/JDIModelPresentationAspect.aj","new_contents":"package scala.tools.eclipse.contribution.weaving.jdt.debug;\n\nimport org.eclipse.ui.IEditorInput;\nimport org.eclipse.jdt.internal.ui.javaeditor.IClassFileEditorInput;\nimport org.eclipse.jdt.core.IClassFile;\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaClassFile;\nimport org.eclipse.jdt.internal.debug.ui.JDIModelPresentation;\n\n\/**\n * Fixes ticket 1000494. \n * @see http:\/\/www.assembla.com\/spaces\/scala-ide\/tickets\/1000494-cannot-set-breakpoint-for-files-opened-via-the-stacktrace-printed-in-the-console\n *\/\n@SuppressWarnings(\"restriction\")\npublic aspect JDIModelPresentationAspect {\n\n  pointcut getEditorId(JDIModelPresentation jdiModelPresentation, IEditorInput input, Object inputObject): \n    args(input, inputObject) \n    && execution(String JDIModelPresentation.getEditorId(IEditorInput, Object))\n    && target(jdiModelPresentation);\n\n  String around(JDIModelPresentation jdiModelPresentation, IEditorInput input, Object inputObject): \n    getEditorId(jdiModelPresentation, input, inputObject) {\n    if(input instanceof IClassFileEditorInput) {\n      IClassFile classFile = ((IClassFileEditorInput) input).getClassFile();\n      if(classFile instanceof IScalaClassFile) {\n        return \"scala.tools.eclipse.ScalaClassFileEditor\";\n      }\n    }\n    return proceed(jdiModelPresentation, input, inputObject);\n  }\n\n}\n","old_contents":"package scala.tools.eclipse.contribution.weaving.jdt.debug;\n\nimport org.eclipse.ui.IEditorInput;\nimport org.eclipse.jdt.internal.ui.javaeditor.IClassFileEditorInput;\nimport org.eclipse.jdt.core.IClassFile;\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaClassFile;\nimport org.eclipse.jdt.internal.debug.ui.JDIModelPresentation;\n\n\/**\n * Fixes ticket 1000494. \n * @see http:\/\/www.assembla.com\/spaces\/scala-ide\/tickets\/1000494-cannot-set-breakpoint-for-files-opened-via-the-stacktrace-printed-in-the-console\n *\/\n@SuppressWarnings(\"restriction\")\npublic aspect JDIModelPresentationAspect {\n  \/\/FIXME: Can we share code with ClassFileEditorIdAspect ?! How? (duplication!) \n  pointcut getEditorId(JDIModelPresentation jdiModelPresentation, IEditorInput input, Object inputObject): \n    args(input, inputObject) \n    && execution(String JDIModelPresentation.getEditorId(IEditorInput, Object))\n    && target(jdiModelPresentation);\n\n  String around(JDIModelPresentation jdiModelPresentation, IEditorInput input, Object inputObject): \n    getEditorId(jdiModelPresentation, input, inputObject) {\n    if(input instanceof IClassFileEditorInput) {\n      IClassFile classFile = ((IClassFileEditorInput) input).getClassFile();\n      if(classFile instanceof IScalaClassFile) {\n        return \"scala.tools.eclipse.ScalaClassFileEditor\";\n      }\n    }\n    return proceed(jdiModelPresentation, input, inputObject);\n  }\n\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"2315d130464fa56ee970161e179e9d688d77886a","subject":"Fix syntax error due to missing semicolon","message":"Fix syntax error due to missing semicolon","repos":"tlaplus\/tlaplus,lemmy\/tlaplus,lemmy\/tlaplus,tlaplus\/tlaplus,lemmy\/tlaplus,lemmy\/tlaplus,tlaplus\/tlaplus,tlaplus\/tlaplus","old_file":"tlatools\/src-aj\/tlc2\/tool\/distributed\/RMIMethodMonitorAspect.aj","new_file":"tlatools\/src-aj\/tlc2\/tool\/distributed\/RMIMethodMonitorAspect.aj","new_contents":"package tlc2.tool.distributed;\n\npublic aspect RMIMethodMonitorAspect {\n\t\n\t\/\/ catch all method calls to RMI methods\n\tpointcut callToRemoteMethod() : \n\t\t   execution(* tlc2.tool.distributed.InternRMI.*(..))\n\t\t|| execution(* tlc2.tool.distributed.TLCServerRMI.*(..))\n\t\t|| execution(* tlc2.tool.distributed.TLCWorkerRMI.*(..))\n\t\t|| execution(* tlc2.tool.distributed.fp.FPSetRMI.*(..));\n\t\n\tbefore(): (callToRemoteMethod()) {\n\t\tRMIMethodMonitor.entering(thisJoinPoint);\n\t}\n}\n","old_contents":"package tlc2.tool.distributed;\n\npublic aspect RMIMethodMonitorAspect {\n\t\n\t\/\/ catch all method calls to RMI methods\n\tpointcut callToRemoteMethod() : \n\t\t   execution(* tlc2.tool.distributed.InternRMI.*(..))\n\t\t|| execution(* tlc2.tool.distributed.TLCServerRMI.*(..))\n\t\t|| execution(* tlc2.tool.distributed.TLCWorkerRMI.*(..))\n\t\t|| execution(* tlc2.tool.distributed.fp.FPSetRMI.*(..))\n\t\n\tbefore(): (callToRemoteMethod()) {\n\t\tRMIMethodMonitor.entering(thisJoinPoint);\n\t}\n}\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"a521ac58ab69e8f6ec975d43505e5fb6e5d7690e","subject":"added getRollbackOnly() handling to EntityTransactionAspect","message":"added getRollbackOnly() handling to EntityTransactionAspect\n","repos":"palava\/palava-jpa-aspectj","old_file":"src\/main\/java\/de\/cosmocode\/palava\/jpa\/aspectj\/EntityTransactionAspect.aj","new_file":"src\/main\/java\/de\/cosmocode\/palava\/jpa\/aspectj\/EntityTransactionAspect.aj","new_contents":"\/**\n * palava - a java-php-bridge\n * Copyright (C) 2007-2010  CosmoCode GmbH\n *\n * This program is free software; you can redistribute it and\/or\n * modify it under the terms of the GNU General Public License\n * as published by the Free Software Foundation; either version 2\n * of the License, or (at your option) any later version.\n *\n * This program is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n * along with this program; if not, write to the Free Software\n * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.\n *\/\n\npackage de.cosmocode.palava.jpa.aspectj;\n\nimport javax.persistence.EntityManager;\nimport javax.persistence.EntityTransaction;\nimport javax.persistence.PersistenceException;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\nimport de.cosmocode.palava.jpa.Transactional;\n\npublic final aspect EntityTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(EntityTransactionAspect.class);\n\n    private Provider<EntityManager> currentManager;\n    \n    @Inject\n    public void setProvider(Provider<EntityManager> manager) {\n        this.currentManager = Preconditions.checkNotNull(manager, \"Manager\");\n    }\n    \n    pointcut transactional(): execution(@Transactional * *.*(..));\n\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        final EntityManager manager = currentManager.get();\n        LOG.trace(\"Retrieved entitymanager {}\", manager);\n        final EntityTransaction tx = manager.getTransaction();\n        LOG.trace(\"Using transaction {}\", tx);\n        final boolean localTx = !tx.isActive();\n        \n        if (localTx) {\n            LOG.trace(\"Beginning automatic transaction\");\n            tx.begin();\n        } else {\n            LOG.trace(\"Transaction already active\");\n        }\n        \n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (RuntimeException e) {\n            LOG.error(\"Exception inside automatic transaction context\", e);\n            tx.rollback();\n            throw e;\n        }\n        \n        if (localTx && tx.isActive()) {\n            if (tx.getRollbackOnly()) {\n                LOG.trace(\"Transaction was marked as rollback only. Rolling back...\");\n                tx.rollback();\n            } else {\n                try {\n                    tx.commit();\n                    LOG.trace(\"Committed automatic transaction\");\n                } catch (PersistenceException e) {\n                    LOG.error(\"Commit in automatic transaction context failed\", e);\n                    tx.rollback();\n                    throw e;\n                }\n            }\n        }\n        \n        return returnValue;\n    }\n    \n}\n","old_contents":"\/**\n * palava - a java-php-bridge\n * Copyright (C) 2007-2010  CosmoCode GmbH\n *\n * This program is free software; you can redistribute it and\/or\n * modify it under the terms of the GNU General Public License\n * as published by the Free Software Foundation; either version 2\n * of the License, or (at your option) any later version.\n *\n * This program is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n * along with this program; if not, write to the Free Software\n * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.\n *\/\n\npackage de.cosmocode.palava.jpa.aspectj;\n\nimport javax.persistence.EntityManager;\nimport javax.persistence.EntityTransaction;\nimport javax.persistence.PersistenceException;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\nimport de.cosmocode.palava.jpa.Transactional;\n\npublic final aspect EntityTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(EntityTransactionAspect.class);\n\n    private Provider<EntityManager> currentManager;\n    \n    @Inject\n    public void setProvider(Provider<EntityManager> manager) {\n        this.currentManager = Preconditions.checkNotNull(manager, \"Manager\");\n    }\n    \n    pointcut transactional(): execution(@Transactional * *.*(..));\n\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        final EntityManager manager = currentManager.get();\n        LOG.trace(\"Retrieved entitymanager {}\", manager);\n        final EntityTransaction tx = manager.getTransaction();\n        LOG.trace(\"Using transaction {}\", tx);\n        final boolean localTx = !tx.isActive();\n        \n        if (localTx) {\n            LOG.trace(\"Beginning automatic transaction\");\n            tx.begin();\n        } else {\n            LOG.trace(\"Transaction already active\");\n        }\n        \n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (RuntimeException e) {\n            LOG.error(\"Exception inside automatic transaction context\", e);\n            tx.rollback();\n            throw e;\n        }\n        \n        try {\n            if (localTx && tx.isActive()) {\n                tx.commit();\n                LOG.trace(\"Committed automatic transaction\");\n            }\n            return returnValue;\n        } catch (PersistenceException e) {\n            LOG.error(\"Commit in automatic transaction context failed\", e);\n            tx.rollback();\n            throw e;\n        }\n    }\n    \n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"b3fde69df5e3f8e442652f7efc34c04b7222c9c3","subject":"sync ExportVmTemplateCommand with ovirt-sync","message":"sync ExportVmTemplateCommand with ovirt-sync\n","repos":"OpenUniversity\/ovirt-engine,OpenUniversity\/ovirt-engine,OpenUniversity\/ovirt-engine,OpenUniversity\/ovirt-engine,OpenUniversity\/ovirt-engine","old_file":"backend\/manager\/modules\/bll\/src\/main\/java\/org\/ovirt\/engine\/core\/bll\/Locks.aj","new_file":"backend\/manager\/modules\/bll\/src\/main\/java\/org\/ovirt\/engine\/core\/bll\/Locks.aj","new_contents":"\tpackage org.ovirt.engine.core.bll;\n\n\timport java.util.*;\n\t\n\timport org.ovirt.engine.core.common.action.LockProperties;\n\timport org.ovirt.engine.core.common.action.LockProperties.Scope;\n\timport org.ovirt.engine.core.common.locks.LockingGroup;\n\timport org.ovirt.engine.core.bll.CommandBase;\n\timport org.ovirt.engine.core.utils.lock.EngineLock;\n\timport org.ovirt.engine.core.common.utils.Pair;\n\timport org.ovirt.engine.core.common.action.VdcReturnValueBase;\n\timport org.ovirt.engine.core.common.businessentities.IVdsAsyncCommand;\n\timport org.ovirt.engine.core.common.errors.EngineMessage;\n\n\tpublic privileged aspect Locks {\n\n\t\tvoid around(CommandBase command): execution(* endActionInTransactionScope()) && this(command) {\n\t\t\ttry {\n\t          proceed(command);\n\t        }\n\t        finally {\n\t          command.freeLockEndAction();\n\t        }\n\t    }\n\t\n\t   boolean around(CommandBase command): execution(* internalCanDoAction()) && this(command) {\n\t        boolean result = false;\n\t        try {\n\t          result = proceed(command);\n\t        }\n\t        finally {\n\t          if (!result) {\n\t            command.freeLock();\n\t          }\n\t        }\n\t        return result;\n\t   }\n\n\t   void around(CommandBase command): execution(* freeLock()) && this(command) {\n            if (command.context.getLock() != null) {\n                command.getLockManager().releaseLock(command.context.getLock());\n                command.log.info(\"Lock freed to object '{}'\", command.context.getLock());\n                command.context.withLock(null);\n                \/\/ free other locks here to guarantee they will be freed only once\n                command.freeCustomLocks();\n            }\n        }\n\n\n\t    VdcReturnValueBase around(CommandBase command): execution(* executeAction()) && this(command) {\n\t        try {\n\t          return proceed(command);\n\t        }\n\t        finally {\n\t          command.freeLockExecute();\n\t        }\n\t    }\n\t\n\t    boolean around(CommandBase commandBase): execution(* CommandBase.acquireLock()) && this(commandBase) {\n\t        LockProperties lockProperties = commandBase.getLockProperties();\n\t        boolean returnValue = true;\n\t        if (!Scope.None.equals(lockProperties.getScope())) {\n\t            commandBase.releaseLocksAtEndOfExecute = Scope.Execution.equals(lockProperties.getScope());\n\t            if (!lockProperties.isWait()) {\n\t                returnValue = commandBase.acquireLockInternal();\n\t            } else {\n\t                commandBase.acquireLockAndWait();\n\t            }\n\t        }\n\t        return returnValue;\n\t    }\n\n\t\tboolean around(CommandBase command): execution(* acquireLockInternal()) && this(command) {\n\t        \/\/ if commandLock is null then we acquire new lock, otherwise probably we got lock from caller command.\n\t        if (command.context.getLock() == null) {\n\t            EngineLock lock = command.buildLock();\n\t            if (lock != null) {\n\t                Pair<Boolean, Set<String>> lockAcquireResult = command.getLockManager().acquireLock(lock);\n\t                if (lockAcquireResult.getFirst()) {\n\t                    command.log.info(\"Lock Acquired to object '{}'\", lock);\n\t                    command.context.withLock(lock);\n\t                } else {\n\t                    command.log.info(\"Failed to Acquire Lock to object '{}'\", lock);\n\t                    command.getReturnValue().getCanDoActionMessages()\n\t                    .addAll(command.extractVariableDeclarations(lockAcquireResult.getSecond()));\n\t                    return false;\n\t                }\n\t            }\n\t        }\n\t        return true;\n\t   }\n\n\t   void around(CommandBase command): execution(* acquireLockAndWait()) && this(command) {\n\t        \/\/ if commandLock is null then we acquire new lock, otherwise probably we got lock from caller command.\n\t         if (command.context.getLock() == null) {\n\t            Map<String, Pair<String, String>> exclusiveLocks = command.getExclusiveLocks();\n\t             if (exclusiveLocks != null) {\n\t                 EngineLock lock = new EngineLock(exclusiveLocks, null);\n\t                 command.getLockManager().acquireLockWait(lock);\n\t                 command.context.withLock(lock);\n\t            }\n\t         }\n\t    }\n\n\t\tVdcReturnValueBase around(CommandBase commandBase): execution(* endAction()) && this(commandBase) {\n\t        VdcReturnValueBase result = null;\n\t        try {\n\t            commandBase.initiateLockEndAction();\n\t            result = proceed(commandBase);\n\t        } finally {\n\t            commandBase.freeLockEndAction();\n\t        }\n\t                return result;\n\t        }\n\t\n\t   private void CommandBase.freeLockExecute() {\n\t        if (releaseLocksAtEndOfExecute || !getSucceeded() ||\n\t                (noAsyncOperations() && !(this instanceof IVdsAsyncCommand))) {\n\t            freeLock();\n\t        }\n\t    }\n\n\t\t\/**\n\t     * If the command has more than one task handler, we can reach the end action\n\t     * phase and in that phase execute the next task handler. In that case, we\n\t     * don't want to release the locks, so we ask whether we're not in execute state.\n\t     *\/\n\t    private void CommandBase.freeLockEndAction() {\n\t        if (getActionState() != CommandActionState.EXECUTE) {\n\t            freeLock();\n\t        }\n\t    }\n\n\t\t\/**\n\t     * The following method should initiate a lock , in order to release it at endAction()\n\t     *\/\n\t    private void CommandBase.initiateLockEndAction() {\n\t        if (context.getLock() == null) {\n\t            LockProperties lockProperties = getLockProperties();\n\t            if (Scope.Command.equals(lockProperties.getScope())) {\n\t                context.withLock(buildLock());\n\t            }\n\t\n\t        }\n\t    }\n\t\n\t    private EngineLock CommandBase.buildLock() {\n\t        EngineLock lock = null;\n\t        Map<String, Pair<String, String>> exclusiveLocks = getExclusiveLocks();\n\t        Map<String, Pair<String, String>> sharedLocks = getSharedLocks();\n\t        if (exclusiveLocks != null || sharedLocks != null) {\n\t            lock = new EngineLock(exclusiveLocks, sharedLocks);\n\t        }\n\t        return lock;\n\t    }\n\n\t\t\n\n\t\t\tLockProperties around(LockProperties lockProperties, org.ovirt.engine.core.bll.ExportVmTemplateCommand command): execution(* applyLockProperties(..)) && args(lockProperties) && target(command) {\n\t\t\t\treturn lockProperties.withScope(Scope.Execution);\n\t\t\t}\n\t\t\n\t\t\tMap<String, Pair<String, String>> around(org.ovirt.engine.core.bll.ExportVmTemplateCommand command): execution(* getExclusiveLocks()) && target(command) {\n\t\t\t        Map<String, Pair<String, String>> locks = new HashMap<String, Pair<String, String>>();\n\t\t\n\t\tlocks.put(command.getVmTemplateId().toString(),\n\t\t\tLockMessagesMatchUtil.makeLockingPair(LockingGroup.REMOTE_TEMPLATE, EngineMessage.ACTION_TYPE_FAILED_OBJECT_LOCKED));\n\t\t\n\t\t\t\treturn locks;\n\t\t\t    }\n\t\t\n\t\tMap<String, Pair<String, String>> around(org.ovirt.engine.core.bll.ExportVmTemplateCommand command): execution(* getSharedLocks()) && target(command) {\n\t\t    Map<String, Pair<String, String>> locks = new HashMap<String, Pair<String, String>>();\n\t\t\n\t\tlocks.put(command.getVmTemplateId().toString(),\n\t\t\tLockMessagesMatchUtil.makeLockingPair(LockingGroup.TEMPLATE, EngineMessage.ACTION_TYPE_FAILED_OBJECT_LOCKED));\n\t\t\n\t\t    return locks;\n\t\t}\n\t\t\n\t}\n\n","old_contents":"\tpackage org.ovirt.engine.core.bll;\n\n\timport java.util.*;\n\t\n\timport org.ovirt.engine.core.common.action.LockProperties;\n\timport org.ovirt.engine.core.common.action.LockProperties.Scope;\n\timport org.ovirt.engine.core.common.locks.LockingGroup;\n\timport org.ovirt.engine.core.bll.CommandBase;\n\timport org.ovirt.engine.core.utils.lock.EngineLock;\n\timport org.ovirt.engine.core.common.utils.Pair;\n\timport org.ovirt.engine.core.common.action.VdcReturnValueBase;\n\timport org.ovirt.engine.core.common.businessentities.IVdsAsyncCommand;\n\timport org.ovirt.engine.core.common.errors.EngineMessage;\n\n\tpublic privileged aspect Locks {\n\n\t\tvoid around(CommandBase command): execution(* endActionInTransactionScope()) && this(command) {\n\t\t\ttry {\n\t          proceed(command);\n\t        }\n\t        finally {\n\t          command.freeLockEndAction();\n\t        }\n\t    }\n\t\n\t   boolean around(CommandBase command): execution(* internalCanDoAction()) && this(command) {\n\t        boolean result = false;\n\t        try {\n\t          result = proceed(command);\n\t        }\n\t        finally {\n\t          if (!result) {\n\t            command.freeLock();\n\t          }\n\t        }\n\t        return result;\n\t   }\n\n\t   void around(CommandBase command): execution(* freeLock()) && this(command) {\n            if (command.context.getLock() != null) {\n                command.getLockManager().releaseLock(command.context.getLock());\n                command.log.info(\"Lock freed to object '{}'\", command.context.getLock());\n                command.context.withLock(null);\n                \/\/ free other locks here to guarantee they will be freed only once\n                command.freeCustomLocks();\n            }\n        }\n\n\n\t    VdcReturnValueBase around(CommandBase command): execution(* executeAction()) && this(command) {\n\t        try {\n\t          return proceed(command);\n\t        }\n\t        finally {\n\t          command.freeLockExecute();\n\t        }\n\t    }\n\t\n\t    boolean around(CommandBase commandBase): execution(* CommandBase.acquireLock()) && this(commandBase) {\n\t        LockProperties lockProperties = commandBase.getLockProperties();\n\t        boolean returnValue = true;\n\t        if (!Scope.None.equals(lockProperties.getScope())) {\n\t            commandBase.releaseLocksAtEndOfExecute = Scope.Execution.equals(lockProperties.getScope());\n\t            if (!lockProperties.isWait()) {\n\t                returnValue = commandBase.acquireLockInternal();\n\t            } else {\n\t                commandBase.acquireLockAndWait();\n\t            }\n\t        }\n\t        return returnValue;\n\t    }\n\n\t\tboolean around(CommandBase command): execution(* acquireLockInternal()) && this(command) {\n\t        \/\/ if commandLock is null then we acquire new lock, otherwise probably we got lock from caller command.\n\t        if (command.context.getLock() == null) {\n\t            EngineLock lock = command.buildLock();\n\t            if (lock != null) {\n\t                Pair<Boolean, Set<String>> lockAcquireResult = command.getLockManager().acquireLock(lock);\n\t                if (lockAcquireResult.getFirst()) {\n\t                    command.log.info(\"Lock Acquired to object '{}'\", lock);\n\t                    command.context.withLock(lock);\n\t                } else {\n\t                    command.log.info(\"Failed to Acquire Lock to object '{}'\", lock);\n\t                    command.getReturnValue().getCanDoActionMessages()\n\t                    .addAll(command.extractVariableDeclarations(lockAcquireResult.getSecond()));\n\t                    return false;\n\t                }\n\t            }\n\t        }\n\t        return true;\n\t   }\n\n\t   void around(CommandBase command): execution(* acquireLockAndWait()) && this(command) {\n\t        \/\/ if commandLock is null then we acquire new lock, otherwise probably we got lock from caller command.\n\t         if (command.context.getLock() == null) {\n\t            Map<String, Pair<String, String>> exclusiveLocks = command.getExclusiveLocks();\n\t             if (exclusiveLocks != null) {\n\t                 EngineLock lock = new EngineLock(exclusiveLocks, null);\n\t                 command.getLockManager().acquireLockWait(lock);\n\t                 command.context.withLock(lock);\n\t            }\n\t         }\n\t    }\n\n\t\tVdcReturnValueBase around(CommandBase commandBase): execution(* endAction()) && this(commandBase) {\n\t        VdcReturnValueBase result = null;\n\t        try {\n\t            commandBase.initiateLockEndAction();\n\t            result = proceed(commandBase);\n\t        } finally {\n\t            commandBase.freeLockEndAction();\n\t        }\n\t        return result;\n\t    }\n\t\n\t    private void CommandBase.freeLockExecute() {\n\t        if (releaseLocksAtEndOfExecute || !getSucceeded() ||\n\t                (noAsyncOperations() && !(this instanceof IVdsAsyncCommand))) {\n\t            freeLock();\n\t        }\n\t    }\n\n\t\t\/**\n\t     * If the command has more than one task handler, we can reach the end action\n\t     * phase and in that phase execute the next task handler. In that case, we\n\t     * don't want to release the locks, so we ask whether we're not in execute state.\n\t     *\/\n\t    private void CommandBase.freeLockEndAction() {\n\t        if (getActionState() != CommandActionState.EXECUTE) {\n\t            freeLock();\n\t        }\n\t    }\n\n\t\t\/**\n\t     * The following method should initiate a lock , in order to release it at endAction()\n\t     *\/\n\t    private void CommandBase.initiateLockEndAction() {\n\t        if (context.getLock() == null) {\n\t            LockProperties lockProperties = getLockProperties();\n\t            if (Scope.Command.equals(lockProperties.getScope())) {\n\t                context.withLock(buildLock());\n\t            }\n\t\n\t        }\n\t    }\n\t\n\t    private EngineLock CommandBase.buildLock() {\n\t        EngineLock lock = null;\n\t        Map<String, Pair<String, String>> exclusiveLocks = getExclusiveLocks();\n\t        Map<String, Pair<String, String>> sharedLocks = getSharedLocks();\n\t        if (exclusiveLocks != null || sharedLocks != null) {\n\t            lock = new EngineLock(exclusiveLocks, sharedLocks);\n\t        }\n\t        return lock;\n\t    }\n\n\t\t\n\n\t\tLockProperties around(LockProperties lockProperties, org.ovirt.engine.core.bll.ExportVmTemplateCommand command): execution(* applyLockProperties(..)) && args(lockProperties) && target(command) {\n\t\t\treturn lockProperties.withScope(Scope.Execution);\n\t\t}\n\t\t\n\t\tMap<String, Pair<String, String>> around(org.ovirt.engine.core.bll.ExportVmTemplateCommand command): execution(* getExclusiveLocks()) && target(command) {\n\t\t\tMap<String, Pair<String, String>> locks = new HashMap<String, Pair<String, String>>();\n\t\t\n\t\t\tlocks.put(command.getVmTemplateId().toString(),\n\t\t\t\tLockMessagesMatchUtil.makeLockingPair(LockingGroup.REMOTE_TEMPLATE, EngineMessage.ACTION_TYPE_FAILED_OBJECT_LOCKED));\n\t\t\n\t\t\treturn locks;\n\t\t}\n\t\t\n\t\tMap<String, Pair<String, String>> around(org.ovirt.engine.core.bll.ExportVmTemplateCommand command): execution(* getSharedLocks()) && target(command) {\n\t\t\tMap<String, Pair<String, String>> locks = new HashMap<String, Pair<String, String>>();\n\t\t\n\t\t\tlocks.put(command.getVmTemplateId().toString(),\n\t\t\t\tLockMessagesMatchUtil.makeLockingPair(LockingGroup.TEMPLATE, EngineMessage.ACTION_TYPE_FAILED_OBJECT_LOCKED));\n\t\t\n\t\t\treturn locks;\n\t\t}\n\t\t\n\t\tLockProperties around(LockProperties lockProperties, org.ovirt.engine.core.bll.MigrateVmCommand command): execution(* applyLockProperties(..)) && args(lockProperties) && target(command) {\n\t\t\treturn lockProperties.withScope(Scope.Command);\n\t\t}\n\t\t\n\t\tMap<String, Pair<String, String>> around(org.ovirt.engine.core.bll.MigrateVmCommand command): execution(* getExclusiveLocks()) && target(command) {\n\t\t\tMap<String, Pair<String, String>> locks = new HashMap<String, Pair<String, String>>();\n\t\t\n\t\t\tlocks.put(command.getVmId().toString(),\n\t\t\t\tLockMessagesMatchUtil.makeLockingPair(LockingGroup.VM, EngineMessage.ACTION_TYPE_FAILED_OBJECT_LOCKED));\n\t\t\n\t\t\treturn locks;\n\t\t}\n\t\t\n\t\t\n\t\tLockProperties around(LockProperties lockProperties, org.ovirt.engine.core.bll.AddDiskCommand command): execution(* applyLockProperties(..)) && args(lockProperties) && target(command) {\n\t\t\treturn lockProperties.withScope(Scope.Execution);\n\t\t}\n\t\t\n\t\tMap<String, Pair<String, String>> around(org.ovirt.engine.core.bll.AddDiskCommand command): execution(* getExclusiveLocks()) && target(command) {\n\t\t\tMap<String, Pair<String, String>> locks = new HashMap<String, Pair<String, String>>();\n\t\t\n\t\t\tlocks.put(command.getVmId().toString(),\n\t\t\t\tLockMessagesMatchUtil.makeLockingPair(LockingGroup.VM_DISK_BOOT, EngineMessage.ACTION_TYPE_FAILED_OBJECT_LOCKED));\n\t\t\n\t\t\treturn locks;\n\t\t}\n\t\t\n\t\tMap<String, Pair<String, String>> around(org.ovirt.engine.core.bll.AddDiskCommand command): execution(* getSharedLocks()) && target(command) {\n\t\t\tMap<String, Pair<String, String>> locks = new HashMap<String, Pair<String, String>>();\n\t\t\n\t\t\tlocks.put(command.getVmId().toString(),\n\t\t\t\tLockMessagesMatchUtil.makeLockingPair(LockingGroup.VM, EngineMessage.ACTION_TYPE_FAILED_OBJECT_LOCKED));\n\t\t\n\t\t\treturn locks;\n\t\t}\n\t\t\n\t}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"16fab293104af69659185347a1f514bdca95cc20","subject":"moved annotation processing to controller - much fewer chance of it getting overwritten","message":"moved annotation processing to controller - much fewer chance of it getting overwritten\n\ngit-svn-id: 611fcff3babe92294e93aa7369573f5fe3352ff6@508 468f3c8c-1912-47de-8909-53fc7abe8733\n","repos":"EntitypediaGames\/games-common,EntitypediaGames\/games-common","old_file":"src\/main\/java\/org\/entitypedia\/games\/common\/mixins\/JacksonMixinSetupAspect.aj","new_file":"src\/main\/java\/org\/entitypedia\/games\/common\/mixins\/JacksonMixinSetupAspect.aj","new_contents":"package org.entitypedia.games.common.mixins;\r\n\r\nimport com.fasterxml.jackson.databind.ObjectMapper;\r\nimport org.aspectj.lang.JoinPoint;\r\nimport org.aspectj.lang.reflect.MethodSignature;\r\nimport org.entitypedia.games.common.util.HibernateAwareObjectMapper;\r\nimport org.entitypedia.games.common.util.MapperSavingJackson2HttpMessageConverter;\r\nimport org.slf4j.Logger;\r\nimport org.slf4j.LoggerFactory;\r\nimport org.springframework.beans.factory.InitializingBean;\r\nimport org.springframework.security.access.intercept.aspectj.MethodInvocationAdapter;\r\nimport org.springframework.security.access.prepost.PreInvocationAttribute;\r\nimport org.springframework.security.access.prepost.PreInvocationAuthorizationAdvice;\r\nimport org.springframework.security.access.prepost.PrePostInvocationAttributeFactory;\r\nimport org.springframework.security.core.context.SecurityContextHolder;\r\n\r\nimport java.lang.reflect.Constructor;\r\nimport java.lang.reflect.InvocationTargetException;\r\nimport java.lang.reflect.Method;\r\nimport java.util.ArrayList;\r\nimport java.util.Arrays;\r\nimport java.util.List;\r\n\r\n\/**\r\n * Applies mixins from annotations to Jackson Mapper.\r\n *\r\n * @author <a rel=\"author\" href=\"http:\/\/autayeu.com\/\">Aliaksandr Autayeu<\/a>\r\n *\/\r\npublic aspect JacksonMixinSetupAspect implements InitializingBean {\r\n\r\n    private static final Logger log = LoggerFactory.getLogger(JacksonMixinSetupAspect.class);\r\n\r\n    private PreInvocationAuthorizationAdvice preAdvice;\r\n\r\n    private PrePostInvocationAttributeFactory attributeFactory;\r\n\r\n    private MapperSavingJackson2HttpMessageConverter converter;\r\n\r\n    private Constructor<MethodInvocationAdapter> constructor;\r\n\r\n    private final static ThreadLocal<ObjectMapper> tlObjectMapper = new ThreadLocal<ObjectMapper>() {\r\n        @Override protected ObjectMapper initialValue() {\r\n            return null;\r\n        }\r\n    };\r\n    private final static ThreadLocal<List<JacksonMixin>> tlMixins = new ThreadLocal<List<JacksonMixin>>() {\r\n        @Override\r\n        protected List<JacksonMixin> initialValue() {\r\n            return new ArrayList<JacksonMixin>(4);\r\n        }\r\n    };\r\n\r\n    @Override\r\n    public void afterPropertiesSet() throws Exception {\r\n        \/\/ hack package local constructor...\r\n        constructor = MethodInvocationAdapter.class.getDeclaredConstructor(JoinPoint.class);\r\n        constructor.setAccessible(true);\r\n\r\n        if (null == preAdvice) {\r\n            throw new IllegalArgumentException(\"org.springframework.security.access.expression.method.ExpressionBasedPreInvocationAdvice required!\");\r\n        }\r\n        if (null == attributeFactory) {\r\n            throw new IllegalArgumentException(\"org.springframework.security.access.expression.method.ExpressionBasedAnnotationAttributeFactory required!\");\r\n        }\r\n        if (null == converter) {\r\n            throw new IllegalArgumentException(\"org.entitypedia.games.common.util.MapperSavingJackson2HttpMessageConverter required!\");\r\n        }\r\n    }\r\n\r\n    pointcut serviceExecution(): execution(@JacksonMixins * org.entitypedia.games..api.controller..*(..));\r\n    after() returning: serviceExecution() {\r\n        \/\/ this prepares mixins for the filtering mapper.\r\n\r\n        \/\/ one needs to check the control flow of the annotated method to ensure\r\n        \/\/ there is no other mixins-annotated method being called inside the body\r\n        \/\/ e.g. createGame calls readCrossword, both annotated\r\n        \/\/ and the latter overwrites the mixins of the former\r\n        \/\/ in this case warning is printed\r\n\r\n        \/\/ jackson allows only one mixin per class... can't accumulate mixins over complex call trees\r\n\r\n        \/\/ mixins clear in writeInternal. therefore they might get stuck if method does not render JSON\r\n        \/\/ e.g. updateFocus calls readGame for access control and mixins get stuck.\r\n        \/\/ in this case warning is printed too, but it has little meaning\r\n\r\n        if (thisJoinPoint.getSignature() instanceof MethodSignature) {\r\n            MethodSignature signature = (MethodSignature) thisJoinPoint.getSignature();\r\n            \/\/ gets interface method\r\n            Method method = signature.getMethod();\r\n            if (null != method) {\r\n                JacksonMixins annotation = method.getAnnotation(JacksonMixins.class);\r\n                if (null != annotation && null != annotation.value() && 0 < annotation.value().length) {\r\n                    List<JacksonMixin> mixins = tlMixins.get();\r\n                    if (0 < mixins.size()) {\r\n                        if (log.isWarnEnabled()) {\r\n                            log.warn(\"{} is overwriting mixins {}\", thisJoinPoint, Arrays.toString(mixinsToStringArray(mixins)));\r\n                        }\r\n                    }\r\n                    mixins.clear();\r\n\r\n                    for (int i = 0; i < annotation.value().length; i++) {\r\n                        JacksonMixin mixin = annotation.value()[i];\r\n                        boolean apply = true;\r\n                        if (!\"\".equals(mixin.condition())) {\r\n                            \/\/ evaluate condition\r\n                            PreInvocationAttribute attribute = attributeFactory.createPreInvocationAttribute(null, null, mixin.condition());\r\n                            try {\r\n                                apply = preAdvice.before(\r\n                                        SecurityContextHolder.getContext().getAuthentication(),\r\n                                        constructor.newInstance(thisJoinPoint),\r\n                                        attribute);\r\n                            } catch (InstantiationException e) {\r\n                                throw new RuntimeException(e);\r\n                            } catch (IllegalAccessException e) {\r\n                                throw new RuntimeException(e);\r\n                            } catch (InvocationTargetException e) {\r\n                                throw new RuntimeException(e);\r\n                            }\r\n                        }\r\n                        if (apply) {\r\n                            mixins.add(mixin);\r\n                        }\r\n                    }\r\n\r\n                    if (0 < mixins.size()) {\r\n                        if (log.isDebugEnabled()) {\r\n                            log.debug(\"{} prepared mixins {}\", thisJoinPoint, Arrays.toString(mixinsToStringArray(mixins)));\r\n                        }\r\n                    } else {\r\n                        log.debug(\"{} cleared mixins\", thisJoinPoint);\r\n                    }\r\n                }\r\n            }\r\n        }\r\n    }\r\n\r\n    private String[] mixinsToStringArray(List<JacksonMixin> mixins) {\r\n        String[] result = new String[mixins.size()];\r\n        for (int i = 0; i < mixins.size(); i++) {\r\n            result[i] = mixins.get(i).target().getSimpleName() + \"=\" + mixins.get(i).mixin().getSimpleName();\r\n        }\r\n        return result;\r\n    }\r\n\r\n    pointcut writeInternalExecution(): execution(* org.entitypedia.games.common.util.MapperSavingJackson2HttpMessageConverter.writeInternal(..));\r\n    Object around(): writeInternalExecution() {\r\n        List<JacksonMixin> mixins = tlMixins.get();\r\n        if (0 < mixins.size()) {\r\n            \/\/ set up mapper\r\n            ObjectMapper mapper = new HibernateAwareObjectMapper();\r\n            for (JacksonMixin mixin : mixins) {\r\n                mapper.addMixInAnnotations(mixin.target(), mixin.mixin());\r\n            }\r\n\r\n            log.debug(\"Applying mixins {} to {}\", Arrays.toString(mixinsToStringArray(mixins)), converter);\r\n            tlObjectMapper.set(converter.getObjectMapper());\r\n            converter.setObjectMapper(mapper);\r\n        }\r\n\r\n        Object result = proceed();\r\n\r\n        if (0 < mixins.size()) {\r\n            \/\/ restore mapper\r\n            log.debug(\"Removing mixins from {}\", converter);\r\n            converter.setObjectMapper(tlObjectMapper.get());\r\n\r\n            \/\/ clean up vars\r\n            tlObjectMapper.set(null);\r\n            mixins.clear();\r\n        }\r\n\r\n        return result;\r\n    }\r\n\r\n    public void setConverter(MapperSavingJackson2HttpMessageConverter converter) {\r\n        this.converter = converter;\r\n    }\r\n\r\n    public void setAttributeFactory(PrePostInvocationAttributeFactory attributeFactory) {\r\n        this.attributeFactory = attributeFactory;\r\n    }\r\n\r\n    public void setPreAdvice(PreInvocationAuthorizationAdvice preAdvice) {\r\n        this.preAdvice = preAdvice;\r\n    }\r\n}\r\n","old_contents":"package org.entitypedia.games.common.mixins;\r\n\r\nimport com.fasterxml.jackson.databind.ObjectMapper;\r\nimport org.aspectj.lang.JoinPoint;\r\nimport org.aspectj.lang.reflect.MethodSignature;\r\nimport org.entitypedia.games.common.util.HibernateAwareObjectMapper;\r\nimport org.entitypedia.games.common.util.MapperSavingJackson2HttpMessageConverter;\r\nimport org.slf4j.Logger;\r\nimport org.slf4j.LoggerFactory;\r\nimport org.springframework.beans.factory.InitializingBean;\r\nimport org.springframework.security.access.intercept.aspectj.MethodInvocationAdapter;\r\nimport org.springframework.security.access.prepost.PreInvocationAttribute;\r\nimport org.springframework.security.access.prepost.PreInvocationAuthorizationAdvice;\r\nimport org.springframework.security.access.prepost.PrePostInvocationAttributeFactory;\r\nimport org.springframework.security.core.context.SecurityContextHolder;\r\n\r\nimport java.lang.reflect.Constructor;\r\nimport java.lang.reflect.InvocationTargetException;\r\nimport java.lang.reflect.Method;\r\nimport java.util.ArrayList;\r\nimport java.util.Arrays;\r\nimport java.util.List;\r\n\r\n\/**\r\n * Applies mixins from annotations to Jackson Mapper.\r\n *\r\n * @author <a rel=\"author\" href=\"http:\/\/autayeu.com\/\">Aliaksandr Autayeu<\/a>\r\n *\/\r\npublic aspect JacksonMixinSetupAspect implements InitializingBean {\r\n\r\n    private static final Logger log = LoggerFactory.getLogger(JacksonMixinSetupAspect.class);\r\n\r\n    private PreInvocationAuthorizationAdvice preAdvice;\r\n\r\n    private PrePostInvocationAttributeFactory attributeFactory;\r\n\r\n    private MapperSavingJackson2HttpMessageConverter converter;\r\n\r\n    private Constructor<MethodInvocationAdapter> constructor;\r\n\r\n    private final static ThreadLocal<ObjectMapper> tlObjectMapper = new ThreadLocal<ObjectMapper>() {\r\n        @Override protected ObjectMapper initialValue() {\r\n            return null;\r\n        }\r\n    };\r\n    private final static ThreadLocal<List<JacksonMixin>> tlMixins = new ThreadLocal<List<JacksonMixin>>() {\r\n        @Override\r\n        protected List<JacksonMixin> initialValue() {\r\n            return new ArrayList<JacksonMixin>(4);\r\n        }\r\n    };\r\n\r\n    @Override\r\n    public void afterPropertiesSet() throws Exception {\r\n        \/\/ hack package local constructor...\r\n        constructor = MethodInvocationAdapter.class.getDeclaredConstructor(JoinPoint.class);\r\n        constructor.setAccessible(true);\r\n\r\n        if (null == preAdvice) {\r\n            throw new IllegalArgumentException(\"org.springframework.security.access.expression.method.ExpressionBasedPreInvocationAdvice required!\");\r\n        }\r\n        if (null == attributeFactory) {\r\n            throw new IllegalArgumentException(\"org.springframework.security.access.expression.method.ExpressionBasedAnnotationAttributeFactory required!\");\r\n        }\r\n        if (null == converter) {\r\n            throw new IllegalArgumentException(\"org.entitypedia.games.common.util.MapperSavingJackson2HttpMessageConverter required!\");\r\n        }\r\n    }\r\n\r\n    pointcut serviceExecution(): execution(@JacksonMixins * org.entitypedia.games..service..*(..));\r\n    \/\/ these 2 below might be faster, depends on performance of cflowbelow VS the current checks\r\n    \/\/ pointcut controllerExecution(): execution(* org.entitypedia.games..api.controller..*(..));\r\n    \/\/ after() returning: serviceExecution() && cflowbelow(controllerExecution()) {\r\n    after() returning: serviceExecution() {\r\n        \/\/ this prepares mixins for the filtering mapper.\r\n\r\n        \/\/ one needs to check the control flow of the annotated method to ensure\r\n        \/\/ there is no other mixins-annotated method being called inside the body\r\n        \/\/ e.g. createGame calls readCrossword, both annotated\r\n        \/\/ and the latter overwrites the mixins of the former\r\n        \/\/ in this case warning is printed\r\n\r\n        \/\/ jackson allows only one mixin per class... can't accumulate mixins over complex call trees\r\n\r\n        \/\/ mixins clear in writeInternal. therefore they might get stuck if method does not render JSON\r\n        \/\/ e.g. updateFocus calls readGame for access control and mixins get stuck.\r\n        \/\/ in this case warning is printed too, but it has little meaning\r\n\r\n        if (thisJoinPoint.getSignature() instanceof MethodSignature) {\r\n            MethodSignature signature = (MethodSignature) thisJoinPoint.getSignature();\r\n            \/\/ gets interface method\r\n            Method method = signature.getMethod();\r\n            if (null != method) {\r\n                JacksonMixins annotation = method.getAnnotation(JacksonMixins.class);\r\n                if (null != annotation && null != annotation.value() && 0 < annotation.value().length) {\r\n                    List<JacksonMixin> mixins = tlMixins.get();\r\n                    if (0 < mixins.size()) {\r\n                        if (log.isWarnEnabled()) {\r\n                            log.warn(\"{} is overwriting mixins {}\", thisJoinPoint, Arrays.toString(mixinsToStringArray(mixins)));\r\n                        }\r\n                    }\r\n                    mixins.clear();\r\n\r\n                    for (int i = 0; i < annotation.value().length; i++) {\r\n                        JacksonMixin mixin = annotation.value()[i];\r\n                        boolean apply = true;\r\n                        if (!\"\".equals(mixin.condition())) {\r\n                            \/\/ evaluate condition\r\n                            PreInvocationAttribute attribute = attributeFactory.createPreInvocationAttribute(null, null, mixin.condition());\r\n                            try {\r\n                                apply = preAdvice.before(\r\n                                        SecurityContextHolder.getContext().getAuthentication(),\r\n                                        constructor.newInstance(thisJoinPoint),\r\n                                        attribute);\r\n                            } catch (InstantiationException e) {\r\n                                throw new RuntimeException(e);\r\n                            } catch (IllegalAccessException e) {\r\n                                throw new RuntimeException(e);\r\n                            } catch (InvocationTargetException e) {\r\n                                throw new RuntimeException(e);\r\n                            }\r\n                        }\r\n                        if (apply) {\r\n                            mixins.add(mixin);\r\n                        }\r\n                    }\r\n\r\n                    if (0 < mixins.size()) {\r\n                        if (log.isDebugEnabled()) {\r\n                            log.debug(\"{} prepared mixins {}\", thisJoinPoint, Arrays.toString(mixinsToStringArray(mixins)));\r\n                        }\r\n                    } else {\r\n                        log.debug(\"{} cleared mixins\", thisJoinPoint);\r\n                    }\r\n                }\r\n            }\r\n        }\r\n    }\r\n\r\n    private String[] mixinsToStringArray(List<JacksonMixin> mixins) {\r\n        String[] result = new String[mixins.size()];\r\n        for (int i = 0; i < mixins.size(); i++) {\r\n            result[i] = mixins.get(i).target().getSimpleName() + \"=\" + mixins.get(i).mixin().getSimpleName();\r\n        }\r\n        return result;\r\n    }\r\n\r\n    pointcut writeInternalExecution(): execution(* org.entitypedia.games.common.util.MapperSavingJackson2HttpMessageConverter.writeInternal(..));\r\n    Object around(): writeInternalExecution() {\r\n        List<JacksonMixin> mixins = tlMixins.get();\r\n        if (0 < mixins.size()) {\r\n            \/\/ set up mapper\r\n            ObjectMapper mapper = new HibernateAwareObjectMapper();\r\n            for (JacksonMixin mixin : mixins) {\r\n                mapper.addMixInAnnotations(mixin.target(), mixin.mixin());\r\n            }\r\n\r\n            log.debug(\"Applying mixins {} to {}\", Arrays.toString(mixinsToStringArray(mixins)), converter);\r\n            tlObjectMapper.set(converter.getObjectMapper());\r\n            converter.setObjectMapper(mapper);\r\n        }\r\n\r\n        Object result = proceed();\r\n\r\n        if (0 < mixins.size()) {\r\n            \/\/ restore mapper\r\n            log.debug(\"Removing mixins from {}\", converter);\r\n            converter.setObjectMapper(tlObjectMapper.get());\r\n\r\n            \/\/ clean up vars\r\n            tlObjectMapper.set(null);\r\n            mixins.clear();\r\n        }\r\n\r\n        return result;\r\n    }\r\n\r\n    public void setConverter(MapperSavingJackson2HttpMessageConverter converter) {\r\n        this.converter = converter;\r\n    }\r\n\r\n    public void setAttributeFactory(PrePostInvocationAttributeFactory attributeFactory) {\r\n        this.attributeFactory = attributeFactory;\r\n    }\r\n\r\n    public void setPreAdvice(PreInvocationAuthorizationAdvice preAdvice) {\r\n        this.preAdvice = preAdvice;\r\n    }\r\n}\r\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"ea7cc0489b730965e6356277afc7ec7bb1d0da2e","subject":"used generic type info to avoid compilation warnings and unneccessary cast","message":"used generic type info to avoid compilation warnings and unneccessary cast\n\n\ngit-svn-id: b619a0c99665f88f1afe72824344cefe9a1c8c90@8627 fd5a2b45-1f63-4059-99e9-3c7cb7fd75c8\n","repos":"cbeams-archive\/spring-framework-2.5.x,cbeams-archive\/spring-framework-2.5.x,cbeams-archive\/spring-framework-2.5.x,cbeams-archive\/spring-framework-2.5.x","old_file":"aspectj\/src\/org\/springframework\/beans\/factory\/aspectj\/AnnotationBeanConfigurer.aj","new_file":"aspectj\/src\/org\/springframework\/beans\/factory\/aspectj\/AnnotationBeanConfigurer.aj","new_contents":"\/*\n * Copyright 2002-2006 the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n \npackage org.springframework.beans.factory.aspectj;\n\n\n\/**\n * Concrete aspect that uses the Configurable annotation to identify\n * which classes need autowiring. The bean name to look up will be\n * taken from the Configurable annotation if specified, otherwise\n * the default will be the FQN of the class being configured.\n * @see Configurable\n * @author Rod Johnson\n * @since 2.0\n *\/\npublic aspect AnnotationBeanConfigurer extends AbstractBeanConfigurer {\n\t\n\tpublic AnnotationBeanConfigurer() {\n\t\t\/\/ Set a custom BeanWiringInfoResolver that is aware of \n\t\t\/\/ the Configurable annotation\n\t\tsetBeanWiringInfoResolver(new BeanWiringInfoResolver() {\n\t\t\tpublic BeanWiringInfo resolve(Object instance) {\n\t\t\t\tClass<?> clazz = instance.getClass();\n\t\t\t\tConfigurable configurableAnnotation = clazz.getAnnotation(Configurable.class);\n\t\t\t\tif (configurableAnnotation != null) {\n\t\t\t\t\tString beanName = configurableAnnotation.value();\n\t\t\t\t\tif (\"\".equals(beanName)) {\n\t\t\t\t\t\tbeanName = clazz.getName();\n\t\t\t\t\t}\n\t\t\t\t\treturn new BeanWiringInfo(beanName);\n\t\t\t\t}\n\t\t\t\treturn null;\n\t\t\t}\n\t\t});\n\t}\n\n\t\/**\n     * The creation of a new bean (an object with the @SpringConfigured annotation)\n     *\/\n    protected pointcut beanCreation(Object beanInstance) :\n        initialization((@Configurable *).new(..)) &&\n        \tthis(beanInstance);\n}\n","old_contents":"\/*\n * Copyright 2002-2006 the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n \npackage org.springframework.beans.factory.aspectj;\n\n\n\/**\n * Concrete aspect that uses the Configurable annotation to identify\n * which classes need autowiring. The bean name to look up will be\n * taken from the Configurable annotation if specified, otherwise\n * the default will be the FQN of the class being configured.\n * @see Configurable\n * @author Rod Johnson\n * @since 2.0\n *\/\npublic aspect AnnotationBeanConfigurer extends AbstractBeanConfigurer {\n\t\n\tpublic AnnotationBeanConfigurer() {\n\t\t\/\/ Set a custom BeanWiringInfoResolver that is aware of \n\t\t\/\/ the Configurable annotation\n\t\tsetBeanWiringInfoResolver(new BeanWiringInfoResolver() {\n\t\t\tpublic BeanWiringInfo resolve(Object instance) {\n\t\t\t\tClass clazz = instance.getClass();\n\t\t\t\tConfigurable springAnnotation = (Configurable) clazz.getAnnotation(Configurable.class);\n\t\t\t\tif (springAnnotation != null) {\n\t\t\t\t\tString beanName = springAnnotation.value();\n\t\t\t\t\tif (\"\".equals(beanName)) {\n\t\t\t\t\t\tbeanName = clazz.getName();\n\t\t\t\t\t}\n\t\t\t\t\treturn new BeanWiringInfo(beanName);\n\t\t\t\t}\n\t\t\t\treturn null;\n\t\t\t}\n\t\t});\n\t}\n\n\t\/**\n     * The creation of a new bean (an object with the @SpringConfigured annotation)\n     *\/\n    protected pointcut beanCreation(Object beanInstance) :\n        initialization((@Configurable *).new(..)) &&\n        \tthis(beanInstance);\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"d28b786a132fe62259ca5a5230a3ee91b462dca7","subject":"commit 6231ae49df45df5c47e8c9561ef5be03d8d7792f Author: Vinay Kumar Thota <vinayt@yahoo-inc.com> Date:   Wed Jun 16 09:54:29 2010 +0000","message":"commit 6231ae49df45df5c47e8c9561ef5be03d8d7792f\nAuthor: Vinay Kumar Thota <vinayt@yahoo-inc.com>\nDate:   Wed Jun 16 09:54:29 2010 +0000\n\n    HADOOP:6819 from https:\/\/issues.apache.org\/jira\/secure\/attachment\/12446837\/6819-ydist-security.patch\n\n\ngit-svn-id: 7e7a2d564dde2945c3a26e08d1235fcc0cb7aba1@1077506 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"ShortMap\/ShortMap,aseldawy\/spatialhadoop,ShortMap\/ShortMap,aseldawy\/spatialhadoop,aseldawy\/spatialhadoop,ShortMap\/ShortMap,aseldawy\/spatialhadoop,ShortMap\/ShortMap,aseldawy\/spatialhadoop,ShortMap\/ShortMap,ShortMap\/ShortMap,ShortMap\/ShortMap,aseldawy\/spatialhadoop,aseldawy\/spatialhadoop,ShortMap\/ShortMap,ShortMap\/ShortMap,aseldawy\/spatialhadoop,aseldawy\/spatialhadoop","old_file":"src\/test\/system\/aop\/org\/apache\/hadoop\/test\/system\/DaemonProtocolAspect.aj","new_file":"src\/test\/system\/aop\/org\/apache\/hadoop\/test\/system\/DaemonProtocolAspect.aj","new_contents":"\/**\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements.  See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership.  The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * \"License\"); you may not use this file except in compliance\n * with the License.  You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.apache.hadoop.test.system;\n\nimport java.io.File;\nimport java.io.IOException;\nimport java.security.PrivilegedExceptionAction;\nimport java.util.HashMap;\nimport java.util.List;\nimport java.util.ArrayList;\nimport java.util.Map;\nimport java.util.Properties;\nimport org.apache.commons.logging.Log;\nimport org.apache.commons.logging.LogFactory;\nimport org.apache.hadoop.io.Writable;\nimport org.apache.hadoop.security.UserGroupInformation;\nimport org.apache.hadoop.util.Shell.ShellCommandExecutor;\nimport org.apache.hadoop.util.Shell;\nimport org.apache.hadoop.fs.FileStatus;\nimport org.apache.hadoop.fs.FileSystem;\nimport org.apache.hadoop.fs.Path;\nimport org.apache.hadoop.conf.Configuration;\n\n\/**\n * Default DaemonProtocolAspect which is used to provide default implementation\n * for all the common daemon methods. If a daemon requires more specialized\n * version of method, it is responsibility of the DaemonClient to introduce the\n * same in woven classes.\n * \n *\/\npublic aspect DaemonProtocolAspect {\n\n  private boolean DaemonProtocol.ready;\n  \n  @SuppressWarnings(\"unchecked\")\n  private HashMap<Object, List<ControlAction>> DaemonProtocol.actions = \n    new HashMap<Object, List<ControlAction>>();\n  private static final Log LOG = LogFactory.getLog(\n      DaemonProtocolAspect.class.getName());\n  \/**\n   * Set if the daemon process is ready or not, concrete daemon protocol should\n   * implement pointcuts to determine when the daemon is ready and use the\n   * setter to set the ready state.\n   * \n   * @param ready\n   *          true if the Daemon is ready.\n   *\/\n  public void DaemonProtocol.setReady(boolean ready) {\n    this.ready = ready;\n  }\n\n  \/**\n   * Checks if the daemon process is alive or not.\n   * \n   * @throws IOException\n   *           if daemon is not alive.\n   *\/\n  public void DaemonProtocol.ping() throws IOException {\n  }\n\n  \/**\n   * Checks if the daemon process is ready to accepting RPC connections after it\n   * finishes initialization. <br\/>\n   * \n   * @return true if ready to accept connection.\n   * \n   * @throws IOException\n   *\/\n  public boolean DaemonProtocol.isReady() throws IOException {\n    return ready;\n  }\n\n  \/**\n   * Returns the process related information regarding the daemon process. <br\/>\n   * \n   * @return process information.\n   * @throws IOException\n   *\/\n  public ProcessInfo DaemonProtocol.getProcessInfo() throws IOException {\n    int activeThreadCount = Thread.activeCount();\n    long currentTime = System.currentTimeMillis();\n    long maxmem = Runtime.getRuntime().maxMemory();\n    long freemem = Runtime.getRuntime().freeMemory();\n    long totalmem = Runtime.getRuntime().totalMemory();\n    Map<String, String> envMap = System.getenv();\n    Properties sysProps = System.getProperties();\n    Map<String, String> props = new HashMap<String, String>();\n    for (Map.Entry entry : sysProps.entrySet()) {\n      props.put((String) entry.getKey(), (String) entry.getValue());\n    }\n    ProcessInfo info = new ProcessInfoImpl(activeThreadCount, currentTime,\n        freemem, maxmem, totalmem, envMap, props);\n    return info;\n  }\n\n  public void DaemonProtocol.enable(List<Enum<?>> faults) throws IOException {\n  }\n\n  public void DaemonProtocol.disableAll() throws IOException {\n  }\n\n  public abstract Configuration DaemonProtocol.getDaemonConf()\n    throws IOException;\n\n  public FileStatus DaemonProtocol.getFileStatus(String path, boolean local) \n    throws IOException {\n    Path p = new Path(path);\n    FileSystem fs = getFS(p, local);\n    p.makeQualified(fs);\n    FileStatus fileStatus = fs.getFileStatus(p);\n    return cloneFileStatus(fileStatus);\n  }\n\n  public FileStatus[] DaemonProtocol.listStatus(String path, boolean local) \n    throws IOException {\n    Path p = new Path(path);\n    FileSystem fs = getFS(p, local);\n    FileStatus[] status = fs.listStatus(p);\n    if (status != null) {\n      FileStatus[] result = new FileStatus[status.length];\n      int i = 0;\n      for (FileStatus fileStatus : status) {\n        result[i++] = cloneFileStatus(fileStatus);\n      }\n      return result;\n    }\n    return status;\n  }\n\n  \/**\n   * FileStatus object may not be serializable. Clone it into raw FileStatus \n   * object.\n   *\/\n  private FileStatus DaemonProtocol.cloneFileStatus(FileStatus fileStatus) {\n    return new FileStatus(fileStatus.getLen(),\n        fileStatus.isDir(),\n        fileStatus.getReplication(),\n        fileStatus.getBlockSize(),\n        fileStatus.getModificationTime(),\n        fileStatus.getAccessTime(),\n        fileStatus.getPermission(),\n        fileStatus.getOwner(),\n        fileStatus.getGroup(),\n        fileStatus.getPath());\n  }\n\n  private FileSystem DaemonProtocol.getFS(final Path path, final boolean local)\n      throws IOException {\n    FileSystem ret = null;\n    try {\n      ret = UserGroupInformation.getLoginUser().doAs (\n          new PrivilegedExceptionAction<FileSystem>() {\n            public FileSystem run() throws IOException {\n              FileSystem fs = null;\n              if (local) {\n                fs = FileSystem.getLocal(getDaemonConf());\n              } else {\n                fs = path.getFileSystem(getDaemonConf());\n              }\n              return fs;\n            }\n          });\n    } catch (InterruptedException ie) {\n    }\n    return ret;\n  }\n  \n  @SuppressWarnings(\"unchecked\")\n  public ControlAction[] DaemonProtocol.getActions(Writable key) \n    throws IOException {\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(key);\n      if(actionList == null) {\n        return new ControlAction[0];\n      } else {\n        return (ControlAction[]) actionList.toArray(new ControlAction[actionList\n                                                                      .size()]);\n      }\n    }\n  }\n\n\n  @SuppressWarnings(\"unchecked\")\n  public void DaemonProtocol.sendAction(ControlAction action) \n      throws IOException {\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(action.getTarget());\n      if(actionList == null) {\n        actionList = new ArrayList<ControlAction>();\n        actions.put(action.getTarget(), actionList);\n      }\n      actionList.add(action);\n    } \n  }\n \n  @SuppressWarnings(\"unchecked\")\n  public boolean DaemonProtocol.isActionPending(ControlAction action) \n    throws IOException{\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(action.getTarget());\n      if(actionList == null) {\n        return false;\n      } else {\n        return actionList.contains(action);\n      }\n    }\n  }\n  \n  \n  @SuppressWarnings(\"unchecked\")\n  public void DaemonProtocol.removeAction(ControlAction action) \n    throws IOException {\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(action.getTarget());\n      if(actionList == null) {\n        return;\n      } else {\n        actionList.remove(action);\n      }\n    }\n  }\n  \n  public void DaemonProtocol.clearActions() throws IOException {\n    synchronized (actions) {\n      actions.clear();\n    }\n  }\n\n  public String DaemonProtocol.getFilePattern() {\n    \/\/We use the environment variable HADOOP_LOGFILE to get the\n    \/\/pattern to use in the search.\n    String logDir = System.getenv(\"HADOOP_LOG_DIR\");\n    String daemonLogPattern = System.getenv(\"HADOOP_LOGFILE\");\n    if(daemonLogPattern == null && daemonLogPattern.isEmpty()) {\n      return \"*\";\n    }\n    return  logDir+File.separator+daemonLogPattern+\"*\";\n  }\n\n  public int DaemonProtocol.getNumberOfMatchesInLogFile(String pattern,\n      String[] list) throws IOException {\n    StringBuffer filePattern = new StringBuffer(getFilePattern());    \n    String[] cmd = null;\n    if (list != null) {\n      StringBuffer filterExpPattern = new StringBuffer();\n      int index=0;\n      for (String excludeExp : list) {\n        if (index++ < list.length -1) {\n           filterExpPattern.append(\"grep -v \" + excludeExp + \" | \");\n        } else {\n           filterExpPattern.append(\"grep -v \" + excludeExp + \" | wc -l\");\n        }\n      }\n      cmd = new String[] {\n                \"bash\",\n                \"-c\",\n                \"grep \"\n                + pattern + \" \" + filePattern + \" | \"\n                + filterExpPattern};\n    } else {\n      cmd = new String[] {\n                \"bash\",\n                \"-c\",\n                \"grep -c \"\n                + pattern + \" \" + filePattern\n                + \" | awk -F: '{s+=$2} END {print s}'\" };    \n    }\n    ShellCommandExecutor shexec = new ShellCommandExecutor(cmd);\n    shexec.execute();\n    String output = shexec.getOutput();\n    return Integer.parseInt(output.replaceAll(\"\\n\", \"\").trim());\n  }\n  \n  \/**\n   * This method is used for suspending the process.\n   * @param pid process id\n   * @throws IOException if an I\/O error occurs.\n   * @return true if process is suspended otherwise false.\n   *\/\n  public boolean DaemonProtocol.suspendProcess(String pid) throws IOException {\n    String suspendCmd = getDaemonConf().get(\"test.system.hdrc.suspend.cmd\",\n        \"kill -SIGSTOP\");\n    String [] command = {\"bash\", \"-c\", suspendCmd + \" \" + pid};\n    ShellCommandExecutor shexec = new ShellCommandExecutor(command);\n    try {\n      shexec.execute();\n    } catch (Shell.ExitCodeException e) {\n      LOG.warn(\"suspended process throws an exitcode \"\n          + \"exception for not being suspended the given process id.\");\n      return false;\n    }\n    LOG.info(\"The suspend process command is :\"\n        + shexec.toString()\n        + \" and the output for the command is \"\n        + shexec.getOutput());\n    return true;\n  }\n\n  \/**\n   * This method is used for resuming the process\n   * @param pid process id of suspended process.\n   * @throws IOException if an I\/O error occurs.\n   * @return true if suspeneded process is resumed otherwise false.\n   *\/\n  public boolean DaemonProtocol.resumeProcess(String pid) throws IOException {\n    String resumeCmd = getDaemonConf().get(\"test.system.hdrc.resume.cmd\",\n        \"kill -SIGCONT\");\n    String [] command = {\"bash\", \"-c\", resumeCmd + \" \" + pid};\n    ShellCommandExecutor shexec = new ShellCommandExecutor(command);\n    try {\n      shexec.execute();\n    } catch(Shell.ExitCodeException e) {\n        LOG.warn(\"Resume process throws an exitcode \"\n          + \"exception for not being resumed the given process id.\");\n      return false;\n    }\n    LOG.info(\"The resume process command is :\"\n        + shexec.toString()\n        + \" and the output for the command is \"\n        + shexec.getOutput());\n    return true;\n  }\n\n  private String DaemonProtocol.user = null;\n  \n  public String DaemonProtocol.getDaemonUser() {\n    return user;\n  }\n  \n  public void DaemonProtocol.setUser(String user) {\n    this.user = user;\n  }\n}\n","old_contents":"\/**\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements.  See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership.  The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * \"License\"); you may not use this file except in compliance\n * with the License.  You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.apache.hadoop.test.system;\n\nimport java.io.File;\nimport java.io.IOException;\nimport java.security.PrivilegedExceptionAction;\nimport java.util.HashMap;\nimport java.util.List;\nimport java.util.ArrayList;\nimport java.util.Map;\nimport java.util.Properties;\nimport org.apache.commons.logging.Log;\nimport org.apache.commons.logging.LogFactory;\nimport org.apache.hadoop.io.Writable;\nimport org.apache.hadoop.security.UserGroupInformation;\nimport org.apache.hadoop.util.Shell.ShellCommandExecutor;\nimport org.apache.hadoop.util.Shell;\nimport org.apache.hadoop.fs.FileStatus;\nimport org.apache.hadoop.fs.FileSystem;\nimport org.apache.hadoop.fs.Path;\nimport org.apache.hadoop.conf.Configuration;\n\n\/**\n * Default DaemonProtocolAspect which is used to provide default implementation\n * for all the common daemon methods. If a daemon requires more specialized\n * version of method, it is responsibility of the DaemonClient to introduce the\n * same in woven classes.\n * \n *\/\npublic aspect DaemonProtocolAspect {\n\n  private boolean DaemonProtocol.ready;\n  \n  @SuppressWarnings(\"unchecked\")\n  private HashMap<Object, List<ControlAction>> DaemonProtocol.actions = \n    new HashMap<Object, List<ControlAction>>();\n  private static final Log LOG = LogFactory.getLog(\n      DaemonProtocolAspect.class.getName());\n  \/**\n   * Set if the daemon process is ready or not, concrete daemon protocol should\n   * implement pointcuts to determine when the daemon is ready and use the\n   * setter to set the ready state.\n   * \n   * @param ready\n   *          true if the Daemon is ready.\n   *\/\n  public void DaemonProtocol.setReady(boolean ready) {\n    this.ready = ready;\n  }\n\n  \/**\n   * Checks if the daemon process is alive or not.\n   * \n   * @throws IOException\n   *           if daemon is not alive.\n   *\/\n  public void DaemonProtocol.ping() throws IOException {\n  }\n\n  \/**\n   * Checks if the daemon process is ready to accepting RPC connections after it\n   * finishes initialization. <br\/>\n   * \n   * @return true if ready to accept connection.\n   * \n   * @throws IOException\n   *\/\n  public boolean DaemonProtocol.isReady() throws IOException {\n    return ready;\n  }\n\n  \/**\n   * Returns the process related information regarding the daemon process. <br\/>\n   * \n   * @return process information.\n   * @throws IOException\n   *\/\n  public ProcessInfo DaemonProtocol.getProcessInfo() throws IOException {\n    int activeThreadCount = Thread.activeCount();\n    long currentTime = System.currentTimeMillis();\n    long maxmem = Runtime.getRuntime().maxMemory();\n    long freemem = Runtime.getRuntime().freeMemory();\n    long totalmem = Runtime.getRuntime().totalMemory();\n    Map<String, String> envMap = System.getenv();\n    Properties sysProps = System.getProperties();\n    Map<String, String> props = new HashMap<String, String>();\n    for (Map.Entry entry : sysProps.entrySet()) {\n      props.put((String) entry.getKey(), (String) entry.getValue());\n    }\n    ProcessInfo info = new ProcessInfoImpl(activeThreadCount, currentTime,\n        freemem, maxmem, totalmem, envMap, props);\n    return info;\n  }\n\n  public void DaemonProtocol.enable(List<Enum<?>> faults) throws IOException {\n  }\n\n  public void DaemonProtocol.disableAll() throws IOException {\n  }\n\n  public abstract Configuration DaemonProtocol.getDaemonConf()\n    throws IOException;\n\n  public FileStatus DaemonProtocol.getFileStatus(String path, boolean local) \n    throws IOException {\n    Path p = new Path(path);\n    FileSystem fs = getFS(p, local);\n    p.makeQualified(fs);\n    FileStatus fileStatus = fs.getFileStatus(p);\n    return cloneFileStatus(fileStatus);\n  }\n\n  public FileStatus[] DaemonProtocol.listStatus(String path, boolean local) \n    throws IOException {\n    Path p = new Path(path);\n    FileSystem fs = getFS(p, local);\n    FileStatus[] status = fs.listStatus(p);\n    if (status != null) {\n      FileStatus[] result = new FileStatus[status.length];\n      int i = 0;\n      for (FileStatus fileStatus : status) {\n        result[i++] = cloneFileStatus(fileStatus);\n      }\n      return result;\n    }\n    return status;\n  }\n\n  \/**\n   * FileStatus object may not be serializable. Clone it into raw FileStatus \n   * object.\n   *\/\n  private FileStatus DaemonProtocol.cloneFileStatus(FileStatus fileStatus) {\n    return new FileStatus(fileStatus.getLen(),\n        fileStatus.isDir(),\n        fileStatus.getReplication(),\n        fileStatus.getBlockSize(),\n        fileStatus.getModificationTime(),\n        fileStatus.getAccessTime(),\n        fileStatus.getPermission(),\n        fileStatus.getOwner(),\n        fileStatus.getGroup(),\n        fileStatus.getPath());\n  }\n\n  private FileSystem DaemonProtocol.getFS(final Path path, final boolean local)\n      throws IOException {\n    FileSystem ret = null;\n    try {\n      ret = UserGroupInformation.getLoginUser().doAs (\n          new PrivilegedExceptionAction<FileSystem>() {\n            public FileSystem run() throws IOException {\n              FileSystem fs = null;\n              if (local) {\n                fs = FileSystem.getLocal(getDaemonConf());\n              } else {\n                fs = path.getFileSystem(getDaemonConf());\n              }\n              return fs;\n            }\n          });\n    } catch (InterruptedException ie) {\n    }\n    return ret;\n  }\n  \n  @SuppressWarnings(\"unchecked\")\n  public ControlAction[] DaemonProtocol.getActions(Writable key) \n    throws IOException {\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(key);\n      if(actionList == null) {\n        return new ControlAction[0];\n      } else {\n        return (ControlAction[]) actionList.toArray(new ControlAction[actionList\n                                                                      .size()]);\n      }\n    }\n  }\n\n\n  @SuppressWarnings(\"unchecked\")\n  public void DaemonProtocol.sendAction(ControlAction action) \n      throws IOException {\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(action.getTarget());\n      if(actionList == null) {\n        actionList = new ArrayList<ControlAction>();\n        actions.put(action.getTarget(), actionList);\n      }\n      actionList.add(action);\n    } \n  }\n \n  @SuppressWarnings(\"unchecked\")\n  public boolean DaemonProtocol.isActionPending(ControlAction action) \n    throws IOException{\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(action.getTarget());\n      if(actionList == null) {\n        return false;\n      } else {\n        return actionList.contains(action);\n      }\n    }\n  }\n  \n  \n  @SuppressWarnings(\"unchecked\")\n  public void DaemonProtocol.removeAction(ControlAction action) \n    throws IOException {\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(action.getTarget());\n      if(actionList == null) {\n        return;\n      } else {\n        actionList.remove(action);\n      }\n    }\n  }\n  \n  public void DaemonProtocol.clearActions() throws IOException {\n    synchronized (actions) {\n      actions.clear();\n    }\n  }\n\n  public String DaemonProtocol.getFilePattern() {\n    \/\/We use the environment variable HADOOP_LOGFILE to get the\n    \/\/pattern to use in the search.\n    String logDir = System.getenv(\"HADOOP_LOG_DIR\");\n    String daemonLogPattern = System.getenv(\"HADOOP_LOGFILE\");\n    if(daemonLogPattern == null && daemonLogPattern.isEmpty()) {\n      return \"*\";\n    }\n    return  logDir+File.separator+daemonLogPattern+\"*\";\n  }\n\n  public int DaemonProtocol.getNumberOfMatchesInLogFile(String pattern,\n      String[] list) throws IOException {\n    StringBuffer filePattern = new StringBuffer(getFilePattern());    \n    String[] cmd = null;\n    if (list != null) {\n      StringBuffer filterExpPattern = new StringBuffer();\n      int index=0;\n      for (String excludeExp : list) {\n        if (index++ < list.length -1) {\n           filterExpPattern.append(\"grep -v \" + excludeExp + \" | \");\n        } else {\n           filterExpPattern.append(\"grep -vc \" + excludeExp);\n        }\n      }\n      cmd = new String[] {\n                \"bash\",\n                \"-c\",\n                \"grep \"\n                + pattern + \" \" + filePattern + \" | \"\n                + filterExpPattern};\n    } else {\n      cmd = new String[] {\n                \"bash\",\n                \"-c\",\n                \"grep -c \"\n                + pattern + \" \" + filePattern\n                + \" | awk -F: '{s+=$2} END {print s}'\" };    \n    }\n    ShellCommandExecutor shexec = new ShellCommandExecutor(cmd);\n    shexec.execute();\n    String output = shexec.getOutput();\n    return Integer.parseInt(output.replaceAll(\"\\n\", \"\").trim());\n  }\n  \n  \/**\n   * This method is used for suspending the process.\n   * @param pid process id\n   * @throws IOException if an I\/O error occurs.\n   * @return true if process is suspended otherwise false.\n   *\/\n  public boolean DaemonProtocol.suspendProcess(String pid) throws IOException {\n    String suspendCmd = getDaemonConf().get(\"test.system.hdrc.suspend.cmd\",\n        \"kill -SIGSTOP\");\n    String [] command = {\"bash\", \"-c\", suspendCmd + \" \" + pid};\n    ShellCommandExecutor shexec = new ShellCommandExecutor(command);\n    try {\n      shexec.execute();\n    } catch (Shell.ExitCodeException e) {\n      LOG.warn(\"suspended process throws an exitcode \"\n          + \"exception for not being suspended the given process id.\");\n      return false;\n    }\n    LOG.info(\"The suspend process command is :\"\n        + shexec.toString()\n        + \" and the output for the command is \"\n        + shexec.getOutput());\n    return true;\n  }\n\n  \/**\n   * This method is used for resuming the process\n   * @param pid process id of suspended process.\n   * @throws IOException if an I\/O error occurs.\n   * @return true if suspeneded process is resumed otherwise false.\n   *\/\n  public boolean DaemonProtocol.resumeProcess(String pid) throws IOException {\n    String resumeCmd = getDaemonConf().get(\"test.system.hdrc.resume.cmd\",\n        \"kill -SIGCONT\");\n    String [] command = {\"bash\", \"-c\", resumeCmd + \" \" + pid};\n    ShellCommandExecutor shexec = new ShellCommandExecutor(command);\n    try {\n      shexec.execute();\n    } catch(Shell.ExitCodeException e) {\n        LOG.warn(\"Resume process throws an exitcode \"\n          + \"exception for not being resumed the given process id.\");\n      return false;\n    }\n    LOG.info(\"The resume process command is :\"\n        + shexec.toString()\n        + \" and the output for the command is \"\n        + shexec.getOutput());\n    return true;\n  }\n\n  private String DaemonProtocol.user = null;\n  \n  public String DaemonProtocol.getDaemonUser() {\n    return user;\n  }\n  \n  public void DaemonProtocol.setUser(String user) {\n    this.user = user;\n  }\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"bb5ef2d08497189fc36d085d5aa038b39ea282f8","subject":"Formatting","message":"Formatting\n","repos":"josauder\/AOP_incubator_beam,josauder\/AOP_incubator_beam","old_file":"sdks\/java\/core\/src\/main\/java\/org\/apache\/beam\/aspects\/TracingAspect.aj","new_file":"sdks\/java\/core\/src\/main\/java\/org\/apache\/beam\/aspects\/TracingAspect.aj","new_contents":"package org.apache.beam.aspects;\n\nimport org.aspectj.lang.Signature;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\n\/**\n * Created by jonathan on 17.01.17.\n *\/\naspect TracingAspect {\n    pointcut aspects(): within (org.apache.beam.aspects.*);\n    pointcut project(): within (org.apache.beam.*.*) && !aspects();\n    pointcut constructors(): call(*.new(..)) && project();\n    pointcut methods(): project() && call(* *(..));\n\n    Tree<Signature> tree = new Tree<>(null, null);\n    Tree<Signature> currentNode = tree;\n\n    Object around (): constructors() || methods() {\n        Signature sig = thisJoinPointStaticPart.getSignature();\n        Tree<Signature> child;\n        if ((child=currentNode.getChildWithValue(sig))==null) {\n            child = new Tree<>(sig,currentNode);\n        }\n        currentNode = child;\n        currentNode.incrementCounter();\n        Object o = proceed();\n        currentNode = currentNode.getParent();\n        if (currentNode==tree) {\n            System.out.println(tree);\n        }\n        return o;\n    }\n}\n","old_contents":"package org.apache.beam.aspects;\n\nimport org.aspectj.lang.Signature;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\n\/**\n * Created by jonathan on 17.01.17.\n *\/\naspect TracingAspect {\n    pointcut aspects(): within (org.apache.beam.aspects.*);\n    pointcut project(): within (org.apache.beam.*.*) && !aspects();\n    pointcut constructors(): call(*.new(..)) && project();\n    pointcut methods(): project() && call(* *(..));\n\n    Tree<Signature> tree = new Tree<>(null, null);\n    Tree<Signature> currentNode = tree;\n\n    Object around (): constructors() || methods() {\n        Signature sig = thisJoinPointStaticPart.getSignature();\n        Tree<Signature> child;\n        if ((child=currentNode.getChildWithValue(sig))==null) {\n            child = new Tree<>(sig,currentNode);\n        }\n        currentNode = child;\n        if (currentNode==tree) {\n            System.out.println(tree);\n        }\n        currentNode.incrementCounter();\n        Object o = proceed();\n        currentNode = currentNode.getParent();\n        return o;\n    }\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"10d14c5b1b2299509a5ad46052f5c5dd1b1a65da","subject":"*Event id fixed for unlock event","message":"*Event id fixed for unlock event\n","repos":"selig\/qea","old_file":"code\/qea\/src\/benchmark\/competition\/java\/jUnitRV_MMT\/monitoring\/JUnitRV_MMTThreeAspect.aj","new_file":"code\/qea\/src\/benchmark\/competition\/java\/jUnitRV_MMT\/monitoring\/JUnitRV_MMTThreeAspect.aj","new_contents":"package benchmark.competition.java.jUnitRV_MMT.monitoring;\r\n\r\nimport java.util.concurrent.locks.Lock;\r\n\r\nimport monitoring.impl.MonitorFactory;\r\nimport monitoring.intf.Monitor;\r\nimport properties.Property;\r\nimport properties.competition.JavaRV_mmt;\r\nimport structure.impl.other.Verdict;\r\nimport structure.intf.QEA;\r\nimport benchmark.competition.java.jUnitRV_MMT.ExampleLocking;\r\n\r\npublic aspect JUnitRV_MMTThreeAspect {\r\n\r\n\tprivate final Monitor monitor;\r\n\r\n\tprivate final int RUN = 1;\r\n\tprivate final int LOCK_TRUE = 2;\r\n\tprivate final int UNLOCK = 3;\r\n\tprivate final int ACTION = 4;\r\n\r\n\tpublic JUnitRV_MMTThreeAspect() {\r\n\t\tQEA qea = new JavaRV_mmt().make(Property.JAVARV_MMT_THREE);\r\n\t\tmonitor = MonitorFactory.create(qea);\r\n\t}\r\n\r\n\tpointcut run(ExampleLocking thread) : execution(void ExampleLocking.run())\r\n\t\t&& target(thread);\r\n\r\n\tpointcut action(ExampleLocking thread) : call(void ExampleLocking.action())\r\n\t\t&& target(thread);\r\n\r\n\tbefore(ExampleLocking thread) : run(thread) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(RUN, thread);\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [thread=\"\r\n\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n\tboolean around(Lock lockObj, ExampleLocking thread) :\r\n\t\t\tcall(boolean Lock.tryLock())\r\n\t\t\t&& cflow(call(boolean ExampleLocking.lock())) && target(lockObj)\r\n\t\t\t&& this(thread) {\r\n\r\n\t\tboolean result = false;\r\n\t\t\/\/ We perform the lock and the monitor step as an atomic action\r\n\t\t\/\/ i.e. whilst holding the lockObj, so that we cannot be interrupted\r\n\t\tsynchronized (lockObj) {\r\n\t\t\tresult = proceed(lockObj, thread);\t\t\r\n\t\t\tif (result) {\r\n\t\t\t\tVerdict verdict = null;\r\n\t\t\t\t\/\/ Ordering between lockObj and monitor important\r\n\t\t\t\tsynchronized (monitor) {\r\n\t\t\t\t\tverdict = monitor.step(LOCK_TRUE, thread);\r\n\t\t\t\t}\r\n\t\t\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\t\t\tSystem.err\r\n\t\t\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [thread=\"\r\n\t\t\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t\t\t}\r\n\t\r\n\t\t\t}\r\n\t\t}\r\n\t\treturn result;\r\n\t};\r\n\r\n\tvoid around(Lock lockObj, ExampleLocking thread) :\r\n\t\tcall(void Lock.unlock()) && cflow(call(void ExampleLocking.unlock()))\r\n\t\t&& target(lockObj) && this(thread) {\r\n\r\n\t\t\/\/ We perform the unlock and the monitor step as an atomic action\r\n\t\t\/\/ i.e. whilst holding the lockObj, so that we cannot be interrupted\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (lockObj) {\r\n\t\t\tproceed(lockObj, thread);\t\r\n\t\t\t\/\/ Ordering between lockObj and monitor important\r\n\t\t\tsynchronized (monitor) {\r\n\t\t\t\tverdict = monitor.step(UNLOCK, thread);\r\n\t\t\t}\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [thread=\"\r\n\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n\tbefore(ExampleLocking thread) : action(thread) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(ACTION, thread);\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [id=\"\r\n\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n}\r\n","old_contents":"package benchmark.competition.java.jUnitRV_MMT.monitoring;\r\n\r\nimport java.util.concurrent.locks.Lock;\r\n\r\nimport monitoring.impl.MonitorFactory;\r\nimport monitoring.intf.Monitor;\r\nimport properties.Property;\r\nimport properties.competition.JavaRV_mmt;\r\nimport structure.impl.other.Verdict;\r\nimport structure.intf.QEA;\r\nimport benchmark.competition.java.jUnitRV_MMT.ExampleLocking;\r\n\r\npublic aspect JUnitRV_MMTThreeAspect {\r\n\r\n\tprivate final Monitor monitor;\r\n\r\n\tprivate final int RUN = 1;\r\n\tprivate final int LOCK_TRUE = 2;\r\n\tprivate final int UNLOCK = 3;\r\n\tprivate final int ACTION = 4;\r\n\r\n\tpublic JUnitRV_MMTThreeAspect() {\r\n\t\tQEA qea = new JavaRV_mmt().make(Property.JAVARV_MMT_THREE);\r\n\t\tmonitor = MonitorFactory.create(qea);\r\n\t}\r\n\r\n\tpointcut run(ExampleLocking thread) : execution(void ExampleLocking.run())\r\n\t\t&& target(thread);\r\n\r\n\tpointcut action(ExampleLocking thread) : call(void ExampleLocking.action())\r\n\t\t&& target(thread);\r\n\r\n\tbefore(ExampleLocking thread) : run(thread) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(RUN, thread);\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [thread=\"\r\n\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n\tboolean around(Lock lockObj, ExampleLocking thread) :\r\n\t\t\tcall(boolean Lock.tryLock())\r\n\t\t\t&& cflow(call(boolean ExampleLocking.lock())) && target(lockObj)\r\n\t\t\t&& this(thread) {\r\n\r\n\t\tboolean result = false;\r\n\t\t\/\/ We perform the lock and the monitor step as an atomic action\r\n\t\t\/\/ i.e. whilst holding the lockObj, so that we cannot be interrupted\r\n\t\tsynchronized (lockObj) {\r\n\t\t\tresult = proceed(lockObj, thread);\t\t\r\n\t\t\tif (result) {\r\n\t\t\t\tVerdict verdict = null;\r\n\t\t\t\t\/\/ Ordering between lockObj and monitor important\r\n\t\t\t\tsynchronized (monitor) {\r\n\t\t\t\t\tverdict = monitor.step(LOCK_TRUE, thread);\r\n\t\t\t\t}\r\n\t\t\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\t\t\tSystem.err\r\n\t\t\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [thread=\"\r\n\t\t\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t\t\t}\r\n\t\r\n\t\t\t}\r\n\t\t}\r\n\t\treturn result;\r\n\t};\r\n\r\n\tvoid around(Lock lockObj, ExampleLocking thread) :\r\n\t\tcall(void Lock.unlock()) && cflow(call(void ExampleLocking.unlock()))\r\n\t\t&& target(lockObj) && this(thread) {\r\n\r\n\t\t\/\/ We perform the unlock and the monitor step as an atomic action\r\n\t\t\/\/ i.e. whilst holding the lockObj, so that we cannot be interrupted\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (lockObj) {\r\n\t\t\tproceed(lockObj, thread);\t\r\n\t\t\t\/\/ Ordering between lockObj and monitor important\r\n\t\t\tsynchronized (monitor) {\r\n\t\t\t\tverdict = monitor.step(LOCK_TRUE, thread);\r\n\t\t\t}\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [thread=\"\r\n\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n\tbefore(ExampleLocking thread) : action(thread) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(ACTION, thread);\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [id=\"\r\n\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n}\r\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"f9b7132b05aba961cc0af9d0eb42849b4df63f61","subject":"fix NPE in DOMAspect.aj","message":"fix NPE in DOMAspect.aj\n","repos":"Kwestor\/scala-ide,pilipolio\/scala-ide,andrey-ilinykh\/scala-ide,romanowski\/scala-ide,romanowski\/scala-ide,aleksi-lukkarinen\/scala-ide,pilipolio\/scala-ide,sschaef\/scala-ide,aleksi-lukkarinen\/scala-ide,wpopielarski\/scala-ide,Duhemm\/scala-ide,dragos\/scala-ide,andrey-ilinykh\/scala-ide,Duhemm\/scala-ide,aleksi-lukkarinen\/scala-ide,Kwestor\/scala-ide,andrey-ilinykh\/scala-ide,stephenh\/scala-ide,dragos\/scala-ide,Duhemm\/scala-ide,scala-ide\/scala-ide,scala-ide\/scala-ide,Kwestor\/scala-ide,scala-ide\/scala-ide,sschaef\/scala-ide,stephenh\/scala-ide,aleksi-lukkarinen\/scala-ide,wpopielarski\/scala-ide,romanowski\/scala-ide,romanowski\/scala-ide,pilipolio\/scala-ide,wpopielarski\/scala-ide,mlangc\/scala-ide,Kwestor\/scala-ide,sschaef\/scala-ide,stephenh\/scala-ide,andrey-ilinykh\/scala-ide,pilipolio\/scala-ide,dragos\/scala-ide,scala-ide\/scala-ide,mlangc\/scala-ide,stephenh\/scala-ide,Duhemm\/scala-ide,sschaef\/scala-ide,mlangc\/scala-ide,dragos\/scala-ide,wpopielarski\/scala-ide,mlangc\/scala-ide","old_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/core\/DOMAspect.aj","new_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/core\/DOMAspect.aj","new_contents":"\/*\n * Copyright 2005-2010 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.core;\n\nimport java.util.Locale;\nimport java.util.Map;\n\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.core.ICompilationUnit;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.core.compiler.CharOperation;\nimport org.eclipse.jdt.core.dom.AST;\nimport org.eclipse.jdt.core.dom.ASTNode;\nimport org.eclipse.jdt.core.dom.ASTParser;\nimport org.eclipse.jdt.internal.compiler.CompilationResult;\nimport org.eclipse.jdt.internal.compiler.DefaultErrorHandlingPolicies;\nimport org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.AbstractVariableDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.AnnotationMethodDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.Argument;\nimport org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.ConstructorDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.Expression;\nimport org.eclipse.jdt.internal.compiler.ast.MethodDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.QualifiedAllocationExpression;\nimport org.eclipse.jdt.internal.compiler.ast.Statement;\nimport org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.TypeParameter;\nimport org.eclipse.jdt.internal.compiler.ast.TypeReference;\nimport org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;\nimport org.eclipse.jdt.internal.compiler.env.AccessRestriction;\nimport org.eclipse.jdt.internal.compiler.env.IBinaryType;\nimport org.eclipse.jdt.internal.compiler.env.INameEnvironment;\nimport org.eclipse.jdt.internal.compiler.env.ISourceType;\nimport org.eclipse.jdt.internal.compiler.impl.CompilerOptions;\nimport org.eclipse.jdt.internal.compiler.impl.ITypeRequestor;\nimport org.eclipse.jdt.internal.compiler.lookup.LookupEnvironment;\nimport org.eclipse.jdt.internal.compiler.lookup.PackageBinding;\nimport org.eclipse.jdt.internal.compiler.parser.SourceTypeConverter;\nimport org.eclipse.jdt.internal.compiler.problem.DefaultProblemFactory;\nimport org.eclipse.jdt.internal.compiler.problem.ProblemReporter;\nimport org.eclipse.jdt.internal.core.DefaultWorkingCopyOwner;\nimport org.eclipse.jdt.internal.core.JavaProject;\nimport org.eclipse.jdt.internal.core.SourceAnnotationMethodInfo;\nimport org.eclipse.jdt.internal.core.SourceMethod;\nimport org.eclipse.jdt.internal.core.SourceMethodElementInfo;\nimport org.eclipse.jdt.internal.core.SourceType;\nimport org.eclipse.jdt.internal.core.SourceTypeElementInfo;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaCompilationUnit;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect DOMAspect {\n  pointcut internalCreateAST(ASTParser parser, IProgressMonitor monitor) :\n    execution(ASTNode ASTParser.internalCreateAST(IProgressMonitor)) &&\n    args(monitor) &&\n    target(parser);\n  \n  pointcut convert(SourceTypeConverter stc, SourceMethod methodHandle, SourceMethodElementInfo methodInfo, CompilationResult compilationResult) :\n    execution(AbstractMethodDeclaration SourceTypeConverter.convert(SourceMethod, SourceMethodElementInfo, CompilationResult)) &&\n    args(methodHandle, methodInfo, compilationResult) &&\n    target(stc);\n  \n  ASTNode around(ASTParser parser, IProgressMonitor monitor) :\n    internalCreateAST(parser, monitor) {\n    try {\n      if (!(parser.typeRoot instanceof IScalaCompilationUnit))\n        return proceed(parser, monitor);\n      \n      ICompilationUnit cu = (ICompilationUnit)parser.typeRoot;\n      org.eclipse.jdt.internal.compiler.env.ICompilationUnit sourceUnit = (org.eclipse.jdt.internal.compiler.env.ICompilationUnit)cu;\n      \n      IType[] topLevelTypes = cu.getTypes();\n      int length = topLevelTypes.length;\n      if (length == 0)\n        throw new IllegalStateException();\n      \n      SourceTypeElementInfo[] topLevelInfos = new SourceTypeElementInfo[length];\n      for (int i = 0; i < length; i++) {\n        topLevelInfos[i] = (SourceTypeElementInfo) ((SourceType)topLevelTypes[i]).getElementInfo();\n      }\n      char[] fileName = ((ISourceType)topLevelInfos[0]).getFileName();\n      \n      CompilationResult result = new CompilationResult(fileName, 1, 1, 100);\n\n      JavaProject javaProject = (JavaProject)cu.getJavaProject(); \n      Map compilerOptions0 = javaProject.getOptions(true);\n      CompilerOptions compilerOptions = new CompilerOptions(compilerOptions0);\n      compilerOptions.storeAnnotations = true;\n      \n      ProblemReporter problemReporter =\n        new ProblemReporter(\n          DefaultErrorHandlingPolicies.proceedWithAllProblems(),\n          compilerOptions,\n          new DefaultProblemFactory(Locale.getDefault()));\n      \n      int flags = SourceTypeConverter.FIELD_AND_METHOD | SourceTypeConverter.MEMBER_TYPE;\n      \n      CompilationUnitDeclaration unit =\n        SourceTypeConverter.buildCompilationUnit(topLevelInfos, flags, problemReporter, result);\n      \n      INameEnvironment ne = javaProject.newSearchableNameEnvironment(DefaultWorkingCopyOwner.PRIMARY);\n      final LookupEnvironment le = new LookupEnvironment(null, compilerOptions, problemReporter, ne);\n      ITypeRequestor typeRequestor = new ITypeRequestor() {\n        public void accept(IBinaryType binaryType, PackageBinding packageBinding, AccessRestriction accessRestriction) {\n          le.createBinaryTypeFrom(binaryType, packageBinding, accessRestriction);\n        }\n        public void accept(org.eclipse.jdt.internal.compiler.env.ICompilationUnit unit, AccessRestriction accessRestriction) {}\n        public void accept(ISourceType[] sourceType, PackageBinding packageBinding, AccessRestriction accessRestriction) {}\n      };\n      le.typeRequestor = typeRequestor;\n      \n      le.buildTypeBindings(unit, null);\n      le.completeTypeBindings();\n      fixTypes(unit.types);\n      \n      AST ast = AST.newAST(AST.JLS3);\n      ast.setFlag(AST.RESOLVED_BINDINGS);\n      ast.setDefaultNodeFlag(ASTNode.ORIGINAL);\n\n      org.eclipse.jdt.core.dom.ASTConverter converter =\n        new org.eclipse.jdt.core.dom.ASTConverter(compilerOptions0, true, monitor);\n      \n      org.eclipse.jdt.core.dom.BindingResolver resolver =\n        new org.eclipse.jdt.core.dom.DefaultBindingResolver(\n          unit.scope,\n          DefaultWorkingCopyOwner.PRIMARY,\n          new org.eclipse.jdt.core.dom.DefaultBindingResolver.BindingTables(),\n          true);\n      ast.setBindingResolver(resolver);\n      converter.setAST(ast);\n      \n      ASTNode node = converter.convert(unit, sourceUnit.getContents());\n      return node;\n    } catch (JavaModelException ex) {\n      throw new IllegalArgumentException(ex);\n    }\n  }\n  \n  private void fixTypes(TypeDeclaration[] types) {\n    for(int i = 0, iLimit = types.length; i < iLimit ; ++i) {\n      TypeDeclaration tpe = types[i];\n      if (tpe != null) {\n        if (tpe.binding != null) tpe.binding.getAnnotationTagBits();\n        if (tpe.scope != null) {\n          tpe.scope.buildFields();\n          tpe.scope.buildMethods();\n        }\n        fixFields(tpe.fields);\n        fixMethods(tpe.methods);\n        fixTypes(tpe.memberTypes);\n      }\n    }\n  }\n  \n  private void fixMethods(AbstractMethodDeclaration[] methods) {\n    if (methods == null)\n      return;\n    \n    for(int i = 0, iLimit = methods.length; i < iLimit; ++i) {\n      AbstractMethodDeclaration m = methods[i];\n      m.bodyStart = m.declarationSourceStart;\n      m.bodyEnd = m.declarationSourceEnd;\n      m.binding.getAnnotationTagBits();\n    }\n  }\n  \n  private void fixFields(AbstractVariableDeclaration[] fields) {\n    if (fields == null)\n      return;\n    \n    for(int i = 0, iLimit = fields.length; i < iLimit; ++i) {\n      AbstractVariableDeclaration f = fields[i];\n      f.declarationEnd = f.declarationSourceEnd;\n    }\n  }\n\n  AbstractMethodDeclaration around(SourceTypeConverter stc, SourceMethod methodHandle, SourceMethodElementInfo methodInfo, CompilationResult compilationResult) throws JavaModelException :\n    convert(stc, methodHandle, methodInfo, compilationResult) {\n    AbstractMethodDeclaration method;\n\n    \/* only source positions available *\/\n    int start = methodInfo.getNameSourceStart();\n    int end = methodInfo.getNameSourceEnd();\n\n    \/\/ convert 1.5 specific constructs only if compliance is 1.5 or above\n    TypeParameter[] typeParams = null;\n    if (stc.has1_5Compliance) {\n      \/* convert type parameters *\/\n      char[][] typeParameterNames = methodInfo.getTypeParameterNames();\n      if (typeParameterNames != null) {\n        int parameterCount = typeParameterNames.length;\n        if (parameterCount > 0) { \/\/ method's type parameters must be null if no type parameter\n          char[][][] typeParameterBounds = methodInfo.getTypeParameterBounds();\n          typeParams = new TypeParameter[parameterCount];\n          for (int i = 0; i < parameterCount; i++) {\n            typeParams[i] = stc.createTypeParameter(typeParameterNames[i], typeParameterBounds[i], start, end);\n          }\n        }\n      }\n    }\n\n    int modifiers = methodInfo.getModifiers();\n    if (methodInfo.isConstructor()) {\n      ConstructorDeclaration decl = new ConstructorDeclaration(compilationResult);\n      decl.bits &= ~org.eclipse.jdt.internal.compiler.ast.ASTNode.IsDefaultConstructor;\n      method = decl;\n      decl.typeParameters = typeParams;\n    } else {\n      MethodDeclaration decl;\n      if (methodInfo.isAnnotationMethod()) {\n        AnnotationMethodDeclaration annotationMethodDeclaration = new AnnotationMethodDeclaration(compilationResult);\n\n        \/* conversion of default value *\/\n        SourceAnnotationMethodInfo annotationMethodInfo = (SourceAnnotationMethodInfo) methodInfo;\n        boolean hasDefaultValue = annotationMethodInfo.defaultValueStart != -1 || annotationMethodInfo.defaultValueEnd != -1;\n        if ((stc.flags & SourceTypeConverter.FIELD_INITIALIZATION) != 0) {\n          if (hasDefaultValue) {\n            char[] defaultValueSource = CharOperation.subarray(stc.getSource(), annotationMethodInfo.defaultValueStart, annotationMethodInfo.defaultValueEnd+1);\n            if (defaultValueSource != null) {\n                Expression expression =  stc.parseMemberValue(defaultValueSource);\n                if (expression != null) {\n                  annotationMethodDeclaration.defaultValue = expression;\n                }\n            } else {\n              \/\/ could not retrieve the default value\n              hasDefaultValue = false;\n            }\n          }\n        }\n        if (hasDefaultValue)\n          modifiers |= ClassFileConstants.AccAnnotationDefault;\n        decl = annotationMethodDeclaration;\n      } else {\n        decl = new MethodDeclaration(compilationResult);\n      }\n\n      \/\/ convert return type\n      decl.returnType = stc.createTypeReference(methodInfo.getReturnTypeName(), start, end);\n\n      \/\/ type parameters\n      decl.typeParameters = typeParams;\n\n      method = decl;\n    }\n    method.selector = methodHandle.getElementName().toCharArray();\n    boolean isVarargs = (modifiers & ClassFileConstants.AccVarargs) != 0;\n    method.modifiers = modifiers & ~ClassFileConstants.AccVarargs;\n    method.sourceStart = start;\n    method.sourceEnd = end;\n    method.declarationSourceStart = methodInfo.getDeclarationSourceStart();\n    method.declarationSourceEnd = methodInfo.getDeclarationSourceEnd();\n\n    \/\/ convert 1.5 specific constructs only if compliance is 1.5 or above\n    if (stc.has1_5Compliance) {\n      \/* convert annotations *\/\n      method.annotations = stc.convertAnnotations(methodHandle);\n    }\n\n    \/* convert arguments *\/\n    String[] argumentTypeSignatures = methodHandle.getParameterTypes();\n    char[][] argumentNames = methodInfo.getArgumentNames();\n    int argumentCount = argumentTypeSignatures == null ? 0 : argumentTypeSignatures.length;\n    if (argumentCount > 0) {\n      long position = ((long) start << 32) + end;\n      method.arguments = new Argument[argumentCount];\n      for (int i = 0; i < argumentCount; i++) {\n        TypeReference typeReference = stc.createTypeReference(argumentTypeSignatures[i], start, end);\n        if (isVarargs && i == argumentCount-1) {\n          typeReference.bits |= org.eclipse.jdt.internal.compiler.ast.ASTNode.IsVarArgs;\n        }\n        method.arguments[i] =\n          new Argument(\n            argumentNames[i],\n            position,\n            typeReference,\n            ClassFileConstants.AccDefault);\n        \/\/ do not care whether was final or not\n      }\n    }\n\n    \/* convert thrown exceptions *\/\n    char[][] exceptionTypeNames = methodInfo.getExceptionTypeNames();\n    int exceptionCount = exceptionTypeNames == null ? 0 : exceptionTypeNames.length;\n    if (exceptionCount > 0) {\n      method.thrownExceptions = new TypeReference[exceptionCount];\n      for (int i = 0; i < exceptionCount; i++) {\n        method.thrownExceptions[i] =\n          stc.createTypeReference(exceptionTypeNames[i], start, end);\n      }\n    }\n\n    \/* convert local and anonymous types *\/\n    if ((stc.flags & SourceTypeConverter.LOCAL_TYPE) != 0) {\n      IJavaElement[] children = methodInfo.getChildren();\n      int typesLength = 0;\n      int childrenLength = children.length;\n      for (int i = 0; i < childrenLength; ++i)\n        if (children[i] instanceof SourceType)\n          ++typesLength;\n      \n      if (typesLength != 0) {\n        Statement[] statements = new Statement[typesLength];\n        int typeIndex = 0;\n        for (int i = 0; i < childrenLength; i++) {\n          if (children[i] instanceof SourceType) {\n            SourceType type = (SourceType) children[i];\n            TypeDeclaration localType = stc.convert(type, compilationResult);\n            if ((localType.bits & org.eclipse.jdt.internal.compiler.ast.ASTNode.IsAnonymousType) != 0) {\n              QualifiedAllocationExpression expression = new QualifiedAllocationExpression(localType);\n              expression.type = localType.superclass;\n              localType.superclass = null;\n              localType.superInterfaces = null;\n              localType.allocation = expression;\n              statements[typeIndex] = expression;\n            } else {\n              statements[typeIndex] = localType;\n            }\n            ++typeIndex;\n          }\n        }\n        method.statements = statements;\n      }\n    }\n\n    return method;\n  }\n}\n","old_contents":"\/*\n * Copyright 2005-2010 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.core;\n\nimport java.util.Locale;\nimport java.util.Map;\n\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.core.ICompilationUnit;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.core.compiler.CharOperation;\nimport org.eclipse.jdt.core.dom.AST;\nimport org.eclipse.jdt.core.dom.ASTNode;\nimport org.eclipse.jdt.core.dom.ASTParser;\nimport org.eclipse.jdt.internal.compiler.CompilationResult;\nimport org.eclipse.jdt.internal.compiler.DefaultErrorHandlingPolicies;\nimport org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.AbstractVariableDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.AnnotationMethodDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.Argument;\nimport org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.ConstructorDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.Expression;\nimport org.eclipse.jdt.internal.compiler.ast.MethodDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.QualifiedAllocationExpression;\nimport org.eclipse.jdt.internal.compiler.ast.Statement;\nimport org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.TypeParameter;\nimport org.eclipse.jdt.internal.compiler.ast.TypeReference;\nimport org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;\nimport org.eclipse.jdt.internal.compiler.env.AccessRestriction;\nimport org.eclipse.jdt.internal.compiler.env.IBinaryType;\nimport org.eclipse.jdt.internal.compiler.env.INameEnvironment;\nimport org.eclipse.jdt.internal.compiler.env.ISourceType;\nimport org.eclipse.jdt.internal.compiler.impl.CompilerOptions;\nimport org.eclipse.jdt.internal.compiler.impl.ITypeRequestor;\nimport org.eclipse.jdt.internal.compiler.lookup.LookupEnvironment;\nimport org.eclipse.jdt.internal.compiler.lookup.PackageBinding;\nimport org.eclipse.jdt.internal.compiler.parser.SourceTypeConverter;\nimport org.eclipse.jdt.internal.compiler.problem.DefaultProblemFactory;\nimport org.eclipse.jdt.internal.compiler.problem.ProblemReporter;\nimport org.eclipse.jdt.internal.core.DefaultWorkingCopyOwner;\nimport org.eclipse.jdt.internal.core.JavaProject;\nimport org.eclipse.jdt.internal.core.SourceAnnotationMethodInfo;\nimport org.eclipse.jdt.internal.core.SourceMethod;\nimport org.eclipse.jdt.internal.core.SourceMethodElementInfo;\nimport org.eclipse.jdt.internal.core.SourceType;\nimport org.eclipse.jdt.internal.core.SourceTypeElementInfo;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaCompilationUnit;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect DOMAspect {\n  pointcut internalCreateAST(ASTParser parser, IProgressMonitor monitor) :\n    execution(ASTNode ASTParser.internalCreateAST(IProgressMonitor)) &&\n    args(monitor) &&\n    target(parser);\n  \n  pointcut convert(SourceTypeConverter stc, SourceMethod methodHandle, SourceMethodElementInfo methodInfo, CompilationResult compilationResult) :\n    execution(AbstractMethodDeclaration SourceTypeConverter.convert(SourceMethod, SourceMethodElementInfo, CompilationResult)) &&\n    args(methodHandle, methodInfo, compilationResult) &&\n    target(stc);\n  \n  ASTNode around(ASTParser parser, IProgressMonitor monitor) :\n    internalCreateAST(parser, monitor) {\n    try {\n      if (!(parser.typeRoot instanceof IScalaCompilationUnit))\n        return proceed(parser, monitor);\n      \n      ICompilationUnit cu = (ICompilationUnit)parser.typeRoot;\n      org.eclipse.jdt.internal.compiler.env.ICompilationUnit sourceUnit = (org.eclipse.jdt.internal.compiler.env.ICompilationUnit)cu;\n      \n      IType[] topLevelTypes = cu.getTypes();\n      int length = topLevelTypes.length;\n      if (length == 0)\n        throw new IllegalStateException();\n      \n      SourceTypeElementInfo[] topLevelInfos = new SourceTypeElementInfo[length];\n      for (int i = 0; i < length; i++) {\n        topLevelInfos[i] = (SourceTypeElementInfo) ((SourceType)topLevelTypes[i]).getElementInfo();\n      }\n      char[] fileName = ((ISourceType)topLevelInfos[0]).getFileName();\n      \n      CompilationResult result = new CompilationResult(fileName, 1, 1, 100);\n\n      JavaProject javaProject = (JavaProject)cu.getJavaProject(); \n      Map compilerOptions0 = javaProject.getOptions(true);\n      CompilerOptions compilerOptions = new CompilerOptions(compilerOptions0);\n      compilerOptions.storeAnnotations = true;\n      \n      ProblemReporter problemReporter =\n        new ProblemReporter(\n          DefaultErrorHandlingPolicies.proceedWithAllProblems(),\n          compilerOptions,\n          new DefaultProblemFactory(Locale.getDefault()));\n      \n      int flags = SourceTypeConverter.FIELD_AND_METHOD | SourceTypeConverter.MEMBER_TYPE;\n      \n      CompilationUnitDeclaration unit =\n        SourceTypeConverter.buildCompilationUnit(topLevelInfos, flags, problemReporter, result);\n      \n      INameEnvironment ne = javaProject.newSearchableNameEnvironment(DefaultWorkingCopyOwner.PRIMARY);\n      final LookupEnvironment le = new LookupEnvironment(null, compilerOptions, problemReporter, ne);\n      ITypeRequestor typeRequestor = new ITypeRequestor() {\n        public void accept(IBinaryType binaryType, PackageBinding packageBinding, AccessRestriction accessRestriction) {\n          le.createBinaryTypeFrom(binaryType, packageBinding, accessRestriction);\n        }\n        public void accept(org.eclipse.jdt.internal.compiler.env.ICompilationUnit unit, AccessRestriction accessRestriction) {}\n        public void accept(ISourceType[] sourceType, PackageBinding packageBinding, AccessRestriction accessRestriction) {}\n      };\n      le.typeRequestor = typeRequestor;\n      \n      le.buildTypeBindings(unit, null);\n      le.completeTypeBindings();\n      fixTypes(unit.types);\n      \n      AST ast = AST.newAST(AST.JLS3);\n      ast.setFlag(AST.RESOLVED_BINDINGS);\n      ast.setDefaultNodeFlag(ASTNode.ORIGINAL);\n\n      org.eclipse.jdt.core.dom.ASTConverter converter =\n        new org.eclipse.jdt.core.dom.ASTConverter(compilerOptions0, true, monitor);\n      \n      org.eclipse.jdt.core.dom.BindingResolver resolver =\n        new org.eclipse.jdt.core.dom.DefaultBindingResolver(\n          unit.scope,\n          DefaultWorkingCopyOwner.PRIMARY,\n          new org.eclipse.jdt.core.dom.DefaultBindingResolver.BindingTables(),\n          true);\n      ast.setBindingResolver(resolver);\n      converter.setAST(ast);\n      \n      ASTNode node = converter.convert(unit, sourceUnit.getContents());\n      return node;\n    } catch (JavaModelException ex) {\n      throw new IllegalArgumentException(ex);\n    }\n  }\n  \n  private void fixTypes(TypeDeclaration[] types) {\n    for(int i = 0, iLimit = types.length; i < iLimit ; ++i) {\n      TypeDeclaration tpe = types[i];\n      if (tpe != null) {\n        tpe.binding.getAnnotationTagBits();\n        tpe.scope.buildFields();\n        tpe.scope.buildMethods();\n        fixFields(tpe.fields);\n        fixMethods(tpe.methods);\n        fixTypes(tpe.memberTypes);\n      }\n    }\n  }\n  \n  private void fixMethods(AbstractMethodDeclaration[] methods) {\n    if (methods == null)\n      return;\n    \n    for(int i = 0, iLimit = methods.length; i < iLimit; ++i) {\n      AbstractMethodDeclaration m = methods[i];\n      m.bodyStart = m.declarationSourceStart;\n      m.bodyEnd = m.declarationSourceEnd;\n      m.binding.getAnnotationTagBits();\n    }\n  }\n  \n  private void fixFields(AbstractVariableDeclaration[] fields) {\n    if (fields == null)\n      return;\n    \n    for(int i = 0, iLimit = fields.length; i < iLimit; ++i) {\n      AbstractVariableDeclaration f = fields[i];\n      f.declarationEnd = f.declarationSourceEnd;\n    }\n  }\n\n  AbstractMethodDeclaration around(SourceTypeConverter stc, SourceMethod methodHandle, SourceMethodElementInfo methodInfo, CompilationResult compilationResult) throws JavaModelException :\n    convert(stc, methodHandle, methodInfo, compilationResult) {\n    AbstractMethodDeclaration method;\n\n    \/* only source positions available *\/\n    int start = methodInfo.getNameSourceStart();\n    int end = methodInfo.getNameSourceEnd();\n\n    \/\/ convert 1.5 specific constructs only if compliance is 1.5 or above\n    TypeParameter[] typeParams = null;\n    if (stc.has1_5Compliance) {\n      \/* convert type parameters *\/\n      char[][] typeParameterNames = methodInfo.getTypeParameterNames();\n      if (typeParameterNames != null) {\n        int parameterCount = typeParameterNames.length;\n        if (parameterCount > 0) { \/\/ method's type parameters must be null if no type parameter\n          char[][][] typeParameterBounds = methodInfo.getTypeParameterBounds();\n          typeParams = new TypeParameter[parameterCount];\n          for (int i = 0; i < parameterCount; i++) {\n            typeParams[i] = stc.createTypeParameter(typeParameterNames[i], typeParameterBounds[i], start, end);\n          }\n        }\n      }\n    }\n\n    int modifiers = methodInfo.getModifiers();\n    if (methodInfo.isConstructor()) {\n      ConstructorDeclaration decl = new ConstructorDeclaration(compilationResult);\n      decl.bits &= ~org.eclipse.jdt.internal.compiler.ast.ASTNode.IsDefaultConstructor;\n      method = decl;\n      decl.typeParameters = typeParams;\n    } else {\n      MethodDeclaration decl;\n      if (methodInfo.isAnnotationMethod()) {\n        AnnotationMethodDeclaration annotationMethodDeclaration = new AnnotationMethodDeclaration(compilationResult);\n\n        \/* conversion of default value *\/\n        SourceAnnotationMethodInfo annotationMethodInfo = (SourceAnnotationMethodInfo) methodInfo;\n        boolean hasDefaultValue = annotationMethodInfo.defaultValueStart != -1 || annotationMethodInfo.defaultValueEnd != -1;\n        if ((stc.flags & SourceTypeConverter.FIELD_INITIALIZATION) != 0) {\n          if (hasDefaultValue) {\n            char[] defaultValueSource = CharOperation.subarray(stc.getSource(), annotationMethodInfo.defaultValueStart, annotationMethodInfo.defaultValueEnd+1);\n            if (defaultValueSource != null) {\n                Expression expression =  stc.parseMemberValue(defaultValueSource);\n                if (expression != null) {\n                  annotationMethodDeclaration.defaultValue = expression;\n                }\n            } else {\n              \/\/ could not retrieve the default value\n              hasDefaultValue = false;\n            }\n          }\n        }\n        if (hasDefaultValue)\n          modifiers |= ClassFileConstants.AccAnnotationDefault;\n        decl = annotationMethodDeclaration;\n      } else {\n        decl = new MethodDeclaration(compilationResult);\n      }\n\n      \/\/ convert return type\n      decl.returnType = stc.createTypeReference(methodInfo.getReturnTypeName(), start, end);\n\n      \/\/ type parameters\n      decl.typeParameters = typeParams;\n\n      method = decl;\n    }\n    method.selector = methodHandle.getElementName().toCharArray();\n    boolean isVarargs = (modifiers & ClassFileConstants.AccVarargs) != 0;\n    method.modifiers = modifiers & ~ClassFileConstants.AccVarargs;\n    method.sourceStart = start;\n    method.sourceEnd = end;\n    method.declarationSourceStart = methodInfo.getDeclarationSourceStart();\n    method.declarationSourceEnd = methodInfo.getDeclarationSourceEnd();\n\n    \/\/ convert 1.5 specific constructs only if compliance is 1.5 or above\n    if (stc.has1_5Compliance) {\n      \/* convert annotations *\/\n      method.annotations = stc.convertAnnotations(methodHandle);\n    }\n\n    \/* convert arguments *\/\n    String[] argumentTypeSignatures = methodHandle.getParameterTypes();\n    char[][] argumentNames = methodInfo.getArgumentNames();\n    int argumentCount = argumentTypeSignatures == null ? 0 : argumentTypeSignatures.length;\n    if (argumentCount > 0) {\n      long position = ((long) start << 32) + end;\n      method.arguments = new Argument[argumentCount];\n      for (int i = 0; i < argumentCount; i++) {\n        TypeReference typeReference = stc.createTypeReference(argumentTypeSignatures[i], start, end);\n        if (isVarargs && i == argumentCount-1) {\n          typeReference.bits |= org.eclipse.jdt.internal.compiler.ast.ASTNode.IsVarArgs;\n        }\n        method.arguments[i] =\n          new Argument(\n            argumentNames[i],\n            position,\n            typeReference,\n            ClassFileConstants.AccDefault);\n        \/\/ do not care whether was final or not\n      }\n    }\n\n    \/* convert thrown exceptions *\/\n    char[][] exceptionTypeNames = methodInfo.getExceptionTypeNames();\n    int exceptionCount = exceptionTypeNames == null ? 0 : exceptionTypeNames.length;\n    if (exceptionCount > 0) {\n      method.thrownExceptions = new TypeReference[exceptionCount];\n      for (int i = 0; i < exceptionCount; i++) {\n        method.thrownExceptions[i] =\n          stc.createTypeReference(exceptionTypeNames[i], start, end);\n      }\n    }\n\n    \/* convert local and anonymous types *\/\n    if ((stc.flags & SourceTypeConverter.LOCAL_TYPE) != 0) {\n      IJavaElement[] children = methodInfo.getChildren();\n      int typesLength = 0;\n      int childrenLength = children.length;\n      for (int i = 0; i < childrenLength; ++i)\n        if (children[i] instanceof SourceType)\n          ++typesLength;\n      \n      if (typesLength != 0) {\n        Statement[] statements = new Statement[typesLength];\n        int typeIndex = 0;\n        for (int i = 0; i < childrenLength; i++) {\n          if (children[i] instanceof SourceType) {\n            SourceType type = (SourceType) children[i];\n            TypeDeclaration localType = stc.convert(type, compilationResult);\n            if ((localType.bits & org.eclipse.jdt.internal.compiler.ast.ASTNode.IsAnonymousType) != 0) {\n              QualifiedAllocationExpression expression = new QualifiedAllocationExpression(localType);\n              expression.type = localType.superclass;\n              localType.superclass = null;\n              localType.superInterfaces = null;\n              localType.allocation = expression;\n              statements[typeIndex] = expression;\n            } else {\n              statements[typeIndex] = localType;\n            }\n            ++typeIndex;\n          }\n        }\n        method.statements = statements;\n      }\n    }\n\n    return method;\n  }\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"5435f67e28e6e2b19d09a77a4e12aed5eb6d0679","subject":"added trace message to else case","message":"added trace message to else case\n","repos":"palava\/palava-jta","old_file":"src\/main\/java\/de\/cosmocode\/palava\/jta\/AbstractUserTransactionAspect.aj","new_file":"src\/main\/java\/de\/cosmocode\/palava\/jta\/AbstractUserTransactionAspect.aj","new_contents":"\/**\n * Copyright 2010 CosmoCode GmbH\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage de.cosmocode.palava.jta;\n\nimport javax.transaction.NotSupportedException;\nimport javax.transaction.Status;\nimport javax.transaction.SystemException;\nimport javax.transaction.UserTransaction;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.gag.annotation.remark.Hack;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.Registry;\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\n\npublic abstract aspect AbstractUserTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(AbstractUserTransactionAspect.class);\n\n    private Provider<UserTransaction> provider;\n\n    private TransactionBeginEvent begin;\n    private TransactionBeganEvent began;\n    private TransactionCommitEvent commit;\n    private TransactionCommittedEvent committed;\n    private TransactionRollbackEvent rollback;\n    private TransactionRolledbackEvent rolledback;\n    \n    @Inject\n    void setProvider(Provider<UserTransaction> provider) {\n        this.provider = Preconditions.checkNotNull(provider, \"Provider\");\n    }\n    \n    @Inject\n    void setRegistry(Registry registry) {\n        Preconditions.checkNotNull(registry, \"Registry\");\n        this.begin = registry.proxy(TransactionBeginEvent.class);\n        this.began = registry.proxy(TransactionBeganEvent.class);\n        this.commit = registry.proxy(TransactionCommitEvent.class);\n        this.committed = registry.proxy(TransactionCommittedEvent.class);\n        this.rollback = registry.proxy(TransactionRollbackEvent.class);\n        this.rolledback = registry.proxy(TransactionRolledbackEvent.class);\n    }\n    \n    protected abstract pointcut transactional();\n    \n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        Preconditions.checkNotNull(provider, \"Provider not injected yet\");\n        final UserTransaction tx = provider.get();\n        LOG.trace(\"Using transaction {}\", tx);\n\n        try {\n            LOG.trace(\"Status of transaction: {}\", tx.getStatus());\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        int status;\n        final boolean local;\n        try {\n            status = tx.getStatus();\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        local = status == Status.STATUS_NO_TRANSACTION;\n\n        if (local) {\n            LOG.debug(\"Beginning automatic transaction {}\", tx);\n            try {\n                begin.eventTransactionBegin(tx);\n                tx.begin();\n                began.eventTransactionBegan(tx);\n            } catch (NotSupportedException e) {\n                throw new IllegalStateException(e);\n            } catch (SystemException e) {\n                throw new IllegalStateException(e);\n            }\n        } else {\n            LOG.trace(\"Transaction {} already active (Status: {})\", tx, status);\n        }\n\n        try {\n            status = tx.getStatus();\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        final Object returnValue;\n        \n        try {\n            LOG.trace(\"Status before execution: {}\", status);\n            returnValue = proceed();\n        } catch (Exception e) {\n            try {\n                if (local && \n                    (tx.getStatus() == Status.STATUS_ACTIVE || tx.getStatus() == Status.STATUS_MARKED_ROLLBACK)) {\n                    LOG.info(\"Rolling back local\/active transaction {}\", tx);\n                    rollback(tx);\n                } else if (tx.getStatus() != Status.STATUS_ROLLEDBACK || tx.getStatus() != Status.STATUS_ROLLING_BACK) {\n                    LOG.debug(\"Setting transaction {} as rollback only\", tx);\n                    tx.setRollbackOnly();\n                }\n            } catch (Exception inner) {\n                LOG.error(\"Rollback failed\", inner);\n            }\n            \n            \/\/ hack to support throwing checked exceptions\n            return sneakyThrow(e);\n        }\n        \n        try {\n            status = tx.getStatus();\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        LOG.trace(\"Status after execution: {}\", status);\n        \n        if (local) {\n            if (status == Status.STATUS_MARKED_ROLLBACK) {\n                try {\n                    LOG.debug(\"Rolling back marked transaction {}\", tx);\n                    rollback(tx);\n                } catch (SystemException e) {\n                    throw new IllegalStateException(e);\n                }\n            } else {\n                try {\n                    commit.eventTransactionCommit(tx);\n                    tx.commit();\n                    committed.eventTransactionCommitted(tx);\n                    LOG.debug(\"Committed automatic transaction {}\", tx);\n                } catch (Exception e) {\n                    try {\n                        LOG.info(\"Rolling back transaction {}\", tx);\n                        rollback(tx);\n                    } catch (Exception inner) {\n                        LOG.error(\"Rollback failed\", inner);\n                    }\n                    throw new IllegalStateException(e);\n                }\n            }\n        } else {\n            LOG.trace(\"Not committing non-local transaction {}\", tx);\n        }\n        \n        return returnValue;\n    }\n    \n    private void rollback(UserTransaction tx) throws SystemException {\n        rollback.eventTransactionRollback(tx);\n        tx.rollback();\n        rolledback.eventTransactionRolledback(tx);\n    }\n    \n    @Hack(\"Why is this possible?\")\n    private Object sneakyThrow(Throwable t) {\n        this.<RuntimeException>doSneakyThrow(t);\n        return null;\n    }\n\n    @SuppressWarnings(\"unchecked\")\n    private <T extends Throwable> T doSneakyThrow(Throwable t) throws T {\n        throw (T) t;\n    }\n    \n}\n","old_contents":"\/**\n * Copyright 2010 CosmoCode GmbH\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage de.cosmocode.palava.jta;\n\nimport javax.transaction.NotSupportedException;\nimport javax.transaction.Status;\nimport javax.transaction.SystemException;\nimport javax.transaction.UserTransaction;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.gag.annotation.remark.Hack;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.Registry;\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\n\npublic abstract aspect AbstractUserTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(AbstractUserTransactionAspect.class);\n\n    private Provider<UserTransaction> provider;\n\n    private TransactionBeginEvent begin;\n    private TransactionBeganEvent began;\n    private TransactionCommitEvent commit;\n    private TransactionCommittedEvent committed;\n    private TransactionRollbackEvent rollback;\n    private TransactionRolledbackEvent rolledback;\n    \n    @Inject\n    void setProvider(Provider<UserTransaction> provider) {\n        this.provider = Preconditions.checkNotNull(provider, \"Provider\");\n    }\n    \n    @Inject\n    void setRegistry(Registry registry) {\n        Preconditions.checkNotNull(registry, \"Registry\");\n        this.begin = registry.proxy(TransactionBeginEvent.class);\n        this.began = registry.proxy(TransactionBeganEvent.class);\n        this.commit = registry.proxy(TransactionCommitEvent.class);\n        this.committed = registry.proxy(TransactionCommittedEvent.class);\n        this.rollback = registry.proxy(TransactionRollbackEvent.class);\n        this.rolledback = registry.proxy(TransactionRolledbackEvent.class);\n    }\n    \n    protected abstract pointcut transactional();\n    \n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        Preconditions.checkNotNull(provider, \"Provider not injected yet\");\n        final UserTransaction tx = provider.get();\n        LOG.trace(\"Using transaction {}\", tx);\n\n        try {\n            LOG.trace(\"Status of transaction: {}\", tx.getStatus());\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        int status;\n        final boolean local;\n        try {\n            status = tx.getStatus();\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        local = status == Status.STATUS_NO_TRANSACTION;\n\n        if (local) {\n            LOG.debug(\"Beginning automatic transaction {}\", tx);\n            try {\n                begin.eventTransactionBegin(tx);\n                tx.begin();\n                began.eventTransactionBegan(tx);\n            } catch (NotSupportedException e) {\n                throw new IllegalStateException(e);\n            } catch (SystemException e) {\n                throw new IllegalStateException(e);\n            }\n        } else {\n            LOG.trace(\"Transaction {} already active (Status: {})\", tx, status);\n        }\n\n        try {\n            status = tx.getStatus();\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        final Object returnValue;\n        \n        try {\n            LOG.trace(\"Status before execution: {}\", status);\n            returnValue = proceed();\n        } catch (Exception e) {\n            try {\n                if (local && \n                    (tx.getStatus() == Status.STATUS_ACTIVE || tx.getStatus() == Status.STATUS_MARKED_ROLLBACK)) {\n                    LOG.info(\"Rolling back local\/active transaction {}\", tx);\n                    rollback(tx);\n                } else if (tx.getStatus() != Status.STATUS_ROLLEDBACK || tx.getStatus() != Status.STATUS_ROLLING_BACK) {\n                    LOG.debug(\"Setting transaction {} as rollback only\", tx);\n                    tx.setRollbackOnly();\n                }\n            } catch (Exception inner) {\n                LOG.error(\"Rollback failed\", inner);\n            }\n            \n            \/\/ hack to support throwing checked exceptions\n            return sneakyThrow(e);\n        }\n        \n        try {\n            status = tx.getStatus();\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        LOG.trace(\"Status after execution: {}\", status);\n        \n        if (local) {\n            if (status == Status.STATUS_MARKED_ROLLBACK) {\n                try {\n                    LOG.debug(\"Rolling back marked transaction {}\", tx);\n                    rollback(tx);\n                } catch (SystemException e) {\n                    throw new IllegalStateException(e);\n                }\n            } else {\n                try {\n                    commit.eventTransactionCommit(tx);\n                    tx.commit();\n                    committed.eventTransactionCommitted(tx);\n                    LOG.debug(\"Committed automatic transaction {}\", tx);\n                } catch (Exception e) {\n                    try {\n                        LOG.info(\"Rolling back transaction {}\", tx);\n                        rollback(tx);\n                    } catch (Exception inner) {\n                        LOG.error(\"Rollback failed\", inner);\n                    }\n                    throw new IllegalStateException(e);\n                }\n            }\n        }\n        \n        return returnValue;\n    }\n    \n    private void rollback(UserTransaction tx) throws SystemException {\n        rollback.eventTransactionRollback(tx);\n        tx.rollback();\n        rolledback.eventTransactionRolledback(tx);\n    }\n    \n    @Hack(\"Why is this possible?\")\n    private RuntimeException sneakyThrow(Throwable t) {\n        this.<RuntimeException>doSneakyThrow(t);\n        return null;\n    }\n\n    @SuppressWarnings(\"unchecked\")\n    private <T extends Throwable> T doSneakyThrow(Throwable t) throws T {\n        throw (T) t;\n    }\n    \n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"9fdccd269953760b4bbb259b6d0b8b06c9cc747b","subject":"More work on hyperlinking; fixed issue with missing sources in Open Type; highlighting for additional basic types.","message":"More work on hyperlinking; fixed issue with missing sources in Open Type; highlighting for additional basic types.\n\ngit-svn-id: f4ecfe233223879a4a16cd7937f11b5152963d8e@19021 5e8d7ff9-d8ef-0310-90f0-a4852d11357a\n","repos":"aleksi-lukkarinen\/scala-ide,romanowski\/scala-ide,andrey-ilinykh\/scala-ide,mlangc\/scala-ide,scala-ide\/scala-ide,Duhemm\/scala-ide,mlangc\/scala-ide,Duhemm\/scala-ide,dragos\/scala-ide,stephenh\/scala-ide,stephenh\/scala-ide,andrey-ilinykh\/scala-ide,romanowski\/scala-ide,dragos\/scala-ide,sschaef\/scala-ide,wpopielarski\/scala-ide,scala-ide\/scala-ide,andrey-ilinykh\/scala-ide,Kwestor\/scala-ide,wpopielarski\/scala-ide,stephenh\/scala-ide,pilipolio\/scala-ide,Kwestor\/scala-ide,mlangc\/scala-ide,Kwestor\/scala-ide,aleksi-lukkarinen\/scala-ide,scala-ide\/scala-ide,wpopielarski\/scala-ide,pilipolio\/scala-ide,sschaef\/scala-ide,aleksi-lukkarinen\/scala-ide,sschaef\/scala-ide,sschaef\/scala-ide,Duhemm\/scala-ide,pilipolio\/scala-ide,scala-ide\/scala-ide,wpopielarski\/scala-ide,andrey-ilinykh\/scala-ide,aleksi-lukkarinen\/scala-ide,dragos\/scala-ide,dragos\/scala-ide,pilipolio\/scala-ide,stephenh\/scala-ide,mlangc\/scala-ide,romanowski\/scala-ide,Kwestor\/scala-ide,Duhemm\/scala-ide,romanowski\/scala-ide","old_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/cfprovider\/ClassFileProviderAspect.aj","new_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/cfprovider\/ClassFileProviderAspect.aj","new_contents":"\/*\n * Copyright 2005-2009 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.cfprovider;\n\nimport java.util.HashSet;\n\nimport org.eclipse.core.filebuffers.FileBuffers;\nimport org.eclipse.core.filebuffers.ITextFileBuffer;\nimport org.eclipse.core.filebuffers.ITextFileBufferManager;\nimport org.eclipse.core.filebuffers.LocationKind;\nimport org.eclipse.core.resources.IResource;\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.core.IBuffer;\nimport org.eclipse.jdt.core.IClassFile;\nimport org.eclipse.jdt.core.IImportDeclaration;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IOpenable;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.ITypeRoot;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.core.dom.CompilationUnit;\nimport org.eclipse.jdt.core.search.TypeNameMatch;\nimport org.eclipse.jdt.internal.compiler.CompilationResult;\nimport org.eclipse.jdt.internal.compiler.ast.ASTNode;\nimport org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.ImportReference;\nimport org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.TypeReference;\nimport org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;\nimport org.eclipse.jdt.internal.compiler.env.IBinaryType;\nimport org.eclipse.jdt.internal.compiler.env.ICompilationUnit;\nimport org.eclipse.jdt.internal.compiler.env.IGenericType;\nimport org.eclipse.jdt.internal.compiler.env.ISourceImport;\nimport org.eclipse.jdt.internal.compiler.env.ISourceType;\nimport org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer;\nimport org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding;\nimport org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding;\nimport org.eclipse.jdt.internal.compiler.parser.Parser;\nimport org.eclipse.jdt.internal.compiler.parser.SourceTypeConverter;\nimport org.eclipse.jdt.internal.core.BinaryType;\nimport org.eclipse.jdt.internal.core.ClassFile;\nimport org.eclipse.jdt.internal.core.CompilationUnitElementInfo;\nimport org.eclipse.jdt.internal.core.ImportDeclaration;\nimport org.eclipse.jdt.internal.core.JavaElement;\nimport org.eclipse.jdt.internal.core.NameLookup;\nimport org.eclipse.jdt.internal.core.Openable;\nimport org.eclipse.jdt.internal.core.PackageFragment;\nimport org.eclipse.jdt.internal.core.SearchableEnvironment;\nimport org.eclipse.jdt.internal.core.SourceMapper;\nimport org.eclipse.jdt.internal.core.SourceType;\nimport org.eclipse.jdt.internal.core.SourceTypeElementInfo;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyResolver;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyType;\nimport org.eclipse.jdt.internal.core.util.Util;\nimport org.eclipse.jdt.internal.corext.util.OpenTypeHistory;\nimport org.eclipse.jdt.internal.ui.filters.InnerClassFilesFilter;\nimport org.eclipse.jdt.ui.SharedASTProvider;\nimport org.eclipse.jface.viewers.Viewer;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaClassFile;\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaElement;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect ClassFileProviderAspect {\n\n  pointcut classFileCreations(PackageFragment parent, String name) : \n    call(protected ClassFile.new(PackageFragment, String)) &&\n    within(org.eclipse.jdt..*) &&\n    args(parent, name);\n  \n  pointcut mapSource() :\n    execution(IBuffer ClassFile.mapSource(SourceMapper, IBinaryType)) &&\n    target(IScalaClassFile);\n  \n  pointcut mapSource2() :\n    execution(void SourceMapper.mapSource(IType, char[], IBinaryType));\n  \n  pointcut getSourceFileName(BinaryType bt) :\n    execution(String BinaryType.getSourceFileName(IBinaryType)) &&\n    target(bt);\n  \n  pointcut select(Viewer viewer, Object parentElement, Object element) :\n    execution(boolean InnerClassFilesFilter.select(Viewer, Object, Object)) &&\n    args(viewer, parentElement, element);\n  \n  pointcut getChildren(BinaryType bt) :\n    execution(IJavaElement[] BinaryType.getChildren()) &&\n    target(bt);\n  \n  pointcut getAST(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) : \n    execution(CompilationUnit SharedASTProvider.getAST(ITypeRoot, SharedASTProvider.WAIT_FLAG, IProgressMonitor)) &&\n    args(element, waitFlag, progressMonitor);\n  \n  pointcut resolve(HierarchyResolver hr, IGenericType suppliedType) :\n    execution(void HierarchyResolver.resolve(IGenericType)) &&\n    target(hr) &&\n    args(suppliedType);\n  \n  pointcut remember(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    execution(void HierarchyResolver.remember(IType, ReferenceBinding)) &&\n    target(hr) &&\n    args(type, typeBinding);\n  \n  pointcut acceptType(IType type, int acceptFlags, boolean isSourceType) :\n    execution(boolean NameLookup.acceptType(IType, int, boolean)) &&\n    args(type, acceptFlags, isSourceType);\n  \n  pointcut find(SearchableEnvironment se, String typeName, String packageName) :\n    execution(NameEnvironmentAnswer find(String, String)) &&\n    target(se) &&\n    args(typeName, packageName);\n  \n  pointcut convert(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) :\n    execution(CompilationUnitDeclaration SourceTypeConverter.convert(ISourceType[], CompilationResult)) &&\n    target(stc) &&\n    args(sourceTypes, compilationResult);\n  \n  pointcut getAncestor(JavaElement je, int ancestorType) :\n    execution(IJavaElement JavaElement.getAncestor(int)) &&\n    target(je) &&\n    args(ancestorType);\n  \n  pointcut isContainerDirty(TypeNameMatch match) :\n    execution(boolean OpenTypeHistory.isContainerDirty(TypeNameMatch)) &&\n    args(match);\n  \n  ClassFile around(PackageFragment parent, String name) : \n    classFileCreations(parent, name) {\n\n    ClassFile javaClassFile = proceed(parent, name);\n    byte[] bytes;\n    \n    try {\n      bytes = javaClassFile.getBytes();\n    } catch(Throwable t) {\n      return javaClassFile; \n    }\n    \n    for (IClassFileProvider provider : ClassFileProviderRegistry.getInstance().getProviders()) {\n      ClassFile cf = provider.create(bytes, parent, name);\n      if (cf != null)\n        return cf;\n    }\n    \n    return javaClassFile;\n  }\n  \n  void around() :\n    mapSource2() &&\n    cflow(mapSource()) {\n    return;\n  }\n  \n  boolean around(Viewer viewer, Object parentElement, Object element) :\n    select(viewer, parentElement, element) {\n    if (element instanceof IScalaClassFile) {\n      IClassFile classFile = (IClassFile) element;\n      String name = classFile.getElementName(); \n      int dollarIndex = name.indexOf('$');\n      return dollarIndex == -1 || dollarIndex == name.length()-7; \/\/ Trailing '$' implies object rather than inner class \n    }\n    return proceed(viewer, parentElement, element);\n  }\n  \n  IJavaElement[] around(BinaryType bt) throws JavaModelException :\n    getChildren(bt) && \n    target(BinaryType) {\n    ClassFile cf = (ClassFile)bt.parent;\n    if (cf instanceof IScalaClassFile)\n      return cf.getChildren();\n    else\n      return proceed(bt);\n  }\n  \n  CompilationUnit around(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) :\n    getAST(element, waitFlag, progressMonitor) {\n      if (element instanceof IScalaElement)\n        return null;\n      else\n        return proceed(element, waitFlag, progressMonitor);\n  }\n  \n  void around(HierarchyResolver hr, IGenericType suppliedType) :\n    resolve(hr, suppliedType) {\n    if (!suppliedType.isBinaryType()) {\n      IType tpe = ((SourceTypeElementInfo)suppliedType).getHandle();\n      IClassFile cf = tpe.getClassFile();\n      if (cf instanceof IScalaClassFile) {\n        hr.resolve(new Openable[]{(Openable)cf}, new HashSet(), null);\n        return;\n      }\n    }\n      \n    proceed(hr, suppliedType);\n  }\n  \n  void around(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    remember(hr, type, typeBinding) {\n    if (((IOpenable)type.getCompilationUnit()).isOpen()) {\n      try {\n        IGenericType genericType = (IGenericType)((JavaElement)type).getElementInfo();\n        hr.remember(genericType, typeBinding);\n      } catch (JavaModelException e) {\n        \/\/ cannot happen since element is open\n        return;\n      }\n    } else {\n      if (typeBinding == null) return;\n\n      TypeDeclaration typeDeclaration = ((SourceTypeBinding)typeBinding).scope.referenceType();\n\n      \/\/ simple super class name\n      char[] superclassName = null;\n      TypeReference superclass;\n      if ((typeDeclaration.bits & ASTNode.IsAnonymousType) != 0) {\n        superclass = typeDeclaration.allocation.type;\n      } else {\n        superclass = typeDeclaration.superclass;\n      }\n      if (superclass != null) {\n        char[][] typeName = superclass.getTypeName();\n        superclassName = typeName == null ? null : typeName[typeName.length-1];\n      }\n\n      \/\/ simple super interface names\n      char[][] superInterfaceNames = null;\n      TypeReference[] superInterfaces = typeDeclaration.superInterfaces;\n      if (superInterfaces != null) {\n        int length = superInterfaces.length;\n        superInterfaceNames = new char[length][];\n        for (int i = 0; i < length; i++) {\n          TypeReference superInterface = superInterfaces[i];\n          char[][] typeName = superInterface.getTypeName();\n          superInterfaceNames[i] = typeName[typeName.length-1];\n        }\n      }\n\n      HierarchyType hierarchyType = new HierarchyType(\n        type,\n        typeDeclaration.name,\n        typeDeclaration.binding.modifiers,\n        superclassName,\n        superInterfaceNames);\n      hr.remember(hierarchyType, typeDeclaration.binding);\n    }\n  }\n  \n  String around(BinaryType bt) :\n    getSourceFileName(bt) {\n    IJavaElement parent = bt.getParent(); \n    if (parent instanceof IScalaClassFile)\n      return ((IScalaClassFile)parent).getSourceFileName();\n    else\n      return proceed(bt);\n  }\n  \n  boolean around(IType type, int acceptFlags, boolean isSourceType) :\n    acceptType(type, acceptFlags, isSourceType) {\n    if (!isSourceType && (type instanceof SourceType)) {\n      IJavaElement parent = type.getParent(); \n      if (parent instanceof IScalaClassFile)\n        return proceed(type, acceptFlags, true);\n    }\n    \n    return proceed(type, acceptFlags, isSourceType);\n  }\n  \n  CompilationUnitDeclaration around(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) throws JavaModelException :\n    convert(stc, sourceTypes, compilationResult) {\n    stc.unit = new CompilationUnitDeclaration(stc.problemReporter, compilationResult, 0);\n    \/\/ not filled at this point\n\n    if (sourceTypes.length == 0) return stc.unit;\n    SourceTypeElementInfo topLevelTypeInfo = (SourceTypeElementInfo) sourceTypes[0];\n    org.eclipse.jdt.core.ICompilationUnit cuHandle = topLevelTypeInfo.getHandle().getCompilationUnit();\n    stc.cu = (ICompilationUnit) cuHandle;\n\n    CompilationUnitElementInfo cuei = null;\n    Object info = ((JavaElement)stc.cu).getElementInfo();\n    if (info instanceof CompilationUnitElementInfo)\n      cuei = (CompilationUnitElementInfo)info;\n    \n    \n    if (stc.has1_5Compliance && cuei != null && cuei.annotationNumber > 10) { \/\/ experimental value\n      \/\/ if more than 10 annotations, diet parse as this is faster\n      return new Parser(stc.problemReporter, true).dietParse(stc.cu, compilationResult);\n    }\n\n    \/* only positions available *\/\n    int start = topLevelTypeInfo.getNameSourceStart();\n    int end = topLevelTypeInfo.getNameSourceEnd();\n\n    \/* convert package and imports *\/\n    String[] packageName = ((PackageFragment) cuHandle.getParent()).names;\n    if (packageName.length > 0)\n      \/\/ if its null then it is defined in the default package\n      stc.unit.currentPackage =\n        stc.createImportReference(packageName, start, end, false, ClassFileConstants.AccDefault);\n    IImportDeclaration[] importDeclarations = topLevelTypeInfo.getHandle().getCompilationUnit().getImports();\n    int importCount = importDeclarations.length;\n    stc.unit.imports = new ImportReference[importCount];\n    for (int i = 0; i < importCount; i++) {\n      ImportDeclaration importDeclaration = (ImportDeclaration) importDeclarations[i];\n      ISourceImport sourceImport = (ISourceImport) importDeclaration.getElementInfo();\n      String nameWithoutStar = importDeclaration.getNameWithoutStar();\n      stc.unit.imports[i] = stc.createImportReference(\n        Util.splitOn('.', nameWithoutStar, 0, nameWithoutStar.length()),\n        sourceImport.getDeclarationSourceStart(),\n        sourceImport.getDeclarationSourceEnd(),\n        importDeclaration.isOnDemand(),\n        sourceImport.getModifiers());\n    }\n    \/* convert type(s) *\/\n    try {\n      int typeCount = sourceTypes.length;\n      final TypeDeclaration[] types = new TypeDeclaration[typeCount];\n      \/*\n       * We used a temporary types collection to prevent this.unit.types from being null during a call to\n       * convert(...) when the source is syntactically incorrect and the parser is flushing the unit's types.\n       * See https:\/\/bugs.eclipse.org\/bugs\/show_bug.cgi?id=97466\n       *\/\n      for (int i = 0; i < typeCount; i++) {\n        SourceTypeElementInfo typeInfo = (SourceTypeElementInfo) sourceTypes[i];\n        types[i] = stc.convert((SourceType) typeInfo.getHandle(), compilationResult);\n      }\n      stc.unit.types = types;\n      return stc.unit;\n    } catch (SourceTypeConverter.AnonymousMemberFound e) {\n      return new Parser(stc.problemReporter, true).parse(stc.cu, compilationResult);\n    }\n  }\n  \n  IJavaElement around(JavaElement je, int ancestorType) :\n    getAncestor(je, ancestorType) {\n    IJavaElement element = je;\n    while (element != null) {\n      if (element.getElementType() == ancestorType)\n        return element;\n      else if (element instanceof IScalaClassFile && ancestorType == IJavaElement.COMPILATION_UNIT)\n        return ((JavaElement)element).getCompilationUnit();\n      element= element.getParent();\n    }\n    return null;\n  }\n\n  boolean around(TypeNameMatch match) :\n    isContainerDirty(match) {\n    org.eclipse.jdt.core.ICompilationUnit cu = match.getType().getCompilationUnit();\n    if (cu == null) {\n      return false;\n    }\n    IResource resource= cu.getResource();\n    if (resource == null)\n      return false;\n    \n    ITextFileBufferManager manager= FileBuffers.getTextFileBufferManager();\n    ITextFileBuffer textFileBuffer= manager.getTextFileBuffer(resource.getFullPath(), LocationKind.IFILE);\n    if (textFileBuffer != null) {\n      return textFileBuffer.isDirty();\n    }\n    return false;\n  }\n}\n","old_contents":"\/*\n * Copyright 2005-2009 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.cfprovider;\n\nimport org.eclipse.jdt.core.IJavaElement;\n\nimport java.util.HashSet;\n\nimport org.eclipse.jdt.internal.compiler.CompilationResult;\nimport org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;\nimport org.eclipse.jdt.internal.compiler.env.ISourceType;\n\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.core.IBuffer;\nimport org.eclipse.jdt.core.IClassFile;\nimport org.eclipse.jdt.core.IImportDeclaration;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IOpenable;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.ITypeRoot;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.core.dom.CompilationUnit;\nimport org.eclipse.jdt.internal.compiler.ast.ASTNode;\nimport org.eclipse.jdt.internal.compiler.ast.ImportReference;\nimport org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.TypeReference;\nimport org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;\nimport org.eclipse.jdt.internal.compiler.env.IBinaryType;\nimport org.eclipse.jdt.internal.compiler.env.ICompilationUnit;\nimport org.eclipse.jdt.internal.compiler.env.IGenericType;\nimport org.eclipse.jdt.internal.compiler.env.ISourceImport;\nimport org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer;\nimport org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding;\nimport org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding;\nimport org.eclipse.jdt.internal.compiler.parser.Parser;\nimport org.eclipse.jdt.internal.compiler.parser.SourceTypeConverter;\nimport org.eclipse.jdt.internal.core.BinaryType;\nimport org.eclipse.jdt.internal.core.ClassFile;\nimport org.eclipse.jdt.internal.core.CompilationUnitElementInfo;\nimport org.eclipse.jdt.internal.core.ImportDeclaration;\nimport org.eclipse.jdt.internal.core.JavaElement;\nimport org.eclipse.jdt.internal.core.Openable;\nimport org.eclipse.jdt.internal.core.NameLookup;\nimport org.eclipse.jdt.internal.core.PackageFragment;\nimport org.eclipse.jdt.internal.core.SearchableEnvironment;\nimport org.eclipse.jdt.internal.core.SourceMapper;\nimport org.eclipse.jdt.internal.core.SourceType;\nimport org.eclipse.jdt.internal.core.SourceTypeElementInfo;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyResolver;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyType;\nimport org.eclipse.jdt.internal.core.util.Util;\nimport org.eclipse.jdt.internal.ui.filters.InnerClassFilesFilter;\nimport org.eclipse.jdt.ui.SharedASTProvider;\nimport org.eclipse.jface.viewers.Viewer;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaElement;\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaClassFile;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect ClassFileProviderAspect {\n\n  pointcut classFileCreations(PackageFragment parent, String name) : \n    call(protected ClassFile.new(PackageFragment, String)) &&\n    within(org.eclipse.jdt..*) &&\n    args(parent, name);\n  \n  pointcut mapSource() :\n    execution(IBuffer ClassFile.mapSource(SourceMapper, IBinaryType)) &&\n    target(IScalaClassFile);\n  \n  pointcut mapSource2() :\n    execution(void SourceMapper.mapSource(IType, char[], IBinaryType));\n  \n  pointcut getSourceFileName(BinaryType bt) :\n    execution(String BinaryType.getSourceFileName(IBinaryType)) &&\n    target(bt);\n  \n  pointcut select(Viewer viewer, Object parentElement, Object element) :\n    execution(boolean InnerClassFilesFilter.select(Viewer, Object, Object)) &&\n    args(viewer, parentElement, element);\n  \n  pointcut getChildren(BinaryType bt) :\n    execution(IJavaElement[] BinaryType.getChildren()) &&\n    target(bt);\n  \n  pointcut getAST(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) : \n    execution(CompilationUnit SharedASTProvider.getAST(ITypeRoot, SharedASTProvider.WAIT_FLAG, IProgressMonitor)) &&\n    args(element, waitFlag, progressMonitor);\n  \n  pointcut resolve(HierarchyResolver hr, IGenericType suppliedType) :\n    execution(void HierarchyResolver.resolve(IGenericType)) &&\n    target(hr) &&\n    args(suppliedType);\n  \n  pointcut remember(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    execution(void HierarchyResolver.remember(IType, ReferenceBinding)) &&\n    target(hr) &&\n    args(type, typeBinding);\n  \n  pointcut acceptType(IType type, int acceptFlags, boolean isSourceType) :\n    execution(boolean NameLookup.acceptType(IType, int, boolean)) &&\n    args(type, acceptFlags, isSourceType);\n  \n  pointcut find(SearchableEnvironment se, String typeName, String packageName) :\n    execution(NameEnvironmentAnswer find(String, String)) &&\n    target(se) &&\n    args(typeName, packageName);\n  \n  pointcut convert(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) :\n    execution(CompilationUnitDeclaration SourceTypeConverter.convert(ISourceType[], CompilationResult)) &&\n    target(stc) &&\n    args(sourceTypes, compilationResult);\n  \n  pointcut getAncestor(JavaElement je, int ancestorType) :\n    execution(IJavaElement JavaElement.getAncestor(int)) &&\n    target(je) &&\n    args(ancestorType);\n  \n  ClassFile around(PackageFragment parent, String name) : \n    classFileCreations(parent, name) {\n\n    ClassFile javaClassFile = proceed(parent, name);\n    byte[] bytes;\n    \n    try {\n      bytes = javaClassFile.getBytes();\n    } catch(Throwable t) {\n      return javaClassFile; \n    }\n    \n    for (IClassFileProvider provider : ClassFileProviderRegistry.getInstance().getProviders()) {\n      ClassFile cf = provider.create(bytes, parent, name);\n      if (cf != null)\n        return cf;\n    }\n    \n    return javaClassFile;\n  }\n  \n  void around() :\n    mapSource2() &&\n    cflow(mapSource()) {\n    return;\n  }\n  \n  boolean around(Viewer viewer, Object parentElement, Object element) :\n    select(viewer, parentElement, element) {\n    if (element instanceof IScalaClassFile) {\n      IClassFile classFile = (IClassFile) element;\n      String name = classFile.getElementName(); \n      int dollarIndex = name.indexOf('$');\n      return dollarIndex == -1 || dollarIndex == name.length()-7; \/\/ Trailing '$' implies object rather than inner class \n    }\n    return proceed(viewer, parentElement, element);\n  }\n  \n  IJavaElement[] around(BinaryType bt) throws JavaModelException :\n    getChildren(bt) && \n    target(BinaryType) {\n    ClassFile cf = (ClassFile)bt.parent;\n    if (cf instanceof IScalaClassFile)\n      return cf.getChildren();\n    else\n      return proceed(bt);\n  }\n  \n  CompilationUnit around(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) :\n    getAST(element, waitFlag, progressMonitor) {\n      if (element instanceof IScalaElement)\n        return null;\n      else\n        return proceed(element, waitFlag, progressMonitor);\n  }\n  \n  void around(HierarchyResolver hr, IGenericType suppliedType) :\n    resolve(hr, suppliedType) {\n    if (!suppliedType.isBinaryType()) {\n      IType tpe = ((SourceTypeElementInfo)suppliedType).getHandle();\n      IClassFile cf = tpe.getClassFile();\n      if (cf instanceof IScalaClassFile) {\n        hr.resolve(new Openable[]{(Openable)cf}, new HashSet(), null);\n        return;\n      }\n    }\n      \n    proceed(hr, suppliedType);\n  }\n  \n  void around(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    remember(hr, type, typeBinding) {\n    if (((IOpenable)type.getCompilationUnit()).isOpen()) {\n      try {\n        IGenericType genericType = (IGenericType)((JavaElement)type).getElementInfo();\n        hr.remember(genericType, typeBinding);\n      } catch (JavaModelException e) {\n        \/\/ cannot happen since element is open\n        return;\n      }\n    } else {\n      if (typeBinding == null) return;\n\n      TypeDeclaration typeDeclaration = ((SourceTypeBinding)typeBinding).scope.referenceType();\n\n      \/\/ simple super class name\n      char[] superclassName = null;\n      TypeReference superclass;\n      if ((typeDeclaration.bits & ASTNode.IsAnonymousType) != 0) {\n        superclass = typeDeclaration.allocation.type;\n      } else {\n        superclass = typeDeclaration.superclass;\n      }\n      if (superclass != null) {\n        char[][] typeName = superclass.getTypeName();\n        superclassName = typeName == null ? null : typeName[typeName.length-1];\n      }\n\n      \/\/ simple super interface names\n      char[][] superInterfaceNames = null;\n      TypeReference[] superInterfaces = typeDeclaration.superInterfaces;\n      if (superInterfaces != null) {\n        int length = superInterfaces.length;\n        superInterfaceNames = new char[length][];\n        for (int i = 0; i < length; i++) {\n          TypeReference superInterface = superInterfaces[i];\n          char[][] typeName = superInterface.getTypeName();\n          superInterfaceNames[i] = typeName[typeName.length-1];\n        }\n      }\n\n      HierarchyType hierarchyType = new HierarchyType(\n        type,\n        typeDeclaration.name,\n        typeDeclaration.binding.modifiers,\n        superclassName,\n        superInterfaceNames);\n      hr.remember(hierarchyType, typeDeclaration.binding);\n    }\n  }\n  \n  String around(BinaryType bt) :\n    getSourceFileName(bt) {\n    IJavaElement parent = bt.getParent(); \n    if (parent instanceof IScalaClassFile)\n      return ((IScalaClassFile)parent).getSourceFileName();\n    else\n      return proceed(bt);\n  }\n  \n  boolean around(IType type, int acceptFlags, boolean isSourceType) :\n    acceptType(type, acceptFlags, isSourceType) {\n    if (!isSourceType && (type instanceof SourceType)) {\n      IJavaElement parent = type.getParent(); \n      if (parent instanceof IScalaClassFile)\n        return proceed(type, acceptFlags, true);\n    }\n    \n    return proceed(type, acceptFlags, isSourceType);\n  }\n  \n  CompilationUnitDeclaration around(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) throws JavaModelException :\n    convert(stc, sourceTypes, compilationResult) {\n    stc.unit = new CompilationUnitDeclaration(stc.problemReporter, compilationResult, 0);\n    \/\/ not filled at this point\n\n    if (sourceTypes.length == 0) return stc.unit;\n    SourceTypeElementInfo topLevelTypeInfo = (SourceTypeElementInfo) sourceTypes[0];\n    org.eclipse.jdt.core.ICompilationUnit cuHandle = topLevelTypeInfo.getHandle().getCompilationUnit();\n    stc.cu = (ICompilationUnit) cuHandle;\n\n    CompilationUnitElementInfo cuei = null;\n    Object info = ((JavaElement)stc.cu).getElementInfo();\n    if (info instanceof CompilationUnitElementInfo)\n      cuei = (CompilationUnitElementInfo)info;\n    \n    \n    if (stc.has1_5Compliance && cuei != null && cuei.annotationNumber > 10) { \/\/ experimental value\n      \/\/ if more than 10 annotations, diet parse as this is faster\n      return new Parser(stc.problemReporter, true).dietParse(stc.cu, compilationResult);\n    }\n\n    \/* only positions available *\/\n    int start = topLevelTypeInfo.getNameSourceStart();\n    int end = topLevelTypeInfo.getNameSourceEnd();\n\n    \/* convert package and imports *\/\n    String[] packageName = ((PackageFragment) cuHandle.getParent()).names;\n    if (packageName.length > 0)\n      \/\/ if its null then it is defined in the default package\n      stc.unit.currentPackage =\n        stc.createImportReference(packageName, start, end, false, ClassFileConstants.AccDefault);\n    IImportDeclaration[] importDeclarations = topLevelTypeInfo.getHandle().getCompilationUnit().getImports();\n    int importCount = importDeclarations.length;\n    stc.unit.imports = new ImportReference[importCount];\n    for (int i = 0; i < importCount; i++) {\n      ImportDeclaration importDeclaration = (ImportDeclaration) importDeclarations[i];\n      ISourceImport sourceImport = (ISourceImport) importDeclaration.getElementInfo();\n      String nameWithoutStar = importDeclaration.getNameWithoutStar();\n      stc.unit.imports[i] = stc.createImportReference(\n        Util.splitOn('.', nameWithoutStar, 0, nameWithoutStar.length()),\n        sourceImport.getDeclarationSourceStart(),\n        sourceImport.getDeclarationSourceEnd(),\n        importDeclaration.isOnDemand(),\n        sourceImport.getModifiers());\n    }\n    \/* convert type(s) *\/\n    try {\n      int typeCount = sourceTypes.length;\n      final TypeDeclaration[] types = new TypeDeclaration[typeCount];\n      \/*\n       * We used a temporary types collection to prevent this.unit.types from being null during a call to\n       * convert(...) when the source is syntactically incorrect and the parser is flushing the unit's types.\n       * See https:\/\/bugs.eclipse.org\/bugs\/show_bug.cgi?id=97466\n       *\/\n      for (int i = 0; i < typeCount; i++) {\n        SourceTypeElementInfo typeInfo = (SourceTypeElementInfo) sourceTypes[i];\n        types[i] = stc.convert((SourceType) typeInfo.getHandle(), compilationResult);\n      }\n      stc.unit.types = types;\n      return stc.unit;\n    } catch (SourceTypeConverter.AnonymousMemberFound e) {\n      return new Parser(stc.problemReporter, true).parse(stc.cu, compilationResult);\n    }\n  }\n  \n  IJavaElement around(JavaElement je, int ancestorType) :\n    getAncestor(je, ancestorType) {\n    IJavaElement element = je;\n    while (element != null) {\n      if (element.getElementType() == ancestorType)\n        return element;\n      else if (element instanceof IScalaClassFile && ancestorType == IJavaElement.COMPILATION_UNIT)\n        return ((JavaElement)element).getCompilationUnit();\n      element= element.getParent();\n    }\n    return null;\n  }\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"d809e567440a5f6e1bd2d1e97926ec7e64fd7b21","subject":"Add a 2nd pointcut to handle files named \"package.scala\".","message":"Add a 2nd pointcut to handle files named \"package.scala\".\n","repos":"romanowski\/scala-ide,dragos\/scala-ide,Kwestor\/scala-ide,wpopielarski\/scala-ide,dragos\/scala-ide,wpopielarski\/scala-ide,andrey-ilinykh\/scala-ide,mlangc\/scala-ide,stephenh\/scala-ide,Duhemm\/scala-ide,pilipolio\/scala-ide,romanowski\/scala-ide,mlangc\/scala-ide,dragos\/scala-ide,sschaef\/scala-ide,romanowski\/scala-ide,aleksi-lukkarinen\/scala-ide,wpopielarski\/scala-ide,Kwestor\/scala-ide,Kwestor\/scala-ide,mlangc\/scala-ide,sschaef\/scala-ide,Duhemm\/scala-ide,pilipolio\/scala-ide,pilipolio\/scala-ide,dragos\/scala-ide,sschaef\/scala-ide,scala-ide\/scala-ide,andrey-ilinykh\/scala-ide,wpopielarski\/scala-ide,romanowski\/scala-ide,andrey-ilinykh\/scala-ide,stephenh\/scala-ide,pilipolio\/scala-ide,scala-ide\/scala-ide,mlangc\/scala-ide,aleksi-lukkarinen\/scala-ide,scala-ide\/scala-ide,Duhemm\/scala-ide,Kwestor\/scala-ide,Duhemm\/scala-ide,scala-ide\/scala-ide,stephenh\/scala-ide,aleksi-lukkarinen\/scala-ide,stephenh\/scala-ide,sschaef\/scala-ide,andrey-ilinykh\/scala-ide,aleksi-lukkarinen\/scala-ide","old_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/core\/CompilationUnitNameAspect.aj","new_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/core\/CompilationUnitNameAspect.aj","new_contents":"package scala.tools.eclipse.contribution.weaving.jdt.core;\n\nimport org.eclipse.jdt.internal.core.util.Util;\nimport org.eclipse.jdt.core.JavaConventions;\nimport org.eclipse.core.runtime.IStatus;\nimport org.eclipse.jdt.internal.core.JavaModelStatus;\n\n\/**\n * We override the behaviour of isValidCompilationUnitName() for .scala files.\n * The standard implementation applies Java identifier rules on the prefix of\n * the file name, so that, for example, \"package.scala\" would not be judged\n * valid. See Issues #3266, #1000859.\n *\/\n@SuppressWarnings(\"restriction\")\npublic aspect CompilationUnitNameAspect {\n\n\tprivate static boolean isScalaFileName(String name) {\n\t\treturn name != null && name.length() > 6 && name.endsWith(\".scala\");\n\t}\n\n\tpointcut isValidCompilationUnitName(String name, String sourceLevel, String complianceLevel):\n\t    args(name, sourceLevel, complianceLevel) &&\n\t\texecution(boolean Util.isValidCompilationUnitName(String, String, String));\n\n\tboolean around(String name, String sourceLevel, String complianceLevel):\n\t    isValidCompilationUnitName(name, sourceLevel, complianceLevel) {\n\t\tif (isScalaFileName(name))\n\t\t\treturn true;\n\t\telse\n\t\t\treturn proceed(name, sourceLevel, complianceLevel);\n\t}\n\n\tpointcut validateCompilationUnitName(String name, String sourceLevel, String complianceLevel):\n\t    args(name, sourceLevel, complianceLevel) &&\n\t\texecution(IStatus JavaConventions.validateCompilationUnitName(String, String, String));\n\n\tIStatus around(String name, String sourceLevel, String complianceLevel):\n\t    validateCompilationUnitName(name, sourceLevel, complianceLevel) {\n\t\tif (isScalaFileName(name))\n\t\t\treturn JavaModelStatus.VERIFIED_OK;\n\t\telse\n\t\t\treturn proceed(name, sourceLevel, complianceLevel);\n\t}\n}\n","old_contents":"package scala.tools.eclipse.contribution.weaving.jdt.core;\n\nimport org.eclipse.jdt.internal.core.util.Util;\n\n\/**\n * We override the behaviour of isValidCompilationUnitName() for .scala files.\n * The standard implementation applies Java identifier rules on the prefix of\n * the file name, so that, for example, \"package.scala\" would not be judged\n * valid. See Issue #3266.\n *\/\n@SuppressWarnings(\"restriction\")\npublic aspect CompilationUnitNameAspect {\n\n\tpointcut isValidCompilationUnitName(String name, String sourceLevel, String complianceLevel):\n\t    args(name, sourceLevel, complianceLevel) &&\n\t\texecution(boolean Util.isValidCompilationUnitName(String, String, String));\n\n\tboolean around(String name, String sourceLevel, String complianceLevel):\n\t    isValidCompilationUnitName(name, sourceLevel, complianceLevel) {\n\t\tif (name != null && name.endsWith(\".scala\"))\n\t\t\treturn true;\n\t\telse\n\t\t\treturn proceed(name, sourceLevel, complianceLevel);\n\t}\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"8ad84a298213b714f0058abc954bcebb8819d399","subject":"Fixed #3114.","message":"Fixed #3114.\n\ngit-svn-id: f4ecfe233223879a4a16cd7937f11b5152963d8e@21046 5e8d7ff9-d8ef-0310-90f0-a4852d11357a\n","repos":"stephenh\/scala-ide,mlangc\/scala-ide,dragos\/scala-ide,andrey-ilinykh\/scala-ide,Kwestor\/scala-ide,andrey-ilinykh\/scala-ide,pilipolio\/scala-ide,aleksi-lukkarinen\/scala-ide,pilipolio\/scala-ide,dragos\/scala-ide,romanowski\/scala-ide,stephenh\/scala-ide,andrey-ilinykh\/scala-ide,mlangc\/scala-ide,romanowski\/scala-ide,aleksi-lukkarinen\/scala-ide,dragos\/scala-ide,wpopielarski\/scala-ide,aleksi-lukkarinen\/scala-ide,Duhemm\/scala-ide,sschaef\/scala-ide,romanowski\/scala-ide,Kwestor\/scala-ide,mlangc\/scala-ide,sschaef\/scala-ide,stephenh\/scala-ide,stephenh\/scala-ide,sschaef\/scala-ide,scala-ide\/scala-ide,Kwestor\/scala-ide,romanowski\/scala-ide,Duhemm\/scala-ide,Kwestor\/scala-ide,scala-ide\/scala-ide,mlangc\/scala-ide,pilipolio\/scala-ide,sschaef\/scala-ide,pilipolio\/scala-ide,wpopielarski\/scala-ide,dragos\/scala-ide,scala-ide\/scala-ide,andrey-ilinykh\/scala-ide,Duhemm\/scala-ide,Duhemm\/scala-ide,scala-ide\/scala-ide,wpopielarski\/scala-ide,wpopielarski\/scala-ide,aleksi-lukkarinen\/scala-ide","old_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/cfprovider\/ClassFileProviderAspect.aj","new_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/cfprovider\/ClassFileProviderAspect.aj","new_contents":"\/*\n * Copyright 2005-2010 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.cfprovider;\n\nimport java.util.HashSet;\n\nimport org.eclipse.core.filebuffers.FileBuffers;\nimport org.eclipse.core.filebuffers.ITextFileBuffer;\nimport org.eclipse.core.filebuffers.ITextFileBufferManager;\nimport org.eclipse.core.filebuffers.LocationKind;\nimport org.eclipse.core.resources.IResource;\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.core.IBuffer;\nimport org.eclipse.jdt.core.IClassFile;\nimport org.eclipse.jdt.core.IImportDeclaration;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IOpenable;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.ITypeRoot;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.core.dom.CompilationUnit;\nimport org.eclipse.jdt.core.search.TypeNameMatch;\nimport org.eclipse.jdt.internal.compiler.CompilationResult;\nimport org.eclipse.jdt.internal.compiler.ast.ASTNode;\nimport org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.ImportReference;\nimport org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.TypeReference;\nimport org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;\nimport org.eclipse.jdt.internal.compiler.env.IBinaryType;\nimport org.eclipse.jdt.internal.compiler.env.ICompilationUnit;\nimport org.eclipse.jdt.internal.compiler.env.IGenericType;\nimport org.eclipse.jdt.internal.compiler.env.ISourceImport;\nimport org.eclipse.jdt.internal.compiler.env.ISourceType;\nimport org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer;\nimport org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding;\nimport org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding;\nimport org.eclipse.jdt.internal.compiler.parser.Parser;\nimport org.eclipse.jdt.internal.compiler.parser.SourceTypeConverter;\nimport org.eclipse.jdt.internal.core.BinaryType;\nimport org.eclipse.jdt.internal.core.ClassFile;\nimport org.eclipse.jdt.internal.core.CompilationUnitElementInfo;\nimport org.eclipse.jdt.internal.core.ImportDeclaration;\nimport org.eclipse.jdt.internal.core.JavaElement;\nimport org.eclipse.jdt.internal.core.NameLookup;\nimport org.eclipse.jdt.internal.core.Openable;\nimport org.eclipse.jdt.internal.core.PackageFragment;\nimport org.eclipse.jdt.internal.core.SearchableEnvironment;\nimport org.eclipse.jdt.internal.core.SourceMapper;\nimport org.eclipse.jdt.internal.core.SourceType;\nimport org.eclipse.jdt.internal.core.SourceTypeElementInfo;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyResolver;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyType;\nimport org.eclipse.jdt.internal.core.util.Util;\nimport org.eclipse.jdt.internal.corext.util.OpenTypeHistory;\nimport org.eclipse.jdt.internal.ui.filters.InnerClassFilesFilter;\nimport org.eclipse.jdt.ui.SharedASTProvider;\nimport org.eclipse.jface.viewers.Viewer;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaClassFile;\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaElement;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect ClassFileProviderAspect {\n\n  pointcut classFileCreations(PackageFragment parent, String name) : \n    call(protected ClassFile.new(PackageFragment, String)) &&\n    within(org.eclipse.jdt..*) &&\n    args(parent, name);\n  \n  pointcut getTypeName(ClassFile cf) :\n    execution(public String ClassFile.getTypeName()) &&\n    target(cf);\n\n  pointcut getType(ClassFile cf) :\n    call(public IType ClassFile.getType()) &&\n    target(cf);\n  \n  pointcut mapSource() :\n    execution(IBuffer ClassFile.mapSource(SourceMapper, IBinaryType)) &&\n    target(IScalaClassFile);\n  \n  pointcut mapSource2() :\n    execution(void SourceMapper.mapSource(IType, char[], IBinaryType));\n  \n  pointcut getSourceFileName(BinaryType bt) :\n    execution(String BinaryType.getSourceFileName(IBinaryType)) &&\n    target(bt);\n  \n  pointcut select(Viewer viewer, Object parentElement, Object element) :\n    execution(boolean InnerClassFilesFilter.select(Viewer, Object, Object)) &&\n    args(viewer, parentElement, element);\n  \n  pointcut getChildren(BinaryType bt) :\n    execution(IJavaElement[] BinaryType.getChildren()) &&\n    target(bt);\n  \n  pointcut getAST(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) : \n    execution(CompilationUnit SharedASTProvider.getAST(ITypeRoot, SharedASTProvider.WAIT_FLAG, IProgressMonitor)) &&\n    args(element, waitFlag, progressMonitor);\n  \n  pointcut resolve(HierarchyResolver hr, IGenericType suppliedType) :\n    execution(void HierarchyResolver.resolve(IGenericType)) &&\n    target(hr) &&\n    args(suppliedType);\n  \n  pointcut remember(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    execution(void HierarchyResolver.remember(IType, ReferenceBinding)) &&\n    target(hr) &&\n    args(type, typeBinding);\n  \n  pointcut acceptType(IType type, int acceptFlags, boolean isSourceType) :\n    execution(boolean NameLookup.acceptType(IType, int, boolean)) &&\n    args(type, acceptFlags, isSourceType);\n  \n  pointcut find(SearchableEnvironment se, String typeName, String packageName) :\n    execution(NameEnvironmentAnswer find(String, String)) &&\n    target(se) &&\n    args(typeName, packageName);\n  \n  pointcut convert(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) :\n    execution(CompilationUnitDeclaration SourceTypeConverter.convert(ISourceType[], CompilationResult)) &&\n    target(stc) &&\n    args(sourceTypes, compilationResult);\n  \n  pointcut getAncestor(JavaElement je, int ancestorType) :\n    execution(IJavaElement JavaElement.getAncestor(int)) &&\n    target(je) &&\n    args(ancestorType);\n  \n  pointcut isContainerDirty(TypeNameMatch match) :\n    execution(boolean OpenTypeHistory.isContainerDirty(TypeNameMatch)) &&\n    args(match);\n  \n  ClassFile around(PackageFragment parent, String name) : \n    classFileCreations(parent, name) {\n\n    ClassFile javaClassFile = proceed(parent, name);\n    byte[] bytes;\n    \n    try {\n      bytes = javaClassFile.getBytes();\n    } catch(Throwable t) {\n      return javaClassFile; \n    }\n    \n    for (IClassFileProvider provider : ClassFileProviderRegistry.getInstance().getProviders()) {\n      ClassFile cf = provider.create(bytes, parent, name);\n      if (cf != null)\n        return cf;\n    }\n    \n    return javaClassFile;\n  }\n  \n  void around() :\n    mapSource2() &&\n    cflow(mapSource()) {\n    return;\n  }\n  \n  IType around(ClassFile cf) :\n    getType(cf) &&\n    cflow(mapSource()) {\n    if (cf.binaryType == null)\n      cf.binaryType = new BinaryType(cf, cf.getTypeName());\n    return cf.binaryType;\n  }\n  \n  String around(ClassFile cf) :\n    getTypeName(cf) {\n    if(cf instanceof IScalaClassFile) {\n      int lastDollar = cf.name.lastIndexOf('$');\n      return (lastDollar == -1 || lastDollar == cf.name.length()-1) ? cf.name : Util.localTypeName(cf.name, lastDollar, cf.name.length());\n    } else\n      return proceed(cf);\n  }\n  \n  boolean around(Viewer viewer, Object parentElement, Object element) :\n    select(viewer, parentElement, element) {\n    if (element instanceof IScalaClassFile) {\n      IClassFile classFile = (IClassFile) element;\n      String name = classFile.getElementName(); \n      int dollarIndex = name.indexOf('$');\n      return dollarIndex == -1 || dollarIndex == name.length()-7; \/\/ Trailing '$' implies object rather than inner class \n    }\n    return proceed(viewer, parentElement, element);\n  }\n  \n  IJavaElement[] around(BinaryType bt) throws JavaModelException :\n    getChildren(bt) && \n    target(BinaryType) {\n    ClassFile cf = (ClassFile)bt.parent;\n    if (cf instanceof IScalaClassFile)\n      return cf.getChildren();\n    else\n      return proceed(bt);\n  }\n  \n  CompilationUnit around(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) :\n    getAST(element, waitFlag, progressMonitor) {\n      if (element instanceof IScalaElement)\n        return null;\n      else\n        return proceed(element, waitFlag, progressMonitor);\n  }\n  \n  void around(HierarchyResolver hr, IGenericType suppliedType) :\n    resolve(hr, suppliedType) {\n    if (!suppliedType.isBinaryType()) {\n      IType tpe = ((SourceTypeElementInfo)suppliedType).getHandle();\n      IClassFile cf = tpe.getClassFile();\n      if (cf instanceof IScalaClassFile) {\n        hr.resolve(new Openable[]{(Openable)cf}, new HashSet(), null);\n        return;\n      }\n    }\n      \n    proceed(hr, suppliedType);\n  }\n  \n  void around(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    remember(hr, type, typeBinding) {\n    if (((IOpenable)type.getCompilationUnit()).isOpen()) {\n      try {\n        IGenericType genericType = (IGenericType)((JavaElement)type).getElementInfo();\n        hr.remember(genericType, typeBinding);\n      } catch (JavaModelException e) {\n        \/\/ cannot happen since element is open\n        return;\n      }\n    } else {\n      if (typeBinding == null) return;\n\n      TypeDeclaration typeDeclaration = ((SourceTypeBinding)typeBinding).scope.referenceType();\n\n      \/\/ simple super class name\n      char[] superclassName = null;\n      TypeReference superclass;\n      if ((typeDeclaration.bits & ASTNode.IsAnonymousType) != 0) {\n        superclass = typeDeclaration.allocation.type;\n      } else {\n        superclass = typeDeclaration.superclass;\n      }\n      if (superclass != null) {\n        char[][] typeName = superclass.getTypeName();\n        superclassName = typeName == null ? null : typeName[typeName.length-1];\n      }\n\n      \/\/ simple super interface names\n      char[][] superInterfaceNames = null;\n      TypeReference[] superInterfaces = typeDeclaration.superInterfaces;\n      if (superInterfaces != null) {\n        int length = superInterfaces.length;\n        superInterfaceNames = new char[length][];\n        for (int i = 0; i < length; i++) {\n          TypeReference superInterface = superInterfaces[i];\n          char[][] typeName = superInterface.getTypeName();\n          superInterfaceNames[i] = typeName[typeName.length-1];\n        }\n      }\n\n      HierarchyType hierarchyType = new HierarchyType(\n        type,\n        typeDeclaration.name,\n        typeDeclaration.binding.modifiers,\n        superclassName,\n        superInterfaceNames);\n      hr.remember(hierarchyType, typeDeclaration.binding);\n    }\n  }\n  \n  String around(BinaryType bt) :\n    getSourceFileName(bt) {\n    IJavaElement parent = bt.getParent(); \n    if (parent instanceof IScalaClassFile)\n      return ((IScalaClassFile)parent).getSourceFileName();\n    else\n      return proceed(bt);\n  }\n  \n  boolean around(IType type, int acceptFlags, boolean isSourceType) :\n    acceptType(type, acceptFlags, isSourceType) {\n    if (!isSourceType && (type instanceof SourceType)) {\n      IJavaElement parent = type.getParent(); \n      if (parent instanceof IScalaClassFile)\n        return proceed(type, acceptFlags, true);\n    }\n    \n    return proceed(type, acceptFlags, isSourceType);\n  }\n  \n  CompilationUnitDeclaration around(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) throws JavaModelException :\n    convert(stc, sourceTypes, compilationResult) {\n    stc.unit = new CompilationUnitDeclaration(stc.problemReporter, compilationResult, 0);\n    \/\/ not filled at this point\n\n    if (sourceTypes.length == 0) return stc.unit;\n    SourceTypeElementInfo topLevelTypeInfo = (SourceTypeElementInfo) sourceTypes[0];\n    org.eclipse.jdt.core.ICompilationUnit cuHandle = topLevelTypeInfo.getHandle().getCompilationUnit();\n    stc.cu = (ICompilationUnit) cuHandle;\n\n    CompilationUnitElementInfo cuei = null;\n    Object info = ((JavaElement)stc.cu).getElementInfo();\n    if (info instanceof CompilationUnitElementInfo)\n      cuei = (CompilationUnitElementInfo)info;\n    \n    \n    if (stc.has1_5Compliance && cuei != null && cuei.annotationNumber > 10) { \/\/ experimental value\n      \/\/ if more than 10 annotations, diet parse as this is faster\n      return new Parser(stc.problemReporter, true).dietParse(stc.cu, compilationResult);\n    }\n\n    \/* only positions available *\/\n    int start = topLevelTypeInfo.getNameSourceStart();\n    int end = topLevelTypeInfo.getNameSourceEnd();\n\n    \/* convert package and imports *\/\n    String[] packageName = ((PackageFragment) cuHandle.getParent()).names;\n    if (packageName.length > 0)\n      \/\/ if its null then it is defined in the default package\n      stc.unit.currentPackage =\n        stc.createImportReference(packageName, start, end, false, ClassFileConstants.AccDefault);\n    IImportDeclaration[] importDeclarations = topLevelTypeInfo.getHandle().getCompilationUnit().getImports();\n    int importCount = importDeclarations.length;\n    stc.unit.imports = new ImportReference[importCount];\n    for (int i = 0; i < importCount; i++) {\n      ImportDeclaration importDeclaration = (ImportDeclaration) importDeclarations[i];\n      ISourceImport sourceImport = (ISourceImport) importDeclaration.getElementInfo();\n      String nameWithoutStar = importDeclaration.getNameWithoutStar();\n      stc.unit.imports[i] = stc.createImportReference(\n        Util.splitOn('.', nameWithoutStar, 0, nameWithoutStar.length()),\n        sourceImport.getDeclarationSourceStart(),\n        sourceImport.getDeclarationSourceEnd(),\n        importDeclaration.isOnDemand(),\n        sourceImport.getModifiers());\n    }\n    \/* convert type(s) *\/\n    try {\n      int typeCount = sourceTypes.length;\n      final TypeDeclaration[] types = new TypeDeclaration[typeCount];\n      \/*\n       * We used a temporary types collection to prevent this.unit.types from being null during a call to\n       * convert(...) when the source is syntactically incorrect and the parser is flushing the unit's types.\n       * See https:\/\/bugs.eclipse.org\/bugs\/show_bug.cgi?id=97466\n       *\/\n      for (int i = 0; i < typeCount; i++) {\n        SourceTypeElementInfo typeInfo = (SourceTypeElementInfo) sourceTypes[i];\n        types[i] = stc.convert((SourceType) typeInfo.getHandle(), compilationResult);\n      }\n      stc.unit.types = types;\n      return stc.unit;\n    } catch (SourceTypeConverter.AnonymousMemberFound e) {\n      return new Parser(stc.problemReporter, true).parse(stc.cu, compilationResult);\n    }\n  }\n  \n  IJavaElement around(JavaElement je, int ancestorType) :\n    getAncestor(je, ancestorType) {\n    IJavaElement element = je;\n    while (element != null) {\n      if (element.getElementType() == ancestorType)\n        return element;\n      else if (element instanceof IScalaClassFile && ancestorType == IJavaElement.COMPILATION_UNIT)\n        return ((JavaElement)element).getCompilationUnit();\n      element= element.getParent();\n    }\n    return null;\n  }\n\n  boolean around(TypeNameMatch match) :\n    isContainerDirty(match) {\n    org.eclipse.jdt.core.ICompilationUnit cu = match.getType().getCompilationUnit();\n    if (cu == null) {\n      return false;\n    }\n    IResource resource= cu.getResource();\n    if (resource == null)\n      return false;\n    \n    ITextFileBufferManager manager= FileBuffers.getTextFileBufferManager();\n    ITextFileBuffer textFileBuffer= manager.getTextFileBuffer(resource.getFullPath(), LocationKind.IFILE);\n    if (textFileBuffer != null) {\n      return textFileBuffer.isDirty();\n    }\n    return false;\n  }\n}\n","old_contents":"\/*\n * Copyright 2005-2010 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.cfprovider;\n\nimport java.util.HashSet;\n\nimport org.eclipse.core.filebuffers.FileBuffers;\nimport org.eclipse.core.filebuffers.ITextFileBuffer;\nimport org.eclipse.core.filebuffers.ITextFileBufferManager;\nimport org.eclipse.core.filebuffers.LocationKind;\nimport org.eclipse.core.resources.IResource;\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.core.IBuffer;\nimport org.eclipse.jdt.core.IClassFile;\nimport org.eclipse.jdt.core.IImportDeclaration;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IOpenable;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.ITypeRoot;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.core.dom.CompilationUnit;\nimport org.eclipse.jdt.core.search.TypeNameMatch;\nimport org.eclipse.jdt.internal.compiler.CompilationResult;\nimport org.eclipse.jdt.internal.compiler.ast.ASTNode;\nimport org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.ImportReference;\nimport org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.TypeReference;\nimport org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;\nimport org.eclipse.jdt.internal.compiler.env.IBinaryType;\nimport org.eclipse.jdt.internal.compiler.env.ICompilationUnit;\nimport org.eclipse.jdt.internal.compiler.env.IGenericType;\nimport org.eclipse.jdt.internal.compiler.env.ISourceImport;\nimport org.eclipse.jdt.internal.compiler.env.ISourceType;\nimport org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer;\nimport org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding;\nimport org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding;\nimport org.eclipse.jdt.internal.compiler.parser.Parser;\nimport org.eclipse.jdt.internal.compiler.parser.SourceTypeConverter;\nimport org.eclipse.jdt.internal.core.BinaryType;\nimport org.eclipse.jdt.internal.core.ClassFile;\nimport org.eclipse.jdt.internal.core.CompilationUnitElementInfo;\nimport org.eclipse.jdt.internal.core.ImportDeclaration;\nimport org.eclipse.jdt.internal.core.JavaElement;\nimport org.eclipse.jdt.internal.core.NameLookup;\nimport org.eclipse.jdt.internal.core.Openable;\nimport org.eclipse.jdt.internal.core.PackageFragment;\nimport org.eclipse.jdt.internal.core.SearchableEnvironment;\nimport org.eclipse.jdt.internal.core.SourceMapper;\nimport org.eclipse.jdt.internal.core.SourceType;\nimport org.eclipse.jdt.internal.core.SourceTypeElementInfo;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyResolver;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyType;\nimport org.eclipse.jdt.internal.core.util.Util;\nimport org.eclipse.jdt.internal.corext.util.OpenTypeHistory;\nimport org.eclipse.jdt.internal.ui.filters.InnerClassFilesFilter;\nimport org.eclipse.jdt.ui.SharedASTProvider;\nimport org.eclipse.jface.viewers.Viewer;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaClassFile;\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaElement;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect ClassFileProviderAspect {\n\n  pointcut classFileCreations(PackageFragment parent, String name) : \n    call(protected ClassFile.new(PackageFragment, String)) &&\n    within(org.eclipse.jdt..*) &&\n    args(parent, name);\n  \n  pointcut getTypeName(ClassFile cf) :\n    execution(public String ClassFile.getTypeName()) &&\n    target(cf);\n  \n  pointcut mapSource() :\n    execution(IBuffer ClassFile.mapSource(SourceMapper, IBinaryType)) &&\n    target(IScalaClassFile);\n  \n  pointcut mapSource2() :\n    execution(void SourceMapper.mapSource(IType, char[], IBinaryType));\n  \n  pointcut getSourceFileName(BinaryType bt) :\n    execution(String BinaryType.getSourceFileName(IBinaryType)) &&\n    target(bt);\n  \n  pointcut select(Viewer viewer, Object parentElement, Object element) :\n    execution(boolean InnerClassFilesFilter.select(Viewer, Object, Object)) &&\n    args(viewer, parentElement, element);\n  \n  pointcut getChildren(BinaryType bt) :\n    execution(IJavaElement[] BinaryType.getChildren()) &&\n    target(bt);\n  \n  pointcut getAST(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) : \n    execution(CompilationUnit SharedASTProvider.getAST(ITypeRoot, SharedASTProvider.WAIT_FLAG, IProgressMonitor)) &&\n    args(element, waitFlag, progressMonitor);\n  \n  pointcut resolve(HierarchyResolver hr, IGenericType suppliedType) :\n    execution(void HierarchyResolver.resolve(IGenericType)) &&\n    target(hr) &&\n    args(suppliedType);\n  \n  pointcut remember(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    execution(void HierarchyResolver.remember(IType, ReferenceBinding)) &&\n    target(hr) &&\n    args(type, typeBinding);\n  \n  pointcut acceptType(IType type, int acceptFlags, boolean isSourceType) :\n    execution(boolean NameLookup.acceptType(IType, int, boolean)) &&\n    args(type, acceptFlags, isSourceType);\n  \n  pointcut find(SearchableEnvironment se, String typeName, String packageName) :\n    execution(NameEnvironmentAnswer find(String, String)) &&\n    target(se) &&\n    args(typeName, packageName);\n  \n  pointcut convert(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) :\n    execution(CompilationUnitDeclaration SourceTypeConverter.convert(ISourceType[], CompilationResult)) &&\n    target(stc) &&\n    args(sourceTypes, compilationResult);\n  \n  pointcut getAncestor(JavaElement je, int ancestorType) :\n    execution(IJavaElement JavaElement.getAncestor(int)) &&\n    target(je) &&\n    args(ancestorType);\n  \n  pointcut isContainerDirty(TypeNameMatch match) :\n    execution(boolean OpenTypeHistory.isContainerDirty(TypeNameMatch)) &&\n    args(match);\n  \n  ClassFile around(PackageFragment parent, String name) : \n    classFileCreations(parent, name) {\n\n    ClassFile javaClassFile = proceed(parent, name);\n    byte[] bytes;\n    \n    try {\n      bytes = javaClassFile.getBytes();\n    } catch(Throwable t) {\n      return javaClassFile; \n    }\n    \n    for (IClassFileProvider provider : ClassFileProviderRegistry.getInstance().getProviders()) {\n      ClassFile cf = provider.create(bytes, parent, name);\n      if (cf != null)\n        return cf;\n    }\n    \n    return javaClassFile;\n  }\n  \n  void around() :\n    mapSource2() &&\n    cflow(mapSource()) {\n    return;\n  }\n  \n  String around(ClassFile cf) :\n    getTypeName(cf) {\n    if(cf instanceof IScalaClassFile) {\n      int lastDollar = cf.name.lastIndexOf('$');\n      return (lastDollar == -1 || lastDollar == cf.name.length()-1) ? cf.name : Util.localTypeName(cf.name, lastDollar, cf.name.length());\n    } else\n      return proceed(cf);\n  }\n  \n  boolean around(Viewer viewer, Object parentElement, Object element) :\n    select(viewer, parentElement, element) {\n    if (element instanceof IScalaClassFile) {\n      IClassFile classFile = (IClassFile) element;\n      String name = classFile.getElementName(); \n      int dollarIndex = name.indexOf('$');\n      return dollarIndex == -1 || dollarIndex == name.length()-7; \/\/ Trailing '$' implies object rather than inner class \n    }\n    return proceed(viewer, parentElement, element);\n  }\n  \n  IJavaElement[] around(BinaryType bt) throws JavaModelException :\n    getChildren(bt) && \n    target(BinaryType) {\n    ClassFile cf = (ClassFile)bt.parent;\n    if (cf instanceof IScalaClassFile)\n      return cf.getChildren();\n    else\n      return proceed(bt);\n  }\n  \n  CompilationUnit around(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) :\n    getAST(element, waitFlag, progressMonitor) {\n      if (element instanceof IScalaElement)\n        return null;\n      else\n        return proceed(element, waitFlag, progressMonitor);\n  }\n  \n  void around(HierarchyResolver hr, IGenericType suppliedType) :\n    resolve(hr, suppliedType) {\n    if (!suppliedType.isBinaryType()) {\n      IType tpe = ((SourceTypeElementInfo)suppliedType).getHandle();\n      IClassFile cf = tpe.getClassFile();\n      if (cf instanceof IScalaClassFile) {\n        hr.resolve(new Openable[]{(Openable)cf}, new HashSet(), null);\n        return;\n      }\n    }\n      \n    proceed(hr, suppliedType);\n  }\n  \n  void around(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    remember(hr, type, typeBinding) {\n    if (((IOpenable)type.getCompilationUnit()).isOpen()) {\n      try {\n        IGenericType genericType = (IGenericType)((JavaElement)type).getElementInfo();\n        hr.remember(genericType, typeBinding);\n      } catch (JavaModelException e) {\n        \/\/ cannot happen since element is open\n        return;\n      }\n    } else {\n      if (typeBinding == null) return;\n\n      TypeDeclaration typeDeclaration = ((SourceTypeBinding)typeBinding).scope.referenceType();\n\n      \/\/ simple super class name\n      char[] superclassName = null;\n      TypeReference superclass;\n      if ((typeDeclaration.bits & ASTNode.IsAnonymousType) != 0) {\n        superclass = typeDeclaration.allocation.type;\n      } else {\n        superclass = typeDeclaration.superclass;\n      }\n      if (superclass != null) {\n        char[][] typeName = superclass.getTypeName();\n        superclassName = typeName == null ? null : typeName[typeName.length-1];\n      }\n\n      \/\/ simple super interface names\n      char[][] superInterfaceNames = null;\n      TypeReference[] superInterfaces = typeDeclaration.superInterfaces;\n      if (superInterfaces != null) {\n        int length = superInterfaces.length;\n        superInterfaceNames = new char[length][];\n        for (int i = 0; i < length; i++) {\n          TypeReference superInterface = superInterfaces[i];\n          char[][] typeName = superInterface.getTypeName();\n          superInterfaceNames[i] = typeName[typeName.length-1];\n        }\n      }\n\n      HierarchyType hierarchyType = new HierarchyType(\n        type,\n        typeDeclaration.name,\n        typeDeclaration.binding.modifiers,\n        superclassName,\n        superInterfaceNames);\n      hr.remember(hierarchyType, typeDeclaration.binding);\n    }\n  }\n  \n  String around(BinaryType bt) :\n    getSourceFileName(bt) {\n    IJavaElement parent = bt.getParent(); \n    if (parent instanceof IScalaClassFile)\n      return ((IScalaClassFile)parent).getSourceFileName();\n    else\n      return proceed(bt);\n  }\n  \n  boolean around(IType type, int acceptFlags, boolean isSourceType) :\n    acceptType(type, acceptFlags, isSourceType) {\n    if (!isSourceType && (type instanceof SourceType)) {\n      IJavaElement parent = type.getParent(); \n      if (parent instanceof IScalaClassFile)\n        return proceed(type, acceptFlags, true);\n    }\n    \n    return proceed(type, acceptFlags, isSourceType);\n  }\n  \n  CompilationUnitDeclaration around(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) throws JavaModelException :\n    convert(stc, sourceTypes, compilationResult) {\n    stc.unit = new CompilationUnitDeclaration(stc.problemReporter, compilationResult, 0);\n    \/\/ not filled at this point\n\n    if (sourceTypes.length == 0) return stc.unit;\n    SourceTypeElementInfo topLevelTypeInfo = (SourceTypeElementInfo) sourceTypes[0];\n    org.eclipse.jdt.core.ICompilationUnit cuHandle = topLevelTypeInfo.getHandle().getCompilationUnit();\n    stc.cu = (ICompilationUnit) cuHandle;\n\n    CompilationUnitElementInfo cuei = null;\n    Object info = ((JavaElement)stc.cu).getElementInfo();\n    if (info instanceof CompilationUnitElementInfo)\n      cuei = (CompilationUnitElementInfo)info;\n    \n    \n    if (stc.has1_5Compliance && cuei != null && cuei.annotationNumber > 10) { \/\/ experimental value\n      \/\/ if more than 10 annotations, diet parse as this is faster\n      return new Parser(stc.problemReporter, true).dietParse(stc.cu, compilationResult);\n    }\n\n    \/* only positions available *\/\n    int start = topLevelTypeInfo.getNameSourceStart();\n    int end = topLevelTypeInfo.getNameSourceEnd();\n\n    \/* convert package and imports *\/\n    String[] packageName = ((PackageFragment) cuHandle.getParent()).names;\n    if (packageName.length > 0)\n      \/\/ if its null then it is defined in the default package\n      stc.unit.currentPackage =\n        stc.createImportReference(packageName, start, end, false, ClassFileConstants.AccDefault);\n    IImportDeclaration[] importDeclarations = topLevelTypeInfo.getHandle().getCompilationUnit().getImports();\n    int importCount = importDeclarations.length;\n    stc.unit.imports = new ImportReference[importCount];\n    for (int i = 0; i < importCount; i++) {\n      ImportDeclaration importDeclaration = (ImportDeclaration) importDeclarations[i];\n      ISourceImport sourceImport = (ISourceImport) importDeclaration.getElementInfo();\n      String nameWithoutStar = importDeclaration.getNameWithoutStar();\n      stc.unit.imports[i] = stc.createImportReference(\n        Util.splitOn('.', nameWithoutStar, 0, nameWithoutStar.length()),\n        sourceImport.getDeclarationSourceStart(),\n        sourceImport.getDeclarationSourceEnd(),\n        importDeclaration.isOnDemand(),\n        sourceImport.getModifiers());\n    }\n    \/* convert type(s) *\/\n    try {\n      int typeCount = sourceTypes.length;\n      final TypeDeclaration[] types = new TypeDeclaration[typeCount];\n      \/*\n       * We used a temporary types collection to prevent this.unit.types from being null during a call to\n       * convert(...) when the source is syntactically incorrect and the parser is flushing the unit's types.\n       * See https:\/\/bugs.eclipse.org\/bugs\/show_bug.cgi?id=97466\n       *\/\n      for (int i = 0; i < typeCount; i++) {\n        SourceTypeElementInfo typeInfo = (SourceTypeElementInfo) sourceTypes[i];\n        types[i] = stc.convert((SourceType) typeInfo.getHandle(), compilationResult);\n      }\n      stc.unit.types = types;\n      return stc.unit;\n    } catch (SourceTypeConverter.AnonymousMemberFound e) {\n      return new Parser(stc.problemReporter, true).parse(stc.cu, compilationResult);\n    }\n  }\n  \n  IJavaElement around(JavaElement je, int ancestorType) :\n    getAncestor(je, ancestorType) {\n    IJavaElement element = je;\n    while (element != null) {\n      if (element.getElementType() == ancestorType)\n        return element;\n      else if (element instanceof IScalaClassFile && ancestorType == IJavaElement.COMPILATION_UNIT)\n        return ((JavaElement)element).getCompilationUnit();\n      element= element.getParent();\n    }\n    return null;\n  }\n\n  boolean around(TypeNameMatch match) :\n    isContainerDirty(match) {\n    org.eclipse.jdt.core.ICompilationUnit cu = match.getType().getCompilationUnit();\n    if (cu == null) {\n      return false;\n    }\n    IResource resource= cu.getResource();\n    if (resource == null)\n      return false;\n    \n    ITextFileBufferManager manager= FileBuffers.getTextFileBufferManager();\n    ITextFileBuffer textFileBuffer= manager.getTextFileBuffer(resource.getFullPath(), LocationKind.IFILE);\n    if (textFileBuffer != null) {\n      return textFileBuffer.isDirty();\n    }\n    return false;\n  }\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"d393d5617f14fc1fdb6fd02bfb795027dc6fa7e0","subject":"- clear wrong aspect ","message":"- clear wrong aspect ","repos":"agentlab\/ru.agentlab.maia","old_file":"aspects\/ru.agentlab.maia.memory.injector.logs\/aj-src\/ru\/agentlab\/maia\/context\/injector\/log\/AMaiaContextInjectorLog.aj","new_file":"aspects\/ru.agentlab.maia.memory.injector.logs\/aj-src\/ru\/agentlab\/maia\/context\/injector\/log\/AMaiaContextInjectorLog.aj","new_contents":"package ru.agentlab.maia.context.injector.log;\n\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport ru.agentlab.maia.memory.IMaiaContext;\nimport ru.agentlab.maia.memory.aj.AMaiaContextFactory;\n\npublic aspect AMaiaContextInjectorLog extends AMaiaContextFactory {\n\n\/\/\tbefore(IMaiaContextFactory factory) : \n\/\/\t\tonCreateContext(factory) {\n\/\/\t\tLogger logger = LoggerFactory.getLogger(factory.getClass());\n\/\/\t\tlogger.info(\"Try to create context...\");\n\/\/\t}\n\/\/\n\/\/\tafter(IMaiaContextFactory factory) returning (IMaiaContext result): \n\/\/\t\tonCreateContext(factory) {\n\/\/\t\tLogger logger = LoggerFactory.getLogger(factory.getClass());\n\/\/\t\tlogger.info(\"Context [\" + result.getUuid() + \"] successfully created\");\n\/\/\t}\n}","old_contents":"package ru.agentlab.maia.context.injector.log;\n\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport ru.agentlab.maia.memory.IMaiaContext;\nimport ru.agentlab.maia.memory.IMaiaContextFactory;\nimport ru.agentlab.maia.memory.aj.AMaiaContextFactory;\n\npublic aspect AMaiaContextInjectorLog extends AMaiaContextFactory {\n\n\tbefore(IMaiaContextFactory factory) : \n\t\tonCreateContext(factory) {\n\t\tLogger logger = LoggerFactory.getLogger(factory.getClass());\n\t\tlogger.info(\"Try to create context...\");\n\t}\n\n\tafter(IMaiaContextFactory factory) returning (IMaiaContext result): \n\t\tonCreateContext(factory) {\n\t\tLogger logger = LoggerFactory.getLogger(factory.getClass());\n\t\tlogger.info(\"Context [\" + result.getUuid() + \"] successfully created\");\n\t}\n}","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"765f0f506b9cc90b32a326cc61091680d4d6d844","subject":"added log message for non-local case","message":"added log message for non-local case\n","repos":"palava\/palava-jpa-aspectj","old_file":"src\/main\/java\/de\/cosmocode\/palava\/jpa\/aspectj\/EntityTransactionAspect.aj","new_file":"src\/main\/java\/de\/cosmocode\/palava\/jpa\/aspectj\/EntityTransactionAspect.aj","new_contents":"\/**\n * Copyright 2010 CosmoCode GmbH\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage de.cosmocode.palava.jpa.aspectj;\n\nimport javax.persistence.EntityManager;\nimport javax.persistence.EntityTransaction;\nimport javax.persistence.PersistenceException;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\nimport de.cosmocode.palava.jpa.Transactional;\n\npublic final aspect EntityTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(EntityTransactionAspect.class);\n\n    private Provider<EntityManager> currentManager;\n    \n    @Inject\n    public void setProvider(Provider<EntityManager> manager) {\n        this.currentManager = Preconditions.checkNotNull(manager, \"Manager\");\n    }\n    \n    pointcut transactional(): execution(@Transactional * *.*(..));\n\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        final EntityManager manager = currentManager.get();\n        LOG.trace(\"Retrieved entitymanager {}\", manager);\n        final EntityTransaction tx = manager.getTransaction();\n        LOG.trace(\"Using transaction {}\", tx);\n        final boolean localTx = !tx.isActive();\n        \n        if (localTx) {\n            LOG.trace(\"Beginning automatic transaction\");\n            tx.begin();\n        } else {\n            LOG.trace(\"Transaction already active\");\n        }\n        \n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (RuntimeException e) {\n            LOG.debug(\"Exception inside automatic transaction context; rolling back\", e);\n            tx.rollback();\n            throw e;\n        }\n        \n        if (localTx && tx.isActive()) {\n            if (tx.getRollbackOnly()) {\n                LOG.debug(\"Transaction was marked as rollback only. Rolling back...\");\n                tx.rollback();\n            } else {\n                try {\n                    tx.commit();\n                    LOG.trace(\"Committed automatic transaction\");\n                } catch (PersistenceException e) {\n                    LOG.debug(\"Commit in automatic transaction context failed\", e);\n                    if (tx.isActive()) {\n                        LOG.debug(\"Rolling back {}\", tx);\n                        tx.rollback();\n                    } else {\n                        LOG.debug(\"Can't roll back inactive transaction {}\", tx);\n                    }\n                    throw e;\n                }\n            }\n        } else {\n            LOG.trace(\"Not committing non-local transaction {}\", tx);\n        }\n        \n        return returnValue;\n    }\n    \n}\n","old_contents":"\/**\n * Copyright 2010 CosmoCode GmbH\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage de.cosmocode.palava.jpa.aspectj;\n\nimport javax.persistence.EntityManager;\nimport javax.persistence.EntityTransaction;\nimport javax.persistence.PersistenceException;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\nimport de.cosmocode.palava.jpa.Transactional;\n\npublic final aspect EntityTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(EntityTransactionAspect.class);\n\n    private Provider<EntityManager> currentManager;\n    \n    @Inject\n    public void setProvider(Provider<EntityManager> manager) {\n        this.currentManager = Preconditions.checkNotNull(manager, \"Manager\");\n    }\n    \n    pointcut transactional(): execution(@Transactional * *.*(..));\n\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        final EntityManager manager = currentManager.get();\n        LOG.trace(\"Retrieved entitymanager {}\", manager);\n        final EntityTransaction tx = manager.getTransaction();\n        LOG.trace(\"Using transaction {}\", tx);\n        final boolean localTx = !tx.isActive();\n        \n        if (localTx) {\n            LOG.trace(\"Beginning automatic transaction\");\n            tx.begin();\n        } else {\n            LOG.trace(\"Transaction already active\");\n        }\n        \n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (RuntimeException e) {\n            LOG.debug(\"Exception inside automatic transaction context; rolling back\", e);\n            tx.rollback();\n            throw e;\n        }\n        \n        if (localTx && tx.isActive()) {\n            if (tx.getRollbackOnly()) {\n                LOG.debug(\"Transaction was marked as rollback only. Rolling back...\");\n                tx.rollback();\n            } else {\n                try {\n                    tx.commit();\n                    LOG.trace(\"Committed automatic transaction\");\n                } catch (PersistenceException e) {\n                    LOG.debug(\"Commit in automatic transaction context failed\", e);\n                    if (tx.isActive()) {\n                        LOG.debug(\"Rolling back {}\", tx);\n                        tx.rollback();\n                    } else {\n                        LOG.debug(\"Can't roll back inactive transaction {}\", tx);\n                    }\n                    throw e;\n                }\n            }\n        }\n        \n        return returnValue;\n    }\n    \n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"ff01b96929e247a518689c3ffb00c4dc90bd3c71","subject":"multipage table for pdf","message":"multipage table for pdf\n","repos":"stieglma\/Schafkopfauswerter","old_file":"src\/PdfExport.aj","new_file":"src\/PdfExport.aj","new_contents":"import java.awt.Component;\nimport java.awt.event.ActionEvent;\nimport java.awt.event.ActionListener;\nimport java.io.IOException;\nimport java.text.SimpleDateFormat;\nimport java.util.Calendar;\nimport java.util.Iterator;\n\nimport javax.swing.JMenu;\nimport javax.swing.JMenuBar;\nimport javax.swing.JMenuItem;\n\nimport org.apache.pdfbox.exceptions.COSVisitorException;\nimport org.apache.pdfbox.pdmodel.PDDocument;\nimport org.apache.pdfbox.pdmodel.PDPage;\nimport org.apache.pdfbox.pdmodel.edit.PDPageContentStream;\nimport org.apache.pdfbox.pdmodel.font.PDType1Font;\n\nimport model.db.DataObject;\nimport model.db.GameData;\nimport view.GUI;\nimport view.SchafkopfTableModel;\n\npublic privileged aspect PdfExport {\n\n    \/** This precendence makes the order of the items in the file menu sure *\/\n    declare precedence : Import, HtmlExport, PdfExport; \n    private GUI gui;\n\n    \/**\n     * catch constructor call, so that we have the correct gui, to refer to everywhere\n     *\/\n    after() returning(GUI gui): call(GUI.new(*)) {\n        this.gui = gui;\n    }\n\n    private String[][] SchafkopfTableModel.asTextArray() {\n        String[][] completeTable = data.asTextArray();\n\n        String[] headerLine = new String[getColumnCount()];\n        for (int i = 0; i < getColumnCount(); i++) {\n            headerLine[i] = getColumnName(i);\n        }\n        completeTable[0] = headerLine;\n        return completeTable;\n    }\n\n    private String[][] GameData.asTextArray() {\n        Iterator<DataObject> it = data.iterator();\n        String[][] rows = new String[data.size()+1][];\n        int index = 1;\n        while (it.hasNext()) {\n            rows[index] = it.next().asTextArray(index-1);\n            index++;\n        }\n        return rows;\n    }\n\n    \/**\n     * Add pdf report feature to menu bar\n     *\/\n    after() returning(JMenuBar bar): call(JMenuBar GUI.createMenu()) {\n        JMenuItem itemExportPdf = new JMenuItem(\"Generiere PDF Report\");\n        itemExportPdf.addActionListener(new PDFReportListener());\n\n        Component[] menus = bar.getComponents();\n        if (menus.length != 0 && menus[0] instanceof JMenu) {\n            ((JMenu)bar.getComponents()[0]).add(itemExportPdf, 0);\n        } else {\n            throw new AssertionError(\"There should be a menu entry!\");\n        }\n    }\n\n    \/**\n     * generate pdf report (execution of PDFReportListener is suppressed, this\n     * is just an empty method, to be able to create this pointcut\n     *\/\n    void around(PDDocument document) throws IOException\n          : execution (* PDFReportListener.drawTable(PDDocument)) \n          && args(document) {\n\n\n        String[][] content = ((SchafkopfTableModel) gui.table.getModel()).asTextArray();\n\n        \/\/ we have inches in us letter (8.5x11) therefore calculate correct width in points here\n        \/\/ 1 pt = 1\/72 inch\n        final int height = 11 * 72;\n        final int width = (int) (8.5* 72);\n        \/\/ some values for drawing the table\n        final int margin = 50;\n        final int rowHeight = 20;\n        final int maxRowsPerPage = (int) (height - 2*margin) \/ rowHeight;\n        final int tableWidth = width - (2*margin);\n        final int cellMargin=5;\n\n        int rowsToBeDone = content.length;\n        int actRow = 0;\n        final int cols = content[0].length;\n        final float colWidth = tableWidth\/(float)cols;\n\n        \/\/draw the table\n        do {\n            \/\/ create initial page\n            PDPage page = new PDPage();\n            document.addPage(page);\n            PDPageContentStream contentStream = new PDPageContentStream(document, page);\n            final float tableHeight = rowHeight * (Math.min(rowsToBeDone, maxRowsPerPage));\n            float y = height - margin;\n\n            \/\/ draw table borders\n            float nexty = y;\n            for (int i = 0; i <= Math.min(rowsToBeDone, maxRowsPerPage); i++) {\n                contentStream.drawLine(margin,nexty,margin+tableWidth,nexty);\n                nexty-= rowHeight;\n            }\n            float nextx = margin;\n            for (int i = 0; i <= cols; i++) {\n                contentStream.drawLine(nextx,y,nextx,y-tableHeight);\n                nextx += colWidth;\n            }\n\n          \/\/now add the text\n            contentStream.setFont(PDType1Font.HELVETICA_BOLD,10);\n            float textx = margin+cellMargin;\n            float texty = y-15;\n            for(int i = actRow; i < Math.min(rowsToBeDone, maxRowsPerPage)+actRow; i++){\n                for(int j = 0 ; j < cols; j++){\n                    contentStream.beginText();\n                    contentStream.moveTextPositionByAmount(textx,texty);\n                    contentStream.drawString(content[i][j]);\n                    contentStream.endText();\n                    textx += colWidth;\n                }\n                texty-=rowHeight;\n                textx = margin+cellMargin;\n            }\n            contentStream.close();\n\n            \/\/ reduce number of rows that still have to be done\n            rowsToBeDone -= maxRowsPerPage;\n            actRow += maxRowsPerPage;\n        } while (rowsToBeDone > 0);\n    }\n}\n\nclass PDFReportListener implements ActionListener {\n\n    @Override\n    public void actionPerformed(ActionEvent arg0) {\n        \/\/ Create a document and add a page to it\n        PDDocument document = new PDDocument();\n        \n        try {\n            drawTable(document);  \n\n            \/\/ Save the results and ensure that the document is properly closed:\n            document.save(\"Session_vom_\"+new SimpleDateFormat(\"dd.MM_'um'_HH:mm\").format(Calendar.getInstance().getTime()) + \".pdf\");\n        } catch (IOException | COSVisitorException e) {\n            \/\/ TODO Auto-generated catch block\n            e.printStackTrace();\n        } finally {\n            try {\n                document.close();\n            } catch (IOException e) {\n                e.printStackTrace();\n            }\n        }\n    }\n\n    \/** filled with pointcut from pdfExport.aj*\/\n    public static void drawTable(PDDocument document) throws IOException {\n    }\n}","old_contents":"import java.awt.Component;\nimport java.awt.event.ActionEvent;\nimport java.awt.event.ActionListener;\nimport java.io.IOException;\nimport java.text.SimpleDateFormat;\nimport java.util.Calendar;\nimport java.util.Iterator;\n\nimport javax.swing.JMenu;\nimport javax.swing.JMenuBar;\nimport javax.swing.JMenuItem;\n\nimport org.apache.pdfbox.exceptions.COSVisitorException;\nimport org.apache.pdfbox.pdmodel.PDDocument;\nimport org.apache.pdfbox.pdmodel.PDPage;\nimport org.apache.pdfbox.pdmodel.edit.PDPageContentStream;\nimport org.apache.pdfbox.pdmodel.font.PDType1Font;\n\nimport model.db.DataObject;\nimport model.db.GameData;\nimport view.GUI;\nimport view.SchafkopfTableModel;\n\npublic privileged aspect PdfExport {\n\n    \/** This precendence makes the order of the items in the file menu sure *\/\n    declare precedence : Import, HtmlExport, PdfExport; \n    private GUI gui;\n\n    \/**\n     * catch constructor call, so that we have the correct gui, to refer to everywhere\n     *\/\n    after() returning(GUI gui): call(GUI.new(*)) {\n        this.gui = gui;\n    }\n\n    private String[][] SchafkopfTableModel.asTextArray() {\n        String[][] completeTable = data.asTextArray();\n\n        String[] headerLine = new String[getColumnCount()];\n        for (int i = 0; i < getColumnCount(); i++) {\n            headerLine[i] = getColumnName(i);\n        }\n        completeTable[0] = headerLine;\n        return completeTable;\n    }\n\n    private String[][] GameData.asTextArray() {\n        Iterator<DataObject> it = data.iterator();\n        String[][] rows = new String[data.size()+1][];\n        int index = 1;\n        while (it.hasNext()) {\n            rows[index] = it.next().asTextArray(index-1);\n            index++;\n        }\n        return rows;\n    }\n\n    \/**\n     * Add pdf report feature to menu bar\n     *\/\n    after() returning(JMenuBar bar): call(JMenuBar GUI.createMenu()) {\n        JMenuItem itemExportPdf = new JMenuItem(\"Generiere PDF Report\");\n        itemExportPdf.addActionListener(new PDFReportListener());\n\n        Component[] menus = bar.getComponents();\n        if (menus.length != 0 && menus[0] instanceof JMenu) {\n            ((JMenu)bar.getComponents()[0]).add(itemExportPdf, 0);\n        } else {\n            throw new AssertionError(\"There should be a menu entry!\");\n        }\n    }\n\n    \/**\n     * generate pdf report (execution of PDFReportListener is suppressed, this\n     * is just an empty method, to be able to create this pointcut\n     *\/\n    void around(PDDocument document) throws IOException\n          : execution (* PDFReportListener.drawTable(PDDocument)) \n          && args(document) {\n        PDPage page = new PDPage();\n        document.addPage(page);\n        PDPageContentStream contentStream = new PDPageContentStream(document, page);\n        float y =750f;\n        float margin =60f;\n        String[][] content = ((SchafkopfTableModel) gui.table.getModel()).asTextArray();\n\n        final int rows = content.length;\n        final int cols = content[0].length;\n        final float rowHeight = 20f;\n        final float tableWidth = page.findMediaBox().getWidth()-(2*margin);\n        final float tableHeight = rowHeight * rows;\n        final float colWidth = tableWidth\/(float)cols;\n        final float cellMargin=5f;\n\n        \/\/ TODO multisite tables\n        \/\/draw the rows\n        float nexty = y ;\n        for (int i = 0; i <= rows; i++) {\n            contentStream.drawLine(margin,nexty,margin+tableWidth,nexty);\n            nexty-= rowHeight;\n        }\n     \n        \/\/draw the columns\n        float nextx = margin;\n        for (int i = 0; i <= cols; i++) {\n            contentStream.drawLine(nextx,y,nextx,y-tableHeight);\n            nextx += colWidth;\n        }\n     \n        \/\/now add the text\n        contentStream.setFont(PDType1Font.HELVETICA_BOLD,10);\n     \n        float textx = margin+cellMargin;\n        float texty = y-15;\n        for(int i = 0; i < content.length; i++){\n            for(int j = 0 ; j < content[i].length; j++){\n                String text = content[i][j];\n                contentStream.beginText();\n                contentStream.moveTextPositionByAmount(textx,texty);\n                contentStream.drawString(text);\n                contentStream.endText();\n                textx += colWidth;\n            }\n            texty-=rowHeight;\n            textx = margin+cellMargin;\n        }\n        contentStream.close();\n    }\n}\n\nclass PDFReportListener implements ActionListener {\n\n    @Override\n    public void actionPerformed(ActionEvent arg0) {\n        \/\/ Create a document and add a page to it\n        PDDocument document = new PDDocument();\n        \n        try {\n            drawTable(document);  \n\n            \/\/ Save the results and ensure that the document is properly closed:\n            document.save(\"Session_vom_\"+new SimpleDateFormat(\"dd.MM_'um'_HH:mm\").format(Calendar.getInstance().getTime()) + \".pdf\");\n        } catch (IOException | COSVisitorException e) {\n            \/\/ TODO Auto-generated catch block\n            e.printStackTrace();\n        } finally {\n            try {\n                document.close();\n            } catch (IOException e) {\n                e.printStackTrace();\n            }\n        }\n    }\n\n    \/** filled with pointcut from pdfExport.aj*\/\n    public static void drawTable(PDDocument document) throws IOException {\n    }\n}","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"89f6e8e60ef2beeca1fb1c7254ad786ee5f5564b","subject":"Fixing xpp3 imports for plugin realms.","message":"Fixing xpp3 imports for plugin realms.\n\ngit-svn-id: 2c527eb49caa05e19d6b2be874bf74fa9d7ea670@654198 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"kidaa\/maven-1,njuneau\/maven,xasx\/maven,cstamas\/maven,cstamas\/maven,stephenc\/maven,Distrotech\/maven,vedmishr\/demo1,mizdebsk\/maven,ChristianSchulte\/maven,pkozelka\/maven,Distrotech\/maven,kidaa\/maven-1,Tibor17\/maven,atanasenko\/maven,apache\/maven,barthel\/maven,ChristianSchulte\/maven,changbai1980\/maven,skitt\/maven,Mounika-Chirukuri\/maven,wangyuesong\/maven,trajano\/maven,aheritier\/maven,apache\/maven,Mounika-Chirukuri\/maven,wangyuesong0\/maven,likaiwalkman\/maven,skitt\/maven,stephenc\/maven,aheritier\/maven,gorcz\/maven,karthikjaps\/maven,xasx\/maven,likaiwalkman\/maven,stephenc\/maven,pkozelka\/maven,runepeter\/maven-deploy-plugin-2.8.1,josephw\/maven,josephw\/maven,skitt\/maven,atanasenko\/maven,apache\/maven,changbai1980\/maven,njuneau\/maven,rogerchina\/maven,gorcz\/maven,dsyer\/maven,karthikjaps\/maven,keith-turner\/maven,olamy\/maven,trajano\/maven,likaiwalkman\/maven,rogerchina\/maven,changbai1980\/maven,xasx\/maven,dsyer\/maven,mcculls\/maven,atanasenko\/maven,njuneau\/maven,aheritier\/maven,gorcz\/maven,olamy\/maven,wangyuesong\/maven,pkozelka\/maven,rogerchina\/maven,barthel\/maven,keith-turner\/maven,josephw\/maven,keith-turner\/maven,kidaa\/maven-1,Mounika-Chirukuri\/maven,olamy\/maven,Tibor17\/maven,lbndev\/maven,lbndev\/maven,vedmishr\/demo1,vedmishr\/demo1,ChristianSchulte\/maven,runepeter\/maven-deploy-plugin-2.8.1,mizdebsk\/maven,dsyer\/maven,barthel\/maven,mcculls\/maven,wangyuesong0\/maven,wangyuesong0\/maven,mizdebsk\/maven,lbndev\/maven,cstamas\/maven,trajano\/maven,wangyuesong\/maven,mcculls\/maven,karthikjaps\/maven","old_file":"maven-core\/src\/main\/aspect\/org\/apache\/maven\/compat\/Maven20xCompatAspect.aj","new_file":"maven-core\/src\/main\/aspect\/org\/apache\/maven\/compat\/Maven20xCompatAspect.aj","new_contents":"package org.apache.maven.compat;\n\nimport org.apache.maven.lifecycle.binding.DefaultLifecycleBindingManager;\nimport org.apache.maven.lifecycle.binding.LifecycleBindingManager;\nimport org.codehaus.plexus.PlexusContainer;\nimport org.apache.maven.DefaultMaven;\nimport org.apache.maven.lifecycle.DefaultLifecycleExecutor;\nimport org.apache.maven.lifecycle.MojoBindingUtils;\nimport org.apache.maven.lifecycle.LifecycleUtils;\nimport org.apache.maven.lifecycle.NoSuchPhaseException;\nimport org.apache.maven.execution.MavenExecutionRequest;\nimport org.apache.maven.execution.MavenExecutionResult;\nimport org.apache.maven.execution.MavenSession;\nimport org.apache.maven.extension.DefaultExtensionManager;\nimport org.apache.maven.artifact.Artifact;\nimport org.apache.maven.artifact.factory.ArtifactFactory;\nimport org.apache.maven.artifact.metadata.ResolutionGroup;\nimport org.apache.maven.artifact.repository.ArtifactRepository;\nimport org.apache.maven.artifact.resolver.ArtifactNotFoundException;\nimport org.apache.maven.artifact.resolver.ArtifactResolutionException;\nimport org.apache.maven.artifact.versioning.DefaultArtifactVersion;\nimport org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;\nimport org.apache.maven.artifact.versioning.VersionRange;\nimport org.apache.maven.lifecycle.model.MojoBinding;\nimport org.apache.maven.model.Plugin;\nimport org.apache.maven.plugin.DefaultPluginManager;\nimport org.apache.maven.plugin.InvalidPluginException;\nimport org.apache.maven.plugin.PluginManager;\nimport org.apache.maven.plugin.PluginManagerException;\nimport org.apache.maven.plugin.PluginNotFoundException;\nimport org.apache.maven.plugin.descriptor.PluginDescriptor;\nimport org.apache.maven.plugin.version.PluginVersionNotFoundException;\nimport org.apache.maven.plugin.version.PluginVersionResolutionException;\nimport org.apache.maven.project.MavenProject;\nimport org.apache.maven.realm.MavenRealmManager;\nimport org.apache.maven.settings.MavenSettingsBuilder;\nimport org.apache.maven.settings.DefaultMavenSettingsBuilder;\nimport org.apache.maven.settings.Settings;\nimport org.codehaus.plexus.classworlds.realm.ClassRealm;\nimport org.codehaus.plexus.classworlds.realm.NoSuchRealmException;\nimport org.codehaus.plexus.component.repository.exception.ComponentLookupException;\nimport org.codehaus.plexus.util.xml.pull.XmlPullParserException;\nimport org.codehaus.plexus.util.xml.Xpp3Dom;\nimport org.codehaus.plexus.logging.Logger;\n\nimport java.util.List;\nimport java.io.IOException;\nimport java.util.Iterator;\nimport java.util.Collection;\nimport java.util.Set;\nimport java.util.LinkedHashSet;\n\npublic privileged aspect Maven20xCompatAspect\n{\n\n    \/\/ GRAB Session as soon as it's constructed.\n    private MavenSession session;\n\n    \/\/ GRAB the request when it's passed into a method that returns a corresponding result.\n    \/\/ NOTE: We'll use this in multiple places below...\n    private MavenExecutionRequest request;\n\n    \/\/ Grab this so we have a voice!\n    private Logger logger;\n\n    \/\/ used for injecting plexus-utils into extension and plugin artifact sets.\n    private VersionRange vr = null;\n    private Artifact plexusUtilsArtifact = null;\n\n\n    private pointcut mavenEmbedderStop():\n        execution( * org.apache.maven.embedder.MavenEmbedder.stop( .. ) );\n\n    \/\/ TODO: There must be a more elegant way to release these resources than depending on MavenEmbedder.stop().\n    after(): mavenEmbedderStop()\n    {\n        session = null;\n        request = null;\n        logger = null;\n        vr = null;\n        plexusUtilsArtifact = null;\n    }\n\n\n    \/\/ pointcut to avoid recursive matching on behavior injected by this aspect.\n    private pointcut notHere(): !within( Maven20xCompatAspect );\n\n    private pointcut sessionCreation( MavenSession session ):\n        execution( public MavenSession+.new(..) )\n        && this( session )\n        && notHere();\n\n    \/\/ capture the session instance.\n    after( MavenSession session ): sessionCreation( session )\n    {\n        if ( logger != null && logger.isDebugEnabled() )\n        {\n            logger.debug( \"Capturing session for backward compatibility aspect: \" + session );\n        }\n\n        this.session = session;\n    }\n\n    \/\/ Re-Introduce old verifyPlugin(..) API.\n    public PluginDescriptor PluginManager.verifyPlugin( Plugin plugin,\n                                                        MavenProject project,\n                                                        Settings settings,\n                                                        ArtifactRepository localRepository )\n        throws ArtifactResolutionException, ArtifactNotFoundException, PluginNotFoundException,\n        PluginVersionResolutionException, InvalidPluginException, PluginManagerException,\n        PluginVersionNotFoundException\n    {\n        \/\/ this will always be diverted, so no need to do anything.\n        throw new IllegalStateException( \"This introduced method should ALWAYS be intercepted by backward compatibility aspect.\" );\n    }\n\n    \/\/ USE Session to compensate for old verifyPlugin(..) API.\n    private pointcut verifyPlugin( Plugin plugin, MavenProject project, PluginManager manager ):\n        execution( PluginDescriptor PluginManager+.verifyPlugin( Plugin, MavenProject, Settings, ArtifactRepository+ ) )\n        && args( plugin, project, .. )\n        && this( manager );\n\n    \/\/ redirect the old verifyPlugin(..) call to the new one, using the captured session instance above.\n    PluginDescriptor around( Plugin plugin,\n                             MavenProject project,\n                             PluginManager manager )\n        throws ArtifactResolutionException, ArtifactNotFoundException, PluginNotFoundException,\n        PluginVersionResolutionException, InvalidPluginException, PluginManagerException,\n        PluginVersionNotFoundException:\n            verifyPlugin( plugin, project, manager )\n    {\n        if ( logger != null && logger.isDebugEnabled() )\n        {\n            logger.debug( \"Diverting legacy PluginManager.verifyPlugin(..) call to replacement method using session: \" + session );\n        }\n\n        return manager.verifyPlugin( plugin, project, session );\n    }\n\n    private pointcut getPluginDescriptorForPrefix( String prefix, PluginManager manager ):\n        execution( public PluginDescriptor PluginManager+.getPluginDescriptorForPrefix( String ) )\n        && args( prefix )\n        && this( manager )\n        && notHere();\n\n    PluginDescriptor around( String prefix, PluginManager manager ): getPluginDescriptorForPrefix( prefix, manager )\n    {\n        \/\/ TODO: Implement Me!\n        throw new UnsupportedOperationException( \"This method has not yet been implemented in Maven's backward-compatibility library.\" );\n    }\n\n    public PluginDescriptor PluginManager.getPluginDescriptorForPrefix( String prefix )\n    {\n        return null;\n    }\n\n    \/\/ Intercept retrieval of artifact dependencies of an extension, inject plexus-utils if it's not there.\n    private pointcut extDepArtifactsResolved( DefaultExtensionManager mgr ):\n        call( public Set ResolutionGroup+.getArtifacts() )\n        && within( DefaultExtensionManager+ )\n        && this( mgr )\n        && notHere();\n\n    \/\/ We use the same hack here to make sure that plexus 1.1 is available for extensions that do\n    \/\/ not declare plexus-utils but need it. MNG-2900\n    Set around( DefaultExtensionManager mgr ): extDepArtifactsResolved( mgr )\n    {\n        Set result = proceed( mgr );\n\n        result = checkPlexusUtils( result, mgr.artifactFactory );\n\n        return result;\n    }\n\n    \/\/ Intercept retrieval of artifact dependencies of a plugin, inject plexus-utils if it's not there.\n    private pointcut pluginDepArtifactsResolved( DefaultPluginManager mgr ):\n        call( public Set ResolutionGroup+.getArtifacts() )\n        && cflow( execution( Set DefaultPluginManager+.getPluginArtifacts(..) ) )\n        && this( mgr )\n        && notHere();\n\n    Set around( DefaultPluginManager mgr ): pluginDepArtifactsResolved( mgr )\n    {\n        Set result = proceed( mgr );\n\n        result = checkPlexusUtils( result, mgr.artifactFactory );\n\n        return result;\n    }\n\n    private pointcut methodsTakingRequest( MavenExecutionRequest request ):\n        execution( MavenExecutionResult *.*( MavenExecutionRequest ) )\n        && !withincode( * *.*( MavenExecutionRequest ) )\n        && args( request )\n        && notHere();\n\n    \/\/ capture the request instance before it's passed into any method that returns a corresponding MavenExecutionResult.\n    Object around( MavenExecutionRequest request ): methodsTakingRequest( request )\n    {\n        this.request = request;\n\n        try\n        {\n            return proceed( request );\n        }\n        finally\n        {\n            this.request = null;\n        }\n    }\n\n    \/\/ Re-Introduce old buildSettings() API.\n    public Settings MavenSettingsBuilder.buildSettings()\n        throws IOException, XmlPullParserException\n    {\n        return null;\n    }\n\n    public Settings DefaultMavenSettingsBuilder.buildSettings()\n    throws IOException, XmlPullParserException\n    {\n        return null;\n    }\n\n    \/\/ USE Request to compensate for old buildSettings() API.\n    private pointcut buildSettings( MavenSettingsBuilder builder ):\n        execution( public Settings MavenSettingsBuilder+.buildSettings() )\n        && target( builder );\n\n    \/\/ redirect old buildSettings() call to the new one, using the request captured above.\n    Settings around( MavenSettingsBuilder builder )\n        throws IOException, XmlPullParserException:\n            buildSettings( builder )\n    {\n        return builder.buildSettings( request );\n    }\n\n    private pointcut pluginManager( DefaultPluginManager manager ):\n        execution( * DefaultPluginManager.*( .. ) )\n        && this( manager );\n\n    private pointcut pluginRealmCreation( Plugin plugin, DefaultPluginManager manager ):\n        call( ClassRealm MavenRealmManager+.createPluginRealm( Plugin, Artifact, List, .. ) )\n        && cflow( pluginManager( manager ) )\n        && args( plugin, .. );\n\n    \/\/ Add various imports for Xpp3 stuff back into the core realm every time a plugin realm is created.\n    ClassRealm around( Plugin plugin, DefaultPluginManager manager ): pluginRealmCreation( plugin, manager )\n    {\n        ClassRealm pluginRealm = proceed( plugin, manager );\n\n        try\n        {\n            String parentRealmId = manager.container.getContainerRealm().getId();\n\n            \/\/ adding for MNG-3012 to try to work around problems with Xpp3Dom (from plexus-utils)\n            \/\/ spawning a ClassCastException when a mojo calls plugin.getConfiguration() from maven-model...\n            pluginRealm.importFrom( parentRealmId, Xpp3Dom.class.getName() );\n            pluginRealm.importFrom( parentRealmId, \"org.codehaus.plexus.util.xml.pull\" );\n\n            \/\/ Adding for MNG-2878, since maven-reporting-impl was removed from the\n            \/\/ internal list of artifacts managed by maven, the classloader is different\n            \/\/ between maven-reporting-impl and maven-reporting-api...so this resource\n            \/\/ is not available from the AbstractMavenReport since it uses:\n            \/\/ getClass().getResourceAsStream( \"\/default-report.xml\" )\n            \/\/ (maven-reporting-impl version 2.0; line 134; affects: checkstyle plugin, and probably others)\n            pluginRealm.importFrom( parentRealmId, \"\/default-report.xml\" );\n        }\n        catch ( NoSuchRealmException e )\n        {\n            \/\/ can't happen here. All realms are concretely resolved by now.\n        }\n\n        return pluginRealm;\n    }\n\n    before( DefaultMaven maven ):\n        execution( MavenExecutionResult DefaultMaven.execute( MavenExecutionRequest ) )\n        && this( maven )\n    {\n        if ( this.logger == null )\n        {\n            this.logger = maven.getLogger();\n        }\n    }\n\n    private pointcut addMojoBindingCall( String phase, MojoBinding binding ):\n        call( void LifecycleUtils.addMojoBinding( String, MojoBinding, .. ) )\n        && args( phase, binding, .. );\n\n    void around( String phase, MojoBinding binding ): addMojoBindingCall( phase, binding )\n    {\n        try\n        {\n            proceed( phase, binding );\n        }\n        catch ( NoSuchPhaseException e )\n        {\n            logger.debug( \"Mojo execution: \" + MojoBindingUtils.toString( binding )\n                          + \" cannot be attached to lifecycle phase: \" + phase\n                          + \"; it does not exist. Ignoring this binding.\" );\n        }\n    }\n\n    \/\/ --------------------------\n    \/\/ UTILITIES\n    \/\/ --------------------------\n\n    private Set checkPlexusUtils( Set dependencyArtifacts, ArtifactFactory artifactFactory )\n    {\n        \/\/ ----------------------------------------------------------------------------\n        \/\/ If the plugin already declares a dependency on plexus-utils then we're all\n        \/\/ set as the plugin author is aware of its use. If we don't have a dependency\n        \/\/ on plexus-utils then we must protect users from stupid plugin authors who\n        \/\/ did not declare a direct dependency on plexus-utils because the version\n        \/\/ Maven uses is hidden from downstream use. We will also bump up any\n        \/\/ anything below 1.1 to 1.1 as this mimics the behaviour in 2.0.5 where\n        \/\/ plexus-utils 1.1 was being forced into use.\n        \/\/ ----------------------------------------------------------------------------\n\n        if ( vr == null )\n        {\n            try\n            {\n                vr = VersionRange.createFromVersionSpec( \"[1.1,)\" );\n            }\n            catch ( InvalidVersionSpecificationException e )\n            {\n                \/\/ Won't happen\n            }\n        }\n\n        for ( Iterator i = dependencyArtifacts.iterator(); i.hasNext(); )\n        {\n            Artifact a = (Artifact) i.next();\n\n            if ( a.getArtifactId().equals( \"plexus-utils\" )\n                 && vr.containsVersion( new DefaultArtifactVersion( a.getVersion() ) ) )\n            {\n                return dependencyArtifacts;\n            }\n        }\n\n        \/\/ We will add plexus-utils as every plugin was getting this anyway from Maven itself. We will set the\n        \/\/ version to the latest version we know that works as of the 2.0.6 release. We set the scope to runtime\n        \/\/ as this is what's implicitly happening in 2.0.6.\n\n        if ( plexusUtilsArtifact == null )\n        {\n            plexusUtilsArtifact = artifactFactory.createArtifact( \"org.codehaus.plexus\",\n                                                                  \"plexus-utils\",\n                                                                  \"1.1\",\n                                                                  Artifact.SCOPE_RUNTIME,\n                                                                  \"jar\" );\n        }\n\n        Set result = new LinkedHashSet( dependencyArtifacts );\n        result.add( plexusUtilsArtifact );\n\n        return result;\n    }\n\n    \/\/ This is to support the maven-enforcer-plugin.\n    private List DefaultLifecycleExecutor.lifecycles;\n\n    private pointcut lifecycleExecutorExecute( DefaultLifecycleExecutor executor ):\n        execution( * DefaultLifecycleExecutor.execute( .. ) )\n        && this( executor );\n\n    before( DefaultLifecycleExecutor executor ): lifecycleExecutorExecute( executor )\n    {\n        PlexusContainer container = executor.container;\n        DefaultLifecycleBindingManager bindingMgr;\n        try\n        {\n            bindingMgr = (DefaultLifecycleBindingManager) container.lookup( LifecycleBindingManager.ROLE, \"default\" );\n        }\n        catch ( ComponentLookupException e )\n        {\n            IllegalStateException err = new IllegalStateException( \"Cannot lookup default role-hint for: \" + LifecycleBindingManager.ROLE );\n            err.initCause( e );\n\n            throw err;\n        }\n\n        executor.lifecycles = bindingMgr.lifecycles;\n    }\n\n}\n","old_contents":"package org.apache.maven.compat;\n\nimport org.apache.maven.lifecycle.binding.DefaultLifecycleBindingManager;\nimport org.apache.maven.lifecycle.binding.LifecycleBindingManager;\nimport org.codehaus.plexus.PlexusContainer;\nimport org.apache.maven.DefaultMaven;\nimport org.apache.maven.lifecycle.DefaultLifecycleExecutor;\nimport org.apache.maven.lifecycle.MojoBindingUtils;\nimport org.apache.maven.lifecycle.LifecycleUtils;\nimport org.apache.maven.lifecycle.NoSuchPhaseException;\nimport org.apache.maven.execution.MavenExecutionRequest;\nimport org.apache.maven.execution.MavenExecutionResult;\nimport org.apache.maven.execution.MavenSession;\nimport org.apache.maven.extension.DefaultExtensionManager;\nimport org.apache.maven.artifact.Artifact;\nimport org.apache.maven.artifact.factory.ArtifactFactory;\nimport org.apache.maven.artifact.metadata.ResolutionGroup;\nimport org.apache.maven.artifact.repository.ArtifactRepository;\nimport org.apache.maven.artifact.resolver.ArtifactNotFoundException;\nimport org.apache.maven.artifact.resolver.ArtifactResolutionException;\nimport org.apache.maven.artifact.versioning.DefaultArtifactVersion;\nimport org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;\nimport org.apache.maven.artifact.versioning.VersionRange;\nimport org.apache.maven.lifecycle.model.MojoBinding;\nimport org.apache.maven.model.Plugin;\nimport org.apache.maven.plugin.DefaultPluginManager;\nimport org.apache.maven.plugin.InvalidPluginException;\nimport org.apache.maven.plugin.PluginManager;\nimport org.apache.maven.plugin.PluginManagerException;\nimport org.apache.maven.plugin.PluginNotFoundException;\nimport org.apache.maven.plugin.descriptor.PluginDescriptor;\nimport org.apache.maven.plugin.version.PluginVersionNotFoundException;\nimport org.apache.maven.plugin.version.PluginVersionResolutionException;\nimport org.apache.maven.project.MavenProject;\nimport org.apache.maven.realm.MavenRealmManager;\nimport org.apache.maven.settings.MavenSettingsBuilder;\nimport org.apache.maven.settings.DefaultMavenSettingsBuilder;\nimport org.apache.maven.settings.Settings;\nimport org.codehaus.plexus.classworlds.realm.ClassRealm;\nimport org.codehaus.plexus.classworlds.realm.NoSuchRealmException;\nimport org.codehaus.plexus.component.repository.exception.ComponentLookupException;\nimport org.codehaus.plexus.util.xml.pull.XmlPullParserException;\nimport org.codehaus.plexus.util.xml.Xpp3Dom;\nimport org.codehaus.plexus.logging.Logger;\n\nimport java.util.List;\nimport java.io.IOException;\nimport java.util.Iterator;\nimport java.util.Collection;\nimport java.util.Set;\nimport java.util.LinkedHashSet;\n\npublic privileged aspect Maven20xCompatAspect\n{\n\n    \/\/ GRAB Session as soon as it's constructed.\n    private MavenSession session;\n\n    \/\/ GRAB the request when it's passed into a method that returns a corresponding result.\n    \/\/ NOTE: We'll use this in multiple places below...\n    private MavenExecutionRequest request;\n\n    \/\/ Grab this so we have a voice!\n    private Logger logger;\n\n    \/\/ used for injecting plexus-utils into extension and plugin artifact sets.\n    private VersionRange vr = null;\n    private Artifact plexusUtilsArtifact = null;\n\n\n    private pointcut mavenEmbedderStop():\n        execution( * org.apache.maven.embedder.MavenEmbedder.stop( .. ) );\n\n    \/\/ TODO: There must be a more elegant way to release these resources than depending on MavenEmbedder.stop().\n    after(): mavenEmbedderStop()\n    {\n        session = null;\n        request = null;\n        logger = null;\n        vr = null;\n        plexusUtilsArtifact = null;\n    }\n\n\n    \/\/ pointcut to avoid recursive matching on behavior injected by this aspect.\n    private pointcut notHere(): !within( Maven20xCompatAspect );\n\n    private pointcut sessionCreation( MavenSession session ):\n        execution( public MavenSession+.new(..) )\n        && this( session )\n        && notHere();\n\n    \/\/ capture the session instance.\n    after( MavenSession session ): sessionCreation( session )\n    {\n        if ( logger != null && logger.isDebugEnabled() )\n        {\n            logger.debug( \"Capturing session for backward compatibility aspect: \" + session );\n        }\n\n        this.session = session;\n    }\n\n    \/\/ Re-Introduce old verifyPlugin(..) API.\n    public PluginDescriptor PluginManager.verifyPlugin( Plugin plugin,\n                                                        MavenProject project,\n                                                        Settings settings,\n                                                        ArtifactRepository localRepository )\n        throws ArtifactResolutionException, ArtifactNotFoundException, PluginNotFoundException,\n        PluginVersionResolutionException, InvalidPluginException, PluginManagerException,\n        PluginVersionNotFoundException\n    {\n        \/\/ this will always be diverted, so no need to do anything.\n        throw new IllegalStateException( \"This introduced method should ALWAYS be intercepted by backward compatibility aspect.\" );\n    }\n\n    \/\/ USE Session to compensate for old verifyPlugin(..) API.\n    private pointcut verifyPlugin( Plugin plugin, MavenProject project, PluginManager manager ):\n        execution( PluginDescriptor PluginManager+.verifyPlugin( Plugin, MavenProject, Settings, ArtifactRepository+ ) )\n        && args( plugin, project, .. )\n        && this( manager );\n\n    \/\/ redirect the old verifyPlugin(..) call to the new one, using the captured session instance above.\n    PluginDescriptor around( Plugin plugin,\n                             MavenProject project,\n                             PluginManager manager )\n        throws ArtifactResolutionException, ArtifactNotFoundException, PluginNotFoundException,\n        PluginVersionResolutionException, InvalidPluginException, PluginManagerException,\n        PluginVersionNotFoundException:\n            verifyPlugin( plugin, project, manager )\n    {\n        if ( logger != null && logger.isDebugEnabled() )\n        {\n            logger.debug( \"Diverting legacy PluginManager.verifyPlugin(..) call to replacement method using session: \" + session );\n        }\n\n        return manager.verifyPlugin( plugin, project, session );\n    }\n\n    private pointcut getPluginDescriptorForPrefix( String prefix, PluginManager manager ):\n        execution( public PluginDescriptor PluginManager+.getPluginDescriptorForPrefix( String ) )\n        && args( prefix )\n        && this( manager )\n        && notHere();\n\n    PluginDescriptor around( String prefix, PluginManager manager ): getPluginDescriptorForPrefix( prefix, manager )\n    {\n        \/\/ TODO: Implement Me!\n        throw new UnsupportedOperationException( \"This method has not yet been implemented in Maven's backward-compatibility library.\" );\n    }\n\n    public PluginDescriptor PluginManager.getPluginDescriptorForPrefix( String prefix )\n    {\n        return null;\n    }\n\n    \/\/ Intercept retrieval of artifact dependencies of an extension, inject plexus-utils if it's not there.\n    private pointcut extDepArtifactsResolved( DefaultExtensionManager mgr ):\n        call( public Set ResolutionGroup+.getArtifacts() )\n        && within( DefaultExtensionManager+ )\n        && this( mgr )\n        && notHere();\n\n    \/\/ We use the same hack here to make sure that plexus 1.1 is available for extensions that do\n    \/\/ not declare plexus-utils but need it. MNG-2900\n    Set around( DefaultExtensionManager mgr ): extDepArtifactsResolved( mgr )\n    {\n        Set result = proceed( mgr );\n\n        result = checkPlexusUtils( result, mgr.artifactFactory );\n\n        return result;\n    }\n\n    \/\/ Intercept retrieval of artifact dependencies of a plugin, inject plexus-utils if it's not there.\n    private pointcut pluginDepArtifactsResolved( DefaultPluginManager mgr ):\n        call( public Set ResolutionGroup+.getArtifacts() )\n        && cflow( execution( Set DefaultPluginManager+.getPluginArtifacts(..) ) )\n        && this( mgr )\n        && notHere();\n\n    Set around( DefaultPluginManager mgr ): pluginDepArtifactsResolved( mgr )\n    {\n        Set result = proceed( mgr );\n\n        result = checkPlexusUtils( result, mgr.artifactFactory );\n\n        return result;\n    }\n\n    private pointcut methodsTakingRequest( MavenExecutionRequest request ):\n        execution( MavenExecutionResult *.*( MavenExecutionRequest ) )\n        && !withincode( * *.*( MavenExecutionRequest ) )\n        && args( request )\n        && notHere();\n\n    \/\/ capture the request instance before it's passed into any method that returns a corresponding MavenExecutionResult.\n    Object around( MavenExecutionRequest request ): methodsTakingRequest( request )\n    {\n        this.request = request;\n\n        try\n        {\n            return proceed( request );\n        }\n        finally\n        {\n            this.request = null;\n        }\n    }\n\n    \/\/ Re-Introduce old buildSettings() API.\n    public Settings MavenSettingsBuilder.buildSettings()\n        throws IOException, XmlPullParserException\n    {\n        return null;\n    }\n\n    public Settings DefaultMavenSettingsBuilder.buildSettings()\n    throws IOException, XmlPullParserException\n    {\n        return null;\n    }\n\n    \/\/ USE Request to compensate for old buildSettings() API.\n    private pointcut buildSettings( MavenSettingsBuilder builder ):\n        execution( public Settings MavenSettingsBuilder+.buildSettings() )\n        && target( builder );\n\n    \/\/ redirect old buildSettings() call to the new one, using the request captured above.\n    Settings around( MavenSettingsBuilder builder )\n        throws IOException, XmlPullParserException:\n            buildSettings( builder )\n    {\n        return builder.buildSettings( request );\n    }\n\n    private pointcut pluginManager( DefaultPluginManager manager ):\n        execution( * DefaultPluginManager.*( .. ) )\n        && this( manager );\n\n    private pointcut pluginRealmCreation( Plugin plugin, DefaultPluginManager manager ):\n        call( ClassRealm MavenRealmManager+.createPluginRealm( Plugin, Artifact, Collection, .. ) )\n        && cflow( pluginManager( manager ) )\n        && args( plugin, .. );\n\n    \/\/ Add various imports for Xpp3 stuff back into the core realm every time a plugin realm is created.\n    ClassRealm around( Plugin plugin, DefaultPluginManager manager ): pluginRealmCreation( plugin, manager )\n    {\n        ClassRealm pluginRealm = proceed( plugin, manager );\n\n        try\n        {\n            String parentRealmId = manager.container.getContainerRealm().getId();\n\n            \/\/ adding for MNG-3012 to try to work around problems with Xpp3Dom (from plexus-utils)\n            \/\/ spawning a ClassCastException when a mojo calls plugin.getConfiguration() from maven-model...\n            pluginRealm.importFrom( parentRealmId, Xpp3Dom.class.getName() );\n            pluginRealm.importFrom( parentRealmId, \"org.codehaus.plexus.util.xml.pull\" );\n\n            \/\/ Adding for MNG-2878, since maven-reporting-impl was removed from the\n            \/\/ internal list of artifacts managed by maven, the classloader is different\n            \/\/ between maven-reporting-impl and maven-reporting-api...so this resource\n            \/\/ is not available from the AbstractMavenReport since it uses:\n            \/\/ getClass().getResourceAsStream( \"\/default-report.xml\" )\n            \/\/ (maven-reporting-impl version 2.0; line 134; affects: checkstyle plugin, and probably others)\n            pluginRealm.importFrom( parentRealmId, \"\/default-report.xml\" );\n        }\n        catch ( NoSuchRealmException e )\n        {\n            \/\/ can't happen here. All realms are concretely resolved by now.\n        }\n\n        return pluginRealm;\n    }\n\n    before( DefaultMaven maven ):\n        execution( MavenExecutionResult DefaultMaven.execute( MavenExecutionRequest ) )\n        && this( maven )\n    {\n        if ( this.logger == null )\n        {\n            this.logger = maven.getLogger();\n        }\n    }\n\n    private pointcut addMojoBindingCall( String phase, MojoBinding binding ):\n        call( void LifecycleUtils.addMojoBinding( String, MojoBinding, .. ) )\n        && args( phase, binding, .. );\n\n    void around( String phase, MojoBinding binding ): addMojoBindingCall( phase, binding )\n    {\n        try\n        {\n            proceed( phase, binding );\n        }\n        catch ( NoSuchPhaseException e )\n        {\n            logger.debug( \"Mojo execution: \" + MojoBindingUtils.toString( binding )\n                          + \" cannot be attached to lifecycle phase: \" + phase\n                          + \"; it does not exist. Ignoring this binding.\" );\n        }\n    }\n\n    \/\/ --------------------------\n    \/\/ UTILITIES\n    \/\/ --------------------------\n\n    private Set checkPlexusUtils( Set dependencyArtifacts, ArtifactFactory artifactFactory )\n    {\n        \/\/ ----------------------------------------------------------------------------\n        \/\/ If the plugin already declares a dependency on plexus-utils then we're all\n        \/\/ set as the plugin author is aware of its use. If we don't have a dependency\n        \/\/ on plexus-utils then we must protect users from stupid plugin authors who\n        \/\/ did not declare a direct dependency on plexus-utils because the version\n        \/\/ Maven uses is hidden from downstream use. We will also bump up any\n        \/\/ anything below 1.1 to 1.1 as this mimics the behaviour in 2.0.5 where\n        \/\/ plexus-utils 1.1 was being forced into use.\n        \/\/ ----------------------------------------------------------------------------\n\n        if ( vr == null )\n        {\n            try\n            {\n                vr = VersionRange.createFromVersionSpec( \"[1.1,)\" );\n            }\n            catch ( InvalidVersionSpecificationException e )\n            {\n                \/\/ Won't happen\n            }\n        }\n\n        for ( Iterator i = dependencyArtifacts.iterator(); i.hasNext(); )\n        {\n            Artifact a = (Artifact) i.next();\n\n            if ( a.getArtifactId().equals( \"plexus-utils\" )\n                 && vr.containsVersion( new DefaultArtifactVersion( a.getVersion() ) ) )\n            {\n                return dependencyArtifacts;\n            }\n        }\n\n        \/\/ We will add plexus-utils as every plugin was getting this anyway from Maven itself. We will set the\n        \/\/ version to the latest version we know that works as of the 2.0.6 release. We set the scope to runtime\n        \/\/ as this is what's implicitly happening in 2.0.6.\n\n        if ( plexusUtilsArtifact == null )\n        {\n            plexusUtilsArtifact = artifactFactory.createArtifact( \"org.codehaus.plexus\",\n                                                                  \"plexus-utils\",\n                                                                  \"1.1\",\n                                                                  Artifact.SCOPE_RUNTIME,\n                                                                  \"jar\" );\n        }\n\n        Set result = new LinkedHashSet( dependencyArtifacts );\n        result.add( plexusUtilsArtifact );\n\n        return result;\n    }\n\n    \/\/ This is to support the maven-enforcer-plugin.\n    private List DefaultLifecycleExecutor.lifecycles;\n\n    private pointcut lifecycleExecutorExecute( DefaultLifecycleExecutor executor ):\n        execution( * DefaultLifecycleExecutor.execute( .. ) )\n        && this( executor );\n\n    before( DefaultLifecycleExecutor executor ): lifecycleExecutorExecute( executor )\n    {\n        PlexusContainer container = executor.container;\n        DefaultLifecycleBindingManager bindingMgr;\n        try\n        {\n            bindingMgr = (DefaultLifecycleBindingManager) container.lookup( LifecycleBindingManager.ROLE, \"default\" );\n        }\n        catch ( ComponentLookupException e )\n        {\n            IllegalStateException err = new IllegalStateException( \"Cannot lookup default role-hint for: \" + LifecycleBindingManager.ROLE );\n            err.initCause( e );\n\n            throw err;\n        }\n\n        executor.lifecycles = bindingMgr.lifecycles;\n    }\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"bdd637ac2529effc24d999d5213da709b40041dd","subject":"Fixed a bad interaction between Scala object naming conventions (trailing '$') and JDT indexing of binary-only inner classes.","message":"Fixed a bad interaction between Scala object naming conventions (trailing '$') and JDT indexing of binary-only inner classes.\n\ngit-svn-id: f4ecfe233223879a4a16cd7937f11b5152963d8e@19512 5e8d7ff9-d8ef-0310-90f0-a4852d11357a\n","repos":"andrey-ilinykh\/scala-ide,mlangc\/scala-ide,Kwestor\/scala-ide,Duhemm\/scala-ide,dragos\/scala-ide,wpopielarski\/scala-ide,andrey-ilinykh\/scala-ide,Kwestor\/scala-ide,mlangc\/scala-ide,pilipolio\/scala-ide,scala-ide\/scala-ide,wpopielarski\/scala-ide,andrey-ilinykh\/scala-ide,stephenh\/scala-ide,romanowski\/scala-ide,scala-ide\/scala-ide,aleksi-lukkarinen\/scala-ide,Duhemm\/scala-ide,mlangc\/scala-ide,Kwestor\/scala-ide,sschaef\/scala-ide,aleksi-lukkarinen\/scala-ide,wpopielarski\/scala-ide,stephenh\/scala-ide,stephenh\/scala-ide,mlangc\/scala-ide,dragos\/scala-ide,wpopielarski\/scala-ide,pilipolio\/scala-ide,andrey-ilinykh\/scala-ide,sschaef\/scala-ide,Duhemm\/scala-ide,pilipolio\/scala-ide,stephenh\/scala-ide,romanowski\/scala-ide,scala-ide\/scala-ide,sschaef\/scala-ide,aleksi-lukkarinen\/scala-ide,sschaef\/scala-ide,Duhemm\/scala-ide,Kwestor\/scala-ide,pilipolio\/scala-ide,romanowski\/scala-ide,dragos\/scala-ide,aleksi-lukkarinen\/scala-ide,scala-ide\/scala-ide,romanowski\/scala-ide,dragos\/scala-ide","old_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/cfprovider\/ClassFileProviderAspect.aj","new_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/cfprovider\/ClassFileProviderAspect.aj","new_contents":"\/*\n * Copyright 2005-2009 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.cfprovider;\n\nimport java.util.HashSet;\n\nimport org.eclipse.core.filebuffers.FileBuffers;\nimport org.eclipse.core.filebuffers.ITextFileBuffer;\nimport org.eclipse.core.filebuffers.ITextFileBufferManager;\nimport org.eclipse.core.filebuffers.LocationKind;\nimport org.eclipse.core.resources.IResource;\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.core.IBuffer;\nimport org.eclipse.jdt.core.IClassFile;\nimport org.eclipse.jdt.core.IImportDeclaration;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IOpenable;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.ITypeRoot;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.core.dom.CompilationUnit;\nimport org.eclipse.jdt.core.search.TypeNameMatch;\nimport org.eclipse.jdt.internal.compiler.CompilationResult;\nimport org.eclipse.jdt.internal.compiler.ast.ASTNode;\nimport org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.ImportReference;\nimport org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.TypeReference;\nimport org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;\nimport org.eclipse.jdt.internal.compiler.env.IBinaryType;\nimport org.eclipse.jdt.internal.compiler.env.ICompilationUnit;\nimport org.eclipse.jdt.internal.compiler.env.IGenericType;\nimport org.eclipse.jdt.internal.compiler.env.ISourceImport;\nimport org.eclipse.jdt.internal.compiler.env.ISourceType;\nimport org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer;\nimport org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding;\nimport org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding;\nimport org.eclipse.jdt.internal.compiler.parser.Parser;\nimport org.eclipse.jdt.internal.compiler.parser.SourceTypeConverter;\nimport org.eclipse.jdt.internal.core.BinaryType;\nimport org.eclipse.jdt.internal.core.ClassFile;\nimport org.eclipse.jdt.internal.core.CompilationUnitElementInfo;\nimport org.eclipse.jdt.internal.core.ImportDeclaration;\nimport org.eclipse.jdt.internal.core.JavaElement;\nimport org.eclipse.jdt.internal.core.NameLookup;\nimport org.eclipse.jdt.internal.core.Openable;\nimport org.eclipse.jdt.internal.core.PackageFragment;\nimport org.eclipse.jdt.internal.core.SearchableEnvironment;\nimport org.eclipse.jdt.internal.core.SourceMapper;\nimport org.eclipse.jdt.internal.core.SourceType;\nimport org.eclipse.jdt.internal.core.SourceTypeElementInfo;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyResolver;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyType;\nimport org.eclipse.jdt.internal.core.util.Util;\nimport org.eclipse.jdt.internal.corext.util.OpenTypeHistory;\nimport org.eclipse.jdt.internal.ui.filters.InnerClassFilesFilter;\nimport org.eclipse.jdt.ui.SharedASTProvider;\nimport org.eclipse.jface.viewers.Viewer;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaClassFile;\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaElement;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect ClassFileProviderAspect {\n\n  pointcut classFileCreations(PackageFragment parent, String name) : \n    call(protected ClassFile.new(PackageFragment, String)) &&\n    within(org.eclipse.jdt..*) &&\n    args(parent, name);\n  \n  pointcut getTypeName(ClassFile cf) :\n    execution(public String ClassFile.getTypeName()) &&\n    target(cf);\n  \n  pointcut mapSource() :\n    execution(IBuffer ClassFile.mapSource(SourceMapper, IBinaryType)) &&\n    target(IScalaClassFile);\n  \n  pointcut mapSource2() :\n    execution(void SourceMapper.mapSource(IType, char[], IBinaryType));\n  \n  pointcut getSourceFileName(BinaryType bt) :\n    execution(String BinaryType.getSourceFileName(IBinaryType)) &&\n    target(bt);\n  \n  pointcut select(Viewer viewer, Object parentElement, Object element) :\n    execution(boolean InnerClassFilesFilter.select(Viewer, Object, Object)) &&\n    args(viewer, parentElement, element);\n  \n  pointcut getChildren(BinaryType bt) :\n    execution(IJavaElement[] BinaryType.getChildren()) &&\n    target(bt);\n  \n  pointcut getAST(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) : \n    execution(CompilationUnit SharedASTProvider.getAST(ITypeRoot, SharedASTProvider.WAIT_FLAG, IProgressMonitor)) &&\n    args(element, waitFlag, progressMonitor);\n  \n  pointcut resolve(HierarchyResolver hr, IGenericType suppliedType) :\n    execution(void HierarchyResolver.resolve(IGenericType)) &&\n    target(hr) &&\n    args(suppliedType);\n  \n  pointcut remember(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    execution(void HierarchyResolver.remember(IType, ReferenceBinding)) &&\n    target(hr) &&\n    args(type, typeBinding);\n  \n  pointcut acceptType(IType type, int acceptFlags, boolean isSourceType) :\n    execution(boolean NameLookup.acceptType(IType, int, boolean)) &&\n    args(type, acceptFlags, isSourceType);\n  \n  pointcut find(SearchableEnvironment se, String typeName, String packageName) :\n    execution(NameEnvironmentAnswer find(String, String)) &&\n    target(se) &&\n    args(typeName, packageName);\n  \n  pointcut convert(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) :\n    execution(CompilationUnitDeclaration SourceTypeConverter.convert(ISourceType[], CompilationResult)) &&\n    target(stc) &&\n    args(sourceTypes, compilationResult);\n  \n  pointcut getAncestor(JavaElement je, int ancestorType) :\n    execution(IJavaElement JavaElement.getAncestor(int)) &&\n    target(je) &&\n    args(ancestorType);\n  \n  pointcut isContainerDirty(TypeNameMatch match) :\n    execution(boolean OpenTypeHistory.isContainerDirty(TypeNameMatch)) &&\n    args(match);\n  \n  ClassFile around(PackageFragment parent, String name) : \n    classFileCreations(parent, name) {\n\n    ClassFile javaClassFile = proceed(parent, name);\n    byte[] bytes;\n    \n    try {\n      bytes = javaClassFile.getBytes();\n    } catch(Throwable t) {\n      return javaClassFile; \n    }\n    \n    for (IClassFileProvider provider : ClassFileProviderRegistry.getInstance().getProviders()) {\n      ClassFile cf = provider.create(bytes, parent, name);\n      if (cf != null)\n        return cf;\n    }\n    \n    return javaClassFile;\n  }\n  \n  void around() :\n    mapSource2() &&\n    cflow(mapSource()) {\n    return;\n  }\n  \n  String around(ClassFile cf) :\n    getTypeName(cf) {\n    if(cf instanceof IScalaClassFile) {\n      int lastDollar = cf.name.lastIndexOf('$');\n      return (lastDollar == -1 || lastDollar == cf.name.length()-1) ? cf.name : Util.localTypeName(cf.name, lastDollar, cf.name.length());\n    } else\n      return proceed(cf);\n  }\n  \n  boolean around(Viewer viewer, Object parentElement, Object element) :\n    select(viewer, parentElement, element) {\n    if (element instanceof IScalaClassFile) {\n      IClassFile classFile = (IClassFile) element;\n      String name = classFile.getElementName(); \n      int dollarIndex = name.indexOf('$');\n      return dollarIndex == -1 || dollarIndex == name.length()-7; \/\/ Trailing '$' implies object rather than inner class \n    }\n    return proceed(viewer, parentElement, element);\n  }\n  \n  IJavaElement[] around(BinaryType bt) throws JavaModelException :\n    getChildren(bt) && \n    target(BinaryType) {\n    ClassFile cf = (ClassFile)bt.parent;\n    if (cf instanceof IScalaClassFile)\n      return cf.getChildren();\n    else\n      return proceed(bt);\n  }\n  \n  CompilationUnit around(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) :\n    getAST(element, waitFlag, progressMonitor) {\n      if (element instanceof IScalaElement)\n        return null;\n      else\n        return proceed(element, waitFlag, progressMonitor);\n  }\n  \n  void around(HierarchyResolver hr, IGenericType suppliedType) :\n    resolve(hr, suppliedType) {\n    if (!suppliedType.isBinaryType()) {\n      IType tpe = ((SourceTypeElementInfo)suppliedType).getHandle();\n      IClassFile cf = tpe.getClassFile();\n      if (cf instanceof IScalaClassFile) {\n        hr.resolve(new Openable[]{(Openable)cf}, new HashSet(), null);\n        return;\n      }\n    }\n      \n    proceed(hr, suppliedType);\n  }\n  \n  void around(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    remember(hr, type, typeBinding) {\n    if (((IOpenable)type.getCompilationUnit()).isOpen()) {\n      try {\n        IGenericType genericType = (IGenericType)((JavaElement)type).getElementInfo();\n        hr.remember(genericType, typeBinding);\n      } catch (JavaModelException e) {\n        \/\/ cannot happen since element is open\n        return;\n      }\n    } else {\n      if (typeBinding == null) return;\n\n      TypeDeclaration typeDeclaration = ((SourceTypeBinding)typeBinding).scope.referenceType();\n\n      \/\/ simple super class name\n      char[] superclassName = null;\n      TypeReference superclass;\n      if ((typeDeclaration.bits & ASTNode.IsAnonymousType) != 0) {\n        superclass = typeDeclaration.allocation.type;\n      } else {\n        superclass = typeDeclaration.superclass;\n      }\n      if (superclass != null) {\n        char[][] typeName = superclass.getTypeName();\n        superclassName = typeName == null ? null : typeName[typeName.length-1];\n      }\n\n      \/\/ simple super interface names\n      char[][] superInterfaceNames = null;\n      TypeReference[] superInterfaces = typeDeclaration.superInterfaces;\n      if (superInterfaces != null) {\n        int length = superInterfaces.length;\n        superInterfaceNames = new char[length][];\n        for (int i = 0; i < length; i++) {\n          TypeReference superInterface = superInterfaces[i];\n          char[][] typeName = superInterface.getTypeName();\n          superInterfaceNames[i] = typeName[typeName.length-1];\n        }\n      }\n\n      HierarchyType hierarchyType = new HierarchyType(\n        type,\n        typeDeclaration.name,\n        typeDeclaration.binding.modifiers,\n        superclassName,\n        superInterfaceNames);\n      hr.remember(hierarchyType, typeDeclaration.binding);\n    }\n  }\n  \n  String around(BinaryType bt) :\n    getSourceFileName(bt) {\n    IJavaElement parent = bt.getParent(); \n    if (parent instanceof IScalaClassFile)\n      return ((IScalaClassFile)parent).getSourceFileName();\n    else\n      return proceed(bt);\n  }\n  \n  boolean around(IType type, int acceptFlags, boolean isSourceType) :\n    acceptType(type, acceptFlags, isSourceType) {\n    if (!isSourceType && (type instanceof SourceType)) {\n      IJavaElement parent = type.getParent(); \n      if (parent instanceof IScalaClassFile)\n        return proceed(type, acceptFlags, true);\n    }\n    \n    return proceed(type, acceptFlags, isSourceType);\n  }\n  \n  CompilationUnitDeclaration around(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) throws JavaModelException :\n    convert(stc, sourceTypes, compilationResult) {\n    stc.unit = new CompilationUnitDeclaration(stc.problemReporter, compilationResult, 0);\n    \/\/ not filled at this point\n\n    if (sourceTypes.length == 0) return stc.unit;\n    SourceTypeElementInfo topLevelTypeInfo = (SourceTypeElementInfo) sourceTypes[0];\n    org.eclipse.jdt.core.ICompilationUnit cuHandle = topLevelTypeInfo.getHandle().getCompilationUnit();\n    stc.cu = (ICompilationUnit) cuHandle;\n\n    CompilationUnitElementInfo cuei = null;\n    Object info = ((JavaElement)stc.cu).getElementInfo();\n    if (info instanceof CompilationUnitElementInfo)\n      cuei = (CompilationUnitElementInfo)info;\n    \n    \n    if (stc.has1_5Compliance && cuei != null && cuei.annotationNumber > 10) { \/\/ experimental value\n      \/\/ if more than 10 annotations, diet parse as this is faster\n      return new Parser(stc.problemReporter, true).dietParse(stc.cu, compilationResult);\n    }\n\n    \/* only positions available *\/\n    int start = topLevelTypeInfo.getNameSourceStart();\n    int end = topLevelTypeInfo.getNameSourceEnd();\n\n    \/* convert package and imports *\/\n    String[] packageName = ((PackageFragment) cuHandle.getParent()).names;\n    if (packageName.length > 0)\n      \/\/ if its null then it is defined in the default package\n      stc.unit.currentPackage =\n        stc.createImportReference(packageName, start, end, false, ClassFileConstants.AccDefault);\n    IImportDeclaration[] importDeclarations = topLevelTypeInfo.getHandle().getCompilationUnit().getImports();\n    int importCount = importDeclarations.length;\n    stc.unit.imports = new ImportReference[importCount];\n    for (int i = 0; i < importCount; i++) {\n      ImportDeclaration importDeclaration = (ImportDeclaration) importDeclarations[i];\n      ISourceImport sourceImport = (ISourceImport) importDeclaration.getElementInfo();\n      String nameWithoutStar = importDeclaration.getNameWithoutStar();\n      stc.unit.imports[i] = stc.createImportReference(\n        Util.splitOn('.', nameWithoutStar, 0, nameWithoutStar.length()),\n        sourceImport.getDeclarationSourceStart(),\n        sourceImport.getDeclarationSourceEnd(),\n        importDeclaration.isOnDemand(),\n        sourceImport.getModifiers());\n    }\n    \/* convert type(s) *\/\n    try {\n      int typeCount = sourceTypes.length;\n      final TypeDeclaration[] types = new TypeDeclaration[typeCount];\n      \/*\n       * We used a temporary types collection to prevent this.unit.types from being null during a call to\n       * convert(...) when the source is syntactically incorrect and the parser is flushing the unit's types.\n       * See https:\/\/bugs.eclipse.org\/bugs\/show_bug.cgi?id=97466\n       *\/\n      for (int i = 0; i < typeCount; i++) {\n        SourceTypeElementInfo typeInfo = (SourceTypeElementInfo) sourceTypes[i];\n        types[i] = stc.convert((SourceType) typeInfo.getHandle(), compilationResult);\n      }\n      stc.unit.types = types;\n      return stc.unit;\n    } catch (SourceTypeConverter.AnonymousMemberFound e) {\n      return new Parser(stc.problemReporter, true).parse(stc.cu, compilationResult);\n    }\n  }\n  \n  IJavaElement around(JavaElement je, int ancestorType) :\n    getAncestor(je, ancestorType) {\n    IJavaElement element = je;\n    while (element != null) {\n      if (element.getElementType() == ancestorType)\n        return element;\n      else if (element instanceof IScalaClassFile && ancestorType == IJavaElement.COMPILATION_UNIT)\n        return ((JavaElement)element).getCompilationUnit();\n      element= element.getParent();\n    }\n    return null;\n  }\n\n  boolean around(TypeNameMatch match) :\n    isContainerDirty(match) {\n    org.eclipse.jdt.core.ICompilationUnit cu = match.getType().getCompilationUnit();\n    if (cu == null) {\n      return false;\n    }\n    IResource resource= cu.getResource();\n    if (resource == null)\n      return false;\n    \n    ITextFileBufferManager manager= FileBuffers.getTextFileBufferManager();\n    ITextFileBuffer textFileBuffer= manager.getTextFileBuffer(resource.getFullPath(), LocationKind.IFILE);\n    if (textFileBuffer != null) {\n      return textFileBuffer.isDirty();\n    }\n    return false;\n  }\n}\n","old_contents":"\/*\n * Copyright 2005-2009 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.cfprovider;\n\nimport java.util.HashSet;\n\nimport org.eclipse.core.filebuffers.FileBuffers;\nimport org.eclipse.core.filebuffers.ITextFileBuffer;\nimport org.eclipse.core.filebuffers.ITextFileBufferManager;\nimport org.eclipse.core.filebuffers.LocationKind;\nimport org.eclipse.core.resources.IResource;\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.core.IBuffer;\nimport org.eclipse.jdt.core.IClassFile;\nimport org.eclipse.jdt.core.IImportDeclaration;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IOpenable;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.ITypeRoot;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.core.dom.CompilationUnit;\nimport org.eclipse.jdt.core.search.TypeNameMatch;\nimport org.eclipse.jdt.internal.compiler.CompilationResult;\nimport org.eclipse.jdt.internal.compiler.ast.ASTNode;\nimport org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.ImportReference;\nimport org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.TypeReference;\nimport org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;\nimport org.eclipse.jdt.internal.compiler.env.IBinaryType;\nimport org.eclipse.jdt.internal.compiler.env.ICompilationUnit;\nimport org.eclipse.jdt.internal.compiler.env.IGenericType;\nimport org.eclipse.jdt.internal.compiler.env.ISourceImport;\nimport org.eclipse.jdt.internal.compiler.env.ISourceType;\nimport org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer;\nimport org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding;\nimport org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding;\nimport org.eclipse.jdt.internal.compiler.parser.Parser;\nimport org.eclipse.jdt.internal.compiler.parser.SourceTypeConverter;\nimport org.eclipse.jdt.internal.core.BinaryType;\nimport org.eclipse.jdt.internal.core.ClassFile;\nimport org.eclipse.jdt.internal.core.CompilationUnitElementInfo;\nimport org.eclipse.jdt.internal.core.ImportDeclaration;\nimport org.eclipse.jdt.internal.core.JavaElement;\nimport org.eclipse.jdt.internal.core.NameLookup;\nimport org.eclipse.jdt.internal.core.Openable;\nimport org.eclipse.jdt.internal.core.PackageFragment;\nimport org.eclipse.jdt.internal.core.SearchableEnvironment;\nimport org.eclipse.jdt.internal.core.SourceMapper;\nimport org.eclipse.jdt.internal.core.SourceType;\nimport org.eclipse.jdt.internal.core.SourceTypeElementInfo;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyResolver;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyType;\nimport org.eclipse.jdt.internal.core.util.Util;\nimport org.eclipse.jdt.internal.corext.util.OpenTypeHistory;\nimport org.eclipse.jdt.internal.ui.filters.InnerClassFilesFilter;\nimport org.eclipse.jdt.ui.SharedASTProvider;\nimport org.eclipse.jface.viewers.Viewer;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaClassFile;\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaElement;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect ClassFileProviderAspect {\n\n  pointcut classFileCreations(PackageFragment parent, String name) : \n    call(protected ClassFile.new(PackageFragment, String)) &&\n    within(org.eclipse.jdt..*) &&\n    args(parent, name);\n  \n  pointcut mapSource() :\n    execution(IBuffer ClassFile.mapSource(SourceMapper, IBinaryType)) &&\n    target(IScalaClassFile);\n  \n  pointcut mapSource2() :\n    execution(void SourceMapper.mapSource(IType, char[], IBinaryType));\n  \n  pointcut getSourceFileName(BinaryType bt) :\n    execution(String BinaryType.getSourceFileName(IBinaryType)) &&\n    target(bt);\n  \n  pointcut select(Viewer viewer, Object parentElement, Object element) :\n    execution(boolean InnerClassFilesFilter.select(Viewer, Object, Object)) &&\n    args(viewer, parentElement, element);\n  \n  pointcut getChildren(BinaryType bt) :\n    execution(IJavaElement[] BinaryType.getChildren()) &&\n    target(bt);\n  \n  pointcut getAST(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) : \n    execution(CompilationUnit SharedASTProvider.getAST(ITypeRoot, SharedASTProvider.WAIT_FLAG, IProgressMonitor)) &&\n    args(element, waitFlag, progressMonitor);\n  \n  pointcut resolve(HierarchyResolver hr, IGenericType suppliedType) :\n    execution(void HierarchyResolver.resolve(IGenericType)) &&\n    target(hr) &&\n    args(suppliedType);\n  \n  pointcut remember(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    execution(void HierarchyResolver.remember(IType, ReferenceBinding)) &&\n    target(hr) &&\n    args(type, typeBinding);\n  \n  pointcut acceptType(IType type, int acceptFlags, boolean isSourceType) :\n    execution(boolean NameLookup.acceptType(IType, int, boolean)) &&\n    args(type, acceptFlags, isSourceType);\n  \n  pointcut find(SearchableEnvironment se, String typeName, String packageName) :\n    execution(NameEnvironmentAnswer find(String, String)) &&\n    target(se) &&\n    args(typeName, packageName);\n  \n  pointcut convert(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) :\n    execution(CompilationUnitDeclaration SourceTypeConverter.convert(ISourceType[], CompilationResult)) &&\n    target(stc) &&\n    args(sourceTypes, compilationResult);\n  \n  pointcut getAncestor(JavaElement je, int ancestorType) :\n    execution(IJavaElement JavaElement.getAncestor(int)) &&\n    target(je) &&\n    args(ancestorType);\n  \n  pointcut isContainerDirty(TypeNameMatch match) :\n    execution(boolean OpenTypeHistory.isContainerDirty(TypeNameMatch)) &&\n    args(match);\n  \n  ClassFile around(PackageFragment parent, String name) : \n    classFileCreations(parent, name) {\n\n    ClassFile javaClassFile = proceed(parent, name);\n    byte[] bytes;\n    \n    try {\n      bytes = javaClassFile.getBytes();\n    } catch(Throwable t) {\n      return javaClassFile; \n    }\n    \n    for (IClassFileProvider provider : ClassFileProviderRegistry.getInstance().getProviders()) {\n      ClassFile cf = provider.create(bytes, parent, name);\n      if (cf != null)\n        return cf;\n    }\n    \n    return javaClassFile;\n  }\n  \n  void around() :\n    mapSource2() &&\n    cflow(mapSource()) {\n    return;\n  }\n  \n  boolean around(Viewer viewer, Object parentElement, Object element) :\n    select(viewer, parentElement, element) {\n    if (element instanceof IScalaClassFile) {\n      IClassFile classFile = (IClassFile) element;\n      String name = classFile.getElementName(); \n      int dollarIndex = name.indexOf('$');\n      return dollarIndex == -1 || dollarIndex == name.length()-7; \/\/ Trailing '$' implies object rather than inner class \n    }\n    return proceed(viewer, parentElement, element);\n  }\n  \n  IJavaElement[] around(BinaryType bt) throws JavaModelException :\n    getChildren(bt) && \n    target(BinaryType) {\n    ClassFile cf = (ClassFile)bt.parent;\n    if (cf instanceof IScalaClassFile)\n      return cf.getChildren();\n    else\n      return proceed(bt);\n  }\n  \n  CompilationUnit around(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) :\n    getAST(element, waitFlag, progressMonitor) {\n      if (element instanceof IScalaElement)\n        return null;\n      else\n        return proceed(element, waitFlag, progressMonitor);\n  }\n  \n  void around(HierarchyResolver hr, IGenericType suppliedType) :\n    resolve(hr, suppliedType) {\n    if (!suppliedType.isBinaryType()) {\n      IType tpe = ((SourceTypeElementInfo)suppliedType).getHandle();\n      IClassFile cf = tpe.getClassFile();\n      if (cf instanceof IScalaClassFile) {\n        hr.resolve(new Openable[]{(Openable)cf}, new HashSet(), null);\n        return;\n      }\n    }\n      \n    proceed(hr, suppliedType);\n  }\n  \n  void around(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    remember(hr, type, typeBinding) {\n    if (((IOpenable)type.getCompilationUnit()).isOpen()) {\n      try {\n        IGenericType genericType = (IGenericType)((JavaElement)type).getElementInfo();\n        hr.remember(genericType, typeBinding);\n      } catch (JavaModelException e) {\n        \/\/ cannot happen since element is open\n        return;\n      }\n    } else {\n      if (typeBinding == null) return;\n\n      TypeDeclaration typeDeclaration = ((SourceTypeBinding)typeBinding).scope.referenceType();\n\n      \/\/ simple super class name\n      char[] superclassName = null;\n      TypeReference superclass;\n      if ((typeDeclaration.bits & ASTNode.IsAnonymousType) != 0) {\n        superclass = typeDeclaration.allocation.type;\n      } else {\n        superclass = typeDeclaration.superclass;\n      }\n      if (superclass != null) {\n        char[][] typeName = superclass.getTypeName();\n        superclassName = typeName == null ? null : typeName[typeName.length-1];\n      }\n\n      \/\/ simple super interface names\n      char[][] superInterfaceNames = null;\n      TypeReference[] superInterfaces = typeDeclaration.superInterfaces;\n      if (superInterfaces != null) {\n        int length = superInterfaces.length;\n        superInterfaceNames = new char[length][];\n        for (int i = 0; i < length; i++) {\n          TypeReference superInterface = superInterfaces[i];\n          char[][] typeName = superInterface.getTypeName();\n          superInterfaceNames[i] = typeName[typeName.length-1];\n        }\n      }\n\n      HierarchyType hierarchyType = new HierarchyType(\n        type,\n        typeDeclaration.name,\n        typeDeclaration.binding.modifiers,\n        superclassName,\n        superInterfaceNames);\n      hr.remember(hierarchyType, typeDeclaration.binding);\n    }\n  }\n  \n  String around(BinaryType bt) :\n    getSourceFileName(bt) {\n    IJavaElement parent = bt.getParent(); \n    if (parent instanceof IScalaClassFile)\n      return ((IScalaClassFile)parent).getSourceFileName();\n    else\n      return proceed(bt);\n  }\n  \n  boolean around(IType type, int acceptFlags, boolean isSourceType) :\n    acceptType(type, acceptFlags, isSourceType) {\n    if (!isSourceType && (type instanceof SourceType)) {\n      IJavaElement parent = type.getParent(); \n      if (parent instanceof IScalaClassFile)\n        return proceed(type, acceptFlags, true);\n    }\n    \n    return proceed(type, acceptFlags, isSourceType);\n  }\n  \n  CompilationUnitDeclaration around(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) throws JavaModelException :\n    convert(stc, sourceTypes, compilationResult) {\n    stc.unit = new CompilationUnitDeclaration(stc.problemReporter, compilationResult, 0);\n    \/\/ not filled at this point\n\n    if (sourceTypes.length == 0) return stc.unit;\n    SourceTypeElementInfo topLevelTypeInfo = (SourceTypeElementInfo) sourceTypes[0];\n    org.eclipse.jdt.core.ICompilationUnit cuHandle = topLevelTypeInfo.getHandle().getCompilationUnit();\n    stc.cu = (ICompilationUnit) cuHandle;\n\n    CompilationUnitElementInfo cuei = null;\n    Object info = ((JavaElement)stc.cu).getElementInfo();\n    if (info instanceof CompilationUnitElementInfo)\n      cuei = (CompilationUnitElementInfo)info;\n    \n    \n    if (stc.has1_5Compliance && cuei != null && cuei.annotationNumber > 10) { \/\/ experimental value\n      \/\/ if more than 10 annotations, diet parse as this is faster\n      return new Parser(stc.problemReporter, true).dietParse(stc.cu, compilationResult);\n    }\n\n    \/* only positions available *\/\n    int start = topLevelTypeInfo.getNameSourceStart();\n    int end = topLevelTypeInfo.getNameSourceEnd();\n\n    \/* convert package and imports *\/\n    String[] packageName = ((PackageFragment) cuHandle.getParent()).names;\n    if (packageName.length > 0)\n      \/\/ if its null then it is defined in the default package\n      stc.unit.currentPackage =\n        stc.createImportReference(packageName, start, end, false, ClassFileConstants.AccDefault);\n    IImportDeclaration[] importDeclarations = topLevelTypeInfo.getHandle().getCompilationUnit().getImports();\n    int importCount = importDeclarations.length;\n    stc.unit.imports = new ImportReference[importCount];\n    for (int i = 0; i < importCount; i++) {\n      ImportDeclaration importDeclaration = (ImportDeclaration) importDeclarations[i];\n      ISourceImport sourceImport = (ISourceImport) importDeclaration.getElementInfo();\n      String nameWithoutStar = importDeclaration.getNameWithoutStar();\n      stc.unit.imports[i] = stc.createImportReference(\n        Util.splitOn('.', nameWithoutStar, 0, nameWithoutStar.length()),\n        sourceImport.getDeclarationSourceStart(),\n        sourceImport.getDeclarationSourceEnd(),\n        importDeclaration.isOnDemand(),\n        sourceImport.getModifiers());\n    }\n    \/* convert type(s) *\/\n    try {\n      int typeCount = sourceTypes.length;\n      final TypeDeclaration[] types = new TypeDeclaration[typeCount];\n      \/*\n       * We used a temporary types collection to prevent this.unit.types from being null during a call to\n       * convert(...) when the source is syntactically incorrect and the parser is flushing the unit's types.\n       * See https:\/\/bugs.eclipse.org\/bugs\/show_bug.cgi?id=97466\n       *\/\n      for (int i = 0; i < typeCount; i++) {\n        SourceTypeElementInfo typeInfo = (SourceTypeElementInfo) sourceTypes[i];\n        types[i] = stc.convert((SourceType) typeInfo.getHandle(), compilationResult);\n      }\n      stc.unit.types = types;\n      return stc.unit;\n    } catch (SourceTypeConverter.AnonymousMemberFound e) {\n      return new Parser(stc.problemReporter, true).parse(stc.cu, compilationResult);\n    }\n  }\n  \n  IJavaElement around(JavaElement je, int ancestorType) :\n    getAncestor(je, ancestorType) {\n    IJavaElement element = je;\n    while (element != null) {\n      if (element.getElementType() == ancestorType)\n        return element;\n      else if (element instanceof IScalaClassFile && ancestorType == IJavaElement.COMPILATION_UNIT)\n        return ((JavaElement)element).getCompilationUnit();\n      element= element.getParent();\n    }\n    return null;\n  }\n\n  boolean around(TypeNameMatch match) :\n    isContainerDirty(match) {\n    org.eclipse.jdt.core.ICompilationUnit cu = match.getType().getCompilationUnit();\n    if (cu == null) {\n      return false;\n    }\n    IResource resource= cu.getResource();\n    if (resource == null)\n      return false;\n    \n    ITextFileBufferManager manager= FileBuffers.getTextFileBufferManager();\n    ITextFileBuffer textFileBuffer= manager.getTextFileBuffer(resource.getFullPath(), LocationKind.IFILE);\n    if (textFileBuffer != null) {\n      return textFileBuffer.isDirty();\n    }\n    return false;\n  }\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"a92dba224ca70937ba1e511aecdfe8a8210f7268","subject":"Update Track'n Restart aspect.","message":"Update Track'n Restart aspect.","repos":"awltech\/org.parallelj,christophe-w\/parallelj.runtime","old_file":"org.parallelj\/parallelj\/parallelj-tracknrestart\/src\/main\/java\/org\/parallelj\/tracknrestart\/aspects\/QuartzContextAdapter.aj","new_file":"org.parallelj\/parallelj\/parallelj-tracknrestart\/src\/main\/java\/org\/parallelj\/tracknrestart\/aspects\/QuartzContextAdapter.aj","new_contents":"package org.parallelj.tracknrestart.aspects;\n\nimport java.lang.reflect.Field;\nimport java.lang.reflect.InvocationTargetException;\nimport java.lang.reflect.Method;\nimport java.sql.SQLException;\n\nimport org.apache.log4j.Logger;\nimport org.parallelj.Programs;\nimport org.parallelj.Programs.ProcessHelper;\nimport org.parallelj.internal.kernel.KCall;\nimport org.parallelj.internal.kernel.KProcess;\nimport org.parallelj.internal.reflect.ProgramAdapter.Adapter;\nimport org.parallelj.tracknrestart.annotations.TrackNRestart;\nimport org.parallelj.tracknrestart.listeners.ForEachListener;\nimport org.parallelj.tracknrestart.plugins.TrackNRestartPlugin;\nimport org.quartz.Job;\nimport org.quartz.JobExecutionContext;\nimport org.quartz.JobExecutionException;\nimport org.quartz.JobPersistenceException;\nimport org.parallelj.tracknrestart.ReturnCodes;\n\nprivileged public aspect QuartzContextAdapter percflow (execution(public void Job+.execute(..) throws JobExecutionException)) {\n\t\n\tdeclare precedence :\n\t\torg.parallelj.tracknrestart.aspects.QuartzContextAdapter,\n\t\torg.parallelj.launching.quartz.JobsAdapter;\n\n\tstatic Logger logger = Logger.getLogger(\"org.parallelj.tracknrestart.QuartzContextAdapter\");\n\t\n\tprivate X root;\n\n\tString result = ReturnCodes.SUCCESS.name();\n\t\n\t\/\/---------------------------------------------------------------------------------------------------\n\t\n\tdeclare parents:\n\t\t(@org.parallelj.launching.QuartzExecution *) implements Job;\n\n\tpublic void Job.execute(JobExecutionContext context)\n\t\t\tthrows JobExecutionException {\n\t\t\n\t\tProcessHelper<?> p = null;\n\t\tlogger.debug(\"-----------------------------------------------------------------------------------------------------\");\n\t\tlogger.debug(\"STARTING \/\/J Root Program \"+this.getClass().getName());\n\n\t\tp = Programs.as((Adapter) this);\n\n\t\ttry {\n\t\t\t\/\/TODO voir avec Christophe @IN\n\t\t\tField f = this.getClass().getDeclaredField(\"data1\");\n\t\t\tf.setAccessible(true);\n\t\t\tf.set(this, context.getJobDetail().getJobDataMap().get(\"data1\"));\n\t\t} catch (IllegalArgumentException e) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te.printStackTrace();\n\t\t} catch (IllegalAccessException e) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te.printStackTrace();\n\t\t} catch (SecurityException e) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te.printStackTrace();\n\t\t} catch (NoSuchFieldException e) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te.printStackTrace();\n\t\t}\n\n\t\tp.execute().join();\n\n\t\tlogger.debug(\"ENDING   \/\/J Root Program \"+this.getClass().getName());\n\t\tlogger.debug(\"-----------------------------------------------------------------------------------------------------\");\n\t\tcontext.setResult(String.valueOf(p.getState()));\n\t}\n\n\t\/\/---------------------------------------------------------------------------------------------------\n\t\n\tpublic interface X {};\n\n\tdeclare parents:           \n\t\t(org.quartz.Job+ && !org.quartz.Job) implements X;    \n\n\tdeclare parents:   \n\t\t(org.parallelj.internal.kernel.KCall) implements X;      \n\n\/\/\tdeclare parents:   \n\/\/\t\t(org.parallelj.mirror.Element+) implements X;      \n\n\/\/\tdeclare parents:   \n\/\/\t\t(org.parallelj.internal.kernel.callback.Entry+) implements X; \n\t\n\/\/\tdeclare parents:   \n\/\/\t\t(org.parallelj.internal.kernel.callback.Exit+) implements X; \n\t\n\tprivate ForEachListener X.forEachListener = null;       \n\t\n\tpublic ForEachListener X.getForEachListener() { \n\t\treturn forEachListener;\n\t}\n\t\n\tpublic void X.setForEachListener(ForEachListener forEachListener) {\n\t\tthis.forEachListener = forEachListener;\n\t}\n\t\n\tprivate String X.restartedFireInstanceId = null;       \n\t\n\tpublic String X.getRestartedFireInstanceId() {\n\t\treturn restartedFireInstanceId;\n\t}\n\t\n\tpublic void X.setRestartedFireInstanceId(String restartedFireInstanceId) {\n\t\tthis.restartedFireInstanceId = restartedFireInstanceId;\n\t}\n\t\n\t\/\/---------------------------------------------------------------------------------------------------\n\t\n\t\/\/JobExecutionContext --> Job\n\tbefore(X self, JobExecutionContext jobExecutionContext): \n\t\texecution(public void Job+.execute(..) throws JobExecutionException) \n\t\t&& this(self) \n\t\t&& args(jobExecutionContext) {\n\n\t\t\/\/logger.debug(\"ASPECT BEFORE:execution(public void Job+.execute(..) throws JobExecutionException) && this(self) && args(jobExecutionContext)\");\n\n\t\tself.setRestartedFireInstanceId(jobExecutionContext.getJobDetail().getJobDataMap().getString(TrackNRestartPlugin.RESTARTED_FIRE_INSTANCE_ID));\n\t\tself.setForEachListener((ForEachListener) jobExecutionContext.getJobDetail().getJobDataMap().get(TrackNRestartPlugin.FOR_EACH_LISTENER));\n\t\t\/\/logger.debug(\"job=\"+self); \n\t\t\/\/logger.debug(\"restartedFireInstanceId=\"+self.getRestartedFireInstanceId()); \n\t\t\/\/logger.debug(\"forEachListener=\"+self.getForEachListener());\n\n\t\tthis.root = self;\n\t}\n\n\tafter(X self, JobExecutionContext jobExecutionContext): \n\t\texecution(public void Job+.execute(..) throws JobExecutionException) \n\t\t&& this(self) \n\t\t&& args(jobExecutionContext) {\n\n\t\t\/\/logger.debug(\"ASPECT AFTER:execution(public void Job+.execute(..) throws JobExecutionException) && this(self) && args(jobExecutionContext)\");\n\t\tjobExecutionContext.setResult(result);\n\t}\n\t\n\tafter(X self): \n\t\texecution(protected KCall.new(..)) && this(self) {\n\n\t\t\/\/logger.debug(\"ASPECT AFTER:protected execution(protected KCall.new(..)) && this(self)\");\n\t\t\/\/logger.debug(\"self=\"+self);\n\t\tself.setRestartedFireInstanceId(root.getRestartedFireInstanceId()); \n\t\tself.setForEachListener(root.getForEachListener());\n\t\t\/\/logger.debug(\"restartedFireInstanceId=\"+self.getRestartedFireInstanceId()); \n\t\t\/\/logger.debug(\"forEachListener=\"+self.getForEachListener());\n\t}\n\n\tafter(X self): \n\t\texecution(protected KProcess.new(..)) && this(self) {\n\n\t\t\/\/logger.debug(\"ASPECT AFTER:protected execution(protected KProcess.new(..)) && this(self)\");\n\t\t\/\/logger.debug(\"self=\"+self);\n\t\tself.setRestartedFireInstanceId(root.getRestartedFireInstanceId()); \n\t\tself.setForEachListener(root.getForEachListener());\n\t\t\/\/logger.debug(\"restartedFireInstanceId=\"+self.getRestartedFireInstanceId()); \n\t\t\/\/logger.debug(\"forEachListener=\"+self.getForEachListener());\n\t}\n\n    pointcut enter(KCall _kCall): call(* org.parallelj.internal.kernel.callback.Entry+.enter(KCall)) && args(_kCall);\n    pointcut invoke(): call(public Object Method.invoke(Object, ..)) && !within(QuartzContextAdapter);\n\n\/\/ Runnable program. ----------------------------------------------------------------------------------------------------------------------------------\n\n    public interface Y {};\n    \n  \tprivate Object Y.context = null;\n  \t\n  \tpublic Object Y.getContext() {\n  \t\treturn context;\n  \t}\n  \t\n  \tpublic void Y.setContext(Object context) {\n  \t\tthis.context=context;\n  \t}\n    \n    declare parents:           \n\t\t(java.lang.Runnable+ ) implements X, Y;    \n    \n    \/\/ 1) Transfert from RunnableCall to Runnable. \n  \tafter(Object self) returning (Runnable ret): \n    \t execution(* org.parallelj.internal.kernel.procedure.RunnableProcedure.RunnableCall.toRunnable())\n      && this(self)  {\n    \t\n    \t ((X)ret).setForEachListener(((X)self).getForEachListener());\n    \t ((X)ret).setRestartedFireInstanceId(((X)self).getRestartedFireInstanceId());\n    \t ((Y)ret).setContext(((org.parallelj.internal.kernel.KCall)self).getContext());\n    }\n    \n     \/\/ 2) Interception around call of run.      \n     void around(Object self): call(* run(..))\n     && within(org.parallelj.internal.kernel.procedure.RunnableProcedure.RunnableCall)\n     && within(Runnable+)  && this(self)  {\n    \t \n    \t String restartedFireInstanceId = ((X) self).getRestartedFireInstanceId();\n    \t ForEachListener forEachListener = ((X)self).getForEachListener();\t\n    \t Object program =  ((Y)self).getContext();\n    \t \n    \t if (isToProcess(restartedFireInstanceId,forEachListener,program)) {\n    \t\ttry { \n    \t\t\tproceed(self);\n     \t\t\tif (isTrackNRestartAnnoted(program)) {\n     \t\t\t\tString oid = getOID(program);\n   \t\t\t\t\ttrack(forEachListener, oid, true);\n     \t\t\t}\n    \t\t} catch (Exception e) {\n \t\t\t\tif (isTrackNRestartAnnoted(program)){\n \t\t\t\t\tString oid = getOID(program);\n \t\t\t\t\tif (isTrackNRestartExceptionPermitted(program, e)) {\n\t \t\t\t\t\ttrack(forEachListener, oid, false);\n\t\t\t\t\t} else {\n\t\t\t\t\t\tabortAbruptly();\n\t\t\t\t\t\tthrow new TrackNRestartException(\"Exception thrown (\"+e.getClass().getName()+\") is not in list of permitted exceptions \"+filteredExceptionsAsString(getTrackNRestartAnnotedException(program)));\n\t\t\t\t\t}\n \t\t\t\t}\n    \t\t}\n     \t} else {\n     \t\tif (isTrackNRestartAnnoted(program)) {\n \t\t\t\tString oid = getOID(program);\n \t\t\t\ttrack(forEachListener, oid, true);\n\t\t\t} else {\n\t\t\t\tabortAbruptly();\n\t\t\t\tthrow new TrackNRestartException(\"Unable to get iteration OID while 'tracking' context.\");\n \t\t\t}\n     \t}\n     }\n     \n     \/**\n      * Track the execution (success or failure).\n      * @param forEachListener listener handling Quartz backend.\n      * @param oid unique identifier\n      * @param success boolean indicating if processing is a success or a failure.\n      *\/\n     private void track(ForEachListener forEachListener, String oid, boolean success) {\n\t     try {\n\t\t\t\tforEachListener.forEachInstanceComplete(oid, success);\n\t     } catch (JobPersistenceException e) {\n\t\t\t\tabortAbruptly();\n\t\t\t\tthrow new TrackNRestartException(\"Unable to read status for iteration '\"+ oid + \"'.\", e);\n\t\t} catch (SQLException e) {\n\t\t\t\tabortAbruptly();\n\t\t\t\tthrow new TrackNRestartException(\"Unable to read status for iteration '\"+ oid + \"'.\", e);\n\t\t}\n     }\n    \n \n\/\/ restart part ----------------------------------------------------------------------------------------------------------------------------------------\n     \n     Object around(Object oo, KCall _kCall)  :\n        invoke() && args(oo, ..) && cflow(enter(_kCall)) {\n         \n    \tif (isToProcess( ((X) _kCall).getRestartedFireInstanceId(),((X) _kCall).getForEachListener(), oo)) {\n               return proceed(oo, _kCall);\n        } else {\n               return null;\n        }\n     }\n\n    \/**\n     * Check if an iterable must be processed. This means if the iterable is not already processed or the element was processed in error.\n     * @param restartedFireInstanceId id of the batch to be restarted.\n     * @param forEachListener listener handling request to Quartz. \n     * @param program instance of the program processing the iterable. \n     * @return true iterable has to be processed, false else.\n     *\/\n    private boolean isToProcess(String restartedFireInstanceId,  ForEachListener forEachListener, Object program)   {\n\t\tboolean result = true;\n\t\tif (program != null) {\n\t\t\tif (program.getClass().isAnnotationPresent(TrackNRestart.class)) {\n\t\t\t\tString oid = getOID(program);\n\t\t\t\tif (oid != null) {\n\t\t\t\t\tif (restartedFireInstanceId != null) {\n\t\t\t\t\t\t\/\/ logger.debug(\"Processing in restarting mode for oid : [\"\n\t\t\t\t\t\t\/\/ + oid + \"] ,program : [\" + program +\n\t\t\t\t\t\t\/\/ \"] ,instanceId :[\" +instanceId+ \"]\");\n\t\t\t\t\t\ttry {\n\t\t\t\t\t\t\tresult = !forEachListener.isForEachInstanceIgnorable(restartedFireInstanceId, oid);\n\t\t\t\t\t\t\t\/\/ logger.debug(result ?\n\t\t\t\t\t\t\t\/\/ \"This OID has not been already processed or\" +\n\t\t\t\t\t\t\t\/\/ \" already processed in error, so its processing is not skipped\":\n\t\t\t\t\t\t\t\/\/ \"This OID (\"+oid+\") has been already successfully processed, so its processing is skipped\");\n\t\t\t\t\t\t} catch (JobPersistenceException e) {\n\t\t\t\t\t\t\tabortAbruptly();\n\t\t\t\t\t\t\tthrow new TrackNRestartException(\n\t\t\t\t\t\t\t\t\t\"Unable to read status for iteration '\"\n\t\t\t\t\t\t\t\t\t\t\t+ oid + \"'.\", e);\n\t\t\t\t\t\t} catch (SQLException e) {\n\t\t\t\t\t\t\tabortAbruptly();\n\t\t\t\t\t\t\tthrow new TrackNRestartException(\n\t\t\t\t\t\t\t\t\t\"Unable to read status for iteration '\"\n\t\t\t\t\t\t\t\t\t\t\t+ oid + \"'.\", e);\n\t\t\t\t\t\t}\n\t\t\t\t\t} else {\n\t\t\t\t\t\t\/\/ logger.debug(\"Processing in normal mode (ie not restarting mode) for : [\"\n\t\t\t\t\t\t\/\/ + oid + \"] ,program : [\" + program + \"]\");\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t\treturn result;\n\t}\n    \n    \/**\n     * Get unique identifier returned by the program (the program contains value to be processed).\n     * @param program\n     * @return unique identifier.\n     *\/\n\tprivate String getOID(Object program) {\n\t\tString result = null;\n\t\ttry {\n\t\t\tMethod m = program.getClass().getDeclaredMethod(\"getOID\",\n\t\t\t\t\tnew Class[] {});\n\t\t\treturn (String) m.invoke(program, new Object[] {});\n\t\t} catch (SecurityException e1) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te1.printStackTrace();\n\t\t} catch (NoSuchMethodException e1) {\n\t\t\tabortAbruptly();\n\t\t\tthrow new TrackNRestartException(\n\t\t\t\t\t\"No getOID() method found while program \" + program\n\t\t\t\t\t\t\t+ \" was annotated @TrackNRestart.\", e1);\n\t\t} catch (IllegalArgumentException e) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te.printStackTrace();\n\t\t} catch (IllegalAccessException e) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te.printStackTrace();\n\t\t} catch (InvocationTargetException e) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te.printStackTrace();\n\t\t}\n\t\t\n\t\treturn result;\n\t}\n\t\n\t\/**\n\t * Indicate of the Program contains annotation TrackNRestart.\n\t * @param program\n\t * @return true if program is annoted.\n\t *\/\n\tprivate boolean isTrackNRestartAnnoted(Object program) {\n\t\treturn program.getClass().isAnnotationPresent(TrackNRestart.class);\n\t}\n\n\t\/**\n\t * Check if the raised exception belong to the allowed ones in TrackNRestart annotation.\n\t * @param program\n\t * @param exception raised\n\t * @return true if exception is allowed, false else.\n\t *\/\n\tprivate boolean isTrackNRestartExceptionPermitted(Object program, Exception exception) {\n\t\tboolean result = false;\n\t\tClass<? extends Throwable>[] filteredExceptions =  getTrackNRestartAnnotedException(program);\n\t\tfor (int i = 0; i < filteredExceptions.length; i++) {\n\t\t\t\tif (filteredExceptions[i].isAssignableFrom(exception.getClass())) {\n\t\t\t\t\treturn true;\n\t\t\t}\n\t\t}\n\t\treturn false;\n\t}\n\t\n\t\/**\n\t * Return exceptions defined in TrackNRestart annotation.\n\t * @param program\n\t * @return array of exceptions\n\t *\/\n\tprivate Class<? extends Throwable>[] getTrackNRestartAnnotedException (Object program) {\n\t\treturn program.getClass().getAnnotation(TrackNRestart.class).filteredExceptions();\n\t}\n\t\n\t\n\/\/ tracking part ----------------------------------------------------------------------------------------------------------------------------------------\n   after(Object oo, KCall _kCall) returning :\n    \tinvoke() && args(oo, ..) && cflow(enter(_kCall)) {\n\t\t\n\t\t\/\/logger.debug(\"ASPECT AFTER RETURNING\");\n\t\t\/\/logger.debug(\"_KCall=\"+_kCall);\n\t\ttrack(_kCall, oo, true, null);\n    }\n\n    after(Object oo, KCall _kCall) throwing (InvocationTargetException ite) : \n    \tinvoke() && args(oo, ..) && cflow(enter(_kCall)) {\n\t\t\n\t\t\/\/logger.debug(\"ASPECT AFTER THROWING (InvocationTargetException)\");\n\t\t\/\/logger.debug(\"_KCall=\"+_kCall);\n\t\tthis.result = \"FAILURE\";\n\t\ttrack(_kCall, oo, false, ite);\n    }\n\n    \n\tprivate void track(KCall _kCall, Object program, boolean success,\n\t\t\tInvocationTargetException ite) {\n\t\tString oid = null;\n\n\t\ttry {\n\t\t\tif (program != null) {\n\t\t\t\tClass<? extends Object> clazz = program.getClass();\n\t\t\t\tif (clazz.isAnnotationPresent(TrackNRestart.class)) {\n\t\t\t\t\tMethod m = clazz\n\t\t\t\t\t\t\t.getDeclaredMethod(\"getOID\", new Class[] {});\n\t\t\t\t\toid = (String) m.invoke(program, new Object[] {});\n\t\t\t\t\tif (oid != null) {\n\t\t\t\t\t\tif (success == true) {\n\t\t\t\t\t\t\tpersist(_kCall, success, oid);\n\t\t\t\t\t\t} else {\n\t\t\t\t\t\t\tClass<? extends Throwable>[] filteredExceptions = clazz\n\t\t\t\t\t\t\t\t\t.getAnnotation(TrackNRestart.class)\n\t\t\t\t\t\t\t\t\t.filteredExceptions();\n\t\t\t\t\t\t\tif (isIteCausePermittedInList(ite,\n\t\t\t\t\t\t\t\t\tfilteredExceptions)) {\n\t\t\t\t\t\t\t\tpersist(_kCall, success, oid);\n\t\t\t\t\t\t\t} else {\n\t\t\t\t\t\t\t\tabortAbruptly();\n\t\t\t\t\t\t\t\tthrow new TrackNRestartException(\n\t\t\t\t\t\t\t\t\t\t\"Exception thrown (\"\n\t\t\t\t\t\t\t\t\t\t\t\t+ ite.getCause().getClass()\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t.getName()\n\t\t\t\t\t\t\t\t\t\t\t\t+ \") is not in list of permitted exceptions \"\n\t\t\t\t\t\t\t\t\t\t\t\t+ filteredExceptionsAsString(filteredExceptions));\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t\tif (logger.isDebugEnabled()) {\n\t\t\t\t\t\t\t\/\/ logger.debug(\"oid='\" + oid +\n\t\t\t\t\t\t\t\/\/ \"' persisted with status='\" + (success ?\n\t\t\t\t\t\t\t\/\/ ReturnCodes.SUCCESS : \"FAILURE\") + \"' \"+ (ite ==\n\t\t\t\t\t\t\t\/\/ null ? \"\" : \", cause : \" + ite.getCause()));\n\t\t\t\t\t\t}\n\t\t\t\t\t} else {\n\t\t\t\t\t\tabortAbruptly();\n\t\t\t\t\t\tthrow new TrackNRestartException(\n\t\t\t\t\t\t\t\t\"Unable to get iteration OID while 'tracking' context.\");\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t} catch (NoSuchMethodException e) {\n\t\t\tabortAbruptly();\n\t\t\tthrow new TrackNRestartException(\n\t\t\t\t\t\"No getOID() method found while program \" + program\n\t\t\t\t\t\t\t+ \" was annotated @TrackNRestart.\", e);\n\t\t} catch (SecurityException e) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te.printStackTrace();\n\t\t} catch (IllegalArgumentException e) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te.printStackTrace();\n\t\t} catch (IllegalAccessException e) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te.printStackTrace();\n\t\t} catch (InvocationTargetException e) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te.printStackTrace();\n\t\t} catch (JobPersistenceException e) {\n\t\t\tabortAbruptly();\n\t\t\tthrow new TrackNRestartException(\"Unable to persist status ['\"\n\t\t\t\t\t+ (success ? ReturnCodes.SUCCESS : \"FAILURE\")\n\t\t\t\t\t+ \"'] for iteration '\" + oid + \"'.\", e);\n\t\t} catch (SQLException e) {\n\t\t\tabortAbruptly();\n\t\t\tthrow new TrackNRestartException(\"Unable to persist status ['\"\n\t\t\t\t\t+ (success ? ReturnCodes.SUCCESS : \"FAILURE\")\n\t\t\t\t\t+ \"'] for iteration '\" + oid + \"'.\", e);\n\t\t}\n\t}\n\n\tprivate boolean isIteCausePermittedInList(InvocationTargetException ite,\n\t\t\tClass<? extends Throwable>[] filteredExceptions) {\n\t\tfor (int i = 0; i < filteredExceptions.length; i++) {\n\t\t\tif (filteredExceptions[i].isAssignableFrom(ite.getCause()\n\t\t\t\t\t.getClass()))\n\t\t\t\treturn true;\n\t\t}\n\t\treturn false;\n\t}\n\n\tprivate String filteredExceptionsAsString(\n\t\t\tClass<? extends Throwable>[] filteredExceptions) {\n\t\tStringBuffer sb = new StringBuffer();\n\t\tsb.append(\"[\");\n\t\tfor (int i = 0; i < filteredExceptions.length; i++) {\n\t\t\tif (i > 0)\n\t\t\t\tsb.append(\", \");\n\t\t\tsb.append(filteredExceptions[i].getName());\n\t\t}\n\t\tsb.append(\"]\");\n\t\treturn sb.toString();\n\t}\n\n\tprivate void persist(KCall _kCall, boolean success, String oid)\n\t\t\tthrows JobPersistenceException, SQLException {\n\t\t((X) _kCall).getForEachListener().forEachInstanceComplete(oid, success);\n\t}\n\n\tprivate void abortAbruptly() {\n\t\tthis.result = \"ABORTED\";\n\t\tPrograms.as((Adapter) this.root).abort();\n\t}\n\n}\n","old_contents":"package org.parallelj.tracknrestart.aspects;\n\nimport java.lang.reflect.Field;\nimport java.lang.reflect.InvocationTargetException;\nimport java.lang.reflect.Method;\nimport java.sql.SQLException;\n\nimport org.apache.log4j.Logger;\nimport org.parallelj.Programs;\nimport org.parallelj.Programs.ProcessHelper;\nimport org.parallelj.internal.kernel.KCall;\nimport org.parallelj.internal.kernel.KProcess;\nimport org.parallelj.internal.reflect.ProgramAdapter.Adapter;\nimport org.parallelj.tracknrestart.annotations.TrackNRestart;\nimport org.parallelj.tracknrestart.listeners.ForEachListener;\nimport org.parallelj.tracknrestart.plugins.TrackNRestartPlugin;\nimport org.quartz.Job;\nimport org.quartz.JobExecutionContext;\nimport org.quartz.JobExecutionException;\nimport org.quartz.JobPersistenceException;\nimport org.parallelj.tracknrestart.ReturnCodes;\n\nprivileged public aspect QuartzContextAdapter percflow (execution(public void Job+.execute(..) throws JobExecutionException)) {\n\t\n\tdeclare precedence :\n\t\torg.parallelj.tracknrestart.aspects.QuartzContextAdapter,\n\t\torg.parallelj.launching.quartz.JobsAdapter;\n\n\tstatic Logger logger = Logger.getLogger(\"org.parallelj.tracknrestart.QuartzContextAdapter\");\n\t\n\tprivate X root;\n\n\tString result = ReturnCodes.SUCCESS.name();\n\t\n\t\/\/---------------------------------------------------------------------------------------------------\n\t\n\tdeclare parents:\n\t\t(@org.parallelj.launching.QuartzExecution *) implements Job;\n\n\tpublic void Job.execute(JobExecutionContext context)\n\t\t\tthrows JobExecutionException {\n\t\t\n\t\tProcessHelper<?> p = null;\n\t\tlogger.debug(\"-----------------------------------------------------------------------------------------------------\");\n\t\tlogger.debug(\"STARTING \/\/J Root Program \"+this.getClass().getName());\n\n\t\tp = Programs.as((Adapter) this);\n\n\t\ttry {\n\t\t\t\/\/TODO voir avec Christophe @IN\n\t\t\tField f = this.getClass().getDeclaredField(\"data1\");\n\t\t\tf.setAccessible(true);\n\t\t\tf.set(this, context.getJobDetail().getJobDataMap().get(\"data1\"));\n\t\t} catch (IllegalArgumentException e) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te.printStackTrace();\n\t\t} catch (IllegalAccessException e) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te.printStackTrace();\n\t\t} catch (SecurityException e) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te.printStackTrace();\n\t\t} catch (NoSuchFieldException e) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te.printStackTrace();\n\t\t}\n\n\t\tp.execute().join();\n\n\t\tlogger.debug(\"ENDING   \/\/J Root Program \"+this.getClass().getName());\n\t\tlogger.debug(\"-----------------------------------------------------------------------------------------------------\");\n\t\tcontext.setResult(String.valueOf(p.getState()));\n\t}\n\n\t\/\/---------------------------------------------------------------------------------------------------\n\t\n\tpublic interface X {};\n\n\tdeclare parents:           \n\t\t(org.quartz.Job+ && !org.quartz.Job) implements X;    \n\n\tdeclare parents:   \n\t\t(org.parallelj.internal.kernel.KCall) implements X;      \n\n\/\/\tdeclare parents:   \n\/\/\t\t(org.parallelj.mirror.Element+) implements X;      \n\n\/\/\tdeclare parents:   \n\/\/\t\t(org.parallelj.internal.kernel.callback.Entry+) implements X; \n\t\n\/\/\tdeclare parents:   \n\/\/\t\t(org.parallelj.internal.kernel.callback.Exit+) implements X; \n\t\n\tprivate ForEachListener X.forEachListener = null;       \n\t\n\tpublic ForEachListener X.getForEachListener() { \n\t\treturn forEachListener;\n\t}\n\t\n\tpublic void X.setForEachListener(ForEachListener forEachListener) {\n\t\tthis.forEachListener = forEachListener;\n\t}\n\t\n\tprivate String X.restartedFireInstanceId = null;       \n\t\n\tpublic String X.getRestartedFireInstanceId() {\n\t\treturn restartedFireInstanceId;\n\t}\n\t\n\tpublic void X.setRestartedFireInstanceId(String restartedFireInstanceId) {\n\t\tthis.restartedFireInstanceId = restartedFireInstanceId;\n\t}\n\t\n\t\/\/---------------------------------------------------------------------------------------------------\n\t\n\t\/\/JobExecutionContext --> Job\n\tbefore(X self, JobExecutionContext jobExecutionContext): \n\t\texecution(public void Job+.execute(..) throws JobExecutionException) \n\t\t&& this(self) \n\t\t&& args(jobExecutionContext) {\n\n\t\t\/\/logger.debug(\"ASPECT BEFORE:execution(public void Job+.execute(..) throws JobExecutionException) && this(self) && args(jobExecutionContext)\");\n\n\t\tself.setRestartedFireInstanceId(jobExecutionContext.getJobDetail().getJobDataMap().getString(TrackNRestartPlugin.RESTARTED_FIRE_INSTANCE_ID));\n\t\tself.setForEachListener((ForEachListener) jobExecutionContext.getJobDetail().getJobDataMap().get(TrackNRestartPlugin.FOR_EACH_LISTENER));\n\t\t\/\/logger.debug(\"job=\"+self); \n\t\t\/\/logger.debug(\"restartedFireInstanceId=\"+self.getRestartedFireInstanceId()); \n\t\t\/\/logger.debug(\"forEachListener=\"+self.getForEachListener());\n\n\t\tthis.root = self;\n\t}\n\n\tafter(X self, JobExecutionContext jobExecutionContext): \n\t\texecution(public void Job+.execute(..) throws JobExecutionException) \n\t\t&& this(self) \n\t\t&& args(jobExecutionContext) {\n\n\t\t\/\/logger.debug(\"ASPECT AFTER:execution(public void Job+.execute(..) throws JobExecutionException) && this(self) && args(jobExecutionContext)\");\n\t\tjobExecutionContext.setResult(result);\n\t}\n\t\n\tafter(X self): \n\t\texecution(protected KCall.new(..)) && this(self) {\n\n\t\t\/\/logger.debug(\"ASPECT AFTER:protected execution(protected KCall.new(..)) && this(self)\");\n\t\t\/\/logger.debug(\"self=\"+self);\n\t\tself.setRestartedFireInstanceId(root.getRestartedFireInstanceId()); \n\t\tself.setForEachListener(root.getForEachListener());\n\t\t\/\/logger.debug(\"restartedFireInstanceId=\"+self.getRestartedFireInstanceId()); \n\t\t\/\/logger.debug(\"forEachListener=\"+self.getForEachListener());\n\t}\n\n\tafter(X self): \n\t\texecution(protected KProcess.new(..)) && this(self) {\n\n\t\t\/\/logger.debug(\"ASPECT AFTER:protected execution(protected KProcess.new(..)) && this(self)\");\n\t\t\/\/logger.debug(\"self=\"+self);\n\t\tself.setRestartedFireInstanceId(root.getRestartedFireInstanceId()); \n\t\tself.setForEachListener(root.getForEachListener());\n\t\t\/\/logger.debug(\"restartedFireInstanceId=\"+self.getRestartedFireInstanceId()); \n\t\t\/\/logger.debug(\"forEachListener=\"+self.getForEachListener());\n\t}\n\n    pointcut enter(KCall _kCall): call(* org.parallelj.internal.kernel.callback.Entry+.enter(KCall)) && args(_kCall);\n    pointcut invoke(): call(public Object Method.invoke(Object, ..)) && !within(QuartzContextAdapter);\n\n\/\/pdx\n\/\/ Runnable program. ----------------------------------------------------------------------------------------------------------------------------------\n\n    public interface Y {};\n    \n  \tprivate Object Y.context = null;\n  \t\n  \tpublic Object Y.getContext() {\n  \t\treturn context;\n  \t}\n  \t\n  \tpublic void Y.setContext(Object context) {\n  \t\tthis.context=context;\n  \t}\n    \n    declare parents:           \n\t\t(java.lang.Runnable+ ) implements X, Y;    \n    \n    \/\/ 1) Transfert from RunnableCall to Runnable. \n  \tafter(Object self) returning (Runnable ret): \n    \t execution(* org.parallelj.internal.kernel.procedure.RunnableProcedure.RunnableCall.toRunnable())\n      && this(self)  {\n    \t\n    \t ((X)ret).setForEachListener(((X)self).getForEachListener());\n    \t ((X)ret).setRestartedFireInstanceId(((X)self).getRestartedFireInstanceId());\n    \t ((Y)ret).setContext(((org.parallelj.internal.kernel.KCall)self).getContext());\n    }\n    \n     \/\/ 2) Interception around call of run.      \n     void around(Object self): call(* run(..))\n     && within(org.parallelj.internal.kernel.procedure.RunnableProcedure.RunnableCall)\n     && within(Runnable+)  && this(self)  {\n    \t \n    \t String restartedFireInstanceId = ((X) self).getRestartedFireInstanceId();\n    \t ForEachListener forEachListener = ((X)self).getForEachListener();\t\n    \t Object program =  ((Y)self).getContext();\n    \t \n    \t if (isToProcess(restartedFireInstanceId,forEachListener,program)) {\n    \t\ttry { \n    \t\t\tproceed(self);\n     \t\t\tif (isTrackNRestartAnnoted(program)) {\n     \t\t\t\tString oid = getOID(program);\n   \t\t\t\t\ttrack(forEachListener, oid, true);\n     \t\t\t}\n    \t\t} catch (Exception e) {\n \t\t\t\tif (isTrackNRestartAnnoted(program)){\n \t\t\t\t\tString oid = getOID(program);\n \t\t\t\t\tif (isTrackNRestartExceptionPermitted(program, e)) {\n\t \t\t\t\t\ttrack(forEachListener, oid, false);\n\t\t\t\t\t} else {\n\t\t\t\t\t\tabortAbruptly();\n\t\t\t\t\t\tthrow new TrackNRestartException(\"Exception thrown (\"+e.getClass().getName()+\") is not in list of permitted exceptions \"+filteredExceptionsAsString(getTrackNRestartAnnotedException(program)));\n\t\t\t\t\t}\n \t\t\t\t}\n    \t\t}\n     \t} else {\n     \t\tif (isTrackNRestartAnnoted(program)) {\n \t\t\t\tString oid = getOID(program);\n \t\t\t\ttrack(forEachListener, oid, true);\n\t\t\t} else {\n\t\t\t\tabortAbruptly();\n\t\t\t\tthrow new TrackNRestartException(\"Unable to get iteration OID while 'tracking' context.\");\n \t\t\t}\n     \t}\n     }\n     \n     \/**\n      * Track the execution (success or failure).\n      * @param forEachListener listener handling Quartz backend.\n      * @param oid unique identifier\n      * @param success boolean indicating if processing is a success or a failure.\n      *\/\n     private void track(ForEachListener forEachListener, String oid, boolean success) {\n\t     try {\n\t\t\t\tforEachListener.forEachInstanceComplete(oid, success);\n\t     } catch (JobPersistenceException e) {\n\t\t\t\tabortAbruptly();\n\t\t\t\tthrow new TrackNRestartException(\"Unable to read status for iteration '\"+ oid + \"'.\", e);\n\t\t} catch (SQLException e) {\n\t\t\t\tabortAbruptly();\n\t\t\t\tthrow new TrackNRestartException(\"Unable to read status for iteration '\"+ oid + \"'.\", e);\n\t\t}\n     }\n    \n \n\/\/ restart part ----------------------------------------------------------------------------------------------------------------------------------------\n     \n     Object around(Object oo, KCall _kCall)  :\n        invoke() && args(oo, ..) && cflow(enter(_kCall)) {\n         \n    \tif (isToProcess( ((X) _kCall).getRestartedFireInstanceId(),((X) _kCall).getForEachListener(), oo)) {\n               return proceed(oo, _kCall);\n        } else {\n               return null;\n        }\n     }\n\n    \/**\n     * Check if an iterable must be processed. This means if the iterable is not already processed or the element was processed in error.\n     * @param restartedFireInstanceId id of the batch to be restarted.\n     * @param forEachListener listener handling request to Quartz. \n     * @param program instance of the program processing the iterable. \n     * @return true iterable has to be processed, false else.\n     *\/\n    private boolean isToProcess(String restartedFireInstanceId,  ForEachListener forEachListener, Object program)   {\n\t\tboolean result = true;\n\t\tif (program != null) {\n\t\t\tif (program.getClass().isAnnotationPresent(TrackNRestart.class)) {\n\t\t\t\tString oid = getOID(program);\n\t\t\t\tif (oid != null) {\n\t\t\t\t\tif (restartedFireInstanceId != null) {\n\t\t\t\t\t\t\/\/ logger.debug(\"Processing in restarting mode for oid : [\"\n\t\t\t\t\t\t\/\/ + oid + \"] ,program : [\" + program +\n\t\t\t\t\t\t\/\/ \"] ,instanceId :[\" +instanceId+ \"]\");\n\t\t\t\t\t\ttry {\n\t\t\t\t\t\t\tresult = !forEachListener.isForEachInstanceIgnorable(restartedFireInstanceId, oid);\n\t\t\t\t\t\t\t\/\/ logger.debug(result ?\n\t\t\t\t\t\t\t\/\/ \"This OID has not been already processed or\" +\n\t\t\t\t\t\t\t\/\/ \" already processed in error, so its processing is not skipped\":\n\t\t\t\t\t\t\t\/\/ \"This OID (\"+oid+\") has been already successfully processed, so its processing is skipped\");\n\t\t\t\t\t\t} catch (JobPersistenceException e) {\n\t\t\t\t\t\t\tabortAbruptly();\n\t\t\t\t\t\t\tthrow new TrackNRestartException(\n\t\t\t\t\t\t\t\t\t\"Unable to read status for iteration '\"\n\t\t\t\t\t\t\t\t\t\t\t+ oid + \"'.\", e);\n\t\t\t\t\t\t} catch (SQLException e) {\n\t\t\t\t\t\t\tabortAbruptly();\n\t\t\t\t\t\t\tthrow new TrackNRestartException(\n\t\t\t\t\t\t\t\t\t\"Unable to read status for iteration '\"\n\t\t\t\t\t\t\t\t\t\t\t+ oid + \"'.\", e);\n\t\t\t\t\t\t}\n\t\t\t\t\t} else {\n\t\t\t\t\t\t\/\/ logger.debug(\"Processing in normal mode (ie not restarting mode) for : [\"\n\t\t\t\t\t\t\/\/ + oid + \"] ,program : [\" + program + \"]\");\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t\treturn result;\n\t}\n    \n    \/**\n     * Get unique identifier returned by the program (the program contains value to be processed).\n     * @param program\n     * @return unique identifier.\n     *\/\n\tprivate String getOID(Object program) {\n\t\tString result = null;\n\t\ttry {\n\t\t\tMethod m = program.getClass().getDeclaredMethod(\"getOID\",\n\t\t\t\t\tnew Class[] {});\n\t\t\treturn (String) m.invoke(program, new Object[] {});\n\t\t} catch (SecurityException e1) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te1.printStackTrace();\n\t\t} catch (NoSuchMethodException e1) {\n\t\t\tabortAbruptly();\n\t\t\tthrow new TrackNRestartException(\n\t\t\t\t\t\"No getOID() method found while program \" + program\n\t\t\t\t\t\t\t+ \" was annotated @TrackNRestart.\", e1);\n\t\t} catch (IllegalArgumentException e) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te.printStackTrace();\n\t\t} catch (IllegalAccessException e) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te.printStackTrace();\n\t\t} catch (InvocationTargetException e) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te.printStackTrace();\n\t\t}\n\t\t\n\t\treturn result;\n\t}\n\t\n\t\/**\n\t * Indicate of the Program contains annotation TrackNRestart.\n\t * @param program\n\t * @return true if program is annoted.\n\t *\/\n\tprivate boolean isTrackNRestartAnnoted(Object program) {\n\t\treturn program.getClass().isAnnotationPresent(TrackNRestart.class);\n\t}\n\n\t\/**\n\t * Check if the raised exception belong to the allowed ones in TrackNRestart annotation.\n\t * @param program\n\t * @param exception raised\n\t * @return true if exception is allowed, false else.\n\t *\/\n\tprivate boolean isTrackNRestartExceptionPermitted(Object program, Exception exception) {\n\t\tboolean result = false;\n\t\tClass<? extends Throwable>[] filteredExceptions =  getTrackNRestartAnnotedException(program);\n\t\tfor (int i = 0; i < filteredExceptions.length; i++) {\n\t\t\t\tif (filteredExceptions[i].isAssignableFrom(exception.getClass())) {\n\t\t\t\t\treturn true;\n\t\t\t}\n\t\t}\n\t\treturn false;\n\t}\n\t\n\t\/**\n\t * Return exceptions defined in TrackNRestart annotation.\n\t * @param program\n\t * @return array of exceptions\n\t *\/\n\tprivate Class<? extends Throwable>[] getTrackNRestartAnnotedException (Object program) {\n\t\treturn program.getClass().getAnnotation(TrackNRestart.class).filteredExceptions();\n\t}\n\t\n\t\n\/\/ tracking part ----------------------------------------------------------------------------------------------------------------------------------------\n   after(Object oo, KCall _kCall) returning :\n    \tinvoke() && args(oo, ..) && cflow(enter(_kCall)) {\n\t\t\n\t\t\/\/logger.debug(\"ASPECT AFTER RETURNING\");\n\t\t\/\/logger.debug(\"_KCall=\"+_kCall);\n\t\ttrack(_kCall, oo, true, null);\n    }\n\n    after(Object oo, KCall _kCall) throwing (InvocationTargetException ite) : \n    \tinvoke() && args(oo, ..) && cflow(enter(_kCall)) {\n\t\t\n\t\t\/\/logger.debug(\"ASPECT AFTER THROWING (InvocationTargetException)\");\n\t\t\/\/logger.debug(\"_KCall=\"+_kCall);\n\t\tthis.result = \"FAILURE\";\n\t\ttrack(_kCall, oo, false, ite);\n    }\n\n    \n\tprivate void track(KCall _kCall, Object program, boolean success,\n\t\t\tInvocationTargetException ite) {\n\t\tString oid = null;\n\n\t\ttry {\n\t\t\tif (program != null) {\n\t\t\t\tClass<? extends Object> clazz = program.getClass();\n\t\t\t\tif (clazz.isAnnotationPresent(TrackNRestart.class)) {\n\t\t\t\t\tMethod m = clazz\n\t\t\t\t\t\t\t.getDeclaredMethod(\"getOID\", new Class[] {});\n\t\t\t\t\toid = (String) m.invoke(program, new Object[] {});\n\t\t\t\t\tif (oid != null) {\n\t\t\t\t\t\tif (success == true) {\n\t\t\t\t\t\t\tpersist(_kCall, success, oid);\n\t\t\t\t\t\t} else {\n\t\t\t\t\t\t\tClass<? extends Throwable>[] filteredExceptions = clazz\n\t\t\t\t\t\t\t\t\t.getAnnotation(TrackNRestart.class)\n\t\t\t\t\t\t\t\t\t.filteredExceptions();\n\t\t\t\t\t\t\tif (isIteCausePermittedInList(ite,\n\t\t\t\t\t\t\t\t\tfilteredExceptions)) {\n\t\t\t\t\t\t\t\tpersist(_kCall, success, oid);\n\t\t\t\t\t\t\t} else {\n\t\t\t\t\t\t\t\tabortAbruptly();\n\t\t\t\t\t\t\t\tthrow new TrackNRestartException(\n\t\t\t\t\t\t\t\t\t\t\"Exception thrown (\"\n\t\t\t\t\t\t\t\t\t\t\t\t+ ite.getCause().getClass()\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t.getName()\n\t\t\t\t\t\t\t\t\t\t\t\t+ \") is not in list of permitted exceptions \"\n\t\t\t\t\t\t\t\t\t\t\t\t+ filteredExceptionsAsString(filteredExceptions));\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t\tif (logger.isDebugEnabled()) {\n\t\t\t\t\t\t\t\/\/ logger.debug(\"oid='\" + oid +\n\t\t\t\t\t\t\t\/\/ \"' persisted with status='\" + (success ?\n\t\t\t\t\t\t\t\/\/ ReturnCodes.SUCCESS : \"FAILURE\") + \"' \"+ (ite ==\n\t\t\t\t\t\t\t\/\/ null ? \"\" : \", cause : \" + ite.getCause()));\n\t\t\t\t\t\t}\n\t\t\t\t\t} else {\n\t\t\t\t\t\tabortAbruptly();\n\t\t\t\t\t\tthrow new TrackNRestartException(\n\t\t\t\t\t\t\t\t\"Unable to get iteration OID while 'tracking' context.\");\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t} catch (NoSuchMethodException e) {\n\t\t\tabortAbruptly();\n\t\t\tthrow new TrackNRestartException(\n\t\t\t\t\t\"No getOID() method found while program \" + program\n\t\t\t\t\t\t\t+ \" was annotated @TrackNRestart.\", e);\n\t\t} catch (SecurityException e) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te.printStackTrace();\n\t\t} catch (IllegalArgumentException e) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te.printStackTrace();\n\t\t} catch (IllegalAccessException e) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te.printStackTrace();\n\t\t} catch (InvocationTargetException e) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te.printStackTrace();\n\t\t} catch (JobPersistenceException e) {\n\t\t\tabortAbruptly();\n\t\t\tthrow new TrackNRestartException(\"Unable to persist status ['\"\n\t\t\t\t\t+ (success ? ReturnCodes.SUCCESS : \"FAILURE\")\n\t\t\t\t\t+ \"'] for iteration '\" + oid + \"'.\", e);\n\t\t} catch (SQLException e) {\n\t\t\tabortAbruptly();\n\t\t\tthrow new TrackNRestartException(\"Unable to persist status ['\"\n\t\t\t\t\t+ (success ? ReturnCodes.SUCCESS : \"FAILURE\")\n\t\t\t\t\t+ \"'] for iteration '\" + oid + \"'.\", e);\n\t\t}\n\t}\n\n\tprivate boolean isIteCausePermittedInList(InvocationTargetException ite,\n\t\t\tClass<? extends Throwable>[] filteredExceptions) {\n\t\tfor (int i = 0; i < filteredExceptions.length; i++) {\n\t\t\tif (filteredExceptions[i].isAssignableFrom(ite.getCause()\n\t\t\t\t\t.getClass()))\n\t\t\t\treturn true;\n\t\t}\n\t\treturn false;\n\t}\n\n\tprivate String filteredExceptionsAsString(\n\t\t\tClass<? extends Throwable>[] filteredExceptions) {\n\t\tStringBuffer sb = new StringBuffer();\n\t\tsb.append(\"[\");\n\t\tfor (int i = 0; i < filteredExceptions.length; i++) {\n\t\t\tif (i > 0)\n\t\t\t\tsb.append(\", \");\n\t\t\tsb.append(filteredExceptions[i].getName());\n\t\t}\n\t\tsb.append(\"]\");\n\t\treturn sb.toString();\n\t}\n\n\tprivate void persist(KCall _kCall, boolean success, String oid)\n\t\t\tthrows JobPersistenceException, SQLException {\n\t\t((X) _kCall).getForEachListener().forEachInstanceComplete(oid, success);\n\t}\n\n\tprivate void abortAbruptly() {\n\t\tthis.result = \"ABORTED\";\n\t\tPrograms.as((Adapter) this.root).abort();\n\t}\n\n}\n","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"4a874bd79a64b6d6881b2b7d6b37437d93ca5672","subject":"renamed TransactionAspectSupport's transaction demarcation methods","message":"renamed TransactionAspectSupport's transaction demarcation methods\n\n\ngit-svn-id: b619a0c99665f88f1afe72824344cefe9a1c8c90@11694 fd5a2b45-1f63-4059-99e9-3c7cb7fd75c8\n","repos":"cbeams-archive\/spring-framework-2.5.x,cbeams-archive\/spring-framework-2.5.x,cbeams-archive\/spring-framework-2.5.x,cbeams-archive\/spring-framework-2.5.x","old_file":"aspectj\/src\/org\/springframework\/transaction\/aspectj\/AbstractTransactionAspect.aj","new_file":"aspectj\/src\/org\/springframework\/transaction\/aspectj\/AbstractTransactionAspect.aj","new_contents":"\/*\n * Copyright 2002-2006 the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.springframework.transaction.aspectj;\n\nimport java.lang.reflect.Method;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.aspectj.lang.reflect.MethodSignature;\nimport org.springframework.transaction.interceptor.TransactionAspectSupport;\nimport org.springframework.transaction.interceptor.TransactionAttributeSource;\n\n\/**\n * Abstract superaspect for AspectJ transaction aspects. Concrete\n * subaspects will implement the <code>transactionalMethodExecution()<\/code>\n * pointcut using a strategy such as Java 5 annotations.\n *\n * <p>Suitable for use inside or outside the Spring IoC container.\n * Set the \"transactionManager\" property appropriately, allowing\n * use of any transaction implementation supported by Spring.\n *\n * <p><b>NB:<\/b> If a method implements an interface that is itself\n * transactionally annotated, the relevant Spring transaction attribute\n * will <i>not<\/i> be resolved. This behavior will vary from that of Spring AOP\n * if proxying an interface (but not when proxying a class). We recommend that\n * transaction annotations should be added to classes, rather than business\n * interfaces, as they are an implementation detail rather than a contract\n * specification validation.\n *\n * @author Rod Johnson\n * @author Ramnivas Laddad\n * @since 2.0\n *\/\npublic abstract aspect AbstractTransactionAspect extends TransactionAspectSupport {\n\t\n\t\/**\n\t * Construct object using the given transaction metadata retrieval strategy.\n\t * @param tas TransactionAttributeSource implementation, retrieving Spring\n\t * transaction metadata for each joinpoint. Write the subclass to pass in null\n\t * if it's intended to be configured by Setter Injection.\n\t *\/\n\tprotected AbstractTransactionAspect(TransactionAttributeSource tas) {\n\t\tsetTransactionAttributeSource(tas);\n\t}\n\t\n\t@SuppressAjWarnings(\"adviceDidNotMatch\")\n\tbefore(Object txObject) : transactionalMethodExecution(txObject) {\n\t\tMethodSignature methodSignature = (MethodSignature) thisJoinPoint.getSignature();\n\t\tMethod method = methodSignature.getMethod();\n\t\t\/\/  Create transaction if necessary.\n\t\tTransactionInfo txInfo = createTransactionIfNecessary(method, txObject.getClass());\n\t\tif (logger.isDebugEnabled()) {\n\t\t\tlogger.debug(\"Aspect-created transaction: \" + txInfo);\n\t\t}\n\t}\n\t\n\t@SuppressAjWarnings(\"adviceDidNotMatch\")\n\tafter(Object txObject) throwing(Throwable t) : transactionalMethodExecution(txObject) {\n    try {\n      completeTransactionAfterThrowing(TransactionAspectSupport.currentTransactionInfo(), t);\n    }\n    catch (Throwable th) {\n      logger.error(\"Failed to close transaction after throwing in a Transactional method\", th);\n    }\n  }\n\t\n\t@SuppressAjWarnings(\"adviceDidNotMatch\")\n\tafter(Object txObject) returning() : transactionalMethodExecution(txObject) {\n\t\tcommitTransactionAfterReturning(TransactionAspectSupport.currentTransactionInfo());\n\t}\n\t\n\t@SuppressAjWarnings(\"adviceDidNotMatch\")\n\tafter(Object txObject) : transactionalMethodExecution(txObject) {\n\t\tcleanupTransactionInfo(TransactionAspectSupport.currentTransactionInfo());\n\t}\n\n\n\t\/\/ TODO extend TransactionAttributeSource to support join points besides methods\n\n\t\/**\n\t * Concrete subaspects must implement this pointcut, to identify\n\t * transactional methods. For each selected joinpoint, TransactionMetadata\n\t * will be retrieved using Spring's TransactionAttributeSource interface.\n\t *\/\n\tprotected abstract pointcut transactionalMethodExecution(Object txObject);\n\n}\n","old_contents":"\/*\n * Copyright 2002-2005 the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.springframework.transaction.aspectj;\n\nimport java.lang.reflect.Method;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.aspectj.lang.reflect.MethodSignature;\nimport org.springframework.transaction.interceptor.TransactionAspectSupport;\nimport org.springframework.transaction.interceptor.TransactionAttributeSource;\n\n\/**\n * Abstract superaspect for AspectJ transaction aspects. Concrete\n * subaspects will implement the <code>transactionalMethodExecution()<\/code>\n * pointcut using a strategy such as Java 5 annotations.\n *\n * <p>Suitable for use inside or outside the Spring IoC container.\n * Set the \"transactionManager\" property appropriately, allowing\n * use of any transaction implementation supported by Spring.\n *\n * <p><b>NB:<\/b> If a method implements an interface that is itself\n * transactionally annotated, the relevant Spring transaction attribute\n * will <i>not<\/i> be resolved. This behavior will vary from that of Spring AOP\n * if proxying an interface (but not when proxying a class). We recommend that\n * transaction annotations should be added to classes, rather than business\n * interfaces, as they are an implementation detail rather than a contract\n * specification validation.\n *\n * @author Rod Johnson\n * @author Ramnivas Laddad\n * @since 2.0\n *\/\npublic abstract aspect AbstractTransactionAspect extends TransactionAspectSupport {\n\t\n\t\/**\n\t * Construct object using the given transaction metadata retrieval strategy.\n\t * @param tas TransactionAttributeSource implementation, retrieving Spring\n\t * transaction metadata for each joinpoint. Write the subclass to pass in null\n\t * if it's intended to be configured by Setter Injection.\n\t *\/\n\tprotected AbstractTransactionAspect(TransactionAttributeSource tas) {\n\t\tsetTransactionAttributeSource(tas);\n\t}\n\t\n\t@SuppressAjWarnings(\"adviceDidNotMatch\")\n\tbefore(Object txObject) : transactionalMethodExecution(txObject) {\n\t\tMethodSignature methodSignature = (MethodSignature) thisJoinPoint.getSignature();\n\t\tMethod method = methodSignature.getMethod();\n\t\t\/\/  Create transaction if necessary.\n\t\tTransactionInfo txInfo = createTransactionIfNecessary(method, txObject.getClass());\n\t\tif (logger.isDebugEnabled()) {\n\t\t\tlogger.debug(\"Aspect-created transaction: \" + txInfo);\n\t\t}\n\t}\n\t\n\t@SuppressAjWarnings(\"adviceDidNotMatch\")\n\tafter(Object txObject) throwing(Throwable t) : transactionalMethodExecution(txObject) {\n    try {\n      doCloseTransactionAfterThrowing(TransactionAspectSupport.currentTransactionInfo(), t);\n    }\n    catch (Throwable th) {\n      logger.error(\"Failed to close transaction after throwing in a Transactional method\", th);\n    }\n  }\n\t\n\t@SuppressAjWarnings(\"adviceDidNotMatch\")\n\tafter(Object txObject) returning() : transactionalMethodExecution(txObject) {\n\t\tdoCommitTransactionAfterReturning(TransactionAspectSupport.currentTransactionInfo());\n\t}\n\t\n\t@SuppressAjWarnings(\"adviceDidNotMatch\")\n\tafter(Object txObject) : transactionalMethodExecution(txObject) {\n\t\tdoFinally(TransactionAspectSupport.currentTransactionInfo());\n\t}\n\n\n\t\/\/ TODO extend TransactionAttributeSource to support join points besides methods\n\n\t\/**\n\t * Concrete subaspects must implement this pointcut, to identify\n\t * transactional methods. For each selected joinpoint, TransactionMetadata\n\t * will be retrieved using Spring's TransactionAttributeSource interface.\n\t *\/\n\tprotected abstract pointcut transactionalMethodExecution(Object txObject);\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"7733883e1d3e4d584df9aaa81d0953603a66217d","subject":"Add proper entry point to queue logging","message":"Add proper entry point to queue logging\n","repos":"brownsys\/tracing-framework,brownsys\/tracing-framework,brownsys\/tracing-framework,brownsys\/tracing-framework,brownsys\/tracing-framework,brownsys\/tracing-framework,brownsys\/tracing-framework","old_file":"tracingplane\/aspects\/src\/main\/aspect\/edu\/brown\/cs\/systems\/tracing\/aspects\/Queues.aj","new_file":"tracingplane\/aspects\/src\/main\/aspect\/edu\/brown\/cs\/systems\/tracing\/aspects\/Queues.aj","new_contents":"package edu.brown.cs.systems.tracing.aspects;\n\nimport java.util.concurrent.BlockingQueue;\n\nimport edu.brown.cs.systems.baggage.Baggage;\nimport edu.brown.cs.systems.baggage.DetachedBaggage;\nimport edu.brown.cs.systems.tracing.aspects.Annotations.InstrumentQueues;\nimport edu.brown.cs.systems.tracing.aspects.Annotations.InstrumentedQueueElement;\nimport edu.brown.cs.systems.xtrace.reporting.XTraceReport;\n\n\/** Instruments potentially asynchronous executions -- runnables, callables, and threads. Special-case handling for\n * threads since they can themselves be a runnable, or they can wrap a runnable *\/\npublic aspect Queues {\n\n    \/* ================================================================================================================\n     * \n     * QueueElementWithBaggage is added to any class that is used as a queue element, with the InstrumentedQueueElement\n     * annotation. *\/\n\n    public interface QueueElementWithBaggage {\n        public DetachedBaggage takeAttachedBaggage();\n        public void attachProvidedBaggage(DetachedBaggage baggage);\n    }\n\n    public volatile DetachedBaggage QueueElementWithBaggage.attachedQueueElementBaggage;\n\n    public DetachedBaggage QueueElementWithBaggage.takeAttachedBaggage() {\n        try {\n            return attachedQueueElementBaggage;\n        } finally {\n            attachedQueueElementBaggage = null;\n        }\n    }\n\n    public void QueueElementWithBaggage.attachProvidedBaggage(DetachedBaggage baggage) {\n        attachedQueueElementBaggage = baggage;\n    }\n\n    \/* ================================================================================================================\n     * \n     * All instrumented queue element annotated get baggage added *\/\n\n    declare parents: (@InstrumentedQueueElement Object)+ implements QueueElementWithBaggage;\n    \n    before(QueueElementWithBaggage e): args(e,..) && within(@InstrumentQueues *) && (\n            call(* BlockingQueue+.add(..)) || call(* BlockingQueue+.offer(..)) || call(* BlockingQueue+.put(..))\n            ) {\n        XTraceReport.entering(thisJoinPointStaticPart);\n        e.attachProvidedBaggage(Baggage.fork());\n        XTraceReport.left(thisJoinPointStaticPart);\n    }\n    \n    before(): within(@InstrumentQueues *) && call(* BlockingQueue+.take(..)) {\n        XTraceReport.entering(thisJoinPointStaticPart);\n        Baggage.discard();\n        XTraceReport.left(thisJoinPointStaticPart);\n    }\n    \n    after() returning(QueueElementWithBaggage e): within(@InstrumentQueues *) && call(* BlockingQueue+.take(..)) {\n        if (e != null) {\n            XTraceReport.entering(thisJoinPointStaticPart);\n            Baggage.start(e.takeAttachedBaggage());\n            XTraceReport.left(thisJoinPointStaticPart);\n        }\n    }\n\n}","old_contents":"package edu.brown.cs.systems.tracing.aspects;\n\nimport java.util.concurrent.BlockingQueue;\n\nimport edu.brown.cs.systems.baggage.Baggage;\nimport edu.brown.cs.systems.baggage.DetachedBaggage;\nimport edu.brown.cs.systems.tracing.aspects.Annotations.InstrumentQueues;\nimport edu.brown.cs.systems.tracing.aspects.Annotations.InstrumentedQueueElement;\n\n\/** Instruments potentially asynchronous executions -- runnables, callables, and threads. Special-case handling for\n * threads since they can themselves be a runnable, or they can wrap a runnable *\/\npublic aspect Queues {\n\n    \/* ================================================================================================================\n     * \n     * QueueElementWithBaggage is added to any class that is used as a queue element, with the InstrumentedQueueElement\n     * annotation. *\/\n\n    public interface QueueElementWithBaggage {\n        public DetachedBaggage takeAttachedBaggage();\n        public void attachProvidedBaggage(DetachedBaggage baggage);\n    }\n\n    public volatile DetachedBaggage QueueElementWithBaggage.attachedQueueElementBaggage;\n\n    public DetachedBaggage QueueElementWithBaggage.takeAttachedBaggage() {\n        try {\n            return attachedQueueElementBaggage;\n        } finally {\n            attachedQueueElementBaggage = null;\n        }\n    }\n\n    public void QueueElementWithBaggage.attachProvidedBaggage(DetachedBaggage baggage) {\n        attachedQueueElementBaggage = baggage;\n    }\n\n    \/* ================================================================================================================\n     * \n     * All instrumented queue element annotated get baggage added *\/\n\n    declare parents: (@InstrumentedQueueElement Object)+ implements QueueElementWithBaggage;\n    \n    before(QueueElementWithBaggage e): args(e,..) && within(@InstrumentQueues *) && (\n            call(* BlockingQueue+.add(..)) || call(* BlockingQueue+.offer(..)) || call(* BlockingQueue+.put(..))\n            ) {\n        e.attachProvidedBaggage(Baggage.fork());\n    }\n    \n    before(): within(@InstrumentQueues *) && call(* BlockingQueue+.take(..)) {\n        Baggage.discard();\n    }\n    \n    after() returning(QueueElementWithBaggage e): within(@InstrumentQueues *) && call(* BlockingQueue+.take(..)) {\n        if (e != null) {\n            Baggage.start(e.takeAttachedBaggage());\n        }\n    }\n\n}","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"72e75760983fa885d9dc57697dd76334a76edde7","subject":"operational is true on NO error :)","message":"operational is true on NO error :)\n","repos":"mebigfatguy\/hashshmash","old_file":"aj\/com\/mebigfatguy\/hashshmash\/HashCollector.aj","new_file":"aj\/com\/mebigfatguy\/hashshmash\/HashCollector.aj","new_contents":"package com.mebigfatguy.hashshmash;\n\nimport java.io.BufferedWriter;\nimport java.io.File;\nimport java.io.FileOutputStream;\nimport java.io.OutputStreamWriter;\nimport java.io.PrintWriter;\nimport java.lang.reflect.Field;\nimport java.text.SimpleDateFormat;\nimport java.util.Date;\nimport java.util.HashMap;\nimport java.util.HashSet;\nimport java.util.Map;\nimport java.util.Map.Entry;\nimport java.util.Set;\nimport java.util.concurrent.ConcurrentHashMap;\n\npublic aspect HashCollector {\n    \n    private static final Journaller journaller = new Journaller();\n\n    after() returning (Map<?,?> m): call(HashMap.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashMapDetails details = new HashMapDetails(m, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    after() returning (Set<?> s): call(HashSet.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashSetDetails details = new HashSetDetails(s, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    before(): execution(public static void *.main(String[])) {\n        Class<?> c = HashCollector.class;\n    }\n}\n\nfinal class Journaller implements Runnable {\n    \n    private static final int SLEEP_TIME = 5 * 1000;\n    \n    private Field tableField;\n    private ConcurrentHashMap<HashDetails, HashDetails> hDetails = new ConcurrentHashMap<HashDetails, HashDetails>();\n    private PrintWriter writer;\n    private boolean operational = false;\n\n    public Journaller() {\n        try {\n            System.out.println(\"*************************\");\n            System.out.println(\"HASHSHMASH ASPECT ENABLED\");\n            System.out.println(\"*************************\");\n            \n            tableField = HashMap.class.getDeclaredField(\"table\");\n            tableField.setAccessible(true);\n              \n            File dir = new File(System.getProperty(\"user.home\"), \".hashshmash\");\n            dir.mkdirs();  \n            \n            writer = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(new File(dir, new Date().toString() + \".txt\")))));\n            \n            Thread t = new Thread(this);\n            t.setDaemon(true);\n            operational = true;\n            t.start();\n        } catch (Exception e) {\n        }\n    }\n    \n    public void add(HashDetails details) {\n        if (operational)\n            hDetails.put(details,  details);\n    }\n    \n    public void run() {\n        try {\n            while (!Thread.interrupted()) {\n                Thread.sleep(SLEEP_TIME);\n                \n                for (HashDetails details : hDetails.keySet()) {\n                    try {\n                        Map<?, ?> map = details.getMap();\n                        if (map != null) {\n                            int newSize = details.getMap().size();\n                            if (newSize == details.size) {\n                                Entry<?, ?>[] table = (Entry<?, ?>[])tableField.get(map);\n                                details.totalSlots = table.length;\n                                for (Entry<?, ?> e : table) {\n                                    if (e != null) {\n                                        details.usedSlots++;\n                                    }\n                                }\n                                writer.println(details);\n                                hDetails.remove(details);\n                            } else\n                                details.size = newSize;\n                        } else {\n                            hDetails.remove(details);\n                        }\n                    } catch (Exception e) {\n                        \/\/might get ConcurrentModificationException or such, just ignore\n                    }\n                }\n                writer.flush();\n            }\n        } catch (InterruptedException ie) {    \n        }\n    }\n}\n\nabstract class HashDetails {\n    private static SimpleDateFormat FORMATTER = new SimpleDateFormat(\"MM\/dd\/yyyy HH:mm:ss\");\n    \n    public Date allocTime;\n    public String caller;\n    public int size;\n    public int usedSlots;\n    public int totalSlots;\n    \n    public abstract Map<?,?> getMap();\n    \n    public abstract String getDetailType();\n    \n    public String toString() {\n        return getDetailType() + \"\\t\" + FORMATTER.format(allocTime) + \"\\t\" + caller + \"\\t\" + getMap().size() + \"\\t\" + totalSlots + \"\\t\" + usedSlots;\n    }\n}\n\nclass HashMapDetails extends HashDetails {\n    public Map<?, ?> map;\n\n    public HashMapDetails(Map<?, ?> m, Date d, String c) {\n        map = m;\n        allocTime = d;\n        caller = c;\n        size = map.size();\n    }\n    \n    public Map<?,?> getMap() {\n        return map;\n    }\n    \n    public String getDetailType() {\n        return map.getClass().getSimpleName();\n    }\n}\n\nclass HashSetDetails extends HashDetails {\n    private static Field MAP_FIELD;\n    static {\n        try {\n            MAP_FIELD = HashSet.class.getDeclaredField(\"map\");\n            MAP_FIELD.setAccessible(true);\n        } catch (Exception e) {\n            MAP_FIELD = null;\n        }\n    }\n    \n    public Set<?> set;\n\n    public HashSetDetails(Set<?> s, Date d, String c) {\n        set = s;\n        allocTime = d;\n        caller = c;\n        size = set.size();\n    }\n    \n    public Map<?,?> getMap() {\n        try {\n            if (MAP_FIELD == null)\n                return null;\n            \n            return (Map<?,?>) MAP_FIELD.get(set);\n        } catch (Exception e) {\n            return null;\n        }\n    }\n    \n    public String getDetailType() {\n        return set.getClass().getSimpleName();\n    }\n}\n","old_contents":"package com.mebigfatguy.hashshmash;\n\nimport java.io.BufferedWriter;\nimport java.io.File;\nimport java.io.FileOutputStream;\nimport java.io.OutputStreamWriter;\nimport java.io.PrintWriter;\nimport java.lang.reflect.Field;\nimport java.text.SimpleDateFormat;\nimport java.util.Date;\nimport java.util.HashMap;\nimport java.util.HashSet;\nimport java.util.Map;\nimport java.util.Map.Entry;\nimport java.util.Set;\nimport java.util.concurrent.ConcurrentHashMap;\n\npublic aspect HashCollector {\n    \n    private static final Journaller journaller = new Journaller();\n\n    after() returning (Map<?,?> m): call(HashMap.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashMapDetails details = new HashMapDetails(m, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    after() returning (Set<?> s): call(HashSet.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashSetDetails details = new HashSetDetails(s, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    before(): execution(public static void *.main(String[])) {\n        Class<?> c = HashCollector.class;\n    }\n}\n\nfinal class Journaller implements Runnable {\n    \n    private static final int SLEEP_TIME = 5 * 1000;\n    \n    private Field tableField;\n    private ConcurrentHashMap<HashDetails, HashDetails> hDetails = new ConcurrentHashMap<HashDetails, HashDetails>();\n    private PrintWriter writer;\n    private boolean operational = false;\n\n    public Journaller() {\n        try {\n            System.out.println(\"*************************\");\n            System.out.println(\"HASHSHMASH ASPECT ENABLED\");\n            System.out.println(\"*************************\");\n            \n            tableField = HashMap.class.getDeclaredField(\"table\");\n            tableField.setAccessible(true);\n              \n            File dir = new File(System.getProperty(\"user.home\"), \".hashshmash\");\n            dir.mkdirs();  \n            \n            writer = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(new File(dir, new Date().toString() + \".txt\")))));\n            \n            Thread t = new Thread(this);\n            t.setDaemon(true);\n            t.start();\n        } catch (Exception e) {\n            operational = true;\n        }\n    }\n    \n    public void add(HashDetails details) {\n        if (operational)\n            hDetails.put(details,  details);\n    }\n    \n    public void run() {\n        try {\n            while (!Thread.interrupted()) {\n                Thread.sleep(SLEEP_TIME);\n                \n                for (HashDetails details : hDetails.keySet()) {\n                    try {\n                        Map<?, ?> map = details.getMap();\n                        if (map != null) {\n                            int newSize = details.getMap().size();\n                            if (newSize == details.size) {\n                                Entry<?, ?>[] table = (Entry<?, ?>[])tableField.get(map);\n                                details.totalSlots = table.length;\n                                for (Entry<?, ?> e : table) {\n                                    if (e != null) {\n                                        details.usedSlots++;\n                                    }\n                                }\n                                writer.println(details);\n                                hDetails.remove(details);\n                            } else\n                                details.size = newSize;\n                        } else {\n                            hDetails.remove(details);\n                        }\n                    } catch (Exception e) {\n                        \/\/might get ConcurrentModificationException or such, just ignore\n                    }\n                }\n                writer.flush();\n            }\n        } catch (InterruptedException ie) {    \n        }\n    }\n}\n\nabstract class HashDetails {\n    private static SimpleDateFormat FORMATTER = new SimpleDateFormat(\"MM\/dd\/yyyy HH:mm:ss\");\n    \n    public Date allocTime;\n    public String caller;\n    public int size;\n    public int usedSlots;\n    public int totalSlots;\n    \n    public abstract Map<?,?> getMap();\n    \n    public abstract String getDetailType();\n    \n    public String toString() {\n        return getDetailType() + \"\\t\" + FORMATTER.format(allocTime) + \"\\t\" + caller + \"\\t\" + getMap().size() + \"\\t\" + totalSlots + \"\\t\" + usedSlots;\n    }\n}\n\nclass HashMapDetails extends HashDetails {\n    public Map<?, ?> map;\n\n    public HashMapDetails(Map<?, ?> m, Date d, String c) {\n        map = m;\n        allocTime = d;\n        caller = c;\n        size = map.size();\n    }\n    \n    public Map<?,?> getMap() {\n        return map;\n    }\n    \n    public String getDetailType() {\n        return map.getClass().getSimpleName();\n    }\n}\n\nclass HashSetDetails extends HashDetails {\n    private static Field MAP_FIELD;\n    static {\n        try {\n            MAP_FIELD = HashSet.class.getDeclaredField(\"map\");\n            MAP_FIELD.setAccessible(true);\n        } catch (Exception e) {\n            MAP_FIELD = null;\n        }\n    }\n    \n    public Set<?> set;\n\n    public HashSetDetails(Set<?> s, Date d, String c) {\n        set = s;\n        allocTime = d;\n        caller = c;\n        size = set.size();\n    }\n    \n    public Map<?,?> getMap() {\n        try {\n            if (MAP_FIELD == null)\n                return null;\n            \n            return (Map<?,?>) MAP_FIELD.get(set);\n        } catch (Exception e) {\n            return null;\n        }\n    }\n    \n    public String getDetailType() {\n        return set.getClass().getSimpleName();\n    }\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"792cd858b91cdc55f6693833c4c314990616bd69","subject":"use BatchJobId header to get the batch job id.  We are no longer passing the job object in the exchange.","message":"use BatchJobId header to get the batch job id.  We are no longer passing the job object in the exchange.\n","repos":"inbloom\/secure-data-service,inbloom\/secure-data-service,inbloom\/secure-data-service,inbloom\/secure-data-service,inbloom\/secure-data-service","old_file":"sli\/ingestion\/ingestion-core\/src\/main\/java\/org\/slc\/sli\/ingestion\/measurement\/IngestionPerformanceTrackingAspect.aj","new_file":"sli\/ingestion\/ingestion-core\/src\/main\/java\/org\/slc\/sli\/ingestion\/measurement\/IngestionPerformanceTrackingAspect.aj","new_contents":"package org.slc.sli.ingestion.measurement;\n\nimport org.apache.camel.Exchange;\nimport org.aspectj.lang.annotation.Aspect;\nimport org.aspectj.lang.annotation.Before;\nimport org.aspectj.lang.annotation.Pointcut;\nimport org.springframework.stereotype.Component;\n\nimport org.slc.sli.util.performance.PerformanceTrackingAspect;\n\n\/**\n * Aspect for performance measurement of ingestion operations\n *\n * @author ifaybyshev\n *\n *\/\n@Aspect\n@Component(\"IngestionPerformanceTrackingAspect\")\npublic class IngestionPerformanceTrackingAspect extends PerformanceTrackingAspect {\n\n    \/\/ setting ingestion job context: setting of batch job id\n    @Pointcut(\"@annotation(org.slc.sli.ingestion.measurement.ExtractBatchJobIdToContext)\")\n    public void extractBatchJobIdToContext() {\n    }\n\n    @Before(\"extractBatchJobIdToContext() && args(exchange)\")\n    public void handleExtractBatchJobIdToContextPointcut(Exchange exchange) {\n        log.info(\"================== Assigned Ingestion Batch Id (Setter) = {}\",\n                exchange.getIn().getHeader(\"BatchJobId\", String.class));\n        store.put(\"ingestionBatchJobId\", exchange.getIn().getHeader(\"BatchJobId\", String.class));\n    }\n\n    protected void sendPerformanceMessage(String callerName, long startTimestamp, long endTimestamp) {\n        performanceLog.info(\"<ingestionPerformance>\" + \"<batchId>\" + store.get(\"ingestionBatchJobId\") + \"<\/batchId>\"\n                + \"<caller>\" + callerName + \"<\/caller>\" + \"<timing>\" + \"<startTimestamp>\" + startTimestamp\n                + \"<\/startTimestamp>\" + \"<endTimestamp>\" + endTimestamp + \"<\/endTimestamp>\" + \"<elapsedMs>\"\n                + (endTimestamp - startTimestamp) + \"<\/elapsedMs>\" + \"<\/timing>\" + \"<\/ingestionPerformance>\");\n\n    }\n\n}\n","old_contents":"package org.slc.sli.ingestion.measurement;\n\nimport org.apache.camel.Exchange;\nimport org.aspectj.lang.annotation.Aspect;\nimport org.aspectj.lang.annotation.Before;\nimport org.aspectj.lang.annotation.Pointcut;\nimport org.slc.sli.ingestion.model.NewBatchJob;\nimport org.slc.sli.util.performance.PerformanceTrackingAspect;\nimport org.springframework.stereotype.Component;\n\n\/**\n * Aspect for performance measurement of ingestion operations\n * \n * @author ifaybyshev\n * \n *\/\n@Aspect\n@Component(\"IngestionPerformanceTrackingAspect\")\npublic class IngestionPerformanceTrackingAspect extends\n\t\tPerformanceTrackingAspect {\n\n\t\/\/ setting ingestion job context: setting of batch job id\n\t@Pointcut(\"@annotation(org.slc.sli.ingestion.measurement.ExtractBatchJobIdToContext)\")\n\tpublic void extractBatchJobIdToContext() {\n\t}\n\n\t@Before(\"extractBatchJobIdToContext() && args(exchange)\")\n\tpublic void handleExtractBatchJobIdToContextPointcut(Exchange exchange) {\n\t\tlog.info(\"================== Assigned Ingestion Batch Id (Setter) = {}\", \n\t\t\t\texchange.getIn().getBody(NewBatchJob.class).getId());\n\t\tstore.put(\"ingestionBatchJobId\",\n\t\t\t\texchange.getIn().getBody(NewBatchJob.class).getId());\n\t}\n\n\tprotected void sendPerformanceMessage(String callerName,\n\t\t\tlong startTimestamp, long endTimestamp) {\n\t\tperformanceLog.info(\"<ingestionPerformance>\" + \"<batchId>\"\n\t\t\t\t+ store.get(\"ingestionBatchJobId\") + \"<\/batchId>\" + \"<caller>\"\n\t\t\t\t+ callerName + \"<\/caller>\" + \"<timing>\" + \"<startTimestamp>\"\n\t\t\t\t+ startTimestamp + \"<\/startTimestamp>\" + \"<endTimestamp>\"\n\t\t\t\t+ endTimestamp + \"<\/endTimestamp>\" + \"<elapsedMs>\"\n\t\t\t\t+ (endTimestamp - startTimestamp) + \"<\/elapsedMs>\"\n\t\t\t\t+ \"<\/timing>\" + \"<\/ingestionPerformance>\");\n\n\t}\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"dacfa6993a5604c8fef3c580e965ac1d52a687b1","subject":"Fix assignment error in AbstractAsyncExecutionAspect","message":"Fix assignment error in AbstractAsyncExecutionAspect\n\nIssue: SPR-8772\n","repos":"spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework","old_file":"org.springframework.aspects\/src\/main\/java\/org\/springframework\/scheduling\/aspectj\/AbstractAsyncExecutionAspect.aj","new_file":"org.springframework.aspects\/src\/main\/java\/org\/springframework\/scheduling\/aspectj\/AbstractAsyncExecutionAspect.aj","new_contents":"\/*\r\n * Copyright 2002-2010 the original author or authors.\r\n *\r\n * Licensed under the Apache License, Version 2.0 (the \"License\");\r\n * you may not use this file except in compliance with the License.\r\n * You may obtain a copy of the License at\r\n *\r\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\r\n *\r\n * Unless required by applicable law or agreed to in writing, software\r\n * distributed under the License is distributed on an \"AS IS\" BASIS,\r\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n * See the License for the specific language governing permissions and\r\n * limitations under the License.\r\n *\/\r\n\r\npackage org.springframework.scheduling.aspectj;\r\n\r\nimport java.util.concurrent.Callable;\r\nimport java.util.concurrent.Executor;\r\nimport java.util.concurrent.Future;\r\n\r\nimport org.aspectj.lang.reflect.MethodSignature;\r\nimport org.springframework.core.task.AsyncTaskExecutor;\r\nimport org.springframework.core.task.SimpleAsyncTaskExecutor;\r\nimport org.springframework.core.task.support.TaskExecutorAdapter;\r\n\r\n\/**\r\n * Abstract aspect that routes selected methods asynchronously.\r\n *\r\n * <p>This aspect needs to be injected with an implementation of \r\n * {@link Executor} to activate it for a specific thread pool.\r\n * Otherwise it will simply delegate all calls synchronously.\r\n *\r\n * @author Ramnivas Laddad\r\n * @author Juergen Hoeller\r\n * @since 3.0.5\r\n *\/\r\npublic abstract aspect AbstractAsyncExecutionAspect {\r\n\r\n\tprivate AsyncTaskExecutor asyncExecutor;\r\n\r\n\tpublic void setExecutor(Executor executor) {\r\n\t\tif (executor instanceof AsyncTaskExecutor) {\r\n\t\t\tthis.asyncExecutor = (AsyncTaskExecutor) executor;\r\n\t\t}\r\n\t\telse {\r\n\t\t\tthis.asyncExecutor = new TaskExecutorAdapter(executor);\r\n\t\t}\r\n\t}\r\n\r\n\tObject around() : asyncMethod() {\r\n                if (this.asyncExecutor == null) {\r\n\t\t\treturn proceed();\r\n                }\r\n\t\tCallable<Object> callable = new Callable<Object>() {\r\n\t\t\tpublic Object call() throws Exception {\r\n\t\t\t\tObject result = proceed();\r\n\t\t\t\tif (result instanceof Future) {\r\n\t\t\t\t\treturn ((Future<?>) result).get();\r\n\t\t\t\t}\r\n\t\t\t\treturn null;\r\n\t\t\t}};\r\n\t\tFuture<?> result = this.asyncExecutor.submit(callable);\r\n\t\tif (Future.class.isAssignableFrom(((MethodSignature) thisJoinPointStaticPart.getSignature()).getReturnType())) {\r\n\t\t\treturn result;\r\n\t\t}\r\n\t\telse {\r\n\t\t\treturn null;\r\n\t\t}\r\n\t}\r\n\r\n\tpublic abstract pointcut asyncMethod();\r\n\r\n}\r\n","old_contents":"\/*\r\n * Copyright 2002-2010 the original author or authors.\r\n *\r\n * Licensed under the Apache License, Version 2.0 (the \"License\");\r\n * you may not use this file except in compliance with the License.\r\n * You may obtain a copy of the License at\r\n *\r\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\r\n *\r\n * Unless required by applicable law or agreed to in writing, software\r\n * distributed under the License is distributed on an \"AS IS\" BASIS,\r\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n * See the License for the specific language governing permissions and\r\n * limitations under the License.\r\n *\/\r\n\r\npackage org.springframework.scheduling.aspectj;\r\n\r\nimport java.util.concurrent.Callable;\r\nimport java.util.concurrent.Executor;\r\nimport java.util.concurrent.Future;\r\n\r\nimport org.aspectj.lang.reflect.MethodSignature;\r\nimport org.springframework.core.task.AsyncTaskExecutor;\r\nimport org.springframework.core.task.SimpleAsyncTaskExecutor;\r\nimport org.springframework.core.task.support.TaskExecutorAdapter;\r\n\r\n\/**\r\n * Abstract aspect that routes selected methods asynchronously.\r\n *\r\n * <p>This aspect needs to be injected with an implementation of \r\n * {@link Executor} to activate it for a specific thread pool.\r\n * Otherwise it will simply delegate all calls synchronously.\r\n *\r\n * @author Ramnivas Laddad\r\n * @author Juergen Hoeller\r\n * @since 3.0.5\r\n *\/\r\npublic abstract aspect AbstractAsyncExecutionAspect {\r\n\r\n\tprivate AsyncTaskExecutor asyncExecutor;\r\n\r\n\tpublic void setExecutor(Executor executor) {\r\n\t\tif (executor instanceof AsyncTaskExecutor) {\r\n\t\t\tthis.asyncExecutor = (AsyncTaskExecutor) executor;\r\n\t\t}\r\n\t\telse {\r\n\t\t\tthis.asyncExecutor = new TaskExecutorAdapter(asyncExecutor);\r\n\t\t}\r\n\t}\r\n\r\n\tObject around() : asyncMethod() {\r\n                if (this.asyncExecutor == null) {\r\n\t\t\treturn proceed();\r\n                }\r\n\t\tCallable<Object> callable = new Callable<Object>() {\r\n\t\t\tpublic Object call() throws Exception {\r\n\t\t\t\tObject result = proceed();\r\n\t\t\t\tif (result instanceof Future) {\r\n\t\t\t\t\treturn ((Future<?>) result).get();\r\n\t\t\t\t}\r\n\t\t\t\treturn null;\r\n\t\t\t}};\r\n\t\tFuture<?> result = this.asyncExecutor.submit(callable);\r\n\t\tif (Future.class.isAssignableFrom(((MethodSignature) thisJoinPointStaticPart.getSignature()).getReturnType())) {\r\n\t\t\treturn result;\r\n\t\t}\r\n\t\telse {\r\n\t\t\treturn null;\r\n\t\t}\r\n\t}\r\n\r\n\tpublic abstract pointcut asyncMethod();\r\n\r\n}\r\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"0f048e14cae9b1d359b784532fa2692dae1dbaf4","subject":"Throttling works","message":"Throttling works\n","repos":"ties\/winstone","old_file":"winstone\/src\/main\/aspectj\/RateLimitingAspect.aj","new_file":"winstone\/src\/main\/aspectj\/RateLimitingAspect.aj","new_contents":"import net.winstone.core.WinstoneConstant;\nimport org.slf4j.LoggerFactory;\n\n\/\/ Java EE servlet API\nimport javax.servlet.Servlet;\nimport javax.servlet.ServletRequest;\nimport javax.servlet.ServletResponse;\nimport javax.servlet.http.HttpServlet;\n\n\/\/ Used to scope pointcuts\nimport net.winstone.core.listener.RequestHandlerThread;\nimport net.winstone.core.ServletConfiguration;\nimport net.winstone.core.SimpleRequestDispatcher;\n\n\n\/\/ Rate Limiter\nimport edu.utwente.aop.tools.RateLimiter;\nimport java.util.concurrent.TimeUnit;\n\n\/\/ exceptions from Servlet.service(..)\nimport java.io.IOException;\nimport javax.servlet.ServletException;\nimport javax.servlet.http.HttpServletResponse;\n\n\/\/ We redirect the call flow to error servlet\nimport net.winstone.servlet.ErrorServlet;\n\n\/**\n * Ensure that the request is allowed by the RateLimiter before continuing..\n *\/\npublic aspect RateLimitingAspect  percflow(processRequest()) {\n    private enum State { UNINITIALIZED, NOTICKET, TICKET, NOTICKET_AVAILABLE };\n\n    public final int RESPONSE_TIME_MS = 1000;\n\n    \/** public because it is implicitly accessed from WebAppConfiguration *\/\n    public State state = State.UNINITIALIZED;\n\n    static org.slf4j.Logger logger = LoggerFactory.getLogger(Servlet.class);\n    \/\/ Allow 5 requests per limit\n    private static RateLimiter limits = new RateLimiter(5, 1, TimeUnit.MINUTES);\n\n    pointcut processRequest(): call(* processRequest(..)) && within(RequestHandlerThread);\n\n    pointcut servletCallService(Servlet servlet, ServletRequest req, ServletResponse resp): call(void Servlet.service(..)) && target(servlet) && args(req, resp);\n\n    pointcut inWinstoneServletConfiguration(): within(ServletConfiguration);\n\n    before(): processRequest() {\n        logger.info(\"Processrequest!\");\n        state = State.NOTICKET;\n    }\n\n    \/\/ TODO: Rewrite to around and call service on different type.\n    \/\/ TODO: Voor cflowbelow\n    before(ServletRequest req, ServletResponse resp) throws ServletException, IOException: inWinstoneServletConfiguration() && call(void Servlet.service(..)) && args(req, resp) {\n        logger.info(this.toString() + req + resp);\n\n        getTicket();\n\n        if (state != State.TICKET) {\n            \/\/ Instantiate new 503-UNAVAILABLE\n            ((HttpServletResponse) resp).sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE, \"Rate limit reached - Throttled\");\n\n            \/\/ TODO: Should not continue the regular call on service.\n        }\n    }\n\n    public void getTicket() {\n        switch (state) {\n            case TICKET:\n                logger.info(\"Re-using ticket\");\n                break;\n            case NOTICKET:\n                logger.info(\"Trying to acquire ticket for \" + this);\n                if (limits.acquire(RESPONSE_TIME_MS)) {\n                    logger.info(\"Acquired ticket\");\n                    state = State.TICKET;\n                } else {\n                    state = State.NOTICKET_AVAILABLE;\n                }\n                break;\n            case NOTICKET_AVAILABLE:\n                logger.info(\"No tickets available\");\n                break;\n            case UNINITIALIZED: \/\/ ensure this does not happen\n                throw new IllegalStateException(\"Should not receive request before init\");\n        }\n    }\n}\n","old_contents":"import edu.utwente.aop.tools.RateLimiter;\nimport net.winstone.core.ServletConfiguration;\nimport net.winstone.core.SimpleRequestDispatcher;\nimport net.winstone.servlet.StaticResourceServlet;\nimport org.aspectj.lang.Aspects;\nimport org.aspectj.lang.Aspects14;\nimport org.slf4j.LoggerFactory;\n\nimport javax.servlet.Servlet;\nimport javax.servlet.ServletRequest;\nimport javax.servlet.ServletResponse;\nimport javax.servlet.http.HttpServlet;\nimport java.util.concurrent.TimeUnit;\n\nimport net.winstone.core.listener.RequestHandlerThread;\n\n\/**\n * Ensure that the request is allowed by the RateLimiter before continuing..\n *\/\npublic aspect RateLimitingAspect  percflow(processRequest()) {\n    private enum State { UNINITIALIZED, NOTICKET, TICKET, NOTICKET_AVAILABLE };\n\n    public final int RESPONSE_TIME_MS = 1000;\n\n    private State state = State.UNINITIALIZED;\n\n    static org.slf4j.Logger logger = LoggerFactory.getLogger(Servlet.class);\n    \/\/ Allow 5 requests per limit\n    private static RateLimiter limits = new RateLimiter(5, 1, TimeUnit.MINUTES);\n\n    pointcut processRequest(): call(* processRequest(..)) && within(RequestHandlerThread);\n\n    pointcut servletCallService(Servlet servlet): call(* Servlet.service(..)) && target(servlet);\n\n    pointcut inWinstoneServletConfiguration(): within(ServletConfiguration);\n\n    pointcut rateLimit(Servlet servlet): servletCallService(servlet) && inWinstoneServletConfiguration();\n\n    before(): processRequest() {\n        logger.info(\"Processrequest!\");\n        state = State.NOTICKET;\n    }\n\n     \/\/ TODO: Rewrite to around and call service on different type.\n    \/\/ TODO: Voor cflowbelow\n    before(Servlet servlet): rateLimit(servlet) {\n        logger.info(this.toString());\n\n        switch (state) {\n            case TICKET:\n                logger.info(\"Re-using ticket\");\n                break;\n            case NOTICKET:\n                logger.info(\"Trying to acquire ticket for \" + servlet);\n                if (limits.acquire(RESPONSE_TIME_MS)) {\n                    logger.info(\"Acquired ticket\");\n                    state = State.TICKET;\n                } else {\n                    state = State.NOTICKET_AVAILABLE;\n                }\n                break;\n            case NOTICKET_AVAILABLE:\n                logger.info(\"No tickets available\");\n                break;\n            case UNINITIALIZED: \/\/ ensure this does not happen\n                throw new IllegalStateException(\"Should not receive request before init\");\n        }\n    }\n}\n","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"df24174dcb618abad572fffb4af2f767485ed2e7","subject":"comments for ImportDealer","message":"comments for ImportDealer\n","repos":"stieglma\/Schafkopfauswerter","old_file":"src\/ImportDealer.aj","new_file":"src\/ImportDealer.aj","new_contents":"import view.GUI;\n\n\npublic privileged aspect ImportDealer {\n    declare precedence : ImportDealer, Import;\n\n    private GUI gui;\n\n    \/**\n     * catch constructor call, so that we have the correct gui, to refer to everywhere\n     *\/\n    after() returning(GUI gui): call(GUI.new(*)) {\n        this.gui = gui;\n    }\n\n    \/** reset the dealer index to the appropriate value after importing *\/\n    after() : execution(* LoadFileListener.actionPerformed(*)) {\n        Dealer.dealerIndex = (gui.model.gameDB.size()-1) % 4;\n        Dealer.updateShownDealer();\n    }\n}","old_contents":"import view.GUI;\n\n\npublic privileged aspect ImportDealer {\n    declare precedence : ImportDealer, Import;\n\n    private GUI gui;\n\n    \/**\n     * catch constructor call, so that we have the correct gui, to refer to everywhere\n     *\/\n    after() returning(GUI gui): call(GUI.new(*)) {\n        this.gui = gui;\n    }\n\n    after() : execution(* LoadFileListener.actionPerformed(*)) {\n        Dealer.dealerIndex = (gui.model.gameDB.size()-1) % 4;\n        Dealer.updateShownDealer();\n    }\n}","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"3f2e27f24f1d78338158595b6c7a0aeee56b6e61","subject":"Fix Javadoc formatting in AnnotationBeanConfigurerAspect","message":"Fix Javadoc formatting in AnnotationBeanConfigurerAspect\n","repos":"spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework","old_file":"spring-aspects\/src\/main\/java\/org\/springframework\/beans\/factory\/aspectj\/AnnotationBeanConfigurerAspect.aj","new_file":"spring-aspects\/src\/main\/java\/org\/springframework\/beans\/factory\/aspectj\/AnnotationBeanConfigurerAspect.aj","new_contents":"\/*\n * Copyright 2002-2017 the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.springframework.beans.factory.aspectj;\n\nimport java.io.Serializable;\n\nimport org.aspectj.lang.annotation.control.CodeGenerationHint;\n\nimport org.springframework.beans.factory.BeanFactory;\nimport org.springframework.beans.factory.BeanFactoryAware;\nimport org.springframework.beans.factory.DisposableBean;\nimport org.springframework.beans.factory.InitializingBean;\nimport org.springframework.beans.factory.annotation.AnnotationBeanWiringInfoResolver;\nimport org.springframework.beans.factory.annotation.Configurable;\nimport org.springframework.beans.factory.wiring.BeanConfigurerSupport;\n\n\/**\n * Concrete aspect that uses the {@link Configurable} annotation to identify\n * which classes need autowiring.\n *\n * <p>The bean name to look up will be taken from the {@code @Configurable}\n * annotation if specified; otherwise, the default bean name to look up will be\n * the fully qualified name of the class being configured.\n *\n * @author Rod Johnson\n * @author Ramnivas Laddad\n * @author Juergen Hoeller\n * @author Adrian Colyer\n * @since 2.0\n * @see org.springframework.beans.factory.annotation.Configurable\n * @see org.springframework.beans.factory.annotation.AnnotationBeanWiringInfoResolver\n *\/\npublic aspect AnnotationBeanConfigurerAspect extends AbstractInterfaceDrivenDependencyInjectionAspect\n\t\timplements BeanFactoryAware, InitializingBean, DisposableBean {\n\n\tprivate BeanConfigurerSupport beanConfigurerSupport = new BeanConfigurerSupport();\n\n\n\tpublic void setBeanFactory(BeanFactory beanFactory) {\n\t\tthis.beanConfigurerSupport.setBeanWiringInfoResolver(new AnnotationBeanWiringInfoResolver());\n\t\tthis.beanConfigurerSupport.setBeanFactory(beanFactory);\n\t}\n\n\tpublic void afterPropertiesSet() {\n\t\tthis.beanConfigurerSupport.afterPropertiesSet();\n\t}\n\n\tpublic void configureBean(Object bean) {\n\t\tthis.beanConfigurerSupport.configureBean(bean);\n\t}\n\n\tpublic void destroy() {\n\t\tthis.beanConfigurerSupport.destroy();\n\t}\n\n\n\tpublic pointcut inConfigurableBean() : @this(Configurable);\n\n\tpublic pointcut preConstructionConfiguration() : preConstructionConfigurationSupport(*);\n\n\t\/*\n\t * An intermediary to match preConstructionConfiguration signature (that doesn't expose the annotation object)\n\t *\/\n\t@CodeGenerationHint(ifNameSuffix=\"bb0\")\n\tprivate pointcut preConstructionConfigurationSupport(Configurable c) : @this(c) && if (c.preConstruction());\n\n\n\tdeclare parents: @Configurable * implements ConfigurableObject;\n\n\t\/*\n\t * This declaration shouldn't be needed,\n\t * except for an AspectJ bug (https:\/\/bugs.eclipse.org\/bugs\/show_bug.cgi?id=214559)\n\t *\/\n\tdeclare parents: @Configurable Serializable+ implements ConfigurableDeserializationSupport;\n\n}\n","old_contents":"\/*\n * Copyright 2002-2014 the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.springframework.beans.factory.aspectj;\n\nimport java.io.Serializable;\n\nimport org.aspectj.lang.annotation.control.CodeGenerationHint;\n\nimport org.springframework.beans.factory.BeanFactory;\nimport org.springframework.beans.factory.BeanFactoryAware;\nimport org.springframework.beans.factory.DisposableBean;\nimport org.springframework.beans.factory.InitializingBean;\nimport org.springframework.beans.factory.annotation.AnnotationBeanWiringInfoResolver;\nimport org.springframework.beans.factory.annotation.Configurable;\nimport org.springframework.beans.factory.wiring.BeanConfigurerSupport;\n\n\/**\n * Concrete aspect that uses the {@link Configurable} annotation to identify\n * which classes need autowiring.\n *\n * <p>The bean name to look up will be taken from the {@code &#64;Configurable}\n * annotation if specified, otherwise the default bean name to look up will be\n * the fully qualified name of the class being configured.\n *\n * @author Rod Johnson\n * @author Ramnivas Laddad\n * @author Juergen Hoeller\n * @author Adrian Colyer\n * @since 2.0\n * @see org.springframework.beans.factory.annotation.Configurable\n * @see org.springframework.beans.factory.annotation.AnnotationBeanWiringInfoResolver\n *\/\npublic aspect AnnotationBeanConfigurerAspect extends AbstractInterfaceDrivenDependencyInjectionAspect\n\t\timplements BeanFactoryAware, InitializingBean, DisposableBean {\n\n\tprivate BeanConfigurerSupport beanConfigurerSupport = new BeanConfigurerSupport();\n\n\n\tpublic void setBeanFactory(BeanFactory beanFactory) {\n\t\tthis.beanConfigurerSupport.setBeanWiringInfoResolver(new AnnotationBeanWiringInfoResolver());\n\t\tthis.beanConfigurerSupport.setBeanFactory(beanFactory);\n\t}\n\n\tpublic void afterPropertiesSet() {\n\t\tthis.beanConfigurerSupport.afterPropertiesSet();\n\t}\n\n\tpublic void configureBean(Object bean) {\n\t\tthis.beanConfigurerSupport.configureBean(bean);\n\t}\n\n\tpublic void destroy() {\n\t\tthis.beanConfigurerSupport.destroy();\n\t}\n\n\n\tpublic pointcut inConfigurableBean() : @this(Configurable);\n\n\tpublic pointcut preConstructionConfiguration() : preConstructionConfigurationSupport(*);\n\n\t\/*\n\t * An intermediary to match preConstructionConfiguration signature (that doesn't expose the annotation object)\n\t *\/\n\t@CodeGenerationHint(ifNameSuffix=\"bb0\")\n\tprivate pointcut preConstructionConfigurationSupport(Configurable c) : @this(c) && if (c.preConstruction());\n\n\n\tdeclare parents: @Configurable * implements ConfigurableObject;\n\n\t\/*\n\t * This declaration shouldn't be needed,\n\t * except for an AspectJ bug (https:\/\/bugs.eclipse.org\/bugs\/show_bug.cgi?id=214559)\n\t *\/\n\tdeclare parents: @Configurable Serializable+ implements ConfigurableDeserializationSupport;\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"082651bc666ef00cd5a9fb2b11ab018b74d73c69","subject":"What even is life?","message":"What even is life?\n","repos":"majorpayne327\/JavaAOP-Sandbox","old_file":"src\/main\/java\/flow\/FlowAspect.aj","new_file":"src\/main\/java\/flow\/FlowAspect.aj","new_contents":"package flow;\n\n\/**\n * Created by Chris on 5\/3\/2015.\n *\/\npublic aspect FlowAspect {\n\n    int methodCount = 0;\n\n    public pointcut flow() : cflow(call( * FlowA.methodA() ) ) && !within(FlowAspect);\n    public pointcut method() : call(* Flow*.method*());\n\n\n    before() : flow() {\n        \/\/System.out.println( thisJoinPoint );\n    }\n\n    before() : method(){\n        methodCount++;\n    }\n\n    after() returning: call(void FlowC.methodC()){\n        System.out.println(methodCount);\n    }\n}\n","old_contents":"package flow;\n\n\/**\n * Created by Chris on 5\/3\/2015.\n *\/\npublic aspect FlowAspect {\n\n    public pointcut flow() : cflow(call( * FlowA.methodA() ) ) && !within(FlowAspect);\n\n    before() : flow() {\n        System.out.println( thisJoinPoint );\n    }\n}\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"59b047ec76bdff771b95d1dce9a73e89268fbf10","subject":"attempt to change injection of aspects","message":"attempt to change injection of aspects\n","repos":"palava\/palava-scope","old_file":"src\/main\/java\/de\/cosmocode\/palava\/scope\/UnitOfWorkScopeAspect.aj","new_file":"src\/main\/java\/de\/cosmocode\/palava\/scope\/UnitOfWorkScopeAspect.aj","new_contents":"\/**\n * palava - a java-php-bridge\n * Copyright (C) 2007-2010  CosmoCode GmbH\n *\n * This program is free software; you can redistribute it and\/or\n * modify it under the terms of the GNU General Public License\n * as published by the Free Software Foundation; either version 2\n * of the License, or (at your option) any later version.\n *\n * This program is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n * along with this program; if not, write to the Free Software\n * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n * MA  02110-1301, USA.\n *\/\n\npackage de.cosmocode.palava.scope;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\n\nfinal aspect UnitOfWorkScopeAspect extends AbstractPalavaAspect issingleton() {\n\n    private UnitOfWorkScope scope;\n    \n    @Inject\n    void setUnitOfWorkScope(UnitOfWorkScope scope) {\n        this.scope = Preconditions.checkNotNull(scope, \"Scope\");\n    }\n    \n    pointcut unitOfWork(): execution(@UnitOfWork * *.*(..));\n    \n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): unitOfWork() {\n        if (scope.inProgress()) return proceed();\n        scope.begin();\n        try {\n            return proceed();\n        } finally {\n            scope.end();\n        }\n    }\n    \n}\n","old_contents":"\/**\n * palava - a java-php-bridge\n * Copyright (C) 2007-2010  CosmoCode GmbH\n *\n * This program is free software; you can redistribute it and\/or\n * modify it under the terms of the GNU General Public License\n * as published by the Free Software Foundation; either version 2\n * of the License, or (at your option) any later version.\n *\n * This program is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n * along with this program; if not, write to the Free Software\n * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n * MA  02110-1301, USA.\n *\/\n\npackage de.cosmocode.palava.scope;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\n\npublic final aspect UnitOfWorkScopeAspect extends AbstractPalavaAspect issingleton() {\n\n    private UnitOfWorkScope scope;\n    \n    @Inject\n    void setUnitOfWorkScope(UnitOfWorkScope scope) {\n        this.scope = Preconditions.checkNotNull(scope, \"Scope\");\n    }\n    \n    pointcut unitOfWork(): execution(@UnitOfWork * *.*(..));\n    \n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): unitOfWork() {\n        if (scope.inProgress()) return proceed();\n        scope.begin();\n        try {\n            return proceed();\n        } finally {\n            scope.end();\n        }\n    }\n    \n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"a0daaefb981c10a832c32677901f5675fa24e321","subject":"Fixed error on reduce phases + other minor fixes","message":"Fixed error on reduce phases + other minor fixes\n","repos":"Aloja\/AOP4Hadoop","old_file":"src\/1.0.3\/Aspectj.aj","new_file":"src\/1.0.3\/Aspectj.aj","new_contents":"import java.io.*;\nimport java.util.*;\nimport java.lang.management.ManagementFactory;\nimport java.sql.Timestamp;\nimport java.text.SimpleDateFormat;\nimport java.net.InetAddress;\nimport java.lang.ClassLoader;\nimport org.apache.hadoop.io.DataInputBuffer;\nimport org.apache.hadoop.mapred.TaskStatus;\nimport org.apache.hadoop.fs.permission.FsPermission;\nimport org.apache.hadoop.util.Progressable;\nimport org.apache.hadoop.hdfs.protocol.DatanodeInfo;\nimport org.apache.hadoop.util.DataChecksum;\nimport java.net.Socket;\n\n\nimport org.apache.hadoop.security.token.Token;\nimport org.apache.hadoop.security.token.TokenIdentifier;\nimport org.apache.hadoop.hdfs.security.token.block.BlockTokenIdentifier;\n\n\nimport org.apache.hadoop.fs.FSDataInputStream;\nimport org.apache.hadoop.hdfs.DFSClient;\n\nimport org.apache.hadoop.mapred.TaskTrackerStatus;\n\nimport org.apache.commons.logging.Log;\nimport org.apache.commons.logging.LogFactory;\n\n\nimport org.apache.hadoop.conf.Configuration;\n\n\n\n\n\n\n\/**\n *\n * @author Alejandro\n *\/\n\naspect AlojaAspect {\t\t\n\n\tprivate static final Log LOG = LogFactory.getLog(AlojaAspect.class);\n\n\t\/*\n\tTYPES\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\n    public static class Events {\n\n        public static final int JobTracker = 11111;\n        public static final int TaskTracker = 11112;\n        public static final int NameNode = 11113;\n        public static final int SecondaryNameNode = 11114;\n        public static final int DataNode = 11115;\n        public static final int Task = 11116;\n        public static final int HeartBeat = 11119;\n        public static final int MapOutputBuffer = 33333;\n        public static final int MapTaskOutputSize = 44444;\n    }\n\n    public static class Values {\n\n       \t\/\/ Generic\n\t\tpublic static final int End = 0;        \n        public static final int Start = 1;\n        \n        \/\/ Events.TaskTracker \n\t\tpublic static final int RunMapper = 8;\n        public static final int RunReducer = 9;\n        public static final int ReducerCopyPhase = 10;\n        public static final int ReducerSortPhase = 11;\n        public static final int ReducerReducePhase = 12;\n\n\t\t\/\/ Events.MapOutputBuffer\n        public static final int Flush = 1;\n        public static final int SortAndSpill = 2;\n        public static final int Sort = 3;        \n        public static final int CreateSpillIndexFile = 5;\n        \/\/public static final int TotalIndexCacheMemory = 6;\n        public static final int SpillRecordDumped = 7;\n        public static final int Combine = 4;\n    }    \n\n\n\t\/*\n\tFUNCTIONS\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\t\n\tprivate static long getPID() {\n\t\tString name = java.lang.management.ManagementFactory.getRuntimeMXBean().getName();\n\t\treturn Long.parseLong(name.split(\"@\")[0]);\n\t}\n\n\tprivate void generateEvent(Integer key, Integer value) {\n\t\t\/\/2:cpu:app:task:thread:time:type:value\n\t\ttry{\n\t\t\tString hostname = InetAddress.getLocalHost().getHostName();\n\t\t\tlong pid = getPID();\n\t\t\t\/\/LOG.info(hostname+\",\"+pid+\",2:\"+hostname+\":2:\"+pid+\":1:\"+System.currentTimeMillis()+\":\"+key+\":\"+value);\n\t\t\tLOG.info(\"AOPLOG,\"+hostname+\",\"+pid+\",\"+System.currentTimeMillis()+\",\"+key+\",\"+value);\n\t\t}\n\t\tcatch (Exception e) {\n\t\t\tLOG.error(e, e);\n\n\t\t}\n\t}\n\n\n\tprivate void generateEvent(Integer key, String value) {\n\t\t\/\/2:cpu:app:task:thread:time:type:value\n\t\ttry{\n\t\t\tString hostname = InetAddress.getLocalHost().getHostName();\n\t\t\tlong pid = getPID();\n\t\t\t\/\/LOG.info(hostname+\",\"+pid+\",2:\"+hostname+\":2:\"+pid+\":1:\"+System.currentTimeMillis()+\":\"+key+\":\"+value);\n\t\t\tLOG.info(\"AOPLOG,\"+hostname+\",\"+pid+\",\"+System.currentTimeMillis()+\",\"+key+\",\"+value);\n\t\t}\n\t\tcatch (Exception e) {\n\t\t\tLOG.error(e, e);\n\n\t\t}\n\t}\n\n\/*\tprivate void writeLog(Integer key, Integer value) {\n\n\t\ttry {\n\t\t\tString hostname = InetAddress.getLocalHost().getHostName();\n\t\t\tlong pid = getPID();\n\t\t\tBufferedWriter bw = new BufferedWriter(new FileWriter(new File(\"\/tmp\/aloja-\"+getPID()+\".log\"),true));\n\t\t\tbw.write(\"AOPLOG,\"+hostname+\",\"+pid+\",\"+System.currentTimeMillis()+\",\"+key+\",\"+value);\n\t\t\tbw.close();\n\t\t}\n\t\tcatch (IOException e) {\n\t\t\te.printStackTrace();\n\t\t}\n\t}\n\n\n\tprivate void writeLog(Integer key, String value) {\n\n\t\ttry {\n\t\t\tString hostname = InetAddress.getLocalHost().getHostName();\n\t\t\tlong pid = getPID();\n\t\t\tBufferedWriter bw = new BufferedWriter(new FileWriter(new File(\"\/tmp\/aloja-\"+getPID()+\".log\"),true));\n\t\t\tbw.write(\"AOPLOG,\"+hostname+\",\"+pid+\",\"+System.currentTimeMillis()+\",\"+key+\",\"+value);\n\t\t\tbw.close();\n\t\t}\n\t\tcatch (IOException e) {\n\t\t\te.printStackTrace();\n\t\t}\n\t}*\/\n\n\n\t\/*private void generateEVent(Integer key[], Integer value) {\n\n\t\tStringBuffer output = new StringBuffer();\n\n\n\t\toutput.append()\n\n\t}*\/\n\n\tprivate void instrumentation(String event, String when) {\n\n\t\tinstrumentation(event, when, \"\");\n\n\t}\n\tprivate void instrumentation(String event, String when, String additional) {\n\t\ttry {\n\t\t\t\/\/Add hostname\n\t\t\tString log = InetAddress.getLocalHost().getHostName();\n\t\t\t\/\/Add PID \n\t\t\tlog += \",\" + getPID();\n\t\t\t\/\/Specify event\n\t\t\tlog += \",\" + when + \",\" + event;\n\t\t\t\/\/Specify event\n\t\t\tlog += additional;\n\t\t\t\/\/LOG.info(log);\n\t\t\t\/\/writeLog(logFile,log);\n\n\n\t\t}\n\t\tcatch (IOException e) {\n\t\t\te.printStackTrace();\n\t\t}\n\t}\n\n\n\t\/*\n\tPOINTCUTS\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\n\t\/\/RegisterDataNode Pointcut\n\n\tpointcut startDataNode(): execution(* org.apache.hadoop.hdfs.server.datanode.DataNode.startDataNode(..));\n\n\n\t\/\/RegisterTaskTracker Pointcut\n\n\tpointcut registerTaskTracker(): execution(* org.apache.hadoop.mapred.TaskTracker.initialize(..));\n\n\n\t\/\/RegisterNameNode Pointcut\n\n\tpointcut initializeNameNode():  execution(* org.apache.hadoop.hdfs.server.namenode.NameNode.initialize(..));\n\n\t\/\/RegisterSecondaryNamenode Pointcut\n\n\tpointcut initializeSecondaryNameNode(): execution(* org.apache.hadoop.hdfs.server.namenode.SecondaryNameNode.initialize(..));\n\n\t\/\/RegisterTask - CHILD\n\n\t\/\/pointcut initializeChild(): call(* org.apache.hadoop.mapred.Child.initMetrics(..)) && withincode(* org.apache.hadoop.mapred.Child.main(..)); \n\n\tpointcut initializeChild(): execution(* org.apache.hadoop.mapred.Child.main(..)); \n\n\t\/\/Register JobTracker Pointcut\n\n\tpointcut registerJobTracker(): execution(* org.apache.hadoop.mapred.JobTracker.startTracker(..));\n\n\t\/\/HEARTBEAT\n\n\tpointcut heartbeat(TaskTrackerStatus status,boolean restarted,boolean initialContact,boolean acceptNewTasks,short responseId): execution(* org.apache.hadoop.mapred.JobTracker.heartbeat(..)) && args(status, restarted, initialContact, acceptNewTasks,responseId);\n\n\t\/*\n\t\t###########################################################################\n\t\t############################Task###########################################\n\t\t###########################################################################\n\t*\/\n\n\n\tpointcut outputSize(): call (* *.getLen(..)) && withincode(* org.apache.hadoop.mapred.Task.calculateOutputSize());\n\n\t\/*\n\t\t###########################################################################\n\t\t############################MAPPER#########################################\n\t\t###########################################################################\n\t*\/\n\n\t\/\/pointcut maptask(): execution(* org.apache.hadoop.mapred.MapTask.run(..));\n\tpointcut mapper(): call(* org.apache.hadoop.mapred.MapTask.runNewMapper(..)) && withincode(* org.apache.hadoop.mapred.MapTask.run(..));\n\n\n\t\/\/  ############################SORT AND SPILL#################################\n\n\t\/\/Start-End\n\tpointcut taskSortAndSpill(): execution(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\n\tpointcut flush(): execution(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.flush());\n\n\t\/\/Spill File Size\n\tpointcut sortAndSpillSpillFile(int numSpills, long size) : call (* *.getSpillFileForWrite(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(numSpills, size);\n\n\t\/\/SpillIndex File Size\n\tpointcut sortAndSpillSpillIndexFile(int numSpills, long partitions) : call (* *.getSpillIndexFileForWrite(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(numSpills, partitions);\n\n\t\/\/Sort \n\tpointcut sortAndSpillSort(int kvstart, int endPosition, Object reporter): call(* *.sort(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(..,kvstart,endPosition,reporter);\n\n\t\/\/Init Writer\n\t\/\/pointcut sortAndSpillInitWriter() : call (org.apache.hadoop.mapred.IFile.Writer.new(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Close Writer\n\t\/\/pointcut sortAndSpillCloseWriter() : call (void org.apache.hadoop.mapred.IFile.Writer.close(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Write key-value\n\tpointcut sortAndSpillWrite(DataInputBuffer key, DataInputBuffer value): call (* *.append(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(key,value);\n\t\n\t\/\/Combiner\n\tpointcut sortAndSpillCombiner(): call(* *.combine(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Spill Index File\n\tpointcut sortAndSpillSpillIndexWrite(): call(* *.writeToFile(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/*\n\t\t###########################################################################\n\t\t############################REDUCER########################################\n\t\t###########################################################################\n\t*\/\n\n\t\/\/REDUCETASK RUN\n\tpointcut reducer(): execution(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\tpointcut initCodec(): call(* *.initCodec(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\tpointcut setPhase(TaskStatus.Phase phase): call(* *.setPhase(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..)) && args(phase);\n\n\t\n\t\/\/pointcut endCopy(): call(* *.setPhase(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\t\/\/pointcut endSort(): call(* *.getMapOutputKeyClass(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\t\n\n\t\/*\n\t\t###########################################################################\n\t\t############################NETWORK########################################\n\t\t###########################################################################\n\t*\/\n\n\tpointcut defaultBlockSize(): call(* org.apache.hadoop.hdfs.DFSClient.getDefaultBlockSize());\n\t\/\/pointcut blockSize(): call(* org.apache.hadoop.hdfs.DFSClient.getBlockSize(..));\n\tpointcut createDFSFile(String src,FsPermission permission,boolean overwrite,boolean createParent,short replication,long blockSize,Progressable progress, int buffersize): execution (* org.apache.hadoop.hdfs.DFSClient.create(..)) && args(src,permission,overwrite,createParent,replication,blockSize,progress,buffersize);\n\tpointcut runDataStreamer(): execution (* org.apache.hadoop.hdfs.DFSClient.DFSOutputStream.DataStreamer.run());\n\t\/\/pointcut readEntireBufferFromDataNode(byte buf[],int off,int len): execution(* org.apache.hadoop.hdfs.DFSClient.DFSInputStream.read(..)) && args(buf[],off,len);\n\t\/\/pointcut readFromDataNode(): call (* org.apache.hadoop.hdfs.DFSClient.DFSInputStream.blockSeekTo(..)) && withincode(* org.apache.hadoop.hdfs.DFSClient.DFSInputStream.read(..));\n\tpointcut newBlockReader(Socket sock, String file, long blockId, Token<BlockTokenIdentifier> accessToken, long genStamp, long startOffset, long len, int bufferSize, boolean verifyChecksum, String clientName): execution (* org.apache.hadoop.hdfs.DFSClient.BlockReader.newBlockReader(..)) && args(sock,file,blockId,accessToken,genStamp,startOffset,len,bufferSize,verifyChecksum,clientName);\n\n\t\/*\n\tAdvices\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\n\t\/\/ RegiterJobTracker\n\n\tafter() : registerJobTracker(){\n\t\tgenerateEvent(Events.JobTracker, Values.Start);\n\n\t}\n\n\t\/\/RegisterTaskTracker \n\tafter() : registerTaskTracker(){\n\t\tgenerateEvent(Events.TaskTracker, Values.Start);\n\n\t}\n\n\t\/\/RegisterNameNode\n\n\tafter() : initializeNameNode(){\n\t\tgenerateEvent(Events.NameNode, Values.Start);\n\t}\n\n\t\/\/RegisterDataNode \n\n\tafter() : startDataNode(){\n\t\tgenerateEvent(Events.DataNode, Values.Start);\n\t}\n\n\n\t\/\/RegisterSecondaryNamenode\n\n\tafter() : initializeSecondaryNameNode(){\n\t\tgenerateEvent(Events.SecondaryNameNode, Values.Start);\n\t}\n\n\n\t\/\/HEARTBEAT \n\tafter(TaskTrackerStatus status,boolean restarted,boolean initialContact,boolean acceptNewTasks,short responseId) : heartbeat(status, restarted, initialContact, acceptNewTasks,responseId){\n\t\t\/\/ SAMPLE trackername: tracker_vagrant-99-01:localhost\/127.0.0.1:38149\n\t\tgenerateEvent(Events.HeartBeat, status.getTrackerName().replace(':','-').replace('\/','_'));\n\t}\n\n\n\t\/*\n\t\t###########################################################################\n\t\t############################Task###########################################\n\t\t###########################################################################\n\t*\/\n\n\t\/\/RegisterTask CHILD \n\tafter() : initializeChild() { \/\/We need the  PID of this task to be registered\n\t\tgenerateEvent(Events.Task, Values.Start);\n\t}\n\n\n\/*\tafter() returning(long size) : outputSize() {\n\t\tString s = \"Task-outputSize\";\n\t\tinstrumentation(s,\"after\",\", size: \" + Long.toString(size));\n\t}\n\n\t\/*\n\t\t###########################################################################\n\t\t############################Mapper#########################################\n\t\t###########################################################################\n\t*\/\n\n\n\t\/*before() : maptask(){\n\t\tgenerateEvent(Events.MapTask, Values.Start);\n\t}*\/\n\n\tbefore() : mapper(){\n\t\tgenerateEvent(Events.TaskTracker, Values.RunMapper);\n\t}\n\n\tafter() : mapper(){\n\t\tgenerateEvent(Events.TaskTracker, Values.End);\n\t}\n\n\n\t\n\n\t\/\/  ############################SORT AND SPILL#################################\n\n\tbefore() : taskSortAndSpill(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.SortAndSpill);\n\t}\n\n\n\tafter() : taskSortAndSpill(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\n\t}\n\n\t\/\/flush\n\n\tbefore() : flush(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.Flush);\n\t}\n\n\tafter() : flush(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\n\t}\n\n\n\n\t\/\/ Spill File Size\n\n\tafter(int numSpills, long size) returning : sortAndSpillSpillFile(numSpills, size){\n\t\tString s = \"sortAndSpillSpillFile\";\n\t\tinstrumentation(s,\"after\",\", numSpills: \" +Integer.toString(numSpills) + \";size: \" + Long.toString((size*numSpills) + size));\n\t}\n\n\t\/\/ SpillIndex File Size\n\n\tafter(int numSpills, long partitions) returning : sortAndSpillSpillIndexFile(numSpills, partitions){\n\t\tString s = \"sortAndSpillSpillIndexFile\";\n\t\tinstrumentation(s,\"after\",\",\" + Long.toString(numSpills * partitions));\n\t}\n\n\/*\n\tbefore(int length) : kvbufferState(length){\n\n\t\tString s = \"kvbufferState\";\n\t\tFile logFile = getFile();\n\t\tinstrumentation(logFile,s,\"before\");\n\t\twriteLog(logFile,Integer.toString(length));\n\t}\n\n*\/\n\n\tbefore(int kvstart, int endPosition, Object reporter) : sortAndSpillSort(kvstart,endPosition,reporter){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.Sort);\n\t\t\/\/instrumentation(s,\"before\",\",\" + Integer.toString(endPosition - kvstart));\n\t}\n\tafter(int kvstart, int endPosition, Object reporter) returning : sortAndSpillSort(kvstart,endPosition,reporter){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\n\t\t\/\/instrumentation(s,\"after\",\",\" + Integer.toString(endPosition - kvstart));\n\t}\n\n\t\/\/ Init writer\n\/*\tafter() returning : sortAndSpillInitWriter(){\n\t\tString s = \"sortAndSpillInitWriter\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\t\/\/ Close writer\n\tafter() returning : sortAndSpillCloseWriter(){\n\t\tString s = \"sortAndSpillCloseWriter\";\n\t\tinstrumentation(s,\"after\");\n\t}\n*\/\n\n\tafter(DataInputBuffer key, DataInputBuffer value) returning : sortAndSpillWrite(key,value){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.SpillRecordDumped);\n\t}\n\n\tbefore() : sortAndSpillCombiner(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.Combine);\n\t}\n\n\tafter() returning : sortAndSpillCombiner(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\t\n\t}\n\n\tbefore() : sortAndSpillSpillIndexWrite(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.CreateSpillIndexFile);\n\t}\n\n\tafter() returning : sortAndSpillSpillIndexWrite(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\n\t}\n\n\t\/*\n\t\t###########################################################################\n\t\t############################REDUCER########################################\n\t\t###########################################################################\n\t*\/\n\n\/*\tbefore() : reducer(){\n\t\tString s = \"Reducer\";\n\t\tinstrumentation(s,\"before\");\n\t}\n*\/\n\n\tbefore() : initCodec() {\n\t\tgenerateEvent(Events.TaskTracker, Values.RunReducer);\n\t}\n\n\n\tafter() returning : initCodec() {\n\t\tgenerateEvent(Events.TaskTracker, Values.ReducerCopyPhase);\n\t}\n\n\tbefore(TaskStatus.Phase phase) : setPhase(phase) { \/\/END OF A PHASE (SORT OR COPY)\n\t\tgenerateEvent(Events.TaskTracker, Values.End);\n\t\tif (phase == TaskStatus.Phase.SORT) {\n\t\t\tgenerateEvent(Events.TaskTracker, Values.ReducerSortPhase);\n\t\t}\n\t\telse if (phase == TaskStatus.Phase.REDUCE) {\n\t\t\tgenerateEvent(Events.TaskTracker, Values.ReducerReducePhase);\n\t\t}\n\t}\n\n\t\/\/after(TaskStatus.Phase phase) returning: setPhase(phase) { \n\t\t\n\t\/\/}\n\n\tafter() : reducer(){ \/\/END OF REDUCE PHASE\n\t\t\tgenerateEvent(Events.TaskTracker, Values.End);\t}\n\n\t\/*\n\t\t###########################################################################\n\t\t############################NETWORK########################################\n\t\t###########################################################################\n\t*\/\n\n\tafter() returning(long blockSize) : defaultBlockSize() {\n\t\tString s = \"Network-defaultBlockSize\";\n\t\tinstrumentation(s,\"after\",\", size: \" + Long.toString(blockSize));\n\t}\n\t\/\/ after() returning(long blockSize) : blockSize() {\n\t\/\/ \tString s = \"Network-blockSize\";\n\t\/\/ \tFile logFile = getFile();\n\t\/\/ \tinstrumentation(logFile,s,\"after\");\n\t\/\/ \tString log = \", size: \" + Long.toString(blockSize);\n\t\/\/ \twriteLog(logFile,log);\n\t\/\/ }\n\n\tafter(String src,FsPermission permission,boolean overwrite, boolean createParent,short replication,long blockSize,Progressable progress, int buffersize): createDFSFile(src,permission,overwrite,createParent,replication,blockSize,progress,buffersize) {\n\t\tString s = \"Network-CreateDFSFile\";\n\n\t\t\/\/MODIFIED!!!!!!-----!!!!!!!!!!!\n\t\tinstrumentation(s,\"after\",\", path: \" + src + \";permission: \" + permission.toString() + \";overwrite: \" + String.valueOf(overwrite) + \";createParent: \" + String.valueOf(createParent) + \";replication: \" + Short.toString(replication) + \";blockSize: \" + Long.toString(blockSize) + \";buffersize: \" + Integer.toString(buffersize));\n\t}\n\tbefore(): runDataStreamer() {\n\t\tString s = \"DataStreamer\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\t\/\/ before(byte buf[],int off, int len) : readEntireBufferFromDataNode(buf[],off,len){\n\t\/\/ \tString s = \"Network-ReadEntireBuffer\";\n\t\/\/ \tinstrumentation(s,\"after\",\", bufferLength: \" + Integer.toString(len));\n\t\/\/ }\n\n\t\/\/ after() returning(DatanodeInfo datanode) : readFromDataNode(){\n\t\/\/ \tString s = \"Network-fromDataNode\";\n\t\/\/ \tinstrumentation(s,\"after\", \", from : \" + datanode.getHostName());\n\t\/\/ }\n\n\tafter(Socket sock, String file, long blockId, Token<BlockTokenIdentifier> accessToken, long genStamp, long startOffset, long len, int bufferSize, boolean verifyChecksum, String clientName) : newBlockReader(sock,file,blockId,accessToken,genStamp,startOffset,len,bufferSize,verifyChecksum,clientName) {\n\t\tString s = \"Network-NewBlockReader\";\n\t\tString extra = \", DataNode: \" + sock.getInetAddress().getCanonicalHostName();\n\t\textra += \";file: \" + file;\n\t\t\/\/extra += \", length: \" + Long.toString(len) + \"B\";\n\t\textra += \";\" + Long.toString(len);\n\t\textra += \";blockId: \" + Long.toString(blockId);\n\t\textra += \";startOffset: \" + Long.toString(startOffset);\t\t\n\t\tinstrumentation(s,\"after\",extra);\n\t}\n}\n\n\n\n\n","old_contents":"import java.io.*;\nimport java.util.*;\nimport java.lang.management.ManagementFactory;\nimport java.sql.Timestamp;\nimport java.text.SimpleDateFormat;\nimport java.net.InetAddress;\nimport java.lang.ClassLoader;\nimport org.apache.hadoop.io.DataInputBuffer;\nimport org.apache.hadoop.mapred.TaskStatus;\nimport org.apache.hadoop.fs.permission.FsPermission;\nimport org.apache.hadoop.util.Progressable;\nimport org.apache.hadoop.hdfs.protocol.DatanodeInfo;\nimport org.apache.hadoop.util.DataChecksum;\nimport java.net.Socket;\n\n\nimport org.apache.hadoop.security.token.Token;\nimport org.apache.hadoop.security.token.TokenIdentifier;\nimport org.apache.hadoop.hdfs.security.token.block.BlockTokenIdentifier;\n\n\nimport org.apache.hadoop.fs.FSDataInputStream;\nimport org.apache.hadoop.hdfs.DFSClient;\n\nimport org.apache.hadoop.mapred.TaskTrackerStatus;\n\nimport org.apache.commons.logging.Log;\nimport org.apache.commons.logging.LogFactory;\n\n\nimport org.apache.hadoop.conf.Configuration;\n\n\n\n\n\n\n\/**\n *\n * @author Alejandro\n *\/\n\naspect AlojaAspect {\t\t\n\n\tprivate static final Log LOG = LogFactory.getLog(AlojaAspect.class);\n\n\t\/*\n\tTYPES\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\n    public static class Events {\n\n        public static final int JobTracker = 11111;\n        public static final int TaskTracker = 11112;\n        public static final int NameNode = 11113;\n        public static final int SecondaryNameNode = 11114;\n        public static final int DataNode = 11115;\n        public static final int Task = 11116;\n        public static final int HeartBeat = 11119;\n\/\/        public static final int MapTask = 11117;\n\/\/        public static final int ReduceTask = 11118;\n        public static final int MapOutputBuffer = 33333;\n        public static final int MapTaskOutputSize = 44444;\n    }\n\n    public static class Values {\n\n       \t\/\/ Generic\n\t\tpublic static final int End = 0;        \n        public static final int Start = 1;\n        \n        \/\/ Events.TaskTracker \n\t\tpublic static final int RunMapper = 8;\n        public static final int RunReducer = 9;\n        public static final int ReducerCopyPhase = 10;\n        public static final int ReducerSortPhase = 11;\n        public static final int ReducerReducePhase = 12;\n\n\t\t\/\/ Events.MapOutputBuffer\n        public static final int Flush = 1;\n        public static final int SortAndSpill = 2;\n        public static final int Sort = 3;        \n        public static final int CreateSpillIndexFile = 5;\n        \/\/public static final int TotalIndexCacheMemory = 6;\n        public static final int SpillRecordDumped = 7;\n        public static final int Combine = 4;\n    }    \n\n\n\t\/*\n\tFUNCTIONS\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\t\n\tprivate static long getPID() {\n\t\tString name = java.lang.management.ManagementFactory.getRuntimeMXBean().getName();\n\t\treturn Long.parseLong(name.split(\"@\")[0]);\n\t}\n\n\tprivate void generateEvent(Integer key, Integer value) {\n\t\t\/\/2:cpu:app:task:thread:time:type:value\n\t\ttry{\n\t\t\tString hostname = InetAddress.getLocalHost().getHostName();\n\t\t\tlong pid = getPID();\n\t\t\t\/\/LOG.info(hostname+\",\"+pid+\",2:\"+hostname+\":2:\"+pid+\":1:\"+System.currentTimeMillis()+\":\"+key+\":\"+value);\n\t\t\tLOG.info(\"AOPLOG,\"+hostname+\",\"+pid+\",\"+System.currentTimeMillis()+\",\"+key+\",\"+value);\n\t\t}\n\t\tcatch (Exception e) {\n\t\t\tLOG.error(e, e);\n\n\t\t}\n\t}\n\n\n\tprivate void generateEvent(Integer key, String value) {\n\t\t\/\/2:cpu:app:task:thread:time:type:value\n\t\ttry{\n\t\t\tString hostname = InetAddress.getLocalHost().getHostName();\n\t\t\tlong pid = getPID();\n\t\t\t\/\/LOG.info(hostname+\",\"+pid+\",2:\"+hostname+\":2:\"+pid+\":1:\"+System.currentTimeMillis()+\":\"+key+\":\"+value);\n\t\t\tLOG.info(\"AOPLOG,\"+hostname+\",\"+pid+\",\"+System.currentTimeMillis()+\",\"+key+\",\"+value);\n\t\t}\n\t\tcatch (Exception e) {\n\t\t\tLOG.error(e, e);\n\n\t\t}\n\t}\n\n\n\t\/*private void generateEVent(Integer key[], Integer value) {\n\n\t\tStringBuffer output = new StringBuffer();\n\n\n\t\toutput.append()\n\n\t}*\/\n\n\tprivate void instrumentation(String event, String when) {\n\n\t\tinstrumentation(event, when, \"\");\n\n\t}\n\tprivate void instrumentation(String event, String when, String additional) {\n\t\ttry {\n\t\t\t\/\/Add hostname\n\t\t\tString log = InetAddress.getLocalHost().getHostName();\n\t\t\t\/\/Add PID \n\t\t\tlog += \",\" + getPID();\n\t\t\t\/\/Specify event\n\t\t\tlog += \",\" + when + \",\" + event;\n\t\t\t\/\/Specify event\n\t\t\tlog += additional;\n\t\t\t\/\/LOG.info(log);\n\t\t\t\/\/writeLog(logFile,log);\n\n\n\t\t}\n\t\tcatch (IOException e) {\n\t\t\te.printStackTrace();\n\t\t}\n\t}\n\n\n\t\/*\n\tPOINTCUTS\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\n\t\/\/RegisterDataNode Pointcut\n\n\tpointcut startDataNode(): execution(* org.apache.hadoop.hdfs.server.datanode.DataNode.startDataNode(..));\n\n\n\t\/\/RegisterTaskTracker Pointcut\n\n\tpointcut registerTaskTracker(): execution(* org.apache.hadoop.mapred.TaskTracker.initialize(..));\n\n\n\t\/\/RegisterNameNode Pointcut\n\n\tpointcut initializeNameNode():  execution(* org.apache.hadoop.hdfs.server.namenode.NameNode.initialize(..));\n\n\t\/\/RegisterSecondaryNamenode Pointcut\n\n\tpointcut initializeSecondaryNameNode(): execution(* org.apache.hadoop.hdfs.server.namenode.SecondaryNameNode.initialize(..));\n\n\t\/\/RegisterTask - CHILD\n\n\t\/\/pointcut initializeChild(): call(* org.apache.hadoop.mapred.Child.initMetrics(..)) && withincode(* org.apache.hadoop.mapred.Child.main(..)); \n\n\tpointcut initializeChild(): execution(* org.apache.hadoop.mapred.Child.main(..)); \n\n\t\/\/Register JobTracker Pointcut\n\n\tpointcut registerJobTracker(): execution(* org.apache.hadoop.mapred.JobTracker.startTracker(..));\n\n\t\/\/HEARTBEAT\n\n\tpointcut heartbeat(TaskTrackerStatus status,boolean restarted,boolean initialContact,boolean acceptNewTasks,short responseId): execution(* org.apache.hadoop.mapred.JobTracker.heartbeat(..)) && args(status, restarted, initialContact, acceptNewTasks,responseId);\n\n\t\/*\n\t\t###########################################################################\n\t\t############################Task###########################################\n\t\t###########################################################################\n\t*\/\n\n\n\tpointcut outputSize(): call (* *.getLen(..)) && withincode(* org.apache.hadoop.mapred.Task.calculateOutputSize());\n\n\t\/*\n\t\t###########################################################################\n\t\t############################MAPPER#########################################\n\t\t###########################################################################\n\t*\/\n\n\t\/\/pointcut maptask(): execution(* org.apache.hadoop.mapred.MapTask.run(..));\n\tpointcut mapper(): call(* org.apache.hadoop.mapred.MapTask.runNewMapper(..)) && withincode(* org.apache.hadoop.mapred.MapTask.run(..));\n\n\n\t\/\/  ############################SORT AND SPILL#################################\n\n\t\/\/Start-End\n\tpointcut taskSortAndSpill(): execution(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\n\tpointcut flush(): execution(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.flush());\n\n\t\/\/Spill File Size\n\tpointcut sortAndSpillSpillFile(int numSpills, long size) : call (* *.getSpillFileForWrite(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(numSpills, size);\n\n\t\/\/SpillIndex File Size\n\tpointcut sortAndSpillSpillIndexFile(int numSpills, long partitions) : call (* *.getSpillIndexFileForWrite(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(numSpills, partitions);\n\n\t\/\/Sort \n\tpointcut sortAndSpillSort(int kvstart, int endPosition, Object reporter): call(* *.sort(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(..,kvstart,endPosition,reporter);\n\n\t\/\/Init Writer\n\t\/\/pointcut sortAndSpillInitWriter() : call (org.apache.hadoop.mapred.IFile.Writer.new(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Close Writer\n\t\/\/pointcut sortAndSpillCloseWriter() : call (void org.apache.hadoop.mapred.IFile.Writer.close(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Write key-value\n\tpointcut sortAndSpillWrite(DataInputBuffer key, DataInputBuffer value): call (* *.append(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(key,value);\n\t\n\t\/\/Combiner\n\tpointcut sortAndSpillCombiner(): call(* *.combine(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Spill Index File\n\tpointcut sortAndSpillSpillIndexWrite(): call(* *.writeToFile(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/*\n\t\t###########################################################################\n\t\t############################REDUCER########################################\n\t\t###########################################################################\n\t*\/\n\n\t\/\/REDUCETASK RUN\n\tpointcut reducer(): execution(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\tpointcut initCodec(): call(* *.initCodec(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\tpointcut setPhase(TaskStatus.Phase phase): call(* *.setPhase(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..)) && args(phase);\n\n\t\n\t\/\/pointcut endCopy(): call(* *.setPhase(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\t\/\/pointcut endSort(): call(* *.getMapOutputKeyClass(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\t\n\n\t\/*\n\t\t###########################################################################\n\t\t############################NETWORK########################################\n\t\t###########################################################################\n\t*\/\n\n\tpointcut defaultBlockSize(): call(* org.apache.hadoop.hdfs.DFSClient.getDefaultBlockSize());\n\t\/\/pointcut blockSize(): call(* org.apache.hadoop.hdfs.DFSClient.getBlockSize(..));\n\tpointcut createDFSFile(String src,FsPermission permission,boolean overwrite,boolean createParent,short replication,long blockSize,Progressable progress, int buffersize): execution (* org.apache.hadoop.hdfs.DFSClient.create(..)) && args(src,permission,overwrite,createParent,replication,blockSize,progress,buffersize);\n\tpointcut runDataStreamer(): execution (* org.apache.hadoop.hdfs.DFSClient.DFSOutputStream.DataStreamer.run());\n\t\/\/pointcut readEntireBufferFromDataNode(byte buf[],int off,int len): execution(* org.apache.hadoop.hdfs.DFSClient.DFSInputStream.read(..)) && args(buf[],off,len);\n\t\/\/pointcut readFromDataNode(): call (* org.apache.hadoop.hdfs.DFSClient.DFSInputStream.blockSeekTo(..)) && withincode(* org.apache.hadoop.hdfs.DFSClient.DFSInputStream.read(..));\n\tpointcut newBlockReader(Socket sock, String file, long blockId, Token<BlockTokenIdentifier> accessToken, long genStamp, long startOffset, long len, int bufferSize, boolean verifyChecksum, String clientName): execution (* org.apache.hadoop.hdfs.DFSClient.BlockReader.newBlockReader(..)) && args(sock,file,blockId,accessToken,genStamp,startOffset,len,bufferSize,verifyChecksum,clientName);\n\n\t\/*\n\tAdvices\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\n\t\/\/ RegiterJobTracker\n\n\tafter() : registerJobTracker(){\n\t\tgenerateEvent(Events.JobTracker, Values.Start);\n\n\t}\n\n\t\/\/RegisterTaskTracker \n\tafter() : registerTaskTracker(){\n\t\tgenerateEvent(Events.TaskTracker, Values.Start);\n\n\t}\n\n\t\/\/RegisterNameNode\n\n\tafter() : initializeNameNode(){\n\t\tgenerateEvent(Events.NameNode, Values.Start);\n\t}\n\n\t\/\/RegisterDataNode \n\n\tafter() : startDataNode(){\n\t\tgenerateEvent(Events.DataNode, Values.Start);\n\t}\n\n\n\t\/\/RegisterSecondaryNamenode\n\n\tafter() : initializeSecondaryNameNode(){\n\t\tgenerateEvent(Events.SecondaryNameNode, Values.Start);\n\t}\n\n\n\t\/\/HEARTBEAT \n\tafter(TaskTrackerStatus status,boolean restarted,boolean initialContact,boolean acceptNewTasks,short responseId) : heartbeat(status, restarted, initialContact, acceptNewTasks,responseId){\n\t\t\/\/ SAMPLE trackername: tracker_vagrant-99-01:localhost\/127.0.0.1:38149\n\t\tgenerateEvent(Events.HeartBeat, status.getTrackerName().replace(':','-').replace('\/','_'));\n\t}\n\n\n\t\/*\n\t\t###########################################################################\n\t\t############################Task###########################################\n\t\t###########################################################################\n\t*\/\n\n\t\/\/RegisterTask CHILD \n\tafter() : initializeChild() { \/\/We need the  PID of this task to be registered\n\t\tgenerateEvent(Events.Task, Values.Start);\n\t}\n\n\n\/*\tafter() returning(long size) : outputSize() {\n\t\tString s = \"Task-outputSize\";\n\t\tinstrumentation(s,\"after\",\", size: \" + Long.toString(size));\n\t}\n\n\t\/*\n\t\t###########################################################################\n\t\t############################Mapper#########################################\n\t\t###########################################################################\n\t*\/\n\n\n\t\/*before() : maptask(){\n\t\tgenerateEvent(Events.MapTask, Values.Start);\n\t}*\/\n\n\tbefore() : mapper(){\n\t\tgenerateEvent(Events.TaskTracker, Values.RunMapper);\n\t}\n\n\tafter() : mapper(){\n\t\tgenerateEvent(Events.TaskTracker, Values.End);\n\t}\n\n\n\t\n\n\t\/\/  ############################SORT AND SPILL#################################\n\n\tbefore() : taskSortAndSpill(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.SortAndSpill);\n\t}\n\n\n\tafter() : taskSortAndSpill(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\n\t}\n\n\t\/\/flush\n\n\tbefore() : flush(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.Flush);\n\t}\n\n\tafter() : flush(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\n\t}\n\n\n\n\t\/\/ Spill File Size\n\n\tafter(int numSpills, long size) returning : sortAndSpillSpillFile(numSpills, size){\n\t\tString s = \"sortAndSpillSpillFile\";\n\t\tinstrumentation(s,\"after\",\", numSpills: \" +Integer.toString(numSpills) + \";size: \" + Long.toString((size*numSpills) + size));\n\t}\n\n\t\/\/ SpillIndex File Size\n\n\tafter(int numSpills, long partitions) returning : sortAndSpillSpillIndexFile(numSpills, partitions){\n\t\tString s = \"sortAndSpillSpillIndexFile\";\n\t\tinstrumentation(s,\"after\",\",\" + Long.toString(numSpills * partitions));\n\t}\n\n\/*\n\tbefore(int length) : kvbufferState(length){\n\n\t\tString s = \"kvbufferState\";\n\t\tFile logFile = getFile();\n\t\tinstrumentation(logFile,s,\"before\");\n\t\twriteLog(logFile,Integer.toString(length));\n\t}\n\n*\/\n\n\tbefore(int kvstart, int endPosition, Object reporter) : sortAndSpillSort(kvstart,endPosition,reporter){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.Sort);\n\t\t\/\/instrumentation(s,\"before\",\",\" + Integer.toString(endPosition - kvstart));\n\t}\n\tafter(int kvstart, int endPosition, Object reporter) returning : sortAndSpillSort(kvstart,endPosition,reporter){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\n\t\t\/\/instrumentation(s,\"after\",\",\" + Integer.toString(endPosition - kvstart));\n\t}\n\n\t\/\/ Init writer\n\/*\tafter() returning : sortAndSpillInitWriter(){\n\t\tString s = \"sortAndSpillInitWriter\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\t\/\/ Close writer\n\tafter() returning : sortAndSpillCloseWriter(){\n\t\tString s = \"sortAndSpillCloseWriter\";\n\t\tinstrumentation(s,\"after\");\n\t}\n*\/\n\n\tafter(DataInputBuffer key, DataInputBuffer value) returning : sortAndSpillWrite(key,value){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.SpillRecordDumped);\n\t}\n\n\tbefore() : sortAndSpillCombiner(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.Combine);\n\t}\n\n\tafter() returning : sortAndSpillCombiner(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\t\n\t}\n\n\tbefore() : sortAndSpillSpillIndexWrite(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.CreateSpillIndexFile);\n\t}\n\n\tafter() returning : sortAndSpillSpillIndexWrite(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\n\t}\n\n\t\/*\n\t\t###########################################################################\n\t\t############################REDUCER########################################\n\t\t###########################################################################\n\t*\/\n\n\/*\tbefore() : reducer(){\n\t\tString s = \"Reducer\";\n\t\tinstrumentation(s,\"before\");\n\t}\n*\/\n\n\tbefore() : initCodec() {\n\t\tgenerateEvent(Events.TaskTracker, Values.RunReducer);\n\t}\n\n\n\tafter() returning : initCodec() {\n\t\tgenerateEvent(Events.TaskTracker, Values.ReducerCopyPhase);\n\t}\n\n\tbefore(TaskStatus.Phase phase) : setPhase(phase) { \/\/END OF A PHASE (SORT OR COPY)\n\t\t\tgenerateEvent(Events.TaskTracker, Values.End);\n\t}\n\n\tafter(TaskStatus.Phase phase) returning: setPhase(phase) { \n\t\tif (phase == TaskStatus.Phase.SORT) {\n\t\t\tgenerateEvent(Events.TaskTracker, Values.ReducerSortPhase);\n\t\t}\n\t\telse if (phase == TaskStatus.Phase.REDUCE) {\n\t\t\tgenerateEvent(Events.TaskTracker, Values.ReducerReducePhase);\n\t\t}\n\t}\n\n\tafter() : reducer(){ \/\/END OF REDUCE PHASE\n\t\t\tgenerateEvent(Events.TaskTracker, Values.End);\t}\n\n\t\/*\n\t\t###########################################################################\n\t\t############################NETWORK########################################\n\t\t###########################################################################\n\t*\/\n\n\tafter() returning(long blockSize) : defaultBlockSize() {\n\t\tString s = \"Network-defaultBlockSize\";\n\t\tinstrumentation(s,\"after\",\", size: \" + Long.toString(blockSize));\n\t}\n\t\/\/ after() returning(long blockSize) : blockSize() {\n\t\/\/ \tString s = \"Network-blockSize\";\n\t\/\/ \tFile logFile = getFile();\n\t\/\/ \tinstrumentation(logFile,s,\"after\");\n\t\/\/ \tString log = \", size: \" + Long.toString(blockSize);\n\t\/\/ \twriteLog(logFile,log);\n\t\/\/ }\n\n\tafter(String src,FsPermission permission,boolean overwrite, boolean createParent,short replication,long blockSize,Progressable progress, int buffersize): createDFSFile(src,permission,overwrite,createParent,replication,blockSize,progress,buffersize) {\n\t\tString s = \"Network-CreateDFSFile\";\n\n\t\t\/\/MODIFIED!!!!!!-----!!!!!!!!!!!\n\t\tinstrumentation(s,\"after\",\", path: \" + src + \";permission: \" + permission.toString() + \";overwrite: \" + String.valueOf(overwrite) + \";createParent: \" + String.valueOf(createParent) + \";replication: \" + Short.toString(replication) + \";blockSize: \" + Long.toString(blockSize) + \";buffersize: \" + Integer.toString(buffersize));\n\t}\n\tbefore(): runDataStreamer() {\n\t\tString s = \"DataStreamer\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\t\/\/ before(byte buf[],int off, int len) : readEntireBufferFromDataNode(buf[],off,len){\n\t\/\/ \tString s = \"Network-ReadEntireBuffer\";\n\t\/\/ \tinstrumentation(s,\"after\",\", bufferLength: \" + Integer.toString(len));\n\t\/\/ }\n\n\t\/\/ after() returning(DatanodeInfo datanode) : readFromDataNode(){\n\t\/\/ \tString s = \"Network-fromDataNode\";\n\t\/\/ \tinstrumentation(s,\"after\", \", from : \" + datanode.getHostName());\n\t\/\/ }\n\n\tafter(Socket sock, String file, long blockId, Token<BlockTokenIdentifier> accessToken, long genStamp, long startOffset, long len, int bufferSize, boolean verifyChecksum, String clientName) : newBlockReader(sock,file,blockId,accessToken,genStamp,startOffset,len,bufferSize,verifyChecksum,clientName) {\n\t\tString s = \"Network-NewBlockReader\";\n\t\tString extra = \", DataNode: \" + sock.getInetAddress().getCanonicalHostName();\n\t\textra += \";file: \" + file;\n\t\t\/\/extra += \", length: \" + Long.toString(len) + \"B\";\n\t\textra += \";\" + Long.toString(len);\n\t\textra += \";blockId: \" + Long.toString(blockId);\n\t\textra += \";startOffset: \" + Long.toString(startOffset);\t\t\n\t\tinstrumentation(s,\"after\",extra);\n\t}\n}\n\n\n\n\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"c950bf22bb53b2e303c1dcda0b53db929a4ba253","subject":"grammar","message":"grammar\n","repos":"eigengo\/monitor,eigengo\/monitor,DataDog\/monitor,DataDog\/monitor","old_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/ActorCellMonitoringAspect.aj","new_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/ActorCellMonitoringAspect.aj","new_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.actor.*;\nimport org.eigengo.monitor.agent.AgentConfiguration;\nimport org.eigengo.monitor.output.CounterInterface;\nimport scala.Option;\n\nimport java.util.ArrayList;\nimport java.util.List;\nimport java.util.concurrent.atomic.AtomicLong;\nimport java.util.concurrent.ConcurrentHashMap;\n\n\/**\n * Contains advices for monitoring behaviour of an actor; typically imprisoned in an {@code ActorCell}.\n *\/\npublic aspect ActorCellMonitoringAspect extends AbstractMonitoringAspect issingleton() {\n    private AkkaAgentConfiguration agentConfiguration;\n    private final CounterInterface counterInterface;\n    private final Option<String> noActorClazz = Option.empty();\n    private final ConcurrentHashMap<Option<String>, AtomicLong> concurrentCounters;\n\n    \/**\n     * Constructs this aspect\n     *\/\n    public ActorCellMonitoringAspect() {\n        AgentConfiguration<AkkaAgentConfiguration> configuration = getAgentConfiguration(\"akka\", AkkaAgentConfigurationJapi.apply());\n        this.agentConfiguration = configuration.agent();\n        this.counterInterface = createCounterInterface(configuration.common());\n        this.concurrentCounters = new ConcurrentHashMap<Option<String>, AtomicLong>();\n    }\n\n    \/**\n     * Injects the new {@code AkkaAgentConfiguration} instance.\n     *\n     * @param agentConfiguration the new configuration\n     *\/\n    synchronized final void setAgentConfiguration(AkkaAgentConfiguration agentConfiguration) {\n        this.agentConfiguration = agentConfiguration;\n    }\n\n    \/\/ decide whether to include this ActorCell in our measurements\n    private boolean includeActorPath(final PathAndClass pathAndClass) {\n        if (!this.agentConfiguration.incuded().accept(pathAndClass)) return false;\n        if (this.agentConfiguration.excluded().accept(pathAndClass)) return false;\n\n        if (this.agentConfiguration.includeSystemAgents()) return true;\n\n        String userOrSystem = pathAndClass.actorPath().getElements().iterator().next();\n        return \"user\".equals(userOrSystem);\n    }\n\n    \/\/ get the sample rate for an actor\n    private int getSampleRate(final PathAndClass pathAndClass) {\n        return this.agentConfiguration.sampling().getRate(pathAndClass);\n    }\n\n    \/\/ decide whether to sample an actor on a particular occasion\n    private final boolean sampleMessage(final PathAndClass pathAndClass) {\n        int sampleRate = getSampleRate(pathAndClass);\n        if (sampleRate == 1) return true;\n\n        this.concurrentCounters.putIfAbsent(pathAndClass.actorClassName(), new AtomicLong(0));\n        long timesSeenSoFar = this.concurrentCounters.get(pathAndClass.actorClassName()).incrementAndGet();\n        return (timesSeenSoFar % sampleRate == 1); \/\/ == 1 to log first value (incrementAndGet returns updated value)\n    }\n\n    \/\/ get the tags for the cell\n    private String[] getTags(final ActorPath actorPath, final Actor actor) {\n        List<String> tags = new ArrayList<String>();\n\n        \/\/ TODO: Improve detection of routed actors. This relies only on the naming :(.\n        String lastPathElement = actorPath.elements().last();\n        if (lastPathElement.startsWith(\"$\")) {\n            \/\/ this is routed actor.\n            tags.add(actorPath.parent().toString());\n            if (this.agentConfiguration.includeRoutees()) tags.add(actorPath.toString());\n        } else {\n            \/\/ there is no supervisor\n            tags.add(actorPath.toString());\n        }\n        if (actor != null) {\n            tags.add(String.format(\"akka:%s.%s\", actor.context().system().name(), actor.getClass().getCanonicalName()));\n        }\n\n        return tags.toArray(new String[tags.size()]);\n    }\n\n    \/**\n     * Advises the {@code ActorCell.receiveMessage(message: Object): Unit}\n     * We proceed with the pointcut if the actor is to be included in the monitoring *and* this is\n     * the 'multiple-of-n'th time we've seen a message for an actor with a sample rate of n.\n     *\n     * Currently, we sample queue size, the fact that the message is delivered, the simple name of the class of the\n     * message, and the time taken to complete the actor's reactive action.\n     *\n     * @param actorCell the ActorCell where the actor that receives the message \"lives\"\n     * @param msg the incoming message\n     *\/\n    Object around(ActorCell actorCell, Object msg) : Pointcuts.actorCellReceiveMessage(actorCell, msg) {\n        final ActorPath actorPath = actorCell.self().path();\n        final PathAndClass pathAndClass = new PathAndClass(actorPath, Option.apply(actorCell.actor().getClass().getCanonicalName()));\n        if (!includeActorPath(pathAndClass) || !sampleMessage(pathAndClass)) return proceed(actorCell, msg);\n\n        int samplingRate = getSampleRate(pathAndClass);\n\n        \/\/ we tag by actor name\n        final String[] tags = getTags(actorPath, actorCell.actor());\n\n        \/\/ record the queue size\n        this.counterInterface.recordGaugeValue(\"akka.queue.size\", actorCell.numberOfMessages(), tags);\n        \/\/ record the message, general and specific\n        this.counterInterface.incrementCounter(\"akka.actor.delivered\", samplingRate, tags);\n        this.counterInterface.incrementCounter(\"akka.actor.delivered.\" + msg.getClass().getSimpleName(), samplingRate, tags);\n\n        \/\/ measure the time. we're using the ``nanoTime`` call to access the high-precision timer.\n        \/\/ since we're not really interested in wall time, but just some increasing measure of\n        \/\/ elapsed time\n        Object result = null;\n        final long start = System.nanoTime();\n        \/\/ result will always be ``null``, because target returns ``Unit``\n        result = proceed(actorCell, msg);\n        \/\/ ns or \u00b5s is too fine. ms will do for now.\n        final long duration = (System.nanoTime() - start) \/ 1000000;\n\n        \/\/ record the actor duration\n        this.counterInterface.recordExecutionTime(\"akka.actor.duration\", (int)duration, tags);\n\n        \/\/ return null would do the trick, but we want to be _proper_.\n        return result;\n    }\n\n    \/**\n     * Advises the {@code ActorCell.handleInvokeFailure(_, failure: Throwable): Unit}\n     *\n     * @param actorCell the ActorCell where the error spreads from\n     * @param failure the exception that escaped from the {@code receive} method\n     *\/\n    before(ActorCell actorCell, Throwable failure) : Pointcuts.actorCellHandleInvokeFailure(actorCell, failure) {\n        \/\/ record the error, general and specific\n        String[] tags = getTags(actorCell.self().path(), actorCell.actor());\n        this.counterInterface.incrementCounter(\"akka.actor.error\", tags);\n        this.counterInterface.incrementCounter(String.format(\"akka.actor.error.%s\", failure.getMessage()), tags);\n    }\n\n    \/**\n     * Advises the {@code EventStream.publish(event: Any): Unit}\n     *\n     * @param event the received event\n     *\/\n    before(Object event) : Pointcuts.eventStreamPublish(event) {\n        if (event instanceof UnhandledMessage) {\n            UnhandledMessage unhandledMessage = (UnhandledMessage)event;\n            String[] tags = getTags(unhandledMessage.recipient().path(), null);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered\", tags);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered.\" + unhandledMessage.getMessage().getClass().getSimpleName(), tags);\n        }\n    }\n\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorCell} and {@code ActorSystem}\n     *\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after() returning (ActorRef actor): Pointcuts.anyActorOf() {\n        if (!includeActorPath(new PathAndClass(actor.path(), this.noActorClazz))) return;\n\n        final String tag = actor.path().root().toString();\n        this.counterInterface.incrementCounter(\"akka.actor.count\", tag);\n    }\n\n    \/**\n     * Advises the {@code ActorCell.stop} method\n     *\n     * @param actor the actor being stopped\n     *\/\n    after(ActorRef actor) : Pointcuts.actorCellStop(actor) {\n        if (!includeActorPath(new PathAndClass(actor.path(), this.noActorClazz))) return;\n\n        final String tag = actor.path().root().toString();\n        this.counterInterface.decrementCounter(\"akka.actor.count\", tag);\n    }\n\n}","old_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.actor.*;\nimport org.eigengo.monitor.agent.AgentConfiguration;\nimport org.eigengo.monitor.output.CounterInterface;\nimport scala.Option;\n\nimport java.util.ArrayList;\nimport java.util.List;\nimport java.util.concurrent.atomic.AtomicLong;\nimport java.util.concurrent.ConcurrentHashMap;\n\n\/**\n * Contains advices for monitoring behaviour of an actor; typically imprisoned in an {@code ActorCell}.\n *\/\npublic aspect ActorCellMonitoringAspect extends AbstractMonitoringAspect issingleton() {\n    private AkkaAgentConfiguration agentConfiguration;\n    private final CounterInterface counterInterface;\n    private final Option<String> noActorClazz = Option.empty();\n    private final ConcurrentHashMap<Option<String>, AtomicLong> concurrentCounters;\n\n    \/**\n     * Constructs this aspect\n     *\/\n    public ActorCellMonitoringAspect() {\n        AgentConfiguration<AkkaAgentConfiguration> configuration = getAgentConfiguration(\"akka\", AkkaAgentConfigurationJapi.apply());\n        this.agentConfiguration = configuration.agent();\n        this.counterInterface = createCounterInterface(configuration.common());\n        this.concurrentCounters = new ConcurrentHashMap<Option<String>, AtomicLong>();\n    }\n\n    \/**\n     * Injects the new {@code AkkaAgentConfiguration} instance.\n     *\n     * @param agentConfiguration the new configuration\n     *\/\n    synchronized final void setAgentConfiguration(AkkaAgentConfiguration agentConfiguration) {\n        this.agentConfiguration = agentConfiguration;\n    }\n\n    \/\/ decide whether to include this ActorCell in our measurements\n    private boolean includeActorPath(final PathAndClass pathAndClass) {\n        if (!this.agentConfiguration.incuded().accept(pathAndClass)) return false;\n        if (this.agentConfiguration.excluded().accept(pathAndClass)) return false;\n\n        if (this.agentConfiguration.includeSystemAgents()) return true;\n\n        String userOrSystem = pathAndClass.actorPath().getElements().iterator().next();\n        return \"user\".equals(userOrSystem);\n    }\n\n    \/\/ get the sample rate for an actor\n    private int getSampleRate(final PathAndClass pathAndClass) {\n        return this.agentConfiguration.sampling().getRate(pathAndClass);\n    }\n\n    \/\/ decide whether to sample an actor on a particular occasion\n    private final boolean sampleMessage(final PathAndClass pathAndClass) {\n        int sampleRate = getSampleRate(pathAndClass);\n        if (sampleRate == 1) return true;\n\n        this.concurrentCounters.putIfAbsent(pathAndClass.actorClassName(), new AtomicLong(0));\n        long timesSeenSoFar = this.concurrentCounters.get(pathAndClass.actorClassName()).incrementAndGet();\n        return (timesSeenSoFar % sampleRate == 1); \/\/ == 1 to log first value (incrementAndGet returns updated value)\n    }\n\n    \/\/ get the tags for the cell\n    private String[] getTags(final ActorPath actorPath, final Actor actor) {\n        List<String> tags = new ArrayList<String>();\n\n        \/\/ TODO: Improve detection of routed actors. This relies only on the naming :(.\n        String lastPathElement = actorPath.elements().last();\n        if (lastPathElement.startsWith(\"$\")) {\n            \/\/ this is routed actor.\n            tags.add(actorPath.parent().toString());\n            if (this.agentConfiguration.includeRoutees()) tags.add(actorPath.toString());\n        } else {\n            \/\/ there is no supervisor\n            tags.add(actorPath.toString());\n        }\n        if (actor != null) {\n            tags.add(String.format(\"akka:%s.%s\", actor.context().system().name(), actor.getClass().getCanonicalName()));\n        }\n\n        return tags.toArray(new String[tags.size()]);\n    }\n\n    \/**\n     * Advises the {@code ActorCell.receiveMessage(message: Object): Unit}\n     * We proceed with the pointcut if the actor is to be included in the monitoring, *and* if\n     * this is the 'multiple-of-n'th time we've seen a message for an actor with a sample rate of n.\n     *\n     * Currently, we sample queue size, the fact that the message is delivered, the simple name of the class of the\n     * message, and the time taken to complete the actor's reactive action.\n     *\n     * @param actorCell the ActorCell where the actor that receives the message \"lives\"\n     * @param msg the incoming message\n     *\/\n    Object around(ActorCell actorCell, Object msg) : Pointcuts.actorCellReceiveMessage(actorCell, msg) {\n        final ActorPath actorPath = actorCell.self().path();\n        final PathAndClass pathAndClass = new PathAndClass(actorPath, Option.apply(actorCell.actor().getClass().getCanonicalName()));\n        if (!includeActorPath(pathAndClass) || !sampleMessage(pathAndClass)) return proceed(actorCell, msg);\n\n        int samplingRate = getSampleRate(pathAndClass);\n\n        \/\/ we tag by actor name\n        final String[] tags = getTags(actorPath, actorCell.actor());\n\n        \/\/ record the queue size\n        this.counterInterface.recordGaugeValue(\"akka.queue.size\", actorCell.numberOfMessages(), tags);\n        \/\/ record the message, general and specific\n        this.counterInterface.incrementCounter(\"akka.actor.delivered\", samplingRate, tags);\n        this.counterInterface.incrementCounter(\"akka.actor.delivered.\" + msg.getClass().getSimpleName(), samplingRate, tags);\n\n        \/\/ measure the time. we're using the ``nanoTime`` call to access the high-precision timer.\n        \/\/ since we're not really interested in wall time, but just some increasing measure of\n        \/\/ elapsed time\n        Object result = null;\n        final long start = System.nanoTime();\n        \/\/ result will always be ``null``, because target returns ``Unit``\n        result = proceed(actorCell, msg);\n        \/\/ ns or \u00b5s is too fine. ms will do for now.\n        final long duration = (System.nanoTime() - start) \/ 1000000;\n\n        \/\/ record the actor duration\n        this.counterInterface.recordExecutionTime(\"akka.actor.duration\", (int)duration, tags);\n\n        \/\/ return null would do the trick, but we want to be _proper_.\n        return result;\n    }\n\n    \/**\n     * Advises the {@code ActorCell.handleInvokeFailure(_, failure: Throwable): Unit}\n     *\n     * @param actorCell the ActorCell where the error spreads from\n     * @param failure the exception that escaped from the {@code receive} method\n     *\/\n    before(ActorCell actorCell, Throwable failure) : Pointcuts.actorCellHandleInvokeFailure(actorCell, failure) {\n        \/\/ record the error, general and specific\n        String[] tags = getTags(actorCell.self().path(), actorCell.actor());\n        this.counterInterface.incrementCounter(\"akka.actor.error\", tags);\n        this.counterInterface.incrementCounter(String.format(\"akka.actor.error.%s\", failure.getMessage()), tags);\n    }\n\n    \/**\n     * Advises the {@code EventStream.publish(event: Any): Unit}\n     *\n     * @param event the received event\n     *\/\n    before(Object event) : Pointcuts.eventStreamPublish(event) {\n        if (event instanceof UnhandledMessage) {\n            UnhandledMessage unhandledMessage = (UnhandledMessage)event;\n            String[] tags = getTags(unhandledMessage.recipient().path(), null);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered\", tags);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered.\" + unhandledMessage.getMessage().getClass().getSimpleName(), tags);\n        }\n    }\n\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorCell} and {@code ActorSystem}\n     *\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after() returning (ActorRef actor): Pointcuts.anyActorOf() {\n        if (!includeActorPath(new PathAndClass(actor.path(), this.noActorClazz))) return;\n\n        final String tag = actor.path().root().toString();\n        this.counterInterface.incrementCounter(\"akka.actor.count\", tag);\n    }\n\n    \/**\n     * Advises the {@code ActorCell.stop} method\n     *\n     * @param actor the actor being stopped\n     *\/\n    after(ActorRef actor) : Pointcuts.actorCellStop(actor) {\n        if (!includeActorPath(new PathAndClass(actor.path(), this.noActorClazz))) return;\n\n        final String tag = actor.path().root().toString();\n        this.counterInterface.decrementCounter(\"akka.actor.count\", tag);\n    }\n\n}","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"dc17d371b089e049edece3eadf3e720469de3777","subject":"Encapsulate constraint registration from class loading","message":"Encapsulate constraint registration from class loading","repos":"sourcepit\/common-constraints","old_file":"src\/main\/java\/org\/sourcepit\/common\/constraints\/MethodAspects.aj","new_file":"src\/main\/java\/org\/sourcepit\/common\/constraints\/MethodAspects.aj","new_contents":"\/**\n * Copyright (c) 2011 Sourcepit.org contributors and others. All rights reserved. This program and the accompanying\n * materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution,\n * and is available at http:\/\/www.eclipse.org\/legal\/epl-v10.html\n *\/\n\npackage org.sourcepit.common.constraints;\n\nimport java.lang.annotation.Annotation;\nimport java.lang.reflect.Constructor;\nimport java.lang.reflect.Method;\nimport java.util.HashMap;\nimport java.util.Map;\n\nimport javax.validation.constraints.NotNull;\n\nimport org.aspectj.lang.reflect.ConstructorSignature;\nimport org.aspectj.lang.reflect.MethodSignature;\n\npublic aspect MethodAspects\n{\n   private static final Map<String, AbstractConstraint> CONSTRAINTS = new HashMap<String, AbstractConstraint>();\n   static\n   {\n      CONSTRAINTS.put(NotNull.class.getName(), new NotNullConstraint());\n   }\n\n   pointcut constraintedConstructorCall() : execution(* .new(..,@javax.validation.constraints.NotNull (*),..));\n\n   pointcut constraintedMethodArgs() : execution(* *(..,@javax.validation.constraints.NotNull (*),..));\n\n   pointcut constraintedMethodReturnValue() : execution(@javax.validation.constraints.NotNull !void *(..));\n\n   before() : constraintedConstructorCall() {\n      final Object target = thisJoinPoint.getTarget();\n      final Constructor<?> constructor = ((ConstructorSignature) thisJoinPoint.getSignature()).getConstructor();\n      final Annotation[][] parametersAnnotations = constructor.getParameterAnnotations();\n      final Object[] args = thisJoinPoint.getArgs();\n      for (int i = 0; i < args.length; i++)\n      {\n         final Annotation[] parameterAnnotations = parametersAnnotations[i];\n         if (parameterAnnotations.length > 0)\n         {\n            final Object arg = args[i];\n            for (Annotation annotation : parameterAnnotations)\n            {\n               final AbstractConstraint constraint = getConstraint(annotation);\n               if (constraint != null)\n               {\n                  constraint.validateConstructorArgument(target, constructor, i, annotation, arg);\n               }\n            }\n         }\n      }\n   }\n\n   before() : constraintedMethodArgs() {\n      final Object target = thisJoinPoint.getTarget();\n      final Method method = ((MethodSignature) thisJoinPoint.getSignature()).getMethod();\n      final Annotation[][] parametersAnnotations = method.getParameterAnnotations();\n      final Object[] args = thisJoinPoint.getArgs();\n      for (int i = 0; i < args.length; i++)\n      {\n         final Annotation[] parameterAnnotations = parametersAnnotations[i];\n         if (parameterAnnotations.length > 0)\n         {\n            final Object arg = args[i];\n            for (Annotation annotation : parameterAnnotations)\n            {\n               final AbstractConstraint constraint = getConstraint(annotation);\n               if (constraint != null)\n               {\n                  constraint.validateMethodArgument(target, method, i, annotation, arg);\n               }\n            }\n         }\n      }\n   }\n\n   after() returning(Object returnedValue): constraintedMethodReturnValue()\n   {\n      final Object target = thisJoinPoint.getTarget();\n      final Method method = ((MethodSignature) thisJoinPoint.getSignature()).getMethod();\n      final Annotation[] annotations = method.getAnnotations();\n      if (annotations.length > 0)\n      {\n         for (Annotation annotation : annotations)\n         {\n            final AbstractConstraint constraint = getConstraint(annotation);\n            if (constraint != null)\n            {\n               constraint.validateReturnedValue(target, method, annotation, returnedValue);\n            }\n         }\n      }\n   }\n\n   private AbstractConstraint getConstraint(Annotation annotation)\n   {\n      return CONSTRAINTS.get(annotation.annotationType().getName());\n   }\n}\n","old_contents":"\/**\n * Copyright (c) 2011 Sourcepit.org contributors and others. All rights reserved. This program and the accompanying\n * materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution,\n * and is available at http:\/\/www.eclipse.org\/legal\/epl-v10.html\n *\/\n\npackage org.sourcepit.common.constraints;\n\nimport java.lang.annotation.Annotation;\nimport java.lang.reflect.Constructor;\nimport java.lang.reflect.Method;\nimport java.util.HashMap;\nimport java.util.Map;\n\nimport javax.validation.constraints.NotNull;\n\nimport org.aspectj.lang.reflect.ConstructorSignature;\nimport org.aspectj.lang.reflect.MethodSignature;\n\npublic aspect MethodAspects\n{\n   private static final Map<Class<?>, AbstractConstraint> CONSTRAINTS = new HashMap<Class<?>, AbstractConstraint>();\n   static\n   {\n      CONSTRAINTS.put(NotNull.class, new NotNullConstraint());\n   }\n\n   pointcut constraintedConstructorCall() : execution(* .new(..,@javax.validation.constraints.NotNull (*),..));\n\n   pointcut constraintedMethodArgs() : execution(* *(..,@javax.validation.constraints.NotNull (*),..));\n\n   pointcut constraintedMethodReturnValue() : execution(@javax.validation.constraints.NotNull !void *(..));\n\n   before() : constraintedConstructorCall() {\n      final Object target = thisJoinPoint.getTarget();\n      final Constructor<?> constructor = ((ConstructorSignature) thisJoinPoint.getSignature()).getConstructor();\n      final Annotation[][] parametersAnnotations = constructor.getParameterAnnotations();\n      final Object[] args = thisJoinPoint.getArgs();\n      for (int i = 0; i < args.length; i++)\n      {\n         final Annotation[] parameterAnnotations = parametersAnnotations[i];\n         if (parameterAnnotations.length > 0)\n         {\n            final Object arg = args[i];\n            for (Annotation annotation : parameterAnnotations)\n            {\n               final AbstractConstraint constraint = CONSTRAINTS.get(annotation.annotationType());\n               if (constraint != null)\n               {\n                  constraint.validateConstructorArgument(target, constructor, i, annotation, arg);\n               }\n            }\n         }\n      }\n   }\n\n   before() : constraintedMethodArgs() {\n      final Object target = thisJoinPoint.getTarget();\n      final Method method = ((MethodSignature) thisJoinPoint.getSignature()).getMethod();\n      final Annotation[][] parametersAnnotations = method.getParameterAnnotations();\n      final Object[] args = thisJoinPoint.getArgs();\n      for (int i = 0; i < args.length; i++)\n      {\n         final Annotation[] parameterAnnotations = parametersAnnotations[i];\n         if (parameterAnnotations.length > 0)\n         {\n            final Object arg = args[i];\n            for (Annotation annotation : parameterAnnotations)\n            {\n               final AbstractConstraint constraint = CONSTRAINTS.get(annotation.annotationType());\n               if (constraint != null)\n               {\n                  constraint.validateMethodArgument(target, method, i, annotation, arg);\n               }\n            }\n         }\n      }\n   }\n\n   after() returning(Object returnedValue): constraintedMethodReturnValue()\n   {\n      final Object target = thisJoinPoint.getTarget();\n      final Method method = ((MethodSignature) thisJoinPoint.getSignature()).getMethod();\n      final Annotation[] annotations = method.getAnnotations();\n      if (annotations.length > 0)\n      {\n         for (Annotation annotation : annotations)\n         {\n            final AbstractConstraint constraint = CONSTRAINTS.get(annotation.annotationType());\n            if (constraint != null)\n            {\n               constraint.validateReturnedValue(target, method, annotation, returnedValue);\n            }\n         }\n      }\n   }\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"8c2028cf34fde4f1ca21690fbe6c4e6d327204bd","subject":"some version of aspectj has bug, it will not match correct parameter. so try to use aspectj as clearly as possible.","message":"some version of aspectj has bug, it will not match correct parameter.\nso try to use aspectj as clearly as possible.\n","repos":"zstackorg\/zstack,MatheMatrix\/zstack,MatheMatrix\/zstack,MatheMatrix\/zstack,AlanJager\/zstack,AlanJager\/zstack,zstackio\/zstack,AlanJager\/zstack,zstackio\/zstack,zstackorg\/zstack,zstackio\/zstack","old_file":"core\/src\/main\/java\/org\/zstack\/core\/aspect\/LogSafeAspect.aj","new_file":"core\/src\/main\/java\/org\/zstack\/core\/aspect\/LogSafeAspect.aj","new_contents":"package org.zstack.core.aspect;\n\nimport org.zstack.core.log.LogSafeGson;\nimport org.zstack.header.message.Event;\nimport org.zstack.header.message.Message;\nimport org.zstack.header.message.MessageReply;\nimport org.zstack.header.message.NeedReplyMessage;\nimport org.zstack.utils.Utils;\n\nimport java.util.Collections;\nimport java.util.Map;\n\n\/**\n * Created by MaJin on 2019\/9\/23.\n *\/\npublic aspect LogSafeAspect {\n    pointcut send() : execution(void org.zstack.core.cloudbus.CloudBus.send(Message));\n    pointcut sendCallBack() : execution(void org.zstack.core.cloudbus.CloudBus.send(NeedReplyMessage, CloudBusCallBack));\n    pointcut reply(MessageReply obj) : args(*, obj) && execution(void org.zstack.core.cloudbus.CloudBus.reply(Message, MessageReply));\n    pointcut publish() : execution(void org.zstack.core.cloudbus.CloudBus.publish(Event));\n    pointcut handle() : execution(void *.handle(Message+));\n\n    void around(org.zstack.core.thread.ChainTask obj) : target(obj) && execution(void org.zstack.core.thread.ChainTask+.run(..)) {\n        if (obj.maskWords.isEmpty()) {\n            proceed(obj);\n            return;\n        }\n\n        try (Utils.MaskWords h = new Utils.MaskWords(obj.maskWords)) {\n            proceed(obj);\n        }\n    }\n\n    Void around(org.zstack.core.thread.Task obj) : target(obj) && execution(Void org.zstack.core.thread.Task+.call()) {\n        if (obj.maskWords.isEmpty()) {\n            return proceed(obj);\n        }\n\n        try (Utils.MaskWords h = new Utils.MaskWords(obj.maskWords)) {\n            return proceed(obj);\n        }\n    }\n\n    Object around(org.zstack.core.thread.Task obj) : target(obj) && execution(Object org.zstack.core.thread.Task+.call()) {\n        if (obj.maskWords.isEmpty()) {\n            return proceed(obj);\n        }\n\n        try (Utils.MaskWords h = new Utils.MaskWords(obj.maskWords)) {\n            return proceed(obj);\n        }\n    }\n\n    void around() : send() || sendCallBack() || publish() || handle() {\n        Object obj = thisJoinPoint.getArgs()[0];\n        Map<String, String> maskWords = getValuesToMask(obj);\n        if (maskWords.isEmpty()) {\n            proceed();\n            return;\n        }\n\n        boolean extend = !thisJoinPoint.getSignature().getName().equals(\"handle\");\n        try (Utils.MaskWords h = new Utils.MaskWords(maskWords, extend)) {\n            proceed();\n        }\n    }\n\n    void around(org.zstack.header.message.MessageReply obj) : reply(obj) {\n        Map<String, String> maskWords = getValuesToMask(obj);\n        if (maskWords.isEmpty()) {\n            proceed(obj);\n            return;\n        }\n\n        try (Utils.MaskWords h = new Utils.MaskWords(maskWords, true)) {\n            proceed(obj);\n        }\n    }\n\n    void around() : execution(void org.zstack.header.rest.RESTFacade+.asyncJsonPost(String, Object, java.util.Map, org.zstack.header.rest.AsyncRESTCallback, java.util.concurrent.TimeUnit, long)) {\n        Object cmd = thisJoinPoint.getArgs()[1];\n        Map<String, String> maskWords = getValuesToMask(cmd);\n        if (maskWords.isEmpty()) {\n            proceed();\n            return;\n        }\n\n        try (Utils.MaskWords h = new Utils.MaskWords(maskWords, true)) {\n            proceed();\n        }\n    }\n\n    MessageReply around(org.zstack.header.message.Message obj) : args(obj, ..) && execution(MessageReply org.zstack.core.cloudbus.CloudBus.call(Message+, ..)) {\n        Map<String, String> maskWords = getValuesToMask(obj);\n        if (maskWords.isEmpty()) {\n            return proceed(obj);\n        }\n\n        try (Utils.MaskWords h = new Utils.MaskWords(maskWords, true)) {\n            return proceed(obj);\n        }\n    }\n\n    private Map<String, String> getValuesToMask(Object obj) {\n        try {\n            return LogSafeGson.getValuesToMask(obj);\n        } catch (Throwable t) {\n            return Collections.emptyMap();\n        }\n    }\n}\n","old_contents":"package org.zstack.core.aspect;\n\nimport org.zstack.core.log.LogSafeGson;\nimport org.zstack.header.message.Message;\nimport org.zstack.header.message.MessageReply;\nimport org.zstack.utils.Utils;\n\nimport java.util.Collections;\nimport java.util.Map;\n\n\/**\n * Created by MaJin on 2019\/9\/23.\n *\/\npublic aspect LogSafeAspect {\n    pointcut send(Message obj) : args(obj, ..) && execution(void org.zstack.core.cloudbus.CloudBus.send(Message+, ..));\n    pointcut reply(MessageReply obj) : args(.., obj) && execution(void org.zstack.core.cloudbus.CloudBus.reply(.., MessageReply+));\n    pointcut publish(Message obj) : args(obj, ..) && execution(void org.zstack.core.cloudbus.CloudBus.publish(Message+, ..));\n    pointcut handle(Message obj) : args(obj) && execution(void *.handle(Message+));\n\n    void around(org.zstack.core.thread.ChainTask obj) : target(obj) && execution(void org.zstack.core.thread.ChainTask+.run(..)) {\n        if (obj.maskWords.isEmpty()) {\n            proceed(obj);\n            return;\n        }\n\n        try (Utils.MaskWords h = new Utils.MaskWords(obj.maskWords)) {\n            proceed(obj);\n        }\n    }\n\n    Void around(org.zstack.core.thread.Task obj) : target(obj) && execution(Void org.zstack.core.thread.Task+.call()) {\n        if (obj.maskWords.isEmpty()) {\n            return proceed(obj);\n        }\n\n        try (Utils.MaskWords h = new Utils.MaskWords(obj.maskWords)) {\n            return proceed(obj);\n        }\n    }\n\n    Object around(org.zstack.core.thread.Task obj) : target(obj) && execution(Object org.zstack.core.thread.Task+.call()) {\n        if (obj.maskWords.isEmpty()) {\n            return proceed(obj);\n        }\n\n        try (Utils.MaskWords h = new Utils.MaskWords(obj.maskWords)) {\n            return proceed(obj);\n        }\n    }\n\n    void around(org.zstack.header.message.Message obj) : send(obj) || reply(obj) || publish(obj) || handle(obj) {\n        Map<String, String> maskWords = getValuesToMask(obj);\n        if (maskWords.isEmpty()) {\n            proceed(obj);\n            return;\n        }\n\n        boolean extend = !thisJoinPoint.getSignature().getName().equals(\"handle\");\n        try (Utils.MaskWords h = new Utils.MaskWords(maskWords, extend)) {\n            proceed(obj);\n        }\n    }\n\n    void around() : execution(void org.zstack.header.rest.RESTFacade+.asyncJsonPost(String, Object, java.util.Map, org.zstack.header.rest.AsyncRESTCallback, java.util.concurrent.TimeUnit, long)) {\n        Object cmd = thisJoinPoint.getArgs()[1];\n        Map<String, String> maskWords = getValuesToMask(cmd);\n        if (maskWords.isEmpty()) {\n            proceed();\n            return;\n        }\n\n        try (Utils.MaskWords h = new Utils.MaskWords(maskWords, true)) {\n            proceed();\n        }\n    }\n\n    MessageReply around(org.zstack.header.message.Message obj) : args(obj, ..) && execution(MessageReply org.zstack.core.cloudbus.CloudBus.call(Message+, ..)) {\n        Map<String, String> maskWords = getValuesToMask(obj);\n        if (maskWords.isEmpty()) {\n            return proceed(obj);\n        }\n\n        try (Utils.MaskWords h = new Utils.MaskWords(maskWords, true)) {\n            return proceed(obj);\n        }\n    }\n\n    private Map<String, String> getValuesToMask(Object obj) {\n        try {\n            return LogSafeGson.getValuesToMask(obj);\n        } catch (Throwable t) {\n            return Collections.emptyMap();\n        }\n    }\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"095ca0dac4159022386b6f19e4baa45bba63c01a","subject":"added tx to some log messages, added log.error to rollback catch","message":"added tx to some log messages,\nadded log.error to rollback catch\n","repos":"palava\/palava-jpa-aspectj","old_file":"src\/main\/java\/de\/cosmocode\/palava\/jpa\/aspectj\/EntityTransactionAspect.aj","new_file":"src\/main\/java\/de\/cosmocode\/palava\/jpa\/aspectj\/EntityTransactionAspect.aj","new_contents":"\/**\n * Copyright 2010 CosmoCode GmbH\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage de.cosmocode.palava.jpa.aspectj;\n\nimport javax.persistence.EntityManager;\nimport javax.persistence.EntityTransaction;\nimport javax.persistence.PersistenceException;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\nimport de.cosmocode.palava.jpa.Transactional;\n\npublic final aspect EntityTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(EntityTransactionAspect.class);\n\n    private Provider<EntityManager> currentManager;\n    \n    @Inject\n    public void setProvider(Provider<EntityManager> manager) {\n        this.currentManager = Preconditions.checkNotNull(manager, \"Manager\");\n    }\n    \n    pointcut transactional(): execution(@Transactional * *.*(..));\n\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        final EntityManager manager = currentManager.get();\n        LOG.trace(\"Retrieved entitymanager {}\", manager);\n        final EntityTransaction tx = manager.getTransaction();\n        LOG.trace(\"Using transaction {}\", tx);\n        final boolean localTx = !tx.isActive();\n        \n        if (localTx) {\n            LOG.trace(\"Beginning automatic transaction {}\", tx);\n            tx.begin();\n        } else {\n            LOG.trace(\"Transaction {} already active\", tx);\n        }\n        \n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (RuntimeException e) {\n            LOG.debug(\"Exception inside automatic transaction context; rolling back\", e);\n            tx.rollback();\n            throw e;\n        }\n        \n        if (localTx && tx.isActive()) {\n            if (tx.getRollbackOnly()) {\n                LOG.debug(\"Transaction {} was marked as rollback only. Rolling back...\", tx);\n                tx.rollback();\n            } else {\n                try {\n                    tx.commit();\n                    LOG.trace(\"Committed automatic transaction {}\", tx);\n                } catch (PersistenceException e) {\n                    LOG.debug(\"Commit in automatic transaction context failed\", e);\n                    if (tx.isActive()) {\n                        LOG.debug(\"Rolling back {}\", tx);\n                        try {\n                            tx.rollback();\n                        } catch (PersistenceException e2) {\n                            LOG.error(\"Commit in automatic transaction context failed\", e);\n                            throw e2;\n                        }\n                    } else {\n                        LOG.debug(\"Can't roll back inactive transaction {}\", tx);\n                    }\n                    throw e;\n                }\n            }\n        } else {\n            LOG.trace(\"Not committing non-local transaction {}\", tx);\n        }\n        \n        return returnValue;\n    }\n    \n}\n","old_contents":"\/**\n * Copyright 2010 CosmoCode GmbH\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage de.cosmocode.palava.jpa.aspectj;\n\nimport javax.persistence.EntityManager;\nimport javax.persistence.EntityTransaction;\nimport javax.persistence.PersistenceException;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\nimport de.cosmocode.palava.jpa.Transactional;\n\npublic final aspect EntityTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(EntityTransactionAspect.class);\n\n    private Provider<EntityManager> currentManager;\n    \n    @Inject\n    public void setProvider(Provider<EntityManager> manager) {\n        this.currentManager = Preconditions.checkNotNull(manager, \"Manager\");\n    }\n    \n    pointcut transactional(): execution(@Transactional * *.*(..));\n\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        final EntityManager manager = currentManager.get();\n        LOG.trace(\"Retrieved entitymanager {}\", manager);\n        final EntityTransaction tx = manager.getTransaction();\n        LOG.trace(\"Using transaction {}\", tx);\n        final boolean localTx = !tx.isActive();\n        \n        if (localTx) {\n            LOG.trace(\"Beginning automatic transaction\");\n            tx.begin();\n        } else {\n            LOG.trace(\"Transaction already active\");\n        }\n        \n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (RuntimeException e) {\n            LOG.debug(\"Exception inside automatic transaction context; rolling back\", e);\n            tx.rollback();\n            throw e;\n        }\n        \n        if (localTx && tx.isActive()) {\n            if (tx.getRollbackOnly()) {\n                LOG.debug(\"Transaction was marked as rollback only. Rolling back...\");\n                tx.rollback();\n            } else {\n                try {\n                    tx.commit();\n                    LOG.trace(\"Committed automatic transaction\");\n                } catch (PersistenceException e) {\n                    LOG.debug(\"Commit in automatic transaction context failed\", e);\n                    if (tx.isActive()) {\n                        LOG.debug(\"Rolling back {}\", tx);\n                        tx.rollback();\n                    } else {\n                        LOG.debug(\"Can't roll back inactive transaction {}\", tx);\n                    }\n                    throw e;\n                }\n            }\n        } else {\n            LOG.trace(\"Not committing non-local transaction {}\", tx);\n        }\n        \n        return returnValue;\n    }\n    \n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"d2097f45309213afb3c3ff2e1f59217bb29e7996","subject":"moved sneakyThrow to finally block","message":"moved sneakyThrow to finally block\n","repos":"palava\/palava-jpa-aspectj","old_file":"src\/main\/java\/de\/cosmocode\/palava\/jpa\/aspectj\/EntityTransactionAspect.aj","new_file":"src\/main\/java\/de\/cosmocode\/palava\/jpa\/aspectj\/EntityTransactionAspect.aj","new_contents":"\/**\n * Copyright 2010 CosmoCode GmbH\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage de.cosmocode.palava.jpa.aspectj;\n\nimport javax.persistence.EntityManager;\nimport javax.persistence.EntityTransaction;\nimport javax.persistence.PersistenceException;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.gag.annotation.remark.Hack;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\nimport de.cosmocode.palava.jpa.Transactional;\n\npublic final aspect EntityTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(EntityTransactionAspect.class);\n\n    private Provider<EntityManager> currentManager;\n    \n    @Inject\n    public void setProvider(Provider<EntityManager> manager) {\n        this.currentManager = Preconditions.checkNotNull(manager, \"Manager\");\n    }\n    \n    pointcut transactional(): execution(@Transactional * *.*(..));\n\n    @SuppressWarnings(\"finally\")\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        final EntityManager manager = currentManager.get();\n        LOG.trace(\"Retrieved entitymanager {}\", manager);\n        final EntityTransaction tx = manager.getTransaction();\n        LOG.trace(\"Using transaction {}\", tx);\n        \n        final boolean local = !tx.isActive();\n        \n        if (local) {\n            LOG.debug(\"Beginning automatic transaction {}\", tx);\n            tx.begin();\n        } else {\n            LOG.trace(\"Transaction {} already active\", tx);\n        }\n        \n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (Exception e) {\n            try {\n                if (local && (tx.isActive() || tx.getRollbackOnly())) {\n                    LOG.debug(\"Rolling back local\/active transaction {}\", tx);\n                    tx.rollback();\n                } else if (!tx.getRollbackOnly()) {\n                    LOG.debug(\"Setting transaction {} as rollback only\", tx);\n                    tx.setRollbackOnly();\n                }\n            } catch (PersistenceException inner) {\n                LOG.error(\"Rollback failed\", inner);\n            } finally {\n                \/\/ hack to support throwing checked exceptions\n                return sneakyThrow(e);\n            }\n        }\n        \n        if (local && tx.isActive()) {\n            if (tx.getRollbackOnly()) {\n                LOG.debug(\"Rolling back marked transaction {}\", tx);\n                tx.rollback();\n            } else {\n                try {\n                    tx.commit();\n                    LOG.trace(\"Committed automatic transaction {}\", tx);\n                } catch (PersistenceException e) {\n                    try {\n                        LOG.debug(\"Rolling back transaction {}\", tx);\n                        tx.rollback();\n                    } catch (PersistenceException inner) {\n                        LOG.error(\"Rollback failed\", inner);\n                    }\n                    throw e;\n                }\n            }\n        } else {\n            LOG.trace(\"Not committing non-local transaction {}\", tx);\n        }\n        \n        return returnValue;\n    }\n    \n    @Hack(\"Why is this possible?\")\n    private Object sneakyThrow(Throwable t) {\n        this.<RuntimeException>doSneakyThrow(t);\n        return null;\n    }\n\n    @SuppressWarnings(\"unchecked\")\n    private <T extends Throwable> T doSneakyThrow(Throwable t) throws T {\n        throw (T) t;\n    }\n    \n}\n","old_contents":"\/**\n * Copyright 2010 CosmoCode GmbH\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage de.cosmocode.palava.jpa.aspectj;\n\nimport javax.persistence.EntityManager;\nimport javax.persistence.EntityTransaction;\nimport javax.persistence.PersistenceException;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.gag.annotation.remark.Hack;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\nimport de.cosmocode.palava.jpa.Transactional;\n\npublic final aspect EntityTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(EntityTransactionAspect.class);\n\n    private Provider<EntityManager> currentManager;\n    \n    @Inject\n    public void setProvider(Provider<EntityManager> manager) {\n        this.currentManager = Preconditions.checkNotNull(manager, \"Manager\");\n    }\n    \n    pointcut transactional(): execution(@Transactional * *.*(..));\n\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        final EntityManager manager = currentManager.get();\n        LOG.trace(\"Retrieved entitymanager {}\", manager);\n        final EntityTransaction tx = manager.getTransaction();\n        LOG.trace(\"Using transaction {}\", tx);\n        \n        final boolean local = !tx.isActive();\n        \n        if (local) {\n            LOG.debug(\"Beginning automatic transaction {}\", tx);\n            tx.begin();\n        } else {\n            LOG.trace(\"Transaction {} already active\", tx);\n        }\n        \n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (Exception e) {\n            try {\n                if (local && (tx.isActive() || tx.getRollbackOnly())) {\n                    LOG.debug(\"Rolling back local\/active transaction {}\", tx);\n                    tx.rollback();\n                } else if (!tx.getRollbackOnly()) {\n                    LOG.debug(\"Setting transaction {} as rollback only\", tx);\n                    tx.setRollbackOnly();\n                }\n            } catch (PersistenceException inner) {\n                LOG.error(\"Rollback failed\", inner);\n            }\n            \n            \/\/ hack to support throwing checked exceptions\n            return sneakyThrow(e);\n        }\n        \n        if (local && tx.isActive()) {\n            if (tx.getRollbackOnly()) {\n                LOG.debug(\"Rolling back marked transaction {}\", tx);\n                tx.rollback();\n            } else {\n                try {\n                    tx.commit();\n                    LOG.trace(\"Committed automatic transaction {}\", tx);\n                } catch (PersistenceException e) {\n                    try {\n                        LOG.debug(\"Rolling back transaction {}\", tx);\n                        tx.rollback();\n                    } catch (PersistenceException inner) {\n                        LOG.error(\"Rollback failed\", inner);\n                    }\n                    throw e;\n                }\n            }\n        } else {\n            LOG.trace(\"Not committing non-local transaction {}\", tx);\n        }\n        \n        return returnValue;\n    }\n    \n    @Hack(\"Why is this possible?\")\n    private Object sneakyThrow(Throwable t) {\n        this.<RuntimeException>doSneakyThrow(t);\n        return null;\n    }\n\n    @SuppressWarnings(\"unchecked\")\n    private <T extends Throwable> T doSneakyThrow(Throwable t) throws T {\n        throw (T) t;\n    }\n    \n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"0ca8334ecbae573760530b6f2000d1e769e3cec6","subject":"journal LinkedHashMap\/LinkedHashSet","message":"journal LinkedHashMap\/LinkedHashSet\n","repos":"mebigfatguy\/hashshmash","old_file":"aj\/com\/mebigfatguy\/hashshmash\/HashCollector.aj","new_file":"aj\/com\/mebigfatguy\/hashshmash\/HashCollector.aj","new_contents":"\/*\n * hashshmash - An aspect to record HashMap\/Set allocations\n * Copyright 2013 MeBigFatGuy.com\n * Copyright 2013 Dave Brosius\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *    http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing,\n * software distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and limitations\n * under the License.\n *\/\npackage com.mebigfatguy.hashshmash;\n\nimport java.io.BufferedWriter;\nimport java.io.File;\nimport java.io.FileOutputStream;\nimport java.io.OutputStreamWriter;\nimport java.io.PrintWriter;\nimport java.lang.reflect.Field;\nimport java.text.SimpleDateFormat;\nimport java.util.Date;\nimport java.util.HashMap;\nimport java.util.HashSet;\nimport java.util.Map;\nimport java.util.Map.Entry;\nimport java.util.Set;\nimport java.util.concurrent.ConcurrentHashMap;\n\npublic aspect HashCollector {\n    \n    private static final Journaller journaller = new Journaller();\n\n    after() returning (Map<?,?> m): call(HashMap.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashMapDetails details = new HashMapDetails(m, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    after() returning (Map<?,?> m): call(LinkedHashMap.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashMapDetails details = new LinkedHashMapDetails(m, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    after() returning (Set<?> s): call(HashSet.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashSetDetails details = new HashSetDetails(s, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    after() returning (Set<?> s): call(LinkedHashSet.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashSetDetails details = new LinkedHashSetDetails(s, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    before(): execution(public static void *.main(String[])) {\n        Class<?> c = HashCollector.class;\n    }\n}\n\nfinal class Journaller implements Runnable {\n    \n    private static final int SLEEP_TIME = 5 * 1000;\n    \n    private Field tableField;\n    private ConcurrentHashMap<HashDetails, HashDetails> hDetails = new ConcurrentHashMap<HashDetails, HashDetails>();\n    private PrintWriter writer;\n    private boolean operational = false;\n\n    public Journaller() {\n        try {\n            System.out.println(\"*************************\");\n            System.out.println(\"HASHSHMASH ASPECT ENABLED\");\n            System.out.println(\"*************************\");\n            \n            tableField = HashMap.class.getDeclaredField(\"table\");\n            tableField.setAccessible(true);\n              \n            File dir = new File(System.getProperty(\"user.home\"), \".hashshmash\");\n            dir.mkdirs();  \n            \n            writer = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(new File(dir, new Date().toString() + \".txt\")))));\n            \n            Thread t = new Thread(this);\n            t.setDaemon(true);\n            operational = true;\n            t.start();\n        } catch (Exception e) {\n        }\n    }\n    \n    public void add(HashDetails details) {\n        if (operational)\n            hDetails.put(details,  details);\n    }\n    \n    public void run() {\n        try {\n            while (!Thread.interrupted()) {\n                Thread.sleep(SLEEP_TIME);\n                \n                for (HashDetails details : hDetails.keySet()) {\n                    try {\n                        Map<?, ?> map = details.getMap();\n                        if (map != null) {\n                            int newSize = details.getMap().size();\n                            if (newSize == details.size) {\n                                Entry<?, ?>[] table = (Entry<?, ?>[])tableField.get(map);\n                                details.totalSlots = table.length;\n                                for (Entry<?, ?> e : table) {\n                                    if (e != null) {\n                                        details.usedSlots++;\n                                    }\n                                }\n                                writer.println(details);\n                                hDetails.remove(details);\n                            } else\n                                details.size = newSize;\n                        } else {\n                            hDetails.remove(details);\n                        }\n                    } catch (Exception e) {\n                        \/\/might get ConcurrentModificationException or such, just ignore\n                    }\n                }\n                writer.flush();\n            }\n        } catch (InterruptedException ie) {    \n        }\n    }\n}\n\nabstract class HashDetails {\n    private static SimpleDateFormat FORMATTER = new SimpleDateFormat(\"MM\/dd\/yyyy HH:mm:ss-SSS\");\n    \n    public Date allocTime;\n    public String caller;\n    public int size;\n    public int usedSlots;\n    public int totalSlots;\n    \n    public abstract Map<?,?> getMap();\n    \n    public abstract String getDetailType();\n    \n    public String toString() {\n        return getDetailType() + \"\\t\" + FORMATTER.format(allocTime) + \"\\t\" + caller + \"\\t\" + getMap().size() + \"\\t\" + totalSlots + \"\\t\" + usedSlots;\n    }\n}\n\nclass HashMapDetails extends HashDetails {\n    public Map<?, ?> map;\n\n    public HashMapDetails(Map<?, ?> m, Date d, String c) {\n        map = m;\n        allocTime = d;\n        caller = c;\n        size = map.size();\n    }\n    \n    public Map<?,?> getMap() {\n        return map;\n    }\n    \n    public String getDetailType() {\n        return map.getClass().getSimpleName();\n    }\n}\n\nclass LinkedHashMapDetails extends HashMapDetails {\n    public Map<?, ?> map;\n\n    public LinkedHashMapDetails(Map<?, ?> m, Date d, String c) {\n       super(m, d, c);\n    }\n    \n    public String getDetailType() {\n        return map.getClass().getSimpleName();\n    }\n}\n\nclass HashSetDetails extends HashDetails {\n    private static Field MAP_FIELD;\n    static {\n        try {\n            MAP_FIELD = HashSet.class.getDeclaredField(\"map\");\n            MAP_FIELD.setAccessible(true);\n        } catch (Exception e) {\n            MAP_FIELD = null;\n        }\n    }\n    \n    public Set<?> set;\n\n    public HashSetDetails(Set<?> s, Date d, String c) {\n        set = s;\n        allocTime = d;\n        caller = c;\n        size = set.size();\n    }\n    \n    public Map<?,?> getMap() {\n        try {\n            if (MAP_FIELD == null)\n                return null;\n            \n            return (Map<?,?>) MAP_FIELD.get(set);\n        } catch (Exception e) {\n            return null;\n        }\n    }\n    \n    public String getDetailType() {\n        return set.getClass().getSimpleName();\n    }\n}\n\nclass LinkedHashSetDetails extends HashSetDetails {\n    public Map<?, ?> map;\n\n    public LinkedHashSetDetails(Set<?> s, Date d, String c) {\n       super(s, d, c);\n    }\n    \n    public String getDetailType() {\n        return map.getClass().getSimpleName();\n    }\n}\n","old_contents":"\/*\n * hashshmash - An aspect to record HashMap\/Set allocations\n * Copyright 2013 MeBigFatGuy.com\n * Copyright 2013 Dave Brosius\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *    http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing,\n * software distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and limitations\n * under the License.\n *\/\npackage com.mebigfatguy.hashshmash;\n\nimport java.io.BufferedWriter;\nimport java.io.File;\nimport java.io.FileOutputStream;\nimport java.io.OutputStreamWriter;\nimport java.io.PrintWriter;\nimport java.lang.reflect.Field;\nimport java.text.SimpleDateFormat;\nimport java.util.Date;\nimport java.util.HashMap;\nimport java.util.HashSet;\nimport java.util.Map;\nimport java.util.Map.Entry;\nimport java.util.Set;\nimport java.util.concurrent.ConcurrentHashMap;\n\npublic aspect HashCollector {\n    \n    private static final Journaller journaller = new Journaller();\n\n    after() returning (Map<?,?> m): call(HashMap.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashMapDetails details = new HashMapDetails(m, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    after() returning (Set<?> s): call(HashSet.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashSetDetails details = new HashSetDetails(s, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    before(): execution(public static void *.main(String[])) {\n        Class<?> c = HashCollector.class;\n    }\n}\n\nfinal class Journaller implements Runnable {\n    \n    private static final int SLEEP_TIME = 5 * 1000;\n    \n    private Field tableField;\n    private ConcurrentHashMap<HashDetails, HashDetails> hDetails = new ConcurrentHashMap<HashDetails, HashDetails>();\n    private PrintWriter writer;\n    private boolean operational = false;\n\n    public Journaller() {\n        try {\n            System.out.println(\"*************************\");\n            System.out.println(\"HASHSHMASH ASPECT ENABLED\");\n            System.out.println(\"*************************\");\n            \n            tableField = HashMap.class.getDeclaredField(\"table\");\n            tableField.setAccessible(true);\n              \n            File dir = new File(System.getProperty(\"user.home\"), \".hashshmash\");\n            dir.mkdirs();  \n            \n            writer = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(new File(dir, new Date().toString() + \".txt\")))));\n            \n            Thread t = new Thread(this);\n            t.setDaemon(true);\n            operational = true;\n            t.start();\n        } catch (Exception e) {\n        }\n    }\n    \n    public void add(HashDetails details) {\n        if (operational)\n            hDetails.put(details,  details);\n    }\n    \n    public void run() {\n        try {\n            while (!Thread.interrupted()) {\n                Thread.sleep(SLEEP_TIME);\n                \n                for (HashDetails details : hDetails.keySet()) {\n                    try {\n                        Map<?, ?> map = details.getMap();\n                        if (map != null) {\n                            int newSize = details.getMap().size();\n                            if (newSize == details.size) {\n                                Entry<?, ?>[] table = (Entry<?, ?>[])tableField.get(map);\n                                details.totalSlots = table.length;\n                                for (Entry<?, ?> e : table) {\n                                    if (e != null) {\n                                        details.usedSlots++;\n                                    }\n                                }\n                                writer.println(details);\n                                hDetails.remove(details);\n                            } else\n                                details.size = newSize;\n                        } else {\n                            hDetails.remove(details);\n                        }\n                    } catch (Exception e) {\n                        \/\/might get ConcurrentModificationException or such, just ignore\n                    }\n                }\n                writer.flush();\n            }\n        } catch (InterruptedException ie) {    \n        }\n    }\n}\n\nabstract class HashDetails {\n    private static SimpleDateFormat FORMATTER = new SimpleDateFormat(\"MM\/dd\/yyyy HH:mm:ss-SSS\");\n    \n    public Date allocTime;\n    public String caller;\n    public int size;\n    public int usedSlots;\n    public int totalSlots;\n    \n    public abstract Map<?,?> getMap();\n    \n    public abstract String getDetailType();\n    \n    public String toString() {\n        return getDetailType() + \"\\t\" + FORMATTER.format(allocTime) + \"\\t\" + caller + \"\\t\" + getMap().size() + \"\\t\" + totalSlots + \"\\t\" + usedSlots;\n    }\n}\n\nclass HashMapDetails extends HashDetails {\n    public Map<?, ?> map;\n\n    public HashMapDetails(Map<?, ?> m, Date d, String c) {\n        map = m;\n        allocTime = d;\n        caller = c;\n        size = map.size();\n    }\n    \n    public Map<?,?> getMap() {\n        return map;\n    }\n    \n    public String getDetailType() {\n        return map.getClass().getSimpleName();\n    }\n}\n\nclass HashSetDetails extends HashDetails {\n    private static Field MAP_FIELD;\n    static {\n        try {\n            MAP_FIELD = HashSet.class.getDeclaredField(\"map\");\n            MAP_FIELD.setAccessible(true);\n        } catch (Exception e) {\n            MAP_FIELD = null;\n        }\n    }\n    \n    public Set<?> set;\n\n    public HashSetDetails(Set<?> s, Date d, String c) {\n        set = s;\n        allocTime = d;\n        caller = c;\n        size = set.size();\n    }\n    \n    public Map<?,?> getMap() {\n        try {\n            if (MAP_FIELD == null)\n                return null;\n            \n            return (Map<?,?>) MAP_FIELD.get(set);\n        } catch (Exception e) {\n            return null;\n        }\n    }\n    \n    public String getDetailType() {\n        return set.getClass().getSimpleName();\n    }\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"4e0cfc72c02ad8d09c5b31c1f577e1e227e57d71","subject":"Added location accuracy to logs","message":"Added location accuracy to logs\n","repos":"hongnguyenpro\/ignition,beni55\/ignition,mttkay\/ignition,Applied-Duality\/ignition,treejames\/ignition","old_file":"ignition-location\/ignition-location-lib\/src\/com\/github\/ignition\/location\/IgnitedLocationManager.aj","new_file":"ignition-location\/ignition-location-lib\/src\/com\/github\/ignition\/location\/IgnitedLocationManager.aj","new_contents":"\/*\n * Copyright 2011 Google Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * This code has been modified by Stefano Dacchille.\n *\/\n\npackage com.github.ignition.location;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\n\nimport android.app.Activity;\nimport android.app.PendingIntent;\nimport android.content.BroadcastReceiver;\nimport android.content.Context;\nimport android.content.Intent;\nimport android.content.IntentFilter;\nimport android.content.SharedPreferences;\nimport android.content.SharedPreferences.Editor;\nimport android.location.Criteria;\nimport android.location.Location;\nimport android.location.LocationListener;\nimport android.location.LocationManager;\nimport android.os.BatteryManager;\nimport android.os.Bundle;\nimport android.os.Handler;\nimport android.util.Log;\n\nimport com.github.ignition.location.annotations.IgnitedLocation;\nimport com.github.ignition.location.annotations.IgnitedLocationActivity;\nimport com.github.ignition.location.receivers.IgnitedLocationChangedReceiver;\nimport com.github.ignition.location.receivers.IgnitedPassiveLocationChangedReceiver;\nimport com.github.ignition.location.tasks.IgnitedLastKnownLocationAsyncTask;\nimport com.github.ignition.location.templates.ILastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLocationUpdateRequester;\nimport com.github.ignition.location.templates.OnIgnitedLocationChangedListener;\nimport com.github.ignition.location.utils.PlatformSpecificImplementationFactory;\nimport com.github.ignition.support.IgnitedDiagnostics;\n\n@SuppressAjWarnings\npublic aspect IgnitedLocationManager {\n    public static final String LOG_TAG = IgnitedLocationManager.class.getSimpleName();\n\n    declare parents : (@IgnitedLocationActivity *) implements OnIgnitedLocationChangedListener;\n\n    private Criteria defaultCriteria, lowPowerCriteria;\n    protected IgnitedAbstractLocationUpdateRequester locationUpdateRequester;\n    protected PendingIntent locationListenerPendingIntent, locationListenerPassivePendingIntent;\n    protected LocationManager locationManager;\n    protected IgnitedLocationListener bestInactiveLocationProviderListener;\n\n    private Context context;\n    private volatile Location currentLocation;\n\n    private IgnitedLastKnownLocationAsyncTask ignitedLastKnownLocationTask;\n    private SharedPreferences prefs;\n    private Handler handler;\n\n    private long locationUpdatesInterval, passiveLocationUpdatesInterval;\n    private int locationUpdatesDistanceDiff;\n    private int passiveLocationUpdatesDistanceDiff;\n    private boolean requestLocationUpdates;\n    private boolean locationUpdatesDisabled = true;\n\n    \/\/ Switch to another provider if gps doesn't return a location quickly enough.\n    private Runnable removeGpsUpdates = new Runnable() {\n        @Override\n        public void run() {\n            Log.d(LOG_TAG,\n                    \"It looks like GPS isn't available at this time (i.e.: maybe you're indoors). Removing GPS location updates and requesting network updates.\");\n\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, lowPowerCriteria());\n        }\n    };\n\n    \/**\n     * If the Location Provider we're using to receive location updates is disabled while the app is\n     * running, this Receiver will be notified, allowing us to re-register our Location Receivers\n     * using the best available Location Provider is still available.\n     *\/\n    protected BroadcastReceiver locationProviderDisabledReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            boolean providerDisabled = !intent.getBooleanExtra(\n                    LocationManager.KEY_PROVIDER_ENABLED, false);\n            \/\/ Re-register the location listeners using the best available\n            \/\/ Location Provider.\n            if (providerDisabled) {\n                disableLocationUpdates(false);\n                requestLocationUpdates(context, null);\n            }\n        }\n    };\n\n    \/**\n     * If the battery state is low disable the passive location update receiver.\n     *\/\n    protected BroadcastReceiver refreshLocationUpdatesReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, null);\n        }\n    };\n\n    after(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onCreate(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n\n        \/\/ Get a reference to the Context\n        this.context = context;\n        \/\/ Set pref file\n        prefs = context.getSharedPreferences(IgnitedLocationConstants.SHARED_PREFERENCE_FILE,\n                Context.MODE_PRIVATE);\n        \/\/ Get references to the managers\n        locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);\n        handler = new Handler();\n\n        \/\/ Specify the Criteria to use when requesting location updates while\n        \/\/ the application is Active\n        if (defaultCriteria == null) {\n            defaultCriteria = new Criteria();\n        }\n        \/\/ Use gps if it's enabled and if battery level is at least 15%\n        boolean useGps = prefs.getBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS,\n                IgnitedLocationConstants.USE_GPS_DEFAULT);\n        if (useGps) {\n            defaultCriteria.setAccuracy(Criteria.ACCURACY_FINE);\n        } else {\n            defaultCriteria.setPowerRequirement(Criteria.POWER_LOW);\n        }\n\n        \/\/ Setup the location update Pending Intent\n        Intent activeIntent = new Intent(IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_ACTION);\n        locationListenerPendingIntent = PendingIntent.getBroadcast(context, 0, activeIntent,\n                PendingIntent.FLAG_UPDATE_CURRENT);\n        \/\/ Setup the passive location update Pending Intent\n        Intent passiveIntent = new Intent(context, IgnitedPassiveLocationChangedReceiver.class);\n        locationListenerPassivePendingIntent = PendingIntent.getBroadcast(context, 0,\n                passiveIntent, PendingIntent.FLAG_UPDATE_CURRENT);\n\n        \/\/ Instantiate a Location Update Requester class based on the available\n        \/\/ platform version. This will be used to request location updates.\n        locationUpdateRequester = PlatformSpecificImplementationFactory\n                .getLocationUpdateRequester(context);\n    }\n\n    private boolean isBatteryOk() {\n        IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);\n        Intent intent = context.registerReceiver(null, filter);\n        double currentLevel = 100.0;\n        if (intent != null) {\n            currentLevel = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1);\n        }\n\n        return currentLevel >= prefs.getInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                IgnitedLocationConstants.MIN_BATTERY_LEVEL_FOR_GPS_DEFAULT);\n    }\n\n    before(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onResume(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n        \/\/ Get a reference to the Context if this context is null\n        if (this.context == null) {\n            this.context = context;\n        }\n\n        saveToPreferences(context, ignitedAnnotation);\n\n        Log.d(LOG_TAG, \"Retrieving last known location...\");\n        \/\/ Get the last known location. This isn't directly affecting the UI, so put it on a\n        \/\/ worker thread.\n        if (ignitedLastKnownLocationTask == null) {\n            ignitedLastKnownLocationTask = new IgnitedLastKnownLocationAsyncTask(context,\n                    locationUpdatesDistanceDiff, locationUpdatesInterval);\n            ignitedLastKnownLocationTask.execute();\n        }\n    }\n\n    \/**\n     * Save last settings to preferences.\n     * \n     * @param context\n     * @param locationAnnotation\n     *\/\n    private void saveToPreferences(Context context, IgnitedLocationActivity locationAnnotation) {\n        requestLocationUpdates = locationAnnotation.requestLocationUpdates();\n        locationUpdatesDistanceDiff = locationAnnotation.locationUpdatesDistanceDiff();\n        locationUpdatesInterval = locationAnnotation.locationUpdatesInterval();\n        passiveLocationUpdatesDistanceDiff = locationAnnotation\n                .passiveLocationUpdatesDistanceDiff();\n        passiveLocationUpdatesInterval = locationAnnotation.passiveLocationUpdatesInterval();\n        boolean enablePassiveLocationUpdates = locationAnnotation.enablePassiveUpdates();\n        boolean useGps = locationAnnotation.useGps();\n\n        Editor editor = prefs.edit();\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_LOCATION_UPDATES,\n                requestLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                enablePassiveLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS, useGps);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_DISTANCE_DIFF,\n                locationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_INTERVAL,\n                locationUpdatesInterval);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_DISTANCE_DIFF,\n                passiveLocationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_INTERVAL,\n                passiveLocationUpdatesInterval);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_RUN_ONCE, true);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                locationAnnotation.minBatteryLevelForGps());\n        editor.putLong(IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                locationAnnotation.waitForGpsFixInterval());\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                locationAnnotation.showWaitForLocationDialog());\n        editor.commit();\n\n    }\n\n    before(Activity activity, IgnitedLocationActivity ignitedAnnotation) : execution(* Activity.onPause(..)) \n        && @this(ignitedAnnotation) && this(activity) && within(@IgnitedLocationActivity *) {\n\n        if (ignitedAnnotation.requestLocationUpdates()) {\n            disableLocationUpdates(true);\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n\n        ignitedLastKnownLocationTask.getLastLocationFinder().cancel();\n\n        boolean finishing = activity.isFinishing();\n        if (finishing) {\n            if (ignitedLastKnownLocationTask != null) {\n                ignitedLastKnownLocationTask.cancel(true);\n                ignitedLastKnownLocationTask = null;\n            }\n            context = null;\n        }\n    }\n\n    Location around() : get(@IgnitedLocation Location *) {\n        return currentLocation;\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && within(IgnitedPassiveLocationChangedReceiver) && !adviceexecution() {\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, lng\/acc): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude() + \"\/\"\n                + currentLocation.getAccuracy());\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && (within(IgnitedLocationChangedReceiver) || within(IgnitedAbstractLastLocationFinder)\n                || within(IgnitedLastKnownLocationAsyncTask)) && !adviceexecution() {\n\n        if (context == null) {\n            return;\n        }\n        final Activity activity = (Activity) context;\n        boolean showWaitForLocationDialog = prefs.getBoolean(\n                IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                IgnitedLocationConstants.SHOW_WAIT_FOR_LOCATION_DIALOG_DEFAULT);\n        if (freshLocation == null) {\n            if (showWaitForLocationDialog) {\n                activity.showDialog(R.id.ign_loc_dialog_wait_for_fix);\n            }\n            return;\n        }\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, lng\/acc): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude() + \"\/\" + currentLocation.getAccuracy());\n        boolean keepRequestingLocationUpdates = ((OnIgnitedLocationChangedListener) context)\n                .onIgnitedLocationChanged(currentLocation);\n        Bundle extras = freshLocation.getExtras();\n        \/\/ a) If location updates shouldn't be requested anymore turn them off.\n        \/\/ b) Don't turn location updates on if last location is too old, since the single location\n        \/\/ update is running.\n        if (!keepRequestingLocationUpdates) {\n            disableLocationUpdates(true);\n            \/\/ PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            return;\n        } else if (requestLocationUpdates\n                && !extras.containsKey(ILastLocationFinder.LAST_LOCATION_TOO_OLD_OR_INACCURATE_EXTRA)) {\n            \/\/ If we requested location updates, turn them on here.\n            requestLocationUpdates(context, null);\n        }\n\n        \/\/ If gps is enabled location comes from gps, remove runnable that removes gps updates\n        boolean lastLocation = extras.containsKey(IgnitedLocationConstants.IGNITED_LAST_LOCATION_EXTRA);\n        if (!lastLocation && defaultCriteria.getAccuracy() == Criteria.ACCURACY_FINE\n                && currentLocation.getProvider().equals(LocationManager.GPS_PROVIDER)) {\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n    }\n\n    \/**\n     * Start listening for location updates.\n     *\/\n    protected void requestLocationUpdates(Context context, Criteria criteria) {\n        if (!locationUpdatesDisabled) {\n            return;\n        }\n        Criteria locationUpdateCriteria = criteria;\n        if (criteria == null) {\n            if (isBatteryOk()) {\n                locationUpdateCriteria = defaultCriteria;\n            } else {\n                locationUpdateCriteria = lowPowerCriteria();\n            }\n        }\n        Log.d(LOG_TAG, \"Disabling passive location updates\");\n        locationManager.removeUpdates(locationListenerPassivePendingIntent);\n\n        Log.d(LOG_TAG, \"Requesting location updates\");\n        \/\/ Normal updates while activity is visible.\n        locationUpdateRequester.requestLocationUpdates(locationUpdatesInterval,\n                locationUpdatesDistanceDiff, locationUpdateCriteria, locationListenerPendingIntent);\n\n        \/\/ Register a receiver that listens for when the provider I'm using has\n        \/\/ been disabled.\n        IntentFilter locationProviderDisabledIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_PROVIDER_DISABLED_ACTION);\n        context.registerReceiver(locationProviderDisabledReceiver,\n                locationProviderDisabledIntentFilter);\n\n        IntentFilter refreshLocationUpdatesIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.UPDATE_LOCATION_UPDATES_CRITERIA_ACTION);\n        context.registerReceiver(refreshLocationUpdatesReceiver, refreshLocationUpdatesIntentFilter);\n\n        \/\/ Register a receiver that listens for when a better provider than I'm\n        \/\/ using becomes available.\n        String bestProvider = locationManager.getBestProvider(locationUpdateCriteria, false);\n        String bestAvailableProvider = locationManager.getBestProvider(locationUpdateCriteria, true);\n        if (bestProvider != null && !bestProvider.equals(bestAvailableProvider)) {\n            bestInactiveLocationProviderListener = new IgnitedLocationListener(context);\n            locationManager.requestLocationUpdates(bestProvider, 0, 0,\n                    bestInactiveLocationProviderListener, context.getMainLooper());\n        }\n\n        if (bestAvailableProvider.equals(LocationManager.GPS_PROVIDER)) {\n            Log.d(LOG_TAG, \"Posting delayed remove GPS updates message\");\n            \/\/ Post a runnable that will remove gps updates if no gps location is returned after 1\n            \/\/ minute in order to avoid draining the battery.\n            handler.postDelayed(removeGpsUpdates, prefs.getLong(\n                    IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                    IgnitedLocationConstants.WAIT_FOR_GPS_FIX_INTERVAL_DEFAULT));\n        }\n\n        locationUpdatesDisabled = false;\n    }\n\n    \/**\n     * Stop listening for location updates\n     * \n     * @param enablePassiveLocationUpdates\n     *\/\n    protected void disableLocationUpdates(boolean requestPassiveLocationUpdates) {\n        if (locationUpdatesDisabled) {\n            return;\n        }\n\n        Log.d(LOG_TAG, \"Disabling location updates\");\n        context.unregisterReceiver(locationProviderDisabledReceiver);\n        context.unregisterReceiver(refreshLocationUpdatesReceiver);\n\n        locationUpdateRequester.removeLocationUpdates();\n        if (bestInactiveLocationProviderListener != null) {\n            locationManager.removeUpdates(bestInactiveLocationProviderListener);\n        }\n\n        boolean finishing = ((Activity) context).isFinishing();\n\n        if (requestPassiveLocationUpdates && !finishing) {\n            requestPassiveLocationUpdates();\n        }\n\n        locationUpdatesDisabled = true;\n    }\n\n    private void requestPassiveLocationUpdates() {\n        if (IgnitedDiagnostics.SUPPORTS_FROYO\n                && prefs.getBoolean(\n                        IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                        IgnitedLocationConstants.ENABLE_PASSIVE_LOCATION_UPDATES_DEFAULT)) {\n            Log.d(LOG_TAG, \"Requesting passive location updates\");\n            \/\/ Passive location updates from 3rd party apps when the Activity isn't\n            \/\/ visible. Only for Android 2.2+.\n            locationUpdateRequester.requestPassiveLocationUpdates(passiveLocationUpdatesInterval,\n                    passiveLocationUpdatesDistanceDiff, locationListenerPassivePendingIntent);\n        }\n    }\n\n    public boolean isLocationUpdatesDisabled() {\n        return locationUpdatesDisabled;\n    }\n\n    public Criteria lowPowerCriteria() {\n        if (lowPowerCriteria == null) {\n            lowPowerCriteria = new Criteria();\n            lowPowerCriteria.setPowerRequirement(Criteria.POWER_LOW);\n            lowPowerCriteria.setAccuracy(Criteria.NO_REQUIREMENT);\n        }\n        return lowPowerCriteria;\n    }\n\n    \/**\n     * If the best Location Provider (usually GPS) is not available when we request location\n     * updates, this listener will be notified if \/ when it becomes available. It calls\n     * requestLocationUpdates to re-register the location listeners using the better Location\n     * Provider.\n     *\/\n    private class IgnitedLocationListener implements LocationListener {\n        private Context context;\n\n        public IgnitedLocationListener(Context appContext) {\n            this.context = appContext;\n        }\n\n        @Override\n        public void onLocationChanged(Location l) {\n        }\n\n        @Override\n        public void onProviderDisabled(String provider) {\n        }\n\n        @Override\n        public void onStatusChanged(String provider, int status, Bundle extras) {\n        }\n\n        @Override\n        public void onProviderEnabled(String provider) {\n            \/\/ Re-register the location listeners using the better Location\n            \/\/ Provider.\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, null);\n        }\n    }\n\n}\n","old_contents":"\/*\n * Copyright 2011 Google Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * This code has been modified by Stefano Dacchille.\n *\/\n\npackage com.github.ignition.location;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\n\nimport android.app.Activity;\nimport android.app.PendingIntent;\nimport android.content.BroadcastReceiver;\nimport android.content.Context;\nimport android.content.Intent;\nimport android.content.IntentFilter;\nimport android.content.SharedPreferences;\nimport android.content.SharedPreferences.Editor;\nimport android.location.Criteria;\nimport android.location.Location;\nimport android.location.LocationListener;\nimport android.location.LocationManager;\nimport android.os.BatteryManager;\nimport android.os.Bundle;\nimport android.os.Handler;\nimport android.util.Log;\n\nimport com.github.ignition.location.annotations.IgnitedLocation;\nimport com.github.ignition.location.annotations.IgnitedLocationActivity;\nimport com.github.ignition.location.receivers.IgnitedLocationChangedReceiver;\nimport com.github.ignition.location.receivers.IgnitedPassiveLocationChangedReceiver;\nimport com.github.ignition.location.tasks.IgnitedLastKnownLocationAsyncTask;\nimport com.github.ignition.location.templates.ILastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLocationUpdateRequester;\nimport com.github.ignition.location.templates.OnIgnitedLocationChangedListener;\nimport com.github.ignition.location.utils.PlatformSpecificImplementationFactory;\nimport com.github.ignition.support.IgnitedDiagnostics;\n\n@SuppressAjWarnings\npublic aspect IgnitedLocationManager {\n    public static final String LOG_TAG = IgnitedLocationManager.class.getSimpleName();\n\n    declare parents : (@IgnitedLocationActivity *) implements OnIgnitedLocationChangedListener;\n\n    private Criteria defaultCriteria, lowPowerCriteria;\n    protected IgnitedAbstractLocationUpdateRequester locationUpdateRequester;\n    protected PendingIntent locationListenerPendingIntent, locationListenerPassivePendingIntent;\n    protected LocationManager locationManager;\n    protected IgnitedLocationListener bestInactiveLocationProviderListener;\n\n    private Context context;\n    private volatile Location currentLocation;\n\n    private IgnitedLastKnownLocationAsyncTask ignitedLastKnownLocationTask;\n    private SharedPreferences prefs;\n    private Handler handler;\n\n    private long locationUpdatesInterval, passiveLocationUpdatesInterval;\n    private int locationUpdatesDistanceDiff;\n    private int passiveLocationUpdatesDistanceDiff;\n    private boolean requestLocationUpdates;\n    private boolean locationUpdatesDisabled = true;\n\n    \/\/ Switch to another provider if gps doesn't return a location quickly enough.\n    private Runnable removeGpsUpdates = new Runnable() {\n        @Override\n        public void run() {\n            Log.d(LOG_TAG,\n                    \"It looks like GPS isn't available at this time (i.e.: maybe you're indoors). Removing GPS location updates and requesting network updates.\");\n\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, lowPowerCriteria());\n        }\n    };\n\n    \/**\n     * If the Location Provider we're using to receive location updates is disabled while the app is\n     * running, this Receiver will be notified, allowing us to re-register our Location Receivers\n     * using the best available Location Provider is still available.\n     *\/\n    protected BroadcastReceiver locationProviderDisabledReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            boolean providerDisabled = !intent.getBooleanExtra(\n                    LocationManager.KEY_PROVIDER_ENABLED, false);\n            \/\/ Re-register the location listeners using the best available\n            \/\/ Location Provider.\n            if (providerDisabled) {\n                disableLocationUpdates(false);\n                requestLocationUpdates(context, null);\n            }\n        }\n    };\n\n    \/**\n     * If the battery state is low disable the passive location update receiver.\n     *\/\n    protected BroadcastReceiver refreshLocationUpdatesReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, null);\n        }\n    };\n\n    after(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onCreate(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n\n        \/\/ Get a reference to the Context\n        this.context = context;\n        \/\/ Set pref file\n        prefs = context.getSharedPreferences(IgnitedLocationConstants.SHARED_PREFERENCE_FILE,\n                Context.MODE_PRIVATE);\n        \/\/ Get references to the managers\n        locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);\n        handler = new Handler();\n\n        \/\/ Specify the Criteria to use when requesting location updates while\n        \/\/ the application is Active\n        if (defaultCriteria == null) {\n            defaultCriteria = new Criteria();\n        }\n        \/\/ Use gps if it's enabled and if battery level is at least 15%\n        boolean useGps = prefs.getBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS,\n                IgnitedLocationConstants.USE_GPS_DEFAULT);\n        if (useGps) {\n            defaultCriteria.setAccuracy(Criteria.ACCURACY_FINE);\n        } else {\n            defaultCriteria.setPowerRequirement(Criteria.POWER_LOW);\n        }\n\n        \/\/ Setup the location update Pending Intent\n        Intent activeIntent = new Intent(IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_ACTION);\n        locationListenerPendingIntent = PendingIntent.getBroadcast(context, 0, activeIntent,\n                PendingIntent.FLAG_UPDATE_CURRENT);\n        \/\/ Setup the passive location update Pending Intent\n        Intent passiveIntent = new Intent(context, IgnitedPassiveLocationChangedReceiver.class);\n        locationListenerPassivePendingIntent = PendingIntent.getBroadcast(context, 0,\n                passiveIntent, PendingIntent.FLAG_UPDATE_CURRENT);\n\n        \/\/ Instantiate a Location Update Requester class based on the available\n        \/\/ platform version. This will be used to request location updates.\n        locationUpdateRequester = PlatformSpecificImplementationFactory\n                .getLocationUpdateRequester(context);\n    }\n\n    private boolean isBatteryOk() {\n        IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);\n        Intent intent = context.registerReceiver(null, filter);\n        double currentLevel = 100.0;\n        if (intent != null) {\n            currentLevel = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1);\n        }\n\n        return currentLevel >= prefs.getInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                IgnitedLocationConstants.MIN_BATTERY_LEVEL_FOR_GPS_DEFAULT);\n    }\n\n    before(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onResume(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n        \/\/ Get a reference to the Context if this context is null\n        if (this.context == null) {\n            this.context = context;\n        }\n\n        saveToPreferences(context, ignitedAnnotation);\n\n        Log.d(LOG_TAG, \"Retrieving last known location...\");\n        \/\/ Get the last known location. This isn't directly affecting the UI, so put it on a\n        \/\/ worker thread.\n        if (ignitedLastKnownLocationTask == null) {\n            ignitedLastKnownLocationTask = new IgnitedLastKnownLocationAsyncTask(context,\n                    locationUpdatesDistanceDiff, locationUpdatesInterval);\n            ignitedLastKnownLocationTask.execute();\n        }\n    }\n\n    \/**\n     * Save last settings to preferences.\n     * \n     * @param context\n     * @param locationAnnotation\n     *\/\n    private void saveToPreferences(Context context, IgnitedLocationActivity locationAnnotation) {\n        requestLocationUpdates = locationAnnotation.requestLocationUpdates();\n        locationUpdatesDistanceDiff = locationAnnotation.locationUpdatesDistanceDiff();\n        locationUpdatesInterval = locationAnnotation.locationUpdatesInterval();\n        passiveLocationUpdatesDistanceDiff = locationAnnotation\n                .passiveLocationUpdatesDistanceDiff();\n        passiveLocationUpdatesInterval = locationAnnotation.passiveLocationUpdatesInterval();\n        boolean enablePassiveLocationUpdates = locationAnnotation.enablePassiveUpdates();\n        boolean useGps = locationAnnotation.useGps();\n\n        Editor editor = prefs.edit();\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_LOCATION_UPDATES,\n                requestLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                enablePassiveLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS, useGps);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_DISTANCE_DIFF,\n                locationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_INTERVAL,\n                locationUpdatesInterval);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_DISTANCE_DIFF,\n                passiveLocationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_INTERVAL,\n                passiveLocationUpdatesInterval);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_RUN_ONCE, true);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                locationAnnotation.minBatteryLevelForGps());\n        editor.putLong(IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                locationAnnotation.waitForGpsFixInterval());\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                locationAnnotation.showWaitForLocationDialog());\n        editor.commit();\n\n    }\n\n    before(Activity activity, IgnitedLocationActivity ignitedAnnotation) : execution(* Activity.onPause(..)) \n        && @this(ignitedAnnotation) && this(activity) && within(@IgnitedLocationActivity *) {\n\n        if (ignitedAnnotation.requestLocationUpdates()) {\n            disableLocationUpdates(true);\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n\n        ignitedLastKnownLocationTask.getLastLocationFinder().cancel();\n\n        boolean finishing = activity.isFinishing();\n        if (finishing) {\n            if (ignitedLastKnownLocationTask != null) {\n                ignitedLastKnownLocationTask.cancel(true);\n                ignitedLastKnownLocationTask = null;\n            }\n            context = null;\n        }\n    }\n\n    Location around() : get(@IgnitedLocation Location *) {\n        return currentLocation;\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && within(IgnitedPassiveLocationChangedReceiver) && !adviceexecution() {\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, lng\/acc): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude() + \"\/\" + currentLocation.getAccuracy());\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && (within(IgnitedLocationChangedReceiver) || within(IgnitedAbstractLastLocationFinder)\n                || within(IgnitedLastKnownLocationAsyncTask)) && !adviceexecution() {\n\n        if (context == null) {\n            return;\n        }\n        final Activity activity = (Activity) context;\n        boolean showWaitForLocationDialog = prefs.getBoolean(\n                IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                IgnitedLocationConstants.SHOW_WAIT_FOR_LOCATION_DIALOG_DEFAULT);\n        if (freshLocation == null) {\n            if (showWaitForLocationDialog) {\n                activity.showDialog(R.id.ign_loc_dialog_wait_for_fix);\n            }\n            return;\n        }\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, lng\/acc): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude() + \"\/\" + currentLocation.getAccuracy());\n        boolean keepRequestingLocationUpdates = ((OnIgnitedLocationChangedListener) context)\n                .onIgnitedLocationChanged(currentLocation);\n        Bundle extras = freshLocation.getExtras();\n        \/\/ a) If location updates shouldn't be requested anymore turn them off.\n        \/\/ b) Don't turn location updates on if last location is too old, since the single location\n        \/\/ update is running.\n        if (!keepRequestingLocationUpdates) {\n            disableLocationUpdates(true);\n            \/\/ PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            return;\n        } else if (requestLocationUpdates\n                && !extras.containsKey(ILastLocationFinder.LAST_LOCATION_TOO_OLD_OR_INACCURATE_EXTRA)) {\n            \/\/ If we requested location updates, turn them on here.\n            requestLocationUpdates(context, null);\n        }\n\n        \/\/ If gps is enabled location comes from gps, remove runnable that removes gps updates\n        boolean lastLocation = extras.containsKey(IgnitedLocationConstants.IGNITED_LAST_LOCATION_EXTRA);\n        if (!lastLocation && defaultCriteria.getAccuracy() == Criteria.ACCURACY_FINE\n                && currentLocation.getProvider().equals(LocationManager.GPS_PROVIDER)) {\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n    }\n\n    \/**\n     * Start listening for location updates.\n     *\/\n    protected void requestLocationUpdates(Context context, Criteria criteria) {\n        if (!locationUpdatesDisabled) {\n            return;\n        }\n        Criteria locationUpdateCriteria = criteria;\n        if (criteria == null) {\n            if (isBatteryOk()) {\n                locationUpdateCriteria = defaultCriteria;\n            } else {\n                locationUpdateCriteria = lowPowerCriteria();\n            }\n        }\n        Log.d(LOG_TAG, \"Disabling passive location updates\");\n        locationManager.removeUpdates(locationListenerPassivePendingIntent);\n\n        Log.d(LOG_TAG, \"Requesting location updates\");\n        \/\/ Normal updates while activity is visible.\n        locationUpdateRequester.requestLocationUpdates(locationUpdatesInterval,\n                locationUpdatesDistanceDiff, locationUpdateCriteria, locationListenerPendingIntent);\n\n        \/\/ Register a receiver that listens for when the provider I'm using has\n        \/\/ been disabled.\n        IntentFilter locationProviderDisabledIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_PROVIDER_DISABLED_ACTION);\n        context.registerReceiver(locationProviderDisabledReceiver,\n                locationProviderDisabledIntentFilter);\n\n        IntentFilter refreshLocationUpdatesIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.UPDATE_LOCATION_UPDATES_CRITERIA_ACTION);\n        context.registerReceiver(refreshLocationUpdatesReceiver, refreshLocationUpdatesIntentFilter);\n\n        \/\/ Register a receiver that listens for when a better provider than I'm\n        \/\/ using becomes available.\n        String bestProvider = locationManager.getBestProvider(locationUpdateCriteria, false);\n        String bestAvailableProvider = locationManager.getBestProvider(locationUpdateCriteria, true);\n        if (bestProvider != null && !bestProvider.equals(bestAvailableProvider)) {\n            bestInactiveLocationProviderListener = new IgnitedLocationListener(context);\n            locationManager.requestLocationUpdates(bestProvider, 0, 0,\n                    bestInactiveLocationProviderListener, context.getMainLooper());\n        }\n\n        if (bestAvailableProvider.equals(LocationManager.GPS_PROVIDER)) {\n            Log.d(LOG_TAG, \"Posting delayed remove GPS updates message\");\n            \/\/ Post a runnable that will remove gps updates if no gps location is returned after 1\n            \/\/ minute in order to avoid draining the battery.\n            handler.postDelayed(removeGpsUpdates, prefs.getLong(\n                    IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                    IgnitedLocationConstants.WAIT_FOR_GPS_FIX_INTERVAL_DEFAULT));\n        }\n\n        locationUpdatesDisabled = false;\n    }\n\n    \/**\n     * Stop listening for location updates\n     * \n     * @param enablePassiveLocationUpdates\n     *\/\n    protected void disableLocationUpdates(boolean requestPassiveLocationUpdates) {\n        if (locationUpdatesDisabled) {\n            return;\n        }\n\n        Log.d(LOG_TAG, \"Disabling location updates\");\n        context.unregisterReceiver(locationProviderDisabledReceiver);\n        context.unregisterReceiver(refreshLocationUpdatesReceiver);\n\n        locationUpdateRequester.removeLocationUpdates();\n        if (bestInactiveLocationProviderListener != null) {\n            locationManager.removeUpdates(bestInactiveLocationProviderListener);\n        }\n\n        boolean finishing = ((Activity) context).isFinishing();\n\n        if (requestPassiveLocationUpdates && !finishing) {\n            requestPassiveLocationUpdates();\n        }\n\n        locationUpdatesDisabled = true;\n    }\n\n    private void requestPassiveLocationUpdates() {\n        if (IgnitedDiagnostics.SUPPORTS_FROYO\n                && prefs.getBoolean(\n                        IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                        IgnitedLocationConstants.ENABLE_PASSIVE_LOCATION_UPDATES_DEFAULT)) {\n            Log.d(LOG_TAG, \"Requesting passive location updates\");\n            \/\/ Passive location updates from 3rd party apps when the Activity isn't\n            \/\/ visible. Only for Android 2.2+.\n            locationUpdateRequester.requestPassiveLocationUpdates(passiveLocationUpdatesInterval,\n                    passiveLocationUpdatesDistanceDiff, locationListenerPassivePendingIntent);\n        }\n    }\n\n    public boolean isLocationUpdatesDisabled() {\n        return locationUpdatesDisabled;\n    }\n\n    public Criteria lowPowerCriteria() {\n        if (lowPowerCriteria == null) {\n            lowPowerCriteria = new Criteria();\n            lowPowerCriteria.setPowerRequirement(Criteria.POWER_LOW);\n            lowPowerCriteria.setAccuracy(Criteria.NO_REQUIREMENT);\n        }\n        return lowPowerCriteria;\n    }\n\n    \/**\n     * If the best Location Provider (usually GPS) is not available when we request location\n     * updates, this listener will be notified if \/ when it becomes available. It calls\n     * requestLocationUpdates to re-register the location listeners using the better Location\n     * Provider.\n     *\/\n    private class IgnitedLocationListener implements LocationListener {\n        private Context context;\n\n        public IgnitedLocationListener(Context appContext) {\n            this.context = appContext;\n        }\n\n        @Override\n        public void onLocationChanged(Location l) {\n        }\n\n        @Override\n        public void onProviderDisabled(String provider) {\n        }\n\n        @Override\n        public void onStatusChanged(String provider, int status, Bundle extras) {\n        }\n\n        @Override\n        public void onProviderEnabled(String provider) {\n            \/\/ Re-register the location listeners using the better Location\n            \/\/ Provider.\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, null);\n        }\n    }\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"a9f4bbd8b9bff9f7d8e5a84e06453f0d57f29516","subject":"added comments","message":"added comments\n","repos":"palava\/palava-jta","old_file":"src\/main\/java\/de\/cosmocode\/palava\/jta\/AbstractUserTransactionAspect.aj","new_file":"src\/main\/java\/de\/cosmocode\/palava\/jta\/AbstractUserTransactionAspect.aj","new_contents":"\/**\n * Copyright 2010 CosmoCode GmbH\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage de.cosmocode.palava.jta;\n\nimport javax.transaction.NotSupportedException;\nimport javax.transaction.Status;\nimport javax.transaction.SystemException;\nimport javax.transaction.UserTransaction;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.gag.annotation.remark.Hack;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.Registry;\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\n\npublic abstract aspect AbstractUserTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(AbstractUserTransactionAspect.class);\n\n    private Provider<UserTransaction> provider;\n\n    private TransactionBeginEvent begin;\n    private TransactionBeganEvent began;\n    private TransactionCommitEvent commit;\n    private TransactionCommittedEvent committed;\n    private TransactionRollbackEvent rollback;\n    private TransactionRolledbackEvent rolledback;\n    \n    @Inject\n    void setProvider(Provider<UserTransaction> provider) {\n        this.provider = Preconditions.checkNotNull(provider, \"Provider\");\n    }\n    \n    @Inject\n    void setRegistry(Registry registry) {\n        Preconditions.checkNotNull(registry, \"Registry\");\n        this.begin = registry.proxy(TransactionBeginEvent.class);\n        this.began = registry.proxy(TransactionBeganEvent.class);\n        this.commit = registry.proxy(TransactionCommitEvent.class);\n        this.committed = registry.proxy(TransactionCommittedEvent.class);\n        this.rollback = registry.proxy(TransactionRollbackEvent.class);\n        this.rolledback = registry.proxy(TransactionRolledbackEvent.class);\n    }\n    \n    protected abstract pointcut transactional();\n    \n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        Preconditions.checkNotNull(provider, \"Provider not injected yet\");\n        final UserTransaction tx = provider.get();\n        LOG.trace(\"Using transaction {}\", tx);\n\n        try {\n            LOG.trace(\"Status of transaction: {}\", tx.getStatus());\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        int status;\n        final boolean local;\n        try {\n            status = tx.getStatus();\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        local = status == Status.STATUS_NO_TRANSACTION;\n\n        if (local) {\n            LOG.debug(\"Beginning automatic transaction {}\", tx);\n            try {\n                begin.eventTransactionBegin(tx);\n                tx.begin();\n                began.eventTransactionBegan(tx);\n            } catch (NotSupportedException e) {\n                throw new IllegalStateException(e);\n            } catch (SystemException e) {\n                throw new IllegalStateException(e);\n            }\n        } else {\n            LOG.trace(\"Transaction {} already active (Status: {})\", tx, status);\n        }\n\n        try {\n            status = tx.getStatus();\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        final Object returnValue;\n        \n        try {\n            LOG.trace(\"Status before execution: {}\", status);\n            returnValue = proceed();\n        } catch (Exception e) {\n            try {\n                if (local && \n                    (tx.getStatus() == Status.STATUS_ACTIVE || tx.getStatus() == Status.STATUS_MARKED_ROLLBACK)) {\n                    LOG.info(\"Rolling back local\/active transaction {}\", tx);\n                    rollback(tx);\n                } else if (tx.getStatus() != Status.STATUS_ROLLEDBACK || tx.getStatus() != Status.STATUS_ROLLING_BACK) {\n                    LOG.debug(\"Setting transaction {} as rollback only\", tx);\n                    tx.setRollbackOnly();\n                }\n            } catch (Exception inner) {\n                LOG.error(\"Rollback failed\", inner);\n            }\n            \n            \/\/ hack to support throwing checked exceptions\n            return sneakyThrow(e);\n        }\n        \n        try {\n            status = tx.getStatus();\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        LOG.trace(\"Status after execution: {}\", status);\n        \n        if (local) {\n            if (status == Status.STATUS_MARKED_ROLLBACK) {\n                try {\n                    LOG.debug(\"Rolling back marked transaction {}\", tx);\n                    rollback(tx);\n                } catch (SystemException e) {\n                    throw new IllegalStateException(e);\n                }\n            } else {\n                try {\n                    commit.eventTransactionCommit(tx);\n                    tx.commit();\n                    committed.eventTransactionCommitted(tx);\n                    LOG.debug(\"Committed automatic transaction {}\", tx);\n                } catch (Exception e) {\n                    try {\n                        LOG.info(\"Rolling back transaction {}\", tx);\n                        rollback(tx);\n                    } catch (Exception inner) {\n                        LOG.error(\"Rollback failed\", inner);\n                    }\n                    throw new IllegalStateException(e);\n                }\n            }\n        }\n        \n        return returnValue;\n    }\n    \n    private void rollback(UserTransaction tx) throws SystemException {\n        rollback.eventTransactionRollback(tx);\n        tx.rollback();\n        rolledback.eventTransactionRolledback(tx);\n    }\n    \n    @Hack(\"Why is this possible?\")\n    private RuntimeException sneakyThrow(Throwable t) {\n        this.<RuntimeException>doSneakyThrow(t);\n        return null;\n    }\n\n    @SuppressWarnings(\"unchecked\")\n    private <T extends Throwable> T doSneakyThrow(Throwable t) throws T {\n        throw (T) t;\n    }\n    \n}\n","old_contents":"\/**\n * Copyright 2010 CosmoCode GmbH\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage de.cosmocode.palava.jta;\n\nimport javax.transaction.NotSupportedException;\nimport javax.transaction.Status;\nimport javax.transaction.SystemException;\nimport javax.transaction.UserTransaction;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.Registry;\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\n\npublic abstract aspect AbstractUserTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(AbstractUserTransactionAspect.class);\n\n    private Provider<UserTransaction> provider;\n\n    private TransactionBeginEvent begin;\n    private TransactionBeganEvent began;\n    private TransactionCommitEvent commit;\n    private TransactionCommittedEvent committed;\n    private TransactionRollbackEvent rollback;\n    private TransactionRolledbackEvent rolledback;\n    \n    @Inject\n    void setProvider(Provider<UserTransaction> provider) {\n        this.provider = Preconditions.checkNotNull(provider, \"Provider\");\n    }\n    \n    @Inject\n    void setRegistry(Registry registry) {\n        Preconditions.checkNotNull(registry, \"Registry\");\n        this.begin = registry.proxy(TransactionBeginEvent.class);\n        this.began = registry.proxy(TransactionBeganEvent.class);\n        this.commit = registry.proxy(TransactionCommitEvent.class);\n        this.committed = registry.proxy(TransactionCommittedEvent.class);\n        this.rollback = registry.proxy(TransactionRollbackEvent.class);\n        this.rolledback = registry.proxy(TransactionRolledbackEvent.class);\n    }\n    \n    protected abstract pointcut transactional();\n    \n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        Preconditions.checkNotNull(provider, \"Provider not injected yet\");\n        final UserTransaction tx = provider.get();\n        LOG.trace(\"Using transaction {}\", tx);\n\n        try {\n            LOG.trace(\"Status of transaction: {}\", tx.getStatus());\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        int status;\n        final boolean local;\n        try {\n            status = tx.getStatus();\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        local = status == Status.STATUS_NO_TRANSACTION;\n\n        if (local) {\n            LOG.debug(\"Beginning automatic transaction {}\", tx);\n            try {\n                begin.eventTransactionBegin(tx);\n                tx.begin();\n                began.eventTransactionBegan(tx);\n            } catch (NotSupportedException e) {\n                throw new IllegalStateException(e);\n            } catch (SystemException e) {\n                throw new IllegalStateException(e);\n            }\n        } else {\n            LOG.trace(\"Transaction {} already active (Status: {})\", tx, status);\n        }\n\n        try {\n            status = tx.getStatus();\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        final Object returnValue;\n        \n        try {\n            LOG.trace(\"Status before execution: {}\", status);\n            returnValue = proceed();\n        } catch (Exception e) {\n            try {\n                if (local && \n                    (tx.getStatus() == Status.STATUS_ACTIVE || tx.getStatus() == Status.STATUS_MARKED_ROLLBACK)) {\n                    LOG.info(\"Rolling back local\/active transaction {}\", tx);\n                    rollback(tx);\n                } else if (tx.getStatus() != Status.STATUS_ROLLEDBACK || tx.getStatus() != Status.STATUS_ROLLING_BACK) {\n                    LOG.debug(\"Setting transaction {} as rollback only\", tx);\n                    tx.setRollbackOnly();\n                }\n            } catch (Exception inner) {\n                LOG.error(\"Rollback failed\", inner);\n            }\n            \/\/ FIXME this effectively shadows the real exceptions thus preventing correct exception handling\n            \/\/throw new IllegalStateException(e);\n            return sneakyThrow(e);\n        }\n        \n        try {\n            status = tx.getStatus();\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        LOG.trace(\"Status after execution: {}\", status);\n        \n        if (local) {\n            if (status == Status.STATUS_MARKED_ROLLBACK) {\n                try {\n                    LOG.debug(\"Rolling back marked transaction {}\", tx);\n                    rollback(tx);\n                } catch (SystemException e) {\n                    throw new IllegalStateException(e);\n                }\n            } else {\n                try {\n                    commit.eventTransactionCommit(tx);\n                    tx.commit();\n                    committed.eventTransactionCommitted(tx);\n                    LOG.debug(\"Committed automatic transaction {}\", tx);\n                } catch (Exception e) {\n                    try {\n                        LOG.info(\"Rolling back transaction {}\", tx);\n                        rollback(tx);\n                    } catch (Exception inner) {\n                        LOG.error(\"Rollback failed\", inner);\n                    }\n                    throw new IllegalStateException(e);\n                }\n            }\n        }\n        \n        return returnValue;\n    }\n    \n    private void rollback(UserTransaction tx) throws SystemException {\n        rollback.eventTransactionRollback(tx);\n        tx.rollback();\n        rolledback.eventTransactionRolledback(tx);\n    }\n    \n    private RuntimeException sneakyThrow(Throwable t) {\n        this.<RuntimeException>doSneakyThrow(t);\n        return null;\n    }\n\n    @SuppressWarnings(\"unchecked\")\n    private <T extends Throwable> T doSneakyThrow(Throwable t) throws T {\n        throw (T) t;\n    }\n    \n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"4ee588b9a243c72a809e73514484368ea74b8b26","subject":"update details.newSize","message":"update details.newSize\n","repos":"mebigfatguy\/hashshmash","old_file":"aj\/com\/mebigfatguy\/hashshmash\/HashCollector.aj","new_file":"aj\/com\/mebigfatguy\/hashshmash\/HashCollector.aj","new_contents":"package com.mebigfatguy.hashshmash;\n\nimport java.io.BufferedWriter;\nimport java.io.File;\nimport java.io.FileOutputStream;\nimport java.io.OutputStreamWriter;\nimport java.io.PrintWriter;\nimport java.lang.reflect.Field;\nimport java.util.Date;\nimport java.util.HashMap;\nimport java.util.Map;\nimport java.util.Map.Entry;\nimport java.util.concurrent.ConcurrentHashMap;\n\nimport org.aspectj.lang.Signature;\n\npublic aspect HashCollector {\n    \n    private static final Journaller journaller = new Journaller();\n\n    after() returning (Map m): call(HashMap.new(..)) {\n        Signature sig = thisJoinPointStaticPart.getSignature();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashMapDetails details = new HashMapDetails(m, System.currentTimeMillis(), sig + \":\" + line);\n        journaller.add(details);\n    }\n}\n\nfinal class Journaller implements Runnable {\n    \n    private static final int SLEEP_TIME = 10 * 1000;\n    \n    private Field tableField;\n    private ConcurrentHashMap<HashMapDetails, HashMapDetails> hmDetails = new ConcurrentHashMap<HashMapDetails, HashMapDetails>();\n    private PrintWriter writer;\n\n    public Journaller() {\n        try {\n            tableField = HashMap.class.getDeclaredField(\"table\");\n            tableField.setAccessible(true);\n                        \n            File dir = new File(System.getProperty(\"user.home\"), \".hashshmash\");\n            dir.mkdirs();\n            \n            writer = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(new File(dir, new Date().toString() + \".txt\")))));\n            \n            Thread t = new Thread(this);\n            t.setDaemon(true);\n            t.start();\n        } catch (Exception e) {\n        }\n    }\n    \n    public void add(HashMapDetails details) {\n        hmDetails.put(details,  details);\n    }\n    \n    public void run() {\n        try {\n            while (!Thread.interrupted()) {\n                Thread.sleep(SLEEP_TIME);\n                \n                for (HashMapDetails details : hmDetails.keySet()) {\n                    try {\n                        int newSize = details.map.size();\n                        if (newSize == details.size) {\n                            Entry<?, ?>[] table = (Entry<?, ?>[])tableField.get(details.map);\n                            details.totalSlots = table.length;\n                            for (Entry<?, ?> e : table) {\n                                if (e != null) {\n                                    details.usedSlots++;\n                                }\n                            }\n                            writer.println(details.allocTime + \"\\t\" + details.caller + \"\\t\" + details.map.size() + \"\\t\" + details.totalSlots + \"\\t\" + details.usedSlots);\n                            hmDetails.remove(details);\n                        } else {\n                            details.size = newSize;\n                        }\n                    } catch (Exception e) {\n                        \/\/might get ConcurrentModificationException or such, just ignore\n                    }\n                }\n                writer.flush();\n            }\n        } catch (InterruptedException ie) {    \n        }\n    }\n}\n\nclass HashMapDetails {\n    public Map<?, ?> map;\n    public long allocTime;\n    public String caller;\n    public int size;\n    public int usedSlots;\n    public int totalSlots;\n\n    public HashMapDetails(Map<?, ?> m, long t, String c) {\n        map = m;\n        allocTime = t;\n        caller = c;\n        size = map.size();\n    }\n}\n","old_contents":"package com.mebigfatguy.hashshmash;\n\nimport java.io.BufferedWriter;\nimport java.io.File;\nimport java.io.FileOutputStream;\nimport java.io.OutputStreamWriter;\nimport java.io.PrintWriter;\nimport java.lang.reflect.Field;\nimport java.util.Date;\nimport java.util.HashMap;\nimport java.util.Map;\nimport java.util.Map.Entry;\nimport java.util.concurrent.ConcurrentHashMap;\n\nimport org.aspectj.lang.Signature;\n\npublic aspect HashCollector {\n    \n    private static final Journaller journaller = new Journaller();\n\n    after() returning (Map m): call(HashMap.new(..)) {\n        Signature sig = thisJoinPointStaticPart.getSignature();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashMapDetails details = new HashMapDetails(m, System.currentTimeMillis(), sig + \":\" + line);\n        journaller.add(details);\n    }\n}\n\nfinal class Journaller implements Runnable {\n    \n    private static final int SLEEP_TIME = 10 * 1000;\n    \n    private Field tableField;\n    private ConcurrentHashMap<HashMapDetails, HashMapDetails> hmDetails = new ConcurrentHashMap<HashMapDetails, HashMapDetails>();\n    private PrintWriter writer;\n\n    public Journaller() {\n        try {\n            tableField = HashMap.class.getDeclaredField(\"table\");\n            tableField.setAccessible(true);\n                        \n            File dir = new File(System.getProperty(\"user.home\"), \".hashshmash\");\n            dir.mkdirs();\n            \n            writer = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(new File(dir, new Date().toString() + \".txt\")))));\n            \n            Thread t = new Thread(this);\n            t.setDaemon(true);\n            t.start();\n        } catch (Exception e) {\n        }\n    }\n    \n    public void add(HashMapDetails details) {\n        hmDetails.put(details,  details);\n    }\n    \n    public void run() {\n        try {\n            while (!Thread.interrupted()) {\n                Thread.sleep(SLEEP_TIME);\n                \n                for (HashMapDetails details : hmDetails.keySet()) {\n                    try {\n                        int newSize = details.map.size();\n                        if (newSize == details.size) {\n                            Entry<?, ?>[] table = (Entry<?, ?>[])tableField.get(details.map);\n                            details.totalSlots = table.length;\n                            for (Entry<?, ?> e : table) {\n                                if (e != null) {\n                                    details.usedSlots++;\n                                }\n                            }\n                            writer.println(details.allocTime + \"\\t\" + details.caller + \"\\t\" + details.map.size() + \"\\t\" + details.totalSlots + \"\\t\" + details.usedSlots);\n                            hmDetails.remove(details);\n                        }\n                    } catch (Exception e) {\n                        \/\/might get ConcurrentModificationException or such, just ignore\n                    }\n                }\n                writer.flush();\n            }\n        } catch (InterruptedException ie) {    \n        }\n    }\n}\n\nclass HashMapDetails {\n    public Map<?, ?> map;\n    public long allocTime;\n    public String caller;\n    public int size;\n    public int usedSlots;\n    public int totalSlots;\n\n    public HashMapDetails(Map<?, ?> m, long t, String c) {\n        map = m;\n        allocTime = t;\n        caller = c;\n        size = map.size();\n    }\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"3e39cf6e7916c47bc9baab3fb9a3f6468094a7bc","subject":"add support for HashSet","message":"add support for HashSet\n","repos":"mebigfatguy\/hashshmash","old_file":"aj\/com\/mebigfatguy\/hashshmash\/HashCollector.aj","new_file":"aj\/com\/mebigfatguy\/hashshmash\/HashCollector.aj","new_contents":"package com.mebigfatguy.hashshmash;\n\nimport java.io.BufferedWriter;\nimport java.io.File;\nimport java.io.FileOutputStream;\nimport java.io.OutputStreamWriter;\nimport java.io.PrintWriter;\nimport java.lang.reflect.Field;\nimport java.text.SimpleDateFormat;\nimport java.util.Date;\nimport java.util.HashMap;\nimport java.util.HashSet;\nimport java.util.Map;\nimport java.util.Map.Entry;\nimport java.util.Set;\nimport java.util.concurrent.ConcurrentHashMap;\n\npublic aspect HashCollector {\n    \n    private static final Journaller journaller = new Journaller();\n\n    after() returning (Map m): call(HashMap.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashMapDetails details = new HashMapDetails(m, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    after() returning (Set s): call(HashSet.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashSetDetails details = new HashSetDetails(s, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    before(): execution(public static void *.main(String[])) {\n        Class<?> c = HashCollector.class;\n    }\n}\n\nfinal class Journaller implements Runnable {\n    \n    private static final int SLEEP_TIME = 5 * 1000;\n    \n    private Field tableField;\n    private ConcurrentHashMap<HashDetails, HashDetails> hDetails = new ConcurrentHashMap<HashDetails, HashDetails>();\n    private PrintWriter writer;\n\n    public Journaller() {\n        try {\n            tableField = HashMap.class.getDeclaredField(\"table\");\n            tableField.setAccessible(true);\n              \n            File dir = new File(System.getProperty(\"user.home\"), \".hashshmash\");\n            dir.mkdirs();  \n            \n            writer = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(new File(dir, new Date().toString() + \".txt\")))));\n            \n            Thread t = new Thread(this);\n            t.setDaemon(true);\n            t.start();\n        } catch (Exception e) {\n        }\n    }\n    \n    public void add(HashDetails details) {\n        hDetails.put(details,  details);\n    }\n    \n    public void run() {\n        try {\n            while (!Thread.interrupted()) {\n                Thread.sleep(SLEEP_TIME);\n                \n                for (HashDetails details : hDetails.keySet()) {\n                    try {\n                        Map<?, ?> map = details.getMap();\n                        if (map != null) {\n                            int newSize = details.getMap().size();\n                            if (newSize == details.size) {\n                                Entry<?, ?>[] table = (Entry<?, ?>[])tableField.get(map);\n                                details.totalSlots = table.length;\n                                for (Entry<?, ?> e : table) {\n                                    if (e != null) {\n                                        details.usedSlots++;\n                                    }\n                                }\n                                writer.println(details);\n                                hDetails.remove(details);\n                            } else\n                                details.size = newSize;\n                        } else {\n                            hDetails.remove(details);\n                        }\n                    } catch (Exception e) {\n                        \/\/might get ConcurrentModificationException or such, just ignore\n                    }\n                }\n                writer.flush();\n            }\n        } catch (InterruptedException ie) {    \n        }\n    }\n}\n\nabstract class HashDetails {\n    private static SimpleDateFormat FORMATTER = new SimpleDateFormat(\"MM\/dd\/yyyy HH:mm:ss\");\n    \n    public Date allocTime;\n    public String caller;\n    public int size;\n    public int usedSlots;\n    public int totalSlots;\n    \n    public abstract Map<?,?> getMap();\n    \n    public abstract String getDetailType();\n    \n    public String toString() {\n        return getDetailType() + \"\\t\" + FORMATTER.format(allocTime) + \"\\t\" + caller + \"\\t\" + getMap().size() + \"\\t\" + totalSlots + \"\\t\" + usedSlots;\n    }\n}\n\nclass HashMapDetails extends HashDetails {\n    public Map<?, ?> map;\n\n    public HashMapDetails(Map<?, ?> m, Date d, String c) {\n        map = m;\n        allocTime = d;\n        caller = c;\n        size = map.size();\n    }\n    \n    public Map<?,?> getMap() {\n        return map;\n    }\n    \n    public String getDetailType() {\n        return map.getClass().getSimpleName();\n    }\n}\n\nclass HashSetDetails extends HashDetails {\n    private static Field MAP_FIELD;\n    static {\n        try {\n            MAP_FIELD = HashSet.class.getDeclaredField(\"map\");\n            MAP_FIELD.setAccessible(true);\n        } catch (Exception e) {\n            MAP_FIELD = null;\n        }\n    }\n    \n    public Set<?> set;\n\n    public HashSetDetails(Set<?> s, Date d, String c) {\n        set = s;\n        allocTime = d;\n        caller = c;\n        size = set.size();\n    }\n    \n    public Map<?,?> getMap() {\n        try {\n            if (MAP_FIELD == null)\n                return null;\n            \n            return (Map<?,?>) MAP_FIELD.get(set);\n        } catch (Exception e) {\n            return null;\n        }\n    }\n    \n    public String getDetailType() {\n        return set.getClass().getSimpleName();\n    }\n}\n","old_contents":"package com.mebigfatguy.hashshmash;\n\nimport java.io.BufferedWriter;\nimport java.io.File;\nimport java.io.FileOutputStream;\nimport java.io.OutputStreamWriter;\nimport java.io.PrintWriter;\nimport java.lang.reflect.Field;\nimport java.text.SimpleDateFormat;\nimport java.util.Date;\nimport java.util.HashMap;\nimport java.util.Map;\nimport java.util.Map.Entry;\nimport java.util.concurrent.ConcurrentHashMap;\n\npublic aspect HashCollector {\n    \n    private static final Journaller journaller = new Journaller();\n\n    after() returning (Map m): call(HashMap.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashMapDetails details = new HashMapDetails(m, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    before(): execution(public static void *.main(String[])) {\n        Class<?> c = HashCollector.class;\n    }\n}\n\nfinal class Journaller implements Runnable {\n    \n    private static final int SLEEP_TIME = 10 * 1000;\n    \n    private Field tableField;\n    private ConcurrentHashMap<HashMapDetails, HashMapDetails> hmDetails = new ConcurrentHashMap<HashMapDetails, HashMapDetails>();\n    private PrintWriter writer;\n    private SimpleDateFormat formatter;\n\n    public Journaller() {\n        try {\n            \n            tableField = HashMap.class.getDeclaredField(\"table\");\n            tableField.setAccessible(true);\n              \n            formatter = new SimpleDateFormat(\"MM\/dd\/yyyy HH:mm:ss\");\n            File dir = new File(System.getProperty(\"user.home\"), \".hashshmash\");\n            dir.mkdirs();  \n            \n            writer = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(new File(dir, new Date().toString() + \".txt\")))));\n            \n            Thread t = new Thread(this);\n            t.setDaemon(true);\n            t.start();\n        } catch (Exception e) {\n        }\n    }\n    \n    public void add(HashMapDetails details) {\n        hmDetails.put(details,  details);\n    }\n    \n    public void run() {\n        try {\n            while (!Thread.interrupted()) {\n                Thread.sleep(SLEEP_TIME);\n                \n                for (HashMapDetails details : hmDetails.keySet()) {\n                    try {\n                        int newSize = details.map.size();\n                        if (newSize == details.size) {\n                            Entry<?, ?>[] table = (Entry<?, ?>[])tableField.get(details.map);\n                            details.totalSlots = table.length;\n                            for (Entry<?, ?> e : table) {\n                                if (e != null) {\n                                    details.usedSlots++;\n                                }\n                            }\n                            writer.println(formatter.format(details.allocTime) + \"\\t\" + details.caller + \"\\t\" + details.map.size() + \"\\t\" + details.totalSlots + \"\\t\" + details.usedSlots);\n                            hmDetails.remove(details);\n                        } else {\n                            details.size = newSize;\n                        }\n                    } catch (Exception e) {\n                        \/\/might get ConcurrentModificationException or such, just ignore\n                    }\n                }\n                writer.flush();\n            }\n        } catch (InterruptedException ie) {    \n        }\n    }\n}\n\nclass HashMapDetails {\n    public Map<?, ?> map;\n    public Date allocTime;\n    public String caller;\n    public int size;\n    public int usedSlots;\n    public int totalSlots;\n\n    public HashMapDetails(Map<?, ?> m, Date d, String c) {\n        map = m;\n        allocTime = d;\n        caller = c;\n        size = map.size();\n    }\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"44ecb30aab153a4bea1036dc6927453f6b046995","subject":"Updated the around pointcuts.","message":"Updated the around pointcuts.\n\nThe important issue is to ensure that the lock\/unlock methods and the\nmonitor steps are performed atomically.\n\nThis still might not be the best approach - it seems artifical as we\nlock an object whilst locking it (tryLock). Perhaps it would be better\nprotected by the monitor object, but if tryLock is false this introduces\nunnecessary contention.\n","repos":"selig\/qea","old_file":"code\/qea\/src\/benchmark\/competition\/java\/jUnitRV_MMT\/monitoring\/JUnitRV_MMTThreeAspect.aj","new_file":"code\/qea\/src\/benchmark\/competition\/java\/jUnitRV_MMT\/monitoring\/JUnitRV_MMTThreeAspect.aj","new_contents":"package benchmark.competition.java.jUnitRV_MMT.monitoring;\r\n\r\nimport java.util.concurrent.locks.Lock;\r\n\r\nimport monitoring.impl.MonitorFactory;\r\nimport monitoring.intf.Monitor;\r\nimport properties.Property;\r\nimport properties.competition.JavaRV_mmt;\r\nimport structure.impl.other.Verdict;\r\nimport structure.intf.QEA;\r\nimport benchmark.competition.java.jUnitRV_MMT.ExampleLocking;\r\n\r\npublic aspect JUnitRV_MMTThreeAspect {\r\n\r\n\tprivate final Monitor monitor;\r\n\r\n\tprivate final int RUN = 1;\r\n\tprivate final int LOCK_TRUE = 2;\r\n\tprivate final int UNLOCK = 3;\r\n\tprivate final int ACTION = 4;\r\n\r\n\tpublic JUnitRV_MMTThreeAspect() {\r\n\t\tQEA qea = new JavaRV_mmt().make(Property.JAVARV_MMT_THREE);\r\n\t\tmonitor = MonitorFactory.create(qea);\r\n\t}\r\n\r\n\tpointcut run(ExampleLocking thread) : execution(void ExampleLocking.run())\r\n\t\t&& target(thread);\r\n\r\n\tpointcut action(ExampleLocking thread) : call(void ExampleLocking.action())\r\n\t\t&& target(thread);\r\n\r\n\tbefore(ExampleLocking thread) : run(thread) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(RUN, thread);\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [thread=\"\r\n\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n\tboolean around(Lock lockObj, ExampleLocking thread) :\r\n\t\t\tcall(boolean Lock.tryLock())\r\n\t\t\t&& cflow(call(boolean ExampleLocking.lock())) && target(lockObj)\r\n\t\t\t&& this(thread) {\r\n\r\n\t\tboolean result = false;\r\n\t\t\/\/ We perform the lock and the monitor step as an atomic action\r\n\t\t\/\/ i.e. whilst holding the lockObj, so that we cannot be interrupted\r\n\t\tsynchronized (lockObj) {\r\n\t\t\tresult = proceed(lockObj, thread);\t\t\r\n\t\t\tif (result) {\r\n\t\t\t\tVerdict verdict = null;\r\n\t\t\t\t\/\/ Ordering between lockObj and monitor important\r\n\t\t\t\tsynchronized (monitor) {\r\n\t\t\t\t\tverdict = monitor.step(LOCK_TRUE, thread);\r\n\t\t\t\t}\r\n\t\t\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\t\t\tSystem.err\r\n\t\t\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [thread=\"\r\n\t\t\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t\t\t}\r\n\t\r\n\t\t\t}\r\n\t\t}\r\n\t\treturn result;\r\n\t};\r\n\r\n\tvoid around(Lock lockObj, ExampleLocking thread) :\r\n\t\tcall(void Lock.unlock()) && cflow(call(void ExampleLocking.unlock()))\r\n\t\t&& target(lockObj) && this(thread) {\r\n\r\n\t\t\/\/ We perform the unlock and the monitor step as an atomic action\r\n\t\t\/\/ i.e. whilst holding the lockObj, so that we cannot be interrupted\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (lockObj) {\r\n\t\t\tproceed(lockObj, thread);\t\r\n\t\t\t\/\/ Ordering between lockObj and monitor important\r\n\t\t\tsynchronized (monitor) {\r\n\t\t\t\tverdict = monitor.step(LOCK_TRUE, thread);\r\n\t\t\t}\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [thread=\"\r\n\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n\tbefore(ExampleLocking thread) : action(thread) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(ACTION, thread);\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [id=\"\r\n\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n}\r\n","old_contents":"package benchmark.competition.java.jUnitRV_MMT.monitoring;\r\n\r\nimport java.util.concurrent.locks.Lock;\r\n\r\nimport monitoring.impl.MonitorFactory;\r\nimport monitoring.intf.Monitor;\r\nimport properties.Property;\r\nimport properties.competition.JavaRV_mmt;\r\nimport structure.impl.other.Verdict;\r\nimport structure.intf.QEA;\r\nimport benchmark.competition.java.jUnitRV_MMT.ExampleLocking;\r\n\r\npublic aspect JUnitRV_MMTThreeAspect {\r\n\r\n\tprivate final Monitor monitor;\r\n\r\n\tprivate final int RUN = 1;\r\n\tprivate final int LOCK_TRUE = 2;\r\n\tprivate final int UNLOCK = 3;\r\n\tprivate final int ACTION = 4;\r\n\r\n\tpublic JUnitRV_MMTThreeAspect() {\r\n\t\tQEA qea = new JavaRV_mmt().make(Property.JAVARV_MMT_THREE);\r\n\t\tmonitor = MonitorFactory.create(qea);\r\n\t}\r\n\r\n\tpointcut run(ExampleLocking thread) : execution(void ExampleLocking.run())\r\n\t\t&& target(thread);\r\n\r\n\tpointcut action(ExampleLocking thread) : call(void ExampleLocking.action())\r\n\t\t&& target(thread);\r\n\r\n\tbefore(ExampleLocking thread) : run(thread) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(RUN, thread);\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [thread=\"\r\n\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n\tboolean around(Lock lockObj, ExampleLocking thread) :\r\n\t\t\tcall(boolean Lock.tryLock())\r\n\t\t\t&& cflow(call(boolean ExampleLocking.lock())) && target(lockObj)\r\n\t\t\t&& this(thread) {\r\n\r\n\t\tboolean result = false;\r\n\t\tsynchronized (lockObj) {\r\n\t\t\tresult = proceed(lockObj, thread); \/\/ TODO Not sure if this is right\r\n\t\t}\r\n\t\tif (result) {\r\n\t\t\tVerdict verdict = null;\r\n\t\t\tsynchronized (monitor) {\r\n\t\t\t\tverdict = monitor.step(LOCK_TRUE, thread);\r\n\t\t\t}\r\n\t\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\t\tSystem.err\r\n\t\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [thread=\"\r\n\t\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t\t}\r\n\r\n\t\t}\r\n\t\treturn result;\r\n\t};\r\n\r\n\tvoid around(Lock lockObj, ExampleLocking thread) :\r\n\t\tcall(void Lock.unlock()) && cflow(call(void ExampleLocking.unlock()))\r\n\t\t&& target(lockObj) && this(thread) {\r\n\r\n\t\tsynchronized (lockObj) {\r\n\t\t\tproceed(lockObj, thread); \/\/ TODO Not sure if this is right\r\n\t\t}\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(LOCK_TRUE, thread);\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [thread=\"\r\n\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n\tbefore(ExampleLocking thread) : action(thread) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(ACTION, thread);\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [id=\"\r\n\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n}\r\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"c10bff99aff58cd9fac3b379fef96df880480fa2","subject":"Fixed a small annoying Roo bug on generics","message":"Fixed a small annoying Roo bug on generics","repos":"eSCT\/oppfin,searchbox\/framework,searchbox\/framework,eSCT\/oppfin,searchbox\/framework","old_file":"src\/main\/java\/com\/searchbox\/domain\/Definition_Roo_Jpa_ActiveRecord.aj","new_file":"src\/main\/java\/com\/searchbox\/domain\/Definition_Roo_Jpa_ActiveRecord.aj","new_contents":"\/\/ WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.\n\/\/ You may push code into the target .java compilation unit if you wish to edit any member(s).\n\npackage com.searchbox.domain;\n\nimport com.searchbox.domain.Definition;\nimport java.util.List;\nimport javax.persistence.EntityManager;\nimport javax.persistence.PersistenceContext;\nimport org.springframework.transaction.annotation.Transactional;\n\nprivileged aspect Definition_Roo_Jpa_ActiveRecord {\n    \n    @PersistenceContext\n    transient EntityManager Definition.entityManager;\n    \n    public static final List<String> Definition.fieldNames4OrderClauseFilter = java.util.Arrays.asList(\"clazz\", \"attributes\");\n    \n    public static final EntityManager Definition.entityManager() {\n        EntityManager em = new Definition() {\n        }.entityManager;\n        if (em == null) throw new IllegalStateException(\"Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC\/AJDT aspects library?)\");\n        return em;\n    }\n    \n    public static long Definition.countDefinitions() {\n        return entityManager().createQuery(\"SELECT COUNT(o) FROM Definition o\", Long.class).getSingleResult();\n    }\n    \n    public static List<Definition> Definition.findAllDefinitions() {\n        return entityManager().createQuery(\"SELECT o FROM Definition o\", Definition.class).getResultList();\n    }\n    \n    public static List<Definition> Definition.findAllDefinitions(String sortFieldName, String sortOrder) {\n        String jpaQuery = \"SELECT o FROM Definition o\";\n        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {\n            jpaQuery = jpaQuery + \" ORDER BY \" + sortFieldName;\n            if (\"ASC\".equalsIgnoreCase(sortOrder) || \"DESC\".equalsIgnoreCase(sortOrder)) {\n                jpaQuery = jpaQuery + \" \" + sortOrder;\n            }\n        }\n        return entityManager().createQuery(jpaQuery, Definition.class).getResultList();\n    }\n    \n    public static Definition Definition.findDefinition(Long id) {\n        if (id == null) return null;\n        return entityManager().find(Definition.class, id);\n    }\n    \n    public static List<Definition> Definition.findDefinitionEntries(int firstResult, int maxResults) {\n        return entityManager().createQuery(\"SELECT o FROM Definition o\", Definition.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();\n    }\n    \n    public static List<Definition> Definition.findDefinitionEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {\n        String jpaQuery = \"SELECT o FROM Definition o\";\n        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {\n            jpaQuery = jpaQuery + \" ORDER BY \" + sortFieldName;\n            if (\"ASC\".equalsIgnoreCase(sortOrder) || \"DESC\".equalsIgnoreCase(sortOrder)) {\n                jpaQuery = jpaQuery + \" \" + sortOrder;\n            }\n        }\n        return entityManager().createQuery(jpaQuery, Definition.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();\n    }\n    \n    @Transactional\n    public void Definition.persist() {\n        if (this.entityManager == null) this.entityManager = entityManager();\n        this.entityManager.persist(this);\n    }\n    \n    @Transactional\n    public void Definition.remove() {\n        if (this.entityManager == null) this.entityManager = entityManager();\n        if (this.entityManager.contains(this)) {\n            this.entityManager.remove(this);\n        } else {\n            Definition attached = Definition.findDefinition(this.id);\n            this.entityManager.remove(attached);\n        }\n    }\n    \n    @Transactional\n    public void Definition.flush() {\n        if (this.entityManager == null) this.entityManager = entityManager();\n        this.entityManager.flush();\n    }\n    \n    @Transactional\n    public void Definition.clear() {\n        if (this.entityManager == null) this.entityManager = entityManager();\n        this.entityManager.clear();\n    }\n    \n    @Transactional\n    public Definition Definition.merge() {\n        if (this.entityManager == null) this.entityManager = entityManager();\n        Definition merged = this.entityManager.merge(this);\n        this.entityManager.flush();\n        return merged;\n    }\n    \n}\n","old_contents":"\/\/ WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.\n\/\/ You may push code into the target .java compilation unit if you wish to edit any member(s).\n\npackage com.searchbox.domain;\n\nimport com.searchbox.domain.Definition;\nimport java.util.List;\nimport javax.persistence.EntityManager;\nimport javax.persistence.PersistenceContext;\nimport org.springframework.transaction.annotation.Transactional;\n\nprivileged aspect Definition_Roo_Jpa_ActiveRecord {\n    \n    @PersistenceContext\n    transient EntityManager Definition.entityManager;\n    \n    public static final List<String> Definition.fieldNames4OrderClauseFilter = java.util.Arrays.asList(\"clazz\", \"attributes\");\n    \n    public static final EntityManager Definition.entityManager() {\n        EntityManager em = new Definition() {\n        }.entityManager;\n        if (em == null) throw new IllegalStateException(\"Entity manager has not been injected (is the Spring Aspects JAR configured as an AJC\/AJDT aspects library?)\");\n        return em;\n    }\n    \n    public static long Definition.countDefinitions() {\n        return entityManager().createQuery(\"SELECT COUNT(o) FROM Definition o\", Long.class).getSingleResult();\n    }\n    \n    public static List<Definition<Object>> Definition.findAllDefinitions() {\n        return entityManager().createQuery(\"SELECT o FROM Definition o\", Definition.class).getResultList();\n    }\n    \n    public static List<Definition<Object>> Definition.findAllDefinitions(String sortFieldName, String sortOrder) {\n        String jpaQuery = \"SELECT o FROM Definition o\";\n        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {\n            jpaQuery = jpaQuery + \" ORDER BY \" + sortFieldName;\n            if (\"ASC\".equalsIgnoreCase(sortOrder) || \"DESC\".equalsIgnoreCase(sortOrder)) {\n                jpaQuery = jpaQuery + \" \" + sortOrder;\n            }\n        }\n        return entityManager().createQuery(jpaQuery, Definition.class).getResultList();\n    }\n    \n    public static Definition<Object> Definition.findDefinition(Long id) {\n        if (id == null) return null;\n        return entityManager().find(Definition.class, id);\n    }\n    \n    public static List<Definition<Object>> Definition.findDefinitionEntries(int firstResult, int maxResults) {\n        return entityManager().createQuery(\"SELECT o FROM Definition o\", Definition.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();\n    }\n    \n    public static List<Definition<Object>> Definition.findDefinitionEntries(int firstResult, int maxResults, String sortFieldName, String sortOrder) {\n        String jpaQuery = \"SELECT o FROM Definition o\";\n        if (fieldNames4OrderClauseFilter.contains(sortFieldName)) {\n            jpaQuery = jpaQuery + \" ORDER BY \" + sortFieldName;\n            if (\"ASC\".equalsIgnoreCase(sortOrder) || \"DESC\".equalsIgnoreCase(sortOrder)) {\n                jpaQuery = jpaQuery + \" \" + sortOrder;\n            }\n        }\n        return entityManager().createQuery(jpaQuery, Definition.class).setFirstResult(firstResult).setMaxResults(maxResults).getResultList();\n    }\n    \n    @Transactional\n    public void Definition.persist() {\n        if (this.entityManager == null) this.entityManager = entityManager();\n        this.entityManager.persist(this);\n    }\n    \n    @Transactional\n    public void Definition.remove() {\n        if (this.entityManager == null) this.entityManager = entityManager();\n        if (this.entityManager.contains(this)) {\n            this.entityManager.remove(this);\n        } else {\n            Definition attached = Definition.findDefinition(this.id);\n            this.entityManager.remove(attached);\n        }\n    }\n    \n    @Transactional\n    public void Definition.flush() {\n        if (this.entityManager == null) this.entityManager = entityManager();\n        this.entityManager.flush();\n    }\n    \n    @Transactional\n    public void Definition.clear() {\n        if (this.entityManager == null) this.entityManager = entityManager();\n        this.entityManager.clear();\n    }\n    \n    @Transactional\n    public Definition Definition.merge() {\n        if (this.entityManager == null) this.entityManager = entityManager();\n        Definition merged = this.entityManager.merge(this);\n        this.entityManager.flush();\n        return merged;\n    }\n    \n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"06d649fe34c60c88c9630de5591757b547896275","subject":"Working redirection to 503 - Now adding cflowbelow(thisAspect)","message":"Working redirection to 503 - Now adding cflowbelow(thisAspect)\n","repos":"ties\/winstone","old_file":"winstone\/src\/main\/aspectj\/RateLimitingAspect.aj","new_file":"winstone\/src\/main\/aspectj\/RateLimitingAspect.aj","new_contents":"import net.winstone.core.WinstoneConstant;\nimport org.slf4j.LoggerFactory;\n\n\/\/ Java EE servlet API\nimport javax.servlet.Servlet;\nimport javax.servlet.ServletRequest;\nimport javax.servlet.ServletResponse;\nimport javax.servlet.http.HttpServlet;\n\n\/\/ Used to scope pointcuts\nimport net.winstone.core.listener.RequestHandlerThread;\nimport net.winstone.core.ServletConfiguration;\nimport net.winstone.core.SimpleRequestDispatcher;\n\n\n\/\/ Rate Limiter\nimport edu.utwente.aop.tools.RateLimiter;\nimport java.util.concurrent.TimeUnit;\n\n\/\/ exceptions from Servlet.service(..)\nimport java.io.IOException;\nimport javax.servlet.ServletException;\nimport javax.servlet.http.HttpServletResponse;\n\n\/\/ We redirect the call flow to error servlet\nimport net.winstone.servlet.ErrorServlet;\n\n\/**\n * Ensure that the request is allowed by the RateLimiter before continuing..\n *\/\npublic privileged aspect RateLimitingAspect  percflow(processRequest()) {\n    private enum State { NOTICKET, TICKET, NOTICKET_AVAILABLE };\n\n    public final int RESPONSE_TIME_MS = 1000;\n\n    \/** public because it is implicitly accessed from WebAppConfiguration *\/\n    public State state = State.NOTICKET;\n\n    static org.slf4j.Logger logger = LoggerFactory.getLogger(Servlet.class);\n    \/\/ Allow 5 requests per limit\n    private static RateLimiter limits = new RateLimiter(5, 1, TimeUnit.MINUTES);\n\n    \/**\n     * Pointcut that captures all requests flows in which a request is handled.\n     * This is used to instantiate this aspect per request that is handled.\n     *\/\n    pointcut processRequest(): call(* processRequest(..)) && within(RequestHandlerThread);\n\n    pointcut callServiceWithArgs(Servlet servlet, ServletRequest req, ServletResponse resp): call(void Servlet.service(..)) && target(servlet) && args(req, resp);\n\n    pointcut inWinstoneServletConfiguration(): within(ServletConfiguration);\n\n    pointcut handlingError(): cflow(call(void sendError(int, String)) && target(HttpServletResponse));\n\n    \/** Around did not work when trying to abstract call(...) && args into a seperate pointcut\n     * @throws IOException when sendError throws an exception.\n     *\/\n    void around(ServletRequest req, ServletResponse resp) throws IOException: inWinstoneServletConfiguration() && !handlingError() && call(void Servlet.service(..)) && args(req, resp) {\n\n        ensureTicket();\n\n        if (state != State.TICKET) {\n            \/\/ Instantiate new 503-UNAVAILABLE\n            logger.info(\"Redirecting request to 503\");\n            ((HttpServletResponse) resp).sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE, \"Rate limit reached - Throttled\");\n        } else {\n            proceed(req, resp);\n        }\n    }\n\n    \/**\n     * Try to get a ticket from the state machine\n     *\/\n    private void ensureTicket() {\n        switch (state) {\n            case TICKET:\n                logger.info(\"Re-using ticket\");\n                break;\n            case NOTICKET:\n                logger.info(\"Trying to acquire ticket for \" + this);\n                if (limits.acquire(RESPONSE_TIME_MS)) {\n                    logger.info(\"Acquired ticket\");\n                    state = State.TICKET;\n                } else {\n                    state = State.NOTICKET_AVAILABLE;\n                }\n                break;\n            case NOTICKET_AVAILABLE:\n                logger.info(\"No tickets available\");\n                break;\n        }\n    }\n}\n","old_contents":"import net.winstone.core.WinstoneConstant;\nimport org.slf4j.LoggerFactory;\n\n\/\/ Java EE servlet API\nimport javax.servlet.Servlet;\nimport javax.servlet.ServletRequest;\nimport javax.servlet.ServletResponse;\nimport javax.servlet.http.HttpServlet;\n\n\/\/ Used to scope pointcuts\nimport net.winstone.core.listener.RequestHandlerThread;\nimport net.winstone.core.ServletConfiguration;\nimport net.winstone.core.SimpleRequestDispatcher;\n\n\n\/\/ Rate Limiter\nimport edu.utwente.aop.tools.RateLimiter;\nimport java.util.concurrent.TimeUnit;\n\n\/\/ exceptions from Servlet.service(..)\nimport java.io.IOException;\nimport javax.servlet.ServletException;\nimport javax.servlet.http.HttpServletResponse;\n\n\/\/ We redirect the call flow to error servlet\nimport net.winstone.servlet.ErrorServlet;\n\n\/**\n * Ensure that the request is allowed by the RateLimiter before continuing..\n *\/\npublic aspect RateLimitingAspect  percflow(processRequest()) {\n    private enum State { UNINITIALIZED, NOTICKET, TICKET, NOTICKET_AVAILABLE };\n\n    public final int RESPONSE_TIME_MS = 1000;\n\n    \/** public because it is implicitly accessed from WebAppConfiguration *\/\n    public State state = State.UNINITIALIZED;\n\n    static org.slf4j.Logger logger = LoggerFactory.getLogger(Servlet.class);\n    \/\/ Allow 5 requests per limit\n    private static RateLimiter limits = new RateLimiter(5, 1, TimeUnit.MINUTES);\n\n    pointcut processRequest(): call(* processRequest(..)) && within(RequestHandlerThread);\n\n    pointcut servletCallService(Servlet servlet, ServletRequest req, ServletResponse resp): call(void Servlet.service(..)) && target(servlet) && args(req, resp);\n\n    pointcut inWinstoneServletConfiguration(): within(ServletConfiguration);\n\n    before(): processRequest() {\n        logger.info(\"Processrequest!\");\n        state = State.NOTICKET;\n    }\n\n    \/\/ TODO: Rewrite to around and call service on different type.\n    \/\/ TODO: Voor cflowbelow\n    before(ServletRequest req, ServletResponse resp) throws ServletException, IOException: inWinstoneServletConfiguration() && call(void Servlet.service(..)) && args(req, resp) {\n        logger.info(this.toString() + req + resp);\n\n        getTicket();\n\n        if (state != State.TICKET) {\n            \/\/ Instantiate new 503-UNAVAILABLE\n            ((HttpServletResponse) resp).sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE, \"Rate limit reached - Throttled\");\n\n            \/\/ TODO: Should not continue the regular call on service.\n        }\n    }\n\n    public void getTicket() {\n        switch (state) {\n            case TICKET:\n                logger.info(\"Re-using ticket\");\n                break;\n            case NOTICKET:\n                logger.info(\"Trying to acquire ticket for \" + this);\n                if (limits.acquire(RESPONSE_TIME_MS)) {\n                    logger.info(\"Acquired ticket\");\n                    state = State.TICKET;\n                } else {\n                    state = State.NOTICKET_AVAILABLE;\n                }\n                break;\n            case NOTICKET_AVAILABLE:\n                logger.info(\"No tickets available\");\n                break;\n            case UNINITIALIZED: \/\/ ensure this does not happen\n                throw new IllegalStateException(\"Should not receive request before init\");\n        }\n    }\n}\n","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"3973e132eda3341a47f74f2410c515434c9904f0","subject":"XWIKI-3503: Change Component Manager API to replace roles passed as Strings in favor of classes","message":"XWIKI-3503: Change Component Manager API to replace roles passed as Strings in favor of classes\n\n* Fixed compatibility aspect that was wrong.\n\ngit-svn-id: d23d7a6431d93e1bdd218a46658458610974b053@18642 f329d543-caf0-0310-9063-dda96c69346f\n","repos":"pbondoer\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,xwiki\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform,pbondoer\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,xwiki\/xwiki-platform","old_file":"xwiki-core\/src\/main\/aspect\/compatibility\/com\/xpn\/xwiki\/web\/UtilsCompatibilityAspect.aj","new_file":"xwiki-core\/src\/main\/aspect\/compatibility\/com\/xpn\/xwiki\/web\/UtilsCompatibilityAspect.aj","new_contents":"\/*\n * See the NOTICE file distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This is free software; you can redistribute it and\/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF site: http:\/\/www.fsf.org.\n *\n *\/\n package com.xpn.xwiki.web;\n\nimport com.xpn.xwiki.XWikiContext;\n\n\/**\n * Add a backward compatibility layer to the {@link Utils} class.\n * \n * @version $Id: UtilsCompatibilityAspect.aj 10166 2008-06-09 12:50:40Z sdumitriu $\n *\/\npublic privileged aspect UtilsCompatibilityAspect\n{\n    \/**\n     * Lookup a XWiki component by role and hint.\n     * \n     * @param role the class (aka role) that the component implements\n     * @param hint a value to differentiate different component implementations for the same role\n     * @return the component's instance\n     *\/\n\tpublic static Object Utils.getComponent(String role, String hint)\n    {\n        try {\n            return getComponent(Utils.class.getClassLoader().loadClass(role), hint);\n        } catch (Exception e) {\n            throw new RuntimeException(\"Failed to load component [\" + role + \"] for hint [\" + hint + \"]\", e);\n        }\n    }\n\n    \/**\n     * Lookup a XWiki component by role (uses the default hint).\n     * \n     * @param role the class (aka role) that the component implements\n     * @return the component's instance\n     *\/\n    public static Object Utils.getComponent(String role)\n    {\n        return getComponent(role, \"default\");\n    }\n}\n","old_contents":"\/*\n * See the NOTICE file distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This is free software; you can redistribute it and\/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF site: http:\/\/www.fsf.org.\n *\n *\/\n package com.xpn.xwiki.web;\n\nimport com.xpn.xwiki.XWikiContext;\n\n\/**\n * Add a backward compatibility layer to the {@link Utils} class.\n * \n * @version $Id: UtilsCompatibilityAspect.aj 10166 2008-06-09 12:50:40Z sdumitriu $\n *\/\npublic privileged aspect UtilsCompatibilityAspect\n{\n    \/**\n     * Lookup a XWiki component by role and hint.\n     * \n     * @param role the class (aka role) that the component implements\n     * @param hint a value to differentiate different component implementations for the same role\n     * @return the component's instance\n     *\/\n\tpublic static Object Utils.getComponent(String role, String hint)\n    {\n        try {\n            return getComponent(Utils.class.getClassLoader().loadClass(role).getName(), hint);\n        } catch (Exception e) {\n            throw new RuntimeException(\"Failed to load component [\" + role + \"] for hint [\" + hint + \"]\", e);\n        }\n    }\n\n    \/**\n     * Lookup a XWiki component by role (uses the default hint).\n     * \n     * @param role the class (aka role) that the component implements\n     * @return the component's instance\n     *\/\n    public static Object Utils.getComponent(String role)\n    {\n        return getComponent(role, \"default\");\n    }\n}\n","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"5c49ce89a900c6fb290d109dbd8f034b94987d1a","subject":"bug - fixed inheritance not working right for ltw (had to also provide sys_ pointcuts)","message":"bug - fixed inheritance not working right for ltw (had to also provide sys_ pointcuts)","repos":"appbakers\/automon_example,appbakers\/automon_example,stevensouza\/automon,appbakers\/automon_example,appbakers\/automon_example","old_file":"src\/main\/java\/org\/automon\/aspects\/AutomonAspect.aj","new_file":"src\/main\/java\/org\/automon\/aspects\/AutomonAspect.aj","new_contents":"package org.automon.aspects;\n\nimport org.automon.implementations.NullImp;\nimport org.automon.implementations.OpenMon;\n\n\/**\n * <p>Aspect that advises the {@link org.aspectj.lang.annotation.Around} and {@link org.aspectj.lang.annotation.AfterThrowing} annotations.\n * The appropriate methods on {@link org.automon.implementations.OpenMon} methods are called. The advice typically times methods\n * and counts any exceptions  thrown however other behavior such as logging is also possible.<\/p>\n *\n * <p>Note a developer should implement and provide any methods for this class or {@link org.automon.aspects.AspectJBase} or\n * {@link org.automon.aspects.SpringBase}.<\/p>\n *\n * <p>Note: I used native aspect style instead of the @AspectJ style because around in @AspectJ style doesn't seem to allow for the\n * more performant use of the static part of the JoinPoint. The static part only seems to be available without first\n * creating the dynamic JoinPoint in native aspects. Native style aspects are more powerful and can later be extended by developers\n * with @AspectJ style, so it is probably the best option anyway.  <\/p>\n *\/\npublic abstract aspect AutomonAspect  {\n    private OpenMon openMon = new NullImp();\n    protected  boolean enable = true;\n\n    public boolean isEnabled() {\n        return enable;\n    }\n\n    public void enable(boolean shouldEnable) {\n        enable = shouldEnable;\n    }\n\n\n    \/**\n     * monitor() advice - Wraps the given pointcut and calls the appropriate {@link org.automon.implementations.OpenMon} method at the beginning and end\n     * of the method call.\n     *\n     * @return The advised methods value or void.\n     * @throws Throwable If the method throws a {@link java.lang.Throwable} the advice will rethrow it.\n     *\/\n    Object around() throws Throwable : monitor()  {\n        \/\/ Note: context is typically a Timer\/Monitor object returned by the monitoring implementation (Jamon, JavaSimon, Metrics,...)\n        \/\/ though to this advice it is simply an object and the advice doesn't care what the intent of the context\/object is.\n        Object context = openMon.start(thisJoinPointStaticPart);\n        try {\n            Object retVal = proceed();\n            openMon.stop(context);\n            return retVal;\n        } catch (Throwable throwable) {\n            openMon.stop(context, throwable);\n            throw throwable;\n        }\n    }\n\n    \/**\n     * exceptions() advice - Takes action on any Exception thrown.  It Tracks\/Counts any exceptions thrown by the pointcut.\n     *\/\n    after() throwing(Throwable throwable): exceptions() {\n        openMon.exception(thisJoinPoint, throwable);\n    }\n\n    \/** Retreive monitoring implementation *\/\n    public OpenMon getOpenMon() {\n        return openMon;\n    }\n\n    \/** Set monitoring implementation such as JAMon, Metrics, or JavaSimon *\/\n    public void setOpenMon(OpenMon openMon) {\n        this.openMon = openMon;\n    }\n\n    \/** pointcut that determines what is monitored for performance\/time *\/\n    public pointcut monitor() : user_monitor() && sys_monitor();\n\n    \/** User should implement this pointcut to determine what should be monitored for performance\/time *\/\n    public abstract pointcut user_monitor();\n\n    \/** reserved pointcut for Automon team *\/\n    public pointcut sys_monitor();\n\n\n    \/** pointcut that determines what is monitored for exceptions.  It can be the same as the {@link #monitor()} poincut *\/\n    public pointcut exceptions() : user_exceptions() && sys_exceptions();\n\n    \/** User should implement this pointcut to determine what should be monitored for performance\/time *\/\n    public abstract pointcut user_exceptions();\n\n    \/** reserved pointcut for Automon team *\/\n    public  pointcut sys_exceptions();\n\n}\n","old_contents":"package org.automon.aspects;\n\nimport org.automon.implementations.NullImp;\nimport org.automon.implementations.OpenMon;\n\n\/**\n * <p>Aspect that advises the {@link org.aspectj.lang.annotation.Around} and {@link org.aspectj.lang.annotation.AfterThrowing} annotations.\n * The appropriate methods on {@link org.automon.implementations.OpenMon} methods are called. The advice typically times methods\n * and counts any exceptions  thrown however other behavior such as logging is also possible.<\/p>\n *\n * <p>Note a developer should implement and provide any methods for this class or {@link org.automon.aspects.AspectJBase} or\n * {@link org.automon.aspects.SpringBase}.<\/p>\n *\n * <p>Note: I used native aspect style instead of the @AspectJ style because around in @AspectJ style doesn't seem to allow for the\n * more performant use of the static part of the JoinPoint. The static part only seems to be available without first\n * creating the dynamic JoinPoint in native aspects. Native style aspects are more powerful and can later be extended by developers\n * with @AspectJ style, so it is probably the best option anyway.  <\/p>\n *\/\npublic abstract aspect AutomonAspect  {\n    private OpenMon openMon = new NullImp();\n    protected  boolean enable = true;\n\n    public boolean isEnabled() {\n        return enable;\n    }\n\n    public void enable(boolean shouldEnable) {\n        enable = shouldEnable;\n    }\n\n\n    \/**\n     * monitor() advice - Wraps the given pointcut and calls the appropriate {@link org.automon.implementations.OpenMon} method at the beginning and end\n     * of the method call.\n     *\n     * @return The advised methods value or void.\n     * @throws Throwable If the method throws a {@link java.lang.Throwable} the advice will rethrow it.\n     *\/\n    Object around() throws Throwable : monitor()  {\n        \/\/ Note: context is typically a Timer\/Monitor object returned by the monitoring implementation (Jamon, JavaSimon, Metrics,...)\n        \/\/ though to this advice it is simply an object and the advice doesn't care what the intent of the context\/object is.\n        Object context = openMon.start(thisJoinPointStaticPart);\n        try {\n            Object retVal = proceed();\n            openMon.stop(context);\n            return retVal;\n        } catch (Throwable throwable) {\n            openMon.stop(context, throwable);\n            throw throwable;\n        }\n    }\n\n    \/**\n     * exceptions() advice - Takes action on any Exception thrown.  It Tracks\/Counts any exceptions thrown by the pointcut.\n     *\/\n    after() throwing(Throwable throwable): exceptions() {\n        openMon.exception(thisJoinPoint, throwable);\n    }\n\n    \/** Retreive monitoring implementation *\/\n    public OpenMon getOpenMon() {\n        return openMon;\n    }\n\n    \/** Set monitoring implementation such as JAMon, Metrics, or JavaSimon *\/\n    public void setOpenMon(OpenMon openMon) {\n        this.openMon = openMon;\n    }\n\n    \/** pointcut that determines what is monitored for performance\/time *\/\n    public pointcut monitor() : user_monitor() && sys_monitor();\n\n    \/** User should implement this pointcut to determine what should be monitored for performance\/time *\/\n    public abstract pointcut user_monitor();\n\n    \/** reserved pointcut for Automon team *\/\n    public abstract pointcut sys_monitor();\n\n\n    \/** pointcut that determines what is monitored for exceptions.  It can be the same as the {@link #monitor()} poincut *\/\n    public pointcut exceptions() : user_exceptions() && sys_exceptions();\n\n    \/** User should implement this pointcut to determine what should be monitored for performance\/time *\/\n    public abstract pointcut user_exceptions();\n\n    \/** reserved pointcut for Automon team *\/\n    public abstract pointcut sys_exceptions();\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"f5df9c15f9a0ec97c5e2f9db6acb2003b61d253d","subject":"hmmmm looks like trustin moved stack maintenance to the confguration\/context object and i see why he did not call it a configuration now","message":"hmmmm looks like trustin moved stack maintenance to the confguration\/context object and i see why he did not call it a configuration now\n\ngit-svn-id: 90776817adfbd895fc5cfa90f675377e0a62e745@190952 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"drankye\/directory-server,drankye\/directory-server,darranl\/directory-server,darranl\/directory-server,apache\/directory-server,lucastheisen\/apache-directory-server,lucastheisen\/apache-directory-server,apache\/directory-server","old_file":"core\/src\/main\/aspects\/org\/apache\/ldap\/server\/jndi\/ProviderNexusAspect.aj","new_file":"core\/src\/main\/aspects\/org\/apache\/ldap\/server\/jndi\/ProviderNexusAspect.aj","new_contents":"package org.apache.ldap.server.jndi;\n\n\nimport java.util.Map;\nimport java.util.Stack;\nimport java.util.Iterator;\nimport java.util.EmptyStackException;\n        \nimport javax.naming.Name;\nimport javax.naming.Context;\nimport javax.naming.ldap.LdapContext;\nimport javax.naming.NamingEnumeration;\nimport javax.naming.directory.Attributes;\nimport javax.naming.directory.SearchControls;\nimport javax.naming.directory.ModificationItem;\n\nimport org.apache.ldap.common.filter.ExprNode;\nimport org.apache.ldap.server.PartitionNexus;\nimport org.apache.ldap.server.db.Database;\nimport org.apache.ldap.server.ContextPartition;\nimport org.apache.ldap.server.invocation.Invocation;\n\n\n\/**\n * Aspect coupling the JNDI provider with the nexus thereby facilitating the \n * injection of interceptors between calls to the nexus from the JNDI.\n * \n * @author <a href=\"mailto:aok123@bellsouth.net\">Alex Karasulu<\/a>\n * @author $Author$\n * @version $Revision$\n *\/\npublic aspect ProviderNexusAspect\n{\n    \/\/ ------------------------------------------------------------------------\n    \/\/ M E M B E R   I N T R O D U C T I O N S\n    \/\/ ------------------------------------------------------------------------\n    \n    \n    \/** \n     * Adds a static ThreadLocal for a Stack of LdapContexts representing nested\n     * backend nexus calls made by the DefaultContextFactoryConfiguration's contexts within the same\n     * thread of execution.\n     *\/\n    private static ThreadLocal DefaultContextFactoryConfiguration.s_contextStacks = new ThreadLocal();\n    \n    \n    \/\/ ------------------------------------------------------------------------\n    \/\/ M E T H O D   I N T R O D U C T I O N S\n    \/\/ ------------------------------------------------------------------------\n\n\n    \/**\n     * Pushes a calling LdapContext onto the Thread's ThreadLocal Stack before\n     * calls are made on the nexus within the LdapContext code.\n     * \n     * @param context the caller or the current context for the nexus call\n     *\/\n    private static void DefaultContextFactoryConfiguration.push( LdapContext context )\n    {\n        Stack stack = ( Stack ) s_contextStacks.get();\n        \n        if ( null == stack )\n        {\n            stack = new Stack();\n            s_contextStacks.set( stack );\n        }\n        \n        stack.push( context );\n    } \n\n\n    \/**\n     * Pops the head of the Thread's ThreadLocal Stack after calls complete on\n     * the nexus within the LdapContext code.\n     * \n     * @return the last LdapContext or caller\n     *\/\n    private static LdapContext DefaultContextFactoryConfiguration.pop()\n    {\n        Stack stack = ( Stack ) s_contextStacks.get();\n        \n        if ( null == stack )\n        {\n            throw new EmptyStackException();\n        }\n        \n        return ( LdapContext ) stack.pop();\n    }\n    \n    \n    \/**\n     * Peeks at the head of the Thread's ThreadLocal Stack.\n     * \n     * @return the current LdapContext or caller\n     *\/\n    static LdapContext DefaultContextFactoryConfiguration.peek()\n    {\n        Stack stack = ( Stack ) s_contextStacks.get();\n        \n        if ( null == stack )\n        {\n            throw new EmptyStackException();\n        }\n        \n        return ( LdapContext ) stack.peek();\n    }\n    \n    \n    \/\/ ------------------------------------------------------------------------\n    \/\/ A S P E C T   M E T H O D S \n    \/\/ ------------------------------------------------------------------------\n    \n\n    \/**\n     * Gets a shallow copy of the context stack.\n     * \n     * @return the context Stack.\n     *\/    \n    private static Stack getContextStack()\n    {\n        Stack stack = ( Stack ) DefaultContextFactoryConfiguration.s_contextStacks.get();\n        \n        if ( stack == null )\n        {\n            return null;\n        }\n        \n        return ( Stack ) stack.clone();\n    }\n    \n    \n    \/\/ ------------------------------------------------------------------------\n    \/\/ P O I N T   C U T S\n    \/\/ ------------------------------------------------------------------------\n    \n    \n    \/**\n     * Selects join points on any public method calls made on the BackendNexus\n     * interface implementing proxy from code executing within an LdapContext \n     * caller.  Makes sure that Proxy methods (static) and the \n     * getInvokationHandler() do not get selected.\n     * \n     * @param caller the calling LdapContext.\n     *\/\n    pointcut jndiNexusCalls( Context caller ):\n        this( caller ) &&\n        ! this( ContextPartition ) &&\n        target( PartitionNexus ) &&\n        ! target( Database ) &&\n        (\n        \/\/ these are for the ContextPartition interface methods \n\n        \/\/ not used anymore since it was moved to RootNexus class\n        \/\/ call( public Attributes getRootDSE() ) ||\n        \t\t\n        call( public Name getMatchedDn( Name, boolean ) ) ||\n        call( public Name getSuffix( Name, boolean ) ) ||\n\t\tcall( public Iterator listSuffixes( boolean ) ) ||\n\t\tcall( public Attributes lookup( Name, String [] ) ) ||\n\n\t\t\/\/ these are for BackingStore interface methods\n        call( public void add( String, Name, Attributes ) ) ||\n        call( public void delete( Name ) ) ||\n\t\tcall( public boolean hasEntry( Name ) ) ||\n        call( public boolean isSuffix( Name ) ) ||\n        call( public NamingEnumeration list( Name ) ) ||\n\t\tcall( public Attributes lookup( Name ) ) ||\n        call( public void modify( Name, int, Attributes ) ) ||\n        call( public void modify( Name, ModificationItem [] ) ) ||\n        call( public void modifyRn( Name, String, boolean ) ) ||\n        call( public void move( Name, Name ) ) ||\n        call( public void move( Name, Name, String, boolean ) ) ||\n        call( public NamingEnumeration \n           search( Name, Map, ExprNode, SearchControls ) ) );\n        \n\n    \/**\n     * Selects join points where the Invokation default constructor executes.\n     * \n     * @param invocation the Invocation instantiated\n     *\/\n    pointcut newInvocation( Invocation invocation ):\n        target( invocation ) &&\n        execution( Invocation.new(..) );\n      \n        \n    \/\/ ------------------------------------------------------------------------\n    \/\/ A D V I C E\n    \/\/ ------------------------------------------------------------------------\n\n\n    before( Context caller ):\n        jndiNexusCalls( caller )\n        {\n    \t\tDefaultContextFactoryConfiguration.push( ( LdapContext ) caller );\n            \/\/System.out.println( \"\\npushed \" + caller + \" for join point \"\n            \/\/    + thisJoinPoint );\n        }\n        \n\n    after( Context caller ):\n        jndiNexusCalls( caller ) \n        {\n            LdapContext head = DefaultContextFactoryConfiguration.pop();\n            \/\/System.out.println( \"\\npopped \" + caller + \" for join point \"\n            \/\/    + thisJoinPoint );\n        }\n      \n        \n    after( Invocation invocation ):\n        newInvocation( invocation )\n        {\n            invocation.setContextStack( getContextStack() );\n            \/\/System.out.println( \n            \/\/    \"\\nJust set the context stack on a new Invocation: \" \n            \/\/    + thisJoinPoint );\n        }\n}\n","old_contents":"package org.apache.ldap.server.jndi;\n\n\nimport java.util.Map;\nimport java.util.Stack;\nimport java.util.Iterator;\nimport java.util.EmptyStackException;\n        \nimport javax.naming.Name;\nimport javax.naming.Context;\nimport javax.naming.ldap.LdapContext;\nimport javax.naming.NamingEnumeration;\nimport javax.naming.directory.Attributes;\nimport javax.naming.directory.SearchControls;\nimport javax.naming.directory.ModificationItem;\n\nimport org.apache.ldap.common.filter.ExprNode;\nimport org.apache.ldap.server.PartitionNexus;\nimport org.apache.ldap.server.db.Database;\nimport org.apache.ldap.server.ContextPartition;\nimport org.apache.ldap.server.invocation.Invocation;\n\n\n\/**\n * Aspect coupling the JNDI provider with the nexus thereby facilitating the \n * injection of interceptors between calls to the nexus from the JNDI.\n * \n * @author <a href=\"mailto:aok123@bellsouth.net\">Alex Karasulu<\/a>\n * @author $Author$\n * @version $Revision$\n *\/\npublic aspect ProviderNexusAspect\n{\n    \/\/ ------------------------------------------------------------------------\n    \/\/ M E M B E R   I N T R O D U C T I O N S\n    \/\/ ------------------------------------------------------------------------\n    \n    \n    \/** \n     * Adds a static ThreadLocal for a Stack of LdapContexts representing nested\n     * backend nexus calls made by the DefaultContextFactoryContext's contexts within the same \n     * thread of execution.\n     *\/\n    private static ThreadLocal DefaultContextFactoryContext.s_contextStacks = new ThreadLocal();\n    \n    \n    \/\/ ------------------------------------------------------------------------\n    \/\/ M E T H O D   I N T R O D U C T I O N S\n    \/\/ ------------------------------------------------------------------------\n\n\n    \/**\n     * Pushes a calling LdapContext onto the Thread's ThreadLocal Stack before\n     * calls are made on the nexus within the LdapContext code.\n     * \n     * @param context the caller or the current context for the nexus call\n     *\/\n    private static void DefaultContextFactoryContext.push( LdapContext context )\n    {\n        Stack stack = ( Stack ) s_contextStacks.get();\n        \n        if ( null == stack )\n        {\n            stack = new Stack();\n            s_contextStacks.set( stack );\n        }\n        \n        stack.push( context );\n    } \n\n\n    \/**\n     * Pops the head of the Thread's ThreadLocal Stack after calls complete on\n     * the nexus within the LdapContext code.\n     * \n     * @return the last LdapContext or caller\n     *\/\n    private static LdapContext DefaultContextFactoryContext.pop()\n    {\n        Stack stack = ( Stack ) s_contextStacks.get();\n        \n        if ( null == stack )\n        {\n            throw new EmptyStackException();\n        }\n        \n        return ( LdapContext ) stack.pop();\n    }\n    \n    \n    \/**\n     * Peeks at the head of the Thread's ThreadLocal Stack.\n     * \n     * @return the current LdapContext or caller\n     *\/\n    static LdapContext DefaultContextFactoryContext.peek()\n    {\n        Stack stack = ( Stack ) s_contextStacks.get();\n        \n        if ( null == stack )\n        {\n            throw new EmptyStackException();\n        }\n        \n        return ( LdapContext ) stack.peek();\n    }\n    \n    \n    \/\/ ------------------------------------------------------------------------\n    \/\/ A S P E C T   M E T H O D S \n    \/\/ ------------------------------------------------------------------------\n    \n\n    \/**\n     * Gets a shallow copy of the context stack.\n     * \n     * @return the context Stack.\n     *\/    \n    private static Stack getContextStack()\n    {\n        Stack stack = ( Stack ) DefaultContextFactoryContext.s_contextStacks.get();\n        \n        if ( stack == null )\n        {\n            return null;\n        }\n        \n        return ( Stack ) stack.clone();\n    }\n    \n    \n    \/\/ ------------------------------------------------------------------------\n    \/\/ P O I N T   C U T S\n    \/\/ ------------------------------------------------------------------------\n    \n    \n    \/**\n     * Selects join points on any public method calls made on the BackendNexus\n     * interface implementing proxy from code executing within an LdapContext \n     * caller.  Makes sure that Proxy methods (static) and the \n     * getInvokationHandler() do not get selected.\n     * \n     * @param caller the calling LdapContext.\n     *\/\n    pointcut jndiNexusCalls( Context caller ):\n        this( caller ) &&\n        ! this( ContextPartition ) &&\n        target( PartitionNexus ) &&\n        ! target( Database ) &&\n        (\n        \/\/ these are for the ContextPartition interface methods \n\n        \/\/ not used anymore since it was moved to RootNexus class\n        \/\/ call( public Attributes getRootDSE() ) ||\n        \t\t\n        call( public Name getMatchedDn( Name, boolean ) ) ||\n        call( public Name getSuffix( Name, boolean ) ) ||\n\t\tcall( public Iterator listSuffixes( boolean ) ) ||\n\t\tcall( public Attributes lookup( Name, String [] ) ) ||\n\n\t\t\/\/ these are for BackingStore interface methods\n        call( public void add( String, Name, Attributes ) ) ||\n        call( public void delete( Name ) ) ||\n\t\tcall( public boolean hasEntry( Name ) ) ||\n        call( public boolean isSuffix( Name ) ) ||\n        call( public NamingEnumeration list( Name ) ) ||\n\t\tcall( public Attributes lookup( Name ) ) ||\n        call( public void modify( Name, int, Attributes ) ) ||\n        call( public void modify( Name, ModificationItem [] ) ) ||\n        call( public void modifyRn( Name, String, boolean ) ) ||\n        call( public void move( Name, Name ) ) ||\n        call( public void move( Name, Name, String, boolean ) ) ||\n        call( public NamingEnumeration \n           search( Name, Map, ExprNode, SearchControls ) ) );\n        \n\n    \/**\n     * Selects join points where the Invokation default constructor executes.\n     * \n     * @param invocation the Invocation instantiated\n     *\/\n    pointcut newInvocation( Invocation invocation ):\n        target( invocation ) &&\n        execution( Invocation.new(..) );\n      \n        \n    \/\/ ------------------------------------------------------------------------\n    \/\/ A D V I C E\n    \/\/ ------------------------------------------------------------------------\n\n\n    before( Context caller ):\n        jndiNexusCalls( caller )\n        {\n    \t\tDefaultContextFactoryContext.push( ( LdapContext ) caller );\n            \/\/System.out.println( \"\\npushed \" + caller + \" for join point \"\n            \/\/    + thisJoinPoint );\n        }\n        \n\n    after( Context caller ):\n        jndiNexusCalls( caller ) \n        {\n            LdapContext head = DefaultContextFactoryContext.pop();\n            \/\/System.out.println( \"\\npopped \" + caller + \" for join point \"\n            \/\/    + thisJoinPoint );\n        }\n      \n        \n    after( Invocation invocation ):\n        newInvocation( invocation )\n        {\n            invocation.setContextStack( getContextStack() );\n            \/\/System.out.println( \n            \/\/    \"\\nJust set the context stack on a new Invocation: \" \n            \/\/    + thisJoinPoint );\n        }\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"3626b75401b7f0ee6878cb537b13ba5c1b3ff679","subject":"comments for PdfExport","message":"comments for PdfExport\n","repos":"stieglma\/Schafkopfauswerter","old_file":"src\/PdfExport.aj","new_file":"src\/PdfExport.aj","new_contents":"import java.awt.Component;\nimport java.awt.event.ActionEvent;\nimport java.awt.event.ActionListener;\nimport java.io.IOException;\nimport java.text.SimpleDateFormat;\nimport java.util.Calendar;\nimport java.util.Iterator;\n\nimport javax.swing.JMenu;\nimport javax.swing.JMenuBar;\nimport javax.swing.JMenuItem;\n\nimport org.apache.pdfbox.exceptions.COSVisitorException;\nimport org.apache.pdfbox.pdmodel.PDDocument;\nimport org.apache.pdfbox.pdmodel.PDPage;\nimport org.apache.pdfbox.pdmodel.edit.PDPageContentStream;\nimport org.apache.pdfbox.pdmodel.font.PDType1Font;\n\nimport model.db.DataObject;\nimport model.db.GameData;\nimport view.GUI;\nimport view.SchafkopfTableModel;\n\npublic privileged aspect PdfExport {\n\n    \/** This precendence makes the order of the items in the file menu sure *\/\n    declare precedence : Import, HtmlExport, PdfExport; \n    private GUI gui;\n\n    \/**\n     * catch constructor call, so that we have the correct gui, to refer to everywhere\n     *\/\n    after() returning(GUI gui): call(GUI.new(*)) {\n        this.gui = gui;\n    }\n\n    private String[][] SchafkopfTableModel.asTextArray() {\n        String[][] completeTable = data.asTextArray();\n\n        String[] headerLine = new String[getColumnCount()];\n        for (int i = 0; i < getColumnCount(); i++) {\n            headerLine[i] = getColumnName(i);\n        }\n        completeTable[0] = headerLine;\n        return completeTable;\n    }\n\n    private String[][] GameData.asTextArray() {\n        Iterator<DataObject> it = data.iterator();\n        String[][] rows = new String[data.size()+1][];\n        int index = 1;\n        while (it.hasNext()) {\n            rows[index] = it.next().asTextArray(index-1);\n            index++;\n        }\n        return rows;\n    }\n\n    \/**\n     * Add pdf report feature to menu bar\n     *\/\n    after() returning(JMenuBar bar): call(JMenuBar GUI.createMenu()) {\n        JMenuItem itemExportPdf = new JMenuItem(\"Generiere PDF Report\");\n        itemExportPdf.addActionListener(new PDFReportListener());\n\n        Component[] menus = bar.getComponents();\n        if (menus.length != 0 && menus[0] instanceof JMenu) {\n            ((JMenu)bar.getComponents()[0]).add(itemExportPdf, 0);\n        } else {\n            throw new AssertionError(\"There should be a menu entry!\");\n        }\n    }\n\n    \/**\n     * generate pdf report (execution of PDFReportListener is suppressed, this\n     * is just an empty method, to be able to create this pointcut\n     *\/\n    void around(PDDocument document) throws IOException\n          : execution (* PDFReportListener.drawTable(PDDocument)) \n          && args(document) {\n        PDPage page = new PDPage();\n        document.addPage(page);\n        PDPageContentStream contentStream = new PDPageContentStream(document, page);\n        float y =750f;\n        float margin =60f;\n        String[][] content = ((SchafkopfTableModel) gui.table.getModel()).asTextArray();\n\n        final int rows = content.length;\n        final int cols = content[0].length;\n        final float rowHeight = 20f;\n        final float tableWidth = page.findMediaBox().getWidth()-(2*margin);\n        final float tableHeight = rowHeight * rows;\n        final float colWidth = tableWidth\/(float)cols;\n        final float cellMargin=5f;\n\n        \/\/ TODO multisite tables\n        \/\/draw the rows\n        float nexty = y ;\n        for (int i = 0; i <= rows; i++) {\n            contentStream.drawLine(margin,nexty,margin+tableWidth,nexty);\n            nexty-= rowHeight;\n        }\n     \n        \/\/draw the columns\n        float nextx = margin;\n        for (int i = 0; i <= cols; i++) {\n            contentStream.drawLine(nextx,y,nextx,y-tableHeight);\n            nextx += colWidth;\n        }\n     \n        \/\/now add the text\n        contentStream.setFont(PDType1Font.HELVETICA_BOLD,10);\n     \n        float textx = margin+cellMargin;\n        float texty = y-15;\n        for(int i = 0; i < content.length; i++){\n            for(int j = 0 ; j < content[i].length; j++){\n                String text = content[i][j];\n                contentStream.beginText();\n                contentStream.moveTextPositionByAmount(textx,texty);\n                contentStream.drawString(text);\n                contentStream.endText();\n                textx += colWidth;\n            }\n            texty-=rowHeight;\n            textx = margin+cellMargin;\n        }\n        contentStream.close();\n    }\n}\n\nclass PDFReportListener implements ActionListener {\n\n    @Override\n    public void actionPerformed(ActionEvent arg0) {\n        \/\/ Create a document and add a page to it\n        PDDocument document = new PDDocument();\n        \n        try {\n            drawTable(document);  \n\n            \/\/ Save the results and ensure that the document is properly closed:\n            document.save(\"Session_vom_\"+new SimpleDateFormat(\"dd.MM_'um'_HH:mm\").format(Calendar.getInstance().getTime()) + \".pdf\");\n        } catch (IOException | COSVisitorException e) {\n            \/\/ TODO Auto-generated catch block\n            e.printStackTrace();\n        } finally {\n            try {\n                document.close();\n            } catch (IOException e) {\n                e.printStackTrace();\n            }\n        }\n    }\n\n    \/** filled with pointcut from pdfExport.aj*\/\n    public static void drawTable(PDDocument document) throws IOException {\n    }\n}","old_contents":"import java.awt.Component;\nimport java.awt.event.ActionEvent;\nimport java.awt.event.ActionListener;\nimport java.io.IOException;\nimport java.text.SimpleDateFormat;\nimport java.util.Calendar;\nimport java.util.Iterator;\n\nimport javax.swing.JMenu;\nimport javax.swing.JMenuBar;\nimport javax.swing.JMenuItem;\n\nimport org.apache.pdfbox.exceptions.COSVisitorException;\nimport org.apache.pdfbox.pdmodel.PDDocument;\nimport org.apache.pdfbox.pdmodel.PDPage;\nimport org.apache.pdfbox.pdmodel.edit.PDPageContentStream;\nimport org.apache.pdfbox.pdmodel.font.PDType1Font;\n\nimport model.db.DataObject;\nimport model.db.GameData;\nimport view.GUI;\nimport view.SchafkopfTableModel;\n\npublic privileged aspect PdfExport {\n\n    declare precedence : Import, HtmlExport, PdfExport; \n    private GUI gui;\n\n    \/**\n     * catch constructor call, so that we have the correct gui, to refer to everywhere\n     *\/\n    after() returning(GUI gui): call(GUI.new(*)) {\n        this.gui = gui;\n    }\n\n    private String[][] SchafkopfTableModel.asTextArray() {\n        String[][] completeTable = data.asTextArray();\n\n        String[] headerLine = new String[getColumnCount()];\n        for (int i = 0; i < getColumnCount(); i++) {\n            headerLine[i] = getColumnName(i);\n        }\n        completeTable[0] = headerLine;\n        return completeTable;\n    }\n\n    private String[][] GameData.asTextArray() {\n        Iterator<DataObject> it = data.iterator();\n        String[][] rows = new String[data.size()+1][];\n        int index = 1;\n        while (it.hasNext()) {\n            rows[index] = it.next().asTextArray(index-1);\n            index++;\n        }\n        return rows;\n    }\n\n    \/**\n     * Add pdf report feature to menu bar\n     *\/\n    after() returning(JMenuBar bar): call(JMenuBar GUI.createMenu()) {\n        JMenuItem itemExportPdf = new JMenuItem(\"Generiere PDF Report\");\n        itemExportPdf.addActionListener(new PDFReportListener());\n\n        Component[] menus = bar.getComponents();\n        if (menus.length != 0 && menus[0] instanceof JMenu) {\n            ((JMenu)bar.getComponents()[0]).add(itemExportPdf, 0);\n        } else {\n            throw new AssertionError(\"There should be a menu entry!\");\n        }\n    }\n\n    \/**\n     * generate pdf report (execution of PDFReportListener is suppressed, this\n     * is just an empty method, to be able to create this pointcut\n     *\/\n    void around(PDDocument document) throws IOException\n          : execution (* PDFReportListener.drawTable(PDDocument)) \n          && args(document) {\n        PDPage page = new PDPage();\n        document.addPage(page);\n        PDPageContentStream contentStream = new PDPageContentStream(document, page);\n        float y =750f;\n        float margin =60f;\n        String[][] content = ((SchafkopfTableModel) gui.table.getModel()).asTextArray();\n\n        final int rows = content.length;\n        final int cols = content[0].length;\n        final float rowHeight = 20f;\n        final float tableWidth = page.findMediaBox().getWidth()-(2*margin);\n        final float tableHeight = rowHeight * rows;\n        final float colWidth = tableWidth\/(float)cols;\n        final float cellMargin=5f;\n\n        \/\/ TODO multisite tables\n        \/\/draw the rows\n        float nexty = y ;\n        for (int i = 0; i <= rows; i++) {\n            contentStream.drawLine(margin,nexty,margin+tableWidth,nexty);\n            nexty-= rowHeight;\n        }\n     \n        \/\/draw the columns\n        float nextx = margin;\n        for (int i = 0; i <= cols; i++) {\n            contentStream.drawLine(nextx,y,nextx,y-tableHeight);\n            nextx += colWidth;\n        }\n     \n        \/\/now add the text\n        contentStream.setFont(PDType1Font.HELVETICA_BOLD,10);\n     \n        float textx = margin+cellMargin;\n        float texty = y-15;\n        for(int i = 0; i < content.length; i++){\n            for(int j = 0 ; j < content[i].length; j++){\n                String text = content[i][j];\n                contentStream.beginText();\n                contentStream.moveTextPositionByAmount(textx,texty);\n                contentStream.drawString(text);\n                contentStream.endText();\n                textx += colWidth;\n            }\n            texty-=rowHeight;\n            textx = margin+cellMargin;\n        }\n        contentStream.close();\n    }\n}\n\nclass PDFReportListener implements ActionListener {\n\n    @Override\n    public void actionPerformed(ActionEvent arg0) {\n        \/\/ Create a document and add a page to it\n        PDDocument document = new PDDocument();\n        \n        try {\n            drawTable(document);  \n\n            \/\/ Save the results and ensure that the document is properly closed:\n            document.save(\"Session_vom_\"+new SimpleDateFormat(\"dd.MM_'um'_HH:mm\").format(Calendar.getInstance().getTime()) + \".pdf\");\n        } catch (IOException | COSVisitorException e) {\n            \/\/ TODO Auto-generated catch block\n            e.printStackTrace();\n        } finally {\n            try {\n                document.close();\n            } catch (IOException e) {\n                e.printStackTrace();\n            }\n        }\n    }\n\n    \/** filled with pointcut from pdfExport.aj*\/\n    public static void drawTable(PDDocument document) throws IOException {\n    }\n}","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"170e1ff09204ad07f2bac13e16250943c5cbf63f","subject":"addressing some pr comments","message":"addressing some pr comments\n","repos":"DataDog\/monitor,eigengo\/monitor,eigengo\/monitor,DataDog\/monitor","old_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/ActorCellMonitoringAspect.aj","new_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/ActorCellMonitoringAspect.aj","new_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.actor.*;\nimport org.eigengo.monitor.agent.AgentConfiguration;\nimport org.eigengo.monitor.output.CounterInterface;\nimport scala.Option;\n\nimport java.util.ArrayList;\nimport java.util.List;\nimport java.util.concurrent.atomic.AtomicLong;\nimport java.util.concurrent.ConcurrentHashMap;\n\n\/**\n * Contains advices for monitoring behaviour of an actor; typically imprisoned in an {@code ActorCell}.\n *\/\npublic aspect ActorCellMonitoringAspect extends AbstractMonitoringAspect issingleton() {\n    private AkkaAgentConfiguration agentConfiguration;\n    private final CounterInterface counterInterface;\n    private final Option<String> noActorClazz = Option.empty();\n    private final ConcurrentHashMap<Option<String>, AtomicLong> samplingCounters;\n    private final ConcurrentHashMap<Option<String>, AtomicLong> numberOfActors;\n\n\n    \/**\n     * Constructs this aspect\n     *\/\n    public ActorCellMonitoringAspect() {\n        AgentConfiguration<AkkaAgentConfiguration> configuration = getAgentConfiguration(\"akka\", AkkaAgentConfigurationJapi.apply());\n        this.agentConfiguration = configuration.agent();\n        this.counterInterface = createCounterInterface(configuration.common());\n        this.samplingCounters = new ConcurrentHashMap<Option<String>, AtomicLong>();\n        this.numberOfActors = new ConcurrentHashMap<Option<String>, AtomicLong>();\n    }\n\n    \/**\n     * Injects the new {@code AkkaAgentConfiguration} instance.\n     *\n     * @param agentConfiguration the new configuration\n     *\/\n    synchronized final void setAgentConfiguration(AkkaAgentConfiguration agentConfiguration) {\n        this.agentConfiguration = agentConfiguration;\n    }\n\n    \/\/ decide whether to include this ActorCell in our measurements\n    private boolean includeActorPath(final PathAndClass pathAndClass) {\n        if (!this.agentConfiguration.incuded().accept(pathAndClass)) return false;\n        if (this.agentConfiguration.excluded().accept(pathAndClass)) return false;\n\n        if (this.agentConfiguration.includeSystemAgents()) return true;\n\n        String userOrSystem = pathAndClass.actorPath().getElements().iterator().next();\n        return \"user\".equals(userOrSystem);\n    }\n\n    \/\/ get the sample rate for an actor\n    private int getSampleRate(final PathAndClass pathAndClass) {\n        return this.agentConfiguration.sampling().getRate(pathAndClass);\n    }\n\n    \/\/ decide whether to sample an actor on a particular occasion\n    private final boolean sampleMessage(final PathAndClass pathAndClass) {\n        int sampleRate = getSampleRate(pathAndClass);\n        if (sampleRate == 1) return true;\n\n        this.samplingCounters.putIfAbsent(pathAndClass.actorClassName(), new AtomicLong(0));\n        long timesSeenSoFar = this.samplingCounters.get(pathAndClass.actorClassName()).incrementAndGet();\n        return (timesSeenSoFar % sampleRate == 1); \/\/ == 1 to log first value (incrementAndGet returns updated value)\n    }\n\n    \/\/ get the tags for the cell\n    private String[] getTags(final ActorPath actorPath, final Actor actor) {\n        List<String> tags = new ArrayList<String>();\n\n        \/\/ TODO: Improve detection of routed actors. This relies only on the naming :(.\n        String lastPathElement = actorPath.elements().last();\n        if (lastPathElement.startsWith(\"$\")) {\n            \/\/ this is routed actor.\n            tags.add(actorPath.parent().toString());\n            if (this.agentConfiguration.includeRoutees()) tags.add(actorPath.toString());\n        } else {\n            \/\/ there is no supervisor\n            tags.add(actorPath.toString());\n        }\n        if (actor != null) {\n            tags.add(String.format(\"akka:%s.%s\", actor.context().system().name(), actor.getClass().getCanonicalName()));\n        }\n\n        return tags.toArray(new String[tags.size()]);\n    }\n\n    \/\/ returns the canonical name of the actor type associated with an ActorCell\n    private String uncheckedActorNameFrom(final ActorCell actorCell) {\n        return uncheckedActorNameFrom(actorCell.props());\n    }\n\n    \/\/ returns the canonical name of the actor type associated with a Props instance\n    private String uncheckedActorNameFrom(final Props props) {\n        return props.actorClass().getCanonicalName();\n    }\n\n    \/**\n     * Advises the {@code ActorCell.receiveMessage(message: Object): Unit}\n     * We proceed with the pointcut if the actor is to be included in the monitoring *and* this is\n     * the 'multiple-of-n'th time we've seen a message for an actor with a sample rate of n.\n     *\n     * Currently, we sample queue size, the fact that the message is delivered, the simple name of the class of the\n     * message, and the time taken to complete the actor's reactive action.\n     *\n     * @param actorCell the ActorCell where the actor that receives the message \"lives\"\n     * @param msg the incoming message\n     *\/\n    Object around(ActorCell actorCell, Object msg) : Pointcuts.actorCellReceiveMessage(actorCell, msg) {\n        final ActorPath actorPath = actorCell.self().path();\n        final PathAndClass pathAndClass = new PathAndClass(actorPath, Option.apply(uncheckedActorNameFrom(actorCell)));\n        if (!includeActorPath(pathAndClass) || !sampleMessage(pathAndClass)) return proceed(actorCell, msg);\n\n        int samplingRate = getSampleRate(pathAndClass);\n\n        \/\/ we tag by actor name\n        final String[] tags = getTags(actorPath, actorCell.actor());\n\n        \/\/ record the queue size\n        this.counterInterface.recordGaugeValue(\"akka.queue.size\", actorCell.numberOfMessages(), tags);\n        \/\/ record the message, general and specific\n        this.counterInterface.incrementCounter(\"akka.actor.delivered\", samplingRate, tags);\n        this.counterInterface.incrementCounter(\"akka.actor.delivered.\" + msg.getClass().getSimpleName(), samplingRate, tags);\n\n        \/\/ measure the time. we're using the ``nanoTime`` call to access the high-precision timer.\n        \/\/ since we're not really interested in wall time, but just some increasing measure of\n        \/\/ elapsed time\n        Object result = null;\n        final long start = System.nanoTime();\n        \/\/ result will always be ``null``, because target returns ``Unit``\n        result = proceed(actorCell, msg);\n        \/\/ ns or \u00b5s is too fine. ms will do for now.\n        final long duration = (System.nanoTime() - start) \/ 1000000;\n\n        \/\/ record the actor duration\n        this.counterInterface.recordExecutionTime(\"akka.actor.duration\", (int)duration, tags);\n\n        \/\/ return null would do the trick, but we want to be _proper_.\n        return result;\n    }\n\n    \/**\n     * Advises the {@code ActorCell.handleInvokeFailure(_, failure: Throwable): Unit}\n     *\n     * @param actorCell the ActorCell where the error spreads from\n     * @param failure the exception that escaped from the {@code receive} method\n     *\/\n    before(ActorCell actorCell, Throwable failure) : Pointcuts.actorCellHandleInvokeFailure(actorCell, failure) {\n        \/\/ record the error, general and specific\n        String[] tags = getTags(actorCell.self().path(), actorCell.actor());\n        this.counterInterface.incrementCounter(\"akka.actor.error\", tags);\n        this.counterInterface.incrementCounter(String.format(\"akka.actor.error.%s\", failure.getMessage()), tags);\n    }\n\n    \/**\n     * Advises the {@code EventStream.publish(event: Any): Unit}\n     *\n     * @param event the received event\n     *\/\n    before(Object event) : Pointcuts.eventStreamPublish(event) {\n        if (event instanceof UnhandledMessage) {\n            UnhandledMessage unhandledMessage = (UnhandledMessage)event;\n            String[] tags = getTags(unhandledMessage.recipient().path(), null);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered\", tags);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered.\" + unhandledMessage.getMessage().getClass().getSimpleName(), tags);\n        }\n    }\n\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorCell} and {@code ActorSystem}\n     *\n     * @param props the {@code Props} instance used in the call\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after(Props props) returning (ActorRef actor): Pointcuts.anyActorOf(props) {\n        recordActorCreation(props, actor);\n    }\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorCell} and {@code ActorSystem} when actor is named in construction\n     *\n     * @param props the {@code Props} instance used in the call\n     * @param actorName the {@code String} used to name the actor at creation site\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after(Props props, String actorName) returning (ActorRef actor): Pointcuts.namedActorOf(props, actorName) {\n        recordActorCreation(props, actor);\n    }\n\n    \/\/ method containing the recording logic for advising actor creation\n    private void recordActorCreation(Props props, ActorRef actor) {\n        if (!includeActorPath(new PathAndClass(actor.path(), this.noActorClazz))) return;\n        final String uncheckedClassName = uncheckedActorNameFrom(props);\n        final Option<String> className = Option.apply(uncheckedClassName);\n\n        this.numberOfActors.putIfAbsent(className, new AtomicLong(0));\n        \/\/ increment and get the current number of actors of this type (if the value was 0, then this returns 1 -- which is correct)\n        final long value = this.numberOfActors.get(className).incrementAndGet();\n\n        \/\/ record the current number of actors of this type\n        this.counterInterface.recordGaugeValue(\"akka.actor.count\", (int)value, uncheckedClassName);\n    }\n\n    \/**\n     * Advises the {@code LocalActorRef.stop} method\n     *\n     *\n     * @param actorCell the {@code ActorCell} of the actor being stopped\n     *\/\n    after(ActorCell actorCell) : Pointcuts.actorCellInternalStop(actorCell) {\n        if (!includeActorPath(new PathAndClass(actorCell.self().path(), this.noActorClazz))) return;\n        final String uncheckedClassName = uncheckedActorNameFrom(actorCell);\n        final Option<String> className = Option.apply(uncheckedClassName);\n\n        this.numberOfActors.putIfAbsent(className, new AtomicLong(0));\n        final long value = this.numberOfActors.get(className).decrementAndGet();\n\n        this.counterInterface.recordGaugeValue(\"akka.actor.count\", (int)value, uncheckedClassName);\n    }\n\n}","old_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.actor.*;\nimport org.eigengo.monitor.agent.AgentConfiguration;\nimport org.eigengo.monitor.output.CounterInterface;\nimport scala.Option;\n\nimport java.util.ArrayList;\nimport java.util.List;\nimport java.util.concurrent.atomic.AtomicLong;\nimport java.util.concurrent.ConcurrentHashMap;\n\n\/**\n * Contains advices for monitoring behaviour of an actor; typically imprisoned in an {@code ActorCell}.\n *\/\npublic aspect ActorCellMonitoringAspect extends AbstractMonitoringAspect issingleton() {\n    private AkkaAgentConfiguration agentConfiguration;\n    private final CounterInterface counterInterface;\n    private final Option<String> noActorClazz = Option.empty();\n    private final ConcurrentHashMap<Option<String>, AtomicLong> samplingCounters;\n    private final ConcurrentHashMap<Option<String>, AtomicLong> numberOfActors;\n\n\n    \/**\n     * Constructs this aspect\n     *\/\n    public ActorCellMonitoringAspect() {\n        AgentConfiguration<AkkaAgentConfiguration> configuration = getAgentConfiguration(\"akka\", AkkaAgentConfigurationJapi.apply());\n        this.agentConfiguration = configuration.agent();\n        this.counterInterface = createCounterInterface(configuration.common());\n        this.samplingCounters = new ConcurrentHashMap<Option<String>, AtomicLong>();\n        this.numberOfActors = new ConcurrentHashMap<Option<String>, AtomicLong>();\n    }\n\n    \/**\n     * Injects the new {@code AkkaAgentConfiguration} instance.\n     *\n     * @param agentConfiguration the new configuration\n     *\/\n    synchronized final void setAgentConfiguration(AkkaAgentConfiguration agentConfiguration) {\n        this.agentConfiguration = agentConfiguration;\n    }\n\n    \/\/ decide whether to include this ActorCell in our measurements\n    private boolean includeActorPath(final PathAndClass pathAndClass) {\n        if (!this.agentConfiguration.incuded().accept(pathAndClass)) return false;\n        if (this.agentConfiguration.excluded().accept(pathAndClass)) return false;\n\n        if (this.agentConfiguration.includeSystemAgents()) return true;\n\n        String userOrSystem = pathAndClass.actorPath().getElements().iterator().next();\n        return \"user\".equals(userOrSystem);\n    }\n\n    \/\/ get the sample rate for an actor\n    private int getSampleRate(final PathAndClass pathAndClass) {\n        return this.agentConfiguration.sampling().getRate(pathAndClass);\n    }\n\n    \/\/ decide whether to sample an actor on a particular occasion\n    private final boolean sampleMessage(final PathAndClass pathAndClass) {\n        int sampleRate = getSampleRate(pathAndClass);\n        if (sampleRate == 1) return true;\n\n        this.samplingCounters.putIfAbsent(pathAndClass.actorClassName(), new AtomicLong(0));\n        long timesSeenSoFar = this.samplingCounters.get(pathAndClass.actorClassName()).incrementAndGet();\n        return (timesSeenSoFar % sampleRate == 1); \/\/ == 1 to log first value (incrementAndGet returns updated value)\n    }\n\n    \/\/ get the tags for the cell\n    private String[] getTags(final ActorPath actorPath, final Actor actor) {\n        List<String> tags = new ArrayList<String>();\n\n        \/\/ TODO: Improve detection of routed actors. This relies only on the naming :(.\n        String lastPathElement = actorPath.elements().last();\n        if (lastPathElement.startsWith(\"$\")) {\n            \/\/ this is routed actor.\n            tags.add(actorPath.parent().toString());\n            if (this.agentConfiguration.includeRoutees()) tags.add(actorPath.toString());\n        } else {\n            \/\/ there is no supervisor\n            tags.add(actorPath.toString());\n        }\n        if (actor != null) {\n            tags.add(String.format(\"akka:%s.%s\", actor.context().system().name(), actor.getClass().getCanonicalName()));\n        }\n\n        return tags.toArray(new String[tags.size()]);\n    }\n\n    private String uncheckedActorNameFrom(final ActorCell actorCell) {\n        return uncheckedActorNameFrom(actorCell.props());\n    }\n    private String uncheckedActorNameFrom(final Props props) {\n        return props.actorClass().getCanonicalName();\n    }\n\n    \/**\n     * Advises the {@code ActorCell.receiveMessage(message: Object): Unit}\n     * We proceed with the pointcut if the actor is to be included in the monitoring *and* this is\n     * the 'multiple-of-n'th time we've seen a message for an actor with a sample rate of n.\n     *\n     * Currently, we sample queue size, the fact that the message is delivered, the simple name of the class of the\n     * message, and the time taken to complete the actor's reactive action.\n     *\n     * @param actorCell the ActorCell where the actor that receives the message \"lives\"\n     * @param msg the incoming message\n     *\/\n    Object around(ActorCell actorCell, Object msg) : Pointcuts.actorCellReceiveMessage(actorCell, msg) {\n        final ActorPath actorPath = actorCell.self().path();\n        final PathAndClass pathAndClass = new PathAndClass(actorPath, Option.apply(uncheckedActorNameFrom(actorCell)));\n        if (!includeActorPath(pathAndClass) || !sampleMessage(pathAndClass)) return proceed(actorCell, msg);\n\n        int samplingRate = getSampleRate(pathAndClass);\n\n        \/\/ we tag by actor name\n        final String[] tags = getTags(actorPath, actorCell.actor());\n\n        \/\/ record the queue size\n        this.counterInterface.recordGaugeValue(\"akka.queue.size\", actorCell.numberOfMessages(), tags);\n        \/\/ record the message, general and specific\n        this.counterInterface.incrementCounter(\"akka.actor.delivered\", samplingRate, tags);\n        this.counterInterface.incrementCounter(\"akka.actor.delivered.\" + msg.getClass().getSimpleName(), samplingRate, tags);\n\n        \/\/ measure the time. we're using the ``nanoTime`` call to access the high-precision timer.\n        \/\/ since we're not really interested in wall time, but just some increasing measure of\n        \/\/ elapsed time\n        Object result = null;\n        final long start = System.nanoTime();\n        \/\/ result will always be ``null``, because target returns ``Unit``\n        result = proceed(actorCell, msg);\n        \/\/ ns or \u00b5s is too fine. ms will do for now.\n        final long duration = (System.nanoTime() - start) \/ 1000000;\n\n        \/\/ record the actor duration\n        this.counterInterface.recordExecutionTime(\"akka.actor.duration\", (int)duration, tags);\n\n        \/\/ return null would do the trick, but we want to be _proper_.\n        return result;\n    }\n\n    \/**\n     * Advises the {@code ActorCell.handleInvokeFailure(_, failure: Throwable): Unit}\n     *\n     * @param actorCell the ActorCell where the error spreads from\n     * @param failure the exception that escaped from the {@code receive} method\n     *\/\n    before(ActorCell actorCell, Throwable failure) : Pointcuts.actorCellHandleInvokeFailure(actorCell, failure) {\n        \/\/ record the error, general and specific\n        String[] tags = getTags(actorCell.self().path(), actorCell.actor());\n        this.counterInterface.incrementCounter(\"akka.actor.error\", tags);\n        this.counterInterface.incrementCounter(String.format(\"akka.actor.error.%s\", failure.getMessage()), tags);\n    }\n\n    \/**\n     * Advises the {@code EventStream.publish(event: Any): Unit}\n     *\n     * @param event the received event\n     *\/\n    before(Object event) : Pointcuts.eventStreamPublish(event) {\n        if (event instanceof UnhandledMessage) {\n            UnhandledMessage unhandledMessage = (UnhandledMessage)event;\n            String[] tags = getTags(unhandledMessage.recipient().path(), null);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered\", tags);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered.\" + unhandledMessage.getMessage().getClass().getSimpleName(), tags);\n        }\n    }\n\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorCell} and {@code ActorSystem}\n     *\n     * @param props the {@code Props} instance used in the call\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after(Props props) returning (ActorRef actor): Pointcuts.anyActorOf(props) {\n        recordActorCreation(props, actor);\n    }\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorCell} and {@code ActorSystem} when actor is named in construction\n     *\n     * @param props the {@code Props} instance used in the call\n     * @param actorName the {@code String} used to name the actor at creation site\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after(Props props, String actorName) returning (ActorRef actor): Pointcuts.namedActorOf(props, actorName) {\n        recordActorCreation(props, actor);\n    }\n\n    \/\/ method containing the recording logic for advising actor creation\n    void recordActorCreation(Props props, ActorRef actor) {\n        if (!includeActorPath(new PathAndClass(actor.path(), this.noActorClazz))) return;\n        final String uncheckedClassName = uncheckedActorNameFrom(props);\n        final Option<String> className = Option.apply(uncheckedClassName);\n\n        this.numberOfActors.putIfAbsent(className, new AtomicLong(0));\n        \/\/ increment and get the current number of actors of this type (if the value was 0, then this returns 1 -- which is correct)\n        final long value = this.numberOfActors.get(className).incrementAndGet();\n\n        \/\/ record the current number of actors of this type\n        this.counterInterface.recordGaugeValue(\"akka.actor.count\", (int)value, uncheckedClassName);\n    }\n\n    \/**\n     * Advises the {@code LocalActorRef.stop} method\n     *\n     *\n     * @param actorCell the {@code ActorCell} of the actor being stopped\n     *\/\n    after(ActorCell actorCell) : Pointcuts.actorCellInternalStop(actorCell) {\n        if (!includeActorPath(new PathAndClass(actorCell.self().path(), this.noActorClazz))) return;\n        final String uncheckedClassName = uncheckedActorNameFrom(actorCell);\n        final Option<String> className = Option.apply(uncheckedClassName);\n\n        this.numberOfActors.putIfAbsent(className, new AtomicLong(0));\n        final long value = this.numberOfActors.get(className).decrementAndGet();\n\n        this.counterInterface.recordGaugeValue(\"akka.actor.count\", (int)value, uncheckedClassName);\n    }\n\n}","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"e86c633d9e374f60694ee21970b78221325b7bb8","subject":"Fixed #2553.","message":"Fixed #2553.\n\ngit-svn-id: f4ecfe233223879a4a16cd7937f11b5152963d8e@19496 5e8d7ff9-d8ef-0310-90f0-a4852d11357a\n","repos":"aleksi-lukkarinen\/scala-ide,romanowski\/scala-ide,pilipolio\/scala-ide,mlangc\/scala-ide,wpopielarski\/scala-ide,wpopielarski\/scala-ide,aleksi-lukkarinen\/scala-ide,stephenh\/scala-ide,scala-ide\/scala-ide,Kwestor\/scala-ide,scala-ide\/scala-ide,romanowski\/scala-ide,wpopielarski\/scala-ide,romanowski\/scala-ide,scala-ide\/scala-ide,Kwestor\/scala-ide,dragos\/scala-ide,Kwestor\/scala-ide,stephenh\/scala-ide,Duhemm\/scala-ide,scala-ide\/scala-ide,sschaef\/scala-ide,andrey-ilinykh\/scala-ide,dragos\/scala-ide,stephenh\/scala-ide,aleksi-lukkarinen\/scala-ide,Duhemm\/scala-ide,sschaef\/scala-ide,Duhemm\/scala-ide,mlangc\/scala-ide,sschaef\/scala-ide,aleksi-lukkarinen\/scala-ide,pilipolio\/scala-ide,pilipolio\/scala-ide,mlangc\/scala-ide,wpopielarski\/scala-ide,pilipolio\/scala-ide,dragos\/scala-ide,sschaef\/scala-ide,Kwestor\/scala-ide,dragos\/scala-ide,stephenh\/scala-ide,andrey-ilinykh\/scala-ide,Duhemm\/scala-ide,romanowski\/scala-ide,andrey-ilinykh\/scala-ide,mlangc\/scala-ide,andrey-ilinykh\/scala-ide","old_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/core\/DOMAspect.aj","new_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/core\/DOMAspect.aj","new_contents":"\/*\n * Copyright 2005-2009 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.core;\n\nimport java.util.Locale;\nimport java.util.Map;\n\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.core.ICompilationUnit;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.core.dom.AST;\nimport org.eclipse.jdt.core.dom.ASTNode;\nimport org.eclipse.jdt.core.dom.ASTParser;\nimport org.eclipse.jdt.internal.compiler.CompilationResult;\nimport org.eclipse.jdt.internal.compiler.DefaultErrorHandlingPolicies;\nimport org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.AbstractVariableDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;\nimport org.eclipse.jdt.internal.compiler.env.AccessRestriction;\nimport org.eclipse.jdt.internal.compiler.env.IBinaryType;\nimport org.eclipse.jdt.internal.compiler.env.INameEnvironment;\nimport org.eclipse.jdt.internal.compiler.env.ISourceType;\nimport org.eclipse.jdt.internal.compiler.impl.CompilerOptions;\nimport org.eclipse.jdt.internal.compiler.impl.ITypeRequestor;\nimport org.eclipse.jdt.internal.compiler.lookup.LookupEnvironment;\nimport org.eclipse.jdt.internal.compiler.lookup.PackageBinding;\nimport org.eclipse.jdt.internal.compiler.parser.SourceTypeConverter;\nimport org.eclipse.jdt.internal.compiler.problem.DefaultProblemFactory;\nimport org.eclipse.jdt.internal.compiler.problem.ProblemReporter;\nimport org.eclipse.jdt.internal.core.DefaultWorkingCopyOwner;\nimport org.eclipse.jdt.internal.core.JavaProject;\nimport org.eclipse.jdt.internal.core.SourceType;\nimport org.eclipse.jdt.internal.core.SourceTypeElementInfo;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaCompilationUnit;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect DOMAspect {\n  pointcut internalCreateAST(ASTParser parser, IProgressMonitor monitor) :\n    execution(ASTNode ASTParser.internalCreateAST(IProgressMonitor)) &&\n    args(monitor) &&\n    target(parser);\n  \n  ASTNode around(ASTParser parser, IProgressMonitor monitor) :\n    internalCreateAST(parser, monitor) {\n    try {\n      if (!(parser.typeRoot instanceof IScalaCompilationUnit))\n        return proceed(parser, monitor);\n      \n      ICompilationUnit cu = (ICompilationUnit)parser.typeRoot;\n      org.eclipse.jdt.internal.compiler.env.ICompilationUnit sourceUnit = (org.eclipse.jdt.internal.compiler.env.ICompilationUnit)cu;\n      \n      IType[] topLevelTypes = cu.getTypes();\n      int length = topLevelTypes.length;\n      if (length == 0)\n        throw new IllegalStateException();\n      \n      SourceTypeElementInfo[] topLevelInfos = new SourceTypeElementInfo[length];\n      for (int i = 0; i < length; i++) {\n        topLevelInfos[i] = (SourceTypeElementInfo) ((SourceType)topLevelTypes[i]).getElementInfo();\n      }\n      char[] fileName = ((ISourceType)topLevelInfos[0]).getFileName();\n      \n      CompilationResult result = new CompilationResult(fileName, 1, 1, 100);\n\n      JavaProject javaProject = (JavaProject)cu.getJavaProject(); \n      Map compilerOptions0 = javaProject.getOptions(true);\n      CompilerOptions compilerOptions = new CompilerOptions(compilerOptions0);\n      compilerOptions.storeAnnotations = true;\n      \n      ProblemReporter problemReporter =\n        new ProblemReporter(\n          DefaultErrorHandlingPolicies.proceedWithAllProblems(),\n          compilerOptions,\n          new DefaultProblemFactory(Locale.getDefault()));\n      \n      int flags = SourceTypeConverter.FIELD_AND_METHOD | SourceTypeConverter.MEMBER_TYPE;\n      \n      CompilationUnitDeclaration unit =\n        SourceTypeConverter.buildCompilationUnit(topLevelInfos, flags, problemReporter, result);\n      \n      INameEnvironment ne = javaProject.newSearchableNameEnvironment(DefaultWorkingCopyOwner.PRIMARY);\n      final LookupEnvironment le = new LookupEnvironment(null, compilerOptions, problemReporter, ne);\n      ITypeRequestor typeRequestor = new ITypeRequestor() {\n        public void accept(IBinaryType binaryType, PackageBinding packageBinding, AccessRestriction accessRestriction) {\n          le.createBinaryTypeFrom(binaryType, packageBinding, accessRestriction);\n        }\n        public void accept(org.eclipse.jdt.internal.compiler.env.ICompilationUnit unit, AccessRestriction accessRestriction) {}\n        public void accept(ISourceType[] sourceType, PackageBinding packageBinding, AccessRestriction accessRestriction) {}\n      };\n      le.typeRequestor = typeRequestor;\n      \n      le.buildTypeBindings(unit, null);\n      le.completeTypeBindings();\n      fixTypes(unit.types);\n      \n      AST ast = AST.newAST(AST.JLS3);\n      ast.setFlag(AST.RESOLVED_BINDINGS);\n      ast.setDefaultNodeFlag(ASTNode.ORIGINAL);\n\n      org.eclipse.jdt.core.dom.ASTConverter converter =\n        new org.eclipse.jdt.core.dom.ASTConverter(compilerOptions0, true, monitor);\n      \n      org.eclipse.jdt.core.dom.BindingResolver resolver =\n        new org.eclipse.jdt.core.dom.DefaultBindingResolver(\n          unit.scope,\n          DefaultWorkingCopyOwner.PRIMARY,\n          new org.eclipse.jdt.core.dom.DefaultBindingResolver.BindingTables(),\n          true);\n      ast.setBindingResolver(resolver);\n      converter.setAST(ast);\n      \n      ASTNode node = converter.convert(unit, sourceUnit.getContents());\n      return node;\n    } catch (JavaModelException ex) {\n      throw new IllegalArgumentException(ex);\n    }\n  }\n  \n  private void fixTypes(TypeDeclaration[] types) {\n    for(int i = 0, iLimit = types.length; i < iLimit ; ++i) {\n      TypeDeclaration tpe = types[i];\n      tpe.binding.getAnnotationTagBits();\n      tpe.scope.buildFields();\n      tpe.scope.buildMethods();\n      fixFields(tpe.fields);\n      fixMethods(tpe.methods);\n      fixTypes(tpe.memberTypes);\n    }\n  }\n  \n  private void fixMethods(AbstractMethodDeclaration[] methods) {\n    if (methods == null)\n      return;\n    \n    for(int i = 0, iLimit = methods.length; i < iLimit; ++i) {\n      AbstractMethodDeclaration m = methods[i];\n      m.bodyStart = m.declarationSourceStart;\n      m.bodyEnd = m.declarationSourceEnd;\n      m.binding.getAnnotationTagBits();\n    }\n  }\n  \n  private void fixFields(AbstractVariableDeclaration[] fields) {\n    if (fields == null)\n      return;\n    \n    for(int i = 0, iLimit = fields.length; i < iLimit; ++i) {\n      AbstractVariableDeclaration f = fields[i];\n      f.declarationEnd = f.declarationSourceEnd;\n    }\n  }\n}\n","old_contents":"\/*\n * Copyright 2005-2009 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.core;\n\nimport java.util.Locale;\nimport java.util.Map;\n\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.core.ICompilationUnit;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.core.dom.AST;\nimport org.eclipse.jdt.core.dom.ASTNode;\nimport org.eclipse.jdt.core.dom.ASTParser;\nimport org.eclipse.jdt.internal.compiler.CompilationResult;\nimport org.eclipse.jdt.internal.compiler.DefaultErrorHandlingPolicies;\nimport org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;\nimport org.eclipse.jdt.internal.compiler.env.AccessRestriction;\nimport org.eclipse.jdt.internal.compiler.env.IBinaryType;\nimport org.eclipse.jdt.internal.compiler.env.INameEnvironment;\nimport org.eclipse.jdt.internal.compiler.env.ISourceType;\nimport org.eclipse.jdt.internal.compiler.impl.CompilerOptions;\nimport org.eclipse.jdt.internal.compiler.impl.ITypeRequestor;\nimport org.eclipse.jdt.internal.compiler.lookup.LookupEnvironment;\nimport org.eclipse.jdt.internal.compiler.lookup.PackageBinding;\nimport org.eclipse.jdt.internal.compiler.parser.SourceTypeConverter;\nimport org.eclipse.jdt.internal.compiler.problem.DefaultProblemFactory;\nimport org.eclipse.jdt.internal.compiler.problem.ProblemReporter;\nimport org.eclipse.jdt.internal.core.DefaultWorkingCopyOwner;\nimport org.eclipse.jdt.internal.core.JavaProject;\nimport org.eclipse.jdt.internal.core.SourceType;\nimport org.eclipse.jdt.internal.core.SourceTypeElementInfo;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaCompilationUnit;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect DOMAspect {\n  pointcut internalCreateAST(ASTParser parser, IProgressMonitor monitor) :\n    execution(ASTNode ASTParser.internalCreateAST(IProgressMonitor)) &&\n    args(monitor) &&\n    target(parser);\n  \n  ASTNode around(ASTParser parser, IProgressMonitor monitor) :\n    internalCreateAST(parser, monitor) {\n    try {\n      if (!(parser.typeRoot instanceof IScalaCompilationUnit))\n        return proceed(parser, monitor);\n      \n      ICompilationUnit cu = (ICompilationUnit)parser.typeRoot;\n      org.eclipse.jdt.internal.compiler.env.ICompilationUnit sourceUnit = (org.eclipse.jdt.internal.compiler.env.ICompilationUnit)cu;\n      \n      IType[] topLevelTypes = cu.getTypes();\n      int length = topLevelTypes.length;\n      if (length == 0)\n        throw new IllegalStateException();\n      \n      SourceTypeElementInfo[] topLevelInfos = new SourceTypeElementInfo[length];\n      for (int i = 0; i < length; i++) {\n        topLevelInfos[i] = (SourceTypeElementInfo) ((SourceType)topLevelTypes[i]).getElementInfo();\n      }\n      char[] fileName = ((ISourceType)topLevelInfos[0]).getFileName();\n      \n      CompilationResult result = new CompilationResult(fileName, 1, 1, 100);\n\n      JavaProject javaProject = (JavaProject)cu.getJavaProject(); \n      Map compilerOptions0 = javaProject.getOptions(true);\n      CompilerOptions compilerOptions = new CompilerOptions(compilerOptions0);\n      compilerOptions.storeAnnotations = true;\n      \n      ProblemReporter problemReporter =\n        new ProblemReporter(\n          DefaultErrorHandlingPolicies.proceedWithAllProblems(),\n          compilerOptions,\n          new DefaultProblemFactory(Locale.getDefault()));\n      \n      int flags = SourceTypeConverter.FIELD_AND_METHOD | SourceTypeConverter.MEMBER_TYPE;\n      \n      CompilationUnitDeclaration unit =\n        SourceTypeConverter.buildCompilationUnit(topLevelInfos, flags, problemReporter, result);\n      \n      INameEnvironment ne = javaProject.newSearchableNameEnvironment(DefaultWorkingCopyOwner.PRIMARY);\n      final LookupEnvironment le = new LookupEnvironment(null, compilerOptions, problemReporter, ne);\n      ITypeRequestor typeRequestor = new ITypeRequestor() {\n        public void accept(IBinaryType binaryType, PackageBinding packageBinding, AccessRestriction accessRestriction) {\n          le.createBinaryTypeFrom(binaryType, packageBinding, accessRestriction);\n        }\n        public void accept(org.eclipse.jdt.internal.compiler.env.ICompilationUnit unit, AccessRestriction accessRestriction) {}\n        public void accept(ISourceType[] sourceType, PackageBinding packageBinding, AccessRestriction accessRestriction) {}\n      };\n      le.typeRequestor = typeRequestor;\n      \n      le.buildTypeBindings(unit, null);\n      le.completeTypeBindings();\n      fixTypes(unit.types);\n      \n      AST ast = AST.newAST(AST.JLS3);\n      ast.setFlag(AST.RESOLVED_BINDINGS);\n      ast.setDefaultNodeFlag(ASTNode.ORIGINAL);\n\n      org.eclipse.jdt.core.dom.ASTConverter converter =\n        new org.eclipse.jdt.core.dom.ASTConverter(compilerOptions0, true, monitor);\n      \n      org.eclipse.jdt.core.dom.BindingResolver resolver =\n        new org.eclipse.jdt.core.dom.DefaultBindingResolver(\n          unit.scope,\n          DefaultWorkingCopyOwner.PRIMARY,\n          new org.eclipse.jdt.core.dom.DefaultBindingResolver.BindingTables(),\n          true);\n      ast.setBindingResolver(resolver);\n      converter.setAST(ast);\n      \n      ASTNode node = converter.convert(unit, sourceUnit.getContents());\n      return node;\n    } catch (JavaModelException ex) {\n      throw new IllegalArgumentException(ex);\n    }\n  }\n  \n  private void fixTypes(TypeDeclaration[] types) {\n    for(int i = 0, iLimit = types.length; i < iLimit ; ++i) {\n      TypeDeclaration tpe = types[i];\n      tpe.binding.getAnnotationTagBits();\n      tpe.scope.buildFields();\n      tpe.scope.buildMethods();\n      fixMethods(tpe, tpe.methods);\n      fixTypes(tpe.memberTypes);\n    }\n  }\n  \n  private void fixMethods(TypeDeclaration tpe, AbstractMethodDeclaration[] methods) {\n    for(int i = 0, iLimit = methods.length; i < iLimit; ++i) {\n      AbstractMethodDeclaration m = methods[i];\n      m.bodyStart = m.declarationSourceStart;\n      m.bodyEnd = m.declarationSourceEnd;\n      m.binding.getAnnotationTagBits();\n    }\n  }\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"21af5c6d8d0606b3e37bbcb9f1221a0295b961a8","subject":"Fixed format and javadoc","message":"Fixed format and javadoc\n","repos":"stieglma\/Schafkopfauswerter","old_file":"src\/StatisticsExport.aj","new_file":"src\/StatisticsExport.aj","new_contents":"import java.io.IOException;\n\nimport model.SystemValues.Games;\nimport model.SystemValues.Players;\n\nimport org.apache.pdfbox.pdmodel.PDDocument;\nimport org.apache.pdfbox.pdmodel.PDPage;\nimport org.apache.pdfbox.pdmodel.edit.PDPageContentStream;\nimport org.apache.pdfbox.pdmodel.font.PDType1Font;\n\nimport view.GUI;\n\npublic privileged aspect StatisticsExport {\n\n\tdeclare precedence: StatisticsExport, GraphExport, PdfExport;\n\tprivate GUI gui;\n\n\t\/**\n\t * catch constructor call, so that we have the correct gui, to refer to\n\t * everywhere\n\t *\/\n\tafter() returning(GUI gui): call(GUI.new(*)) {\n\t\tthis.gui = gui;\n\t}\n\n\t\/**\n\t * Catch the call on {@link PDFReportListener.drawTable(PDDocument)} to get\n\t * the pdf creator object.\n\t * \n\t * This method then creates the pages and writes the statistics to the pdf.\n\t * \n\t * @param document\n\t * @throws IOException\n\t *\/\n\tafter(PDDocument document) returning() throws IOException\n    \t\t: call(* PDFReportListener.drawTable(PDDocument))\n    \t\t&& args(document) {\n\t\t\/\/ write overall statistics to pdf\n\t\tPDPage page = new PDPage();\n\t\tdocument.addPage(page);\n\t\tPDPageContentStream contentStream = new PDPageContentStream(document,\n\t\t\t\tpage);\n\n\t\tcontentStream.beginText();\n\t\tcontentStream.setFont(PDType1Font.HELVETICA_BOLD, 15);\n\t\tcontentStream.moveTextPositionByAmount(100, 680);\n\t\tcontentStream.drawString(\"Statistik ueber das gesamte Spiel\");\n\t\tcontentStream.endText();\n\n\t\tcontentStream.beginText();\n\t\tcontentStream.setFont(PDType1Font.HELVETICA_BOLD, 10);\n\t\tcreateOverallContent(contentStream);\n\t\tcontentStream.endText();\n\t\tcontentStream.close();\n\n\t\t\/\/ write individual statistics to pdf\n\t\tpage = new PDPage();\n\t\tdocument.addPage(page);\n\t\tcontentStream = new PDPageContentStream(document, page);\n\n\t\tcontentStream.beginText();\n\t\tcontentStream.setFont(PDType1Font.HELVETICA_BOLD, 15);\n\t\tcontentStream.moveTextPositionByAmount(100, 680);\n\t\tcontentStream.drawString(\"Statistik fuer jeden einzelnen Spieler\");\n\t\tcontentStream.endText();\n\n\t\tfor (int i = 0; i < Players.values().length; ++i) {\n\t\t\tcontentStream.beginText();\n\t\t\tcontentStream.setFont(PDType1Font.HELVETICA_BOLD, 10);\n\t\t\tcreateIndividualContent(contentStream, Players.values()[i]);\n\t\t\tcontentStream.endText();\n\t\t\tcontentStream.close();\n\t\t\tif (i < Players.values().length - 1) {\n\t\t\t\tpage = new PDPage();\n\t\t\t\tdocument.addPage(page);\n\t\t\t\tcontentStream = new PDPageContentStream(document, page);\n\t\t\t}\n\t\t}\n\t}\n\n\t\/**\n\t * Write statistics to given <code>contentStream<\/code> of a pdf page. These\n\t * are the overall statistics.\n\t * \n\t * @param contentStream\n\t *            The <code>contentStream<\/code> of the pdf page to write on.\n\t * @throws IOException\n\t *\/\n\tprivate void createOverallContent(PDPageContentStream contentStream)\n\t\t\tthrows IOException {\n\t\tOverallStatistics data = gui.model.gameDB.getOverallStatistics();\n\n\t\tcontentStream.moveTextPositionByAmount(50, 650);\n\t\tcontentStream.drawString(\"#Spiele (ohne weiter): \"\n\t\t\t\t+ data.getAnzahlSpieleGesamt() + \" (gewonnen: \"\n\t\t\t\t+ String.format(\"%.2f\", data.getGesamtWinPerc()) + \"%)\");\n\n\t\tcontentStream.moveTextPositionByAmount(0, -16);\n\t\tcontentStream.drawString(\"#Rufspiele: \" + data.getAnzahlRufspiele()\n\t\t\t\t+ \" (gewonnen: \"\n\t\t\t\t+ String.format(\"%.2f\", data.getRufspieleWinPerc()) + \"%)\");\n\n\t\tcontentStream.moveTextPositionByAmount(50, -16);\n\t\tcontentStream.drawString(\"-> teuerstes Rufspiel: \"\n\t\t\t\t+ data.getTeuerstesRufspiel());\n\n\t\tcontentStream.moveTextPositionByAmount(-50, -16);\n\t\tcontentStream.drawString(\"#Soli gesamt: \" + data.getAnzahlSoliGesamt()\n\t\t\t\t+ \" (gewonnen: \"\n\t\t\t\t+ String.format(\"%.2f\", data.getSoliGesamtWinPerc()) + \"%)\");\n\n\t\tcontentStream.moveTextPositionByAmount(0, -16);\n\t\tcontentStream.drawString(\"#Soli normal: \" + data.getAnzahlSoli()\n\t\t\t\t+ \" (gewonnen: \"\n\t\t\t\t+ String.format(\"%.2f\", data.getSoliNormalWinPerc()) + \"%)\");\n\n\t\tcontentStream.moveTextPositionByAmount(50, -16);\n\t\tcontentStream.drawString(\"-> teuerstes Solo: \"\n\t\t\t\t+ data.getTeuerstesSolo());\n\n\t\tcontentStream.moveTextPositionByAmount(-50, -16);\n\t\tcontentStream.drawString(\"#Solo Tout: \" + data.getAnzahlSoliTout()\n\t\t\t\t+ \" (gewonnen: \"\n\t\t\t\t+ String.format(\"%.2f\", data.getSoliToutWinPerc()) + \"%)\");\n\n\t\tcontentStream.moveTextPositionByAmount(50, -16);\n\t\tcontentStream.drawString(\"-> teuerstes Solo Tout: \"\n\t\t\t\t+ data.getTeuerstesSoloTout());\n\n\t\tcontentStream.moveTextPositionByAmount(-50, -16);\n\t\tcontentStream.drawString(\"#Solo Sie: \" + data.getAnzahlSoliSie());\n\n\t\tcontentStream.moveTextPositionByAmount(50, -16);\n\t\tcontentStream.drawString(\"-> teuerstes Solo Sie: \"\n\t\t\t\t+ data.getTeuerstesSoloSie());\n\n\t\tcontentStream.moveTextPositionByAmount(-50, -16);\n\t\tcontentStream.drawString(\"#Weiter: \" + data.getAnzahlWeiter());\n\t}\n\n\t\/**\n\t * Write the individual statistics for a given <code>player<\/code> to the\n\t * given <code>contentStream<\/code>.\n\t * \n\t * @param contentStream\n\t * @param player\n\t * @throws IOException\n\t *\/\n\tprivate void createIndividualContent(PDPageContentStream contentStream,\n\t\t\tPlayers player) throws IOException {\n\t\tcontentStream.moveTextPositionByAmount(50, 650);\n\t\tcontentStream.drawString(player.toString());\n\n\t\tcontentStream.moveTextPositionByAmount(0, -22);\n\n\t\tPlayerWiseStatistics data = gui.model.getGameData()\n\t\t\t\t.getPlayerWiseStatistics(player);\n\n\t\tcontentStream.drawString(\"Gespielte Spiele:\");\n\t\tcontentStream.moveTextPositionByAmount(50, -16);\n\t\tcontentStream.drawString(\"- Gesamt: \" + data.getGamesPlayedTot()\n\t\t\t\t+ \", davon gewonnen: \" + data.getGamesWonTot() + \" (\"\n\t\t\t\t+ String.format(\"%.2f\", data.getGamesWonPerc()) + \"%)\");\n\n\t\tfor (Games game : Games.values()) {\n\t\t\tif (game != Games.WEITER && game != Games.NONE) {\n\t\t\t\tint i = game.ordinal();\n\t\t\t\tcontentStream.moveTextPositionByAmount(0, -16);\n\t\t\t\tcontentStream.drawString(\"- \"\n\t\t\t\t\t\t+ game.toString()\n\t\t\t\t\t\t+ \": \"\n\t\t\t\t\t\t+ data.getGamesPlayedPerType()[i]\n\t\t\t\t\t\t+ \", davon gewonnen: \"\n\t\t\t\t\t\t+ data.getGamesWonPerType()[i]\n\t\t\t\t\t\t+ \" (\"\n\t\t\t\t\t\t+ String.format(\"%.2f\",\n\t\t\t\t\t\t\t\tdata.getGamesWonPerTypePerc()[i]) + \"%\");\n\t\t\t}\n\t\t}\n\n\t\tcontentStream.moveTextPositionByAmount(-50, -16);\n\t\tcontentStream\n\t\t\t\t.drawString(\"H\u00f6chster Kontostand: \" + data.getHighestAcc());\n\n\t\tcontentStream.moveTextPositionByAmount(0, -16);\n\t\tcontentStream.drawString(\"Niedrigster Kontostand: \"\n\t\t\t\t+ data.getLowestAcc());\n\n\t\tcontentStream.moveTextPositionByAmount(0, -16);\n\t\tcontentStream.drawString(\"Gr\u00f6\u00dfter Gewinn: \" + data.getHighestWin());\n\n\t\tcontentStream.moveTextPositionByAmount(0, -16);\n\t\tcontentStream.drawString(\"Gr\u00f6\u00dfter Verlust: \" + data.getHighestLoss());\n\n\t\tcontentStream.moveTextPositionByAmount(0, -32);\n\t}\n\n}\n","old_contents":"import java.io.IOException;\n\nimport model.SystemValues.Games;\nimport model.SystemValues.Players;\n\nimport org.apache.pdfbox.pdmodel.PDDocument;\nimport org.apache.pdfbox.pdmodel.PDPage;\nimport org.apache.pdfbox.pdmodel.edit.PDPageContentStream;\nimport org.apache.pdfbox.pdmodel.font.PDType1Font;\n\nimport view.GUI;\n\npublic privileged aspect StatisticsExport {\n\n\tdeclare precedence: StatisticsExport, GraphExport, PdfExport;\n\tprivate GUI gui;\n\n\t\/**\n\t * catch constructor call, so that we have the correct gui, to refer to\n\t * everywhere\n\t *\/\n\tafter() returning(GUI gui): call(GUI.new(*)) {\n\t\tthis.gui = gui;\n\t}\n\n\t\/**\n\t * Catch the call on {@link PDFReportListener.drawTable(PDDocument)} to get\n\t * the pdf creator object.\n\t * \n\t * @param document\n\t * @throws IOException\n\t *\/\n\tafter(PDDocument document) returning() throws IOException\n    : call(* PDFReportListener.drawTable(PDDocument))\n    && args(document) {\n\t\tPDPage page = new PDPage();\n\t\tdocument.addPage(page);\n\t\tPDPageContentStream contentStream = new PDPageContentStream(document,\n\t\t\t\tpage);\n\n\t\tcontentStream.beginText();\n\t\tcontentStream.setFont(PDType1Font.HELVETICA_BOLD, 15);\n\t\tcontentStream.moveTextPositionByAmount(100, 680);\n\t\tcontentStream.drawString(\"Statistik ueber das gesamte Spiel\");\n\t\tcontentStream.endText();\n\n\t\tcontentStream.beginText();\n\t\tcontentStream.setFont(PDType1Font.HELVETICA_BOLD, 10);\n\t\tcreateOverallContent(contentStream);\n\t\tcontentStream.endText();\n\t\tcontentStream.close();\n\n\t\tpage = new PDPage();\n\t\tdocument.addPage(page);\n\t\tcontentStream = new PDPageContentStream(document, page);\n\n\t\tcontentStream.beginText();\n\t\tcontentStream.setFont(PDType1Font.HELVETICA_BOLD, 15);\n\t\tcontentStream.moveTextPositionByAmount(100, 680);\n\t\tcontentStream.drawString(\"Statistik fuer jeden einzelnen Spieler\");\n\t\tcontentStream.endText();\n\n\t\tfor (int i = 0; i < Players.values().length; ++i) {\n\t\t\tcontentStream.beginText();\n\t\t\tcontentStream.setFont(PDType1Font.HELVETICA_BOLD, 10);\n\t\t\tcreateIndividualContent(contentStream, Players.values()[i]);\n\t\t\tcontentStream.endText();\n\t\t\tcontentStream.close();\n\t\t\tif (i < Players.values().length - 1) {\n\t\t\t\tpage = new PDPage();\n\t\t\t\tdocument.addPage(page);\n\t\t\t\tcontentStream = new PDPageContentStream(document, page);\n\t\t\t}\n\t\t}\n\t}\n\n\t\/**\n\t * Write statistics to given <code>contentStream<\/code> of a pdf page.\n\t * \n\t * @param contentStream\n\t *            The <code>contentStream<\/code> of the pdf page to write on.\n\t * @throws IOException\n\t *\/\n\tprivate void createOverallContent(PDPageContentStream contentStream)\n\t\t\tthrows IOException {\n\t\tOverallStatistics data = gui.model.gameDB.getOverallStatistics();\n\n\t\tcontentStream.moveTextPositionByAmount(50, 650);\n\t\tcontentStream.drawString(\"#Spiele (ohne weiter): \"\n\t\t\t\t+ data.getAnzahlSpieleGesamt() + \" (gewonnen: \"\n\t\t\t\t+ String.format(\"%.2f\", data.getGesamtWinPerc()) + \"%)\");\n\n\t\tcontentStream.moveTextPositionByAmount(0, -16);\n\t\tcontentStream.drawString(\"#Rufspiele: \" + data.getAnzahlRufspiele()\n\t\t\t\t+ \" (gewonnen: \"\n\t\t\t\t+ String.format(\"%.2f\", data.getRufspieleWinPerc()) + \"%)\");\n\n\t\tcontentStream.moveTextPositionByAmount(50, -16);\n\t\tcontentStream.drawString(\"-> teuerstes Rufspiel: \"\n\t\t\t\t+ data.getTeuerstesRufspiel());\n\n\t\tcontentStream.moveTextPositionByAmount(-50, -16);\n\t\tcontentStream.drawString(\"#Soli gesamt: \" + data.getAnzahlSoliGesamt()\n\t\t\t\t+ \" (gewonnen: \"\n\t\t\t\t+ String.format(\"%.2f\", data.getSoliGesamtWinPerc()) + \"%)\");\n\n\t\tcontentStream.moveTextPositionByAmount(0, -16);\n\t\tcontentStream.drawString(\"#Soli normal: \" + data.getAnzahlSoli()\n\t\t\t\t+ \" (gewonnen: \"\n\t\t\t\t+ String.format(\"%.2f\", data.getSoliNormalWinPerc()) + \"%)\");\n\n\t\tcontentStream.moveTextPositionByAmount(50, -16);\n\t\tcontentStream.drawString(\"-> teuerstes Solo: \"\n\t\t\t\t+ data.getTeuerstesSolo());\n\n\t\tcontentStream.moveTextPositionByAmount(-50, -16);\n\t\tcontentStream.drawString(\"#Solo Tout: \" + data.getAnzahlSoliTout()\n\t\t\t\t+ \" (gewonnen: \"\n\t\t\t\t+ String.format(\"%.2f\", data.getSoliToutWinPerc()) + \"%)\");\n\n\t\tcontentStream.moveTextPositionByAmount(50, -16);\n\t\tcontentStream.drawString(\"-> teuerstes Solo Tout: \"\n\t\t\t\t+ data.getTeuerstesSoloTout());\n\n\t\tcontentStream.moveTextPositionByAmount(-50, -16);\n\t\tcontentStream.drawString(\"#Solo Sie: \" + data.getAnzahlSoliSie());\n\n\t\tcontentStream.moveTextPositionByAmount(50, -16);\n\t\tcontentStream.drawString(\"-> teuerstes Solo Sie: \"\n\t\t\t\t+ data.getTeuerstesSoloSie());\n\n\t\tcontentStream.moveTextPositionByAmount(-50, -16);\n\t\tcontentStream.drawString(\"#Weiter: \" + data.getAnzahlWeiter());\n\t}\n\n\tprivate void createIndividualContent(PDPageContentStream contentStream,\n\t\t\tPlayers player) throws IOException {\n\t\tcontentStream.moveTextPositionByAmount(50, 650);\n\t\tcontentStream.drawString(player.toString());\n\n\t\tcontentStream.moveTextPositionByAmount(0, -22);\n\n\t\tPlayerWiseStatistics data = gui.model.getGameData()\n\t\t\t\t.getPlayerWiseStatistics(player);\n\n\t\tcontentStream.drawString(\"Gespielte Spiele:\");\n\t\tcontentStream.moveTextPositionByAmount(50, -16);\n\t\tcontentStream.drawString(\"- Gesamt: \" + data.getGamesPlayedTot()\n\t\t\t\t+ \", davon gewonnen: \" + data.getGamesWonTot() + \" (\"\n\t\t\t\t+ String.format(\"%.2f\", data.getGamesWonPerc()) + \"%)\");\n\n\t\tfor (Games game : Games.values()) {\n\t\t\tif (game != Games.WEITER && game != Games.NONE) {\n\t\t\t\tint i = game.ordinal();\n\t\t\t\tcontentStream.moveTextPositionByAmount(0, -16);\n\t\t\t\tcontentStream.drawString(\"- \"\n\t\t\t\t\t\t+ game.toString()\n\t\t\t\t\t\t+ \": \"\n\t\t\t\t\t\t+ data.getGamesPlayedPerType()[i]\n\t\t\t\t\t\t+ \", davon gewonnen: \"\n\t\t\t\t\t\t+ data.getGamesWonPerType()[i]\n\t\t\t\t\t\t+ \" (\"\n\t\t\t\t\t\t+ String.format(\"%.2f\",\n\t\t\t\t\t\t\t\tdata.getGamesWonPerTypePerc()[i]) + \"%\");\n\t\t\t}\n\t\t}\n\n\t\tcontentStream.moveTextPositionByAmount(-50, -16);\n\t\tcontentStream\n\t\t\t\t.drawString(\"H\u00f6chster Kontostand: \" + data.getHighestAcc());\n\n\t\tcontentStream.moveTextPositionByAmount(0, -16);\n\t\tcontentStream.drawString(\"Niedrigster Kontostand: \"\n\t\t\t\t+ data.getLowestAcc());\n\n\t\tcontentStream.moveTextPositionByAmount(0, -16);\n\t\tcontentStream.drawString(\"Gr\u00f6\u00dfter Gewinn: \" + data.getHighestWin());\n\n\t\tcontentStream.moveTextPositionByAmount(0, -16);\n\t\tcontentStream.drawString(\"Gr\u00f6\u00dfter Verlust: \" + data.getHighestLoss());\n\n\t\tcontentStream.moveTextPositionByAmount(0, -32);\n\t}\n\n}\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"1c7ae6a9005e9b214a34949938884e90283ef6e8","subject":"updating aspect signatures","message":"updating aspect signatures","repos":"dukson\/curvature-scale-space-corners-and-transformations,dukson\/curvature-scale-space-corners-and-transformations,dukson\/curvature-scale-space-corners-and-transformations,nking\/curvature-scale-space-corners-and-transformations,nking\/curvature-scale-space-corners-and-transformations","old_file":"aspects\/algorithms\/imageProcessing\/CurvatureAspect.aj","new_file":"aspects\/algorithms\/imageProcessing\/CurvatureAspect.aj","new_contents":"package algorithms.imageProcessing;\n\nimport java.io.IOException;\nimport java.util.logging.Logger;\nimport algorithms.PolygonAndPointPlotter;\nimport algorithms.ResourceFinder;\nimport algorithms.misc.Histogram;\nimport algorithms.misc.HistogramHolder;\nimport algorithms.misc.MiscMath;\nimport algorithms.util.Errors;\nimport java.awt.Color;\nimport java.io.IOException;\nimport java.util.ArrayList;\nimport java.util.Arrays;\nimport java.util.HashMap;\nimport java.util.Iterator;\nimport java.util.List;\nimport java.util.Map;\nimport java.util.Map.Entry;\n\n\/**\nclass to create debugging output from the main source code\n*\/\npublic aspect CurvatureAspect {\n\n    private PolygonAndPointPlotter plotter = null;\n\n    \/\/ for the ContourFinder plots:\n    private PolygonAndPointPlotter plotter9 = null;\n\n    private Logger log2 = Logger.getAnonymousLogger();\n\n    private int debugEdgeNumber = -1;\n\n    private String currentEdgeStr = \"\";\n\n    after() :\n        target(algorithms.imageProcessing.ContourFinder) \n        && execution(public ContourFinder.new(..)) {\n\n        log2.info(\"===> in aspect for ContourFinder\");\n\n        if (plotter9 == null) {\n            try {\n            plotter9 = new PolygonAndPointPlotter();\n            } catch (IOException e) {\n                log2.severe(\"ERROR: \" + e.getMessage());\n            }\n        }\n    }\n\n    before(ScaleSpaceCurveImage scaleSpaceImage, int edgeNumber) :\n        execution(List<CurvatureScaleSpaceContour> algorithms.imageProcessing.ContourFinder.findContours(ScaleSpaceCurveImage, int))\n        && args(scaleSpaceImage, edgeNumber) \n\t    && target(algorithms.imageProcessing.ContourFinder) {\n\n        Object obj = thisJoinPoint.getThis();\n\n        if (!(obj instanceof ContourFinder)) {\n            return;\n        }\n\n        ContourFinder instance = (ContourFinder)obj;\n\n        Object[] args = (Object[])thisJoinPoint.getArgs();\n\n        ScaleSpaceCurveImage scaleSpaceImageIn = (ScaleSpaceCurveImage)args[0];\n        int edgeNumberIn = ((Integer)args[1]).intValue();\n\n        String filePath = printImage(scaleSpaceImageIn, plotter9, 9);\n\n        log2.info(\"===> in aspect for ContourFinder, filePath=\" + filePath);\n    }\n\n    after(ScaleSpaceCurveImage scaleSpaceImage, int edgeNumber) \n        returning(List<CurvatureScaleSpaceContour> contours) :\n        execution(List<CurvatureScaleSpaceContour> algorithms.imageProcessing.ContourFinder.findContours(ScaleSpaceCurveImage, int))\n        && args(scaleSpaceImage, edgeNumber) \n\t    && target(algorithms.imageProcessing.ContourFinder) {\n\n        Object obj = thisJoinPoint.getThis();\n\n        if (!(obj instanceof ContourFinder)) {\n            return;\n        }\n\n        ContourFinder instance = (ContourFinder)obj;\n\n        for (int i = 0; i < contours.size(); i++) {\n\n            CurvatureScaleSpaceContour contour = contours.get(i);\n\n            float sigma = contour.getPeakSigma();\n            float t = contour.getPeakScaleFreeLength();\n\n            String str = String.format(\"edge=%d contour=%d (%f, %f)\", \n                contour.getEdgeNumber(), i, sigma, t);\n\n            log2.info(str);\n        }\n    }\n\n    after() \n        returning(TransformationParameters params) :\n        execution(public TransformationParameters algorithms.imageProcessing.CurvatureScaleSpaceInflectionMapper.createEuclideanTransformation())\n\t    && target(algorithms.imageProcessing.CurvatureScaleSpaceInflectionMapper) {\n\n        Object obj = thisJoinPoint.getThis();\n\n        if (!(obj instanceof CurvatureScaleSpaceInflectionMapper)) {\n            return;\n        }\n\n        if (params == null) {\n            return;\n        }\n\n        CurvatureScaleSpaceInflectionMapper instance = (CurvatureScaleSpaceInflectionMapper)obj;\n\n        List<CurvatureScaleSpaceContour> contours1 = instance.getMatchedContours1();\n\n        List<CurvatureScaleSpaceContour> contours2 = instance.getMatchedContours2();\n\n        log2.info(\"number of matched contours1=\" + contours1.size() +\n            \" number of matched contours2=\" + contours2.size());\n\n        for (int i = 0; i < contours1.size(); i++) {\n\n            CurvatureScaleSpaceContour c1 = contours1.get(i);\n            CurvatureScaleSpaceContour c2 = contours2.get(i);\n\n            float sigma1 = c1.getPeakSigma();\n            float t1 = c1.getPeakScaleFreeLength();\n            int i1 = c1.getEdgeNumber();\n\n            float sigma2 = c2.getPeakSigma();\n            float t2 = c2.getPeakScaleFreeLength();\n            int i2 = c2.getEdgeNumber();\n\n            String str = String.format(\n                \"matched edge=%d (%f, %f) (%f, %f) edge=%d\", i1, sigma1, t1, \n                sigma2, t2, i2);\n\n            log2.info(str);\n        }\n        \n        PairIntArray matchedXY1 = instance.getMatchedXY1();\n        \n        PairIntArray matchedXY2 = instance.getMatchedXY2();\n\n        log2.info(\"number of matched points1=\" + matchedXY1.getN() +\n            \" number of matched points2=\" + matchedXY2.getN());\n\n        for (int i = 0; i < matchedXY1.getN(); i++) {\n            int x1 = matchedXY1.getX(i);\n            int y1 = matchedXY1.getY(i);\n            int x2 = matchedXY2.getX(i);\n            int y2 = matchedXY2.getY(i);\n\n            String str = String.format(\"matched points (%d, %d) (%d, %d)\", \n                x1, y1, x2, y2);\n\n            log2.info(str);\n        }\n\n        try {\n\n            Image img1 = instance.getImage1().copyImageToGreen();\n            \n            ImageIOHelper.addCurveToImage(matchedXY1, img1, 1, 255, 0, 0);\n            String dirPath = ResourceFinder.findDirectory(\"bin\");\n            ImageIOHelper.writeOutputImage(\n                dirPath + \"\/contour_peaks1.png\", img1);\n\n            Image img2 = instance.getImage2().copyImageToGreen();\n            \n            ImageIOHelper.addCurveToImage(matchedXY2, img2, 1, 255, 0, 0);\n            ImageIOHelper.writeOutputImage(\n                dirPath + \"\/contour_peaks2.png\", img2);\n\n        } catch (IOException e) {\n            log2.info(\"ERROR: \" + e.getMessage());\n        }\n\n    }\n\n    after() returning : \n\t    target(algorithms.imageProcessing.CurvatureScaleSpaceCornerDetector) \n        && execution(protected void extractEdgeContours()) {\n        \n        Object obj = thisJoinPoint.getThis();\n\n        if (!(obj instanceof CurvatureScaleSpaceCornerDetector)) {\n            return;\n        }\n\n        CurvatureScaleSpaceCornerDetector instance = (CurvatureScaleSpaceCornerDetector)obj;\n\n        List<PairIntArray> edges = instance.getEdges();\n\n        debugEdgeNumber = debugfindEdgeWithRange(edges, 164, 168, 58, 63);\n\n        log2.info(\"debugEdgeNumber=\" + debugEdgeNumber);\n    }\n\n    before(final PairIntArray edge, \n        final Map<SIGMA, ScaleSpaceCurve> scaleSpaceCurves, int edgeNumber) \n        : call(PairIntArray CurvatureScaleSpaceCornerDetector*.findCornersInScaleSpaceMap( \n        PairIntArray, Map<SIGMA, ScaleSpaceCurve>, int) ) \n        && args(edge, scaleSpaceCurves, edgeNumber) \n        && target(algorithms.imageProcessing.CurvatureScaleSpaceCornerDetector) {\n\n        try {\n            plotter = new PolygonAndPointPlotter();\n        } catch (IOException ex) {\n            ex.printStackTrace();\n            throw new RuntimeException(\"ERROR: l64\" + ex.getMessage());\n        }\n    }\n\n\tafter(PairIntArray curve, int cIndex, float[] g, final boolean calcX) \n        returning(double curvature) :\n        call(double Kernel1DHelper.convolvePointWithKernel(PairIntArray, int, \n        float[], boolean))\n        && args(curve, cIndex, g, calcX) \n\t    && target(algorithms.imageProcessing.Kernel1DHelper) {\n\n        \/*Object[] args = (Object[])thisJoinPoint.getArgs();\n\n        PairIntArray c = (PairIntArray)args[0];\n        int cIdx = (Integer)args[1];\n\n\t\tString str = String.format(\"k=%f  x,y=(%d, %d)\", curvature,\n            c.getX(cIdx), c.getY(cIdx));\n\n        log2.info(str);*\/\n\t}\n\n    after(GreyscaleImage img, int col, int row, float[] g, final boolean calcX) returning(double curvature) :\n        call(double Kernel1DHelper*.convolvePointWithKernel(GreyscaleImage, int, int, float[], boolean))\n        && args(img, col, row, g, calcX) \n\t    && target(algorithms.imageProcessing.Kernel1DHelper) {\t\t\n\n        \/*Object[] args = (Object[])thisJoinPoint.getArgs();\n        Integer c = (Integer)args[1];\n        Integer r = (Integer)args[2];\n\n\t\tString str = String.format(\"k=%f  x,y=(%d, %d)\", curvature, c, r);\n        log2.info(str);*\/\n\t}\n\n    after(GreyscaleImage input, HistogramHolder imgHistogram) returning(ImageStatistics stats) :\n        execution(public ImageStatistics LowIntensityRemovalFilter+.removeLowIntensityPixels(GreyscaleImage, HistogramHolder))\n        && args(input, imgHistogram) \n\t    && target(algorithms.imageProcessing.LowIntensityRemovalFilter) {\t\t\n\n        Object[] args = (Object[])thisJoinPoint.getArgs();\n\n        GreyscaleImage img = (GreyscaleImage)args[0];\n\n        try {\n            String dirPath = ResourceFinder.findDirectory(\"bin\");\n            ImageIOHelper.writeOutputImage(dirPath + \"\/filters_1.png\", img);\n        } catch(IOException e) {\n            log2.severe(e.getMessage());\n        }\n\t}\n\n    \/\/ note, execution binds to CannyEdgeFilter which is good,\n    \/\/ but call binds to the invoker CurvatureScaleSpaceCornerDetector\n    after(GreyscaleImage img) returning() :\n        execution(public void CannyEdgeFilter.applyFilter(GreyscaleImage))\n        && args(img)\n\t    && target(algorithms.imageProcessing.CannyEdgeFilter) {\n\n        Object obj = thisJoinPoint.getThis();\n\n        log2.info(\"after CannyEdgeFilter.applyFilter instance=\" \n            + obj.getClass().getName());\n\n        if (!(obj instanceof CannyEdgeFilter)) {\n            return;\n        }\n\n        CannyEdgeFilter instance = (CannyEdgeFilter)obj;\n\n        Object[] args = (Object[])thisJoinPoint.getArgs();\n        GreyscaleImage image = (GreyscaleImage)args[0];\n\n        debugDisplay(image, \"after edge thinning\");\n\n        try {\n            String dirPath = ResourceFinder.findDirectory(\"bin\");\n\n            ImageIOHelper.writeOutputImage(dirPath + \"\/edgethinned.png\", image);\n\n        } catch (IOException e) {\n            log2.severe(e.getMessage());\n        }\n    }\n\n    after(GreyscaleImage input) returning() :\n        call(void CannyEdgeFilter*.apply2LayerFilter(GreyscaleImage))\n        && args(input)\n\t    && target(algorithms.imageProcessing.CannyEdgeFilter) {\n\n        log2.info(\"after CannyEdgeFilter*.apply2LayerFilter\");\n\n        Object[] args = (Object[])thisJoinPoint.getArgs();\n        GreyscaleImage output = (GreyscaleImage)args[0];\n\n        debugDisplay(output, \"after 2-threshold level filtering\");\n\n        try {\n            String dirPath = ResourceFinder.findDirectory(\"bin\");\n            ImageIOHelper.writeOutputImage(dirPath + \"\/filters2.png\", output);\n        } catch (IOException e) {\n            log2.severe(e.getMessage());\n        }\n    }\n\n    after(GreyscaleImage convolvedX, GreyscaleImage convolvedY) returning(GreyscaleImage output) :\n        call(public GreyscaleImage ImageProcesser.computeTheta(GreyscaleImage, GreyscaleImage))\n        && args(convolvedX, convolvedY)\n\t    && target(algorithms.imageProcessing.ImageProcesser) {\n\n        log2.info(\"after ImageProcesser.computeTheta\");\n\n        debugDisplay(output, \"theta\");\n\n        try {\n            String dirPath = ResourceFinder.findDirectory(\"bin\");\n            ImageIOHelper.writeOutputImage(dirPath + \"\/gTheta.png\", output);\n        } catch (IOException e) {\n            log2.severe(e.getMessage());\n        }\n    }\n\n    after(GreyscaleImage convolvedX, GreyscaleImage convolvedY) returning(GreyscaleImage output) :\n        call(public GreyscaleImage ImageProcesser.combineConvolvedImages(GreyscaleImage, GreyscaleImage))\n        && args(convolvedX, convolvedY)\n\t    && target(algorithms.imageProcessing.ImageProcesser) {\n\n        log2.info(\"after ImageProcesser*.combineConvolvedImages\");\n\n        Object[] args = (Object[])thisJoinPoint.getArgs();\n        GreyscaleImage cX = (GreyscaleImage)args[0];\n        GreyscaleImage cY = (GreyscaleImage)args[1];\n\n        debugDisplay(cX, \"gradient X\");\n        debugDisplay(cY, \"gradient Y\");\n        debugDisplay(output, \"gradient combined\");\n\n        try {\n            String dirPath = ResourceFinder.findDirectory(\"bin\");\n            ImageIOHelper.writeOutputImage(dirPath + \"\/gX.png\", cX);\n            ImageIOHelper.writeOutputImage(dirPath + \"\/gY.png\", cY);\n            ImageIOHelper.writeOutputImage(dirPath + \"\/gXY.png\", output);\n        } catch (IOException e) {\n            log2.severe(e.getMessage());\n        }\n    }\n   \n    before() \n        : call(void CurvatureScaleSpaceCornerDetector*.initialize() ) \n        && args() \n        && target(algorithms.imageProcessing.CurvatureScaleSpaceCornerDetector) {\n\n        Object obj = thisJoinPoint.getThis();\n\n        if (!(obj instanceof CurvatureScaleSpaceCornerDetector)) {\n            return;\n        }\n\n        CurvatureScaleSpaceCornerDetector instance = \n            (CurvatureScaleSpaceCornerDetector)obj;\n\n        if (!instance.getInitialized()) {\n            debugDisplay(instance.getImage(), \"original image\");\n        }\n    }\n\n    after(HistogramHolder h) returning(int[] peakAndMinIndexes) :\n        call(protected int[] CurvatureScaleSpaceCornerDetector.findFirstPeakAndMinimum(HistogramHolder))\n        && args(h) \n\t    && target(algorithms.imageProcessing.CurvatureScaleSpaceCornerDetector) { \t\t\n\n        Object[] args = (Object[])thisJoinPoint.getArgs();\n\n        HistogramHolder hist = (HistogramHolder)args[0];\n        \n        try {\n\n            float xMin = MiscMath.findMax(hist.getXHist());\n            float xMax = MiscMath.findMax(hist.getXHist());\n\n            float yMax = MiscMath.findMax(hist.getYHist());\n\n            if ((xMax > 0) && (yMax > 0)) {\n\n                plotter.addPlot(\n                    xMin, xMax, 0, yMax,\n                    hist.getXHist(), hist.getYHistFloat(), \n                    hist.getXErrors(), hist.getYErrors(), \n                    currentEdgeStr);\n\n                String filePath = plotter.writeFile(Integer.valueOf(10));\n            }\n\n            log2.info(currentEdgeStr + \") x=\" + Arrays.toString(hist.getXHist()));\n\n            log2.info(currentEdgeStr + \") y=\" + Arrays.toString(hist.getYHist()));\n\n        } catch(IOException e) {\n           log2.severe(e.getMessage());\n        }\n\t}\n\n    after() returning : \n        execution(protected void algorithms.imageProcessing.AbstractCurvatureScaleSpaceMapper+.extractEdgeContours()) {\n\n        Object obj = thisJoinPoint.getThis();\n\n        if (!(obj instanceof AbstractCurvatureScaleSpaceMapper)) {\n            return;\n        }\n\n        log2.info(\"==>in aspect of AbstractCurvatureScaleSpaceMapper\");\n\n        AbstractCurvatureScaleSpaceMapper instance = \n            (AbstractCurvatureScaleSpaceMapper)obj;\n\n        try {\n            List<PairIntArray> edges = instance.getEdges();\n\n            Image img3 = instance.getOriginalImage().copyImageToGreen();\n\n            debugDisplay(edges, \"edges extracted\", true, img3.getWidth(), \n                img3.getHeight());\n\n        } catch (IOException e) {\n            log2.severe(e.getMessage());\n        }\n    }\n\n    \/\/ for some reason, execution works here, but call does not\n    after() returning : \n\t    target(algorithms.imageProcessing.CurvatureScaleSpaceCornerDetector) \n        && execution(public void findCorners())\n    {\n    \n        Object obj = thisJoinPoint.getThis();\n\n        log2.info(\"after findCorners() \" + obj.getClass().getSimpleName());\n\n        if (!(obj instanceof CurvatureScaleSpaceCornerDetector)) {\n            return;\n        }\n\n        CurvatureScaleSpaceCornerDetector instance = \n            (CurvatureScaleSpaceCornerDetector)obj;\n\n        Image img3 = instance.getOriginalImage().copyImageToGreen();\n\n        List<PairIntArray> edges = instance.getEdgesInOriginalReferenceFrame();\n\n        PairIntArray corners = instance.getCornersInOriginalReferenceFrame();\n\n        try {\n            \/\/ multi-colored edges alone:\n            debugDisplay(edges, \"edges extracted\", true, img3.getWidth(), img3.getHeight());\n\n            for (PairIntArray edge : edges) {\n                ImageIOHelper.addCurveToImage(edge, img3, 0, 255, 255, 0);\n            }\n            ImageIOHelper.addCurveToImage(corners, img3, 1, 255, 0, 0);\n            debugDisplay(img3, \"original image w\/ edges and corners overplotted\");\n            String dirPath = ResourceFinder.findDirectory(\"bin\");\n            ImageIOHelper.writeOutputImage(\n                dirPath + \"\/lab_with_edges_corners.png\", img3);\n \n        } catch (IOException ex) {\n            throw new RuntimeException(\"ERROR: l298\" + ex.getMessage());\n        }\n    }\n\n    before(ScaleSpaceCurve scaleSpace, int edgeNumber, boolean rmFlseCrnrs, boolean isAClosedCurve) :\n        target(algorithms.imageProcessing.CurvatureScaleSpaceCornerDetector)\n        && call(protected PairFloatArray CurvatureScaleSpaceCornerDetector.findCornersInScaleSpaceMap(\n        ScaleSpaceCurve, int, boolean, boolean))\n        && args(scaleSpace, edgeNumber, rmFlseCrnrs, isAClosedCurve) {\n\n        log2.info(\"before findCornersInScaleSpaceMap for edge \" \n            + Integer.toString(edgeNumber) + \":\");\n\n        Object[] args = (Object[])thisJoinPoint.getArgs();\n        Integer eNumber = (Integer)args[1];\n\n        currentEdgeStr = eNumber.toString();\n\n    }\n\n    after(ScaleSpaceCurve scaleSpace, int edgeNumber, boolean rmFlseCrnrs,\n        boolean isAClosedCurve) \n        returning(PairFloatArray xy) :\n        target(algorithms.imageProcessing.CurvatureScaleSpaceCornerDetector)\n        && call(protected PairFloatArray CurvatureScaleSpaceCornerDetector.findCornersInScaleSpaceMap(\n        ScaleSpaceCurve, int, boolean, boolean))\n        && args(scaleSpace, edgeNumber, rmFlseCrnrs, isAClosedCurve) {\n\n        log2.info(\"after findCornersInScaleSpaceMap for edge \" \n            + Integer.toString(edgeNumber) + \":\");\n\n        for (int i = 0; i < xy.getN(); i++) {\n            log2.info(String.format(\"(%f, %f)\", xy.getX(i), xy.getY(i)));\n        }\n\n    }\n\n    before() \n        : call(List<PairIntArray> EdgeExtractor*.findEdges() ) \n        && args() \n        && target(algorithms.imageProcessing.EdgeExtractor) {\n\n        log2.info(\"before EdgeExtractor*.findEdges()\");\n\n        Object obj = thisJoinPoint.getThis();\n\n        if (!(obj instanceof EdgeExtractor)) {\n            return;\n        }\n\n        EdgeExtractor instance = (EdgeExtractor)obj;\n\n        try {\n            String dirPath = ResourceFinder.findDirectory(\"bin\");\n\n            ImageIOHelper.writeOutputImage(dirPath + \"\/edges0.png\", \n                instance.getImage());\n\n            plotHistogram(instance.getImage(), \"edges before dfs\");\n\n        } catch (IOException ex) {\n\n            log2.severe(\"ERROR: l359\" + ex.getMessage());\n        }\n    }\n\n    before(ImageStatistics stats, HistogramHolder originalImageHistogram) \n        : call(int LowIntensityRemovalFilter*.determineLowThreshold( \n        ImageStatistics,  HistogramHolder))\n        && args(stats, originalImageHistogram) \n        && target(algorithms.imageProcessing.LowIntensityRemovalFilter) {\n\n        log2.info(\"before LowIntensityRemovalFilter*.determineLowThreshold\");\n\n        plotHistogram0(stats.getHistogram(),  \"border histogram\");\n    }\n\n    private int debugfindEdgeWithRange(List<PairIntArray> edges,\n        int xLo, int xHi, int yLo, int yHi) {\n\n        for (int i = 0; i < edges.size(); i++) {\n            boolean c = debugContainsAPoint(edges.get(i), xLo, xHi, yLo, yHi);\n            if (c) {\n                return i;\n            }\n        }\n        return -1;\n    }\n    private boolean debugContainsAPoint(PairIntArray edge, \n        int xLo, int xHi, int yLo, int yHi) {\n        for (int i = 0; i < edge.getN(); i++) {\n            int x = edge.getX(i);\n            int y = edge.getY(i);\n            if (x >= xLo && x <= xHi && y >= yLo && y <= yHi) {\n                return true;\n            }\n        }\n        return false;\n    }\n\n    private void debugDisplay(Image input, String label) throws IOException {\n     \n        ImageDisplayer.displayImage(label, input);\n    }\n \n    private void debugDisplay(List<PairIntArray> curves, String label,\n        boolean writeImage, int width, int height) throws IOException {\n        \n        log2.info(\"create multicolor curve debug image\");\n\n        Image img2 = new Image(width, height);\n\n        ImageIOHelper.addAlternatingColorCurvesToImage(curves, \"edges.png\",\n            writeImage, img2);        \n        \n        ImageDisplayer.displayImage(label, img2);\n       \n    }\n\n    public void debugDisplay(GreyscaleImage input, String label) {\n     \n        try {\n            ImageDisplayer.displayImage(label, input);\n\n        } catch (IOException e) {\n\n            log2.severe(e.getMessage());\n        }\n    }\n    \n    private void debugAddCurveToImage(float[] xPoints, float[] yPoints, \n        Image input, int nExtraForDot, int rClr, int gClr, int bClr) {\n        \n        for (int i = 0; i < xPoints.length; i++) {\n            int x = (int) xPoints[i];\n            int y = (int) yPoints[i];\n            \n            for (int dx = (-1*nExtraForDot); dx < (nExtraForDot + 1); dx++) {\n                float xx = x + dx;\n                if ((xx > -1) && (xx < (input.getWidth() - 1))) {\n                    for (int dy = (-1*nExtraForDot); dy < (nExtraForDot + 1); dy++) {\n                        float yy = y + dy;\n                        if ((yy > -1) && (yy < (input.getHeight() - 1))) {\n                            input.setRGB((int)xx, (int)yy, rClr, gClr, bClr);\n                        }\n                    }\n                }\n            }\n        }\n    }\n    \n    private void debugDisplayScaleSpaceImages(PairIntArray edge,\n        Map<SIGMA, ScaleSpaceCurve> map, GreyscaleImage img) {\n                \n        try {\n            \/\/plot the edge and all scale space images\n            Image debugImg = img.copyImageToGreen();\n            \n            ImageIOHelper.addCurveToImage(edge, debugImg, 0, 0, 255, 0);\n            \n\/\/the convolutions should be acting upon data that starts at (0,0)\n\/\/ and an offset applied?\n\/\/ check an edge which is near x=0 and y=0\n            \n            Iterator<Entry<SIGMA, ScaleSpaceCurve>> iter = map.entrySet().iterator();\n            while (iter.hasNext()) {\n                Entry<SIGMA, ScaleSpaceCurve> entry = iter.next();\n                ScaleSpaceCurve dss = entry.getValue();\n                ImageIOHelper.addCurveToImage(dss, debugImg, 0, 0, 0, 255);\n            }\n            \n            ImageDisplayer.displayImage(\"scale space images\", debugImg);\n                            \n            int z = 1;\n            \n        } catch (IOException ex) {\n            throw new RuntimeException(\"ERROR: l548\" + ex.getMessage());\n        }\n    }\n\n    private void debugDisplayScaleSpace(ScaleSpaceCurve maxScaleSpace, \n        List<Integer> maxCandidateCornerIndexes, PolygonAndPointPlotter plotter, \n        float[] xc, float[] yc, SIGMA sigma, int edgeNumber, \n        int width, int height) {\n        \n        float[] tCornersForPlot = new float[xc.length];\n        float[] kCornersForPlot = new float[xc.length];\n        for (int ii = 0; ii < maxCandidateCornerIndexes.size(); ii++) {\n            int idx = maxCandidateCornerIndexes.get(ii);\n            tCornersForPlot[ii] = maxScaleSpace.getT()[idx];\n            kCornersForPlot[ii] = maxScaleSpace.getK(idx);\n            if (kCornersForPlot[ii] < 0) {\n                kCornersForPlot[ii] *= -1;\n            }\n        }\n        try {\n            float[] tmpX = maxScaleSpace.getT();\n            float[] k = maxScaleSpace.getK();\n            float[] tmpk = Arrays.copyOf(k, k.length);\n            for (int ii = 1; ii < tmpk.length; ii++) {\n                if (tmpk[ii] < 0) {\n                    tmpk[ii] *= -1;\n                }\n            }\n            \n            plotter.addPlot(0.0f, 1.f, 0, MiscMath.findMax(tmpk), \n                tmpX, tmpk, tCornersForPlot, kCornersForPlot,\n                \"k for sigma=\" + sigma.toString() \n                + \" edge=\" + edgeNumber);\n\n            String filePath = plotter.writeFile();\n\n            Image img3 = new Image(width, height);\n\n            ImageIOHelper.addCurveToImage(maxScaleSpace, img3, 0, 255, 255, \n                255);\n\n            debugAddCurveToImage(xc, yc, img3, 1, 255, 0, 0);\n\n            ImageDisplayer.displayImage(\n                \"corner candidates (maxSigma=\" + sigma.toString() \n                + \")\", img3);\n\n        } catch (Exception e) {\n            throw new RuntimeException(\"ERROR: l595\" + e.getMessage());\n        }                \n    }\n\n    private void debugDisplay(ScaleSpaceCurve scaleSpace, List<Integer> \n        candidateCornerIndexes, String label, int width, int height) \n        throws IOException {\n        \n        Image img2 = new Image(width, height);\n        \n        ImageIOHelper.addCurveToImage(scaleSpace, img2, 0, 255, 255, 255);\n      \n        for (Integer idx : candidateCornerIndexes) {\n            float x = scaleSpace.getX(idx.intValue());\n            float y = scaleSpace.getY(idx.intValue());\n            \n            img2.setRGB((int)x, (int)y, 255, 0, 0);\n            \/\/ make a plus symbol because the dot is too small\n            for (int d = -1; d < 2; d++) {\n                float xx = x + d;\n                if ((xx > -1) && (xx < (width - 1))) {\n                    img2.setRGB((int)xx, (int)y, 255, 0, 0);\n                }\n            }\n            for (int d = -1; d < 2; d++) {\n                float yy = y + d;\n                if ((yy > -1) && (yy < (height - 1))) {\n                    img2.setRGB((int)x, (int)yy, 255, 0, 0);\n                }\n            }\n        }\n        \n        ImageDisplayer.displayImage(label, img2);\n    }\n      \n    public double debugAreaUnderTheCurve(float[] x, float[] y) {\n        \n        \/\/ using trapezoidal rule\n        \n        if (x.length == 0) {\n            return 0;\n        } else if (x.length == 1) {\n            \/\/ this isn't correct, but is fine for the one case it's used for\n            return (y[0]);\n        }\n        \n        double sum = 0;\n        \n        for (int i = 0; i < (x.length - 1); i++) {\n            float yTerm = y[i + 1] + y[i];\n            float xLen = x[i + 1] - x[i];\n            sum += (yTerm * xLen);\n        }\n        \n        sum *= 0.5;\n        \n        return sum;\n    }\n    \n    private void debugDisplay(PairIntArray edge, PairIntArray corners,\n        String label, int width, int height) throws IOException {\n        \n        Image img2 = new Image(width, height);\n        \n        ImageIOHelper.addCurveToImage(edge, img2, 0, 255, 255, 255);\n        \n        ImageIOHelper.addCurveToImage(corners, img2, 1, 255, 0, 0);\n        \n        ImageDisplayer.displayImage(label, img2);\n     \n        int z = 1;\n    }\n    \n    private void plotHistogram0(HistogramHolder h, String label) {\n                \n        float[] xh = h.getXHist();\n        float[] yh = h.getYHistFloat();\n        \n        float yMin = MiscMath.findMin(yh);\n        int yMaxIdx = MiscMath.findYMaxIndex(yh);\n        float yMax = yh[yMaxIdx];\n        \n        float xMin = MiscMath.findMin(xh);\n        float xMax = MiscMath.findMax(xh);        \n        \n        log2.info(\"MODE=\" + xh[yMaxIdx]);\n        \n        try {\n\n            PolygonAndPointPlotter plotter = new PolygonAndPointPlotter();\n            \n            plotter.addPlot(\n                xMin, xMax, yMin, yMax,\n                xh, yh, xh, yh, label);\n\n            String filePath = plotter.writeFile3();\n            \n            log2.info(\"created histogram at \" + filePath);\n            \n        } catch (IOException e) {\n            e.printStackTrace(); \n            log2.severe(\"ERROR while plotting histogram: \" + e.getMessage());\n        }\n    }\n\n    private void plotHistogram(GreyscaleImage img, String label) throws \n    IOException {\n        \n        float[] v = new float[img.getWidth() * img.getHeight()];\n        float[] ve = new float[v.length];\n        \n        int count = 0;\n        for (int i = 0; i < img.getWidth(); i++) {\n            for (int j = 0; j < img.getHeight(); j++) {\n                v[count] = img.getValue(i, j);\n                ve[count] = (float)Math.sqrt(v[count]);\n                count++;\n            }\n        }\n        \n        HistogramHolder h = Histogram.createSimpleHistogram(v, ve);\n        \/\/HistogramHolder h = Histogram.defaultHistogramCreator(v, ve);\n        \n        float[] xh = h.getXHist();\n        float[] xhe = h.getXErrors();\n        float[] yh = h.getYHistFloat();\n        float[] yhe = h.getYErrors();\n        int firstZero = -1;\n        for (int i = (yh.length - 1); i > -1; i--) {\n            if (yh[i] > 0) {\n                break;\n            } else {\n                firstZero = i;\n            }\n        }\n        if (firstZero > -1) {\n            int n = xh.length - firstZero;\n            xh = Arrays.copyOf(xh, n);\n            xhe = Arrays.copyOf(xhe, n);\n            yh = Arrays.copyOf(yh, n);\n            yhe = Arrays.copyOf(yhe, n);\n        }\n        \n        float xMax = MiscMath.findMax(xh);\n        float yMax = MiscMath.findMax(yh);\n        \n        int yMaxIdx = MiscMath.findYMaxIndex(yh);\n        yMax = yh[yMaxIdx + 3];\n        \n        PolygonAndPointPlotter plotter2 = new PolygonAndPointPlotter();\n        \n        plotter2.addPlot(0, xMax, 0, yMax, xh, yh, xhe, yhe, label);\n        \n        String filePath = plotter2.writeFile3();\n        \n        log2.info(\"filePath=\" + filePath);\n    }\n\n    public void printContents(ScaleSpaceCurveImage spaceImage) {\n        StringBuilder sb = new StringBuilder();\n        for (int i = 0; i < spaceImage.getImageSigmas().length; i++) {\n            sb.append(\"sigma=\").append(spaceImage.getImageSigmas()[i]).append(\": \");\n            float[] t = spaceImage.getScaleSpaceImage()[i];\n            for (int j = 0; j < t.length; j++) {\n                sb.append(\"t=\").append(t[j]).append(\" \");\n            }\n            sb.append(\"\\n\");\n        }\n        log2.info(sb.toString());\n    }\n   \n    public String printImage(ScaleSpaceCurveImage spaceImage, \n        PolygonAndPointPlotter plotterC, int fileNumber) {\n        \n        if (plotterC == null) {\n            return null;\n        }\n        int nTotalPoints = 0;\n        for (int i = 0; i < spaceImage.getImageSigmas().length; i++) {\n            float[] t = spaceImage.getScaleSpaceImage()[i];\n            nTotalPoints+= t.length;\n        }\n        \n        try {\n            int count = 0;\n            float[] x = new float[nTotalPoints];\n            float[] y = new float[x.length];\n            for (int i = 0; i < spaceImage.getImageSigmas().length; i++) {\n                float sigma = spaceImage.getImageSigmas()[i];\n                float[] t = spaceImage.getScaleSpaceImage()[i];\n                for (int j = 0; j < t.length; j++) {\n                    y[count] = sigma;\n                    x[count] = t[j];\n                    count++;\n                }\n            }\n            float xMin = 0;\n            float xMax = 1.0f;\n            float yMin = MiscMath.findMin(y);\n            if (yMin < 0) {\n                yMin *= 1.1;\n            } else {\n                yMin *= 0.9;\n            }\n            float yMax = MiscMath.findMax(y);\n\n            plotterC.addPlot(xMin, xMax,yMin, yMax, x, y, null, null,\n                \"\");\n\n            String filePathC = plotterC.writeFile(fileNumber);\n            \n            return filePathC;\n            \n        } catch(Exception e) {\n            log2.severe(e.getMessage());\n        }\n        \n        return null;\n    }\n}\n","old_contents":"package algorithms.imageProcessing;\n\nimport java.io.IOException;\nimport java.util.logging.Logger;\nimport algorithms.PolygonAndPointPlotter;\nimport algorithms.ResourceFinder;\nimport algorithms.misc.Histogram;\nimport algorithms.misc.HistogramHolder;\nimport algorithms.misc.MiscMath;\nimport algorithms.util.Errors;\nimport java.awt.Color;\nimport java.io.IOException;\nimport java.util.ArrayList;\nimport java.util.Arrays;\nimport java.util.HashMap;\nimport java.util.Iterator;\nimport java.util.List;\nimport java.util.Map;\nimport java.util.Map.Entry;\n\n\/**\nclass to create debugging output from the main source code\n*\/\npublic aspect CurvatureAspect {\n\n    private PolygonAndPointPlotter plotter = null;\n\n    \/\/ for the ContourFinder plots:\n    private PolygonAndPointPlotter plotter9 = null;\n\n    private Logger log2 = Logger.getAnonymousLogger();\n\n    private int debugEdgeNumber = -1;\n\n    private String currentEdgeStr = \"\";\n\n    after() :\n        target(algorithms.imageProcessing.ContourFinder) \n        && execution(public ContourFinder.new(..)) {\n\n        log2.info(\"===> in aspect for ContourFinder\");\n\n        if (plotter9 == null) {\n            try {\n            plotter9 = new PolygonAndPointPlotter();\n            } catch (IOException e) {\n                log2.severe(\"ERROR: \" + e.getMessage());\n            }\n        }\n    }\n\n    before(ScaleSpaceCurveImage scaleSpaceImage, int edgeNumber) :\n        execution(List<CurvatureScaleSpaceContour> algorithms.imageProcessing.ContourFinder.findContours(ScaleSpaceCurveImage, int))\n        && args(scaleSpaceImage, edgeNumber) \n\t    && target(algorithms.imageProcessing.ContourFinder) {\n\n        Object obj = thisJoinPoint.getThis();\n\n        if (!(obj instanceof ContourFinder)) {\n            return;\n        }\n\n        ContourFinder instance = (ContourFinder)obj;\n\n        Object[] args = (Object[])thisJoinPoint.getArgs();\n\n        ScaleSpaceCurveImage scaleSpaceImageIn = (ScaleSpaceCurveImage)args[0];\n        int edgeNumberIn = ((Integer)args[1]).intValue();\n\n        String filePath = printImage(scaleSpaceImageIn, plotter9, 9);\n\n        log2.info(\"===> in aspect for ContourFinder, filePath=\" + filePath);\n    }\n\n    after(ScaleSpaceCurveImage scaleSpaceImage, int edgeNumber) \n        returning(List<CurvatureScaleSpaceContour> contours) :\n        execution(List<CurvatureScaleSpaceContour> algorithms.imageProcessing.ContourFinder.findContours(ScaleSpaceCurveImage, int))\n        && args(scaleSpaceImage, edgeNumber) \n\t    && target(algorithms.imageProcessing.ContourFinder) {\n\n        Object obj = thisJoinPoint.getThis();\n\n        if (!(obj instanceof ContourFinder)) {\n            return;\n        }\n\n        ContourFinder instance = (ContourFinder)obj;\n\n        for (int i = 0; i < contours.size(); i++) {\n\n            CurvatureScaleSpaceContour contour = contours.get(i);\n\n            float sigma = contour.getPeakSigma();\n            float t = contour.getPeakScaleFreeLength();\n\n            String str = String.format(\"edge=%d contour=%d (%f, %f)\", \n                contour.getEdgeNumber(), i, sigma, t);\n\n            log2.info(str);\n        }\n    }\n\n    after() \n        returning(TransformationParameters params) :\n        execution(public TransformationParameters algorithms.imageProcessing.CurvatureScaleSpaceInflectionMapper.createEuclideanTransformation())\n\t    && target(algorithms.imageProcessing.CurvatureScaleSpaceInflectionMapper) {\n\n        Object obj = thisJoinPoint.getThis();\n\n        if (!(obj instanceof CurvatureScaleSpaceInflectionMapper)) {\n            return;\n        }\n\n        if (params == null) {\n            return;\n        }\n\n        CurvatureScaleSpaceInflectionMapper instance = (CurvatureScaleSpaceInflectionMapper)obj;\n\n        List<CurvatureScaleSpaceContour> contours1 = instance.getMatchedContours1();\n\n        List<CurvatureScaleSpaceContour> contours2 = instance.getMatchedContours2();\n\n        log2.info(\"number of matched contours1=\" + contours1.size() +\n            \" number of matched contours2=\" + contours2.size());\n\n        for (int i = 0; i < contours1.size(); i++) {\n\n            CurvatureScaleSpaceContour c1 = contours1.get(i);\n            CurvatureScaleSpaceContour c2 = contours2.get(i);\n\n            float sigma1 = c1.getPeakSigma();\n            float t1 = c1.getPeakScaleFreeLength();\n            int i1 = c1.getEdgeNumber();\n\n            float sigma2 = c2.getPeakSigma();\n            float t2 = c2.getPeakScaleFreeLength();\n            int i2 = c2.getEdgeNumber();\n\n            String str = String.format(\n                \"matched edge=%d (%f, %f) (%f, %f) edge=%d\", i1, sigma1, t1, \n                sigma2, t2, i2);\n\n            log2.info(str);\n        }\n        \n        PairIntArray matchedXY1 = instance.getMatchedXY1();\n        \n        PairIntArray matchedXY2 = instance.getMatchedXY2();\n\n        log2.info(\"number of matched points1=\" + matchedXY1.getN() +\n            \" number of matched points2=\" + matchedXY2.getN());\n\n        for (int i = 0; i < matchedXY1.getN(); i++) {\n            int x1 = matchedXY1.getX(i);\n            int y1 = matchedXY1.getY(i);\n            int x2 = matchedXY2.getX(i);\n            int y2 = matchedXY2.getY(i);\n\n            String str = String.format(\"matched points (%d, %d) (%d, %d)\", \n                x1, y1, x2, y2);\n\n            log2.info(str);\n        }\n\n        try {\n\n            Image img1 = instance.getImage1().copyImageToGreen();\n            \n            ImageIOHelper.addCurveToImage(matchedXY1, img1, 1, 255, 0, 0);\n            String dirPath = ResourceFinder.findDirectory(\"bin\");\n            ImageIOHelper.writeOutputImage(\n                dirPath + \"\/contour_peaks1.png\", img1);\n\n            Image img2 = instance.getImage2().copyImageToGreen();\n            \n            ImageIOHelper.addCurveToImage(matchedXY2, img2, 1, 255, 0, 0);\n            ImageIOHelper.writeOutputImage(\n                dirPath + \"\/contour_peaks2.png\", img2);\n\n        } catch (IOException e) {\n            log2.info(\"ERROR: \" + e.getMessage());\n        }\n\n    }\n\n    after() returning : \n\t    target(algorithms.imageProcessing.CurvatureScaleSpaceCornerDetector) \n        && execution(protected void extractEdgeContours()) {\n        \n        Object obj = thisJoinPoint.getThis();\n\n        if (!(obj instanceof CurvatureScaleSpaceCornerDetector)) {\n            return;\n        }\n\n        CurvatureScaleSpaceCornerDetector instance = (CurvatureScaleSpaceCornerDetector)obj;\n\n        List<PairIntArray> edges = instance.getEdges();\n\n        debugEdgeNumber = debugfindEdgeWithRange(edges, 164, 168, 58, 63);\n\n        log2.info(\"debugEdgeNumber=\" + debugEdgeNumber);\n    }\n\n    before(final PairIntArray edge, \n        final Map<SIGMA, ScaleSpaceCurve> scaleSpaceCurves, int edgeNumber) \n        : call(PairIntArray CurvatureScaleSpaceCornerDetector*.findCornersInScaleSpaceMap( \n        PairIntArray, Map<SIGMA, ScaleSpaceCurve>, int) ) \n        && args(edge, scaleSpaceCurves, edgeNumber) \n        && target(algorithms.imageProcessing.CurvatureScaleSpaceCornerDetector) {\n\n        try {\n            plotter = new PolygonAndPointPlotter();\n        } catch (IOException ex) {\n            ex.printStackTrace();\n            throw new RuntimeException(\"ERROR: l64\" + ex.getMessage());\n        }\n    }\n\n\tafter(PairIntArray curve, int cIndex, float[] g, final boolean calcX) \n        returning(double curvature) :\n        call(double Kernel1DHelper.convolvePointWithKernel(PairIntArray, int, \n        float[], boolean))\n        && args(curve, cIndex, g, calcX) \n\t    && target(algorithms.imageProcessing.Kernel1DHelper) {\n\n        \/*Object[] args = (Object[])thisJoinPoint.getArgs();\n\n        PairIntArray c = (PairIntArray)args[0];\n        int cIdx = (Integer)args[1];\n\n\t\tString str = String.format(\"k=%f  x,y=(%d, %d)\", curvature,\n            c.getX(cIdx), c.getY(cIdx));\n\n        log2.info(str);*\/\n\t}\n\n    after(GreyscaleImage img, int col, int row, float[] g, final boolean calcX) returning(double curvature) :\n        call(double Kernel1DHelper*.convolvePointWithKernel(GreyscaleImage, int, int, float[], boolean))\n        && args(img, col, row, g, calcX) \n\t    && target(algorithms.imageProcessing.Kernel1DHelper) {\t\t\n\n        \/*Object[] args = (Object[])thisJoinPoint.getArgs();\n        Integer c = (Integer)args[1];\n        Integer r = (Integer)args[2];\n\n\t\tString str = String.format(\"k=%f  x,y=(%d, %d)\", curvature, c, r);\n        log2.info(str);*\/\n\t}\n\n    after(GreyscaleImage input, HistogramHolder imgHistogram) returning(ImageStatistics stats) :\n        execution(public ImageStatistics LowIntensityRemovalFilter+.removeLowIntensityPixels(GreyscaleImage, HistogramHolder))\n        && args(input, imgHistogram) \n\t    && target(algorithms.imageProcessing.LowIntensityRemovalFilter) {\t\t\n\n        Object[] args = (Object[])thisJoinPoint.getArgs();\n\n        GreyscaleImage img = (GreyscaleImage)args[0];\n\n        try {\n            String dirPath = ResourceFinder.findDirectory(\"bin\");\n            ImageIOHelper.writeOutputImage(dirPath + \"\/filters_1.png\", img);\n        } catch(IOException e) {\n            log2.severe(e.getMessage());\n        }\n\t}\n\n    \/\/ note, execution binds to CannyEdgeFilter which is good,\n    \/\/ but call binds to the invoker CurvatureScaleSpaceCornerDetector\n    after(GreyscaleImage img) returning() :\n        execution(public void CannyEdgeFilter.applyFilter(GreyscaleImage))\n        && args(img)\n\t    && target(algorithms.imageProcessing.CannyEdgeFilter) {\n\n        Object obj = thisJoinPoint.getThis();\n\n        log2.info(\"after CannyEdgeFilter.applyFilter instance=\" \n            + obj.getClass().getName());\n\n        if (!(obj instanceof CannyEdgeFilter)) {\n            return;\n        }\n\n        CannyEdgeFilter instance = (CannyEdgeFilter)obj;\n\n        Object[] args = (Object[])thisJoinPoint.getArgs();\n        GreyscaleImage image = (GreyscaleImage)args[0];\n\n        debugDisplay(image, \"after edge thinning\");\n\n        try {\n            String dirPath = ResourceFinder.findDirectory(\"bin\");\n\n            ImageIOHelper.writeOutputImage(dirPath + \"\/edgethinned.png\", image);\n\n        } catch (IOException e) {\n            log2.severe(e.getMessage());\n        }\n    }\n\n    after(GreyscaleImage input) returning() :\n        call(void CannyEdgeFilter*.apply2LayerFilter(GreyscaleImage))\n        && args(input)\n\t    && target(algorithms.imageProcessing.CannyEdgeFilter) {\n\n        log2.info(\"after CannyEdgeFilter*.apply2LayerFilter\");\n\n        Object[] args = (Object[])thisJoinPoint.getArgs();\n        GreyscaleImage output = (GreyscaleImage)args[0];\n\n        debugDisplay(output, \"after 2-threshold level filtering\");\n\n        try {\n            String dirPath = ResourceFinder.findDirectory(\"bin\");\n            ImageIOHelper.writeOutputImage(dirPath + \"\/filters2.png\", output);\n        } catch (IOException e) {\n            log2.severe(e.getMessage());\n        }\n    }\n\n    after(GreyscaleImage convolvedX, GreyscaleImage convolvedY) returning(GreyscaleImage output) :\n        call(public GreyscaleImage ImageProcesser.computeTheta(GreyscaleImage, GreyscaleImage))\n        && args(convolvedX, convolvedY)\n\t    && target(algorithms.imageProcessing.ImageProcesser) {\n\n        log2.info(\"after ImageProcesser.computeTheta\");\n\n        debugDisplay(output, \"theta\");\n\n        try {\n            String dirPath = ResourceFinder.findDirectory(\"bin\");\n            ImageIOHelper.writeOutputImage(dirPath + \"\/gTheta.png\", output);\n        } catch (IOException e) {\n            log2.severe(e.getMessage());\n        }\n    }\n\n    after(GreyscaleImage convolvedX, GreyscaleImage convolvedY) returning(GreyscaleImage output) :\n        call(public GreyscaleImage ImageProcesser.combineConvolvedImages(GreyscaleImage, GreyscaleImage))\n        && args(convolvedX, convolvedY)\n\t    && target(algorithms.imageProcessing.ImageProcesser) {\n\n        log2.info(\"after ImageProcesser*.combineConvolvedImages\");\n\n        Object[] args = (Object[])thisJoinPoint.getArgs();\n        GreyscaleImage cX = (GreyscaleImage)args[0];\n        GreyscaleImage cY = (GreyscaleImage)args[1];\n\n        debugDisplay(cX, \"gradient X\");\n        debugDisplay(cY, \"gradient Y\");\n        debugDisplay(output, \"gradient combined\");\n\n        try {\n            String dirPath = ResourceFinder.findDirectory(\"bin\");\n            ImageIOHelper.writeOutputImage(dirPath + \"\/gX.png\", cX);\n            ImageIOHelper.writeOutputImage(dirPath + \"\/gY.png\", cY);\n            ImageIOHelper.writeOutputImage(dirPath + \"\/gXY.png\", output);\n        } catch (IOException e) {\n            log2.severe(e.getMessage());\n        }\n    }\n   \n    before() \n        : call(void CurvatureScaleSpaceCornerDetector*.initialize() ) \n        && args() \n        && target(algorithms.imageProcessing.CurvatureScaleSpaceCornerDetector) {\n\n        Object obj = thisJoinPoint.getThis();\n\n        if (!(obj instanceof CurvatureScaleSpaceCornerDetector)) {\n            return;\n        }\n\n        CurvatureScaleSpaceCornerDetector instance = \n            (CurvatureScaleSpaceCornerDetector)obj;\n\n        if (!instance.getInitialized()) {\n            debugDisplay(instance.getImage(), \"original image\");\n        }\n    }\n\n    after(HistogramHolder h) returning(int[] peakAndMinIndexes) :\n        call(protected int[] CurvatureScaleSpaceCornerDetector.findFirstPeakAndMinimum(HistogramHolder))\n        && args(h) \n\t    && target(algorithms.imageProcessing.CurvatureScaleSpaceCornerDetector) { \t\t\n\n        Object[] args = (Object[])thisJoinPoint.getArgs();\n\n        HistogramHolder hist = (HistogramHolder)args[0];\n        \n        try {\n\n            float xMin = MiscMath.findMax(hist.getXHist());\n            float xMax = MiscMath.findMax(hist.getXHist());\n\n            float yMax = MiscMath.findMax(hist.getYHist());\n\n            if ((xMax > 0) && (yMax > 0)) {\n\n                plotter.addPlot(\n                    xMin, xMax, 0, yMax,\n                    hist.getXHist(), hist.getYHistFloat(), \n                    hist.getXErrors(), hist.getYErrors(), \n                    currentEdgeStr);\n\n                String filePath = plotter.writeFile(Integer.valueOf(10));\n            }\n\n            log2.info(currentEdgeStr + \") x=\" + Arrays.toString(hist.getXHist()));\n\n            log2.info(currentEdgeStr + \") y=\" + Arrays.toString(hist.getYHist()));\n\n        } catch(IOException e) {\n           log2.severe(e.getMessage());\n        }\n\t}\n\n    after() returning : \n        execution(protected void algorithms.imageProcessing.AbstractCurvatureScaleSpaceMapper+.extractEdgeContours()) {\n\n        Object obj = thisJoinPoint.getThis();\n\n        if (!(obj instanceof AbstractCurvatureScaleSpaceMapper)) {\n            return;\n        }\n\n        log2.info(\"==>in aspect of AbstractCurvatureScaleSpaceMapper\");\n\n        AbstractCurvatureScaleSpaceMapper instance = \n            (AbstractCurvatureScaleSpaceMapper)obj;\n\n        try {\n            List<PairIntArray> edges = instance.getEdges();\n\n            Image img3 = instance.getOriginalImage().copyImageToGreen();\n\n            debugDisplay(edges, \"edges extracted\", true, img3.getWidth(), \n                img3.getHeight());\n\n        } catch (IOException e) {\n            log2.severe(e.getMessage());\n        }\n    }\n\n    \/\/ for some reason, execution works here, but call does not\n    after() returning : \n\t    target(algorithms.imageProcessing.CurvatureScaleSpaceCornerDetector) \n        && execution(public void findCorners())\n    {\n    \n        Object obj = thisJoinPoint.getThis();\n\n        log2.info(\"after findCorners() \" + obj.getClass().getSimpleName());\n\n        if (!(obj instanceof CurvatureScaleSpaceCornerDetector)) {\n            return;\n        }\n\n        CurvatureScaleSpaceCornerDetector instance = \n            (CurvatureScaleSpaceCornerDetector)obj;\n\n        Image img3 = instance.getOriginalImage().copyImageToGreen();\n\n        List<PairIntArray> edges = instance.getEdgesInOriginalReferenceFrame();\n\n        PairIntArray corners = instance.getCornersInOriginalReferenceFrame();\n\n        try {\n            \/\/ multi-colored edges alone:\n            debugDisplay(edges, \"edges extracted\", true, img3.getWidth(), img3.getHeight());\n\n            for (PairIntArray edge : edges) {\n                ImageIOHelper.addCurveToImage(edge, img3, 0, 255, 255, 0);\n            }\n            ImageIOHelper.addCurveToImage(corners, img3, 1, 255, 0, 0);\n            debugDisplay(img3, \"original image w\/ edges and corners overplotted\");\n            String dirPath = ResourceFinder.findDirectory(\"bin\");\n            ImageIOHelper.writeOutputImage(\n                dirPath + \"\/lab_with_edges_corners.png\", img3);\n \n        } catch (IOException ex) {\n            throw new RuntimeException(\"ERROR: l298\" + ex.getMessage());\n        }\n    }\n\n    before(ScaleSpaceCurve scaleSpace, int edgeNumber, boolean rmFlseCrnrs) :\n        target(algorithms.imageProcessing.CurvatureScaleSpaceCornerDetector)\n        && call(protected PairFloatArray CurvatureScaleSpaceCornerDetector.findCornersInScaleSpaceMap(\n        ScaleSpaceCurve, int, boolean))\n        && args(scaleSpace, edgeNumber, rmFlseCrnrs) {\n\n        log2.info(\"before findCornersInScaleSpaceMap for edge \" \n            + Integer.toString(edgeNumber) + \":\");\n\n        Object[] args = (Object[])thisJoinPoint.getArgs();\n        Integer eNumber = (Integer)args[1];\n\n        currentEdgeStr = eNumber.toString();\n\n    }\n\n    after(ScaleSpaceCurve scaleSpace, int edgeNumber, boolean rmFlseCrnrs) \n        returning(PairFloatArray xy) :\n        target(algorithms.imageProcessing.CurvatureScaleSpaceCornerDetector)\n        && call(protected PairFloatArray CurvatureScaleSpaceCornerDetector.findCornersInScaleSpaceMap(\n        ScaleSpaceCurve, int, boolean))\n        && args(scaleSpace, edgeNumber, rmFlseCrnrs) {\n\n        log2.info(\"after findCornersInScaleSpaceMap for edge \" \n            + Integer.toString(edgeNumber) + \":\");\n\n        for (int i = 0; i < xy.getN(); i++) {\n            log2.info(String.format(\"(%f, %f)\", xy.getX(i), xy.getY(i)));\n        }\n\n    }\n\n    before() \n        : call(List<PairIntArray> EdgeExtractor*.findEdges() ) \n        && args() \n        && target(algorithms.imageProcessing.EdgeExtractor) {\n\n        log2.info(\"before EdgeExtractor*.findEdges()\");\n\n        Object obj = thisJoinPoint.getThis();\n\n        if (!(obj instanceof EdgeExtractor)) {\n            return;\n        }\n\n        EdgeExtractor instance = (EdgeExtractor)obj;\n\n        try {\n            String dirPath = ResourceFinder.findDirectory(\"bin\");\n\n            ImageIOHelper.writeOutputImage(dirPath + \"\/edges0.png\", \n                instance.getImage());\n\n            plotHistogram(instance.getImage(), \"edges before dfs\");\n\n        } catch (IOException ex) {\n\n            log2.severe(\"ERROR: l359\" + ex.getMessage());\n        }\n    }\n\n    before(ImageStatistics stats, HistogramHolder originalImageHistogram) \n        : call(int LowIntensityRemovalFilter*.determineLowThreshold( \n        ImageStatistics,  HistogramHolder))\n        && args(stats, originalImageHistogram) \n        && target(algorithms.imageProcessing.LowIntensityRemovalFilter) {\n\n        log2.info(\"before LowIntensityRemovalFilter*.determineLowThreshold\");\n\n        plotHistogram0(stats.getHistogram(),  \"border histogram\");\n    }\n\n    private int debugfindEdgeWithRange(List<PairIntArray> edges,\n        int xLo, int xHi, int yLo, int yHi) {\n\n        for (int i = 0; i < edges.size(); i++) {\n            boolean c = debugContainsAPoint(edges.get(i), xLo, xHi, yLo, yHi);\n            if (c) {\n                return i;\n            }\n        }\n        return -1;\n    }\n    private boolean debugContainsAPoint(PairIntArray edge, \n        int xLo, int xHi, int yLo, int yHi) {\n        for (int i = 0; i < edge.getN(); i++) {\n            int x = edge.getX(i);\n            int y = edge.getY(i);\n            if (x >= xLo && x <= xHi && y >= yLo && y <= yHi) {\n                return true;\n            }\n        }\n        return false;\n    }\n\n    private void debugDisplay(Image input, String label) throws IOException {\n     \n        ImageDisplayer.displayImage(label, input);\n    }\n \n    private void debugDisplay(List<PairIntArray> curves, String label,\n        boolean writeImage, int width, int height) throws IOException {\n        \n        log2.info(\"create multicolor curve debug image\");\n\n        Image img2 = new Image(width, height);\n\n        ImageIOHelper.addAlternatingColorCurvesToImage(curves, \"edges.png\",\n            writeImage, img2);        \n        \n        ImageDisplayer.displayImage(label, img2);\n       \n    }\n\n    public void debugDisplay(GreyscaleImage input, String label) {\n     \n        try {\n            ImageDisplayer.displayImage(label, input);\n\n        } catch (IOException e) {\n\n            log2.severe(e.getMessage());\n        }\n    }\n    \n    private void debugAddCurveToImage(float[] xPoints, float[] yPoints, \n        Image input, int nExtraForDot, int rClr, int gClr, int bClr) {\n        \n        for (int i = 0; i < xPoints.length; i++) {\n            int x = (int) xPoints[i];\n            int y = (int) yPoints[i];\n            \n            for (int dx = (-1*nExtraForDot); dx < (nExtraForDot + 1); dx++) {\n                float xx = x + dx;\n                if ((xx > -1) && (xx < (input.getWidth() - 1))) {\n                    for (int dy = (-1*nExtraForDot); dy < (nExtraForDot + 1); dy++) {\n                        float yy = y + dy;\n                        if ((yy > -1) && (yy < (input.getHeight() - 1))) {\n                            input.setRGB((int)xx, (int)yy, rClr, gClr, bClr);\n                        }\n                    }\n                }\n            }\n        }\n    }\n    \n    private void debugDisplayScaleSpaceImages(PairIntArray edge,\n        Map<SIGMA, ScaleSpaceCurve> map, GreyscaleImage img) {\n                \n        try {\n            \/\/plot the edge and all scale space images\n            Image debugImg = img.copyImageToGreen();\n            \n            ImageIOHelper.addCurveToImage(edge, debugImg, 0, 0, 255, 0);\n            \n\/\/the convolutions should be acting upon data that starts at (0,0)\n\/\/ and an offset applied?\n\/\/ check an edge which is near x=0 and y=0\n            \n            Iterator<Entry<SIGMA, ScaleSpaceCurve>> iter = map.entrySet().iterator();\n            while (iter.hasNext()) {\n                Entry<SIGMA, ScaleSpaceCurve> entry = iter.next();\n                ScaleSpaceCurve dss = entry.getValue();\n                ImageIOHelper.addCurveToImage(dss, debugImg, 0, 0, 0, 255);\n            }\n            \n            ImageDisplayer.displayImage(\"scale space images\", debugImg);\n                            \n            int z = 1;\n            \n        } catch (IOException ex) {\n            throw new RuntimeException(\"ERROR: l548\" + ex.getMessage());\n        }\n    }\n\n    private void debugDisplayScaleSpace(ScaleSpaceCurve maxScaleSpace, \n        List<Integer> maxCandidateCornerIndexes, PolygonAndPointPlotter plotter, \n        float[] xc, float[] yc, SIGMA sigma, int edgeNumber, \n        int width, int height) {\n        \n        float[] tCornersForPlot = new float[xc.length];\n        float[] kCornersForPlot = new float[xc.length];\n        for (int ii = 0; ii < maxCandidateCornerIndexes.size(); ii++) {\n            int idx = maxCandidateCornerIndexes.get(ii);\n            tCornersForPlot[ii] = maxScaleSpace.getT()[idx];\n            kCornersForPlot[ii] = maxScaleSpace.getK(idx);\n            if (kCornersForPlot[ii] < 0) {\n                kCornersForPlot[ii] *= -1;\n            }\n        }\n        try {\n            float[] tmpX = maxScaleSpace.getT();\n            float[] k = maxScaleSpace.getK();\n            float[] tmpk = Arrays.copyOf(k, k.length);\n            for (int ii = 1; ii < tmpk.length; ii++) {\n                if (tmpk[ii] < 0) {\n                    tmpk[ii] *= -1;\n                }\n            }\n            \n            plotter.addPlot(0.0f, 1.f, 0, MiscMath.findMax(tmpk), \n                tmpX, tmpk, tCornersForPlot, kCornersForPlot,\n                \"k for sigma=\" + sigma.toString() \n                + \" edge=\" + edgeNumber);\n\n            String filePath = plotter.writeFile();\n\n            Image img3 = new Image(width, height);\n\n            ImageIOHelper.addCurveToImage(maxScaleSpace, img3, 0, 255, 255, \n                255);\n\n            debugAddCurveToImage(xc, yc, img3, 1, 255, 0, 0);\n\n            ImageDisplayer.displayImage(\n                \"corner candidates (maxSigma=\" + sigma.toString() \n                + \")\", img3);\n\n        } catch (Exception e) {\n            throw new RuntimeException(\"ERROR: l595\" + e.getMessage());\n        }                \n    }\n\n    private void debugDisplay(ScaleSpaceCurve scaleSpace, List<Integer> \n        candidateCornerIndexes, String label, int width, int height) \n        throws IOException {\n        \n        Image img2 = new Image(width, height);\n        \n        ImageIOHelper.addCurveToImage(scaleSpace, img2, 0, 255, 255, 255);\n      \n        for (Integer idx : candidateCornerIndexes) {\n            float x = scaleSpace.getX(idx.intValue());\n            float y = scaleSpace.getY(idx.intValue());\n            \n            img2.setRGB((int)x, (int)y, 255, 0, 0);\n            \/\/ make a plus symbol because the dot is too small\n            for (int d = -1; d < 2; d++) {\n                float xx = x + d;\n                if ((xx > -1) && (xx < (width - 1))) {\n                    img2.setRGB((int)xx, (int)y, 255, 0, 0);\n                }\n            }\n            for (int d = -1; d < 2; d++) {\n                float yy = y + d;\n                if ((yy > -1) && (yy < (height - 1))) {\n                    img2.setRGB((int)x, (int)yy, 255, 0, 0);\n                }\n            }\n        }\n        \n        ImageDisplayer.displayImage(label, img2);\n    }\n      \n    public double debugAreaUnderTheCurve(float[] x, float[] y) {\n        \n        \/\/ using trapezoidal rule\n        \n        if (x.length == 0) {\n            return 0;\n        } else if (x.length == 1) {\n            \/\/ this isn't correct, but is fine for the one case it's used for\n            return (y[0]);\n        }\n        \n        double sum = 0;\n        \n        for (int i = 0; i < (x.length - 1); i++) {\n            float yTerm = y[i + 1] + y[i];\n            float xLen = x[i + 1] - x[i];\n            sum += (yTerm * xLen);\n        }\n        \n        sum *= 0.5;\n        \n        return sum;\n    }\n    \n    private void debugDisplay(PairIntArray edge, PairIntArray corners,\n        String label, int width, int height) throws IOException {\n        \n        Image img2 = new Image(width, height);\n        \n        ImageIOHelper.addCurveToImage(edge, img2, 0, 255, 255, 255);\n        \n        ImageIOHelper.addCurveToImage(corners, img2, 1, 255, 0, 0);\n        \n        ImageDisplayer.displayImage(label, img2);\n     \n        int z = 1;\n    }\n    \n    private void plotHistogram0(HistogramHolder h, String label) {\n                \n        float[] xh = h.getXHist();\n        float[] yh = h.getYHistFloat();\n        \n        float yMin = MiscMath.findMin(yh);\n        int yMaxIdx = MiscMath.findYMaxIndex(yh);\n        float yMax = yh[yMaxIdx];\n        \n        float xMin = MiscMath.findMin(xh);\n        float xMax = MiscMath.findMax(xh);        \n        \n        log2.info(\"MODE=\" + xh[yMaxIdx]);\n        \n        try {\n\n            PolygonAndPointPlotter plotter = new PolygonAndPointPlotter();\n            \n            plotter.addPlot(\n                xMin, xMax, yMin, yMax,\n                xh, yh, xh, yh, label);\n\n            String filePath = plotter.writeFile3();\n            \n            log2.info(\"created histogram at \" + filePath);\n            \n        } catch (IOException e) {\n            e.printStackTrace(); \n            log2.severe(\"ERROR while plotting histogram: \" + e.getMessage());\n        }\n    }\n\n    private void plotHistogram(GreyscaleImage img, String label) throws \n    IOException {\n        \n        float[] v = new float[img.getWidth() * img.getHeight()];\n        float[] ve = new float[v.length];\n        \n        int count = 0;\n        for (int i = 0; i < img.getWidth(); i++) {\n            for (int j = 0; j < img.getHeight(); j++) {\n                v[count] = img.getValue(i, j);\n                ve[count] = (float)Math.sqrt(v[count]);\n                count++;\n            }\n        }\n        \n        HistogramHolder h = Histogram.createSimpleHistogram(v, ve);\n        \/\/HistogramHolder h = Histogram.defaultHistogramCreator(v, ve);\n        \n        float[] xh = h.getXHist();\n        float[] xhe = h.getXErrors();\n        float[] yh = h.getYHistFloat();\n        float[] yhe = h.getYErrors();\n        int firstZero = -1;\n        for (int i = (yh.length - 1); i > -1; i--) {\n            if (yh[i] > 0) {\n                break;\n            } else {\n                firstZero = i;\n            }\n        }\n        if (firstZero > -1) {\n            int n = xh.length - firstZero;\n            xh = Arrays.copyOf(xh, n);\n            xhe = Arrays.copyOf(xhe, n);\n            yh = Arrays.copyOf(yh, n);\n            yhe = Arrays.copyOf(yhe, n);\n        }\n        \n        float xMax = MiscMath.findMax(xh);\n        float yMax = MiscMath.findMax(yh);\n        \n        int yMaxIdx = MiscMath.findYMaxIndex(yh);\n        yMax = yh[yMaxIdx + 3];\n        \n        PolygonAndPointPlotter plotter2 = new PolygonAndPointPlotter();\n        \n        plotter2.addPlot(0, xMax, 0, yMax, xh, yh, xhe, yhe, label);\n        \n        String filePath = plotter2.writeFile3();\n        \n        log2.info(\"filePath=\" + filePath);\n    }\n\n    public void printContents(ScaleSpaceCurveImage spaceImage) {\n        StringBuilder sb = new StringBuilder();\n        for (int i = 0; i < spaceImage.getImageSigmas().length; i++) {\n            sb.append(\"sigma=\").append(spaceImage.getImageSigmas()[i]).append(\": \");\n            float[] t = spaceImage.getScaleSpaceImage()[i];\n            for (int j = 0; j < t.length; j++) {\n                sb.append(\"t=\").append(t[j]).append(\" \");\n            }\n            sb.append(\"\\n\");\n        }\n        log2.info(sb.toString());\n    }\n   \n    public String printImage(ScaleSpaceCurveImage spaceImage, \n        PolygonAndPointPlotter plotterC, int fileNumber) {\n        \n        if (plotterC == null) {\n            return null;\n        }\n        int nTotalPoints = 0;\n        for (int i = 0; i < spaceImage.getImageSigmas().length; i++) {\n            float[] t = spaceImage.getScaleSpaceImage()[i];\n            nTotalPoints+= t.length;\n        }\n        \n        try {\n            int count = 0;\n            float[] x = new float[nTotalPoints];\n            float[] y = new float[x.length];\n            for (int i = 0; i < spaceImage.getImageSigmas().length; i++) {\n                float sigma = spaceImage.getImageSigmas()[i];\n                float[] t = spaceImage.getScaleSpaceImage()[i];\n                for (int j = 0; j < t.length; j++) {\n                    y[count] = sigma;\n                    x[count] = t[j];\n                    count++;\n                }\n            }\n            float xMin = 0;\n            float xMax = 1.0f;\n            float yMin = MiscMath.findMin(y);\n            if (yMin < 0) {\n                yMin *= 1.1;\n            } else {\n                yMin *= 0.9;\n            }\n            float yMax = MiscMath.findMax(y);\n\n            plotterC.addPlot(xMin, xMax,yMin, yMax, x, y, null, null,\n                \"\");\n\n            String filePathC = plotterC.writeFile(fileNumber);\n            \n            return filePathC;\n            \n        } catch(Exception e) {\n            log2.severe(e.getMessage());\n        }\n        \n        return null;\n    }\n}\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"d20edc7798a0d3bf300e60c5590ffb8e71f2ff70","subject":"fix syntax error","message":"fix syntax error\n","repos":"eigengo\/monitor,DataDog\/monitor,DataDog\/monitor,eigengo\/monitor","old_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/ActorCellMonitoringAspect.aj","new_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/ActorCellMonitoringAspect.aj","new_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.actor.*;\n\nimport java.util.ArrayList;\nimport java.util.List;\n\npublic aspect ActorCellMonitoringAspect extends AbstractMonitoringAspect {\n\n    \/\/ decide whether to include this ActorCell in our measurements\n    private boolean includeActorPath(ActorPath actorPath) {\n        if (this.includeSystemActors) return true;\n\n        String userOrSystem = actorPath.getElements().iterator().next();\n        return \"user\".equals(userOrSystem);\n    }\n\n    \/\/ get the tags for the cell\n    private String[] getTags(final ActorPath actorPath, final Actor actor) {\n        List<String> tags = new ArrayList<String>();\n\n        \/\/ TODO: Improve detection of routed actors. This relies only on the naming :(.\n        String lastPathElement = actorPath.elements().last();\n        if (lastPathElement.startsWith(\"$\")) {\n            \/\/ this is routed actor.\n            tags.add(actorPath.parent().toString());\n            if (this.includeRoutees) tags.add(actorPath.toString());\n        } else {\n            \/\/ there is no supervisor\n            tags.add(actorPath.toString());\n        }\n        if (actor != null) {\n            tags.add(String.format(\"akka:%s.%s\", actor.context().system().name(), actor.getClass().getCanonicalName()));\n        }\n\n        return tags.toArray(new String[tags.size()]);\n    }\n\n    Object around(ActorCell actorCell, Object msg) : Pointcuts.receiveMessage(actorCell, msg) {\n        final ActorPath actorPath = actorCell.self().path();\n        if (!includeActorPath(actorPath)) return proceed(actorCell, msg);\n\n        \/\/ we tag by actor name\n        final String[] tags = getTags(actorPath, actorCell.actor());\n\n        \/\/ record the queue size\n        counterInterface.recordGaugeValue(\"akka.queue.size\", actorCell.numberOfMessages(), tags);\n        \/\/ record the message, general and specific\n        counterInterface.incrementCounter(\"akka.actor.delivered\", tags);\n        counterInterface.incrementCounter(\"akka.actor.delivered.\" + msg.getClass().getSimpleName(), tags);\n\n        \/\/ measure the time. we're using the ``nanoTime`` call to access the high-precision timer.\n        \/\/ since we're not really interested in wall time, but just some increasing measure of\n        \/\/ elapsed time\n        Object result = null;\n        final long start = System.nanoTime();\n        \/\/ result will always be ``null``, because target returns ``Unit``\n        result = proceed(actorCell, msg);\n        \/\/ ns or \u00b5s is too fine. ms will do for now.\n        final long duration = (System.nanoTime() - start) \/ 1000000;\n\n        \/\/ record the actor duration\n        counterInterface.recordExecutionTime(\"akka.actor.duration\", (int)duration, tags);\n        \/\/ add gauge value of 1 with actor ref as tag, to provide 'number of actors' metric\n\/\/        counterInterface.gaugeValue(\"akka.actor.count\", tag);\n\n        \/\/ return null would do the trick, but we want to be _proper_.\n        return result;\n    }\n\n    before(ActorCell actorCell, Throwable failure) : Pointcuts.handleInvokeFailure(actorCell, failure) {\n        \/\/ record the error, general and specific\n        String[] tags = getTags(actorCell.self().path(), actorCell.actor());\n        counterInterface.incrementCounter(\"akka.actor.error\", tags);\n        counterInterface.incrementCounter(String.format(\"akka.actor.error.%s\", failure.getMessage()), tags);\n    }\n\n    before(Object event) : Pointcuts.eventStreamPublish(event) {\n        if (event instanceof UnhandledMessage) {\n            UnhandledMessage unhandledMessage = (UnhandledMessage)event;\n            String[] tags = getTags(unhandledMessage.recipient().path(), null);\n            counterInterface.incrementCounter(\"akka.actor.undelivered\", tags);\n            counterInterface.incrementCounter(\"akka.actor.undelivered.\" + unhandledMessage.getMessage().getClass().getSimpleName(), tags);\n        }\n    }\n\n\/\/    after() returning (ActorRef actor): execution(* akka.actor.ActorSystem.actorOf(..)) {\n\/\/        if (!includeActorPath(actor.path())) return;\n\/\/\n\/\/        final String tag = actor.path().root().toString();\n\/\/        counterInterface.incrementCounter(\"akka.actor.count\", tag);\n\/\/    }\n\/\/\n\/\/    after() returning (ActorRef actor): execution(* akka.actor.ActorCell.actorOf(..)) {\n\/\/        if (!includeActorPath(actor.path())) return;\n\/\/\n\/\/        final String tag = actor.path().root().toString();\n\/\/        counterInterface.incrementCounter(\"akka.actor.count\", tag);\n\/\/    }\n\/\/\n\/\/    after(ActorRef actor) : execution(* akka.actor.ActorCell.stop(..)) && args(actor) {\n\/\/        if (!includeActorPath(actor.path())) return;\n\/\/\n\/\/        final String tag = actor.path().root().toString();\n\/\/        counterInterface.decrementCounter(\"akka.actor.count\", tag);\n\/\/    }\n\n}","old_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.actor.*;\n\nimport java.util.ArrayList;\nimport java.util.List;\n\npublic aspect ActorCellMonitoringAspect extends AbstractMonitoringAspect {\n\n    \/\/ decide whether to include this ActorCell in our measurements\n    private boolean includeActorPath(ActorPath actorPath) {\n        if (this.includeSystemActors) return true;\n\n        String userOrSystem = actorPath.getElements().iterator().next();\n        return \"user\".equals(userOrSystem);\n    }\n\n    \/\/ get the tags for the cell\n    private String[] getTags(final ActorPath actorPath, final Actor actor) {\n        List<String> tags = new ArrayList<String>();\n\n        \/\/ TODO: Improve detection of routed actors. This relies only on the naming :(.\n        String lastPathElement = actorPath.elements().last();\n        if (lastPathElement.startsWith(\"$\")) {\n            \/\/ this is routed actor.\n            tags.add(actorPath.parent().toString());\n            if (this.includeRoutees) tags.add(actorPath.toString());\n        } else {\n            \/\/ there is no supervisor\n            tags.add(actorPath.toString());\n        }\n        if (actor != null) {\n            tags.add(String.format(\"akka:%s.%s\", actor.context().system().name(), actor.getClass().getCanonicalName()));\n        }\n\n        return tags.toArray(new String[tags.size()]);\n    }\n\n    Object around(ActorCell actorCell, Object msg) : Pointcuts.receiveMessage(actorCell, msg) {\n        final ActorPath actorPath = actorCell.self().path();\n        if (!includeActorPath(actorPath)) return proceed(actorCell, msg);\n\n        \/\/ we tag by actor name\n        final String[] tags = getTags(actorPath, actorCell.actor());\n\n        \/\/ record the queue size\n        counterInterface.recordGaugeValue(\"akka.queue.size\", actorCell.numberOfMessages(), tags);\n        \/\/ record the message, general and specific\n        counterInterface.incrementCounter(\"akka.actor.delivered\", tags);\n        counterInterface.incrementCounter(\"akka.actor.delivered.\" + msg.getClass().getSimpleName(), tags);\n\n        \/\/ measure the time. we're using the ``nanoTime`` call to access the high-precision timer.\n        \/\/ since we're not really interested in wall time, but just some increasing measure of\n        \/\/ elapsed time\n        Object result = null;\n        final long start = System.nanoTime();\n        \/\/ result will always be ``null``, because target returns ``Unit``\n        result = proceed(actorCell, msg);\n        \/\/ ns or \u00b5s is too fine. ms will do for now.\n        final long duration = (System.nanoTime() - start) \/ 1000000;\n\n        \/\/ record the actor duration\n        counterInterface.recordExecutionTime(\"akka.actor.duration\", (int)duration, tags);\n        \/\/ add gauge value of 1 with actor ref as tag, to provide 'number of actors' metric\n        counterInterface.gaugeValue(\"akka.actor.count\", tag)\n\n        \/\/ return null would do the trick, but we want to be _proper_.\n        return result;\n    }\n\n    before(ActorCell actorCell, Throwable failure) : Pointcuts.handleInvokeFailure(actorCell, failure) {\n        \/\/ record the error, general and specific\n        String[] tags = getTags(actorCell.self().path(), actorCell.actor());\n        counterInterface.incrementCounter(\"akka.actor.error\", tags);\n        counterInterface.incrementCounter(String.format(\"akka.actor.error.%s\", failure.getMessage()), tags);\n    }\n\n    before(Object event) : Pointcuts.eventStreamPublish(event) {\n        if (event instanceof UnhandledMessage) {\n            UnhandledMessage unhandledMessage = (UnhandledMessage)event;\n            String[] tags = getTags(unhandledMessage.recipient().path(), null);\n            counterInterface.incrementCounter(\"akka.actor.undelivered\", tags);\n            counterInterface.incrementCounter(\"akka.actor.undelivered.\" + unhandledMessage.getMessage().getClass().getSimpleName(), tags);\n        }\n    }\n\n\/\/    after() returning (ActorRef actor): execution(* akka.actor.ActorSystem.actorOf(..)) {\n\/\/        if (!includeActorPath(actor.path())) return;\n\/\/\n\/\/        final String tag = actor.path().root().toString();\n\/\/        counterInterface.incrementCounter(\"akka.actor.count\", tag);\n\/\/    }\n\/\/\n\/\/    after() returning (ActorRef actor): execution(* akka.actor.ActorCell.actorOf(..)) {\n\/\/        if (!includeActorPath(actor.path())) return;\n\/\/\n\/\/        final String tag = actor.path().root().toString();\n\/\/        counterInterface.incrementCounter(\"akka.actor.count\", tag);\n\/\/    }\n\/\/\n\/\/    after(ActorRef actor) : execution(* akka.actor.ActorCell.stop(..)) && args(actor) {\n\/\/        if (!includeActorPath(actor.path())) return;\n\/\/\n\/\/        final String tag = actor.path().root().toString();\n\/\/        counterInterface.decrementCounter(\"akka.actor.count\", tag);\n\/\/    }\n\n}","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"17a4325d0f4b1a416f98d5ca25061dd017ab41a0","subject":"prepaid & quota changes","message":"prepaid & quota changes\n","repos":"MCPTech\/mycp,MCPTech\/mycp","old_file":"src\/main\/java\/in\/mycp\/domain\/AddressInfoP_Roo_DbManaged.aj","new_file":"src\/main\/java\/in\/mycp\/domain\/AddressInfoP_Roo_DbManaged.aj","new_contents":"\/\/ WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.\n\/\/ You may push code into the target .java compilation unit if you wish to edit any member(s).\n\npackage in.mycp.domain;\n\nimport in.mycp.domain.AddressInfoP;\nimport in.mycp.domain.Asset;\nimport javax.persistence.Column;\nimport javax.persistence.JoinColumn;\nimport javax.persistence.ManyToOne;\n\nprivileged aspect AddressInfoP_Roo_DbManaged {\n    \n    @ManyToOne\n    @JoinColumn(name = \"asset\", referencedColumnName = \"id\")\n    private Asset AddressInfoP.asset;\n    \n    @Column(name = \"publicIp\", length = 45)\n    private String AddressInfoP.publicIp;\n    \n    @Column(name = \"instanceId\", length = 255)\n    private String AddressInfoP.instanceId;\n    \n    @Column(name = \"name\", length = 45)\n    private String AddressInfoP.name;\n    \n    @Column(name = \"reason\", length = 255)\n    private String AddressInfoP.reason;\n    \n    @Column(name = \"associated\")\n    private Boolean AddressInfoP.associated;\n    \n    @Column(name = \"status\", length = 45)\n    private String AddressInfoP.status;\n    \n    public Asset AddressInfoP.getAsset() {\n        return asset;\n    }\n    \n    public void AddressInfoP.setAsset(Asset asset) {\n        this.asset = asset;\n    }\n    \n    public String AddressInfoP.getPublicIp() {\n        return publicIp;\n    }\n    \n    public void AddressInfoP.setPublicIp(String publicIp) {\n        this.publicIp = publicIp;\n    }\n    \n    public String AddressInfoP.getInstanceId() {\n        return instanceId;\n    }\n    \n    public void AddressInfoP.setInstanceId(String instanceId) {\n        this.instanceId = instanceId;\n    }\n    \n    public String AddressInfoP.getName() {\n        return name;\n    }\n    \n    public void AddressInfoP.setName(String name) {\n        this.name = name;\n    }\n    \n    public String AddressInfoP.getReason() {\n        return reason;\n    }\n    \n    public void AddressInfoP.setReason(String reason) {\n        this.reason = reason;\n    }\n    \n    public Boolean AddressInfoP.getAssociated() {\n        return associated;\n    }\n    \n    public void AddressInfoP.setAssociated(Boolean associated) {\n        this.associated = associated;\n    }\n    \n    public String AddressInfoP.getStatus() {\n        return status;\n    }\n    \n    public void AddressInfoP.setStatus(String status) {\n        this.status = status;\n    }\n    \n}\n","old_contents":"\/\/ WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.\n\/\/ You may push code into the target .java compilation unit if you wish to edit any member(s).\n\npackage in.mycp.domain;\n\nimport in.mycp.domain.AddressInfoP;\nimport in.mycp.domain.Asset;\nimport javax.persistence.Column;\nimport javax.persistence.JoinColumn;\nimport javax.persistence.ManyToOne;\n\nprivileged aspect AddressInfoP_Roo_DbManaged {\n    \n    @ManyToOne\n    @JoinColumn(name = \"asset\", referencedColumnName = \"id\")\n    private Asset AddressInfoP.asset;\n    \n    @Column(name = \"publicIp\", length = 45)\n    private String AddressInfoP.publicIp;\n    \n    @Column(name = \"instanceId\", length = 45)\n    private String AddressInfoP.instanceId;\n    \n    @Column(name = \"name\", length = 45)\n    private String AddressInfoP.name;\n    \n    @Column(name = \"reason\", length = 255)\n    private String AddressInfoP.reason;\n    \n    @Column(name = \"associated\")\n    private Boolean AddressInfoP.associated;\n    \n    @Column(name = \"status\", length = 45)\n    private String AddressInfoP.status;\n    \n    public Asset AddressInfoP.getAsset() {\n        return asset;\n    }\n    \n    public void AddressInfoP.setAsset(Asset asset) {\n        this.asset = asset;\n    }\n    \n    public String AddressInfoP.getPublicIp() {\n        return publicIp;\n    }\n    \n    public void AddressInfoP.setPublicIp(String publicIp) {\n        this.publicIp = publicIp;\n    }\n    \n    public String AddressInfoP.getInstanceId() {\n        return instanceId;\n    }\n    \n    public void AddressInfoP.setInstanceId(String instanceId) {\n        this.instanceId = instanceId;\n    }\n    \n    public String AddressInfoP.getName() {\n        return name;\n    }\n    \n    public void AddressInfoP.setName(String name) {\n        this.name = name;\n    }\n    \n    public String AddressInfoP.getReason() {\n        return reason;\n    }\n    \n    public void AddressInfoP.setReason(String reason) {\n        this.reason = reason;\n    }\n    \n    public Boolean AddressInfoP.getAssociated() {\n        return associated;\n    }\n    \n    public void AddressInfoP.setAssociated(Boolean associated) {\n        this.associated = associated;\n    }\n    \n    public String AddressInfoP.getStatus() {\n        return status;\n    }\n    \n    public void AddressInfoP.setStatus(String status) {\n        this.status = status;\n    }\n    \n}\n","returncode":0,"stderr":"","license":"agpl-3.0","lang":"AspectJ"}
{"commit":"c991b4dfb33896c725bbf69fa9213839d6ec5d3e","subject":"attempt to fix rollback bug","message":"attempt to fix rollback bug\n","repos":"palava\/palava-jpa-aspectj","old_file":"src\/main\/java\/de\/cosmocode\/palava\/jpa\/aspectj\/EntityTransactionAspect.aj","new_file":"src\/main\/java\/de\/cosmocode\/palava\/jpa\/aspectj\/EntityTransactionAspect.aj","new_contents":"\/**\n * Copyright 2010 CosmoCode GmbH\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage de.cosmocode.palava.jpa.aspectj;\n\nimport javax.persistence.EntityManager;\nimport javax.persistence.EntityTransaction;\nimport javax.persistence.PersistenceException;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.gag.annotation.remark.Hack;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\nimport de.cosmocode.palava.jpa.Transactional;\n\npublic final aspect EntityTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(EntityTransactionAspect.class);\n\n    private Provider<EntityManager> currentManager;\n    \n    @Inject\n    public void setProvider(Provider<EntityManager> manager) {\n        this.currentManager = Preconditions.checkNotNull(manager, \"Manager\");\n    }\n    \n    pointcut transactional(): execution(@Transactional * *.*(..));\n\n    @SuppressWarnings(\"finally\")\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        final EntityManager manager = currentManager.get();\n        LOG.trace(\"Retrieved entitymanager {}\", manager);\n        final EntityTransaction tx = manager.getTransaction();\n        LOG.trace(\"Using transaction {}\", tx);\n        \n        final boolean local = !tx.isActive();\n        \n        if (local) {\n            LOG.debug(\"Beginning automatic transaction {}\", tx);\n            tx.begin();\n        } else {\n            LOG.trace(\"Transaction {} already active\", tx);\n        }\n        \n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (Exception e) {\n            try {\n                if (local && (tx.isActive() || tx.getRollbackOnly())) {\n                    LOG.debug(\"Rolling back local\/active transaction {}\", tx);\n                    tx.rollback();\n                } else if (!tx.getRollbackOnly()) {\n                    LOG.debug(\"Setting transaction {} as rollback only\", tx);\n                    tx.setRollbackOnly();\n                }\n            } catch (PersistenceException inner) {\n                LOG.error(\"Rollback failed\", inner);\n            } finally {\n                \/\/ hack to support throwing checked exceptions\n                return sneakyThrow(e);\n            }\n        }\n        \n        if (local && tx.isActive()) {\n            if (tx.getRollbackOnly()) {\n                LOG.debug(\"Rolling back marked transaction {}\", tx);\n                tx.rollback();\n            } else {\n                try {\n                    tx.commit();\n                    LOG.debug(\"Committed automatic transaction {}\", tx);\n                } catch (PersistenceException e) {\n                    if (tx.isActive()) {\n                        try {\n                            LOG.debug(\"Rolling back transaction {}\", tx);\n                            tx.rollback();\n                        } catch (PersistenceException inner) {\n                            LOG.error(\"Rollback failed\", inner);\n                        }\n                    }\n                    throw e;\n                }\n            }\n        } else {\n            LOG.trace(\"Not committing non-local transaction {}\", tx);\n        }\n        \n        return returnValue;\n    }\n    \n    @Hack(\"Why is this possible?\")\n    private Object sneakyThrow(Throwable t) {\n        this.<RuntimeException>doSneakyThrow(t);\n        return null;\n    }\n\n    @SuppressWarnings(\"unchecked\")\n    private <T extends Throwable> T doSneakyThrow(Throwable t) throws T {\n        throw (T) t;\n    }\n    \n}\n","old_contents":"\/**\n * Copyright 2010 CosmoCode GmbH\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage de.cosmocode.palava.jpa.aspectj;\n\nimport javax.persistence.EntityManager;\nimport javax.persistence.EntityTransaction;\nimport javax.persistence.PersistenceException;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.gag.annotation.remark.Hack;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\nimport de.cosmocode.palava.jpa.Transactional;\n\npublic final aspect EntityTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(EntityTransactionAspect.class);\n\n    private Provider<EntityManager> currentManager;\n    \n    @Inject\n    public void setProvider(Provider<EntityManager> manager) {\n        this.currentManager = Preconditions.checkNotNull(manager, \"Manager\");\n    }\n    \n    pointcut transactional(): execution(@Transactional * *.*(..));\n\n    @SuppressWarnings(\"finally\")\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        final EntityManager manager = currentManager.get();\n        LOG.trace(\"Retrieved entitymanager {}\", manager);\n        final EntityTransaction tx = manager.getTransaction();\n        LOG.trace(\"Using transaction {}\", tx);\n        \n        final boolean local = !tx.isActive();\n        \n        if (local) {\n            LOG.debug(\"Beginning automatic transaction {}\", tx);\n            tx.begin();\n        } else {\n            LOG.trace(\"Transaction {} already active\", tx);\n        }\n        \n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (Exception e) {\n            try {\n                if (local && (tx.isActive() || tx.getRollbackOnly())) {\n                    LOG.debug(\"Rolling back local\/active transaction {}\", tx);\n                    tx.rollback();\n                } else if (!tx.getRollbackOnly()) {\n                    LOG.debug(\"Setting transaction {} as rollback only\", tx);\n                    tx.setRollbackOnly();\n                }\n            } catch (PersistenceException inner) {\n                LOG.error(\"Rollback failed\", inner);\n            } finally {\n                \/\/ hack to support throwing checked exceptions\n                return sneakyThrow(e);\n            }\n        }\n        \n        if (local && tx.isActive()) {\n            if (tx.getRollbackOnly()) {\n                LOG.debug(\"Rolling back marked transaction {}\", tx);\n                tx.rollback();\n            } else {\n                try {\n                    tx.commit();\n                    LOG.debug(\"Committed automatic transaction {}\", tx);\n                } catch (PersistenceException e) {\n                    try {\n                        LOG.debug(\"Rolling back transaction {}\", tx);\n                        tx.rollback();\n                    } catch (PersistenceException inner) {\n                        LOG.error(\"Rollback failed\", inner);\n                    }\n                    throw e;\n                }\n            }\n        } else {\n            LOG.trace(\"Not committing non-local transaction {}\", tx);\n        }\n        \n        return returnValue;\n    }\n    \n    @Hack(\"Why is this possible?\")\n    private Object sneakyThrow(Throwable t) {\n        this.<RuntimeException>doSneakyThrow(t);\n        return null;\n    }\n\n    @SuppressWarnings(\"unchecked\")\n    private <T extends Throwable> T doSneakyThrow(Throwable t) throws T {\n        throw (T) t;\n    }\n    \n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"8527f87155599daee1d81f8cfbddc4ad965a7bc4","subject":"XWIKI-5725: Deprecate XWiki#parseMessage Fix aspect","message":"XWIKI-5725: Deprecate XWiki#parseMessage\nFix aspect\n\ngit-svn-id: d23d7a6431d93e1bdd218a46658458610974b053@33151 f329d543-caf0-0310-9063-dda96c69346f\n","repos":"pbondoer\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,xwiki\/xwiki-platform,xwiki\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform","old_file":"xwiki-core\/src\/main\/aspect\/compatibility\/com\/xpn\/xwiki\/XWikiCompatibilityAspect.aj","new_file":"xwiki-core\/src\/main\/aspect\/compatibility\/com\/xpn\/xwiki\/XWikiCompatibilityAspect.aj","new_contents":"\/*\n * See the NOTICE file distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This is free software; you can redistribute it and\/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF site: http:\/\/www.fsf.org.\n *\n *\/\npackage com.xpn.xwiki;\n\nimport com.xpn.xwiki.XWiki;\nimport com.xpn.xwiki.XWikiContext;\nimport com.xpn.xwiki.cache.api.XWikiCache;\nimport com.xpn.xwiki.cache.api.XWikiCacheService;\nimport com.xpn.xwiki.cache.api.internal.XWikiCacheServiceStub;\nimport com.xpn.xwiki.cache.api.internal.XWikiCacheStub;\n\nimport java.io.UnsupportedEncodingException;\nimport java.net.URLEncoder;\nimport java.util.HashMap;\nimport java.util.Map;\n\n\/**\n * Add a backward compatibility layer to the {@link com.xpn.xwiki.XWiki} class.\n * \n * @version $Id$\n *\/\npublic privileged aspect XWikiCompatibilityAspect\n{\n    private static Map XWiki.threadMap = new HashMap();\n\n    \/**\n     * Transform a text in a URL compatible text\n     *\n     * @param content text to transform\n     * @return encoded result\n     * @deprecated replaced by Util#encodeURI since 1.3M2\n     *\/\n    @Deprecated\n    public String XWiki.getURLEncoded(String content)\n    {\n        try {\n            return URLEncoder.encode(content, this.getEncoding());            \n        } catch (UnsupportedEncodingException e) {\n            return content;\n        }\n    }\n    \n    \/**\n     * @return true for multi-wiki\/false for mono-wiki\n     * @deprecated replaced by {@link XWiki#isVirtualMode()} since 1.4M1.\n     *\/\n    @Deprecated\n    public boolean XWiki.isVirtual()\n    {\n        return this.isVirtualMode();\n    }\n\n    \/**\n     * @deprecated Removed since it isn't used; since 1.5M1.\n     *\/\n    @Deprecated\n    public static Map XWiki.getThreadMap()\n    {\n        return XWiki.threadMap;\n    }\n\n    \/**\n     * @deprecated Removed since it isn't used; since 1.5M1.\n     *\/\n    @Deprecated\n    public static void XWiki.setThreadMap(Map threadMap)\n    {\n        XWiki.threadMap = threadMap;\n    }\n\n    \/**\n     * @return the cache service.\n     * @deprecated replaced by {@link XWiki#getCacheFactory(XWikiContext)} or\n     *             {@link XWiki#getLocalCacheFactory(XWikiContext)} since 1.5M2.\n     *\/\n    @Deprecated\n    public XWikiCacheService XWiki.getCacheService()\n    {\n        return new XWikiCacheServiceStub(getCacheFactory(), getLocalCacheFactory());\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getVirtualWikiCache(XWikiContext)} since 1.5M2.\n     *\/\n    @Deprecated\n    public XWikiCache XWiki.getVirtualWikiMap()\n    {\n        return new XWikiCacheStub(this.virtualWikiMap);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpaceCopyright(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebCopyright(XWikiContext context)\n    {\n        return this.getSpaceCopyright(context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, String defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, String, String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, String space, String defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, space, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsLong(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public long XWiki.getWebPreferenceAsLong(String preference, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsLong(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsLong(String, long, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public long XWiki.getWebPreferenceAsLong(String preference, long defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsLong(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsInt(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.getWebPreferenceAsInt(String preference, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsInt(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsInt(String, int, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.getWebPreferenceAsInt(String preference, int defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsInt(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#copySpaceBetweenWikis(String, String, String, String, XWikiContext)} since\n     *             2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.copyWikiWeb(String space, String sourceWiki, String targetWiki, String language, XWikiContext context)\n        throws XWikiException\n    {\n        return this.copySpaceBetweenWikis(space, sourceWiki, targetWiki, language, context);\n    }\n\n    \/**\n     * @deprecated replaced by\n     *             {@link XWiki#copySpaceBetweenWikis(String, String, String, String, boolean, XWikiContext)} since\n     *             2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.copyWikiWeb(String space, String sourceWiki, String targetWiki, String language, boolean clean,\n        XWikiContext context) throws XWikiException\n    {\n        return this.copySpaceBetweenWikis(space, sourceWiki, targetWiki, language, clean, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getDefaultSpace(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getDefaultWeb(XWikiContext context)\n    {\n        return this.getDefaultSpace(context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#skipDefaultSpaceInURLs(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public boolean XWiki.useDefaultWeb(XWikiContext context)\n    {\n        return this.skipDefaultSpaceInURLs(context);\n    }\n\n    \/**\n     * @deprecated use {@link XWikiMessageTool#get(String, List)} instead. You can access message tool using\n     *             {@link XWikiContext#getMessageTool()}.\n     *\/\n    @Deprecated\n    public String XWiki.getMessage(String item, XWikiContext context)\n    {\n        XWikiMessageTool msg = context.getMessageTool();\n        if (msg == null) {\n            return item;\n        } else {\n            return msg.get(item);\n        }\n    }\n\n    \/**\n     * @deprecated use {@link XWikiMessageTool#get(String, List)} instead. You can access message tool using\n     *             {@link XWikiContext#getMessageTool()}.\n     *\/\n    @Deprecated\n    public String XWiki.parseMessage(String id, XWikiContext context)\n    {\n        XWikiMessageTool msg = context.getMessageTool();\n\n        return parseContent(msg.get(id), context);\n    }\n\n    \/**\n     * @deprecated use {@link XWikiMessageTool#get(String, List)} instead. You can access message tool using\n     *             {@link XWikiContext#getMessageTool()}.\n     *\/\n    @Deprecated\n    public String XWiki.parseMessage(XWikiContext context)\n    {\n        String message = (String) context.get(\"message\");\n        if (message == null) {\n            return null;\n        }\n\n        return parseMessage(message, context);\n    }\n}\n","old_contents":"\/*\n * See the NOTICE file distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This is free software; you can redistribute it and\/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF site: http:\/\/www.fsf.org.\n *\n *\/\npackage com.xpn.xwiki;\n\nimport com.xpn.xwiki.XWiki;\nimport com.xpn.xwiki.XWikiContext;\nimport com.xpn.xwiki.cache.api.XWikiCache;\nimport com.xpn.xwiki.cache.api.XWikiCacheService;\nimport com.xpn.xwiki.cache.api.internal.XWikiCacheServiceStub;\nimport com.xpn.xwiki.cache.api.internal.XWikiCacheStub;\n\nimport java.io.UnsupportedEncodingException;\nimport java.net.URLEncoder;\nimport java.util.HashMap;\nimport java.util.Map;\n\n\/**\n * Add a backward compatibility layer to the {@link com.xpn.xwiki.XWiki} class.\n * \n * @version $Id$\n *\/\npublic privileged aspect XWikiCompatibilityAspect\n{\n    private static Map XWiki.threadMap = new HashMap();\n\n    \/**\n     * Transform a text in a URL compatible text\n     *\n     * @param content text to transform\n     * @return encoded result\n     * @deprecated replaced by Util#encodeURI since 1.3M2\n     *\/\n    @Deprecated\n    public String XWiki.getURLEncoded(String content)\n    {\n        try {\n            return URLEncoder.encode(content, this.getEncoding());            \n        } catch (UnsupportedEncodingException e) {\n            return content;\n        }\n    }\n    \n    \/**\n     * @return true for multi-wiki\/false for mono-wiki\n     * @deprecated replaced by {@link XWiki#isVirtualMode()} since 1.4M1.\n     *\/\n    @Deprecated\n    public boolean XWiki.isVirtual()\n    {\n        return this.isVirtualMode();\n    }\n\n    \/**\n     * @deprecated Removed since it isn't used; since 1.5M1.\n     *\/\n    @Deprecated\n    public static Map XWiki.getThreadMap()\n    {\n        return XWiki.threadMap;\n    }\n\n    \/**\n     * @deprecated Removed since it isn't used; since 1.5M1.\n     *\/\n    @Deprecated\n    public static void XWiki.setThreadMap(Map threadMap)\n    {\n        XWiki.threadMap = threadMap;\n    }\n\n    \/**\n     * @return the cache service.\n     * @deprecated replaced by {@link XWiki#getCacheFactory(XWikiContext)} or\n     *             {@link XWiki#getLocalCacheFactory(XWikiContext)} since 1.5M2.\n     *\/\n    @Deprecated\n    public XWikiCacheService XWiki.getCacheService()\n    {\n        return new XWikiCacheServiceStub(getCacheFactory(), getLocalCacheFactory());\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getVirtualWikiCache(XWikiContext)} since 1.5M2.\n     *\/\n    @Deprecated\n    public XWikiCache XWiki.getVirtualWikiMap()\n    {\n        return new XWikiCacheStub(this.virtualWikiMap);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpaceCopyright(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebCopyright(XWikiContext context)\n    {\n        return this.getSpaceCopyright(context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, String defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, String, String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, String space, String defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, space, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsLong(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public long XWiki.getWebPreferenceAsLong(String preference, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsLong(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsLong(String, long, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public long XWiki.getWebPreferenceAsLong(String preference, long defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsLong(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsInt(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.getWebPreferenceAsInt(String preference, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsInt(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsInt(String, int, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.getWebPreferenceAsInt(String preference, int defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsInt(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#copySpaceBetweenWikis(String, String, String, String, XWikiContext)} since\n     *             2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.copyWikiWeb(String space, String sourceWiki, String targetWiki, String language, XWikiContext context)\n        throws XWikiException\n    {\n        return this.copySpaceBetweenWikis(space, sourceWiki, targetWiki, language, context);\n    }\n\n    \/**\n     * @deprecated replaced by\n     *             {@link XWiki#copySpaceBetweenWikis(String, String, String, String, boolean, XWikiContext)} since\n     *             2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.copyWikiWeb(String space, String sourceWiki, String targetWiki, String language, boolean clean,\n        XWikiContext context) throws XWikiException\n    {\n        return this.copySpaceBetweenWikis(space, sourceWiki, targetWiki, language, clean, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getDefaultSpace(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getDefaultWeb(XWikiContext context)\n    {\n        return this.getDefaultSpace(context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#skipDefaultSpaceInURLs(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public boolean XWiki.useDefaultWeb(XWikiContext context)\n    {\n        return this.skipDefaultSpaceInURLs(context);\n    }\n\n    \/**\n     * @deprecated use {@link XWikiMessageTool#get(String, List)} instead. You can access message tool using\n     *             {@link XWikiContext#getMessageTool()}.\n     *\/\n    @Deprecated\n    public String getMessage(String item, XWikiContext context)\n    {\n        XWikiMessageTool msg = context.getMessageTool();\n        if (msg == null) {\n            return item;\n        } else {\n            return msg.get(item);\n        }\n    }\n\n    \/**\n     * @deprecated use {@link XWikiMessageTool#get(String, List)} instead. You can access message tool using\n     *             {@link XWikiContext#getMessageTool()}.\n     *\/\n    @Deprecated\n    public String parseMessage(String id, XWikiContext context)\n    {\n        XWikiMessageTool msg = context.getMessageTool();\n\n        return parseContent(msg.get(id), context);\n    }\n\n    \/**\n     * @deprecated use {@link XWikiMessageTool#get(String, List)} instead. You can access message tool using\n     *             {@link XWikiContext#getMessageTool()}.\n     *\/\n    @Deprecated\n    public String parseMessage(XWikiContext context)\n    {\n        String message = (String) context.get(\"message\");\n        if (message == null) {\n            return null;\n        }\n\n        return parseMessage(message, context);\n    }\n}\n","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"951f154e587bc946a3730cabaf4aace2ced6d2a3","subject":"Included ThreadPoolExecutor.","message":"Included ThreadPoolExecutor.\n","repos":"eigengo\/monitor,DataDog\/monitor,eigengo\/monitor,DataDog\/monitor","old_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/DispatcherMonitoringAspect.aj","new_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/DispatcherMonitoringAspect.aj","new_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.actor.ActorCell;\nimport org.eigengo.monitor.agent.AgentConfiguration;\nimport org.eigengo.monitor.output.CounterInterface;\nimport scala.concurrent.forkjoin.ForkJoinPool;\n\nimport java.util.Map;\nimport java.util.concurrent.ConcurrentHashMap;\nimport java.util.concurrent.ExecutorService;\nimport java.util.concurrent.ThreadPoolExecutor;\n\n\/**\n * Monitors the performance of the ``ForkJoinPool``. This will need much more tidying up, but it\n * outlines the strategy.\n *\n * The aspect contains advices that will--in the future--monitor the performance of all types of\n * thread pools, giving the users the insight into the threading in their actor systems.\n *\/\npublic aspect DispatcherMonitoringAspect extends AbstractMonitoringAspect {\n    private final CounterInterface counterInterface;\n    private final DispatcherTagger tagger;\n\n    \/\/ this is really icky, but it replaces the failing cflowbelow pointcut\n    private final Map<Long, String[]> actorCellCflowTags = new ConcurrentHashMap<Long, String[]>();\n\n    \/**\n     * Constructs this aspects, loads its configuration and instantiates the {@code counterInterface}.\n     *\/\n    public DispatcherMonitoringAspect() {\n        AgentConfiguration<AkkaAgentConfiguration> configuration = getAgentConfiguration(\"akka\", AkkaAgentConfigurationJapi.apply());\n        this.counterInterface = createCounterInterface(configuration.common());\n        this.tagger = new DispatcherTagger(configuration.agent().includeRoutees());\n    }\n\n    pointcut messageDispatcherDispatch(ActorCell actorCell) : execution(* akka.dispatch.MessageDispatcher+.dispatch(..)) && args(actorCell, *);\n\n    before(ActorCell actorCell) : messageDispatcherDispatch(actorCell) {\n        final String[] tags = this.tagger.getTags(actorCell);\n        this.actorCellCflowTags.put(Thread.currentThread().getId(), tags);\n    }\n\n    \/**\n     * Advises the ``execute`` method of an ``ExecutorService``, and then branches depending on the\n     * exact type of the {@code ExecutorService}. This is slightly better option than having multiple\n     * advices for the concrete {@code ExecutorService}s at the moment.\n     *\n     * Ideally, we would like to use <code>cflowbelow<\/code> pointcut expression, but that fails\n     * in the LTW stage with <code>NoSuchFieldError<\/code>, because the control flow stack field\n     * does not get properly generated.\n     *\/\n    before(ExecutorService es) : call(* java.util.concurrent.ExecutorService+.execute(..)) && target(es) {\n        final String[] tags = this.actorCellCflowTags.get(Thread.currentThread().getId());\n        if (tags == null) {\n            \/\/ this is execute outside the ActorCell.dispatch cflow. We don't care about that.\n            return;\n        }\n\n        if (es instanceof ForkJoinPool) forkJoinPool((ForkJoinPool)es, tags);\n        else if (es instanceof ThreadPoolExecutor) threadPoolExecutor((ThreadPoolExecutor)es, tags);\n    }\n\n    private void forkJoinPool(ForkJoinPool es, String[] tags) {\n        this.counterInterface.recordGaugeValue(Aspects.activeThreadCount(), es.getActiveThreadCount(), tags);\n        this.counterInterface.recordGaugeValue(Aspects.runningThreadCount(), es.getRunningThreadCount(), tags);\n\n        this.counterInterface.recordGaugeValue(Aspects.poolSize(), es.getPoolSize(), tags);\n        this.counterInterface.recordGaugeValue(Aspects.queuedTaskCount(), (int) es.getQueuedTaskCount(), tags);\n    }\n\n    private void threadPoolExecutor(ThreadPoolExecutor es, String[] tags) {\n        this.counterInterface.recordGaugeValue(Aspects.activeThreadCount(), es.getActiveCount(), tags);\n        this.counterInterface.recordGaugeValue(Aspects.runningThreadCount(), es.getActiveCount(), tags);\n\n        this.counterInterface.recordGaugeValue(Aspects.poolSize(), es.getPoolSize(), tags);\n        this.counterInterface.recordGaugeValue(Aspects.queuedTaskCount(), es.getQueue().size(), tags);\n    }\n\n}\n","old_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.actor.ActorCell;\nimport org.eigengo.monitor.agent.AgentConfiguration;\nimport org.eigengo.monitor.output.CounterInterface;\nimport scala.concurrent.forkjoin.ForkJoinPool;\n\nimport java.util.Map;\nimport java.util.concurrent.ConcurrentHashMap;\n\n\/**\n * Monitors the performance of the ``ForkJoinPool``. This will need much more tidying up, but it\n * outlines the strategy.\n *\n * The aspect contains advices that will--in the future--monitor the performance of all types of\n * thread pools, giving the users the insight into the threading in their actor systems.\n *\/\npublic aspect DispatcherMonitoringAspect extends AbstractMonitoringAspect {\n    private final CounterInterface counterInterface;\n    private final DispatcherTagger tagger;\n\n    \/\/ this is really icky, but it replaces the failing cflowbelow pointcut\n    private final Map<Long, String[]> actorCellCflowTags = new ConcurrentHashMap<Long, String[]>();\n\n    \/**\n     * Constructs this aspects, loads its configuration and instantiates the {@code counterInterface}.\n     *\/\n    public DispatcherMonitoringAspect() {\n        AgentConfiguration<AkkaAgentConfiguration> configuration = getAgentConfiguration(\"akka\", AkkaAgentConfigurationJapi.apply());\n        this.counterInterface = createCounterInterface(configuration.common());\n        this.tagger = new DispatcherTagger(configuration.agent().includeRoutees());\n    }\n\n    pointcut messageDispatcherDispatch(ActorCell actorCell) : execution(* akka.dispatch.MessageDispatcher+.dispatch(..)) && args(actorCell, *);\n\n    before(ActorCell actorCell) : messageDispatcherDispatch(actorCell) {\n        final String[] tags = this.tagger.getTags(actorCell);\n        this.actorCellCflowTags.put(Thread.currentThread().getId(), tags);\n    }\n\n    \/**\n     * Advises the ``execute`` method of an ``ExecutorService`` if that executor service is the\n     * ``ForkJoinPool``.\n     *\n     * Ideally, we would like to use <code>cflowbelow<\/code> pointcut expression, but that fails\n     * in the LTW stage with <code>NoSuchFieldError<\/code>\n     *\/\n    before(ForkJoinPool es) : call(* java.util.concurrent.ExecutorService+.execute(..)) && target(es) {\n        final String[] tags = this.actorCellCflowTags.get(Thread.currentThread().getId());\n        if (tags == null) {\n            \/\/ this is execute without ActorCell.dispatch. We don't care about that.\n            return;\n        }\n        this.counterInterface.recordGaugeValue(Aspects.activeThreadCount(), es.getActiveThreadCount(), tags);\n        this.counterInterface.recordGaugeValue(Aspects.runningThreadCount(), es.getRunningThreadCount(), tags);\n\n        this.counterInterface.recordGaugeValue(Aspects.poolSize(), es.getPoolSize(), tags);\n        this.counterInterface.recordGaugeValue(Aspects.queuedTaskCount(), (int) es.getQueuedTaskCount(), tags);\n    }\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"c02bf89bb4035a5ac625b4639ec49384a0403ef9","subject":"* change poincuts visible","message":"* change poincuts visible","repos":"agentlab\/ru.agentlab.maia","old_file":"plugins\/ru.agentlab.maia.context\/aj-src\/ru\/agentlab\/maia\/context\/aj\/AMaiaContext.aj","new_file":"plugins\/ru.agentlab.maia.context\/aj-src\/ru\/agentlab\/maia\/context\/aj\/AMaiaContext.aj","new_contents":"package ru.agentlab.maia.context.aj;\n\nimport ru.agentlab.maia.context.IMaiaContext;\n\n\/**\n * Abstract aspect with pointcuts of {@link IMaiaContext} methods\n * \n * @author Shishkin Dmitriy\n *\n *\/\npublic abstract aspect AMaiaContext {\n\n\t\/**\n\t * When actual IMaiaContext object is created\n\t *\/\n\tpublic pointcut onConstruct() : \n\t\texecution(IMaiaContext+.new(..));\n\n\t\/**\n\t * When {@link IMaiaContext} get service object by string identifier\n\t * \n\t * @param context\n\t *            - current context\n\t * @param id\n\t *            - string identifier of context service\n\t *\/\n\tpublic pointcut onGetByString(IMaiaContext context, String id) : \n\t\texecution(Object IMaiaContext+.get(String)) && \n\t\ttarget(context) && \n\t\targs(id);\n\n\t\/**\n\t * When {@link IMaiaContext} get service object by it's type\n\t * \n\t * @param context\n\t *            - current context\n\t * @param id\n\t *            - type of context service\n\t *\/\n\tpublic pointcut onGetByClass(IMaiaContext context, Class<?> id) : \n\t\texecution(Object IMaiaContext+.get(Class)) && \n\t\ttarget(context) && \n\t\targs(id);\n\n\t\/**\n\t * When {@link IMaiaContext} set service object by string identifier\n\t * \n\t * @param context\n\t *            - current context\n\t * @param id\n\t *            - string identifier of context service\n\t * @param obj\n\t *            - service object\n\t *\/\n\tpublic pointcut onSetByString(IMaiaContext context, String id, Object obj) : \n\t\texecution(void IMaiaContext+.set(String, Object)) && \n\t\ttarget(context) && \n\t\targs(id, obj);\n\n\t\/**\n\t * When {@link IMaiaContext} set service object by it's type\n\t * \n\t * @param context\n\t *            - current context\n\t * @param id\n\t *            - type of context service\n\t * @param obj\n\t *            - service object\n\t *\/\n\tpublic pointcut onSetByClass(IMaiaContext context, Class<?> id,\n\t\t\tObject obj) : \n\t\texecution(void IMaiaContext+.set(Class, Object)) && \n\t\ttarget(context) && \n\t\targs(id, obj);\n\n\t\/**\n\t * When {@link IMaiaContext} get service object locally by string identifier\n\t * \n\t * @param context\n\t *            - current context\n\t * @param id\n\t *            - string identifier of context service\n\t *\/\n\tpublic pointcut onGetLocalByString(IMaiaContext context, String id) : \n\t\texecution(Object IMaiaContext+.getLocal(String)) && \n\t\ttarget(context) && \n\t\targs(id);\n\n\t\/**\n\t * When {@link IMaiaContext} get service object locally by it's type\n\t * \n\t * @param context\n\t *            - current context\n\t * @param id\n\t *            - type of context service\n\t *\/\n\tpublic pointcut onGetLocalByClass(IMaiaContext context, Class<?> id) : \n\t\texecution(Object IMaiaContext+.getLocal(Class)) && \n\t\ttarget(context) && \n\t\targs(id);\n\n\t\/**\n\t * When {@link IMaiaContext} remove service object by string identifier\n\t * \n\t * @param context\n\t *            - current context\n\t * @param id\n\t *            - string identifier of context service to be removed\n\t *\/\n\tpublic pointcut onRemoveByString(IMaiaContext context, String id) : \n\t\texecution(void IMaiaContext+.remove(String)) && \n\t\ttarget(context) && \n\t\targs(id);\n\n\t\/**\n\t * When {@link IMaiaContext} remove service object by it's type\n\t * \n\t * @param context\n\t *            - current context\n\t * @param id\n\t *            - type of context service\n\t *\/\n\tpublic pointcut onRemoveByClass(IMaiaContext context, Class<?> id) : \n\t\texecution(void IMaiaContext+.remove(Class)) && \n\t\ttarget(context) && \n\t\targs(id);\n\n\t\/**\n\t * When {@link IMaiaContext} retrieve all it's childs contexts\n\t * \n\t * @param context\n\t *            - current context\n\t *\/\n\tpublic pointcut onGetChilds(IMaiaContext context) : \n\t\texecution(Iterable<IMaiaContext>  IMaiaContext+.getChilds()) && \n\t\ttarget(context);\n\n\t\/**\n\t * When {@link IMaiaContext} retrieve parent context\n\t * \n\t * @param context\n\t *            - current context\n\t *\/\n\tpublic pointcut onGetParent(IMaiaContext context) : \n\t\texecution(IMaiaContext IMaiaContext+.getParent(..)) && \n\t\ttarget(context);\n\n}","old_contents":"package ru.agentlab.maia.context.aj;\n\nimport ru.agentlab.maia.context.IMaiaContext;\n\n\/**\n * Abstract aspect with pointcuts of {@link IMaiaContext} methods\n * \n * @author Shishkin Dmitriy\n *\n *\/\npublic abstract aspect AMaiaContext {\n\n\t\/**\n\t * When actual IMaiaContext object is created\n\t *\/\n\tpublic pointcut onConstruct() : \n\t\texecution(IMaiaContext+.new(..));\n\n\t\/**\n\t * When {@link IMaiaContext} get service object by string identifier\n\t * \n\t * @param context\n\t *            - current context\n\t * @param id\n\t *            - string identifier of context service\n\t *\/\n\tpublic pointcut onGetByString(IMaiaContext context, String id) : \n\t\texecution(Object IMaiaContext+.get(String)) && \n\t\ttarget(context) && \n\t\targs(id);\n\n\t\/**\n\t * When {@link IMaiaContext} get service object by it's type\n\t * \n\t * @param context\n\t *            - current context\n\t * @param id\n\t *            - type of context service\n\t *\/\n\tpublic pointcut onGetByClass(IMaiaContext context, Class<?> id) : \n\t\texecution(Object IMaiaContext+.get(Class)) && \n\t\ttarget(context) && \n\t\targs(id);\n\n\t\/**\n\t * When {@link IMaiaContext} set service object by string identifier\n\t * \n\t * @param context\n\t *            - current context\n\t * @param id\n\t *            - string identifier of context service\n\t * @param obj\n\t *            - service object\n\t *\/\n\tprotected pointcut onSetByString(IMaiaContext context, String id, Object obj) : \n\t\texecution(void IMaiaContext+.set(String, Object)) && \n\t\ttarget(context) && \n\t\targs(id, obj);\n\n\t\/**\n\t * When {@link IMaiaContext} set service object by it's type\n\t * \n\t * @param context\n\t *            - current context\n\t * @param id\n\t *            - type of context service\n\t * @param obj\n\t *            - service object\n\t *\/\n\tprotected pointcut onSetByClass(IMaiaContext context, Class<?> id,\n\t\t\tObject obj) : \n\t\texecution(void IMaiaContext+.set(Class, Object)) && \n\t\ttarget(context) && \n\t\targs(id, obj);\n\n\t\/**\n\t * When {@link IMaiaContext} get service object locally by string identifier\n\t * \n\t * @param context\n\t *            - current context\n\t * @param id\n\t *            - string identifier of context service\n\t *\/\n\tpublic pointcut onGetLocalByString(IMaiaContext context, String id) : \n\t\texecution(Object IMaiaContext+.getLocal(String)) && \n\t\ttarget(context) && \n\t\targs(id);\n\n\t\/**\n\t * When {@link IMaiaContext} get service object locally by it's type\n\t * \n\t * @param context\n\t *            - current context\n\t * @param id\n\t *            - type of context service\n\t *\/\n\tpublic pointcut onGetLocalByClass(IMaiaContext context, Class<?> id) : \n\t\texecution(Object IMaiaContext+.getLocal(Class)) && \n\t\ttarget(context) && \n\t\targs(id);\n\n\t\/**\n\t * When {@link IMaiaContext} remove service object by string identifier\n\t * \n\t * @param context\n\t *            - current context\n\t * @param id\n\t *            - string identifier of context service to be removed\n\t *\/\n\tpublic pointcut onRemoveByString(IMaiaContext context, String id) : \n\t\texecution(void IMaiaContext+.remove(String)) && \n\t\ttarget(context) && \n\t\targs(id);\n\n\t\/**\n\t * When {@link IMaiaContext} remove service object by it's type\n\t * \n\t * @param context\n\t *            - current context\n\t * @param id\n\t *            - type of context service\n\t *\/\n\tpublic pointcut onRemoveByClass(IMaiaContext context, Class<?> id) : \n\t\texecution(void IMaiaContext+.remove(Class)) && \n\t\ttarget(context) && \n\t\targs(id);\n\n\t\/**\n\t * When {@link IMaiaContext} retrieve all it's childs contexts\n\t * \n\t * @param context\n\t *            - current context\n\t *\/\n\tpublic pointcut onGetChilds(IMaiaContext context) : \n\t\texecution(Iterable<IMaiaContext>  IMaiaContext+.getChilds()) && \n\t\ttarget(context);\n\n\t\/**\n\t * When {@link IMaiaContext} retrieve parent context\n\t * \n\t * @param context\n\t *            - current context\n\t *\/\n\tpublic pointcut onGetParent(IMaiaContext context) : \n\t\texecution(IMaiaContext IMaiaContext+.getParent(..)) && \n\t\ttarget(context);\n\n}","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"bbbe25a0b8855f815465d2269950c13a22b2ee12","subject":"syso on Aspect","message":"syso on Aspect","repos":"authzforce\/core,authzforce\/core,authzforce\/core","old_file":"src\/main\/java\/com\/thalesgroup\/authzforce\/audit\/aspect\/AuditAspect.aj","new_file":"src\/main\/java\/com\/thalesgroup\/authzforce\/audit\/aspect\/AuditAspect.aj","new_contents":"\/**\r\n * Copyright (C) 2011-2013 Thales Services - ThereSIS - All rights reserved.\r\n *\r\n * Licensed under the Apache License, Version 2.0 (the \"License\");\r\n *    you may not use this file except in compliance with the License.\r\n *    You may obtain a copy of the License at\r\n *\r\n *        http:\/\/www.apache.org\/licenses\/LICENSE-2.0\r\n *\r\n *    Unless required by applicable law or agreed to in writing, software\r\n *    distributed under the License is distributed on an \"AS IS\" BASIS,\r\n *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n *    See the License for the specific language governing permissions and\r\n *    limitations under the License.\r\n *\/\r\npackage com.thalesgroup.authzforce.audit.aspect;\r\n\r\nimport java.io.StringWriter;\r\nimport java.net.URI;\r\nimport java.text.DateFormat;\r\nimport java.text.SimpleDateFormat;\r\n\r\nimport javax.xml.bind.JAXBContext;\r\nimport javax.xml.bind.JAXBException;\r\n\r\nimport oasis.names.tc.xacml._3_0.core.schema.wd_17.Attribute;\r\nimport oasis.names.tc.xacml._3_0.core.schema.wd_17.AttributeValueType;\r\nimport oasis.names.tc.xacml._3_0.core.schema.wd_17.Policy;\r\nimport oasis.names.tc.xacml._3_0.core.schema.wd_17.Result;\r\nimport oasis.names.tc.xacml._3_0.core.schema.wd_17.Rule;\r\n\r\nimport org.aspectj.lang.JoinPoint;\r\nimport org.aspectj.lang.annotation.AfterReturning;\r\nimport org.aspectj.lang.annotation.Aspect;\r\nimport org.aspectj.lang.annotation.Pointcut;\r\nimport org.slf4j.Logger;\r\nimport org.slf4j.LoggerFactory;\r\n\r\nimport com.sun.xacml.BasicEvaluationCtx;\r\nimport com.sun.xacml.attr.DateTimeAttribute;\r\nimport com.sun.xacml.attr.xacmlv3.AttributeValue;\r\nimport com.sun.xacml.cond.xacmlv3.EvaluationResult;\r\nimport com.thalesgroup.authzforce.audit.AttributesResolved;\r\nimport com.thalesgroup.authzforce.audit.AuditLogs;\r\nimport com.thalesgroup.authzforce.audit.annotations.Audit;\r\nimport com.thalesgroup.authzforce.audit.schema.pdp.AuditLog;\r\nimport com.thalesgroup.authzforce.audit.schema.pdp.AuditedPolicy;\r\nimport com.thalesgroup.authzforce.audit.schema.pdp.AuditedResult;\r\nimport com.thalesgroup.authzforce.audit.schema.pdp.AuditedRule;\r\nimport com.thalesgroup.authzforce.xacml.schema.XACMLAttributeId;\r\nimport com.thalesgroup.authzforce.xacml.schema.XACMLDatatypes;\r\n\r\n@Aspect\r\npublic class AuditAspect {\r\n\r\n\tprivate static final Logger LOGGER = LoggerFactory\r\n\t\t\t.getLogger(AuditAspect.class);\r\n\tprivate static final DateFormat dateFormat = new SimpleDateFormat(\r\n\t\t\t\"dd-MM-yyyy HH:mm:ss.SSSSSSSSS\");\r\n\tprivate static final DateFormat dateFormatWOoNano = new SimpleDateFormat(\r\n\t\t\t\"dd-MM-yyyy HH:mm:ss\");\r\n\r\n\t@Pointcut(\"execution (@com.thalesgroup.authzforce.audit.annotations * *.*(..))\")\r\n\tpublic void searchAnnotation() {\r\n\r\n\t}\r\n\r\n\t@AfterReturning(value = \"@annotation(annotation)\", returning = \"result\")\r\n\tpublic void doAuditLog(Audit annotation, JoinPoint jp, Object result) {\r\n\t\tswitch (annotation.type()) {\r\n\t\tcase RULE:\r\n\t\t\tAuditLog audit = new AuditLog();\r\n\t\t\tAuditedRule auditedRule = new AuditedRule();\r\n\t\t\tauditedRule.setId(((Rule) jp.getTarget()).getRuleId());\r\n\t\t\tauditedRule.setResult(AuditedResult.fromValue(((Result) result)\r\n\t\t\t\t\t.getDecision().value()));\r\n\t\t\tfor (Object arg : jp.getArgs()) {\r\n\t\t\t\tif (arg instanceof BasicEvaluationCtx) {\r\n\t\t\t\t\taudit.setDate(this.formatDate(((BasicEvaluationCtx) arg)\r\n\t\t\t\t\t\t\t.getCurrentDateTime()));\r\n\t\t\t\t\taudit.setRequest(((BasicEvaluationCtx) arg).getRequest());\r\n\t\t\t\t\taudit = this.setAttributes(audit, ((BasicEvaluationCtx) arg));\r\n\t\t\t\t}\r\n\t\t\t}\r\n\r\n\t\t\taudit.getRules().add(auditedRule);\r\n\r\n\t\t\tAuditLogs.getInstance().addAudit(audit);\r\n\t\t\tbreak;\r\n\r\n\t\tcase POLICY:\r\n\t\t\taudit = new AuditLog();\r\n\t\t\tAuditedPolicy auditedPolicy = new AuditedPolicy();\r\n\t\t\tauditedPolicy.setId(((Policy) jp.getTarget()).getPolicyId());\r\n\t\t\tauditedPolicy.setRuleCombiningAlgorithm(((Policy) jp.getTarget())\r\n\t\t\t\t\t.getRuleCombiningAlgId());\r\n\t\t\tauditedPolicy.setResult(AuditedResult.fromValue(((Result) result)\r\n\t\t\t\t\t.getDecision().value()));\r\n\t\t\tfor (Object arg : jp.getArgs()) {\r\n\t\t\t\tif (arg instanceof BasicEvaluationCtx) {\r\n\t\t\t\t\taudit.setDate(this.formatDate(((BasicEvaluationCtx) arg)\r\n\t\t\t\t\t\t\t.getCurrentDateTime()));\r\n\t\t\t\t\taudit.setRequest(((BasicEvaluationCtx) arg).getRequest());\r\n\t\t\t\t\taudit = this.setAttributes(audit, ((BasicEvaluationCtx) arg));;\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t\taudit.getMatchedPolicies().add(auditedPolicy);\r\n\t\t\tAuditLogs.getInstance().addAudit(audit);\r\n\t\t\tbreak;\r\n\r\n\t\tcase ATTRIBUTE:\r\n\t\t\taudit = new AuditLog();\r\n\t\t\tAttributesResolved attrResolved = new AttributesResolved();\r\n\t\t\tfor (Object arg : jp.getArgs()) {\r\n\t\t\t\tif (arg instanceof BasicEvaluationCtx) {\r\n\t\t\t\t\taudit.setDate(this.formatDate(((BasicEvaluationCtx) arg)\r\n\t\t\t\t\t\t\t.getCurrentDateTime()));\r\n\t\t\t\t\taudit.setRequest(((BasicEvaluationCtx) arg).getRequest());\r\n\t\t\t\t\taudit = this.setAttributes(audit, ((BasicEvaluationCtx) arg));\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t\tattrResolved.setAttributeValue(((EvaluationResult) result)\r\n\t\t\t\t\t.getAttributeValue());\r\n\t\t\tbreak;\r\n\r\n\t\t\/\/ Used to display and clean the audit log pool\r\n\t\tcase DISPLAY:\r\n\t\t\tLOGGER.info(AuditLogs.getInstance().toString());\r\n\t\t\tSystem.out.println(AuditLogs.getInstance().toString());\r\n\t\t\tbreak;\r\n\t\tdefault:\r\n\t\t\tSystem.err.println(\"Type unknown: \" + annotation.type());\r\n\t\t\t;\r\n\t\t}\r\n\t}\r\n\r\n\tprivate AuditLog setAttributes(AuditLog audit,\r\n\t\t\tBasicEvaluationCtx basicEvaluationCtx) {\r\n\t\tif (((BasicEvaluationCtx) basicEvaluationCtx).getSubjectAttribute(\r\n\t\t\t\tURI.create(XACMLDatatypes.XACML_DATATYPE_STRING.value()),\r\n\t\t\t\tURI.create(XACMLAttributeId.XACML_SUBJECT_SUBJECT_ID.value()),\r\n\t\t\t\tURI.create(XACMLAttributeId.SUBJECT_CATEGORY.value())) != null) {\r\n\t\t\tif(((BasicEvaluationCtx) basicEvaluationCtx).getSubjectAttribute(\r\n\t\t\t\t\t\tURI.create(XACMLDatatypes.XACML_DATATYPE_STRING.value()),\r\n\t\t\t\t\t\tURI.create(XACMLAttributeId.XACML_SUBJECT_SUBJECT_ID.value()),\r\n\t\t\t\t\t\tURI.create(XACMLAttributeId.SUBJECT_CATEGORY.value())).getAttributeValue().getContent().size() > 0) {\r\n\t\t\t\t\t\t\tString subjectId = (String) ((BasicEvaluationCtx) basicEvaluationCtx).getSubjectAttribute(\r\n\t\t\t\t\t\t\t\t\tURI.create(XACMLDatatypes.XACML_DATATYPE_STRING.value()),\r\n\t\t\t\t\t\t\t\t\tURI.create(XACMLAttributeId.XACML_SUBJECT_SUBJECT_ID.value()),\r\n\t\t\t\t\t\t\t\t\tURI.create(XACMLAttributeId.SUBJECT_CATEGORY.value())).getAttributeValue().getContent().get(0);\r\n\t\t\t\t\t\t\t\r\n\t\t\t\t\t\t\taudit.setSubjectId(subjectId);\t\r\n\t\t\t\t\t\t}\r\n\t\t}\r\n\r\n\t\tAttributeValue resourceId = ((BasicEvaluationCtx) basicEvaluationCtx).getResourceId();\r\n\t\tif(resourceId.getContent().size() > 0) {\r\n\t\t\taudit.setResourceId(String.valueOf(resourceId.getContent().get(0)));\t\r\n\t\t}\r\n\r\n\t\t\/\/ FIXME: Set the ActionId attribute\r\n\t\t\/\/ audit.setActionId();\r\n\t\t\r\n\t\treturn audit;\r\n\t}\r\n\r\n\tprivate String formatDate(DateTimeAttribute currentDateTime) {\r\n\t\tString date = dateFormatWOoNano.format(currentDateTime.getValue())\r\n\t\t\t\t+ \".\" + String.valueOf(currentDateTime.getNanoseconds());\r\n\r\n\t\treturn date;\r\n\t}\r\n}","old_contents":"\/**\r\n * Copyright (C) 2011-2013 Thales Services - ThereSIS - All rights reserved.\r\n *\r\n * Licensed under the Apache License, Version 2.0 (the \"License\");\r\n *    you may not use this file except in compliance with the License.\r\n *    You may obtain a copy of the License at\r\n *\r\n *        http:\/\/www.apache.org\/licenses\/LICENSE-2.0\r\n *\r\n *    Unless required by applicable law or agreed to in writing, software\r\n *    distributed under the License is distributed on an \"AS IS\" BASIS,\r\n *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n *    See the License for the specific language governing permissions and\r\n *    limitations under the License.\r\n *\/\r\npackage com.thalesgroup.authzforce.audit.aspect;\r\n\r\nimport java.io.StringWriter;\r\nimport java.net.URI;\r\nimport java.text.DateFormat;\r\nimport java.text.SimpleDateFormat;\r\n\r\nimport javax.xml.bind.JAXBContext;\r\nimport javax.xml.bind.JAXBException;\r\n\r\nimport oasis.names.tc.xacml._3_0.core.schema.wd_17.Attribute;\r\nimport oasis.names.tc.xacml._3_0.core.schema.wd_17.AttributeValueType;\r\nimport oasis.names.tc.xacml._3_0.core.schema.wd_17.Policy;\r\nimport oasis.names.tc.xacml._3_0.core.schema.wd_17.Result;\r\nimport oasis.names.tc.xacml._3_0.core.schema.wd_17.Rule;\r\n\r\nimport org.aspectj.lang.JoinPoint;\r\nimport org.aspectj.lang.annotation.AfterReturning;\r\nimport org.aspectj.lang.annotation.Aspect;\r\nimport org.aspectj.lang.annotation.Pointcut;\r\nimport org.slf4j.Logger;\r\nimport org.slf4j.LoggerFactory;\r\n\r\nimport com.sun.xacml.BasicEvaluationCtx;\r\nimport com.sun.xacml.attr.DateTimeAttribute;\r\nimport com.sun.xacml.attr.xacmlv3.AttributeValue;\r\nimport com.sun.xacml.cond.xacmlv3.EvaluationResult;\r\nimport com.thalesgroup.authzforce.audit.AttributesResolved;\r\nimport com.thalesgroup.authzforce.audit.AuditLogs;\r\nimport com.thalesgroup.authzforce.audit.annotations.Audit;\r\nimport com.thalesgroup.authzforce.audit.schema.pdp.AuditLog;\r\nimport com.thalesgroup.authzforce.audit.schema.pdp.AuditedPolicy;\r\nimport com.thalesgroup.authzforce.audit.schema.pdp.AuditedResult;\r\nimport com.thalesgroup.authzforce.audit.schema.pdp.AuditedRule;\r\nimport com.thalesgroup.authzforce.xacml.schema.XACMLAttributeId;\r\nimport com.thalesgroup.authzforce.xacml.schema.XACMLDatatypes;\r\n\r\n@Aspect\r\npublic class AuditAspect {\r\n\r\n\tprivate static final Logger LOGGER = LoggerFactory\r\n\t\t\t.getLogger(AuditAspect.class);\r\n\tprivate static final DateFormat dateFormat = new SimpleDateFormat(\r\n\t\t\t\"dd-MM-yyyy HH:mm:ss.SSSSSSSSS\");\r\n\tprivate static final DateFormat dateFormatWOoNano = new SimpleDateFormat(\r\n\t\t\t\"dd-MM-yyyy HH:mm:ss\");\r\n\r\n\t@Pointcut(\"execution (@com.thalesgroup.authzforce.audit.annotations * *.*(..))\")\r\n\tpublic void searchAnnotation() {\r\n\r\n\t}\r\n\r\n\t@AfterReturning(value = \"@annotation(annotation)\", returning = \"result\")\r\n\tpublic void doAuditLog(Audit annotation, JoinPoint jp, Object result) {\r\n\t\tswitch (annotation.type()) {\r\n\t\tcase RULE:\r\n\t\t\tAuditLog audit = new AuditLog();\r\n\t\t\tAuditedRule auditedRule = new AuditedRule();\r\n\t\t\tauditedRule.setId(((Rule) jp.getTarget()).getRuleId());\r\n\t\t\tauditedRule.setResult(AuditedResult.fromValue(((Result) result)\r\n\t\t\t\t\t.getDecision().value()));\r\n\t\t\tfor (Object arg : jp.getArgs()) {\r\n\t\t\t\tif (arg instanceof BasicEvaluationCtx) {\r\n\t\t\t\t\taudit.setDate(this.formatDate(((BasicEvaluationCtx) arg)\r\n\t\t\t\t\t\t\t.getCurrentDateTime()));\r\n\t\t\t\t\taudit.setRequest(((BasicEvaluationCtx) arg).getRequest());\r\n\t\t\t\t\taudit = this.setAttributes(audit, ((BasicEvaluationCtx) arg));\r\n\t\t\t\t}\r\n\t\t\t}\r\n\r\n\t\t\taudit.getRules().add(auditedRule);\r\n\r\n\t\t\tAuditLogs.getInstance().addAudit(audit);\r\n\t\t\tbreak;\r\n\r\n\t\tcase POLICY:\r\n\t\t\taudit = new AuditLog();\r\n\t\t\tAuditedPolicy auditedPolicy = new AuditedPolicy();\r\n\t\t\tauditedPolicy.setId(((Policy) jp.getTarget()).getPolicyId());\r\n\t\t\tauditedPolicy.setRuleCombiningAlgorithm(((Policy) jp.getTarget())\r\n\t\t\t\t\t.getRuleCombiningAlgId());\r\n\t\t\tauditedPolicy.setResult(AuditedResult.fromValue(((Result) result)\r\n\t\t\t\t\t.getDecision().value()));\r\n\t\t\tfor (Object arg : jp.getArgs()) {\r\n\t\t\t\tif (arg instanceof BasicEvaluationCtx) {\r\n\t\t\t\t\taudit.setDate(this.formatDate(((BasicEvaluationCtx) arg)\r\n\t\t\t\t\t\t\t.getCurrentDateTime()));\r\n\t\t\t\t\taudit.setRequest(((BasicEvaluationCtx) arg).getRequest());\r\n\t\t\t\t\taudit = this.setAttributes(audit, ((BasicEvaluationCtx) arg));;\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t\taudit.getMatchedPolicies().add(auditedPolicy);\r\n\t\t\tAuditLogs.getInstance().addAudit(audit);\r\n\t\t\tbreak;\r\n\r\n\t\tcase ATTRIBUTE:\r\n\t\t\taudit = new AuditLog();\r\n\t\t\tAttributesResolved attrResolved = new AttributesResolved();\r\n\t\t\tfor (Object arg : jp.getArgs()) {\r\n\t\t\t\tif (arg instanceof BasicEvaluationCtx) {\r\n\t\t\t\t\taudit.setDate(this.formatDate(((BasicEvaluationCtx) arg)\r\n\t\t\t\t\t\t\t.getCurrentDateTime()));\r\n\t\t\t\t\taudit.setRequest(((BasicEvaluationCtx) arg).getRequest());\r\n\t\t\t\t\taudit = this.setAttributes(audit, ((BasicEvaluationCtx) arg));\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t\tattrResolved.setAttributeValue(((EvaluationResult) result)\r\n\t\t\t\t\t.getAttributeValue());\r\n\t\t\tbreak;\r\n\r\n\t\t\/\/ Used to display and clean the audit log pool\r\n\t\tcase DISPLAY:\r\n\t\t\tLOGGER.info(AuditLogs.getInstance().toString());\r\n\t\t\tbreak;\r\n\t\tdefault:\r\n\t\t\tSystem.err.println(\"Type unknown: \" + annotation.type());\r\n\t\t\t;\r\n\t\t}\r\n\t}\r\n\r\n\tprivate AuditLog setAttributes(AuditLog audit,\r\n\t\t\tBasicEvaluationCtx basicEvaluationCtx) {\r\n\t\tif (((BasicEvaluationCtx) basicEvaluationCtx).getSubjectAttribute(\r\n\t\t\t\tURI.create(XACMLDatatypes.XACML_DATATYPE_STRING.value()),\r\n\t\t\t\tURI.create(XACMLAttributeId.XACML_SUBJECT_SUBJECT_ID.value()),\r\n\t\t\t\tURI.create(XACMLAttributeId.SUBJECT_CATEGORY.value())) != null) {\r\n\t\t\tif(((BasicEvaluationCtx) basicEvaluationCtx).getSubjectAttribute(\r\n\t\t\t\t\t\tURI.create(XACMLDatatypes.XACML_DATATYPE_STRING.value()),\r\n\t\t\t\t\t\tURI.create(XACMLAttributeId.XACML_SUBJECT_SUBJECT_ID.value()),\r\n\t\t\t\t\t\tURI.create(XACMLAttributeId.SUBJECT_CATEGORY.value())).getAttributeValue().getContent().size() > 0) {\r\n\t\t\t\t\t\t\tString subjectId = (String) ((BasicEvaluationCtx) basicEvaluationCtx).getSubjectAttribute(\r\n\t\t\t\t\t\t\t\t\tURI.create(XACMLDatatypes.XACML_DATATYPE_STRING.value()),\r\n\t\t\t\t\t\t\t\t\tURI.create(XACMLAttributeId.XACML_SUBJECT_SUBJECT_ID.value()),\r\n\t\t\t\t\t\t\t\t\tURI.create(XACMLAttributeId.SUBJECT_CATEGORY.value())).getAttributeValue().getContent().get(0);\r\n\t\t\t\t\t\t\t\r\n\t\t\t\t\t\t\taudit.setSubjectId(subjectId);\t\r\n\t\t\t\t\t\t}\r\n\t\t}\r\n\r\n\t\tAttributeValue resourceId = ((BasicEvaluationCtx) basicEvaluationCtx).getResourceId();\r\n\t\tif(resourceId.getContent().size() > 0) {\r\n\t\t\taudit.setResourceId(String.valueOf(resourceId.getContent().get(0)));\t\r\n\t\t}\r\n\r\n\t\t\/\/ FIXME: Set the ActionId attribute\r\n\t\t\/\/ audit.setActionId();\r\n\t\t\r\n\t\treturn audit;\r\n\t}\r\n\r\n\tprivate String formatDate(DateTimeAttribute currentDateTime) {\r\n\t\tString date = dateFormatWOoNano.format(currentDateTime.getValue())\r\n\t\t\t\t+ \".\" + String.valueOf(currentDateTime.getNanoseconds());\r\n\r\n\t\treturn date;\r\n\t}\r\n}","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"da066bcaf551ce73029be9c0bcc23d7858aba1a6","subject":"Comment out some superfluous baggage logging","message":"Comment out some superfluous baggage logging\n","repos":"brownsys\/tracing-framework,brownsys\/tracing-framework,brownsys\/tracing-framework,brownsys\/tracing-framework,brownsys\/tracing-framework,brownsys\/tracing-framework,brownsys\/tracing-framework","old_file":"xtrace\/aspects\/src\/main\/aspect\/edu\/brown\/cs\/systems\/xtrace\/logging\/BaggageWrappers.aj","new_file":"xtrace\/aspects\/src\/main\/aspect\/edu\/brown\/cs\/systems\/xtrace\/logging\/BaggageWrappers.aj","new_contents":"package edu.brown.cs.systems.xtrace.logging;\n\nimport com.google.protobuf.ByteString;\n\nimport edu.brown.cs.systems.baggage.Baggage;\nimport edu.brown.cs.systems.baggage.DetachedBaggage;\nimport edu.brown.cs.systems.xtrace.XTrace;\n\n\/** Invoke X-Trace APIs when baggage is set and unset *\/\npublic aspect BaggageWrappers {\n\n    static XTraceLogger xtrace = XTrace.getLogger(BaggageWrappers.class);\n    \n\/\/    after(): call(void Baggage.start()) && if(xtrace.valid()) {\n\/\/        xtrace.log(thisJoinPointStaticPart, \"Baggage started with Baggage.start()\");\n\/\/    }\n\/\/    \n\/\/    after(): (\n\/\/            call(void Baggage.start(DetachedBaggage)) ||\n\/\/            call(void Baggage.start(ByteString)) ||\n\/\/            call(void Baggage.start(byte[])) ||\n\/\/            call(void Baggage.start(String))\n\/\/            ) && if(xtrace.valid()) {\n\/\/        xtrace.log(thisJoinPointStaticPart, \"Resumed previously detached baggage\");\n\/\/    }\n\n\/\/    before(): call(DetachedBaggage Baggage.swap(..)) && if(xtrace.valid()) {\n\/\/        xtrace.log(thisJoinPointStaticPart, \"Detaching current baggage with Baggage.swap()\");\n\/\/    }\n    \n\/\/    after(): call(DetachedBaggage Baggage.swap(..)) && if(xtrace.valid()) {\n\/\/        xtrace.log(thisJoinPointStaticPart, \"Baggage started with Baggage.swap()\");\n\/\/    }\n    \n\/\/    before(): call(void Baggage.discard()) && if(xtrace.valid()) {\n\/\/        xtrace.log(thisJoinPointStaticPart, \"Discarding baggage with Baggage.discard()\");\n\/\/    }\n    \n\/\/    before(): call(DetachedBaggage Baggage.stop()) && if(xtrace.valid()) {\n\/\/        xtrace.log(thisJoinPointStaticPart, \"Detaching current baggage with Baggage.stop()\");\n\/\/    }\n    \n    before(): call(DetachedBaggage Baggage.fork()) && if(xtrace.valid()) {\n        xtrace.log(thisJoinPointStaticPart, \"Forking current baggage with Baggage.fork()\");\n    }\n    \n    after(): (\n            call(void Baggage.join(DetachedBaggage)) ||\n            call(void Baggage.join(ByteString)) ||\n            call(void Baggage.join(byte[])) ||\n            call(void Baggage.join(String))\n            ) && if(xtrace.valid()) {\n        xtrace.log(thisJoinPointStaticPart, \"Merged current baggage with other baggage\");\n    }\n    \n}\n","old_contents":"package edu.brown.cs.systems.xtrace.logging;\n\nimport com.google.protobuf.ByteString;\n\nimport edu.brown.cs.systems.baggage.Baggage;\nimport edu.brown.cs.systems.baggage.DetachedBaggage;\nimport edu.brown.cs.systems.xtrace.XTrace;\n\n\/** Invoke X-Trace APIs when baggage is set and unset *\/\npublic aspect BaggageWrappers {\n\n    static XTraceLogger xtrace = XTrace.getLogger(BaggageWrappers.class);\n    \n    after(): call(void Baggage.start()) && if(xtrace.valid()) {\n        xtrace.log(thisJoinPointStaticPart, \"Baggage started with Baggage.start()\");\n    }\n    \n    after(): (\n            call(void Baggage.start(DetachedBaggage)) ||\n            call(void Baggage.start(ByteString)) ||\n            call(void Baggage.start(byte[])) ||\n            call(void Baggage.start(String))\n            ) && if(xtrace.valid()) {\n        xtrace.log(thisJoinPointStaticPart, \"Resumed previously detached baggage\");\n    }\n\n    before(): call(DetachedBaggage Baggage.swap(..)) && if(xtrace.valid()) {\n        xtrace.log(thisJoinPointStaticPart, \"Detaching current baggage with Baggage.swap()\");\n    }\n    \n    after(): call(DetachedBaggage Baggage.swap(..)) && if(xtrace.valid()) {\n        xtrace.log(thisJoinPointStaticPart, \"Baggage started with Baggage.swap()\");\n    }\n    \n    before(): call(void Baggage.discard()) && if(xtrace.valid()) {\n        xtrace.log(thisJoinPointStaticPart, \"Discarding baggage with Baggage.discard()\");\n    }\n    \n    before(): call(DetachedBaggage Baggage.stop()) && if(xtrace.valid()) {\n        xtrace.log(thisJoinPointStaticPart, \"Detaching current baggage with Baggage.stop()\");\n    }\n    \n    before(): call(DetachedBaggage Baggage.fork()) && if(xtrace.valid()) {\n        xtrace.log(thisJoinPointStaticPart, \"Forking current baggage with Baggage.fork()\");\n    }\n    \n    after(): (\n            call(void Baggage.join(DetachedBaggage)) ||\n            call(void Baggage.join(ByteString)) ||\n            call(void Baggage.join(byte[])) ||\n            call(void Baggage.join(String))\n            ) && if(xtrace.valid()) {\n        xtrace.log(thisJoinPointStaticPart, \"Merged current baggage with other baggage\");\n    }\n    \n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"3676eeb4dfa2255bf2d72fab4b49ff21288e2114","subject":"Event printing commented","message":"Event printing commented","repos":"selig\/qea","old_file":"code\/qea\/src\/benchmark\/competition\/java\/larva\/monitoring\/LarvaTenAspect.aj","new_file":"code\/qea\/src\/benchmark\/competition\/java\/larva\/monitoring\/LarvaTenAspect.aj","new_contents":"package benchmark.competition.java.larva.monitoring;\r\n\r\nimport monitoring.impl.MonitorFactory;\r\nimport monitoring.intf.Monitor;\r\nimport properties.Property;\r\nimport properties.competition.Larva;\r\nimport structure.impl.other.Verdict;\r\nimport structure.intf.QEA;\r\nimport benchmark.competition.java.larva.transactionsystem.UserSession;\r\n\r\npublic aspect LarvaTenAspect {\r\n\r\n\tprivate final Monitor monitor;\r\n\r\n\tprivate final int OPEN_SESSION = 1;\r\n\tprivate final int CLOSE_SESSION = 2;\r\n\tprivate final int LOG = 3;\r\n\r\n\tpublic LarvaTenAspect() {\r\n\t\tQEA qea = new Larva().make(Property.LARVA_TEN);\r\n\t\tmonitor = MonitorFactory.create(qea);\r\n\t}\r\n\r\n\tpointcut openSession(UserSession session) :\r\n\t\tcall(void UserSession.openSession()) && target(session);\r\n\r\n\tpointcut closeSession(UserSession session) :\r\n\t\tcall(void UserSession.closeSession()) && target(session);\r\n\r\n\tpointcut log(UserSession session) :\r\n\t\tcall(void UserSession.log(String)) && target(session);\r\n\r\n\tbefore(UserSession session) : openSession(session) {\r\n\/\/\t\tSystem.out.println(\">> openSession(\" + session.getOwner() + \")\");\r\n\t\tVerdict verdict = monitor.step(OPEN_SESSION, session.getOwner());\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err.println(\"Violation in Larva 10. [userId=\"\r\n\t\t\t\t\t+ session.getOwner() + \"] [sid=\" + session.getId()\r\n\t\t\t\t\t+ \"]. Logging can only be made to an active session.\");\r\n\t\t}\r\n\t};\r\n\r\n\tbefore(UserSession session) : closeSession(session) {\r\n\/\/\t\tSystem.out.println(\">> closeSession(\" + session.getOwner() + \")\");\r\n\t\tVerdict verdict = monitor.step(CLOSE_SESSION, session.getOwner());\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err.println(\"Violation in Larva 10. [userId=\"\r\n\t\t\t\t\t+ session.getOwner() + \"] [sid=\" + session.getId()\r\n\t\t\t\t\t+ \"]. Logging can only be made to an active session.\");\r\n\t\t}\r\n\t};\r\n\r\n\tbefore(UserSession session) : log(session) {\r\n\/\/\t\tSystem.out.println(\">> log(\" + session.getOwner() + \")\");\r\n\t\tVerdict verdict = monitor.step(LOG, session.getOwner());\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err.println(\"Violation in Larva 10. [userId=\"\r\n\t\t\t\t\t+ session.getOwner() + \"] [sid=\" + session.getId()\r\n\t\t\t\t\t+ \"]. Logging can only be made to an active session.\");\r\n\t\t}\r\n\t};\r\n}\r\n","old_contents":"package benchmark.competition.java.larva.monitoring;\r\n\r\nimport monitoring.impl.MonitorFactory;\r\nimport monitoring.intf.Monitor;\r\nimport properties.Property;\r\nimport properties.competition.Larva;\r\nimport structure.impl.other.Verdict;\r\nimport structure.intf.QEA;\r\nimport benchmark.competition.java.larva.transactionsystem.UserSession;\r\n\r\npublic aspect LarvaTenAspect {\r\n\r\n\tprivate final Monitor monitor;\r\n\r\n\tprivate final int OPEN_SESSION = 1;\r\n\tprivate final int CLOSE_SESSION = 2;\r\n\tprivate final int LOG = 3;\r\n\r\n\tpublic LarvaTenAspect() {\r\n\t\tQEA qea = new Larva().make(Property.LARVA_TEN);\r\n\t\tmonitor = MonitorFactory.create(qea);\r\n\t}\r\n\r\n\tpointcut openSession(UserSession session) :\r\n\t\tcall(void UserSession.openSession()) && target(session);\r\n\r\n\tpointcut closeSession(UserSession session) :\r\n\t\tcall(void UserSession.closeSession()) && target(session);\r\n\r\n\tpointcut log(UserSession session) :\r\n\t\tcall(void UserSession.log(String)) && target(session);\r\n\r\n\tbefore(UserSession session) : openSession(session) {\r\n\t\tSystem.out.println(\">> openSession(\" + session.getOwner() + \")\");\r\n\t\tVerdict verdict = monitor.step(OPEN_SESSION, session.getOwner());\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err.println(\"Violation in Larva 10. [userId=\"\r\n\t\t\t\t\t+ session.getOwner() + \"] [sid=\" + session.getId()\r\n\t\t\t\t\t+ \"]. Logging can only be made to an active session.\");\r\n\t\t}\r\n\t};\r\n\r\n\tbefore(UserSession session) : closeSession(session) {\r\n\t\tSystem.out.println(\">> closeSession(\" + session.getOwner() + \")\");\r\n\t\tVerdict verdict = monitor.step(CLOSE_SESSION, session.getOwner());\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err.println(\"Violation in Larva 10. [userId=\"\r\n\t\t\t\t\t+ session.getOwner() + \"] [sid=\" + session.getId()\r\n\t\t\t\t\t+ \"]. Logging can only be made to an active session.\");\r\n\t\t}\r\n\t};\r\n\r\n\tbefore(UserSession session) : log(session) {\r\n\t\tSystem.out.println(\">> log(\" + session.getOwner() + \")\");\r\n\t\tVerdict verdict = monitor.step(LOG, session.getOwner());\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err.println(\"Violation in Larva 10. [userId=\"\r\n\t\t\t\t\t+ session.getOwner() + \"] [sid=\" + session.getId()\r\n\t\t\t\t\t+ \"]. Logging can only be made to an active session.\");\r\n\t\t}\r\n\t};\r\n}\r\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"3ca0dcd9123981962d8dbf5a371d7d0bed99f298","subject":"Fixed method count in AbstractMethodMockingControl's IllegalStateException message","message":"Fixed method count in AbstractMethodMockingControl's IllegalStateException message\n\nIssue: SPR-10885\n(cherry picked from commit 5596154)\n","repos":"spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework","old_file":"spring-aspects\/src\/main\/java\/org\/springframework\/mock\/staticmock\/AbstractMethodMockingControl.aj","new_file":"spring-aspects\/src\/main\/java\/org\/springframework\/mock\/staticmock\/AbstractMethodMockingControl.aj","new_contents":"\/*\n * Copyright 2002-2013 the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.springframework.mock.staticmock;\n\nimport java.util.Arrays;\nimport java.util.LinkedList;\nimport java.util.List;\n\n\/**\n * Abstract aspect to enable mocking of methods picked out by a pointcut.\n * Sub-aspects must define the mockStaticsTestMethod() pointcut to\n * indicate call stacks when mocking should be triggered, and the\n * methodToMock() pointcut to pick out a method invocations to mock.\n *\n * @author Rod Johnson\n * @author Ramnivas Laddad\n *\/\npublic abstract aspect AbstractMethodMockingControl percflow(mockStaticsTestMethod()) {\n\n\tprotected abstract pointcut mockStaticsTestMethod();\n\n\tprotected abstract pointcut methodToMock();\n\n\tprivate boolean recording = true;\n\n\tstatic enum CallResponse { nothing, return_, throw_ };\n\n\t\/\/ Represents a list of expected calls to static entity methods\n\t\/\/ Public to allow inserted code to access: is this normal??\n\tpublic class Expectations {\n\n\t\t\/\/ Represents an expected call to a static entity method\n\t\tprivate class Call {\n\t\t\tprivate final String signature;\n\t\t\tprivate final Object[] args;\n\n\t\t\tprivate Object responseObject; \/\/ return value or throwable\n\t\t\tprivate CallResponse responseType = CallResponse.nothing;\n\n\t\t\tpublic Call(String name, Object[] args) {\n\t\t\t\tthis.signature = name;\n\t\t\t\tthis.args = args;\n\t\t\t}\n\n\t\t\tpublic boolean hasResponseSpecified() {\n\t\t\t\treturn responseType != CallResponse.nothing;\n\t\t\t}\n\n\t\t\tpublic void setReturnVal(Object retVal) {\n\t\t\t\tthis.responseObject = retVal;\n\t\t\t\tresponseType = CallResponse.return_;\n\t\t\t}\n\n\t\t\tpublic void setThrow(Throwable throwable) {\n\t\t\t\tthis.responseObject = throwable;\n\t\t\t\tresponseType = CallResponse.throw_;\n\t\t\t}\n\n\t\t\tpublic Object returnValue(String lastSig, Object[] args) {\n\t\t\t\tcheckSignature(lastSig, args);\n\t\t\t\treturn responseObject;\n\t\t\t}\n\n\t\t\tpublic Object throwException(String lastSig, Object[] args) {\n\t\t\t\tcheckSignature(lastSig, args);\n\t\t\t\tthrow (RuntimeException)responseObject;\n\t\t\t}\n\n\t\t\tprivate void checkSignature(String lastSig, Object[] args) {\n\t\t\t\tif (!signature.equals(lastSig)) {\n\t\t\t\t\tthrow new IllegalArgumentException(\"Signature doesn't match\");\n\t\t\t\t}\n\t\t\t\tif (!Arrays.equals(this.args, args)) {\n\t\t\t\t\tthrow new IllegalArgumentException(\"Arguments don't match\");\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\n\t\tprivate List<Call> calls = new LinkedList<Call>();\n\n\t\t\/\/ Calls already verified\n\t\tprivate int verified;\n\n\t\tpublic void verify() {\n\t\t\tif (verified != calls.size()) {\n\t\t\t\tthrow new IllegalStateException(\"Expected \" + calls.size() + \" calls, received \" + verified);\n\t\t\t}\n\t\t}\n\n\t\t\/**\n\t\t * Validate the call and provide the expected return value.\n\t\t *\/\n\t\tpublic Object respond(String lastSig, Object[] args) {\n\t\t\tCall call = nextCall();\n\t\t\tCallResponse responseType = call.responseType;\n\t\t\tif (responseType == CallResponse.return_) {\n\t\t\t\treturn call.returnValue(lastSig, args);\n\t\t\t}\n\t\t\telse if (responseType == CallResponse.throw_) {\n\t\t\t\treturn call.throwException(lastSig, args);\n\t\t\t}\n\t\t\telse if (responseType == CallResponse.nothing) {\n\t\t\t\t\/\/ do nothing\n\t\t\t}\n\t\t\tthrow new IllegalStateException(\"Behavior of \" + call + \" not specified\");\n\t\t}\n\n\t\tprivate Call nextCall() {\n\t\t\tverified++;\n\t\t\tif (verified > calls.size()) {\n\t\t\t\tthrow new IllegalStateException(\"Expected \" + calls.size() + \" calls, received \" + verified);\n\t\t\t}\n\t\t\treturn calls.get(verified);\n\t\t}\n\n\t\tpublic void expectCall(String lastSig, Object lastArgs[]) {\n\t\t\tCall call = new Call(lastSig, lastArgs);\n\t\t\tcalls.add(call);\n\t\t}\n\n\t\tpublic boolean hasCalls() {\n\t\t\treturn !calls.isEmpty();\n\t\t}\n\n\t\tpublic void expectReturn(Object retVal) {\n\t\t\tCall call = calls.get(calls.size() - 1);\n\t\t\tif (call.hasResponseSpecified()) {\n\t\t\t\tthrow new IllegalStateException(\"No static method invoked before setting return value\");\n\t\t\t}\n\t\t\tcall.setReturnVal(retVal);\n\t\t}\n\n\t\tpublic void expectThrow(Throwable throwable) {\n\t\t\tCall call = calls.get(calls.size() - 1);\n\t\t\tif (call.hasResponseSpecified()) {\n\t\t\t\tthrow new IllegalStateException(\"No static method invoked before setting throwable\");\n\t\t\t}\n\t\t\tcall.setThrow(throwable);\n\t\t}\n\t}\n\n\tprivate Expectations expectations = new Expectations();\n\n\tafter() returning : mockStaticsTestMethod() {\n\t\tif (recording && (expectations.hasCalls())) {\n\t\t\tthrow new IllegalStateException(\n\t\t\t\t\t\"Calls recorded, yet playback state never reached: Create expectations then call \"\n\t\t\t\t\t\t\t+ this.getClass().getSimpleName() + \".playback()\");\n\t\t}\n\t\texpectations.verify();\n\t}\n\n\tObject around() : methodToMock() && cflowbelow(mockStaticsTestMethod()) {\n\t\tif (recording) {\n\t\t\texpectations.expectCall(thisJoinPointStaticPart.toLongString(), thisJoinPoint.getArgs());\n\t\t\t\/\/ Return value doesn't matter\n\t\t\treturn null;\n\t\t}\n\t\telse {\n\t\t\treturn expectations.respond(thisJoinPointStaticPart.toLongString(), thisJoinPoint.getArgs());\n\t\t}\n\t}\n\n\tpublic void expectReturnInternal(Object retVal) {\n\t\tif (!recording) {\n\t\t\tthrow new IllegalStateException(\"Not recording: Cannot set return value\");\n\t\t}\n\t\texpectations.expectReturn(retVal);\n\t}\n\n\tpublic void expectThrowInternal(Throwable throwable) {\n\t\tif (!recording) {\n\t\t\tthrow new IllegalStateException(\"Not recording: Cannot set throwable value\");\n\t\t}\n\t\texpectations.expectThrow(throwable);\n\t}\n\n\tpublic void playbackInternal() {\n\t\trecording = false;\n\t}\n\n}\n","old_contents":"\/*\n * Copyright 2002-2013 the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.springframework.mock.staticmock;\n\nimport java.util.Arrays;\nimport java.util.LinkedList;\nimport java.util.List;\n\n\/**\n * Abstract aspect to enable mocking of methods picked out by a pointcut.\n * Sub-aspects must define the mockStaticsTestMethod() pointcut to\n * indicate call stacks when mocking should be triggered, and the\n * methodToMock() pointcut to pick out a method invocations to mock.\n *\n * @author Rod Johnson\n * @author Ramnivas Laddad\n *\/\npublic abstract aspect AbstractMethodMockingControl percflow(mockStaticsTestMethod()) {\n\n\tprotected abstract pointcut mockStaticsTestMethod();\n\n\tprotected abstract pointcut methodToMock();\n\n\tprivate boolean recording = true;\n\n\tstatic enum CallResponse { nothing, return_, throw_ };\n\n\t\/\/ Represents a list of expected calls to static entity methods\n\t\/\/ Public to allow inserted code to access: is this normal??\n\tpublic class Expectations {\n\n\t\t\/\/ Represents an expected call to a static entity method\n\t\tprivate class Call {\n\t\t\tprivate final String signature;\n\t\t\tprivate final Object[] args;\n\n\t\t\tprivate Object responseObject; \/\/ return value or throwable\n\t\t\tprivate CallResponse responseType = CallResponse.nothing;\n\n\t\t\tpublic Call(String name, Object[] args) {\n\t\t\t\tthis.signature = name;\n\t\t\t\tthis.args = args;\n\t\t\t}\n\n\t\t\tpublic boolean hasResponseSpecified() {\n\t\t\t\treturn responseType != CallResponse.nothing;\n\t\t\t}\n\n\t\t\tpublic void setReturnVal(Object retVal) {\n\t\t\t\tthis.responseObject = retVal;\n\t\t\t\tresponseType = CallResponse.return_;\n\t\t\t}\n\n\t\t\tpublic void setThrow(Throwable throwable) {\n\t\t\t\tthis.responseObject = throwable;\n\t\t\t\tresponseType = CallResponse.throw_;\n\t\t\t}\n\n\t\t\tpublic Object returnValue(String lastSig, Object[] args) {\n\t\t\t\tcheckSignature(lastSig, args);\n\t\t\t\treturn responseObject;\n\t\t\t}\n\n\t\t\tpublic Object throwException(String lastSig, Object[] args) {\n\t\t\t\tcheckSignature(lastSig, args);\n\t\t\t\tthrow (RuntimeException)responseObject;\n\t\t\t}\n\n\t\t\tprivate void checkSignature(String lastSig, Object[] args) {\n\t\t\t\tif (!signature.equals(lastSig)) {\n\t\t\t\t\tthrow new IllegalArgumentException(\"Signature doesn't match\");\n\t\t\t\t}\n\t\t\t\tif (!Arrays.equals(this.args, args)) {\n\t\t\t\t\tthrow new IllegalArgumentException(\"Arguments don't match\");\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\n\t\tprivate List<Call> calls = new LinkedList<Call>();\n\n\t\t\/\/ Calls already verified\n\t\tprivate int verified;\n\n\t\tpublic void verify() {\n\t\t\tif (verified != calls.size()) {\n\t\t\t\tthrow new IllegalStateException(\"Expected \" + calls.size()\n\t\t\t\t\t\t+ \" calls, received \" + verified);\n\t\t\t}\n\t\t}\n\n\t\t\/**\n\t\t * Validate the call and provide the expected return value\n\t\t * @param lastSig\n\t\t * @param args\n\t\t * @return\n\t\t *\/\n\t\tpublic Object respond(String lastSig, Object[] args) {\n\t\t\tCall call = nextCall();\n\t\t\tCallResponse responseType = call.responseType;\n\t\t\tif (responseType == CallResponse.return_) {\n\t\t\t\treturn call.returnValue(lastSig, args);\n\t\t\t} else if(responseType == CallResponse.throw_) {\n\t\t\t\treturn (RuntimeException)call.throwException(lastSig, args);\n\t\t\t} else if(responseType == CallResponse.nothing) {\n\t\t\t\t\/\/ do nothing\n\t\t\t}\n\t\t\tthrow new IllegalStateException(\"Behavior of \" + call + \" not specified\");\n\t\t}\n\n\t\tprivate Call nextCall() {\n\t\t\tif (verified > calls.size() - 1) {\n\t\t\t\tthrow new IllegalStateException(\"Expected \" + calls.size()\n\t\t\t\t\t\t+ \" calls, received \" + verified);\n\t\t\t}\n\t\t\treturn calls.get(verified++);\n\t\t}\n\n\t\tpublic void expectCall(String lastSig, Object lastArgs[]) {\n\t\t\tCall call = new Call(lastSig, lastArgs);\n\t\t\tcalls.add(call);\n\t\t}\n\n\t\tpublic boolean hasCalls() {\n\t\t\treturn !calls.isEmpty();\n\t\t}\n\n\t\tpublic void expectReturn(Object retVal) {\n\t\t\tCall call = calls.get(calls.size() - 1);\n\t\t\tif (call.hasResponseSpecified()) {\n\t\t\t\tthrow new IllegalStateException(\"No static method invoked before setting return value\");\n\t\t\t}\n\t\t\tcall.setReturnVal(retVal);\n\t\t}\n\n\t\tpublic void expectThrow(Throwable throwable) {\n\t\t\tCall call = calls.get(calls.size() - 1);\n\t\t\tif (call.hasResponseSpecified()) {\n\t\t\t\tthrow new IllegalStateException(\"No static method invoked before setting throwable\");\n\t\t\t}\n\t\t\tcall.setThrow(throwable);\n\t\t}\n\t}\n\n\tprivate Expectations expectations = new Expectations();\n\n\tafter() returning : mockStaticsTestMethod() {\n\t\tif (recording && (expectations.hasCalls())) {\n\t\t\tthrow new IllegalStateException(\n\t\t\t\t\t\"Calls recorded, yet playback state never reached: Create expectations then call \"\n\t\t\t\t\t\t\t+ this.getClass().getSimpleName() + \".playback()\");\n\t\t}\n\t\texpectations.verify();\n\t}\n\n\tObject around() : methodToMock() && cflowbelow(mockStaticsTestMethod()) {\n\t\tif (recording) {\n\t\t\texpectations.expectCall(thisJoinPointStaticPart.toLongString(), thisJoinPoint.getArgs());\n\t\t\t\/\/ Return value doesn't matter\n\t\t\treturn null;\n\t\t} else {\n\t\t\treturn expectations.respond(thisJoinPointStaticPart.toLongString(), thisJoinPoint.getArgs());\n\t\t}\n\t}\n\n\tpublic void expectReturnInternal(Object retVal) {\n\t\tif (!recording) {\n\t\t\tthrow new IllegalStateException(\"Not recording: Cannot set return value\");\n\t\t}\n\t\texpectations.expectReturn(retVal);\n\t}\n\n\tpublic void expectThrowInternal(Throwable throwable) {\n\t\tif (!recording) {\n\t\t\tthrow new IllegalStateException(\"Not recording: Cannot set throwable value\");\n\t\t}\n\t\texpectations.expectThrow(throwable);\n\t}\n\n\tpublic void playbackInternal() {\n\t\trecording = false;\n\t}\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"be79a3119679ed77314a6f261c3d00bd1f7fb76a","subject":"remove source location annotation and fix indentation in ovirt-sync","message":"remove source location annotation and fix indentation in ovirt-sync\n","repos":"OpenUniversity\/ovirt-engine,OpenUniversity\/ovirt-engine,OpenUniversity\/ovirt-engine,OpenUniversity\/ovirt-engine,OpenUniversity\/ovirt-engine","old_file":"backend\/manager\/modules\/bll\/src\/main\/java\/org\/ovirt\/engine\/core\/bll\/Locks.aj","new_file":"backend\/manager\/modules\/bll\/src\/main\/java\/org\/ovirt\/engine\/core\/bll\/Locks.aj","new_contents":"        package org.ovirt.engine.core.bll;\n\n        import java.util.*;\n\n        import org.ovirt.engine.core.common.action.LockProperties;\n        import org.ovirt.engine.core.common.action.LockProperties.Scope;\n        import org.ovirt.engine.core.common.locks.LockingGroup;\n        import org.ovirt.engine.core.bll.CommandBase;\n        import org.ovirt.engine.core.utils.lock.EngineLock;\n        import org.ovirt.engine.core.common.utils.Pair;\n        import org.ovirt.engine.core.common.action.VdcReturnValueBase;\n        import org.ovirt.engine.core.common.businessentities.IVdsAsyncCommand;\n        import org.ovirt.engine.core.common.errors.EngineMessage;\n\n        public privileged aspect Locks {\n\n            \/** Infrastructure Code **\/\n\n            \/** Acquire locks *\/\n            boolean around(CommandBase commandBase): execution(* CommandBase.acquireLock()) && this(commandBase) {\n                LockProperties lockProperties = commandBase.getLockProperties();\n                boolean returnValue = true;\n                if (!Scope.None.equals(lockProperties.getScope())) {\n                    commandBase.releaseLocksAtEndOfExecute = Scope.Execution.equals(lockProperties.getScope());\n                    if (!lockProperties.isWait()) {\n                        returnValue = commandBase.acquireLockInternal();\n                    } else {\n                        commandBase.acquireLockAndWait();\n                    }\n                }\n                return returnValue;\n            }\n\n            boolean around(CommandBase command): execution(* acquireLockInternal()) && this(command) {\n                \/\/ if commandLock is null then we acquire new lock, otherwise probably we got lock from caller command.\n                if (command.context.getLock() == null) {\n                    EngineLock lock = command.buildLock();\n                    if (lock != null) {\n                        Pair<Boolean, Set<String>> lockAcquireResult = command.getLockManager().acquireLock(lock);\n                        if (lockAcquireResult.getFirst()) {\n                            command.log.info(\"Lock Acquired to object '{}'\", lock);\n                            command.context.withLock(lock);\n                        } else {\n                            command.log.info(\"Failed to Acquire Lock to object '{}'\", lock);\n                            command.getReturnValue().getValidationMessages()\n                            .addAll(command.extractVariableDeclarations(lockAcquireResult.getSecond()));\n                            return false;\n                        }\n                    }\n                }\n                return true;\n            }\n\n            void around(CommandBase command): execution(* acquireLockAndWait()) && this(command) {\n                \/\/ if commandLock is null then we acquire new lock, otherwise probably we got lock from caller command.\n                if (command.context.getLock() == null) {\n                    Map<String, Pair<String, String>> exclusiveLocks = command.getExclusiveLocks();\n                    if (exclusiveLocks != null) {\n                        EngineLock lock = new EngineLock(exclusiveLocks, null);\n                        command.log.info(\"Before acquiring and wait lock '{}'\", lock);\n                        command.getLockManager().acquireLockWait(lock);\n                        command.context.withLock(lock);\n                        command.log.info(\"Lock-wait acquired to object '{}'\", lock);\n                    }\n                }\n            }\n\n            \/** Release locks if validation fails *\/\n            boolean around(CommandBase command): execution(* internalValidate()) && this(command) {\n                boolean result = false;\n                try {\n                   result = proceed(command);\n                }\n                finally {\n                   if (!result) {\n                      command.freeLock();\n                   }\n                }\n                return result;\n            }\n\n            \/** How to release locks *\/\n            void around(CommandBase command): execution(* freeLock()) && this(command) {\n                if (command.context.getLock() != null) {\n                    command.getLockManager().releaseLock(command.context.getLock());\n                    command.log.info(\"Lock freed to object '{}'\", command.context.getLock());\n                    command.context.withLock(null);\n                    \/\/ free other locks here to guarantee they will be freed only once\n                    command.freeCustomLocks();\n                }\n            }\n\n            \/** Release locks after the synchronous phase *\/\n            VdcReturnValueBase around(CommandBase command): execution(* executeAction()) && this(command) {\n                try {\n                   return proceed(command);\n                }\n                finally {\n                   command.freeLockExecute();\n                }\n            }\n\n            \/** Release locks after the asynchronous phase *\/\n            void around(CommandBase command): execution(* endActionInTransactionScope()) && this(command) {\n                try {\n                   proceed(command);\n                }\n                finally {\n                   command.freeLockEndAction();\n                }\n            }\n\n            \/** Acquire locks for the asynchronous part *\/\n            VdcReturnValueBase around(CommandBase commandBase): execution(* endAction()) && this(commandBase) {\n                VdcReturnValueBase result = null;\n                try {\n                    commandBase.initiateLockEndAction();\n                    result = proceed(commandBase);\n                } finally {\n                    commandBase.freeLockEndAction();\n                }\n                return result;\n            }\n\n            private void CommandBase.freeLockExecute() {\n                if (releaseLocksAtEndOfExecute || !getSucceeded() ||\n                        (noAsyncOperations() && !(this instanceof IVdsAsyncCommand))) {\n                    freeLock();\n                }\n            }\n\n            \/**\n             * If the command has more than one task handler, we can reach the end action\n             * phase and in that phase execute the next task handler. In that case, we\n             * don't want to release the locks, so we ask whether we're not in execute state.\n             *\/\n            private void CommandBase.freeLockEndAction() {\n                if (getActionState() != CommandActionState.EXECUTE) {\n                    freeLock();\n                }\n            }\n\n            \/**\n             * The following method should initiate a lock , in order to release it at endAction()\n             *\/\n            private void CommandBase.initiateLockEndAction() {\n                if (context.getLock() == null) {\n                    LockProperties lockProperties = getLockProperties();\n                    if (Scope.Command.equals(lockProperties.getScope())) {\n                        context.withLock(buildLock());\n                    }\n                }\n            }\n\n            private EngineLock CommandBase.buildLock() {\n                EngineLock lock = null;\n                Map<String, Pair<String, String>> exclusiveLocks = getExclusiveLocks();\n                Map<String, Pair<String, String>> sharedLocks = getSharedLocks();\n                if (exclusiveLocks != null || sharedLocks != null) {\n                    lock = new EngineLock(exclusiveLocks, sharedLocks);\n                }\n                return lock;\n            }\n\n            \/** Command Locks **\/\n\n        \/** org.ovirt.engine.core.bll.MigrateVmCommand **\/\n            LockProperties around(LockProperties lockProperties, org.ovirt.engine.core.bll.MigrateVmCommand command): execution(* applyLockProperties(..)) && args(lockProperties) && target(command) {\n                return lockProperties.withScope(Scope.Command).withWait(false);\n            }\n        \n            Map<String, Pair<String, String>> around(org.ovirt.engine.core.bll.MigrateVmCommand command): execution(* getExclusiveLocks()) && target(command) {\n                Map<String, Pair<String, String>> locks = new HashMap<String, Pair<String, String>>();\n        \n                locks.put(command.getVmId().toString(),\n                    LockMessagesMatchUtil.makeLockingPair(LockingGroup.VM, EngineMessage.ACTION_TYPE_FAILED_OBJECT_LOCKED));\n        \n                return locks;\n            }\n        \n        \n        \/** org.ovirt.engine.core.bll.AddDiskCommand **\/\n            LockProperties around(LockProperties lockProperties, org.ovirt.engine.core.bll.storage.disk.AddDiskCommand command): execution(* applyLockProperties(..)) && args(lockProperties) && target(command) {\n                return lockProperties.withScope(Scope.Execution).withWait(false);\n            }\n        \n            Map<String, Pair<String, String>> around(org.ovirt.engine.core.bll.storage.disk.AddDiskCommand command): execution(* getExclusiveLocks()) && target(command) {\n                Map<String, Pair<String, String>> locks = new HashMap<String, Pair<String, String>>();\n        \n                locks.put(command.getVmId().toString(),\n                    LockMessagesMatchUtil.makeLockingPair(LockingGroup.VM_DISK_BOOT, EngineMessage.ACTION_TYPE_FAILED_OBJECT_LOCKED));\n        \n                return locks;\n            }\n        \n            Map<String, Pair<String, String>> around(org.ovirt.engine.core.bll.storage.disk.AddDiskCommand command): execution(* getSharedLocks()) && target(command) {\n                Map<String, Pair<String, String>> locks = new HashMap<String, Pair<String, String>>();\n        \n                locks.put(command.getVmId().toString(),\n                    LockMessagesMatchUtil.makeLockingPair(LockingGroup.VM, EngineMessage.ACTION_TYPE_FAILED_OBJECT_LOCKED));\n        \n                return locks;\n            }\n        \n        }\n\n","old_contents":"\tpackage org.ovirt.engine.core.bll;\n\n\timport java.util.*;\n\t\n\timport org.ovirt.engine.core.common.action.LockProperties;\n\timport org.ovirt.engine.core.common.action.LockProperties.Scope;\n\timport org.ovirt.engine.core.common.locks.LockingGroup;\n\timport org.ovirt.engine.core.bll.CommandBase;\n\timport org.ovirt.engine.core.utils.lock.EngineLock;\n\timport org.ovirt.engine.core.common.utils.Pair;\n\timport org.ovirt.engine.core.common.action.VdcReturnValueBase;\n\timport org.ovirt.engine.core.common.businessentities.IVdsAsyncCommand;\n\timport org.ovirt.engine.core.common.errors.EngineMessage;\n\n\tpublic privileged aspect Locks {\n\n\t\tvoid around(CommandBase command): execution(* endActionInTransactionScope()) && this(command) {\n\t\t\ttry {\n\t          proceed(command);\n\t        }\n\t        finally {\n\t          command.freeLockEndAction();\n\t        }\n\t    }\n\t\n\t   boolean around(CommandBase command): execution(* internalCanDoAction()) && this(command) {\n\t        boolean result = false;\n\t        try {\n\t          result = proceed(command);\n\t        }\n\t        finally {\n\t          if (!result) {\n\t            command.freeLock();\n\t          }\n\t        }\n\t        return result;\n\t   }\n\n\t   void around(CommandBase command): execution(* freeLock()) && this(command) {\n            if (command.context.getLock() != null) {\n                command.getLockManager().releaseLock(command.context.getLock());\n                command.log.info(\"Lock freed to object '{}'\", command.context.getLock());\n                command.context.withLock(null);\n                \/\/ free other locks here to guarantee they will be freed only once\n                command.freeCustomLocks();\n            }\n        }\n\n\n\t    VdcReturnValueBase around(CommandBase command): execution(* executeAction()) && this(command) {\n\t        try {\n\t          return proceed(command);\n\t        }\n\t        finally {\n\t          command.freeLockExecute();\n\t        }\n\t    }\n\t\n\t    boolean around(CommandBase commandBase): execution(* CommandBase.acquireLock()) && this(commandBase) {\n\t        LockProperties lockProperties = commandBase.getLockProperties();\n\t        boolean returnValue = true;\n\t        if (!Scope.None.equals(lockProperties.getScope())) {\n\t            commandBase.releaseLocksAtEndOfExecute = Scope.Execution.equals(lockProperties.getScope());\n\t            if (!lockProperties.isWait()) {\n\t                returnValue = commandBase.acquireLockInternal();\n\t            } else {\n\t                commandBase.acquireLockAndWait();\n\t            }\n\t        }\n\t        return returnValue;\n\t    }\n\n\t\tboolean around(CommandBase command): execution(* acquireLockInternal()) && this(command) {\n\t        \/\/ if commandLock is null then we acquire new lock, otherwise probably we got lock from caller command.\n\t        if (command.context.getLock() == null) {\n\t            EngineLock lock = command.buildLock();\n\t            if (lock != null) {\n\t                Pair<Boolean, Set<String>> lockAcquireResult = command.getLockManager().acquireLock(lock);\n\t                if (lockAcquireResult.getFirst()) {\n\t                    command.log.info(\"Lock Acquired to object '{}'\", lock);\n\t                    command.context.withLock(lock);\n\t                } else {\n\t                    command.log.info(\"Failed to Acquire Lock to object '{}'\", lock);\n\t                    command.getReturnValue().getCanDoActionMessages()\n\t                    .addAll(command.extractVariableDeclarations(lockAcquireResult.getSecond()));\n\t                    return false;\n\t                }\n\t            }\n\t        }\n\t        return true;\n\t   }\n\n\t   void around(CommandBase command): execution(* acquireLockAndWait()) && this(command) {\n\t        \/\/ if commandLock is null then we acquire new lock, otherwise probably we got lock from caller command.\n\t         if (command.context.getLock() == null) {\n\t            Map<String, Pair<String, String>> exclusiveLocks = command.getExclusiveLocks();\n\t             if (exclusiveLocks != null) {\n\t                 EngineLock lock = new EngineLock(exclusiveLocks, null);\n\t                 command.getLockManager().acquireLockWait(lock);\n\t                 command.context.withLock(lock);\n\t            }\n\t         }\n\t    }\n\n\t\tVdcReturnValueBase around(CommandBase commandBase): execution(* endAction()) && this(commandBase) {\n\t        VdcReturnValueBase result = null;\n\t        try {\n\t            commandBase.initiateLockEndAction();\n\t            result = proceed(commandBase);\n\t        } finally {\n\t            commandBase.freeLockEndAction();\n\t        }\n\t                return result;\n\t        }\n\t\n\t   private void CommandBase.freeLockExecute() {\n\t        if (releaseLocksAtEndOfExecute || !getSucceeded() ||\n\t                (noAsyncOperations() && !(this instanceof IVdsAsyncCommand))) {\n\t            freeLock();\n\t        }\n\t    }\n\n\t\t\/**\n\t     * If the command has more than one task handler, we can reach the end action\n\t     * phase and in that phase execute the next task handler. In that case, we\n\t     * don't want to release the locks, so we ask whether we're not in execute state.\n\t     *\/\n\t    private void CommandBase.freeLockEndAction() {\n\t        if (getActionState() != CommandActionState.EXECUTE) {\n\t            freeLock();\n\t        }\n\t    }\n\n\t\t\/**\n\t     * The following method should initiate a lock , in order to release it at endAction()\n\t     *\/\n\t    private void CommandBase.initiateLockEndAction() {\n\t        if (context.getLock() == null) {\n\t            LockProperties lockProperties = getLockProperties();\n\t            if (Scope.Command.equals(lockProperties.getScope())) {\n\t                context.withLock(buildLock());\n\t            }\n\t\n\t        }\n\t    }\n\t\n\t    private EngineLock CommandBase.buildLock() {\n\t        EngineLock lock = null;\n\t        Map<String, Pair<String, String>> exclusiveLocks = getExclusiveLocks();\n\t        Map<String, Pair<String, String>> sharedLocks = getSharedLocks();\n\t        if (exclusiveLocks != null || sharedLocks != null) {\n\t            lock = new EngineLock(exclusiveLocks, sharedLocks);\n\t        }\n\t        return lock;\n\t    }\n\n\t\t\n\n\t\t\tLockProperties around(LockProperties lockProperties, org.ovirt.engine.core.bll.ExportVmTemplateCommand command): execution(* applyLockProperties(..)) && args(lockProperties) && target(command) {\n\t\t\t\treturn lockProperties.withScope(Scope.Execution);\n\t\t\t}\n\t\t\n\t\t\tMap<String, Pair<String, String>> around(org.ovirt.engine.core.bll.ExportVmTemplateCommand command): execution(* getExclusiveLocks()) && target(command) {\n\t\t\t        Map<String, Pair<String, String>> locks = new HashMap<String, Pair<String, String>>();\n\t\t\n\t\tlocks.put(command.getVmTemplateId().toString(),\n\t\t\tLockMessagesMatchUtil.makeLockingPair(LockingGroup.REMOTE_TEMPLATE, EngineMessage.ACTION_TYPE_FAILED_OBJECT_LOCKED));\n\t\t\n\t\t\t\treturn locks;\n\t\t\t    }\n\t\t\n\t\tMap<String, Pair<String, String>> around(org.ovirt.engine.core.bll.ExportVmTemplateCommand command): execution(* getSharedLocks()) && target(command) {\n\t\t    Map<String, Pair<String, String>> locks = new HashMap<String, Pair<String, String>>();\n\t\t\n\t\tlocks.put(command.getVmTemplateId().toString(),\n\t\t\tLockMessagesMatchUtil.makeLockingPair(LockingGroup.TEMPLATE, EngineMessage.ACTION_TYPE_FAILED_OBJECT_LOCKED));\n\t\t\n\t\t    return locks;\n\t\t}\n\t\t\n\t}\n\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"8a9b0072f3017f8720dc0792aee402862def5de5","subject":"added constructor pointcut exception for the instatiator","message":"added constructor pointcut exception for the instatiator\n","repos":"spring-projects\/spring-data-graph","old_file":"src\/main\/java\/org\/springframework\/persistence\/graph\/neo4j\/Neo4jNodeBacking.aj","new_file":"src\/main\/java\/org\/springframework\/persistence\/graph\/neo4j\/Neo4jNodeBacking.aj","new_contents":"package org.springframework.persistence.graph.neo4j;\n\nimport java.lang.reflect.Field;\nimport java.util.AbstractSet;\nimport java.util.Collection;\nimport java.util.HashSet;\nimport java.util.Iterator;\nimport java.util.Set;\n\nimport org.aspectj.lang.reflect.FieldSignature;\nimport org.neo4j.graphdb.Direction;\nimport org.neo4j.graphdb.DynamicRelationshipType;\nimport org.neo4j.graphdb.GraphDatabaseService;\nimport org.neo4j.graphdb.Node;\nimport org.neo4j.graphdb.NotInTransactionException;\nimport org.neo4j.graphdb.Relationship;\nimport org.neo4j.graphdb.RelationshipType;\nimport org.neo4j.util.GraphDatabaseUtil;\nimport org.springframework.beans.factory.annotation.Autowired;\nimport org.springframework.dao.InvalidDataAccessApiUsageException;\nimport org.springframework.dao.InvalidDataAccessResourceUsageException;\nimport org.springframework.persistence.graph.Graph;\nimport org.springframework.persistence.support.AbstractTypeAnnotatingMixinFields;\nimport org.springframework.persistence.support.EntityInstantiator;\n\n\/**\n * Aspect to turn an object annotated with GraphEntity into a graph entity using Neo4J.\n * Delegates all field access (except for fields assumed to be transient)\n * to an underlying Neo4 graph node.\n * \n * @author Rod Johnson\n *\/\npublic aspect Neo4jNodeBacking extends AbstractTypeAnnotatingMixinFields<Graph.Entity,NodeBacked> {\n\t\n\t\/\/-------------------------------------------------------------------------\n\t\/\/ Configure aspect for whole system.\n\t\/\/ init() method can be invoked automatically if the aspect is a Spring\n\t\/\/ bean, or called in user code.\n\t\/\/-------------------------------------------------------------------------\n\t\/\/ Aspect shared Neo4J Graph Database Service\n\tprivate GraphDatabaseService graphDatabaseService;\n\t\n\tprivate EntityInstantiator<NodeBacked, Node> graphEntityInstantiator;\n\n\tprivate FieldAccessorFactory fieldAccessorFactory;\n\n\tprivate EntityInstantiator<RelationshipBacked, Relationship> relationshipEntityInstantiator;\n\t\n\t@Autowired\n\tpublic void init(GraphDatabaseService gds, EntityInstantiator<NodeBacked, Node> gei, EntityInstantiator<RelationshipBacked, Relationship> rei) {\n\t\tthis.graphDatabaseService = gds;\n\t\tthis.graphEntityInstantiator = gei;\n\t\tthis.relationshipEntityInstantiator = rei;\n\t\tthis.fieldAccessorFactory = new FieldAccessorFactory(graphEntityInstantiator, relationshipEntityInstantiator);\n\t}\n\t\n\t\n\t\/\/-------------------------------------------------------------------------\n\t\/\/ Advise user-defined constructors of NodeBacked objects to create a new\n\t\/\/ Neo4J backing node\n\t\/\/-------------------------------------------------------------------------\n\tpointcut arbitraryUserConstructorOfNodeBackedObject(NodeBacked entity) : \n\t\texecution((@Graph.Entity *).new(..)) &&\n\t\t!execution((@Graph.Entity *).new(Node)) &&\n\t\tthis(entity);\n\t\texecution((@GraphEntity *).new(..)) &&\n\t\t!execution((@GraphEntity *).new(Node)) &&\n\t\tthis(entity);  \/\/ && !cflow(execution(* fromStateInternal(..));\n\t\n\t\n\t\/\/ Create a new node in the Graph if no Node was passed in a constructor\n\tbefore(NodeBacked entity) : arbitraryUserConstructorOfNodeBackedObject(entity) {\n\t\ttry {\n\t\t\tentity.setUnderlyingNode(graphDatabaseService.createNode());\n\t\t\tlog.info(\"User-defined constructor called on class \" + entity.getClass() + \"; created Node [\" + entity.getUnderlyingNode() +\"]; \" +\n\t\t\t\t\t\"Updating metamodel\");\n\t\t\t\/\/ TODO pull naming out into a strategy interface, todo a separate one, or the Entity Instatiator\n\t\t\t\/\/ graphEntityInstantiator.postEntityCreation(entity);\n\t\t\tpostEntityCreation(entity);\n\t\t} catch(NotInTransactionException e) {\n\t\t\tthrow new InvalidDataAccessResourceUsageException(\"Not in a Neo4j transaction.\", e);\n\t\t}\n\t}\n\n\tprivate void postEntityCreation(NodeBacked entity) {\n\t\tNode subReference = Neo4jHelper.findSubreferenceNode(entity.getClass(), graphDatabaseService);\n\t\tentity.getUnderlyingNode().createRelationshipTo(subReference, Neo4jHelper.INSTANCE_OF_RELATIONSHIP_TYPE);\n\t\tGraphDatabaseUtil.incrementAndGetCounter(subReference, Neo4jHelper.SUBREFERENCE_NODE_COUNTER_KEY);\n\t}\n\t\n\t\/\/ Introduced field\n\tprivate Node NodeBacked.underlyingNode;\n\t\n\tpublic void NodeBacked.setUnderlyingNode(Node n) {\n\t\tthis.underlyingNode = n;\n\t}\n\t\n\tpublic Node NodeBacked.getUnderlyingNode() {\n\t\treturn underlyingNode;\n\t}\n\t\n\tpublic Relationship NodeBacked.relateTo(NodeBacked nb, RelationshipType type) {\n\t\treturn this.underlyingNode.createRelationshipTo(nb.getUnderlyingNode(), type);\n\t}\n\n\tpublic long NodeBacked.getId() {\n\t\treturn underlyingNode.getId();\n\t}\n\t\n\t\n\t\/\/-------------------------------------------------------------------------\n\t\/\/ Equals and hashCode for Neo4j entities.\n\t\/\/ Final to prevent overriding.\n\t\/\/-------------------------------------------------------------------------\n\t\/\/ TODO could use template method for further checks if needed\n\tpublic final boolean NodeBacked.equals(Object obj) {\n\t\tif (obj instanceof NodeBacked) {\n\t\t\treturn this.getUnderlyingNode().equals(((NodeBacked) obj).getUnderlyingNode());\n\t\t}\n\t\treturn false;\n\t}\n\t\n\tpublic final int NodeBacked.hashCode() {\n\t\treturn getUnderlyingNode().hashCode();\n\t}\n\n\tObject around(NodeBacked entity) : entityFieldGet(entity) {\t\n\t\tFieldSignature fieldSignature=(FieldSignature) thisJoinPoint.getSignature();\n\t\tField f = fieldSignature.getField();\n\t\t\n\t\t\/\/ TODO fix arrays, TODO serialize other types as byte[] or string (for indexing, querying) via Annotation\n\t\tif (isPropertyType(f.getType())) {\n\t\t\tString propName = FieldAccessorFactory.getNeo4jPropertyName(f);\n\t\t\tlog.info(\"GET \" + f + \" <- Neo4J simple node property [\" + propName + \"]\");\n\t\t\treturn entity.getUnderlyingNode().getProperty(propName, null);\n\t\t}\n\t\t\n\t\tFieldAccessor accessor = fieldAccessorFactory.forField(f);\n\t\tObject obj = accessor.readObject(entity);\n\t\tif (obj == null) {\n\t\t\tlog.info(\"Ignored GET \" + f + \": \" + f.getType().getName() + \" not primitive or GraphEntity\");\n\t\t\treturn proceed(entity);\n\t\t}\n\t\treturn obj;\n\t}\n\t\n\tObject around(NodeBacked entity, Object newVal) : entityFieldSet(entity, newVal) {\n\t\ttry {\n\t\t\tFieldSignature fieldSignature=(FieldSignature) thisJoinPoint.getSignature();\n\t\t\tField f = fieldSignature.getField();\n\t\t\t\/\/ TODO fix arrays\n\t\t\tClass<?> fieldType = f.getType();\n\t\t\tif (isPropertyType(fieldType)) {\n\t\t\t\tString propName = FieldAccessorFactory.getNeo4jPropertyName(f);\n\t\t\t\tentity.getUnderlyingNode().setProperty(propName, newVal);\n\t\t\t\tlog.info(\"SET \" + f + \" -> Neo4J simple node property [\" + propName + \"] with value=[\" + newVal + \"]\");\n\t\t\t\treturn proceed(entity, newVal);\n\t\t\t}\n\t\t\t\n\t\t\tFieldAccessor accessor = fieldAccessorFactory.forField(f);\n\t\t\tif (accessor == null) {\n\t\t\t\tlog.info(\"Ignored SET \" + f + \": \" + f.getType().getName() + \" not primitive or GraphEntity\");\n\t\t\t\treturn proceed(entity, newVal);\n\t\t\t}\n\t\t\tlog.info(\"SET \" + f + \" -> Neo4J relationship with value=[\" + newVal + \"]\");\n\t\t\tObject result = accessor.apply(entity, newVal);\n\t\t\treturn proceed(entity,result);\n\t\t} catch(NotInTransactionException e) {\n\t\t\tthrow new InvalidDataAccessResourceUsageException(\"Not in a Neo4j transaction.\", e);\n\t\t}\n\t}\n\n\tprivate boolean isPropertyType(Class<?> fieldType) {\n\t\t\/\/ todo: add array support\n\t\treturn fieldType.isPrimitive()\n\t  \t\t|| (fieldType.isArray() && !fieldType.getComponentType().isArray() && isPropertyType(fieldType.getComponentType()))\n\t  \t\t|| fieldType.equals(String.class)\n\t  \t\t|| fieldType.equals(Character.class)\n\t  \t\t|| fieldType.equals(Boolean.class)\n\t  \t\t|| (fieldType.getName().startsWith(\"java.lang\") && Number.class.isAssignableFrom(fieldType));\n\t}\n\t\n}\n","old_contents":"package org.springframework.persistence.graph.neo4j;\n\nimport java.lang.reflect.Field;\nimport java.util.AbstractSet;\nimport java.util.Collection;\nimport java.util.HashSet;\nimport java.util.Iterator;\nimport java.util.Set;\n\nimport org.aspectj.lang.reflect.FieldSignature;\nimport org.neo4j.graphdb.Direction;\nimport org.neo4j.graphdb.DynamicRelationshipType;\nimport org.neo4j.graphdb.GraphDatabaseService;\nimport org.neo4j.graphdb.Node;\nimport org.neo4j.graphdb.NotInTransactionException;\nimport org.neo4j.graphdb.Relationship;\nimport org.neo4j.graphdb.RelationshipType;\nimport org.neo4j.util.GraphDatabaseUtil;\nimport org.springframework.beans.factory.annotation.Autowired;\nimport org.springframework.dao.InvalidDataAccessApiUsageException;\nimport org.springframework.dao.InvalidDataAccessResourceUsageException;\nimport org.springframework.persistence.graph.Graph;\nimport org.springframework.persistence.support.AbstractTypeAnnotatingMixinFields;\nimport org.springframework.persistence.support.EntityInstantiator;\n\n\/**\n * Aspect to turn an object annotated with GraphEntity into a graph entity using Neo4J.\n * Delegates all field access (except for fields assumed to be transient)\n * to an underlying Neo4 graph node.\n * \n * @author Rod Johnson\n *\/\npublic aspect Neo4jNodeBacking extends AbstractTypeAnnotatingMixinFields<Graph.Entity,NodeBacked> {\n\t\n\t\/\/-------------------------------------------------------------------------\n\t\/\/ Configure aspect for whole system.\n\t\/\/ init() method can be invoked automatically if the aspect is a Spring\n\t\/\/ bean, or called in user code.\n\t\/\/-------------------------------------------------------------------------\n\t\/\/ Aspect shared Neo4J Graph Database Service\n\tprivate GraphDatabaseService graphDatabaseService;\n\t\n\tprivate EntityInstantiator<NodeBacked, Node> graphEntityInstantiator;\n\n\tprivate FieldAccessorFactory fieldAccessorFactory;\n\n\tprivate EntityInstantiator<RelationshipBacked, Relationship> relationshipEntityInstantiator;\n\t\n\t@Autowired\n\tpublic void init(GraphDatabaseService gds, EntityInstantiator<NodeBacked, Node> gei, EntityInstantiator<RelationshipBacked, Relationship> rei) {\n\t\tthis.graphDatabaseService = gds;\n\t\tthis.graphEntityInstantiator = gei;\n\t\tthis.relationshipEntityInstantiator = rei;\n\t\tthis.fieldAccessorFactory = new FieldAccessorFactory(graphEntityInstantiator, relationshipEntityInstantiator);\n\t}\n\t\n\t\n\t\/\/-------------------------------------------------------------------------\n\t\/\/ Advise user-defined constructors of NodeBacked objects to create a new\n\t\/\/ Neo4J backing node\n\t\/\/-------------------------------------------------------------------------\n\tpointcut arbitraryUserConstructorOfNodeBackedObject(NodeBacked entity) : \n\t\texecution((@Graph.Entity *).new(..)) &&\n\t\t!execution((@Graph.Entity *).new(Node)) &&\n\t\tthis(entity);\n\t\n\t\n\t\/\/ Create a new node in the Graph if no Node was passed in a constructor\n\tbefore(NodeBacked entity) : arbitraryUserConstructorOfNodeBackedObject(entity) {\n\t\ttry {\n\t\t\tentity.setUnderlyingNode(graphDatabaseService.createNode());\n\t\t\tlog.info(\"User-defined constructor called on class \" + entity.getClass() + \"; created Node [\" + entity.getUnderlyingNode() +\"]; \" +\n\t\t\t\t\t\"Updating metamodel\");\n\t\t\t\/\/ TODO pull naming out into a strategy interface, todo a separate one, or the Entity Instatiator\n\t\t\t\/\/ graphEntityInstantiator.postEntityCreation(entity);\n\t\t\tpostEntityCreation(entity);\n\t\t} catch(NotInTransactionException e) {\n\t\t\tthrow new InvalidDataAccessResourceUsageException(\"Not in a Neo4j transaction.\", e);\n\t\t}\n\t}\n\n\tprivate void postEntityCreation(NodeBacked entity) {\n\t\tNode subReference = Neo4jHelper.findSubreferenceNode(entity.getClass(), graphDatabaseService);\n\t\tentity.getUnderlyingNode().createRelationshipTo(subReference, Neo4jHelper.INSTANCE_OF_RELATIONSHIP_TYPE);\n\t\tGraphDatabaseUtil.incrementAndGetCounter(subReference, Neo4jHelper.SUBREFERENCE_NODE_COUNTER_KEY);\n\t}\n\t\n\t\/\/ Introduced field\n\tprivate Node NodeBacked.underlyingNode;\n\t\n\tpublic void NodeBacked.setUnderlyingNode(Node n) {\n\t\tthis.underlyingNode = n;\n\t}\n\t\n\tpublic Node NodeBacked.getUnderlyingNode() {\n\t\treturn underlyingNode;\n\t}\n\t\n\tpublic Relationship NodeBacked.relateTo(NodeBacked nb, RelationshipType type) {\n\t\treturn this.underlyingNode.createRelationshipTo(nb.getUnderlyingNode(), type);\n\t}\n\n\tpublic long NodeBacked.getId() {\n\t\treturn underlyingNode.getId();\n\t}\n\t\n\t\n\t\/\/-------------------------------------------------------------------------\n\t\/\/ Equals and hashCode for Neo4j entities.\n\t\/\/ Final to prevent overriding.\n\t\/\/-------------------------------------------------------------------------\n\t\/\/ TODO could use template method for further checks if needed\n\tpublic final boolean NodeBacked.equals(Object obj) {\n\t\tif (obj instanceof NodeBacked) {\n\t\t\treturn this.getUnderlyingNode().equals(((NodeBacked) obj).getUnderlyingNode());\n\t\t}\n\t\treturn false;\n\t}\n\t\n\tpublic final int NodeBacked.hashCode() {\n\t\treturn getUnderlyingNode().hashCode();\n\t}\n\n\tObject around(NodeBacked entity) : entityFieldGet(entity) {\t\n\t\tFieldSignature fieldSignature=(FieldSignature) thisJoinPoint.getSignature();\n\t\tField f = fieldSignature.getField();\n\t\t\n\t\t\/\/ TODO fix arrays, TODO serialize other types as byte[] or string (for indexing, querying) via Annotation\n\t\tif (isPropertyType(f.getType())) {\n\t\t\tString propName = FieldAccessorFactory.getNeo4jPropertyName(f);\n\t\t\tlog.info(\"GET \" + f + \" <- Neo4J simple node property [\" + propName + \"]\");\n\t\t\treturn entity.getUnderlyingNode().getProperty(propName, null);\n\t\t}\n\t\t\n\t\tFieldAccessor accessor = fieldAccessorFactory.forField(f);\n\t\tObject obj = accessor.readObject(entity);\n\t\tif (obj == null) {\n\t\t\tlog.info(\"Ignored GET \" + f + \": \" + f.getType().getName() + \" not primitive or GraphEntity\");\n\t\t\treturn proceed(entity);\n\t\t}\n\t\treturn obj;\n\t}\n\t\n\tObject around(NodeBacked entity, Object newVal) : entityFieldSet(entity, newVal) {\n\t\ttry {\n\t\t\tFieldSignature fieldSignature=(FieldSignature) thisJoinPoint.getSignature();\n\t\t\tField f = fieldSignature.getField();\n\t\t\t\/\/ TODO fix arrays\n\t\t\tClass<?> fieldType = f.getType();\n\t\t\tif (isPropertyType(fieldType)) {\n\t\t\t\tString propName = FieldAccessorFactory.getNeo4jPropertyName(f);\n\t\t\t\tentity.getUnderlyingNode().setProperty(propName, newVal);\n\t\t\t\tlog.info(\"SET \" + f + \" -> Neo4J simple node property [\" + propName + \"] with value=[\" + newVal + \"]\");\n\t\t\t\treturn proceed(entity, newVal);\n\t\t\t}\n\t\t\t\n\t\t\tFieldAccessor accessor = fieldAccessorFactory.forField(f);\n\t\t\tif (accessor == null) {\n\t\t\t\tlog.info(\"Ignored SET \" + f + \": \" + f.getType().getName() + \" not primitive or GraphEntity\");\n\t\t\t\treturn proceed(entity, newVal);\n\t\t\t}\n\t\t\tlog.info(\"SET \" + f + \" -> Neo4J relationship with value=[\" + newVal + \"]\");\n\t\t\tObject result = accessor.apply(entity, newVal);\n\t\t\treturn proceed(entity,result);\n\t\t} catch(NotInTransactionException e) {\n\t\t\tthrow new InvalidDataAccessResourceUsageException(\"Not in a Neo4j transaction.\", e);\n\t\t}\n\t}\n\n\tprivate boolean isPropertyType(Class<?> fieldType) {\n\t\t\/\/ todo: add array support\n\t\treturn fieldType.isPrimitive()\n\t  \t\t|| (fieldType.isArray() && !fieldType.getComponentType().isArray() && isPropertyType(fieldType.getComponentType()))\n\t  \t\t|| fieldType.equals(String.class)\n\t  \t\t|| fieldType.equals(Character.class)\n\t  \t\t|| fieldType.equals(Boolean.class)\n\t  \t\t|| (fieldType.getName().startsWith(\"java.lang\") && Number.class.isAssignableFrom(fieldType));\n\t}\n\t\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"7b89fd37925e49afd911fe054c2cbcd7405b1c82","subject":"redeclared Map as ConcurrentHashMap","message":"redeclared Map as ConcurrentHashMap\n","repos":"eigengo\/monitor,eigengo\/monitor,DataDog\/monitor,DataDog\/monitor","old_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/ActorCellMonitoringAspect.aj","new_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/ActorCellMonitoringAspect.aj","new_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.actor.*;\nimport org.eigengo.monitor.agent.AgentConfiguration;\nimport org.eigengo.monitor.output.CounterInterface;\nimport scala.Option;\n\nimport java.util.ArrayList;\nimport java.util.List;\nimport java.util.concurrent.atomic.AtomicInteger;\nimport java.util.concurrent.atomic.AtomicLong;\nimport java.util.concurrent.ConcurrentHashMap;\n\n\/**\n * Contains advices for monitoring behaviour of an actor; typically imprisoned in an {@code ActorCell}.\n *\/\npublic aspect ActorCellMonitoringAspect extends AbstractMonitoringAspect issingleton() {\n    private AkkaAgentConfiguration agentConfiguration;\n    private final CounterInterface counterInterface;\n    private final Option<String> noActorClazz = Option.empty();\n    private final ConcurrentHashMap<Option<String>, AtomicLong> samplingCounters  = new ConcurrentHashMap<Option<String>, AtomicLong>();\n    private final ConcurrentHashMap<Option<String>, AtomicInteger> numberOfActors = new ConcurrentHashMap<Option<String>, AtomicInteger>();\n\n\n    \/**\n     * Constructs this aspect\n     *\/\n    public ActorCellMonitoringAspect() {\n        AgentConfiguration<AkkaAgentConfiguration> configuration = getAgentConfiguration(\"akka\", AkkaAgentConfigurationJapi.apply());\n        this.agentConfiguration = configuration.agent();\n        this.counterInterface = createCounterInterface(configuration.common());\n    }\n\n    \/**\n     * Injects the new {@code AkkaAgentConfiguration} instance.\n     *\n     * @param agentConfiguration the new configuration\n     *\/\n    synchronized final void setAgentConfiguration(AkkaAgentConfiguration agentConfiguration) {\n        this.agentConfiguration = agentConfiguration;\n    }\n\n    \/\/ decide whether to include this ActorCell in our measurements\n    private boolean includeActorPath(final PathAndClass pathAndClass) {\n        if (!this.agentConfiguration.incuded().accept(pathAndClass)) return false;\n        if (this.agentConfiguration.excluded().accept(pathAndClass)) return false;\n\n        if (this.agentConfiguration.includeSystemAgents()) return true;\n\n        String userOrSystem = pathAndClass.actorPath().getElements().iterator().next();\n        return \"user\".equals(userOrSystem);\n    }\n\n    \/\/ get the sample rate for an actor\n    private int getSampleRate(final PathAndClass pathAndClass) {\n        return this.agentConfiguration.sampling().getRate(pathAndClass);\n    }\n\n    \/\/ decide whether to sample an actor on a particular occasion\n    private final boolean sampleMessage(final PathAndClass pathAndClass) {\n        int sampleRate = getSampleRate(pathAndClass);\n        if (sampleRate == 1) return true;\n\n        this.samplingCounters.putIfAbsent(pathAndClass.actorClassName(), new AtomicLong(0));\n        long timesSeenSoFar = this.samplingCounters.get(pathAndClass.actorClassName()).incrementAndGet();\n        return (timesSeenSoFar % sampleRate == 1); \/\/ == 1 to log first value (incrementAndGet returns updated value)\n    }\n\n    \/\/ get the tags for the cell\n    private String[] getTags(final ActorPath actorPath, final Actor actor) {\n        List<String> tags = new ArrayList<String>();\n\n        \/\/ TODO: Improve detection of routed actors. This relies only on the naming :(.\n        String lastPathElement = actorPath.elements().last();\n        if (lastPathElement.startsWith(\"$\")) {\n            \/\/ this is routed actor.\n            tags.add(actorPath.parent().toString());\n            if (this.agentConfiguration.includeRoutees()) tags.add(actorPath.toString());\n        } else {\n            \/\/ there is no supervisor\n            tags.add(actorPath.toString());\n        }\n        if (actor != null) {\n            tags.add(String.format(\"akka:%s.%s\", actor.context().system().name(), actor.getClass().getCanonicalName()));\n        }\n\n        return tags.toArray(new String[tags.size()]);\n    }\n\n    \/\/ returns the canonical name of the actor type associated with an ActorCell\n    private String uncheckedActorNameFrom(final ActorCell actorCell) {\n        return uncheckedActorNameFrom(actorCell.props());\n    }\n\n    \/\/ returns the canonical name of the actor type associated with a Props instance\n    private String uncheckedActorNameFrom(final Props props) {\n        return props.actorClass().getCanonicalName();\n    }\n\n    \/**\n     * Advises the {@code ActorCell.receiveMessage(message: Object): Unit}\n     * We proceed with the pointcut if the actor is to be included in the monitoring *and* this is\n     * the 'multiple-of-n'th time we've seen a message for an actor with a sample rate of n.\n     *\n     * Currently, we sample queue size, the fact that the message is delivered, the simple name of the class of the\n     * message, and the time taken to complete the actor's reactive action.\n     *\n     * @param actorCell the ActorCell where the actor that receives the message \"lives\"\n     * @param msg the incoming message\n     *\/\n    Object around(ActorCell actorCell, Object msg) : Pointcuts.actorCellReceiveMessage(actorCell, msg) {\n        final ActorPath actorPath = actorCell.self().path();\n        final PathAndClass pathAndClass = new PathAndClass(actorPath, Option.apply(uncheckedActorNameFrom(actorCell)));\n        if (!includeActorPath(pathAndClass) || !sampleMessage(pathAndClass)) return proceed(actorCell, msg);\n\n        int samplingRate = getSampleRate(pathAndClass);\n\n        \/\/ we tag by actor name\n        final String[] tags = getTags(actorPath, actorCell.actor());\n\n        \/\/ record the queue size\n        this.counterInterface.recordGaugeValue(\"akka.queue.size\", actorCell.numberOfMessages(), tags);\n        \/\/ record the message, general and specific\n        this.counterInterface.incrementCounter(\"akka.actor.delivered\", samplingRate, tags);\n        this.counterInterface.incrementCounter(\"akka.actor.delivered.\" + msg.getClass().getSimpleName(), samplingRate, tags);\n\n        \/\/ measure the time. we're using the ``nanoTime`` call to access the high-precision timer.\n        \/\/ since we're not really interested in wall time, but just some increasing measure of\n        \/\/ elapsed time\n        Object result = null;\n        final long start = System.nanoTime();\n        \/\/ result will always be ``null``, because target returns ``Unit``\n        result = proceed(actorCell, msg);\n        \/\/ ns or \u00b5s is too fine. ms will do for now.\n        final long duration = (System.nanoTime() - start) \/ 1000000;\n\n        \/\/ record the actor duration\n        this.counterInterface.recordExecutionTime(\"akka.actor.duration\", (int)duration, tags);\n\n        \/\/ return null would do the trick, but we want to be _proper_.\n        return result;\n    }\n\n    \/**\n     * Advises the {@code ActorCell.handleInvokeFailure(_, failure: Throwable): Unit}\n     *\n     * @param actorCell the ActorCell where the error spreads from\n     * @param failure the exception that escaped from the {@code receive} method\n     *\/\n    before(ActorCell actorCell, Throwable failure) : Pointcuts.actorCellHandleInvokeFailure(actorCell, failure) {\n        \/\/ record the error, general and specific\n        String[] tags = getTags(actorCell.self().path(), actorCell.actor());\n        this.counterInterface.incrementCounter(\"akka.actor.error\", tags);\n        this.counterInterface.incrementCounter(String.format(\"akka.actor.error.%s\", failure.getMessage()), tags);\n    }\n\n    \/**\n     * Advises the {@code EventStream.publish(event: Any): Unit}\n     *\n     * @param event the received event\n     *\/\n    before(Object event) : Pointcuts.eventStreamPublish(event) {\n        if (event instanceof UnhandledMessage) {\n            UnhandledMessage unhandledMessage = (UnhandledMessage)event;\n            String[] tags = getTags(unhandledMessage.recipient().path(), null);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered\", tags);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered.\" + unhandledMessage.getMessage().getClass().getSimpleName(), tags);\n        }\n    }\n\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorCell} and {@code ActorSystem}\n     *\n     * @param props the {@code Props} instance used in the call\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after(Props props) returning (ActorRef actor): Pointcuts.anyActorOf(props) {\n        recordActorCreation(props, actor);\n    }\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorCell} and {@code ActorSystem} when actor is named in construction\n     *\n     * @param props the {@code Props} instance used in the call\n     * @param actorName the {@code String} used to name the actor at creation site\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after(Props props, String actorName) returning (ActorRef actor): Pointcuts.namedActorOf(props, actorName) {\n        recordActorCreation(props, actor);\n    }\n\n    \/\/ method containing the recording logic for advising actor creation\n    private void recordActorCreation(Props props, ActorRef actor) {\n        if (!includeActorPath(new PathAndClass(actor.path(), this.noActorClazz))) return;\n        final String uncheckedClassName = uncheckedActorNameFrom(props);\n        final Option<String> className = Option.apply(uncheckedClassName);\n\n        this.numberOfActors.putIfAbsent(className, new AtomicInteger(0));\n        \/\/ increment and get the current number of actors of this type (if the value was 0, then this returns 1 -- which is correct)\n        final int currentNumberOfActors = this.numberOfActors.get(className).incrementAndGet();\n\n        \/\/ record the current number of actors of this type\n        this.counterInterface.recordGaugeValue(\"akka.actor.count\", currentNumberOfActors, uncheckedClassName);\n    }\n\n    \/**\n     * Advises the {@code LocalActorRef.stop} method\n     *\n     *\n     * @param actorCell the {@code ActorCell} of the actor being stopped\n     *\/\n    after(ActorCell actorCell) : Pointcuts.actorCellInternalStop(actorCell) {\n        if (!includeActorPath(new PathAndClass(actorCell.self().path(), this.noActorClazz))) return;\n        final String uncheckedClassName = uncheckedActorNameFrom(actorCell);\n        final Option<String> className = Option.apply(uncheckedClassName);\n\n        this.numberOfActors.putIfAbsent(className, new AtomicInteger(0));\n        \/\/ decrement and get the current number of actors of this type (if the value was 1, then this returns 0 -- which is correct)\n        final int currentNumberOfActors = this.numberOfActors.get(className).decrementAndGet();\n\n        this.counterInterface.recordGaugeValue(\"akka.actor.count\", currentNumberOfActors, uncheckedClassName);\n    }\n\n}","old_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.actor.*;\nimport org.eigengo.monitor.agent.AgentConfiguration;\nimport org.eigengo.monitor.output.CounterInterface;\nimport scala.Option;\n\nimport java.util.ArrayList;\nimport java.util.List;\nimport java.util.concurrent.atomic.AtomicInteger;\nimport java.util.concurrent.atomic.AtomicLong;\nimport java.util.concurrent.ConcurrentHashMap;\n\n\/**\n * Contains advices for monitoring behaviour of an actor; typically imprisoned in an {@code ActorCell}.\n *\/\npublic aspect ActorCellMonitoringAspect extends AbstractMonitoringAspect issingleton() {\n    private AkkaAgentConfiguration agentConfiguration;\n    private final CounterInterface counterInterface;\n    private final Option<String> noActorClazz = Option.empty();\n    private final Map<Option<String>, AtomicLong> samplingCounters  = new ConcurrentHashMap<Option<String>, AtomicLong>();\n    private final Map<Option<String>, AtomicInteger> numberOfActors = new ConcurrentHashMap<Option<String>, AtomicInteger>();\n\n\n    \/**\n     * Constructs this aspect\n     *\/\n    public ActorCellMonitoringAspect() {\n        AgentConfiguration<AkkaAgentConfiguration> configuration = getAgentConfiguration(\"akka\", AkkaAgentConfigurationJapi.apply());\n        this.agentConfiguration = configuration.agent();\n        this.counterInterface = createCounterInterface(configuration.common());\n    }\n\n    \/**\n     * Injects the new {@code AkkaAgentConfiguration} instance.\n     *\n     * @param agentConfiguration the new configuration\n     *\/\n    synchronized final void setAgentConfiguration(AkkaAgentConfiguration agentConfiguration) {\n        this.agentConfiguration = agentConfiguration;\n    }\n\n    \/\/ decide whether to include this ActorCell in our measurements\n    private boolean includeActorPath(final PathAndClass pathAndClass) {\n        if (!this.agentConfiguration.incuded().accept(pathAndClass)) return false;\n        if (this.agentConfiguration.excluded().accept(pathAndClass)) return false;\n\n        if (this.agentConfiguration.includeSystemAgents()) return true;\n\n        String userOrSystem = pathAndClass.actorPath().getElements().iterator().next();\n        return \"user\".equals(userOrSystem);\n    }\n\n    \/\/ get the sample rate for an actor\n    private int getSampleRate(final PathAndClass pathAndClass) {\n        return this.agentConfiguration.sampling().getRate(pathAndClass);\n    }\n\n    \/\/ decide whether to sample an actor on a particular occasion\n    private final boolean sampleMessage(final PathAndClass pathAndClass) {\n        int sampleRate = getSampleRate(pathAndClass);\n        if (sampleRate == 1) return true;\n\n        this.samplingCounters.putIfAbsent(pathAndClass.actorClassName(), new AtomicLong(0));\n        long timesSeenSoFar = this.samplingCounters.get(pathAndClass.actorClassName()).incrementAndGet();\n        return (timesSeenSoFar % sampleRate == 1); \/\/ == 1 to log first value (incrementAndGet returns updated value)\n    }\n\n    \/\/ get the tags for the cell\n    private String[] getTags(final ActorPath actorPath, final Actor actor) {\n        List<String> tags = new ArrayList<String>();\n\n        \/\/ TODO: Improve detection of routed actors. This relies only on the naming :(.\n        String lastPathElement = actorPath.elements().last();\n        if (lastPathElement.startsWith(\"$\")) {\n            \/\/ this is routed actor.\n            tags.add(actorPath.parent().toString());\n            if (this.agentConfiguration.includeRoutees()) tags.add(actorPath.toString());\n        } else {\n            \/\/ there is no supervisor\n            tags.add(actorPath.toString());\n        }\n        if (actor != null) {\n            tags.add(String.format(\"akka:%s.%s\", actor.context().system().name(), actor.getClass().getCanonicalName()));\n        }\n\n        return tags.toArray(new String[tags.size()]);\n    }\n\n    \/\/ returns the canonical name of the actor type associated with an ActorCell\n    private String uncheckedActorNameFrom(final ActorCell actorCell) {\n        return uncheckedActorNameFrom(actorCell.props());\n    }\n\n    \/\/ returns the canonical name of the actor type associated with a Props instance\n    private String uncheckedActorNameFrom(final Props props) {\n        return props.actorClass().getCanonicalName();\n    }\n\n    \/**\n     * Advises the {@code ActorCell.receiveMessage(message: Object): Unit}\n     * We proceed with the pointcut if the actor is to be included in the monitoring *and* this is\n     * the 'multiple-of-n'th time we've seen a message for an actor with a sample rate of n.\n     *\n     * Currently, we sample queue size, the fact that the message is delivered, the simple name of the class of the\n     * message, and the time taken to complete the actor's reactive action.\n     *\n     * @param actorCell the ActorCell where the actor that receives the message \"lives\"\n     * @param msg the incoming message\n     *\/\n    Object around(ActorCell actorCell, Object msg) : Pointcuts.actorCellReceiveMessage(actorCell, msg) {\n        final ActorPath actorPath = actorCell.self().path();\n        final PathAndClass pathAndClass = new PathAndClass(actorPath, Option.apply(uncheckedActorNameFrom(actorCell)));\n        if (!includeActorPath(pathAndClass) || !sampleMessage(pathAndClass)) return proceed(actorCell, msg);\n\n        int samplingRate = getSampleRate(pathAndClass);\n\n        \/\/ we tag by actor name\n        final String[] tags = getTags(actorPath, actorCell.actor());\n\n        \/\/ record the queue size\n        this.counterInterface.recordGaugeValue(\"akka.queue.size\", actorCell.numberOfMessages(), tags);\n        \/\/ record the message, general and specific\n        this.counterInterface.incrementCounter(\"akka.actor.delivered\", samplingRate, tags);\n        this.counterInterface.incrementCounter(\"akka.actor.delivered.\" + msg.getClass().getSimpleName(), samplingRate, tags);\n\n        \/\/ measure the time. we're using the ``nanoTime`` call to access the high-precision timer.\n        \/\/ since we're not really interested in wall time, but just some increasing measure of\n        \/\/ elapsed time\n        Object result = null;\n        final long start = System.nanoTime();\n        \/\/ result will always be ``null``, because target returns ``Unit``\n        result = proceed(actorCell, msg);\n        \/\/ ns or \u00b5s is too fine. ms will do for now.\n        final long duration = (System.nanoTime() - start) \/ 1000000;\n\n        \/\/ record the actor duration\n        this.counterInterface.recordExecutionTime(\"akka.actor.duration\", (int)duration, tags);\n\n        \/\/ return null would do the trick, but we want to be _proper_.\n        return result;\n    }\n\n    \/**\n     * Advises the {@code ActorCell.handleInvokeFailure(_, failure: Throwable): Unit}\n     *\n     * @param actorCell the ActorCell where the error spreads from\n     * @param failure the exception that escaped from the {@code receive} method\n     *\/\n    before(ActorCell actorCell, Throwable failure) : Pointcuts.actorCellHandleInvokeFailure(actorCell, failure) {\n        \/\/ record the error, general and specific\n        String[] tags = getTags(actorCell.self().path(), actorCell.actor());\n        this.counterInterface.incrementCounter(\"akka.actor.error\", tags);\n        this.counterInterface.incrementCounter(String.format(\"akka.actor.error.%s\", failure.getMessage()), tags);\n    }\n\n    \/**\n     * Advises the {@code EventStream.publish(event: Any): Unit}\n     *\n     * @param event the received event\n     *\/\n    before(Object event) : Pointcuts.eventStreamPublish(event) {\n        if (event instanceof UnhandledMessage) {\n            UnhandledMessage unhandledMessage = (UnhandledMessage)event;\n            String[] tags = getTags(unhandledMessage.recipient().path(), null);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered\", tags);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered.\" + unhandledMessage.getMessage().getClass().getSimpleName(), tags);\n        }\n    }\n\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorCell} and {@code ActorSystem}\n     *\n     * @param props the {@code Props} instance used in the call\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after(Props props) returning (ActorRef actor): Pointcuts.anyActorOf(props) {\n        recordActorCreation(props, actor);\n    }\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorCell} and {@code ActorSystem} when actor is named in construction\n     *\n     * @param props the {@code Props} instance used in the call\n     * @param actorName the {@code String} used to name the actor at creation site\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after(Props props, String actorName) returning (ActorRef actor): Pointcuts.namedActorOf(props, actorName) {\n        recordActorCreation(props, actor);\n    }\n\n    \/\/ method containing the recording logic for advising actor creation\n    private void recordActorCreation(Props props, ActorRef actor) {\n        if (!includeActorPath(new PathAndClass(actor.path(), this.noActorClazz))) return;\n        final String uncheckedClassName = uncheckedActorNameFrom(props);\n        final Option<String> className = Option.apply(uncheckedClassName);\n\n        this.numberOfActors.putIfAbsent(className, new AtomicInteger(0));\n        \/\/ increment and get the current number of actors of this type (if the value was 0, then this returns 1 -- which is correct)\n        final int currentNumberOfActors = this.numberOfActors.get(className).incrementAndGet();\n\n        \/\/ record the current number of actors of this type\n        this.counterInterface.recordGaugeValue(\"akka.actor.count\", currentNumberOfActors, uncheckedClassName);\n    }\n\n    \/**\n     * Advises the {@code LocalActorRef.stop} method\n     *\n     *\n     * @param actorCell the {@code ActorCell} of the actor being stopped\n     *\/\n    after(ActorCell actorCell) : Pointcuts.actorCellInternalStop(actorCell) {\n        if (!includeActorPath(new PathAndClass(actorCell.self().path(), this.noActorClazz))) return;\n        final String uncheckedClassName = uncheckedActorNameFrom(actorCell);\n        final Option<String> className = Option.apply(uncheckedClassName);\n\n        this.numberOfActors.putIfAbsent(className, new AtomicInteger(0));\n        \/\/ decrement and get the current number of actors of this type (if the value was 1, then this returns 0 -- which is correct)\n        final int currentNumberOfActors = this.numberOfActors.get(className).decrementAndGet();\n\n        this.counterInterface.recordGaugeValue(\"akka.actor.count\", currentNumberOfActors, uncheckedClassName);\n    }\n\n}","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"e003cb62ed169c172db89f54b2d1498417c68b10","subject":"Add the missing '== null' check","message":"Add the missing '== null' check\n","repos":"aleksi-lukkarinen\/scala-ide,sschaef\/scala-ide,wpopielarski\/scala-ide,stephenh\/scala-ide,pilipolio\/scala-ide,Kwestor\/scala-ide,romanowski\/scala-ide,andrey-ilinykh\/scala-ide,stephenh\/scala-ide,Duhemm\/scala-ide,pilipolio\/scala-ide,scala-ide\/scala-ide,scala-ide\/scala-ide,Kwestor\/scala-ide,mlangc\/scala-ide,mlangc\/scala-ide,pilipolio\/scala-ide,romanowski\/scala-ide,mlangc\/scala-ide,sschaef\/scala-ide,sschaef\/scala-ide,Duhemm\/scala-ide,wpopielarski\/scala-ide,andrey-ilinykh\/scala-ide,wpopielarski\/scala-ide,stephenh\/scala-ide,romanowski\/scala-ide,stephenh\/scala-ide,scala-ide\/scala-ide,dragos\/scala-ide,andrey-ilinykh\/scala-ide,sschaef\/scala-ide,andrey-ilinykh\/scala-ide,pilipolio\/scala-ide,dragos\/scala-ide,Duhemm\/scala-ide,aleksi-lukkarinen\/scala-ide,Kwestor\/scala-ide,Duhemm\/scala-ide,romanowski\/scala-ide,mlangc\/scala-ide,dragos\/scala-ide,wpopielarski\/scala-ide,aleksi-lukkarinen\/scala-ide,scala-ide\/scala-ide,aleksi-lukkarinen\/scala-ide,Kwestor\/scala-ide,dragos\/scala-ide","old_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/core\/DOMAspect.aj","new_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/core\/DOMAspect.aj","new_contents":"\/*\n * Copyright 2005-2010 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.core;\n\nimport java.util.Locale;\nimport java.util.Map;\n\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.core.ICompilationUnit;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.core.compiler.CharOperation;\nimport org.eclipse.jdt.core.dom.AST;\nimport org.eclipse.jdt.core.dom.ASTNode;\nimport org.eclipse.jdt.core.dom.ASTParser;\nimport org.eclipse.jdt.internal.compiler.CompilationResult;\nimport org.eclipse.jdt.internal.compiler.DefaultErrorHandlingPolicies;\nimport org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.AbstractVariableDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.AnnotationMethodDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.Argument;\nimport org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.ConstructorDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.Expression;\nimport org.eclipse.jdt.internal.compiler.ast.MethodDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.QualifiedAllocationExpression;\nimport org.eclipse.jdt.internal.compiler.ast.Statement;\nimport org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.TypeParameter;\nimport org.eclipse.jdt.internal.compiler.ast.TypeReference;\nimport org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;\nimport org.eclipse.jdt.internal.compiler.env.AccessRestriction;\nimport org.eclipse.jdt.internal.compiler.env.IBinaryType;\nimport org.eclipse.jdt.internal.compiler.env.INameEnvironment;\nimport org.eclipse.jdt.internal.compiler.env.ISourceType;\nimport org.eclipse.jdt.internal.compiler.impl.CompilerOptions;\nimport org.eclipse.jdt.internal.compiler.impl.ITypeRequestor;\nimport org.eclipse.jdt.internal.compiler.lookup.LookupEnvironment;\nimport org.eclipse.jdt.internal.compiler.lookup.PackageBinding;\nimport org.eclipse.jdt.internal.compiler.parser.SourceTypeConverter;\nimport org.eclipse.jdt.internal.compiler.problem.DefaultProblemFactory;\nimport org.eclipse.jdt.internal.compiler.problem.ProblemReporter;\nimport org.eclipse.jdt.internal.core.DefaultWorkingCopyOwner;\nimport org.eclipse.jdt.internal.core.JavaProject;\nimport org.eclipse.jdt.internal.core.SourceAnnotationMethodInfo;\nimport org.eclipse.jdt.internal.core.SourceMethod;\nimport org.eclipse.jdt.internal.core.SourceMethodElementInfo;\nimport org.eclipse.jdt.internal.core.SourceType;\nimport org.eclipse.jdt.internal.core.SourceTypeElementInfo;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaCompilationUnit;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect DOMAspect {\n  pointcut internalCreateAST(ASTParser parser, IProgressMonitor monitor) :\n    execution(ASTNode ASTParser.internalCreateAST(IProgressMonitor)) &&\n    args(monitor) &&\n    target(parser);\n  \n  pointcut convert(SourceTypeConverter stc, SourceMethod methodHandle, SourceMethodElementInfo methodInfo, CompilationResult compilationResult) :\n    execution(AbstractMethodDeclaration SourceTypeConverter.convert(SourceMethod, SourceMethodElementInfo, CompilationResult)) &&\n    args(methodHandle, methodInfo, compilationResult) &&\n    target(stc);\n  \n  ASTNode around(ASTParser parser, IProgressMonitor monitor) :\n    internalCreateAST(parser, monitor) {\n    try {\n      if (!(parser.typeRoot instanceof IScalaCompilationUnit))\n        return proceed(parser, monitor);\n      \n      ICompilationUnit cu = (ICompilationUnit)parser.typeRoot;\n      org.eclipse.jdt.internal.compiler.env.ICompilationUnit sourceUnit = (org.eclipse.jdt.internal.compiler.env.ICompilationUnit)cu;\n      \n      IType[] topLevelTypes = cu.getTypes();\n      int length = topLevelTypes.length;\n      if (length == 0)\n        throw new IllegalStateException();\n      \n      SourceTypeElementInfo[] topLevelInfos = new SourceTypeElementInfo[length];\n      for (int i = 0; i < length; i++) {\n        topLevelInfos[i] = (SourceTypeElementInfo) ((SourceType)topLevelTypes[i]).getElementInfo();\n      }\n      char[] fileName = ((ISourceType)topLevelInfos[0]).getFileName();\n      \n      CompilationResult result = new CompilationResult(fileName, 1, 1, 100);\n\n      JavaProject javaProject = (JavaProject)cu.getJavaProject(); \n      Map compilerOptions0 = javaProject.getOptions(true);\n      CompilerOptions compilerOptions = new CompilerOptions(compilerOptions0);\n      compilerOptions.storeAnnotations = true;\n      \n      ProblemReporter problemReporter =\n        new ProblemReporter(\n          DefaultErrorHandlingPolicies.proceedWithAllProblems(),\n          compilerOptions,\n          new DefaultProblemFactory(Locale.getDefault()));\n      \n      int flags = SourceTypeConverter.FIELD_AND_METHOD | SourceTypeConverter.MEMBER_TYPE;\n      \n      CompilationUnitDeclaration unit =\n        SourceTypeConverter.buildCompilationUnit(topLevelInfos, flags, problemReporter, result);\n      \n      INameEnvironment ne = javaProject.newSearchableNameEnvironment(DefaultWorkingCopyOwner.PRIMARY);\n      final LookupEnvironment le = new LookupEnvironment(null, compilerOptions, problemReporter, ne);\n      ITypeRequestor typeRequestor = new ITypeRequestor() {\n        public void accept(IBinaryType binaryType, PackageBinding packageBinding, AccessRestriction accessRestriction) {\n          le.createBinaryTypeFrom(binaryType, packageBinding, accessRestriction);\n        }\n        public void accept(org.eclipse.jdt.internal.compiler.env.ICompilationUnit unit, AccessRestriction accessRestriction) {}\n        public void accept(ISourceType[] sourceType, PackageBinding packageBinding, AccessRestriction accessRestriction) {}\n      };\n      le.typeRequestor = typeRequestor;\n      \n      le.buildTypeBindings(unit, null);\n      le.completeTypeBindings();\n      fixTypes(unit.types);\n      \n      AST ast = AST.newAST(AST.JLS3);\n      ast.setFlag(AST.RESOLVED_BINDINGS);\n      ast.setDefaultNodeFlag(ASTNode.ORIGINAL);\n\n      org.eclipse.jdt.core.dom.ASTConverter converter =\n        new org.eclipse.jdt.core.dom.ASTConverter(compilerOptions0, true, monitor);\n      \n      org.eclipse.jdt.core.dom.BindingResolver resolver =\n        new org.eclipse.jdt.core.dom.DefaultBindingResolver(\n          unit.scope,\n          DefaultWorkingCopyOwner.PRIMARY,\n          new org.eclipse.jdt.core.dom.DefaultBindingResolver.BindingTables(),\n          true);\n      ast.setBindingResolver(resolver);\n      converter.setAST(ast);\n      \n      ASTNode node = converter.convert(unit, sourceUnit.getContents());\n      return node;\n    } catch (JavaModelException ex) {\n      throw new IllegalArgumentException(ex);\n    }\n  }\n  \n  private void fixTypes(TypeDeclaration[] types) {\n    for(int i = 0, iLimit = types.length; i < iLimit ; ++i) {\n      TypeDeclaration tpe = types[i];\n      if (tpe != null) {\n        if (tpe.binding != null) tpe.binding.getAnnotationTagBits();\n        if (tpe.scope != null) {\n          tpe.scope.buildFields();\n          tpe.scope.buildMethods();\n        }\n        fixFields(tpe.fields);\n        fixMethods(tpe.methods);\n        fixTypes(tpe.memberTypes);\n      }\n    }\n  }\n  \n  private void fixMethods(AbstractMethodDeclaration[] methods) {\n    if (methods == null)\n      return;\n    \n    for(int i = 0, iLimit = methods.length; i < iLimit; ++i) {\n      AbstractMethodDeclaration m = methods[i];\n      m.bodyStart = m.declarationSourceStart;\n      m.bodyEnd = m.declarationSourceEnd;\n      if (m.binding != null) {\n        m.binding.getAnnotationTagBits();\n      }\n    }\n  }\n  \n  private void fixFields(AbstractVariableDeclaration[] fields) {\n    if (fields == null)\n      return;\n    \n    for(int i = 0, iLimit = fields.length; i < iLimit; ++i) {\n      AbstractVariableDeclaration f = fields[i];\n      f.declarationEnd = f.declarationSourceEnd;\n    }\n  }\n\n  AbstractMethodDeclaration around(SourceTypeConverter stc, SourceMethod methodHandle, SourceMethodElementInfo methodInfo, CompilationResult compilationResult) throws JavaModelException :\n    convert(stc, methodHandle, methodInfo, compilationResult) {\n    AbstractMethodDeclaration method;\n\n    \/* only source positions available *\/\n    int start = methodInfo.getNameSourceStart();\n    int end = methodInfo.getNameSourceEnd();\n\n    \/\/ convert 1.5 specific constructs only if compliance is 1.5 or above\n    TypeParameter[] typeParams = null;\n    if (stc.has1_5Compliance) {\n      \/* convert type parameters *\/\n      char[][] typeParameterNames = methodInfo.getTypeParameterNames();\n      if (typeParameterNames != null) {\n        int parameterCount = typeParameterNames.length;\n        if (parameterCount > 0) { \/\/ method's type parameters must be null if no type parameter\n          char[][][] typeParameterBounds = methodInfo.getTypeParameterBounds();\n          typeParams = new TypeParameter[parameterCount];\n          for (int i = 0; i < parameterCount; i++) {\n            typeParams[i] = stc.createTypeParameter(typeParameterNames[i], typeParameterBounds[i], start, end);\n          }\n        }\n      }\n    }\n\n    int modifiers = methodInfo.getModifiers();\n    if (methodInfo.isConstructor()) {\n      ConstructorDeclaration decl = new ConstructorDeclaration(compilationResult);\n      decl.bits &= ~org.eclipse.jdt.internal.compiler.ast.ASTNode.IsDefaultConstructor;\n      method = decl;\n      decl.typeParameters = typeParams;\n    } else {\n      MethodDeclaration decl;\n      if (methodInfo.isAnnotationMethod()) {\n        AnnotationMethodDeclaration annotationMethodDeclaration = new AnnotationMethodDeclaration(compilationResult);\n\n        \/* conversion of default value *\/\n        SourceAnnotationMethodInfo annotationMethodInfo = (SourceAnnotationMethodInfo) methodInfo;\n        boolean hasDefaultValue = annotationMethodInfo.defaultValueStart != -1 || annotationMethodInfo.defaultValueEnd != -1;\n        if ((stc.flags & SourceTypeConverter.FIELD_INITIALIZATION) != 0) {\n          if (hasDefaultValue) {\n            char[] defaultValueSource = CharOperation.subarray(stc.getSource(), annotationMethodInfo.defaultValueStart, annotationMethodInfo.defaultValueEnd+1);\n            if (defaultValueSource != null) {\n                Expression expression =  stc.parseMemberValue(defaultValueSource);\n                if (expression != null) {\n                  annotationMethodDeclaration.defaultValue = expression;\n                }\n            } else {\n              \/\/ could not retrieve the default value\n              hasDefaultValue = false;\n            }\n          }\n        }\n        if (hasDefaultValue)\n          modifiers |= ClassFileConstants.AccAnnotationDefault;\n        decl = annotationMethodDeclaration;\n      } else {\n        decl = new MethodDeclaration(compilationResult);\n      }\n\n      \/\/ convert return type\n      decl.returnType = stc.createTypeReference(methodInfo.getReturnTypeName(), start, end);\n\n      \/\/ type parameters\n      decl.typeParameters = typeParams;\n\n      method = decl;\n    }\n    method.selector = methodHandle.getElementName().toCharArray();\n    boolean isVarargs = (modifiers & ClassFileConstants.AccVarargs) != 0;\n    method.modifiers = modifiers & ~ClassFileConstants.AccVarargs;\n    method.sourceStart = start;\n    method.sourceEnd = end;\n    method.declarationSourceStart = methodInfo.getDeclarationSourceStart();\n    method.declarationSourceEnd = methodInfo.getDeclarationSourceEnd();\n\n    \/\/ convert 1.5 specific constructs only if compliance is 1.5 or above\n    if (stc.has1_5Compliance) {\n      \/* convert annotations *\/\n      method.annotations = stc.convertAnnotations(methodHandle);\n    }\n\n    \/* convert arguments *\/\n    String[] argumentTypeSignatures = methodHandle.getParameterTypes();\n    char[][] argumentNames = methodInfo.getArgumentNames();\n    int argumentCount = argumentTypeSignatures == null ? 0 : argumentTypeSignatures.length;\n    if (argumentCount > 0) {\n      long position = ((long) start << 32) + end;\n      method.arguments = new Argument[argumentCount];\n      for (int i = 0; i < argumentCount; i++) {\n        TypeReference typeReference = stc.createTypeReference(argumentTypeSignatures[i], start, end);\n        if (isVarargs && i == argumentCount-1) {\n          typeReference.bits |= org.eclipse.jdt.internal.compiler.ast.ASTNode.IsVarArgs;\n        }\n        method.arguments[i] =\n          new Argument(\n            argumentNames[i],\n            position,\n            typeReference,\n            ClassFileConstants.AccDefault);\n        \/\/ do not care whether was final or not\n      }\n    }\n\n    \/* convert thrown exceptions *\/\n    char[][] exceptionTypeNames = methodInfo.getExceptionTypeNames();\n    int exceptionCount = exceptionTypeNames == null ? 0 : exceptionTypeNames.length;\n    if (exceptionCount > 0) {\n      method.thrownExceptions = new TypeReference[exceptionCount];\n      for (int i = 0; i < exceptionCount; i++) {\n        method.thrownExceptions[i] =\n          stc.createTypeReference(exceptionTypeNames[i], start, end);\n      }\n    }\n\n    \/* convert local and anonymous types *\/\n    if ((stc.flags & SourceTypeConverter.LOCAL_TYPE) != 0) {\n      IJavaElement[] children = methodInfo.getChildren();\n      int typesLength = 0;\n      int childrenLength = children.length;\n      for (int i = 0; i < childrenLength; ++i)\n        if (children[i] instanceof SourceType)\n          ++typesLength;\n      \n      if (typesLength != 0) {\n        Statement[] statements = new Statement[typesLength];\n        int typeIndex = 0;\n        for (int i = 0; i < childrenLength; i++) {\n          if (children[i] instanceof SourceType) {\n            SourceType type = (SourceType) children[i];\n            TypeDeclaration localType = stc.convert(type, compilationResult);\n            if ((localType.bits & org.eclipse.jdt.internal.compiler.ast.ASTNode.IsAnonymousType) != 0) {\n              QualifiedAllocationExpression expression = new QualifiedAllocationExpression(localType);\n              expression.type = localType.superclass;\n              localType.superclass = null;\n              localType.superInterfaces = null;\n              localType.allocation = expression;\n              statements[typeIndex] = expression;\n            } else {\n              statements[typeIndex] = localType;\n            }\n            ++typeIndex;\n          }\n        }\n        method.statements = statements;\n      }\n    }\n\n    return method;\n  }\n}\n","old_contents":"\/*\n * Copyright 2005-2010 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.core;\n\nimport java.util.Locale;\nimport java.util.Map;\n\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.core.ICompilationUnit;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.core.compiler.CharOperation;\nimport org.eclipse.jdt.core.dom.AST;\nimport org.eclipse.jdt.core.dom.ASTNode;\nimport org.eclipse.jdt.core.dom.ASTParser;\nimport org.eclipse.jdt.internal.compiler.CompilationResult;\nimport org.eclipse.jdt.internal.compiler.DefaultErrorHandlingPolicies;\nimport org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.AbstractVariableDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.AnnotationMethodDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.Argument;\nimport org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.ConstructorDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.Expression;\nimport org.eclipse.jdt.internal.compiler.ast.MethodDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.QualifiedAllocationExpression;\nimport org.eclipse.jdt.internal.compiler.ast.Statement;\nimport org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.TypeParameter;\nimport org.eclipse.jdt.internal.compiler.ast.TypeReference;\nimport org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;\nimport org.eclipse.jdt.internal.compiler.env.AccessRestriction;\nimport org.eclipse.jdt.internal.compiler.env.IBinaryType;\nimport org.eclipse.jdt.internal.compiler.env.INameEnvironment;\nimport org.eclipse.jdt.internal.compiler.env.ISourceType;\nimport org.eclipse.jdt.internal.compiler.impl.CompilerOptions;\nimport org.eclipse.jdt.internal.compiler.impl.ITypeRequestor;\nimport org.eclipse.jdt.internal.compiler.lookup.LookupEnvironment;\nimport org.eclipse.jdt.internal.compiler.lookup.PackageBinding;\nimport org.eclipse.jdt.internal.compiler.parser.SourceTypeConverter;\nimport org.eclipse.jdt.internal.compiler.problem.DefaultProblemFactory;\nimport org.eclipse.jdt.internal.compiler.problem.ProblemReporter;\nimport org.eclipse.jdt.internal.core.DefaultWorkingCopyOwner;\nimport org.eclipse.jdt.internal.core.JavaProject;\nimport org.eclipse.jdt.internal.core.SourceAnnotationMethodInfo;\nimport org.eclipse.jdt.internal.core.SourceMethod;\nimport org.eclipse.jdt.internal.core.SourceMethodElementInfo;\nimport org.eclipse.jdt.internal.core.SourceType;\nimport org.eclipse.jdt.internal.core.SourceTypeElementInfo;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaCompilationUnit;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect DOMAspect {\n  pointcut internalCreateAST(ASTParser parser, IProgressMonitor monitor) :\n    execution(ASTNode ASTParser.internalCreateAST(IProgressMonitor)) &&\n    args(monitor) &&\n    target(parser);\n  \n  pointcut convert(SourceTypeConverter stc, SourceMethod methodHandle, SourceMethodElementInfo methodInfo, CompilationResult compilationResult) :\n    execution(AbstractMethodDeclaration SourceTypeConverter.convert(SourceMethod, SourceMethodElementInfo, CompilationResult)) &&\n    args(methodHandle, methodInfo, compilationResult) &&\n    target(stc);\n  \n  ASTNode around(ASTParser parser, IProgressMonitor monitor) :\n    internalCreateAST(parser, monitor) {\n    try {\n      if (!(parser.typeRoot instanceof IScalaCompilationUnit))\n        return proceed(parser, monitor);\n      \n      ICompilationUnit cu = (ICompilationUnit)parser.typeRoot;\n      org.eclipse.jdt.internal.compiler.env.ICompilationUnit sourceUnit = (org.eclipse.jdt.internal.compiler.env.ICompilationUnit)cu;\n      \n      IType[] topLevelTypes = cu.getTypes();\n      int length = topLevelTypes.length;\n      if (length == 0)\n        throw new IllegalStateException();\n      \n      SourceTypeElementInfo[] topLevelInfos = new SourceTypeElementInfo[length];\n      for (int i = 0; i < length; i++) {\n        topLevelInfos[i] = (SourceTypeElementInfo) ((SourceType)topLevelTypes[i]).getElementInfo();\n      }\n      char[] fileName = ((ISourceType)topLevelInfos[0]).getFileName();\n      \n      CompilationResult result = new CompilationResult(fileName, 1, 1, 100);\n\n      JavaProject javaProject = (JavaProject)cu.getJavaProject(); \n      Map compilerOptions0 = javaProject.getOptions(true);\n      CompilerOptions compilerOptions = new CompilerOptions(compilerOptions0);\n      compilerOptions.storeAnnotations = true;\n      \n      ProblemReporter problemReporter =\n        new ProblemReporter(\n          DefaultErrorHandlingPolicies.proceedWithAllProblems(),\n          compilerOptions,\n          new DefaultProblemFactory(Locale.getDefault()));\n      \n      int flags = SourceTypeConverter.FIELD_AND_METHOD | SourceTypeConverter.MEMBER_TYPE;\n      \n      CompilationUnitDeclaration unit =\n        SourceTypeConverter.buildCompilationUnit(topLevelInfos, flags, problemReporter, result);\n      \n      INameEnvironment ne = javaProject.newSearchableNameEnvironment(DefaultWorkingCopyOwner.PRIMARY);\n      final LookupEnvironment le = new LookupEnvironment(null, compilerOptions, problemReporter, ne);\n      ITypeRequestor typeRequestor = new ITypeRequestor() {\n        public void accept(IBinaryType binaryType, PackageBinding packageBinding, AccessRestriction accessRestriction) {\n          le.createBinaryTypeFrom(binaryType, packageBinding, accessRestriction);\n        }\n        public void accept(org.eclipse.jdt.internal.compiler.env.ICompilationUnit unit, AccessRestriction accessRestriction) {}\n        public void accept(ISourceType[] sourceType, PackageBinding packageBinding, AccessRestriction accessRestriction) {}\n      };\n      le.typeRequestor = typeRequestor;\n      \n      le.buildTypeBindings(unit, null);\n      le.completeTypeBindings();\n      fixTypes(unit.types);\n      \n      AST ast = AST.newAST(AST.JLS3);\n      ast.setFlag(AST.RESOLVED_BINDINGS);\n      ast.setDefaultNodeFlag(ASTNode.ORIGINAL);\n\n      org.eclipse.jdt.core.dom.ASTConverter converter =\n        new org.eclipse.jdt.core.dom.ASTConverter(compilerOptions0, true, monitor);\n      \n      org.eclipse.jdt.core.dom.BindingResolver resolver =\n        new org.eclipse.jdt.core.dom.DefaultBindingResolver(\n          unit.scope,\n          DefaultWorkingCopyOwner.PRIMARY,\n          new org.eclipse.jdt.core.dom.DefaultBindingResolver.BindingTables(),\n          true);\n      ast.setBindingResolver(resolver);\n      converter.setAST(ast);\n      \n      ASTNode node = converter.convert(unit, sourceUnit.getContents());\n      return node;\n    } catch (JavaModelException ex) {\n      throw new IllegalArgumentException(ex);\n    }\n  }\n  \n  private void fixTypes(TypeDeclaration[] types) {\n    for(int i = 0, iLimit = types.length; i < iLimit ; ++i) {\n      TypeDeclaration tpe = types[i];\n      if (tpe != null) {\n        if (tpe.binding != null) tpe.binding.getAnnotationTagBits();\n        if (tpe.scope != null) {\n          tpe.scope.buildFields();\n          tpe.scope.buildMethods();\n        }\n        fixFields(tpe.fields);\n        fixMethods(tpe.methods);\n        fixTypes(tpe.memberTypes);\n      }\n    }\n  }\n  \n  private void fixMethods(AbstractMethodDeclaration[] methods) {\n    if (methods == null)\n      return;\n    \n    for(int i = 0, iLimit = methods.length; i < iLimit; ++i) {\n      AbstractMethodDeclaration m = methods[i];\n      m.bodyStart = m.declarationSourceStart;\n      m.bodyEnd = m.declarationSourceEnd;\n      m.binding.getAnnotationTagBits();\n    }\n  }\n  \n  private void fixFields(AbstractVariableDeclaration[] fields) {\n    if (fields == null)\n      return;\n    \n    for(int i = 0, iLimit = fields.length; i < iLimit; ++i) {\n      AbstractVariableDeclaration f = fields[i];\n      f.declarationEnd = f.declarationSourceEnd;\n    }\n  }\n\n  AbstractMethodDeclaration around(SourceTypeConverter stc, SourceMethod methodHandle, SourceMethodElementInfo methodInfo, CompilationResult compilationResult) throws JavaModelException :\n    convert(stc, methodHandle, methodInfo, compilationResult) {\n    AbstractMethodDeclaration method;\n\n    \/* only source positions available *\/\n    int start = methodInfo.getNameSourceStart();\n    int end = methodInfo.getNameSourceEnd();\n\n    \/\/ convert 1.5 specific constructs only if compliance is 1.5 or above\n    TypeParameter[] typeParams = null;\n    if (stc.has1_5Compliance) {\n      \/* convert type parameters *\/\n      char[][] typeParameterNames = methodInfo.getTypeParameterNames();\n      if (typeParameterNames != null) {\n        int parameterCount = typeParameterNames.length;\n        if (parameterCount > 0) { \/\/ method's type parameters must be null if no type parameter\n          char[][][] typeParameterBounds = methodInfo.getTypeParameterBounds();\n          typeParams = new TypeParameter[parameterCount];\n          for (int i = 0; i < parameterCount; i++) {\n            typeParams[i] = stc.createTypeParameter(typeParameterNames[i], typeParameterBounds[i], start, end);\n          }\n        }\n      }\n    }\n\n    int modifiers = methodInfo.getModifiers();\n    if (methodInfo.isConstructor()) {\n      ConstructorDeclaration decl = new ConstructorDeclaration(compilationResult);\n      decl.bits &= ~org.eclipse.jdt.internal.compiler.ast.ASTNode.IsDefaultConstructor;\n      method = decl;\n      decl.typeParameters = typeParams;\n    } else {\n      MethodDeclaration decl;\n      if (methodInfo.isAnnotationMethod()) {\n        AnnotationMethodDeclaration annotationMethodDeclaration = new AnnotationMethodDeclaration(compilationResult);\n\n        \/* conversion of default value *\/\n        SourceAnnotationMethodInfo annotationMethodInfo = (SourceAnnotationMethodInfo) methodInfo;\n        boolean hasDefaultValue = annotationMethodInfo.defaultValueStart != -1 || annotationMethodInfo.defaultValueEnd != -1;\n        if ((stc.flags & SourceTypeConverter.FIELD_INITIALIZATION) != 0) {\n          if (hasDefaultValue) {\n            char[] defaultValueSource = CharOperation.subarray(stc.getSource(), annotationMethodInfo.defaultValueStart, annotationMethodInfo.defaultValueEnd+1);\n            if (defaultValueSource != null) {\n                Expression expression =  stc.parseMemberValue(defaultValueSource);\n                if (expression != null) {\n                  annotationMethodDeclaration.defaultValue = expression;\n                }\n            } else {\n              \/\/ could not retrieve the default value\n              hasDefaultValue = false;\n            }\n          }\n        }\n        if (hasDefaultValue)\n          modifiers |= ClassFileConstants.AccAnnotationDefault;\n        decl = annotationMethodDeclaration;\n      } else {\n        decl = new MethodDeclaration(compilationResult);\n      }\n\n      \/\/ convert return type\n      decl.returnType = stc.createTypeReference(methodInfo.getReturnTypeName(), start, end);\n\n      \/\/ type parameters\n      decl.typeParameters = typeParams;\n\n      method = decl;\n    }\n    method.selector = methodHandle.getElementName().toCharArray();\n    boolean isVarargs = (modifiers & ClassFileConstants.AccVarargs) != 0;\n    method.modifiers = modifiers & ~ClassFileConstants.AccVarargs;\n    method.sourceStart = start;\n    method.sourceEnd = end;\n    method.declarationSourceStart = methodInfo.getDeclarationSourceStart();\n    method.declarationSourceEnd = methodInfo.getDeclarationSourceEnd();\n\n    \/\/ convert 1.5 specific constructs only if compliance is 1.5 or above\n    if (stc.has1_5Compliance) {\n      \/* convert annotations *\/\n      method.annotations = stc.convertAnnotations(methodHandle);\n    }\n\n    \/* convert arguments *\/\n    String[] argumentTypeSignatures = methodHandle.getParameterTypes();\n    char[][] argumentNames = methodInfo.getArgumentNames();\n    int argumentCount = argumentTypeSignatures == null ? 0 : argumentTypeSignatures.length;\n    if (argumentCount > 0) {\n      long position = ((long) start << 32) + end;\n      method.arguments = new Argument[argumentCount];\n      for (int i = 0; i < argumentCount; i++) {\n        TypeReference typeReference = stc.createTypeReference(argumentTypeSignatures[i], start, end);\n        if (isVarargs && i == argumentCount-1) {\n          typeReference.bits |= org.eclipse.jdt.internal.compiler.ast.ASTNode.IsVarArgs;\n        }\n        method.arguments[i] =\n          new Argument(\n            argumentNames[i],\n            position,\n            typeReference,\n            ClassFileConstants.AccDefault);\n        \/\/ do not care whether was final or not\n      }\n    }\n\n    \/* convert thrown exceptions *\/\n    char[][] exceptionTypeNames = methodInfo.getExceptionTypeNames();\n    int exceptionCount = exceptionTypeNames == null ? 0 : exceptionTypeNames.length;\n    if (exceptionCount > 0) {\n      method.thrownExceptions = new TypeReference[exceptionCount];\n      for (int i = 0; i < exceptionCount; i++) {\n        method.thrownExceptions[i] =\n          stc.createTypeReference(exceptionTypeNames[i], start, end);\n      }\n    }\n\n    \/* convert local and anonymous types *\/\n    if ((stc.flags & SourceTypeConverter.LOCAL_TYPE) != 0) {\n      IJavaElement[] children = methodInfo.getChildren();\n      int typesLength = 0;\n      int childrenLength = children.length;\n      for (int i = 0; i < childrenLength; ++i)\n        if (children[i] instanceof SourceType)\n          ++typesLength;\n      \n      if (typesLength != 0) {\n        Statement[] statements = new Statement[typesLength];\n        int typeIndex = 0;\n        for (int i = 0; i < childrenLength; i++) {\n          if (children[i] instanceof SourceType) {\n            SourceType type = (SourceType) children[i];\n            TypeDeclaration localType = stc.convert(type, compilationResult);\n            if ((localType.bits & org.eclipse.jdt.internal.compiler.ast.ASTNode.IsAnonymousType) != 0) {\n              QualifiedAllocationExpression expression = new QualifiedAllocationExpression(localType);\n              expression.type = localType.superclass;\n              localType.superclass = null;\n              localType.superInterfaces = null;\n              localType.allocation = expression;\n              statements[typeIndex] = expression;\n            } else {\n              statements[typeIndex] = localType;\n            }\n            ++typeIndex;\n          }\n        }\n        method.statements = statements;\n      }\n    }\n\n    return method;\n  }\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"0fa1f5982518c64e524ccccc681056e7d09b7e4b","subject":"Fix NPE.","message":"Fix NPE.\n","repos":"openmole\/openmole,openmole\/openmole,openmole\/openmole,openmole\/openmole,openmole\/openmole","old_file":"commons\/org.openmole.commons.aspect.eventdispatcher\/src\/main\/java\/org\/openmole\/commons\/aspect\/eventdispatcher\/EventAspect.aj","new_file":"commons\/org.openmole.commons.aspect.eventdispatcher\/src\/main\/java\/org\/openmole\/commons\/aspect\/eventdispatcher\/EventAspect.aj","new_contents":"package org.openmole.commons.aspect.eventdispatcher;\n\nimport java.util.logging.Level;\nimport java.util.logging.Logger;\nimport org.openmole.commons.aspect.eventdispatcher.internal.Activator;\nimport org.openmole.commons.exception.InternalProcessingError;\nimport org.openmole.commons.exception.UserBadDataError;\nimport java.lang.InterruptedException;\nimport java.lang.reflect.Method;\nimport org.aspectj.lang.reflect.MethodSignature;\nimport java.lang.annotation.Annotation;\n\npublic aspect EventAspect {\n\n\tbefore() throws InternalProcessingError, UserBadDataError : execution(* *(..)) && @annotation(org.openmole.commons.aspect.eventdispatcher.BeforeObjectModified) {\n\n\t\tObject object = thisJoinPoint.getThis();\n\n                Method method = ((MethodSignature) thisJoinPointStaticPart.getSignature()).getMethod();\n                ObjectModified annotation = method.getAnnotation(BeforeObjectModified.class);\n\n                String type = annotation.type();\n                Object[] args = thisJoinPoint.getArgs();\n\n                Activator.getEventDispatcher().objectChanged(object,type, args);\n\t}\n\n\n\tafter() throws InternalProcessingError, UserBadDataError : execution(* *(..)) && @annotation(org.openmole.commons.aspect.eventdispatcher.ObjectModified) {\n\t\t\n\t\tObject object = thisJoinPoint.getThis();\n\n                Method method = ((MethodSignature) thisJoinPointStaticPart.getSignature()).getMethod();\n                ObjectModified annotation = method.getAnnotation(ObjectModified.class);\n\n                Activator.getEventDispatcher().objectChanged(object,annotation.type(), thisJoinPoint.getArgs());\n\t}\n\n        after() : execution(*.new(..)) && @annotation(org.openmole.commons.aspect.eventdispatcher.ObjectConstructed) {\n\n\t\t\/\/ construct genericIdentifier\n\t\tObject object = thisJoinPoint.getThis();\n\t\t\/\/Object ret = proceed();\n\n               \/\/ Method method = ((MethodSignature) thisJoinPointStaticPart.getSignature()).getMethod();\n               \/\/ ObjectModified annotation = method.getAnnotation(ObjectModified.class);\n\n               \/\/ Logger.getLogger(Logger.GLOBAL_LOGGER_NAME).log(Level.INFO,\"ctr: \" + thisJoinPointStaticPart.getSignature().toString());\n\n                Activator.getEventDispatcher().objectConstructed(object);\n\t\t\/\/Logger.getLogger(Logger.GLOBAL_LOGGER_NAME).log(Level.INFO,object.toString() + \" \"+ method);\n\n\t\t\/\/return ret;\n\t}\n}\n","old_contents":"package org.openmole.commons.aspect.eventdispatcher;\n\nimport java.util.logging.Level;\nimport java.util.logging.Logger;\nimport org.openmole.commons.aspect.eventdispatcher.internal.Activator;\nimport org.openmole.commons.exception.InternalProcessingError;\nimport org.openmole.commons.exception.UserBadDataError;\nimport java.lang.InterruptedException;\nimport java.lang.reflect.Method;\nimport org.aspectj.lang.reflect.MethodSignature;\nimport java.lang.annotation.Annotation;\n\npublic aspect EventAspect {\n\n\tbefore() throws InternalProcessingError, UserBadDataError : execution(* *(..)) && @annotation(org.openmole.commons.aspect.eventdispatcher.BeforeObjectModified) {\n\n\t\tObject object = thisJoinPoint.getThis();\n\n                Method method = ((MethodSignature) thisJoinPointStaticPart.getSignature()).getMethod();\n                ObjectModified annotation = method.getAnnotation(ObjectModified.class);\n\n                Activator.getEventDispatcher().objectChanged(object,annotation.type(), thisJoinPoint.getArgs());\n\t}\n\n\n\tafter() throws InternalProcessingError, UserBadDataError : execution(* *(..)) && @annotation(org.openmole.commons.aspect.eventdispatcher.ObjectModified) {\n\t\t\n\t\tObject object = thisJoinPoint.getThis();\n\n                Method method = ((MethodSignature) thisJoinPointStaticPart.getSignature()).getMethod();\n                ObjectModified annotation = method.getAnnotation(ObjectModified.class);\n\n                Activator.getEventDispatcher().objectChanged(object,annotation.type(), thisJoinPoint.getArgs());\n\t}\n\n        after() : execution(*.new(..)) && @annotation(org.openmole.commons.aspect.eventdispatcher.ObjectConstructed) {\n\n\t\t\/\/ construct genericIdentifier\n\t\tObject object = thisJoinPoint.getThis();\n\t\t\/\/Object ret = proceed();\n\n               \/\/ Method method = ((MethodSignature) thisJoinPointStaticPart.getSignature()).getMethod();\n               \/\/ ObjectModified annotation = method.getAnnotation(ObjectModified.class);\n\n               \/\/ Logger.getLogger(Logger.GLOBAL_LOGGER_NAME).log(Level.INFO,\"ctr: \" + thisJoinPointStaticPart.getSignature().toString());\n\n                Activator.getEventDispatcher().objectConstructed(object);\n\t\t\/\/Logger.getLogger(Logger.GLOBAL_LOGGER_NAME).log(Level.INFO,object.toString() + \" \"+ method);\n\n\t\t\/\/return ret;\n\t}\n}\n","returncode":0,"stderr":"","license":"agpl-3.0","lang":"AspectJ"}
{"commit":"3c1d3f0fa64fc86c1458069836e4b663507ad6fb","subject":"* change aspect signature","message":"* change aspect signature","repos":"agentlab\/ru.agentlab.maia","old_file":"aspects\/ru.agentlab.maia.context.log\/aj-src\/ru\/agentlab\/maia\/context\/log\/AMaiaContextFactoryLog.aj","new_file":"aspects\/ru.agentlab.maia.context.log\/aj-src\/ru\/agentlab\/maia\/context\/log\/AMaiaContextFactoryLog.aj","new_contents":"package ru.agentlab.maia.context.log;\n\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport ru.agentlab.maia.context.IMaiaContext;\nimport ru.agentlab.maia.context.IMaiaContextFactory;\nimport ru.agentlab.maia.context.aj.AMaiaContextFactory;\n\npublic aspect AMaiaContextFactoryLog extends AMaiaContextFactory {\n\n\tafter(IMaiaContextFactory factory) returning (IMaiaContext result): \n\t\tonCreateContext(factory) {\n\t\tLogger logger = LoggerFactory.getLogger(factory.getClass());\n\t\tlogger.info(\"Context [\" + result.getUuid() + \"] successfully created\");\n\t}\n}","old_contents":"package ru.agentlab.maia.context.log;\n\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport ru.agentlab.maia.context.IMaiaContext;\nimport ru.agentlab.maia.context.IMaiaContextFactory;\nimport ru.agentlab.maia.context.aj.AMaiaContextFactory;\n\npublic aspect AMaiaContextFactoryLog extends AMaiaContextFactory {\n\n\tbefore(IMaiaContextFactory factory, IMaiaContext parent, String name) : \n\t\tonCreateChildContext(factory, parent, name) {\n\t\tLogger logger = LoggerFactory.getLogger(factory.getClass());\n\t\tlogger.info(\"Try to create [\" + name + \"] context with [\" + parent\n\t\t\t\t+ \"] parent...\");\n\t}\n\t\n\tafter(IMaiaContextFactory factory, String name) returning: \n\t\tonCreateChildContext(factory, *, name) {\n\t\tLogger logger = LoggerFactory.getLogger(factory.getClass());\n\t\tlogger.info(\"Context [\" + name + \"] successfully created\");\n\t}\n\n\tafter(IMaiaContextFactory factory, String name) returning: \n\t\tonCreateContext(factory, name) {\n\t\tLogger logger = LoggerFactory.getLogger(factory.getClass());\n\t\tlogger.info(\"Context [\" + name + \"] successfully created\");\n\t}\n}","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"a4b69a9277fa5c4ad0a967f1c8802e8257bf2689","subject":"used named pointcuts to clarify implementation","message":"used named pointcuts to clarify implementation\n\n\ngit-svn-id: b619a0c99665f88f1afe72824344cefe9a1c8c90@8628 fd5a2b45-1f63-4059-99e9-3c7cb7fd75c8\n","repos":"cbeams-archive\/spring-framework-2.5.x,cbeams-archive\/spring-framework-2.5.x,cbeams-archive\/spring-framework-2.5.x,cbeams-archive\/spring-framework-2.5.x","old_file":"aspectj\/src\/org\/springframework\/transaction\/aspectj\/TransactionalAnnotationTransactionAspect.aj","new_file":"aspectj\/src\/org\/springframework\/transaction\/aspectj\/TransactionalAnnotationTransactionAspect.aj","new_contents":"\/*\n * Copyright 2002-2006 the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.springframework.transaction.aspectj;\n\nimport org.springframework.transaction.annotation.AnnotationTransactionAttributeSource;\nimport org.springframework.transaction.annotation.Transactional;\n\n\/**\n * Concrete AspectJ transaction aspect using Java 5 annotations, and Spring\n * transactional annotation. \n * <p>\n * validation.\n * @author Rod Johnson\n * @author Ramnivas Laddad\n * @author Adrian Colyer\n * @since 2.0\n * @see AbstractTransactionAspect\n *\/\npublic aspect TransactionalAnnotationTransactionAspect extends AbstractTransactionAspect {\n\t\n\tpublic TransactionalAnnotationTransactionAspect() {\n\t\tsuper(new AnnotationTransactionAttributeSource());\n\t}\n\t\n\t\/**\n\t * Matches the execution of any public method in a type with the\n\t * Transactional annotation, or any subtype of a type with the\n\t * Transactional annotation.\n\t *\/\n\tprivate pointcut executionOfAnyPublicMethodInAtTransactionalType() :\n\t\texecution(public * (@Transactional *+).*(..));\n\t\n\t\/**\n\t * Matches the execution of any public method with the \n\t * Transactional annotation.\n\t *\/\n\tprivate pointcut executionOfTransactionalPublicMethod() :\n\t\texecution(public * *(..)) && @annotation(Transactional);\n\t\n\t\/**\n\t * Definition of pointcut from super aspect - matched join points\n\t * will have Spring transaction management applied.\n\t *\/\t\n\tprotected pointcut transactionalMethodExecution(Object txObject) :\n\t\t(executionOfAnyPublicMethodInAtTransactionalType() \n\t\t || executionOfTransactionalPublicMethod())\n\t\t&& this(txObject);\n\n}\n","old_contents":"\/*\n * Copyright 2002-2006 the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.springframework.transaction.aspectj;\n\nimport org.springframework.transaction.annotation.AnnotationTransactionAttributeSource;\nimport org.springframework.transaction.annotation.Transactional;\n\n\/**\n * Concrete AspectJ transaction aspect using Java 5 annotations, and Spring\n * transactional annotation. \n * <p>\n * validation.\n * @author Rod Johnson\n * @author Ramnivas Laddad\n * @since 2.0\n * @see AbstractTransactionAspect\n *\/\npublic aspect TransactionalAnnotationTransactionAspect extends AbstractTransactionAspect {\n\t\n\tpublic TransactionalAnnotationTransactionAspect() {\n\t\tsuper(new AnnotationTransactionAttributeSource());\n\t}\n\t\n\tprotected pointcut transactionalMethodExecution(Object txObject) :\n\t\t(execution(public * (@Transactional *+).*(..))\n\t\t || (execution(public * *(..))) && @annotation(Transactional))\n\t\t&& this(txObject);\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"81c259fe42bfed02fa2c50fba28ed7c27c933e64","subject":"Explain mock scope in static method mocking aspect","message":"Explain mock scope in static method mocking aspect\n","repos":"spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework","old_file":"spring-aspects\/src\/main\/java\/org\/springframework\/mock\/staticmock\/AnnotationDrivenStaticEntityMockingControl.aj","new_file":"spring-aspects\/src\/main\/java\/org\/springframework\/mock\/staticmock\/AnnotationDrivenStaticEntityMockingControl.aj","new_contents":"\/*\n * Copyright 2002-2014 the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.springframework.mock.staticmock;\n\n\/**\n * Annotation-based aspect to use in test builds to enable mocking of static methods\n * on JPA-annotated {@code @Entity} classes, as used by Spring Roo for so-called\n * <em>finder methods<\/em>.\n *\n * <p>Mocking will occur within the call stack of any {@code public} method in a\n * class (typically a test class) that is annotated with {@code @MockStaticEntityMethods}.\n * Thus mocking is not limited to {@code @Test} methods. Furthermore, new mock\n * state will be created for the invocation of each such public method, even when\n * the method is invoked from another such public method.\n *\n * <p>This aspect also provides static methods to simplify the programming model for\n * setting expectations and entering playback mode.\n *\n * <h3>Usage<\/h3>\n * <ol>\n * <li>Annotate a test class with {@code @MockStaticEntityMethods}.\n * <li>In each test method, the {@code AnnotationDrivenStaticEntityMockingControl}\n * will begin in <em>recording<\/em> mode.\n * <li>Invoke static methods on JPA-annotated {@code @Entity} classes, with each\n * recording-mode invocation being followed by an invocation of either\n * {@link #expectReturn(Object)} or {@link #expectThrow(Throwable)} on the\n * {@code AnnotationDrivenStaticEntityMockingControl}.\n * <li>Invoke the {@link #playback()} method.\n * <li>Call the code you wish to test that uses the static methods on the\n * JPA-annotated {@code @Entity} classes.\n * <li>Verification will occur automatically after the test method has executed\n * and returned. However, mock verification will not occur if the test method\n * throws an exception.\n * <\/ol>\n *\n * @author Rod Johnson\n * @author Ramnivas Laddad\n * @author Sam Brannen\n * @see MockStaticEntityMethods\n *\/\npublic aspect AnnotationDrivenStaticEntityMockingControl extends AbstractMethodMockingControl {\n\n\t\/**\n\t * Expect the supplied {@link Object} to be returned by the previous static\n\t * method invocation.\n\t * @see #playback()\n\t *\/\n\tpublic static void expectReturn(Object retVal) {\n\t\tAnnotationDrivenStaticEntityMockingControl.aspectOf().expectReturnInternal(retVal);\n\t}\n\n\t\/**\n\t * Expect the supplied {@link Throwable} to be thrown by the previous static\n\t * method invocation.\n\t * @see #playback()\n\t *\/\n\tpublic static void expectThrow(Throwable throwable) {\n\t\tAnnotationDrivenStaticEntityMockingControl.aspectOf().expectThrowInternal(throwable);\n\t}\n\n\t\/**\n\t * Stop recording mock expectations and enter <em>playback<\/em> mode.\n\t * @see #expectReturn(Object)\n\t * @see #expectThrow(Throwable)\n\t *\/\n\tpublic static void playback() {\n\t\tAnnotationDrivenStaticEntityMockingControl.aspectOf().playbackInternal();\n\t}\n\t\n\t\/\/ Apparently, the following pointcut was originally defined to only match\n\t\/\/ methods directly annotated with @Test (in order to allow methods in\n\t\/\/ @MockStaticEntityMethods classes to invoke each other without resetting\n\t\/\/ the mocking environment); however, this is no longer the case. The current\n\t\/\/ pointcut applies to all public methods in @MockStaticEntityMethods classes.\n\tprotected pointcut mockStaticsTestMethod() : execution(public * (@MockStaticEntityMethods *).*(..));\n\n\tprotected pointcut methodToMock() : execution(public static * (@javax.persistence.Entity *).*(..));\n\n}\n","old_contents":"\/*\n * Copyright 2002-2014 the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.springframework.mock.staticmock;\n\n\/**\n * Annotation-based aspect to use in test builds to enable mocking of static methods\n * on JPA-annotated {@code @Entity} classes, as used by Spring Roo for so-called\n * <em>finder methods<\/em>.\n *\n * <p>Mocking will occur within the call stack of any method in a class (typically a\n * test class) that is annotated with {@code @MockStaticEntityMethods}.\n *\n * <p>This aspect also provides static methods to simplify the programming model for\n * setting expectations and entering playback mode.\n *\n * <h3>Usage<\/h3>\n * <ol>\n * <li>Annotate a test class with {@code @MockStaticEntityMethods}.\n * <li>In each test method, the {@code AnnotationDrivenStaticEntityMockingControl}\n * will begin in <em>recording<\/em> mode.\n * <li>Invoke static methods on JPA-annotated {@code @Entity} classes, with each\n * recording-mode invocation being followed by an invocation of either\n * {@link #expectReturn(Object)} or {@link #expectThrow(Throwable)} on the\n * {@code AnnotationDrivenStaticEntityMockingControl}.\n * <li>Invoke the {@link #playback()} method.\n * <li>Call the code you wish to test that uses the static methods on the\n * JPA-annotated {@code @Entity} classes.\n * <li>Verification will occur automatically after the test method has executed\n * and returned. However, mock verification will not occur if the test method\n * throws an exception.\n * <\/ol>\n *\n * @author Rod Johnson\n * @author Ramnivas Laddad\n * @author Sam Brannen\n * @see MockStaticEntityMethods\n *\/\npublic aspect AnnotationDrivenStaticEntityMockingControl extends AbstractMethodMockingControl {\n\n\t\/**\n\t * Expect the supplied {@link Object} to be returned by the previous static\n\t * method invocation.\n\t * @see #playback()\n\t *\/\n\tpublic static void expectReturn(Object retVal) {\n\t\tAnnotationDrivenStaticEntityMockingControl.aspectOf().expectReturnInternal(retVal);\n\t}\n\n\t\/**\n\t * Expect the supplied {@link Throwable} to be thrown by the previous static\n\t * method invocation.\n\t * @see #playback()\n\t *\/\n\tpublic static void expectThrow(Throwable throwable) {\n\t\tAnnotationDrivenStaticEntityMockingControl.aspectOf().expectThrowInternal(throwable);\n\t}\n\n\t\/**\n\t * Stop recording mock expectations and enter <em>playback<\/em> mode.\n\t * @see #expectReturn(Object)\n\t * @see #expectThrow(Throwable)\n\t *\/\n\tpublic static void playback() {\n\t\tAnnotationDrivenStaticEntityMockingControl.aspectOf().playbackInternal();\n\t}\n\t\n\t\/\/ Apparently, the following pointcut was originally defined to only match\n\t\/\/ methods directly annotated with @Test (in order to allow methods in\n\t\/\/ @MockStaticEntityMethods classes to invoke each other without resetting\n\t\/\/ the mocking environment); however, this is no longer the case. The current\n\t\/\/ pointcut applies to all public methods in @MockStaticEntityMethods classes.\n\tprotected pointcut mockStaticsTestMethod() : execution(public * (@MockStaticEntityMethods *).*(..));\n\n\tprotected pointcut methodToMock() : execution(public static * (@javax.persistence.Entity *).*(..));\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"9f13e3ae8cbb2e26e519b53941ee0aaef16d27d3","subject":"- unused aspects","message":"- unused aspects","repos":"agentlab\/ru.agentlab.maia","old_file":"aspects\/ru.agentlab.maia.memory.context.events\/aj-src\/ru\/agentlab\/maia\/context\/event\/AMaiaContextFactoryEvent.aj","new_file":"aspects\/ru.agentlab.maia.memory.context.events\/aj-src\/ru\/agentlab\/maia\/context\/event\/AMaiaContextFactoryEvent.aj","new_contents":"","old_contents":"package ru.agentlab.maia.context.event;\n\nimport ru.agentlab.maia.event.IMaiaEventBroker;\nimport ru.agentlab.maia.memory.IMaiaContext;\nimport ru.agentlab.maia.memory.IMaiaContextFactory;\nimport ru.agentlab.maia.memory.aj.AMaiaContextFactory;\n\npublic aspect AMaiaContextFactoryEvent extends AMaiaContextFactory {\n\n\tafter(IMaiaContextFactory factory) returning (IMaiaContext result): \n\t\tonCreateContext(factory) {\n\t\tIMaiaEventBroker broker = result.get(IMaiaEventBroker.class);\n\t\tbroker.post(new MaiaContextFactoryCreateChildEvent(result.getParent(), result));\n\t}\n\n\tafter() returning (IMaiaContext result): \n\t\tonCreateContext(*) {\n\t\tIMaiaEventBroker broker = result.get(IMaiaEventBroker.class);\n\t\tbroker.post(new MaiaContextFactoryCreateEvent(result));\n\t}\n}","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"97c6b559fef3b1b1caef4db93a29d7c5e0a90506","subject":"Counting of failures, errors and successes now gives same number as JUnit.","message":"Counting of failures, errors and successes now gives same number as JUnit.\n\ngit-svn-id: dc8158aad167a3007ca64719d3939bef820f4b72@581 ab42f6e0-554d-0410-b580-99e487e6eeb2\n","repos":"grammarware\/slps,grammarware\/slps,grammarware\/slps,grammarware\/slps,grammarware\/slps,grammarware\/slps,grammarware\/slps,grammarware\/slps,grammarware\/slps","old_file":"topics\/apimigration\/benchmark\/src\/org\/planet_sl\/apimigration\/benchmark\/analysis\/InterceptTestFailure.aj","new_file":"topics\/apimigration\/benchmark\/src\/org\/planet_sl\/apimigration\/benchmark\/analysis\/InterceptTestFailure.aj","new_contents":"package org.planet_sl.apimigration.benchmark.analysis;\n\nimport java.util.ArrayList;\nimport java.util.HashMap;\nimport java.util.HashSet;\nimport java.util.Map;\nimport java.util.Set;\nimport java.util.Collections;\n\nimport junit.framework.TestSuite;\nimport junit.textui.TestRunner;\n\n\nimport org.planet_sl.apimigration.benchmark.jdom.wrapped_as_xom.*;\n\n@SuppressWarnings(\"unused\")\npublic aspect InterceptTestFailure {\n\n\tstatic int tests = 0;\n\tstatic int assertionsTotal = 0;\n\tstatic int failuresTotal = 0;\n\tstatic int errorsTotal = 0;\n\tstatic String currentTest = null;\n\tstatic String currentMethod = null;\n\t\n\tprivate static String prettyName(String name) {\n\t\tname = name.replaceAll(\"execution\\\\(\\\\1\\\\)$\", \"\\\\1\");\n\t\tname = name.replaceAll(\"\\\\)$\", \"\");\n\t\tname = name.replaceAll(\"org.planet_sl.apimigration.benchmark.jdom.wrapped_as_xom.\", \"\");\n\t\tname = name.substring(name.indexOf(\" \") + 1);\n\t\treturn name;\n\t}\n\t\n\tafter(): execution(public static void CollectFailures.main(..)) {\n\t\tSystem.out.println(tests + \" tests with \" + assertionsTotal + \" assertions\");\n\t\tSystem.out.println(failuresTotal + \" failures; \" + errorsTotal + \" errors\");\n\t\tfor (String method: assertionCount.keySet()) {\n\t\t\tSystem.out.println(\"assertion of \" + method + \": \" + assertionCount.get(method));\n\t\t}\n\t\tfor (String method: failureCount.keySet()) {\n\t\t\tSystem.out.println(\"failures of \" + method + \": \" + failureCount.get(method));\n\t\t}\n\t\tfor (String method: errorCount.keySet()) {\n\t\t\tSystem.out.println(\"errors of \" + method + \": \" + errorCount.get(method));\n\t\t}\n\t\tfor (String method: successCount.keySet()) {\n\t\t\tSystem.out.println(\"successes of \" + method + \": \" + successCount.get(method));\n\t\t}\n\t}\n\t\n\tprivate static Map<String,Integer> failureCount = new HashMap<String, Integer>();\n\tprivate static Map<String,Integer> errorCount = new HashMap<String, Integer>();\n\tprivate static Map<String,Integer> assertionCount = new HashMap<String, Integer>();\n\tprivate static Map<String,Integer> successCount = new HashMap<String, Integer>();\n\tprivate static java.util.List<String> methods = new ArrayList<String>();\n\tprivate static int assertions = 0;\n\n\tprivate static void inc(Map<String,Integer> table, String currentMethod) {\n\t\tinc(table, currentMethod, 1);\n\t}\n\t\n\tprivate static void inc(Map<String,Integer> table, String currentMethod, int count) {\n\t\tif (!table.containsKey(currentMethod)) {\n\t\t\ttable.put(currentMethod, 0);\n\t\t}\n\t\ttable.put(currentMethod, table.get(currentMethod) + count);\n\t}\n\t\n\tbefore(): call(void assert*(..)) && within(org.planet_sl.apimigration.benchmark.jdom.test_as_xom.*) {\n\t\tassertions++;\n\t\tassertionsTotal++;\n\t}\n\t\n\tprivate static boolean wasFeature = false;\n\tprivate static Map<String,Integer> featureCallCount = new HashMap<String, Integer>();\n\t\n\tafter(): execution(* org.planet_sl.apimigration.benchmark.jdom.wrapped_as_xom.*.*(..)) {\n\t\tcurrentMethod = thisJoinPoint.toShortString();\n\t\tinc(featureCallCount, currentMethod);\n\t\tif (!methods.contains(currentMethod)) {\n\t\t\tmethods.add(currentMethod);\n\t\t}\n\t}\n\n\t\n\tvoid around(): execution(void test*()) && within(org.planet_sl.apimigration.benchmark.jdom.test_as_xom.*) {\n\t\tmethods.clear();\n\t\tassertions = 0;\n\t\ttests++;\n\t\ttry {\n\t\t\tproceed();\n\t\t}\n\t\tcatch (AssertionError e) {\n\t\t\tfailuresTotal++;\n\t\t\tfor (String method: methods) {\n\t\t\t\tinc(failureCount, method);\n\t\t\t}\n\t\t\tthrow e;\n\t\t}\n\t\tcatch (Throwable e) {\n\t\t\terrorsTotal++;\n\t\t\tfor (String method: methods) {\n\t\t\t\tinc(errorCount, method);\n\t\t\t}\n\t\t\t\/\/throw e;\n\t\t}\n\t\tfor (String method: methods) {\n\t\t\tinc(successCount, method, assertions);\n\t\t}\n\t}\n\t\n\n\/\/\tCollections.sort(methods);\n\/\/\tfor (String method: methods) {\n\/\/\t\tSystem.out.println(method + \": \");\n\/\/\t\tSystem.out.println(\"\\t\" + assertionCount.get(method) + \" assertions\");\n\/\/\t\tSystem.out.println(\"\\t\" + failureCount.get(method) + \" failed\");\n\/\/\t\tSystem.out.println(\"\\t\" + errorCount.get(method) + \" errors\");\n\/\/\t}\n\/\/\tSystem.out.println(\"***** FAILURES ****** (\" + failures.size() + \" out of \" + tests + \")\");\n\/\/\tint i = 1;\n\/\/\tfor (String test: failures.keySet()) {\n\/\/\t\tString prettyTest = test.replaceAll(\"execution\\\\(\", \"\").replaceAll(\"\\\\)$\", \"\");\n\/\/\t\tString prettyMethod = failures.get(test);\n\/\/\t\tprettyMethod = prettyMethod.replaceAll(\"execution\\\\(\", \"\");\n\/\/\t\tprettyMethod = prettyMethod.replaceAll(\"\\\\)$\", \"\");\n\/\/\t\tprettyMethod = prettyMethod.replaceAll(\"org.planet_sl.apimigration.benchmark.jdom.wrapped_as_xom.\", \"\");\n\/\/\t\tprettyMethod = prettyMethod.substring(prettyMethod.indexOf(\" \") + 1);\n\/\/\t\tSystem.out.println(i + \" \" + prettyTest + \": \" + prettyMethod);\n\/\/\t\ti++;\n\/\/\t}\n\/\/\tSystem.out.println(\"***** ERRORS ****** (\" + errors.size() + \" out of \" + tests + \")\");\n\/\/\t\/\/ TODO refactor...\n\/\/\ti = 1;\n\/\/\tfor (String test: errors.keySet()) {\n\/\/\t\tString prettyTest = test.replaceAll(\"execution\\\\(\", \"\").replaceAll(\"\\\\)$\", \"\");\n\/\/\t\tString prettyMethod = errors.get(test);\n\/\/\t\tprettyMethod = prettyMethod.replaceAll(\"execution\\\\(\", \"\");\n\/\/\t\tprettyMethod = prettyMethod.replaceAll(\"\\\\)$\", \"\");\n\/\/\t\tprettyMethod = prettyMethod.replaceAll(\"org.planet_sl.apimigration.benchmark.jdom.wrapped_as_xom.\", \"\");\n\/\/\t\tprettyMethod = prettyMethod.substring(prettyMethod.indexOf(\" \") + 1);\n\/\/\t\tSystem.out.println(i + \" \" + prettyTest + \": \" + prettyMethod + \" (\"\n\/\/\t\t\t\t+ exceptions.get(test).getClass() + \")\");\n\/\/\t\ti++;\n\/\/\t}\n\t\n}\n","old_contents":"package org.planet_sl.apimigration.benchmark.analysis;\n\nimport java.util.ArrayList;\nimport java.util.HashMap;\nimport java.util.HashSet;\nimport java.util.Map;\nimport java.util.Set;\nimport java.util.Collections;\n\nimport junit.framework.TestSuite;\nimport junit.textui.TestRunner;\n\n\nimport org.planet_sl.apimigration.benchmark.jdom.wrapped_as_xom.*;\n\n@SuppressWarnings(\"unused\")\npublic aspect InterceptTestFailure {\n\n\tstatic int tests = 0;\n\tstatic Map<String, String> failures = new HashMap<String, String>();\n\tstatic Map<String, String> errors = new HashMap<String, String>();\n\tstatic Map<String, String> success = new HashMap<String, String>();\n\tstatic Map<String, RuntimeException> exceptions = new HashMap<String, RuntimeException>();\n\tstatic String currentTest = null;\n\tstatic String currentMethod = null;\n\t\n\tprivate static String prettyName(String name) {\n\t\tname = name.replaceAll(\"execution\\\\(\\\\1\\\\)$\", \"\\\\1\");\n\t\tname = name.replaceAll(\"\\\\)$\", \"\");\n\t\tname = name.replaceAll(\"org.planet_sl.apimigration.benchmark.jdom.wrapped_as_xom.\", \"\");\n\t\tname = name.substring(name.indexOf(\" \") + 1);\n\t\treturn name;\n\t}\n\t\n\tafter(): execution(public static void CollectFailures.main(..)) {\n\t\tSystem.out.println(tests + \" tests with \" + assertions + \" assertions\");\n\t\tCollections.sort(methods);\n\t\tfor (String method: methods) {\n\t\t\tSystem.out.println(method + \": \");\n\t\t\tSystem.out.println(\"\\t\" + assertionCount.get(method) + \" assertions\");\n\t\t\tSystem.out.println(\"\\t\" + failureCount.get(method) + \" failed\");\n\t\t\tSystem.out.println(\"\\t\" + errorCount.get(method) + \" errors\");\n\t\t}\n\/\/\t\tSystem.out.println(\"***** FAILURES ****** (\" + failures.size() + \" out of \" + tests + \")\");\n\/\/\t\tint i = 1;\n\/\/\t\tfor (String test: failures.keySet()) {\n\/\/\t\t\tString prettyTest = test.replaceAll(\"execution\\\\(\", \"\").replaceAll(\"\\\\)$\", \"\");\n\/\/\t\t\tString prettyMethod = failures.get(test);\n\/\/\t\t\tprettyMethod = prettyMethod.replaceAll(\"execution\\\\(\", \"\");\n\/\/\t\t\tprettyMethod = prettyMethod.replaceAll(\"\\\\)$\", \"\");\n\/\/\t\t\tprettyMethod = prettyMethod.replaceAll(\"org.planet_sl.apimigration.benchmark.jdom.wrapped_as_xom.\", \"\");\n\/\/\t\t\tprettyMethod = prettyMethod.substring(prettyMethod.indexOf(\" \") + 1);\n\/\/\t\t\tSystem.out.println(i + \" \" + prettyTest + \": \" + prettyMethod);\n\/\/\t\t\ti++;\n\/\/\t\t}\n\/\/\t\tSystem.out.println(\"***** ERRORS ****** (\" + errors.size() + \" out of \" + tests + \")\");\n\/\/\t\t\/\/ TODO refactor...\n\/\/\t\ti = 1;\n\/\/\t\tfor (String test: errors.keySet()) {\n\/\/\t\t\tString prettyTest = test.replaceAll(\"execution\\\\(\", \"\").replaceAll(\"\\\\)$\", \"\");\n\/\/\t\t\tString prettyMethod = errors.get(test);\n\/\/\t\t\tprettyMethod = prettyMethod.replaceAll(\"execution\\\\(\", \"\");\n\/\/\t\t\tprettyMethod = prettyMethod.replaceAll(\"\\\\)$\", \"\");\n\/\/\t\t\tprettyMethod = prettyMethod.replaceAll(\"org.planet_sl.apimigration.benchmark.jdom.wrapped_as_xom.\", \"\");\n\/\/\t\t\tprettyMethod = prettyMethod.substring(prettyMethod.indexOf(\" \") + 1);\n\/\/\t\t\tSystem.out.println(i + \" \" + prettyTest + \": \" + prettyMethod + \" (\"\n\/\/\t\t\t\t\t+ exceptions.get(test).getClass() + \")\");\n\/\/\t\t\ti++;\n\/\/\t\t}\n\t}\n\t\n\tprivate static Map<String,Integer> failureCount = new HashMap<String, Integer>();\n\tprivate static Map<String,Integer> errorCount = new HashMap<String, Integer>();\n\tprivate static Map<String,Integer> assertionCount = new HashMap<String, Integer>();\n\tprivate static java.util.List<String> methods = new ArrayList<String>();\n\tprivate static int assertions = 0;\n\tprivate static String testedMethod = \"<unknown>\";\n\tprivate static void inc(Map<String,Integer> table, String currentMethod) {\n\t\tif (!table.containsKey(currentMethod)) {\n\t\t\ttable.put(currentMethod, 0);\n\t\t}\n\t\ttable.put(currentMethod, table.get(currentMethod) + 1);\n\t}\n\t\n\tbefore() : call(void assert*(..)) {\n\t\tinc(assertionCount, testedMethod);\n\t\tassertions++;\n\t}\n\t\n\tbefore (): execution(void test*()) {\n\t\tcurrentTest = thisJoinPoint.toShortString();\n\t\ttestedMethod = \"<unknown>\";\n\t}\n\t\n\tvoid around(): execution(void test*()) {\n\t\ttests++;\n\t\ttry {\n\t\t\tproceed();\n\t\t}\n\t\tcatch (AssertionError e) {\n\t\t\tfailures.put(currentTest, testedMethod);\n\t\t\tinc(failureCount, testedMethod);\n\t\t\tthrow e;\n\t\t}\n\t\tcatch (RuntimeException e) {\n\t\t\terrors.put(currentTest, testedMethod);\n\t\t\texceptions.put(currentTest, e);\n\t\t\tinc(errorCount, testedMethod);\n\t\t\tthrow e;\n\t\t}\n\t\t\/\/ We cannot count success; because than we only count it for the method\n\t\t\/\/ in the last assertion.\n\/\/\t\tsuccess.put(currentTest, currentMethod);\n\t}\n\t\n\tbefore(): execution(* org.planet_sl.apimigration.benchmark.jdom.wrapped_as_xom.*.*(..)) {\n\t\tcurrentMethod = thisJoinPoint.toString();\n\t\tString prettyName = prettyName(currentMethod);\n\t\tString name = prettyName.substring(prettyName.indexOf(\".\") + 1);\n\t\tname = name.replaceAll(\"\\\\(.*\\\\)$\", \"\");\n\t\tname = name.toLowerCase();\n\t\tif (currentTest.toLowerCase().indexOf(name) != -1) {\n\t\t\ttestedMethod = prettyName;\n\t\t}\n\t\tif (!methods.contains(testedMethod)) {\n\t\t\tmethods.add(testedMethod);\n\t\t}\n\t}\n\t\n\t\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"280307acadd6ecdc3cfcda297b684741ee97350d","subject":"corrected package name on the aspect","message":"corrected package name on the aspect","repos":"rdammkoehler\/EasyBuilder","old_file":"src\/main\/aspect\/TracingAspect.aj","new_file":"src\/main\/aspect\/TracingAspect.aj","new_contents":"\/*\n The MIT License\n\nCopyright (c) 2009-2014 NOrad Ltd.\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and\/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\nTHE SOFTWARE.\n *\/\npackage com.noradltd.easybuilder;\n\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\npublic aspect TracingAspect {\n\n\tfinal Logger logger = LoggerFactory.getLogger(EasyBuilder.class);\n\t\n\tvoid emit(String message) {\n\t\tlogger.info(message);\n\t}\n\t\n\tpointcut traceAssemblyInstruction(EasyBuilder.AssemblyInstruction instruction): target(instruction) && call(void invoke(EasyBuilder));\n\t\n\tbefore(EasyBuilder.AssemblyInstruction instruction):traceAssemblyInstruction(instruction) {\n\t\temit(\"Invoking Assembly Instruction \" + instruction.toString());\n\t}\n\t\n\tpointcut traceAssembleObject(EasyBuilder builder):target(builder) && call(Object assembleObject());\n\t\n\tbefore(EasyBuilder builder):traceAssembleObject(builder) {\n\t\temit(\"Assembling Object with \" + builder.toString());\n\t}\n\t\n\tpointcut tracePreCompileResult(EasyBuilder builder):target(builder) && call(void preCompile());\n\t\n\tbefore(EasyBuilder builder):tracePreCompileResult(builder) {\n\t\temit(\"Before PreCompile: AssemblyInstructions \" + builder.toString());\n\t}\n\t\n\tafter(EasyBuilder builder):tracePreCompileResult(builder) {\n\t\temit(\"After PreCompile: AssemblyInstructions \" + builder.toString());\n\t}\n\t\n}\n","old_contents":"\/*\n The MIT License\n\nCopyright (c) 2009-2014 NOrad Ltd.\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and\/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\nTHE SOFTWARE.\n *\/\npackage easybuilder;\n\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\npublic aspect TracingAspect {\n\n\tfinal Logger logger = LoggerFactory.getLogger(EasyBuilder.class);\n\t\n\tvoid emit(String message) {\n\t\tlogger.info(message);\n\t}\n\t\n\tpointcut traceAssemblyInstruction(EasyBuilder.AssemblyInstruction instruction): target(instruction) && call(void invoke(EasyBuilder));\n\t\n\tbefore(EasyBuilder.AssemblyInstruction instruction):traceAssemblyInstruction(instruction) {\n\t\temit(\"Invoking Assembly Instruction \" + instruction.toString());\n\t}\n\t\n\tpointcut traceAssembleObject(EasyBuilder builder):target(builder) && call(Object assembleObject());\n\t\n\tbefore(EasyBuilder builder):traceAssembleObject(builder) {\n\t\temit(\"Assembling Object with \" + builder.toString());\n\t}\n\t\n\tpointcut tracePreCompileResult(EasyBuilder builder):target(builder) && call(void preCompile());\n\t\n\tbefore(EasyBuilder builder):tracePreCompileResult(builder) {\n\t\temit(\"Before PreCompile: AssemblyInstructions \" + builder.toString());\n\t}\n\t\n\tafter(EasyBuilder builder):tracePreCompileResult(builder) {\n\t\temit(\"After PreCompile: AssemblyInstructions \" + builder.toString());\n\t}\n\t\n}\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"63c7bdef93c934a38c966bcca90284cc25f7c9db","subject":"fixed merge error","message":"fixed merge error\n","repos":"spring-projects\/spring-data-graph","old_file":"src\/main\/java\/org\/springframework\/datastore\/graph\/neo4j\/spi\/node\/Neo4jNodeBacking.aj","new_file":"src\/main\/java\/org\/springframework\/datastore\/graph\/neo4j\/spi\/node\/Neo4jNodeBacking.aj","new_contents":"package org.springframework.datastore.graph.neo4j.spi.node;\n\nimport org.aspectj.lang.JoinPoint;\nimport org.aspectj.lang.reflect.FieldSignature;\nimport org.neo4j.graphdb.DynamicRelationshipType;\nimport org.neo4j.graphdb.Node;\nimport org.neo4j.graphdb.Relationship;\nimport org.neo4j.graphdb.RelationshipType;\nimport org.neo4j.graphdb.traversal.TraversalDescription;\nimport org.neo4j.graphdb.traversal.Traverser;\nimport org.springframework.beans.factory.annotation.Autowired;\nimport org.springframework.datastore.graph.api.GraphEntity;\nimport org.springframework.datastore.graph.api.NodeBacked;\nimport org.springframework.datastore.graph.api.RelationshipBacked;\nimport org.springframework.datastore.graph.neo4j.fieldaccess.*;\nimport org.springframework.datastore.graph.neo4j.support.GraphDatabaseContext;\nimport org.springframework.persistence.support.AbstractTypeAnnotatingMixinFields;\n\nimport org.springframework.persistence.support.AbstractConstructorEntityInstantiator;\nimport org.springframework.datastore.graph.neo4j.spi.node.Neo4jConstructorGraphEntityInstantiator;\nimport org.springframework.datastore.graph.neo4j.spi.relationship.ConstructorBypassingGraphRelationshipInstantiator;\n\nimport java.lang.reflect.Field;\n\nimport static org.springframework.datastore.graph.neo4j.fieldaccess.DoReturn.unwrap;\nimport org.springframework.datastore.graph.neo4j.fieldaccess.NodeEntityStateAccessorsFactory;\nimport org.springframework.persistence.support.StateProvider;\n\n\/**\n * Aspect to turn an object annotated with GraphEntity into a graph entity using Neo4J.\n * Delegates all field access (except for fields assumed to be transient)\n * to an underlying Neo4 graph node.\n * \n * @author Rod Johnson\n *\/\npublic aspect Neo4jNodeBacking extends AbstractTypeAnnotatingMixinFields<GraphEntity, NodeBacked> {\n    private GraphDatabaseContext graphDatabaseContext;\n    private NodeEntityStateAccessorsFactory entityStateAccessorsFactory;\n\n    @Autowired\n    public void init(GraphDatabaseContext graphDatabaseContext, NodeEntityStateAccessorsFactory entityStateAccessorsFactory) {\n        this.graphDatabaseContext = graphDatabaseContext;\n        this.entityStateAccessorsFactory = entityStateAccessorsFactory;\n    }\n\t\/\/-------------------------------------------------------------------------\n\t\/\/ Advise user-defined constructors of NodeBacked objects to create a new Neo4J backing node\n\t\/\/-------------------------------------------------------------------------\n\tpointcut arbitraryUserConstructorOfNodeBackedObject(NodeBacked entity) : \n\t\texecution((@GraphEntity *).new(..)) &&\n\t\t!execution((@GraphEntity *).new(Node)) &&\n\t\tthis(entity) && !cflowbelow(call(* fromStateInternal(..)));\n\t\n\t\n\t\/\/ Create a new node in the Graph if no Node was passed in a constructor\n    before(NodeBacked entity): arbitraryUserConstructorOfNodeBackedObject(entity) {\n        if (entityStateAccessorsFactory == null) {\n            log.error(\"entityStateAccessorsFactory not set, not creating accessors for \" + entity.getClass());\n        } else {\n            entity.stateAccessors = entityStateAccessorsFactory.getEntityStateAccessors(entity);\n            Node node = StateProvider.retrieveState();\n            if (node != null) {\n                entity.setUnderlyingState(node);\n            } else {\n                if (graphDatabaseContext.transactionIsRunning()) {\n                    entity.stateAccessors.createAndAssignState();\n                } else {\n                    log.warn(\"New Nodebacked created outside of transaction \" + entity.getClass());\n                }\n            }\n\n        }\n    }\n\n    \/\/ Introduced field\n\tprivate transient Node NodeBacked.underlyingNode;\n    private transient EntityStateAccessors<NodeBacked,Node> NodeBacked.stateAccessors;\n\n    \/*\n    public NodeBacked.new(Node n) {\n       this.setUnderlyingState(n);\n    }\n    *\/\n\tpublic void NodeBacked.setUnderlyingState(Node n) {\n\t\tthis.underlyingNode = n;\n        if (this.stateAccessors == null) {\n            this.stateAccessors = Neo4jNodeBacking.aspectOf().entityStateAccessorsFactory.getEntityStateAccessors(this);\n        } else {\n            this.stateAccessors.setUnderlyingState(n);\n        }\n\t}\n\t\n\tpublic Node NodeBacked.getUnderlyingState() {\n\t\treturn underlyingNode;\n\t}\n\t\n    public EntityStateAccessors NodeBacked.getStateAccessors() {\n        return stateAccessors;\n    }\n\n    public boolean NodeBacked.hasUnderlyingNode() {\n        return underlyingNode!=null;\n    }\n\n\tpublic Relationship NodeBacked.relateTo(NodeBacked nb, RelationshipType type) {\n\t\treturn this.underlyingNode.createRelationshipTo(nb.getUnderlyingState(), type);\n\t}\n\n\tpublic Long NodeBacked.getNodeId() {\n        if (!hasUnderlyingNode()) return null;\n\t\treturn underlyingNode.getId();\n\t}\n\n    public  Iterable<? extends NodeBacked> NodeBacked.find(final Class<? extends NodeBacked> targetType, TraversalDescription traversalDescription) {\n        if (!hasUnderlyingNode()) throw new IllegalStateException(\"No node attached to \" + this);\n        final Traverser traverser = traversalDescription.traverse(this.getUnderlyingState());\n        return new NodeBackedNodeIterableWrapper(traverser, targetType, Neo4jNodeBacking.aspectOf().graphDatabaseContext);\n    }\n    \/* todo Andy Clement\n    public Iterable<? extends NodeBacked> NodeBacked.traverse(TraversalDescription traversalDescription) {\n        final Class<? extends NodeBacked> target = this.getClass();\n        return this.traverse(target,traversalDescription);\n    }\n    *\/\n\n    \/* todo Andy Clement\n    public <R extends RelationshipBacked, N extends NodeBacked> R NodeBacked.relateTo(N node, Class<R> relationshipType, String type) {\n        Relationship rel = this.getUnderlyingState().createRelationshipTo(node.getUnderlyingState(), DynamicRelationshipType.withName(type));\n        Neo4jNodeBacking.aspectOf().relationshipEntityInstantiator.createEntityFromState(rel, relationshipType);\n    }\n    *\/\n\n    public RelationshipBacked NodeBacked.relateTo(NodeBacked node, Class<? extends RelationshipBacked> relationshipType, String type) {\n        Relationship rel = this.getUnderlyingState().createRelationshipTo(node.getUnderlyingState(), DynamicRelationshipType.withName(type));\n        return Neo4jNodeBacking.aspectOf().graphDatabaseContext.createEntityFromState(rel, relationshipType);\n    }\n\n    public void NodeBacked.removeRelationshipTo(NodeBacked node, String type) {\n        Node myNode=this.getUnderlyingState();\n        Node otherNode=node.getUnderlyingState();\n        for (Relationship rel : this.getUnderlyingState().getRelationships(DynamicRelationshipType.withName(type))) {\n            if (rel.getOtherNode(myNode).equals(otherNode)) {\n                rel.delete();\n                return;\n            }\n        }\n        return;\n    }\n\n    public RelationshipBacked NodeBacked.getRelationshipTo(NodeBacked node, Class<? extends RelationshipBacked> relationshipType, String type) {\n        Node myNode=this.getUnderlyingState();\n        Node otherNode=node.getUnderlyingState();\n        for (Relationship rel : this.getUnderlyingState().getRelationships(DynamicRelationshipType.withName(type))) {\n            if (rel.getOtherNode(myNode).equals(otherNode)) return Neo4jNodeBacking.aspectOf().graphDatabaseContext.createEntityFromState(rel, relationshipType);\n        }\n        return null;\n    }\n\n\tpublic final boolean NodeBacked.equals(Object obj) {\n        if (obj == this) return true;\n        if (!hasUnderlyingNode()) return false;\n\t\tif (obj instanceof NodeBacked) {\n\t\t\treturn this.getUnderlyingState().equals(((NodeBacked) obj).getUnderlyingState());\n\t\t}\n\t\treturn false;\n\t}\n\t\n\tpublic final int NodeBacked.hashCode() {\n        if (!hasUnderlyingNode()) return System.identityHashCode(this);\n\t\treturn getUnderlyingState().hashCode();\n\t}\n\n    Object around(NodeBacked entity): entityFieldGet(entity) {\n        Object result=entity.stateAccessors.getValue(field(thisJoinPoint));\n        if (result instanceof DoReturn) return unwrap(result);\n        return proceed(entity);\n    }\n\n    Object around(NodeBacked entity, Object newVal) : entityFieldSet(entity, newVal) {\n        Object result=entity.stateAccessors.setValue(field(thisJoinPoint),newVal);\n        if (result instanceof DoReturn) return unwrap(result);\n        return proceed(entity,result);\n\t}\n\n    Field field(JoinPoint joinPoint) {\n        FieldSignature fieldSignature = (FieldSignature)joinPoint.getSignature();\n        return fieldSignature.getField();\n    }\n}\n","old_contents":"package org.springframework.datastore.graph.neo4j.spi.node;\n\nimport org.aspectj.lang.JoinPoint;\nimport org.aspectj.lang.reflect.FieldSignature;\nimport org.neo4j.graphdb.DynamicRelationshipType;\nimport org.neo4j.graphdb.Node;\nimport org.neo4j.graphdb.Relationship;\nimport org.neo4j.graphdb.RelationshipType;\nimport org.neo4j.graphdb.traversal.TraversalDescription;\nimport org.neo4j.graphdb.traversal.Traverser;\nimport org.springframework.beans.factory.annotation.Autowired;\nimport org.springframework.datastore.graph.api.GraphEntity;\nimport org.springframework.datastore.graph.api.NodeBacked;\nimport org.springframework.datastore.graph.api.RelationshipBacked;\nimport org.springframework.datastore.graph.neo4j.fieldaccess.*;\nimport org.springframework.datastore.graph.neo4j.support.GraphDatabaseContext;\nimport org.springframework.persistence.support.AbstractTypeAnnotatingMixinFields;\n\nimport org.springframework.persistence.support.AbstractConstructorEntityInstantiator;\nimport org.springframework.datastore.graph.neo4j.spi.node.Neo4jConstructorGraphEntityInstantiator;\nimport org.springframework.datastore.graph.neo4j.spi.relationship.ConstructorBypassingGraphRelationshipInstantiator;\n\nimport java.lang.reflect.Field;\n\nimport static org.springframework.datastore.graph.neo4j.fieldaccess.DoReturn.unwrap;\nimport org.springframework.datastore.graph.neo4j.fieldaccess.NodeEntityStateAccessorsFactory;\nimport org.springframework.persistence.support.StateProvider;\n\n\/**\n * Aspect to turn an object annotated with GraphEntity into a graph entity using Neo4J.\n * Delegates all field access (except for fields assumed to be transient)\n * to an underlying Neo4 graph node.\n * \n * @author Rod Johnson\n *\/\npublic aspect Neo4jNodeBacking extends AbstractTypeAnnotatingMixinFields<GraphEntity, NodeBacked> {\n    private GraphDatabaseContext graphDatabaseContext;\n    private NodeEntityStateAccessorsFactory entityStateAccessorsFactory;\n\n    @Autowired\n    public void init(GraphDatabaseContext graphDatabaseContext, NodeEntityStateAccessorsFactory entityStateAccessorsFactory) {\n        this.graphDatabaseContext = graphDatabaseContext;\n        this.entityStateAccessorsFactory = entityStateAccessorsFactory;\n    }\n\t\/\/-------------------------------------------------------------------------\n\t\/\/ Advise user-defined constructors of NodeBacked objects to create a new Neo4J backing node\n\t\/\/-------------------------------------------------------------------------\n\tpointcut arbitraryUserConstructorOfNodeBackedObject(NodeBacked entity) : \n\t\texecution((@GraphEntity *).new(..)) &&\n\t\t!execution((@GraphEntity *).new(Node)) &&\n\t\tthis(entity) && !cflowbelow(call(* fromStateInternal(..)));\n\t\n\t\n\t\/\/ Create a new node in the Graph if no Node was passed in a constructor\n    before(NodeBacked entity): arbitraryUserConstructorOfNodeBackedObject(entity) {\n        if (entityStateAccessorsFactory == null) {\n            log.error(\"entityStateAccessorsFactory not set, not creating accessors for \" + entity.getClass());\n        } else {\n            entity.stateAccessors = entityStateAccessorsFactory.getEntityStateAccessors(entity);\n            Node node = StateProvider.retrieveState();\n            if (node != null) {\n                entity.setUnderlyingState(node);\n            } else {\n                if (log.isWarnEnabled()) log.warn(\"New Nodebacked created outside of transaction \" + entity.getClass());\n                else {}\n\n                if (graphDatabaseContext.transactionIsRunning()) {\n                    entity.stateAccessors.createAndAssignState();\n                } else {\n                    log.warn(\"New Nodebacked created outside of transaction \" + entity.getClass());\n                }\n            }\n        }\n    }\n\n    \/\/ Introduced field\n\tprivate transient Node NodeBacked.underlyingNode;\n    private transient EntityStateAccessors<NodeBacked,Node> NodeBacked.stateAccessors;\n\n    \/*\n    public NodeBacked.new(Node n) {\n       this.setUnderlyingState(n);\n    }\n    *\/\n\tpublic void NodeBacked.setUnderlyingState(Node n) {\n\t\tthis.underlyingNode = n;\n        if (this.stateAccessors == null) {\n            this.stateAccessors = Neo4jNodeBacking.aspectOf().entityStateAccessorsFactory.getEntityStateAccessors(this);\n        } else {\n            this.stateAccessors.setUnderlyingState(n);\n        }\n\t}\n\t\n\tpublic Node NodeBacked.getUnderlyingState() {\n\t\treturn underlyingNode;\n\t}\n\t\n    public EntityStateAccessors NodeBacked.getStateAccessors() {\n        return stateAccessors;\n    }\n\n    public boolean NodeBacked.hasUnderlyingNode() {\n        return underlyingNode!=null;\n    }\n\n\tpublic Relationship NodeBacked.relateTo(NodeBacked nb, RelationshipType type) {\n\t\treturn this.underlyingNode.createRelationshipTo(nb.getUnderlyingState(), type);\n\t}\n\n\tpublic Long NodeBacked.getNodeId() {\n        if (!hasUnderlyingNode()) return null;\n\t\treturn underlyingNode.getId();\n\t}\n\n    public  Iterable<? extends NodeBacked> NodeBacked.find(final Class<? extends NodeBacked> targetType, TraversalDescription traversalDescription) {\n        if (!hasUnderlyingNode()) throw new IllegalStateException(\"No node attached to \" + this);\n        final Traverser traverser = traversalDescription.traverse(this.getUnderlyingState());\n        return new NodeBackedNodeIterableWrapper(traverser, targetType, Neo4jNodeBacking.aspectOf().graphDatabaseContext);\n    }\n    \/* todo Andy Clement\n    public Iterable<? extends NodeBacked> NodeBacked.traverse(TraversalDescription traversalDescription) {\n        final Class<? extends NodeBacked> target = this.getClass();\n        return this.traverse(target,traversalDescription);\n    }\n    *\/\n\n    \/* todo Andy Clement\n    public <R extends RelationshipBacked, N extends NodeBacked> R NodeBacked.relateTo(N node, Class<R> relationshipType, String type) {\n        Relationship rel = this.getUnderlyingState().createRelationshipTo(node.getUnderlyingState(), DynamicRelationshipType.withName(type));\n        Neo4jNodeBacking.aspectOf().relationshipEntityInstantiator.createEntityFromState(rel, relationshipType);\n    }\n    *\/\n\n    public RelationshipBacked NodeBacked.relateTo(NodeBacked node, Class<? extends RelationshipBacked> relationshipType, String type) {\n        Relationship rel = this.getUnderlyingState().createRelationshipTo(node.getUnderlyingState(), DynamicRelationshipType.withName(type));\n        return Neo4jNodeBacking.aspectOf().graphDatabaseContext.createEntityFromState(rel, relationshipType);\n    }\n\n    public void NodeBacked.removeRelationshipTo(NodeBacked node, String type) {\n        Node myNode=this.getUnderlyingState();\n        Node otherNode=node.getUnderlyingState();\n        for (Relationship rel : this.getUnderlyingState().getRelationships(DynamicRelationshipType.withName(type))) {\n            if (rel.getOtherNode(myNode).equals(otherNode)) {\n                rel.delete();\n                return;\n            }\n        }\n        return;\n    }\n\n    public RelationshipBacked NodeBacked.getRelationshipTo(NodeBacked node, Class<? extends RelationshipBacked> relationshipType, String type) {\n        Node myNode=this.getUnderlyingState();\n        Node otherNode=node.getUnderlyingState();\n        for (Relationship rel : this.getUnderlyingState().getRelationships(DynamicRelationshipType.withName(type))) {\n            if (rel.getOtherNode(myNode).equals(otherNode)) return Neo4jNodeBacking.aspectOf().graphDatabaseContext.createEntityFromState(rel, relationshipType);\n        }\n        return null;\n    }\n\n\tpublic final boolean NodeBacked.equals(Object obj) {\n        if (obj == this) return true;\n        if (!hasUnderlyingNode()) return false;\n\t\tif (obj instanceof NodeBacked) {\n\t\t\treturn this.getUnderlyingState().equals(((NodeBacked) obj).getUnderlyingState());\n\t\t}\n\t\treturn false;\n\t}\n\t\n\tpublic final int NodeBacked.hashCode() {\n        if (!hasUnderlyingNode()) return System.identityHashCode(this);\n\t\treturn getUnderlyingState().hashCode();\n\t}\n\n    Object around(NodeBacked entity): entityFieldGet(entity) {\n        Object result=entity.stateAccessors.getValue(field(thisJoinPoint));\n        if (result instanceof DoReturn) return unwrap(result);\n        return proceed(entity);\n    }\n\n    Object around(NodeBacked entity, Object newVal) : entityFieldSet(entity, newVal) {\n        Object result=entity.stateAccessors.setValue(field(thisJoinPoint),newVal);\n        if (result instanceof DoReturn) return unwrap(result);\n        return proceed(entity,result);\n\t}\n\n    Field field(JoinPoint joinPoint) {\n        FieldSignature fieldSignature = (FieldSignature)joinPoint.getSignature();\n        return fieldSignature.getField();\n    }\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"5c6f58167d86cf23fff2f57b90a5e74a139d7d2e","subject":"fixed exception messages","message":"fixed exception messages\n","repos":"palava\/palava-core,palava\/palava-core","old_file":"src\/main\/java\/de\/cosmocode\/palava\/core\/aop\/AbstractPalavaAspect.aj","new_file":"src\/main\/java\/de\/cosmocode\/palava\/core\/aop\/AbstractPalavaAspect.aj","new_contents":"\/**\n * Copyright 2010 CosmoCode GmbH\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage de.cosmocode.palava.core.aop;\n\nimport java.util.Collections;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.common.collect.Iterables;\nimport com.google.inject.Binder;\nimport com.google.inject.Guice;\nimport com.google.inject.Injector;\nimport com.google.inject.Module;\nimport com.google.inject.Stage;\n\n\/**\n * Abstract aspect which intercepts {@link Guice#createInjector(..)} calls\n * to get hands on the injector.\n *\n * @since 2.0\n * @author Willi Schoenborn\n *\/\npublic abstract aspect AbstractPalavaAspect {\n\n    private static final Logger LOG = LoggerFactory.getLogger(AbstractPalavaAspect.class);\n    \n    private final Module module = new Module() {\n        \n        @Override\n        public void configure(Binder binder) {\n            final AbstractPalavaAspect self = AbstractPalavaAspect.this;\n            LOG.trace(\"Injecting members on {}\", self);\n            Preconditions.checkState(!alreadyInjected, \"Members have been already injected on %s\", self);\n            binder.requestInjection(self);\n            alreadyInjected = true;\n        }\n        \n    };\n    \n    private boolean alreadyInjected;\n    \n    private Module[] append(Module[] modules) {\n        final Module[] array = new Module[modules.length + 1];\n        System.arraycopy(modules, 0, array, 0, modules.length);\n        array[modules.length] = module;\n        return array;\n    }\n    \n    private Iterable<Module> append(Iterable<? extends Module> modules) {\n        return Iterables.concat(modules, Collections.singleton(module));\n    }\n    \n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Injector around(Module[] modules): call(Injector Guice.createInjector(Module...)) && args(modules) {\n        return proceed(append(modules));\n    }\n\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Injector around(Iterable<? extends Module> modules): \n        call(Injector Guice.createInjector(Iterable<? extends Module>)) && args(modules) {\n        return proceed(append(modules));\n    }\n\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Injector around(Stage stage, Module[] modules): \n        call(Injector Guice.createInjector(Stage, Module...)) && args(stage, modules) {\n        return proceed(stage, append(modules));\n    }\n\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Injector around(Stage stage, Iterable<? extends Module> modules): \n        call(Injector Guice.createInjector(Stage, Iterable<? extends Module>)) && args(stage, modules) {\n        return proceed(stage, append(modules));\n    }\n    \n    protected final void checkState() {\n        Preconditions.checkState(alreadyInjected, \"Members have not been injected on %s\", this);\n    }\n\n}\n","old_contents":"\/**\n * Copyright 2010 CosmoCode GmbH\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage de.cosmocode.palava.core.aop;\n\nimport java.util.Collections;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.common.collect.Iterables;\nimport com.google.inject.Binder;\nimport com.google.inject.Guice;\nimport com.google.inject.Injector;\nimport com.google.inject.Module;\nimport com.google.inject.Stage;\n\n\/**\n * Abstract aspect which intercepts {@link Guice#createInjector(..)} calls\n * to get hands on the injector.\n *\n * @since 2.0\n * @author Willi Schoenborn\n *\/\npublic abstract aspect AbstractPalavaAspect {\n\n    private static final Logger LOG = LoggerFactory.getLogger(AbstractPalavaAspect.class);\n    \n    private final Module module = new Module() {\n        \n        @Override\n        public void configure(Binder binder) {\n            final AbstractPalavaAspect self = AbstractPalavaAspect.this;\n            LOG.trace(\"Injecting members on {}\", self);\n            Preconditions.checkState(!alreadyInjected, \"Members have been already injected on {}\", self);\n            binder.requestInjection(self);\n            alreadyInjected = true;\n        }\n        \n    };\n    \n    private boolean alreadyInjected;\n    \n    private Module[] append(Module[] modules) {\n        final Module[] array = new Module[modules.length + 1];\n        System.arraycopy(modules, 0, array, 0, modules.length);\n        array[modules.length] = module;\n        return array;\n    }\n    \n    private Iterable<Module> append(Iterable<? extends Module> modules) {\n        return Iterables.concat(modules, Collections.singleton(module));\n    }\n    \n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Injector around(Module[] modules): call(Injector Guice.createInjector(Module...)) && args(modules) {\n        return proceed(append(modules));\n    }\n\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Injector around(Iterable<? extends Module> modules): \n        call(Injector Guice.createInjector(Iterable<? extends Module>)) && args(modules) {\n        return proceed(append(modules));\n    }\n\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Injector around(Stage stage, Module[] modules): \n        call(Injector Guice.createInjector(Stage, Module...)) && args(stage, modules) {\n        return proceed(stage, append(modules));\n    }\n\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Injector around(Stage stage, Iterable<? extends Module> modules): \n        call(Injector Guice.createInjector(Stage, Iterable<? extends Module>)) && args(stage, modules) {\n        return proceed(stage, append(modules));\n    }\n    \n    protected final void checkState() {\n        Preconditions.checkState(alreadyInjected, \"Members have not been injected on {}\", this);\n    }\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"dc78c8a57a7aca1675c41306b7b3846f679a3c7e","subject":"Got rid of an unnecessary catch","message":"Got rid of an unnecessary catch\n","repos":"cansin\/chitterim","old_file":"src\/com\/chitter\/aspect\/Persistence.aj","new_file":"src\/com\/chitter\/aspect\/Persistence.aj","new_contents":"package com.chitter.aspect;\r\n\r\nimport java.util.ArrayList;\r\nimport java.util.List;\r\n\r\nimport javax.jdo.JDOHelper;\r\nimport javax.jdo.PersistenceManager;\r\nimport javax.jdo.PersistenceManagerFactory;\r\nimport javax.jdo.Transaction;\r\nimport javax.jdo.annotations.PersistenceCapable;\r\nimport javax.servlet.http.HttpServletRequest;\r\nimport javax.servlet.http.HttpServletResponse;\r\n\r\nimport com.chitter.persistence.UserAccount;\r\nimport com.chitter.persistence.UserStatistic;\r\n\r\npublic aspect Persistence {\t\r\n\t\/** \r\n\t * captures ctors with more than one arg and\r\n\t * all setters of @PersistenceCapable objects.\r\n\t *\/\r\n\tpointcut pushObject(Object o): target(o) && (call(* (@PersistenceCapable *).set*(..)) || execution((@PersistenceCapable *).new(*,*,..)));\r\n\tpointcut pullObject(Object pk): args(pk) && call((@PersistenceCapable *).new(*));\r\n\tpointcut pullList(): call(List (@PersistenceCapable *).get*List());\r\n\t\r\n\tpointcut pmShouldClose() : call(* com.chitter..*Servlet.processRequest(HttpServletRequest,HttpServletResponse) throws *);\r\n\t\r\n\tpointcut withinEscapePersistence(): withincode(@EscapePersistence * *(..));\r\n\t\r\n\t@SuppressWarnings(\"all\")\r\n\tpublic static List UserAccount.getUserAccountList(){\r\n\t\treturn new ArrayList<UserAccount>();\r\n\t}\r\n\r\n\t@SuppressWarnings(\"all\")\r\n\tpublic static List UserStatistic.getUserStatisticList() {\r\n\t\treturn new ArrayList<UserStatistic> ();\r\n\t}\r\n\r\n\tprivate static final PersistenceManagerFactory PMF =\r\n        JDOHelper.getPersistenceManagerFactory(\"transactions-optional\");\r\n    private static final ThreadLocal<PersistenceManager> perThreadPM\r\n    \t= new ThreadLocal<PersistenceManager>();\r\n\r\n    private Persistence() {};\r\n    \r\n    private static PersistenceManager getPM() {\r\n    \tPersistenceManager PM = perThreadPM.get();\r\n        if (PM == null) {\r\n          PM = PMF.getPersistenceManager();\r\n          perThreadPM.set(PM);\r\n        }\r\n        return PM;\r\n    }\r\n    \r\n    after(Object o) : pushObject(o) && !withinEscapePersistence(){\r\n\t\tSystem.out.println(\"I should persist an instance of \"+o.getClass());\r\n    \tPersistenceManager pm = getPM();\r\n    \ttry{\r\n    \t\tUserStatistic statistic=(UserStatistic) o;\r\n    \t\tSystem.out.println(\"which is a statistic object btw with pk \"+statistic.getGtalkId());\r\n    \t\tJDOHelper.makeDirty(statistic, \"statistics\");\r\n    \t} finally {\r\n        \tpm.makePersistent(o.getClass().cast(o));\r\n    \t\tpm.flush();\r\n    \t}\r\n    }    \r\n    \r\n    @SuppressWarnings(\"all\")\r\n\tObject around(Object pk) : pullObject(pk) && !withinEscapePersistence(){\r\n    \tPersistenceManager pm = getPM();\r\n\t\ttry{\r\n\t\t\tObject r = pm.getObjectById(thisJoinPoint.getSignature().getDeclaringType(),pk);\r\n\t\t\tSystem.out.println(\"Yes I did and will return \"+r);\r\n\t\t\treturn r;\r\n\t\t} catch (Exception e) {\r\n\t\t\tSystem.err.println(\"No I could not and will return null\");\r\n\t\t\treturn null;\r\n\t\t} \r\n    }\r\n    \r\n    @SuppressWarnings(\"all\")\r\n\tList around() : pullList() {\r\n\t\tPersistenceManager pm = getPM();\r\n\t\t\r\n\t\ttry {\r\n\t\t\tSystem.out.println(\"I am trying to pull a list of \"+getClass()+\" from db with \");\r\n\t\t\tList list = (List) pm.newQuery(thisJoinPoint.getSignature().getDeclaringType()).execute();\r\n\t\t\tSystem.out.println(\"Yes I did\");\r\n\t\t\treturn list;\r\n\t\t} catch (Exception e) {\r\n\t\t\tSystem.err.println(\"No I am returning an empty list\");\r\n\t\t\treturn (List)(new ArrayList<Object>());\r\n\t\t} \r\n    }\r\n\t\r\n\tafter() : pmShouldClose() {\r\n\t\tPersistenceManager PM = perThreadPM.get();\r\n\t\tif (PM != null) {\r\n\t\t\tSystem.out.println(\"PM should definitely close\");\r\n\t\t\tperThreadPM.remove();\r\n\t\t\tTransaction tx = PM.currentTransaction();\r\n\t\t\tif (tx.isActive()) {\r\n\t\t\t\ttx.rollback();\r\n\t\t\t}\r\n\t\t\tPM.close();\r\n\t\t}\r\n\t}\r\n\t\r\n}\r\n","old_contents":"package com.chitter.aspect;\r\n\r\nimport java.util.ArrayList;\r\nimport java.util.List;\r\n\r\nimport javax.jdo.JDOHelper;\r\nimport javax.jdo.PersistenceManager;\r\nimport javax.jdo.PersistenceManagerFactory;\r\nimport javax.jdo.Transaction;\r\nimport javax.jdo.annotations.PersistenceCapable;\r\nimport javax.servlet.http.HttpServletRequest;\r\nimport javax.servlet.http.HttpServletResponse;\r\n\r\nimport com.chitter.persistence.UserAccount;\r\nimport com.chitter.persistence.UserStatistic;\r\n\r\npublic aspect Persistence {\t\r\n\t\/** \r\n\t * captures ctors with more than one arg and\r\n\t * all setters of @PersistenceCapable objects.\r\n\t *\/\r\n\tpointcut pushObject(Object o): target(o) && (call(* (@PersistenceCapable *).set*(..)) || execution((@PersistenceCapable *).new(*,*,..)));\r\n\tpointcut pullObject(Object pk): args(pk) && call((@PersistenceCapable *).new(*));\r\n\tpointcut pullList(): call(List (@PersistenceCapable *).get*List());\r\n\t\r\n\tpointcut pmShouldClose() : call(* com.chitter..*Servlet.processRequest(HttpServletRequest,HttpServletResponse) throws *);\r\n\t\r\n\tpointcut withinEscapePersistence(): withincode(@EscapePersistence * *(..));\r\n\t\r\n\t@SuppressWarnings(\"all\")\r\n\tpublic static List UserAccount.getUserAccountList(){\r\n\t\treturn new ArrayList<UserAccount>();\r\n\t}\r\n\r\n\t@SuppressWarnings(\"all\")\r\n\tpublic static List UserStatistic.getUserStatisticList() {\r\n\t\treturn new ArrayList<UserStatistic> ();\r\n\t}\r\n\r\n\tprivate static final PersistenceManagerFactory PMF =\r\n        JDOHelper.getPersistenceManagerFactory(\"transactions-optional\");\r\n    private static final ThreadLocal<PersistenceManager> perThreadPM\r\n    \t= new ThreadLocal<PersistenceManager>();\r\n\r\n    private Persistence() {};\r\n    \r\n    private static PersistenceManager getPM() {\r\n    \tPersistenceManager PM = perThreadPM.get();\r\n        if (PM == null) {\r\n          PM = PMF.getPersistenceManager();\r\n          perThreadPM.set(PM);\r\n        }\r\n        return PM;\r\n    }\r\n    \r\n    after(Object o) : pushObject(o) && !withinEscapePersistence(){\r\n\t\tSystem.out.println(\"I should persist an instance of \"+o.getClass());\r\n    \tPersistenceManager pm = getPM();\r\n    \ttry{\r\n    \t\tUserStatistic statistic=(UserStatistic) o;\r\n    \t\tSystem.out.println(\"which is a statistic object btw with pk \"+statistic.getGtalkId());\r\n    \t\tJDOHelper.makeDirty(statistic, \"statistics\");\r\n    \t} catch(Exception e){\r\n    \t\t\r\n    \t} finally {\r\n        \tpm.makePersistent(o.getClass().cast(o));\r\n    \t\tpm.flush();\r\n    \t}\r\n    }    \r\n    \r\n    @SuppressWarnings(\"all\")\r\n\tObject around(Object pk) : pullObject(pk) && !withinEscapePersistence(){\r\n    \tPersistenceManager pm = getPM();\r\n\t\ttry{\r\n\t\t\tObject r = pm.getObjectById(thisJoinPoint.getSignature().getDeclaringType(),pk);\r\n\t\t\tSystem.out.println(\"Yes I did and will return \"+r);\r\n\t\t\treturn r;\r\n\t\t} catch (Exception e) {\r\n\t\t\tSystem.err.println(\"No I could not and will return null\");\r\n\t\t\treturn null;\r\n\t\t} \r\n    }\r\n    \r\n    @SuppressWarnings(\"all\")\r\n\tList around() : pullList() {\r\n\t\tPersistenceManager pm = getPM();\r\n\t\t\r\n\t\ttry {\r\n\t\t\tSystem.out.println(\"I am trying to pull a list of \"+getClass()+\" from db with \");\r\n\t\t\tList list = (List) pm.newQuery(thisJoinPoint.getSignature().getDeclaringType()).execute();\r\n\t\t\tSystem.out.println(\"Yes I did\");\r\n\t\t\treturn list;\r\n\t\t} catch (Exception e) {\r\n\t\t\tSystem.err.println(\"No I am returning an empty list\");\r\n\t\t\treturn (List)(new ArrayList<Object>());\r\n\t\t} \r\n    }\r\n\t\r\n\tafter() : pmShouldClose() {\r\n\t\tPersistenceManager PM = perThreadPM.get();\r\n\t\tif (PM != null) {\r\n\t\t\tSystem.out.println(\"PM should definitely close\");\r\n\t\t\tperThreadPM.remove();\r\n\t\t\tTransaction tx = PM.currentTransaction();\r\n\t\t\tif (tx.isActive()) {\r\n\t\t\t\ttx.rollback();\r\n\t\t\t}\r\n\t\t\tPM.close();\r\n\t\t}\r\n\t}\r\n\t\r\n}\r\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"aad5d5c1013c310128472f8fb5e7ec80f2b6cd45","subject":"fix graph labels","message":"fix graph labels\n","repos":"stieglma\/Schafkopfauswerter","old_file":"src\/Graph.aj","new_file":"src\/Graph.aj","new_contents":"import java.awt.Color;\n\nimport de.erichseifert.gral.data.DataSeries;\nimport de.erichseifert.gral.data.DataTable;\nimport de.erichseifert.gral.plots.XYPlot;\nimport de.erichseifert.gral.plots.lines.DefaultLineRenderer2D;\nimport de.erichseifert.gral.ui.InteractivePanel;\nimport de.erichseifert.gral.util.Orientation;\n\nimport static model.SystemValues.Players.*;\n\nimport view.GUI;\nimport view.UIUpdater;\n\npublic privileged aspect Graph {\n\n    private static GUI gui;\n    private static DataSeries[] playersGraphs = new DataSeries[4];\n    private static InteractivePanel tabGraph = null;\n\n\n    \/**\n     * catch constructor call, so that we have the correct gui, to refer to everywhere\n     *\/\n    after() returning(GUI gui): call(GUI.new(*)) {\n        Graph.gui = gui;\n        setPlayersGraphs();\n        addGraphPane();\n    }\n\n    static void addGraphPane() {\n        gui.tabbedPane.remove(tabGraph);\n        tabGraph = new InteractivePanel(createPlot());\n        gui.tabbedPane.add(tabGraph, \"Grafik\", 2);\n    }\n\n    \/**\n     * Set the values for the lines of the graph\n     *\/\n    static void setPlayersGraphs() {\n        DataTable[] tmp = gui.model.getGameData().getTables();\n        playersGraphs[0] = new DataSeries(PLAYER_1.toString(), tmp[0], 0, 1);\n        playersGraphs[1] = new DataSeries(PLAYER_2.toString(), tmp[1], 0, 1);\n        playersGraphs[2] = new DataSeries(PLAYER_3.toString(), tmp[2], 0, 1);\n        playersGraphs[3] = new DataSeries(PLAYER_4.toString(), tmp[3], 0, 1);\n    }\n\n    \/**\n     * when the ui update is running, we want to update the names in the graphs\n     *\/\n    after() : execution(* UIUpdater.run()) {\n        playersGraphs[0].setName(PLAYER_1.toString());\n        playersGraphs[1].setName(PLAYER_2.toString());\n        playersGraphs[2].setName(PLAYER_3.toString());\n        playersGraphs[3].setName(PLAYER_4.toString());\n    }\n\n    \/**\n     * create the plot tath is shown in the Grafik tab\n     *\/\n    private static XYPlot createPlot() {\n        XYPlot plot = new XYPlot(playersGraphs[0], playersGraphs[1], playersGraphs[2], playersGraphs[3]);\n        plot.setLegendVisible(true);\n        plot.getLegend().setOrientation(Orientation.HORIZONTAL);\n        plot.getLegend().setAlignmentY(1.0);\n\n        plot.getAxisRenderer(XYPlot.AXIS_X).setLabel(\"Spielanzahl\");\n        plot.getAxisRenderer(XYPlot.AXIS_Y).setLabel(\"Geld\");\n\n        plot.setLineRenderer(playersGraphs[0], new DefaultLineRenderer2D());\n        plot.setLineRenderer(playersGraphs[1], new DefaultLineRenderer2D());\n        plot.setLineRenderer(playersGraphs[2], new DefaultLineRenderer2D());\n        plot.setLineRenderer(playersGraphs[3], new DefaultLineRenderer2D());\n\n        plot.getPointRenderer(playersGraphs[0]).setColor(Color.blue);\n        plot.getLineRenderer(playersGraphs[0]).setColor(Color.blue);\n        plot.getPointRenderer(playersGraphs[1]).setColor(Color.red);\n        plot.getLineRenderer(playersGraphs[1]).setColor(Color.red);\n        plot.getPointRenderer(playersGraphs[2]).setColor(Color.green);\n        plot.getLineRenderer(playersGraphs[2]).setColor(Color.green);\n        plot.getPointRenderer(playersGraphs[3]).setColor(Color.gray);\n        plot.getLineRenderer(playersGraphs[3]).setColor(Color.gray);\n\n        return plot;\n    }\n}\n","old_contents":"import java.awt.Color;\n\nimport de.erichseifert.gral.data.DataSeries;\nimport de.erichseifert.gral.data.DataTable;\nimport de.erichseifert.gral.plots.XYPlot;\nimport de.erichseifert.gral.plots.lines.DefaultLineRenderer2D;\nimport de.erichseifert.gral.ui.InteractivePanel;\nimport de.erichseifert.gral.util.Orientation;\n\nimport static model.SystemValues.Players.*;\n\nimport view.GUI;\nimport view.UIUpdater;\n\npublic privileged aspect Graph {\n\n    private static GUI gui;\n    private static DataSeries[] playersGraphs = new DataSeries[4];\n    private static InteractivePanel tabGraph = null;\n\n\n    \/**\n     * catch constructor call, so that we have the correct gui, to refer to everywhere\n     *\/\n    after() returning(GUI gui): call(GUI.new(*)) {\n        Graph.gui = gui;\n        setPlayersGraphs();\n        addGraphPane();\n    }\n\n    static void addGraphPane() {\n        gui.tabbedPane.remove(tabGraph);\n        tabGraph = new InteractivePanel(createPlot());\n        gui.tabbedPane.add(tabGraph, \"Grafik\", 2);\n    }\n\n    \/**\n     * Set the values for the lines of the graph\n     *\/\n    static void setPlayersGraphs() {\n        DataTable[] tmp = gui.model.getGameData().getTables();\n        playersGraphs[0] = new DataSeries(PLAYER_1.toString(), tmp[0], 0, 1);\n        playersGraphs[1] = new DataSeries(PLAYER_2.toString(), tmp[1], 0, 1);\n        playersGraphs[2] = new DataSeries(PLAYER_3.toString(), tmp[2], 0, 1);\n        playersGraphs[3] = new DataSeries(PLAYER_4.toString(), tmp[3], 0, 1);\n    }\n\n    \/**\n     * when the ui update is running, we want to update the names in the graphs\n     *\/\n    after() : execution(* UIUpdater.run()) {\n        playersGraphs[0].setName(PLAYER_1.toString());\n        playersGraphs[1].setName(PLAYER_2.toString());\n        playersGraphs[2].setName(PLAYER_3.toString());\n        playersGraphs[3].setName(PLAYER_4.toString());\n    }\n\n    \/**\n     * create the plot tath is shown in the Grafik tab\n     *\/\n    private static XYPlot createPlot() {\n        XYPlot plot = new XYPlot(playersGraphs[0], playersGraphs[1], playersGraphs[2], playersGraphs[3]);\n        plot.setLegendVisible(true);\n        plot.getLegend().setOrientation(Orientation.HORIZONTAL);\n        plot.getLegend().setAlignmentY(1.0);\n\n        plot.getAxisRenderer(XYPlot.AXIS_X).setLabel(\"Geld\");\n        plot.getAxisRenderer(XYPlot.AXIS_Y).setLabel(\"Spielanazahl\");\n\n        plot.setLineRenderer(playersGraphs[0], new DefaultLineRenderer2D());\n        plot.setLineRenderer(playersGraphs[1], new DefaultLineRenderer2D());\n        plot.setLineRenderer(playersGraphs[2], new DefaultLineRenderer2D());\n        plot.setLineRenderer(playersGraphs[3], new DefaultLineRenderer2D());\n\n        plot.getPointRenderer(playersGraphs[0]).setColor(Color.blue);\n        plot.getLineRenderer(playersGraphs[0]).setColor(Color.blue);\n        plot.getPointRenderer(playersGraphs[1]).setColor(Color.red);\n        plot.getLineRenderer(playersGraphs[1]).setColor(Color.red);\n        plot.getPointRenderer(playersGraphs[2]).setColor(Color.green);\n        plot.getLineRenderer(playersGraphs[2]).setColor(Color.green);\n        plot.getPointRenderer(playersGraphs[3]).setColor(Color.gray);\n        plot.getLineRenderer(playersGraphs[3]).setColor(Color.gray);\n\n        return plot;\n    }\n}\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"5a3eb1de54c0cf3e396cf9d853551117eac55c04","subject":"commit d97cbd749de78bd0c8c470142bf943a1ee2abe6d Author: Vinay Kumar Thota <vinayt@yahoo-inc.com> Date:   Fri Jun 4 08:50:52 2010 +0000","message":"commit d97cbd749de78bd0c8c470142bf943a1ee2abe6d\nAuthor: Vinay Kumar Thota <vinayt@yahoo-inc.com>\nDate:   Fri Jun 4 08:50:52 2010 +0000\n\n    HADOOP:6788 from https:\/\/issues.apache.org\/jira\/secure\/attachment\/12446102\/6788-ydist-security.patch\n\n\ngit-svn-id: 7e7a2d564dde2945c3a26e08d1235fcc0cb7aba1@1077489 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"awylie\/hadoop,awylie\/hadoop,awylie\/hadoop,awylie\/hadoop,awylie\/hadoop,awylie\/hadoop,awylie\/hadoop,awylie\/hadoop,awylie\/hadoop,awylie\/hadoop","old_file":"src\/test\/system\/aop\/org\/apache\/hadoop\/test\/system\/DaemonProtocolAspect.aj","new_file":"src\/test\/system\/aop\/org\/apache\/hadoop\/test\/system\/DaemonProtocolAspect.aj","new_contents":"\/**\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements.  See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership.  The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * \"License\"); you may not use this file except in compliance\n * with the License.  You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.apache.hadoop.test.system;\n\nimport java.io.File;\nimport java.io.IOException;\nimport java.security.PrivilegedExceptionAction;\nimport java.util.HashMap;\nimport java.util.List;\nimport java.util.ArrayList;\nimport java.util.Map;\nimport java.util.Properties;\nimport org.apache.commons.logging.Log;\nimport org.apache.commons.logging.LogFactory;\nimport org.apache.hadoop.io.Writable;\nimport org.apache.hadoop.security.UserGroupInformation;\nimport org.apache.hadoop.util.Shell.ShellCommandExecutor;\nimport org.apache.hadoop.util.Shell;\nimport org.apache.hadoop.fs.FileStatus;\nimport org.apache.hadoop.fs.FileSystem;\nimport org.apache.hadoop.fs.Path;\nimport org.apache.hadoop.conf.Configuration;\n\n\/**\n * Default DaemonProtocolAspect which is used to provide default implementation\n * for all the common daemon methods. If a daemon requires more specialized\n * version of method, it is responsibility of the DaemonClient to introduce the\n * same in woven classes.\n * \n *\/\npublic aspect DaemonProtocolAspect {\n\n  private boolean DaemonProtocol.ready;\n  \n  @SuppressWarnings(\"unchecked\")\n  private HashMap<Object, List<ControlAction>> DaemonProtocol.actions = \n    new HashMap<Object, List<ControlAction>>();\n  private static final Log LOG = LogFactory.getLog(\n      DaemonProtocolAspect.class.getName());\n  \/**\n   * Set if the daemon process is ready or not, concrete daemon protocol should\n   * implement pointcuts to determine when the daemon is ready and use the\n   * setter to set the ready state.\n   * \n   * @param ready\n   *          true if the Daemon is ready.\n   *\/\n  public void DaemonProtocol.setReady(boolean ready) {\n    this.ready = ready;\n  }\n\n  \/**\n   * Checks if the daemon process is alive or not.\n   * \n   * @throws IOException\n   *           if daemon is not alive.\n   *\/\n  public void DaemonProtocol.ping() throws IOException {\n  }\n\n  \/**\n   * Checks if the daemon process is ready to accepting RPC connections after it\n   * finishes initialization. <br\/>\n   * \n   * @return true if ready to accept connection.\n   * \n   * @throws IOException\n   *\/\n  public boolean DaemonProtocol.isReady() throws IOException {\n    return ready;\n  }\n\n  \/**\n   * Returns the process related information regarding the daemon process. <br\/>\n   * \n   * @return process information.\n   * @throws IOException\n   *\/\n  public ProcessInfo DaemonProtocol.getProcessInfo() throws IOException {\n    int activeThreadCount = Thread.activeCount();\n    long currentTime = System.currentTimeMillis();\n    long maxmem = Runtime.getRuntime().maxMemory();\n    long freemem = Runtime.getRuntime().freeMemory();\n    long totalmem = Runtime.getRuntime().totalMemory();\n    Map<String, String> envMap = System.getenv();\n    Properties sysProps = System.getProperties();\n    Map<String, String> props = new HashMap<String, String>();\n    for (Map.Entry entry : sysProps.entrySet()) {\n      props.put((String) entry.getKey(), (String) entry.getValue());\n    }\n    ProcessInfo info = new ProcessInfoImpl(activeThreadCount, currentTime,\n        freemem, maxmem, totalmem, envMap, props);\n    return info;\n  }\n\n  public void DaemonProtocol.enable(List<Enum<?>> faults) throws IOException {\n  }\n\n  public void DaemonProtocol.disableAll() throws IOException {\n  }\n\n  public abstract Configuration DaemonProtocol.getDaemonConf()\n    throws IOException;\n\n  public FileStatus DaemonProtocol.getFileStatus(String path, boolean local) \n    throws IOException {\n    Path p = new Path(path);\n    FileSystem fs = getFS(p, local);\n    p.makeQualified(fs);\n    FileStatus fileStatus = fs.getFileStatus(p);\n    return cloneFileStatus(fileStatus);\n  }\n\n  public FileStatus[] DaemonProtocol.listStatus(String path, boolean local) \n    throws IOException {\n    Path p = new Path(path);\n    FileSystem fs = getFS(p, local);\n    FileStatus[] status = fs.listStatus(p);\n    if (status != null) {\n      FileStatus[] result = new FileStatus[status.length];\n      int i = 0;\n      for (FileStatus fileStatus : status) {\n        result[i++] = cloneFileStatus(fileStatus);\n      }\n      return result;\n    }\n    return status;\n  }\n\n  \/**\n   * FileStatus object may not be serializable. Clone it into raw FileStatus \n   * object.\n   *\/\n  private FileStatus DaemonProtocol.cloneFileStatus(FileStatus fileStatus) {\n    return new FileStatus(fileStatus.getLen(),\n        fileStatus.isDir(),\n        fileStatus.getReplication(),\n        fileStatus.getBlockSize(),\n        fileStatus.getModificationTime(),\n        fileStatus.getAccessTime(),\n        fileStatus.getPermission(),\n        fileStatus.getOwner(),\n        fileStatus.getGroup(),\n        fileStatus.getPath());\n  }\n\n  private FileSystem DaemonProtocol.getFS(final Path path, final boolean local)\n      throws IOException {\n    FileSystem ret = null;\n    try {\n      ret = UserGroupInformation.getLoginUser().doAs (\n          new PrivilegedExceptionAction<FileSystem>() {\n            public FileSystem run() throws IOException {\n              FileSystem fs = null;\n              if (local) {\n                fs = FileSystem.getLocal(getDaemonConf());\n              } else {\n                fs = path.getFileSystem(getDaemonConf());\n              }\n              return fs;\n            }\n          });\n    } catch (InterruptedException ie) {\n    }\n    return ret;\n  }\n  \n  @SuppressWarnings(\"unchecked\")\n  public ControlAction[] DaemonProtocol.getActions(Writable key) \n    throws IOException {\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(key);\n      if(actionList == null) {\n        return new ControlAction[0];\n      } else {\n        return (ControlAction[]) actionList.toArray(new ControlAction[actionList\n                                                                      .size()]);\n      }\n    }\n  }\n\n\n  @SuppressWarnings(\"unchecked\")\n  public void DaemonProtocol.sendAction(ControlAction action) \n      throws IOException {\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(action.getTarget());\n      if(actionList == null) {\n        actionList = new ArrayList<ControlAction>();\n        actions.put(action.getTarget(), actionList);\n      }\n      actionList.add(action);\n    } \n  }\n \n  @SuppressWarnings(\"unchecked\")\n  public boolean DaemonProtocol.isActionPending(ControlAction action) \n    throws IOException{\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(action.getTarget());\n      if(actionList == null) {\n        return false;\n      } else {\n        return actionList.contains(action);\n      }\n    }\n  }\n  \n  \n  @SuppressWarnings(\"unchecked\")\n  public void DaemonProtocol.removeAction(ControlAction action) \n    throws IOException {\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(action.getTarget());\n      if(actionList == null) {\n        return;\n      } else {\n        actionList.remove(action);\n      }\n    }\n  }\n  \n  public void DaemonProtocol.clearActions() throws IOException {\n    synchronized (actions) {\n      actions.clear();\n    }\n  }\n\n  public String DaemonProtocol.getFilePattern() {\n    \/\/We use the environment variable HADOOP_LOGFILE to get the\n    \/\/pattern to use in the search.\n    String logDir = System.getenv(\"HADOOP_LOG_DIR\");\n    String daemonLogPattern = System.getenv(\"HADOOP_LOGFILE\");\n    if(daemonLogPattern == null && daemonLogPattern.isEmpty()) {\n      return \"*\";\n    }\n    return  logDir+File.separator+daemonLogPattern+\"*\";\n  }\n\n  public int DaemonProtocol.getNumberOfMatchesInLogFile(String pattern,\n      String[] list) throws IOException {\n    StringBuffer filePattern = new StringBuffer(getFilePattern());    \n    String[] cmd = null;\n    if (list != null) {\n      StringBuffer filterExpPattern = new StringBuffer();\n      int index=0;\n      for (String excludeExp : list) {\n        if (index++ < list.length -1) {\n           filterExpPattern.append(\"grep -v \" + excludeExp + \" | \");\n        } else {\n           filterExpPattern.append(\"grep -vc \" + excludeExp);\n        }\n      }\n      cmd = new String[] {\n                \"bash\",\n                \"-c\",\n                \"grep \"\n                + pattern + \" \" + filePattern + \" | \"\n                + filterExpPattern};\n    } else {\n      cmd = new String[] {\n                \"bash\",\n                \"-c\",\n                \"grep -c \"\n                + pattern + \" \" + filePattern\n                + \" | awk -F: '{s+=$2} END {print s}'\" };    \n    }\n    ShellCommandExecutor shexec = new ShellCommandExecutor(cmd);\n    shexec.execute();\n    String output = shexec.getOutput();\n    return Integer.parseInt(output.replaceAll(\"\\n\", \"\").trim());\n  }\n  \n  \/**\n   * This method is used for suspending the process.\n   * @param pid process id\n   * @throws IOException if an I\/O error occurs.\n   * @return true if process is suspended otherwise false.\n   *\/\n  public boolean DaemonProtocol.suspendProcess(String pid) throws IOException {\n    String suspendCmd = getDaemonConf().get(\"test.system.hdrc.suspend.cmd\",\n        \"kill -SIGSTOP\");\n    String [] command = {\"bash\", \"-c\", suspendCmd + \" \" + pid};\n    ShellCommandExecutor shexec = new ShellCommandExecutor(command);\n    try {\n      shexec.execute();\n    } catch (Shell.ExitCodeException e) {\n      LOG.warn(\"suspended process throws an exitcode \"\n          + \"exception for not being suspended the given process id.\");\n      return false;\n    }\n    LOG.info(\"The suspend process command is :\"\n        + shexec.toString()\n        + \" and the output for the command is \"\n        + shexec.getOutput());\n    return true;\n  }\n\n  \/**\n   * This method is used for resuming the process\n   * @param pid process id of suspended process.\n   * @throws IOException if an I\/O error occurs.\n   * @return true if suspeneded process is resumed otherwise false.\n   *\/\n  public boolean DaemonProtocol.resumeProcess(String pid) throws IOException {\n    String resumeCmd = getDaemonConf().get(\"test.system.hdrc.resume.cmd\",\n        \"kill -SIGCONT\");\n    String [] command = {\"bash\", \"-c\", resumeCmd + \" \" + pid};\n    ShellCommandExecutor shexec = new ShellCommandExecutor(command);\n    try {\n      shexec.execute();\n    } catch(Shell.ExitCodeException e) {\n        LOG.warn(\"Resume process throws an exitcode \"\n          + \"exception for not being resumed the given process id.\");\n      return false;\n    }\n    LOG.info(\"The resume process command is :\"\n        + shexec.toString()\n        + \" and the output for the command is \"\n        + shexec.getOutput());\n    return true;\n  }\n\n  private String DaemonProtocol.user = null;\n  \n  public String DaemonProtocol.getDaemonUser() {\n    return user;\n  }\n  \n  public void DaemonProtocol.setUser(String user) {\n    this.user = user;\n  }\n}\n","old_contents":"\/**\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements.  See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership.  The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * \"License\"); you may not use this file except in compliance\n * with the License.  You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.apache.hadoop.test.system;\n\nimport java.io.File;\nimport java.io.IOException;\nimport java.security.PrivilegedExceptionAction;\nimport java.util.HashMap;\nimport java.util.List;\nimport java.util.ArrayList;\nimport java.util.Map;\nimport java.util.Properties;\nimport org.apache.commons.logging.Log;\nimport org.apache.commons.logging.LogFactory;\nimport org.apache.hadoop.io.Writable;\nimport org.apache.hadoop.security.UserGroupInformation;\nimport org.apache.hadoop.util.Shell.ShellCommandExecutor;\nimport org.apache.hadoop.util.Shell;\nimport org.apache.hadoop.fs.FileStatus;\nimport org.apache.hadoop.fs.FileSystem;\nimport org.apache.hadoop.fs.Path;\nimport org.apache.hadoop.conf.Configuration;\n\n\/**\n * Default DaemonProtocolAspect which is used to provide default implementation\n * for all the common daemon methods. If a daemon requires more specialized\n * version of method, it is responsibility of the DaemonClient to introduce the\n * same in woven classes.\n * \n *\/\npublic aspect DaemonProtocolAspect {\n\n  private boolean DaemonProtocol.ready;\n  \n  @SuppressWarnings(\"unchecked\")\n  private HashMap<Object, List<ControlAction>> DaemonProtocol.actions = \n    new HashMap<Object, List<ControlAction>>();\n  private static final Log LOG = LogFactory.getLog(\n      DaemonProtocolAspect.class.getName());\n  \/**\n   * Set if the daemon process is ready or not, concrete daemon protocol should\n   * implement pointcuts to determine when the daemon is ready and use the\n   * setter to set the ready state.\n   * \n   * @param ready\n   *          true if the Daemon is ready.\n   *\/\n  public void DaemonProtocol.setReady(boolean ready) {\n    this.ready = ready;\n  }\n\n  \/**\n   * Checks if the daemon process is alive or not.\n   * \n   * @throws IOException\n   *           if daemon is not alive.\n   *\/\n  public void DaemonProtocol.ping() throws IOException {\n  }\n\n  \/**\n   * Checks if the daemon process is ready to accepting RPC connections after it\n   * finishes initialization. <br\/>\n   * \n   * @return true if ready to accept connection.\n   * \n   * @throws IOException\n   *\/\n  public boolean DaemonProtocol.isReady() throws IOException {\n    return ready;\n  }\n\n  \/**\n   * Returns the process related information regarding the daemon process. <br\/>\n   * \n   * @return process information.\n   * @throws IOException\n   *\/\n  public ProcessInfo DaemonProtocol.getProcessInfo() throws IOException {\n    int activeThreadCount = Thread.activeCount();\n    long currentTime = System.currentTimeMillis();\n    long maxmem = Runtime.getRuntime().maxMemory();\n    long freemem = Runtime.getRuntime().freeMemory();\n    long totalmem = Runtime.getRuntime().totalMemory();\n    Map<String, String> envMap = System.getenv();\n    Properties sysProps = System.getProperties();\n    Map<String, String> props = new HashMap<String, String>();\n    for (Map.Entry entry : sysProps.entrySet()) {\n      props.put((String) entry.getKey(), (String) entry.getValue());\n    }\n    ProcessInfo info = new ProcessInfoImpl(activeThreadCount, currentTime,\n        freemem, maxmem, totalmem, envMap, props);\n    return info;\n  }\n\n  public void DaemonProtocol.enable(List<Enum<?>> faults) throws IOException {\n  }\n\n  public void DaemonProtocol.disableAll() throws IOException {\n  }\n\n  public abstract Configuration DaemonProtocol.getDaemonConf()\n    throws IOException;\n\n  public FileStatus DaemonProtocol.getFileStatus(String path, boolean local) \n    throws IOException {\n    Path p = new Path(path);\n    FileSystem fs = getFS(p, local);\n    p.makeQualified(fs);\n    FileStatus fileStatus = fs.getFileStatus(p);\n    return cloneFileStatus(fileStatus);\n  }\n\n  public FileStatus[] DaemonProtocol.listStatus(String path, boolean local) \n    throws IOException {\n    Path p = new Path(path);\n    FileSystem fs = getFS(p, local);\n    FileStatus[] status = fs.listStatus(p);\n    if (status != null) {\n      FileStatus[] result = new FileStatus[status.length];\n      int i = 0;\n      for (FileStatus fileStatus : status) {\n        result[i++] = cloneFileStatus(fileStatus);\n      }\n      return result;\n    }\n    return status;\n  }\n\n  \/**\n   * FileStatus object may not be serializable. Clone it into raw FileStatus \n   * object.\n   *\/\n  private FileStatus DaemonProtocol.cloneFileStatus(FileStatus fileStatus) {\n    return new FileStatus(fileStatus.getLen(),\n        fileStatus.isDir(),\n        fileStatus.getReplication(),\n        fileStatus.getBlockSize(),\n        fileStatus.getModificationTime(),\n        fileStatus.getAccessTime(),\n        fileStatus.getPermission(),\n        fileStatus.getOwner(),\n        fileStatus.getGroup(),\n        fileStatus.getPath());\n  }\n\n  private FileSystem DaemonProtocol.getFS(final Path path, final boolean local)\n      throws IOException {\n    FileSystem ret = null;\n    try {\n      ret = UserGroupInformation.getLoginUser().doAs (\n          new PrivilegedExceptionAction<FileSystem>() {\n            public FileSystem run() throws IOException {\n              FileSystem fs = null;\n              if (local) {\n                fs = FileSystem.getLocal(getDaemonConf());\n              } else {\n                fs = path.getFileSystem(getDaemonConf());\n              }\n              return fs;\n            }\n          });\n    } catch (InterruptedException ie) {\n    }\n    return ret;\n  }\n  \n  @SuppressWarnings(\"unchecked\")\n  public ControlAction[] DaemonProtocol.getActions(Writable key) \n    throws IOException {\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(key);\n      if(actionList == null) {\n        return new ControlAction[0];\n      } else {\n        return (ControlAction[]) actionList.toArray(new ControlAction[actionList\n                                                                      .size()]);\n      }\n    }\n  }\n\n\n  @SuppressWarnings(\"unchecked\")\n  public void DaemonProtocol.sendAction(ControlAction action) \n      throws IOException {\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(action.getTarget());\n      if(actionList == null) {\n        actionList = new ArrayList<ControlAction>();\n        actions.put(action.getTarget(), actionList);\n      }\n      actionList.add(action);\n    } \n  }\n \n  @SuppressWarnings(\"unchecked\")\n  public boolean DaemonProtocol.isActionPending(ControlAction action) \n    throws IOException{\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(action.getTarget());\n      if(actionList == null) {\n        return false;\n      } else {\n        return actionList.contains(action);\n      }\n    }\n  }\n  \n  \n  @SuppressWarnings(\"unchecked\")\n  public void DaemonProtocol.removeAction(ControlAction action) \n    throws IOException {\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(action.getTarget());\n      if(actionList == null) {\n        return;\n      } else {\n        actionList.remove(action);\n      }\n    }\n  }\n  \n  public void DaemonProtocol.clearActions() throws IOException {\n    synchronized (actions) {\n      actions.clear();\n    }\n  }\n\n  public String DaemonProtocol.getFilePattern() {\n    \/\/We use the environment variable HADOOP_LOGFILE to get the\n    \/\/pattern to use in the search.\n    String logDir = System.getenv(\"HADOOP_LOG_DIR\");\n    String daemonLogPattern = System.getenv(\"HADOOP_LOGFILE\");\n    if(daemonLogPattern == null && daemonLogPattern.isEmpty()) {\n      return \"*\";\n    }\n    return  logDir+File.separator+daemonLogPattern+\"*\";\n  }\n\n  public int DaemonProtocol.getNumberOfMatchesInLogFile(String pattern,\n      String[] list) throws IOException {\n    StringBuffer filePattern = new StringBuffer(getFilePattern());    \n    if(list != null){\n      for(int i =0; i < list.length; ++i)\n      {\n        filePattern.append(\" | grep -v \" + list[i] );\n      }\n    }  \n    String[] cmd =\n        new String[] {\n            \"bash\",\n            \"-c\",\n            \"grep -c \"\n                + pattern + \" \" + filePattern\n                + \" | awk -F: '{s+=$2} END {print s}'\" };    \n    ShellCommandExecutor shexec = new ShellCommandExecutor(cmd);\n    shexec.execute();\n    String output = shexec.getOutput();\n    return Integer.parseInt(output.replaceAll(\"\\n\", \"\").trim());\n  }\n  \n  \/**\n   * This method is used for suspending the process.\n   * @param pid process id\n   * @throws IOException if an I\/O error occurs.\n   * @return true if process is suspended otherwise false.\n   *\/\n  public boolean DaemonProtocol.suspendProcess(String pid) throws IOException {\n    String suspendCmd = getDaemonConf().get(\"test.system.hdrc.suspend.cmd\",\n        \"kill -SIGSTOP\");\n    String [] command = {\"bash\", \"-c\", suspendCmd + \" \" + pid};\n    ShellCommandExecutor shexec = new ShellCommandExecutor(command);\n    try {\n      shexec.execute();\n    } catch (Shell.ExitCodeException e) {\n      LOG.warn(\"suspended process throws an exitcode \"\n          + \"exception for not being suspended the given process id.\");\n      return false;\n    }\n    LOG.info(\"The suspend process command is :\"\n        + shexec.toString()\n        + \" and the output for the command is \"\n        + shexec.getOutput());\n    return true;\n  }\n\n  \/**\n   * This method is used for resuming the process\n   * @param pid process id of suspended process.\n   * @throws IOException if an I\/O error occurs.\n   * @return true if suspeneded process is resumed otherwise false.\n   *\/\n  public boolean DaemonProtocol.resumeProcess(String pid) throws IOException {\n    String resumeCmd = getDaemonConf().get(\"test.system.hdrc.resume.cmd\",\n        \"kill -SIGCONT\");\n    String [] command = {\"bash\", \"-c\", resumeCmd + \" \" + pid};\n    ShellCommandExecutor shexec = new ShellCommandExecutor(command);\n    try {\n      shexec.execute();\n    } catch(Shell.ExitCodeException e) {\n        LOG.warn(\"Resume process throws an exitcode \"\n          + \"exception for not being resumed the given process id.\");\n      return false;\n    }\n    LOG.info(\"The resume process command is :\"\n        + shexec.toString()\n        + \" and the output for the command is \"\n        + shexec.getOutput());\n    return true;\n  }\n\n  private String DaemonProtocol.user = null;\n  \n  public String DaemonProtocol.getDaemonUser() {\n    return user;\n  }\n  \n  public void DaemonProtocol.setUser(String user) {\n    this.user = user;\n  }\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"29580851d6e0563a168fed37db63648ecb6bcdcb","subject":"comments for graph","message":"comments for graph\n","repos":"stieglma\/Schafkopfauswerter","old_file":"src\/Graph.aj","new_file":"src\/Graph.aj","new_contents":"import java.awt.Color;\n\nimport de.erichseifert.gral.data.DataSeries;\nimport de.erichseifert.gral.data.DataTable;\nimport de.erichseifert.gral.plots.XYPlot;\nimport de.erichseifert.gral.plots.lines.DefaultLineRenderer2D;\nimport de.erichseifert.gral.ui.InteractivePanel;\nimport de.erichseifert.gral.util.Orientation;\n\nimport static model.SystemValues.Players.*;\n\nimport view.GUI;\nimport view.UIUpdater;\n\npublic privileged aspect Graph {\n\n    private static GUI gui;\n    private static DataSeries[] playersGraphs = new DataSeries[4];\n    private static InteractivePanel tabGraph = null;\n\n\n    \/**\n     * catch constructor call, so that we have the correct gui, to refer to everywhere\n     *\/\n    after() returning(GUI gui): call(GUI.new(*)) {\n        Graph.gui = gui;\n        setPlayersGraphs();\n        addGraphPane();\n    }\n\n    static void addGraphPane() {\n        gui.tabbedPane.remove(tabGraph);\n        tabGraph = new InteractivePanel(createPlot());\n        gui.tabbedPane.add(tabGraph, \"Grafik\", 2);\n    }\n\n    \/**\n     * Set the values for the lines of the graph\n     *\/\n    static void setPlayersGraphs() {\n        DataTable[] tmp = gui.model.getGameData().getTables();\n        playersGraphs[0] = new DataSeries(PLAYER_1.toString(), tmp[0], 0, 1);\n        playersGraphs[1] = new DataSeries(PLAYER_2.toString(), tmp[1], 0, 1);\n        playersGraphs[2] = new DataSeries(PLAYER_3.toString(), tmp[2], 0, 1);\n        playersGraphs[3] = new DataSeries(PLAYER_4.toString(), tmp[3], 0, 1);\n    }\n\n    \/**\n     * when the ui update is running, we want to update the names in the graphs\n     *\/\n    after() : execution(* UIUpdater.run()) {\n        playersGraphs[0].setName(PLAYER_1.toString());\n        playersGraphs[1].setName(PLAYER_2.toString());\n        playersGraphs[2].setName(PLAYER_3.toString());\n        playersGraphs[3].setName(PLAYER_4.toString());\n    }\n\n    \/**\n     * create the plot tath is shown in the Grafik tab\n     *\/\n    private static XYPlot createPlot() {\n        XYPlot plot = new XYPlot(playersGraphs[0], playersGraphs[1], playersGraphs[2], playersGraphs[3]);\n        plot.setLegendVisible(true);\n        plot.getLegend().setOrientation(Orientation.HORIZONTAL);\n        plot.getLegend().setAlignmentY(1.0);\n\n        plot.getAxisRenderer(XYPlot.AXIS_X).setLabel(\"Geld\");\n        plot.getAxisRenderer(XYPlot.AXIS_Y).setLabel(\"Spielanazahl\");\n\n        plot.setLineRenderer(playersGraphs[0], new DefaultLineRenderer2D());\n        plot.setLineRenderer(playersGraphs[1], new DefaultLineRenderer2D());\n        plot.setLineRenderer(playersGraphs[2], new DefaultLineRenderer2D());\n        plot.setLineRenderer(playersGraphs[3], new DefaultLineRenderer2D());\n\n        plot.getPointRenderer(playersGraphs[0]).setColor(Color.blue);\n        plot.getLineRenderer(playersGraphs[0]).setColor(Color.blue);\n        plot.getPointRenderer(playersGraphs[1]).setColor(Color.red);\n        plot.getLineRenderer(playersGraphs[1]).setColor(Color.red);\n        plot.getPointRenderer(playersGraphs[2]).setColor(Color.green);\n        plot.getLineRenderer(playersGraphs[2]).setColor(Color.green);\n        plot.getPointRenderer(playersGraphs[3]).setColor(Color.gray);\n        plot.getLineRenderer(playersGraphs[3]).setColor(Color.gray);\n\n        return plot;\n    }\n}\n","old_contents":"import java.awt.Color;\n\nimport de.erichseifert.gral.data.DataSeries;\nimport de.erichseifert.gral.data.DataTable;\nimport de.erichseifert.gral.plots.XYPlot;\nimport de.erichseifert.gral.plots.lines.DefaultLineRenderer2D;\nimport de.erichseifert.gral.ui.InteractivePanel;\nimport de.erichseifert.gral.util.Orientation;\n\nimport static model.SystemValues.Players.*;\n\nimport view.GUI;\nimport view.UIUpdater;\n\npublic privileged aspect Graph {\n\n    private static GUI gui;\n    private static DataSeries[] playersGraphs = new DataSeries[4];\n    private static InteractivePanel tabGraph = null;\n\n\n    \/**\n     * catch constructor call, so that we have the correct gui, to refer to everywhere\n     *\/\n    after() returning(GUI gui): call(GUI.new(*)) {\n        Graph.gui = gui;\n        setPlayersGraphs();\n        addGraphPane();\n    }\n\n    static void addGraphPane() {\n        gui.tabbedPane.remove(tabGraph);\n        tabGraph = new InteractivePanel(createPlot());\n        gui.tabbedPane.add(tabGraph, \"Grafik\", 2);\n    }\n\n    \/**\n     * Set the values for the lines of the graph\n     *\/\n    static void setPlayersGraphs() {\n        DataTable[] tmp = gui.model.getGameData().getTables();\n        playersGraphs[0] = new DataSeries(PLAYER_1.toString(), tmp[0], 0, 1);\n        playersGraphs[1] = new DataSeries(PLAYER_2.toString(), tmp[1], 0, 1);\n        playersGraphs[2] = new DataSeries(PLAYER_3.toString(), tmp[2], 0, 1);\n        playersGraphs[3] = new DataSeries(PLAYER_4.toString(), tmp[3], 0, 1);\n    }\n\n    \/**\n     * when the ui update is running, we want to update the names in the graphs\n     *\/\n    after() : execution(* UIUpdater.run()) {\n        playersGraphs[0].setName(PLAYER_1.toString());\n        playersGraphs[1].setName(PLAYER_2.toString());\n        playersGraphs[2].setName(PLAYER_3.toString());\n        playersGraphs[3].setName(PLAYER_4.toString());\n    }\n\n    private static XYPlot createPlot() {\n        XYPlot plot = new XYPlot(playersGraphs[0], playersGraphs[1], playersGraphs[2], playersGraphs[3]);\n        plot.setLegendVisible(true);\n        plot.getLegend().setOrientation(Orientation.HORIZONTAL);\n        plot.getLegend().setAlignmentY(1.0);\n\n        plot.getAxisRenderer(XYPlot.AXIS_X).setLabel(\"Geld\");\n        plot.getAxisRenderer(XYPlot.AXIS_Y).setLabel(\"Spielanazahl\");\n\n        plot.setLineRenderer(playersGraphs[0], new DefaultLineRenderer2D());\n        plot.setLineRenderer(playersGraphs[1], new DefaultLineRenderer2D());\n        plot.setLineRenderer(playersGraphs[2], new DefaultLineRenderer2D());\n        plot.setLineRenderer(playersGraphs[3], new DefaultLineRenderer2D());\n\n        plot.getPointRenderer(playersGraphs[0]).setColor(Color.blue);\n        plot.getLineRenderer(playersGraphs[0]).setColor(Color.blue);\n        plot.getPointRenderer(playersGraphs[1]).setColor(Color.red);\n        plot.getLineRenderer(playersGraphs[1]).setColor(Color.red);\n        plot.getPointRenderer(playersGraphs[2]).setColor(Color.green);\n        plot.getLineRenderer(playersGraphs[2]).setColor(Color.green);\n        plot.getPointRenderer(playersGraphs[3]).setColor(Color.gray);\n        plot.getLineRenderer(playersGraphs[3]).setColor(Color.gray);\n\n        return plot;\n    }\n}\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"d44f9519ca16c7a04151e29db57bfa3bb4fd4a2d","subject":"We can now reliably monitor the dispatchers","message":"We can now reliably monitor the dispatchers\n","repos":"eigengo\/monitor,eigengo\/monitor,DataDog\/monitor,DataDog\/monitor","old_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/DispatcherMonitoringAspect.aj","new_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/DispatcherMonitoringAspect.aj","new_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.actor.ActorCell;\nimport org.eigengo.monitor.agent.AgentConfiguration;\nimport org.eigengo.monitor.output.CounterInterface;\nimport scala.concurrent.forkjoin.ForkJoinPool;\n\nimport java.util.Map;\nimport java.util.concurrent.ConcurrentHashMap;\n\n\/**\n * Monitors the performance of the ``ForkJoinPool``. This will need much more tidying up, but it\n * outlines the strategy.\n *\n * The aspect contains advices that will--in the future--monitor the performance of all types of\n * thread pools, giving the users the insight into the threading in their actor systems.\n *\/\npublic aspect DispatcherMonitoringAspect extends AbstractMonitoringAspect {\n    private final CounterInterface counterInterface;\n    private final ActorPathTagger tagger;\n\n    \/\/ this is really icky, but it replaces the failing cflowbelow pointcut\n    private final Map<Long, String[]> actorCellCflowTags = new ConcurrentHashMap<Long, String[]>();\n\n    \/**\n     * Constructs this aspects, loads its configuration and instantiates the {@code counterInterface}.\n     *\/\n    public DispatcherMonitoringAspect() {\n        AgentConfiguration<AkkaAgentConfiguration> configuration = getAgentConfiguration(\"akka\", AkkaAgentConfigurationJapi.apply());\n        this.counterInterface = createCounterInterface(configuration.common());\n        this.tagger = new ActorPathTagger(configuration.agent().includeRoutees());\n    }\n\n    pointcut messageDispatcherDispatch(ActorCell actorCell) : execution(* akka.dispatch.MessageDispatcher+.dispatch(..)) && args(actorCell, *);\n\n    before(ActorCell actorCell) : messageDispatcherDispatch(actorCell) {\n        final String[] tags = this.tagger.getTags(actorCell.self().path(), ActorPathTagger.ANONYMOUS_ACTOR_CLASS_NAME);\n        final String[] allTags = new String[tags.length + 1];\n        System.arraycopy(tags, 0, allTags, 1, tags.length);\n        allTags[0] = String.format(\"akka.dispatcher:%s\", actorCell.dispatcher().id());\n        this.actorCellCflowTags.put(Thread.currentThread().getId(), allTags);\n    }\n\n    \/**\n     * Advises the ``execute`` method of an ``ExecutorService`` if that executor service is the\n     * ``ForkJoinPool``.\n     *\n     * Ideally, we would like to use <code>cflowbelow<\/code> pointcut expression, but that fails\n     * in the LTW stage with <code>NoSuchFieldError<\/code>\n     *\/\n    before(ForkJoinPool es) : call(* java.util.concurrent.ExecutorService+.execute(..)) && target(es) {\n        final String[] tags = this.actorCellCflowTags.get(Thread.currentThread().getId());\n        if (tags == null) {\n            \/\/ this is execute without ActorCell.dispatch. We don't care about that.\n            return;\n        }\n        this.counterInterface.recordGaugeValue(Aspects.activeThreadCount(), es.getActiveThreadCount(), tags);\n        this.counterInterface.recordGaugeValue(Aspects.runningThreadCount(), es.getRunningThreadCount(), tags);\n\n        this.counterInterface.recordGaugeValue(Aspects.poolSize(), es.getPoolSize(), tags);\n        this.counterInterface.recordGaugeValue(Aspects.queuedTaskCount(), (int) es.getQueuedTaskCount(), tags);\n    }\n\n}\n","old_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.actor.ActorCell;\nimport org.eigengo.monitor.agent.AgentConfiguration;\nimport org.eigengo.monitor.output.CounterInterface;\nimport scala.concurrent.forkjoin.ForkJoinPool;\n\nimport java.util.Arrays;\nimport java.util.Map;\nimport java.util.concurrent.ConcurrentHashMap;\n\n\/**\n * Monitors the performance of the ``ForkJoinPool``. This will need much more tidying up, but it\n * outlines the strategy.\n *\n * The aspect contains advices that will--in the future--monitor the performance of all types of\n * thread pools, giving the users the insight into the threading in their actor systems.\n *\/\npublic aspect DispatcherMonitoringAspect extends AbstractMonitoringAspect {\n    private final CounterInterface counterInterface;\n    private final ActorPathTagger tagger;\n\n    \/\/ this is really icky, but it replaces the failing cflowbelow pointcut\n    private final Map<Long, String[]> actorCellCflowTags = new ConcurrentHashMap<Long, String[]>();\n\n    \/**\n     * Constructs this aspects, loads its configuration and instantiates the {@code counterInterface}.\n     *\/\n    public DispatcherMonitoringAspect() {\n        AgentConfiguration<AkkaAgentConfiguration> configuration = getAgentConfiguration(\"akka\", AkkaAgentConfigurationJapi.apply());\n        this.counterInterface = createCounterInterface(configuration.common());\n        this.tagger = new ActorPathTagger(configuration.agent().includeRoutees());\n    }\n\n    pointcut messageDispatcherDispatch(ActorCell actorCell) : execution(* akka.dispatch.MessageDispatcher+.dispatch(..)) && args(actorCell, *);\n\n    before(ActorCell actorCell) : messageDispatcherDispatch(actorCell) {\n        final String[] tags = this.tagger.getTags(actorCell.self().path(), ActorPathTagger.ANONYMOUS_ACTOR_CLASS_NAME);\n        this.actorCellCflowTags.put(Thread.currentThread().getId(), tags);\n    }\n\n    \/**\n     * Advises the ``execute`` method of an ``ExecutorService`` if that executor service is the\n     * ``ForkJoinPool``.\n     *\n     * Ideally, we would like to use <code>cflowbelow<\/code> pointcut expression, but that fails\n     * in the LTW stage with <code>NoSuchFieldError<\/code>\n     *\/\n    before(ForkJoinPool es) : call(* java.util.concurrent.ExecutorService+.execute(..)) && target(es) {\n        final String[] tags = this.actorCellCflowTags.get(Thread.currentThread().getId());\n        if (tags == null) {\n            \/\/ this is execute without ActorCell.dispatch. We don't care about that.\n            return;\n        }\n        this.counterInterface.recordGaugeValue(Aspects.activeThreadCount(), es.getActiveThreadCount(), tags);\n        this.counterInterface.recordGaugeValue(Aspects.runningThreadCount(), es.getRunningThreadCount(), tags);\n\n        this.counterInterface.recordGaugeValue(Aspects.poolSize(), es.getPoolSize(), tags);\n        this.counterInterface.recordGaugeValue(Aspects.queuedTaskCount(), (int) es.getQueuedTaskCount(), tags);\n    }\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"6b1b3170e7bf2f811548729af299d75c8f58bb26","subject":"removed debug print.","message":"removed debug print.\n","repos":"ThorbenLindhauer\/activiti-engine-ppi","old_file":"modules\/activiti-engine\/src\/main\/java\/de\/unipotsdam\/hpi\/thorben\/ppi\/aspects\/TimeInstantConditionAspect.aj","new_file":"modules\/activiti-engine\/src\/main\/java\/de\/unipotsdam\/hpi\/thorben\/ppi\/aspects\/TimeInstantConditionAspect.aj","new_contents":"package de.unipotsdam.hpi.thorben.ppi.aspects;\n\nimport org.activiti.engine.impl.persistence.entity.ExecutionEntity;\nimport org.activiti.engine.impl.pvm.process.ActivityImpl;\nimport org.activiti.engine.impl.pvm.runtime.AtomicOperation;\nimport org.activiti.engine.impl.pvm.runtime.AtomicOperationActivityExecute;\nimport org.activiti.engine.impl.pvm.runtime.AtomicOperationTransitionDestroyScope;\n\nimport de.unipotsdam.hpi.thorben.ppi.condition.event.ActivityEndEvent;\nimport de.unipotsdam.hpi.thorben.ppi.condition.event.ActivityStartEvent;\nimport de.unipotsdam.hpi.thorben.ppi.condition.event.ConditionEvent;\n\n\/**\n * Defines all points of emitting time instant condition events.\n * @author Thorben\n *\n *\/\npublic aspect TimeInstantConditionAspect {\n\t\/**\n\t * Captures the ActivityStartCondition\n\t * @param operation\n\t * @param execution\n\t *\/\n\tpointcut execute(AtomicOperationActivityExecute operation,\n\t\t\tExecutionEntity execution) : target(operation) && call(void AtomicOperation+.execute(..)) && args(execution);\n\t\n\t\/**\n\t * Signals the ActivityStartCondition\n\t * @param operation\n\t * @param execution\n\t *\/\n\tbefore(AtomicOperationActivityExecute operation, ExecutionEntity execution) : execute(operation, execution) {\n\t\tActivityImpl activity = (ActivityImpl) execution.getActivity();\n\t\t\n\t\tConditionEvent event = new ActivityStartEvent(activity);\n\t\tevent.setProcessInstanceId(execution.getProcessInstanceId());\n\n\t\tactivity.notifyObservers(event);\n\t}\n\t\n\t\/**\n\t * Captures the ActivityEndCondition\n\t * @param operation\n\t * @param execution\n\t *\/\n\tpointcut finish(AtomicOperationTransitionDestroyScope operation, ExecutionEntity execution) : target(operation) && call(void AtomicOperation+.execute(..)) && args(execution);\n\t\n\t\/**\n\t * Signals the ActivityEndCondition\n\t * @param operation\n\t * @param execution\n\t *\/\n\tbefore(AtomicOperationTransitionDestroyScope operation, ExecutionEntity execution) : finish(operation, execution) {\n\t\tActivityImpl activity = (ActivityImpl) execution.getActivity();\n\n\t\tConditionEvent event = new ActivityEndEvent(activity);\n\t\tevent.setProcessInstanceId(execution.getProcessInstanceId());\n\t\tactivity.notifyObservers(event);\n\t}\n\t\n\t\n}\n","old_contents":"package de.unipotsdam.hpi.thorben.ppi.aspects;\n\nimport org.activiti.engine.impl.persistence.entity.ExecutionEntity;\nimport org.activiti.engine.impl.pvm.process.ActivityImpl;\nimport org.activiti.engine.impl.pvm.runtime.AtomicOperation;\nimport org.activiti.engine.impl.pvm.runtime.AtomicOperationActivityExecute;\nimport org.activiti.engine.impl.pvm.runtime.AtomicOperationTransitionDestroyScope;\n\nimport de.unipotsdam.hpi.thorben.ppi.condition.event.ActivityEndEvent;\nimport de.unipotsdam.hpi.thorben.ppi.condition.event.ActivityStartEvent;\nimport de.unipotsdam.hpi.thorben.ppi.condition.event.ConditionEvent;\n\n\/**\n * Defines all points of emitting time instant condition events.\n * @author Thorben\n *\n *\/\npublic aspect TimeInstantConditionAspect {\n\t\/**\n\t * Captures the ActivityStartCondition\n\t * @param operation\n\t * @param execution\n\t *\/\n\tpointcut execute(AtomicOperationActivityExecute operation,\n\t\t\tExecutionEntity execution) : target(operation) && call(void AtomicOperation+.execute(..)) && args(execution);\n\t\n\t\/**\n\t * Signals the ActivityStartCondition\n\t * @param operation\n\t * @param execution\n\t *\/\n\tbefore(AtomicOperationActivityExecute operation, ExecutionEntity execution) : execute(operation, execution) {\n\t\tActivityImpl activity = (ActivityImpl) execution.getActivity();\n\t\tSystem.out.println(\"In execution \" + execution.toString() + \" Start of \" + activity.toString() + \" with behavior \" + operation.toString());\n\t\t\n\t\tConditionEvent event = new ActivityStartEvent(activity);\n\t\tevent.setProcessInstanceId(execution.getProcessInstanceId());\n\n\t\tactivity.notifyObservers(event);\n\t}\n\t\n\t\/**\n\t * Captures the ActivityEndCondition\n\t * @param operation\n\t * @param execution\n\t *\/\n\tpointcut finish(AtomicOperationTransitionDestroyScope operation, ExecutionEntity execution) : target(operation) && call(void AtomicOperation+.execute(..)) && args(execution);\n\t\n\t\/**\n\t * Signals the ActivityEndCondition\n\t * @param operation\n\t * @param execution\n\t *\/\n\tbefore(AtomicOperationTransitionDestroyScope operation, ExecutionEntity execution) : finish(operation, execution) {\n\t\tActivityImpl activity = (ActivityImpl) execution.getActivity();\n\t\tSystem.out.println(\"In execution \" + execution.toString() + \" End of \" + activity.toString() + \" with behavior \" + operation.toString());\n\n\t\tConditionEvent event = new ActivityEndEvent(activity);\n\t\tevent.setProcessInstanceId(execution.getProcessInstanceId());\n\t\tactivity.notifyObservers(event);\n\t}\n\t\n\t\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"fca50514e4b4259ce06d972f51f2752f7040b59f","subject":"static","message":"static\n","repos":"eigengo\/monitor,DataDog\/monitor,eigengo\/monitor,DataDog\/monitor","old_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/Pointcuts.aj","new_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/Pointcuts.aj","new_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.actor.ActorCell;\nimport akka.actor.ActorRef;\nimport akka.actor.Props;\n\n\/**\n * Centralises the pointcuts\n *\/\nabstract aspect Pointcuts {\n\n    \/**\n     * Pointcut for {@code ActorCell.receiveMessage(msg)}, extracting the {@code ActorCell} and the message being received\n     *\/\n    static pointcut actorCellReceiveMessage(ActorCell actorCell, Object msg) : target(actorCell) &&\n            call(* akka.actor.ActorCell.receiveMessage(..)) && args(msg);\n\n    \/**\n     * Pointcut for {@code ActorCell.handleInvokeFailure(_, failure)}, extracting the {@code ActorCell} and the\n     * cause of the failure\n     *\/\n    static pointcut actorCellHandleInvokeFailure(ActorCell actorCell, Throwable failure) : target(actorCell) &&\n            execution(* akka.actor.ActorCell.handleInvokeFailure(..)) && args(*, failure);\n\n    \/**\n     * Pointcut for the {@code EventStream.publish(event)} method, extracting just the event\n     *\/\n    static pointcut eventStreamPublish(Object event) :\n            execution(* akka.event.EventStream.publish(..)) && args(event);\n\n    \/**\n     * Pointcut for the {@code actorOf} method in {@code ActorRefFactory} implementations. You would typically use\n     * it in the {@code after returning()} advices.\n     *\/\n    private static pointcut unnamedActorOf(Props props) : execution(* akka.actor.ActorRefFactory+.actorOf(*)) && args(props);\n    \/**\n     * Pointcut for the {@code actorOf} method in {@code ActorRefFactory} implementations where actor is named on creation\n     *\/\n    private static pointcut namedActorOf(Props props) : execution(* akka.actor.ActorRefFactory+.actorOf(*,*)) && args(props, *);\n    \/**\n     * Public pointcut for retrieving Props instance used by {@code actorOf} method in {@code ActorRefFactory}\n     *\/\n    static pointcut anyActorOf(Props props) : namedActorOf(props) || unnamedActorOf(props);\n\n\n\n\n    \/**\n     * Pointcut for {@code ActorCell.stop(actor)} method, extracting the {@code ActorRef}\n     *\/\n    static pointcut actorCellStop(ActorRef actor) : execution(* akka.actor.ActorCell.stop(..)) && args(actor);\n\n    \/**\n     * Pointcut for {@code ActorCell.stop()} method, extracting the targeted {@code ActorCell}\n     *\/\n    static pointcut actorCellInternalStop(ActorCell actorCell) : target(actorCell) && execution(* akka.actor.ActorCell.stop());\n}\n","old_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.actor.ActorCell;\nimport akka.actor.ActorRef;\nimport akka.actor.Props;\n\n\/**\n * Centralises the pointcuts\n *\/\nabstract aspect Pointcuts {\n\n    \/**\n     * Pointcut for {@code ActorCell.receiveMessage(msg)}, extracting the {@code ActorCell} and the message being received\n     *\/\n    static pointcut actorCellReceiveMessage(ActorCell actorCell, Object msg) : target(actorCell) &&\n            call(* akka.actor.ActorCell.receiveMessage(..)) && args(msg);\n\n    \/**\n     * Pointcut for {@code ActorCell.handleInvokeFailure(_, failure)}, extracting the {@code ActorCell} and the\n     * cause of the failure\n     *\/\n    static pointcut actorCellHandleInvokeFailure(ActorCell actorCell, Throwable failure) : target(actorCell) &&\n            execution(* akka.actor.ActorCell.handleInvokeFailure(..)) && args(*, failure);\n\n    \/**\n     * Pointcut for the {@code EventStream.publish(event)} method, extracting just the event\n     *\/\n    static pointcut eventStreamPublish(Object event) :\n            execution(* akka.event.EventStream.publish(..)) && args(event);\n\n    \/**\n     * Pointcut for the {@code actorOf} method in {@code ActorRefFactory} implementations. You would typically use\n     * it in the {@code after returning()} advices.\n     *\/\n    private pointcut unnamedActorOf(Props props) : execution(* akka.actor.ActorRefFactory+.actorOf(*)) && args(props);\n    \/**\n     * Pointcut for the {@code actorOf} method in {@code ActorRefFactory} implementations where actor is named on creation\n     *\/\n    private pointcut namedActorOf(Props props) : execution(* akka.actor.ActorRefFactory+.actorOf(*,*)) && args(props, *);\n    \/**\n     * Public pointcut for retrieving Props instance used by {@code actorOf} method in {@code ActorRefFactory}\n     *\/\n    pointcut anyActorOf(Props props) : namedActorOf(props) || unnamedActorOf(props);\n\n\n\n\n    \/**\n     * Pointcut for {@code ActorCell.stop(actor)} method, extracting the {@code ActorRef}\n     *\/\n    static pointcut actorCellStop(ActorRef actor) : execution(* akka.actor.ActorCell.stop(..)) && args(actor);\n\n    \/**\n     * Pointcut for {@code ActorCell.stop()} method, extracting the targeted {@code ActorCell}\n     *\/\n    static pointcut actorCellInternalStop(ActorCell actorCell) : target(actorCell) && execution(* akka.actor.ActorCell.stop());\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"b775953342928a44b8ca3a016b2cadf50feec8bf","subject":"Avoid aspectj warning adviceDidNotMatch","message":"Avoid aspectj warning adviceDidNotMatch\n","repos":"folio-org\/raml-module-builder,folio-org\/raml-module-builder,folio-org\/raml-module-builder","old_file":"domain-models-api-aspects\/src\/main\/java\/org\/folio\/rest\/annotations\/RestValidator.aj","new_file":"domain-models-api-aspects\/src\/main\/java\/org\/folio\/rest\/annotations\/RestValidator.aj","new_contents":"package org.folio.rest.annotations;\n\nimport java.util.Arrays;\nimport java.util.Set;\n\nimport javax.validation.ConstraintViolation;\nimport javax.validation.Validation;\nimport javax.validation.ValidationException;\nimport javax.validation.ValidatorFactory;\nimport javax.validation.executable.ExecutableValidator;\nimport org.aspectj.lang.reflect.MethodSignature;\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\n\npublic aspect RestValidator {\n\n  static private ValidatorFactory factory;\n\n  static {\n    factory = Validation.buildDefaultValidatorFactory();\n  }\n\n  static private ExecutableValidator getMethodValidator() {\n    return factory.getValidator().forExecutables();\n  }\n\n  pointcut validatedMethodCall() : execution(@Validate * *(..));\n\n  \/**\n   * Validates the method parameters.\n   *\/\n  @SuppressAjWarnings({\"adviceDidNotMatch\"})\n  before() : validatedMethodCall() {\n\n    MethodSignature methodSignature = (MethodSignature) thisJoinPoint.getSignature();\n\n    System.out.println(\"Validating call: with args \" + methodSignature.getMethod() + Arrays.toString(thisJoinPoint.getArgs()));\n\n    String[] params = methodSignature.getParameterNames();\n\n    Set<? extends ConstraintViolation<?>> validationErrors = getMethodValidator().validateParameters(thisJoinPoint.getThis(),\n        methodSignature.getMethod(), thisJoinPoint.getArgs());\n\n    if (validationErrors.isEmpty()) {\n      System.out.println(\"Valid call......\");\n    } else {\n      System.out.println(\"Invalid call......\");\n      RuntimeException ex = buildValidationException(validationErrors, params);\n      throw ex;\n    }\n  }\n\n  \/**\n   * @param validationErrors\n   *          The errors detected in a method\/constructor call.\n   * @return A RuntimeException with information about the detected validation\n   *         errors.\n   *\/\n  private RuntimeException buildValidationException(Set<? extends ConstraintViolation<?>> validationErrors, String[] paramNames) {\n    StringBuilder sb = new StringBuilder();\n    for (ConstraintViolation<?> cv : validationErrors) {\n      \/\/ sb.append(\"\\n\" + cv.getPropertyPath() + \"{\" + cv.getInvalidValue() +\n      \/\/ \"} : \" + cv.getMessage());\n      String positionOfBadParam = cv.getPropertyPath().toString();\n      if (positionOfBadParam != null) {\n        try {\n          String paramName = paramNames[Integer.valueOf(positionOfBadParam.substring(positionOfBadParam.length() - 1,\n              positionOfBadParam.length()))];\n          sb.append(\"\\n '\" + paramName + \"' parameter is incorrect. parameter value {\" + cv.getInvalidValue() + \"} is not valid: \"\n              + cv.getMessage());\n\n        } catch (Exception e) {\n          sb.append(\"\\n not all parameters were passed properly. parameter value {\" + cv.getInvalidValue() + \"} is not valid: \"\n              + cv.getMessage());\n\n        }\n      }\n    }\n    return new ValidationException(sb.toString());\n  }\n}\n","old_contents":"package org.folio.rest.annotations;\n\nimport java.util.Arrays;\nimport java.util.Set;\n\nimport javax.validation.ConstraintViolation;\nimport javax.validation.Validation;\nimport javax.validation.ValidationException;\nimport javax.validation.ValidatorFactory;\nimport javax.validation.executable.ExecutableValidator;\nimport org.aspectj.lang.reflect.MethodSignature;\n\npublic aspect RestValidator {\n\n  static private ValidatorFactory factory;\n\n  static {\n    factory = Validation.buildDefaultValidatorFactory();\n  }\n\n  static private ExecutableValidator getMethodValidator() {\n    return factory.getValidator().forExecutables();\n  }\n\n  pointcut validatedMethodCall() : execution(@Validate * *(..));\n\n  \/**\n   * Validates the method parameters.\n   *\/\n  before() : validatedMethodCall() {\n\n    MethodSignature methodSignature = (MethodSignature) thisJoinPoint.getSignature();\n\n    System.out.println(\"Validating call: with args \" + methodSignature.getMethod() + Arrays.toString(thisJoinPoint.getArgs()));\n\n    String[] params = methodSignature.getParameterNames();\n\n    Set<? extends ConstraintViolation<?>> validationErrors = getMethodValidator().validateParameters(thisJoinPoint.getThis(),\n        methodSignature.getMethod(), thisJoinPoint.getArgs());\n\n    if (validationErrors.isEmpty()) {\n      System.out.println(\"Valid call......\");\n    } else {\n      System.out.println(\"Invalid call......\");\n      RuntimeException ex = buildValidationException(validationErrors, params);\n      throw ex;\n    }\n  }\n\n  \/**\n   * @param validationErrors\n   *          The errors detected in a method\/constructor call.\n   * @return A RuntimeException with information about the detected validation\n   *         errors.\n   *\/\n  private RuntimeException buildValidationException(Set<? extends ConstraintViolation<?>> validationErrors, String[] paramNames) {\n    StringBuilder sb = new StringBuilder();\n    for (ConstraintViolation<?> cv : validationErrors) {\n      \/\/ sb.append(\"\\n\" + cv.getPropertyPath() + \"{\" + cv.getInvalidValue() +\n      \/\/ \"} : \" + cv.getMessage());\n      String positionOfBadParam = cv.getPropertyPath().toString();\n      if (positionOfBadParam != null) {\n        try {\n          String paramName = paramNames[Integer.valueOf(positionOfBadParam.substring(positionOfBadParam.length() - 1,\n              positionOfBadParam.length()))];\n          sb.append(\"\\n '\" + paramName + \"' parameter is incorrect. parameter value {\" + cv.getInvalidValue() + \"} is not valid: \"\n              + cv.getMessage());\n\n        } catch (Exception e) {\n          sb.append(\"\\n not all parameters were passed properly. parameter value {\" + cv.getInvalidValue() + \"} is not valid: \"\n              + cv.getMessage());\n\n        }\n      }\n    }\n    return new ValidationException(sb.toString());\n  }\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"b7f05ad178772361b55c7421eb53a0c43f7bfbca","subject":"Adding individual statistics to statistics export","message":"Adding individual statistics to statistics export\n","repos":"stieglma\/Schafkopfauswerter","old_file":"src\/StatisticsExport.aj","new_file":"src\/StatisticsExport.aj","new_contents":"import java.io.IOException;\n\nimport model.SystemValues.Games;\nimport model.SystemValues.Players;\n\nimport org.apache.pdfbox.pdmodel.PDDocument;\nimport org.apache.pdfbox.pdmodel.PDPage;\nimport org.apache.pdfbox.pdmodel.edit.PDPageContentStream;\nimport org.apache.pdfbox.pdmodel.font.PDType1Font;\n\nimport view.GUI;\n\npublic privileged aspect StatisticsExport {\n\n\tdeclare precedence: StatisticsExport, GraphExport, PdfExport;\n\tprivate GUI gui;\n\n\t\/**\n\t * catch constructor call, so that we have the correct gui, to refer to\n\t * everywhere\n\t *\/\n\tafter() returning(GUI gui): call(GUI.new(*)) {\n\t\tthis.gui = gui;\n\t}\n\n\t\/**\n\t * Catch the call on {@link PDFReportListener.drawTable(PDDocument)} to get\n\t * the pdf creator object.\n\t * \n\t * @param document\n\t * @throws IOException\n\t *\/\n\tafter(PDDocument document) returning() throws IOException\n    : call(* PDFReportListener.drawTable(PDDocument))\n    && args(document) {\n\t\tPDPage page = new PDPage();\n\t\tdocument.addPage(page);\n\t\tPDPageContentStream contentStream = new PDPageContentStream(document,\n\t\t\t\tpage);\n\n\t\tcontentStream.beginText();\n\t\tcontentStream.setFont(PDType1Font.HELVETICA_BOLD, 15);\n\t\tcontentStream.moveTextPositionByAmount(100, 680);\n\t\tcontentStream.drawString(\"Statistik ueber das gesamte Spiel\");\n\t\tcontentStream.endText();\n\n\t\tcontentStream.beginText();\n\t\tcontentStream.setFont(PDType1Font.HELVETICA_BOLD, 10);\n\t\tcreateOverallContent(contentStream);\n\t\tcontentStream.endText();\n\t\tcontentStream.close();\n\n\t\tpage = new PDPage();\n\t\tdocument.addPage(page);\n\t\tcontentStream = new PDPageContentStream(document, page);\n\n\t\tcontentStream.beginText();\n\t\tcontentStream.setFont(PDType1Font.HELVETICA_BOLD, 15);\n\t\tcontentStream.moveTextPositionByAmount(100, 680);\n\t\tcontentStream.drawString(\"Statistik fuer jeden einzelnen Spieler\");\n\t\tcontentStream.endText();\n\n\t\tfor (int i = 0; i < Players.values().length; ++i) {\n\t\t\tcontentStream.beginText();\n\t\t\tcontentStream.setFont(PDType1Font.HELVETICA_BOLD, 10);\n\t\t\tcreateIndividualContent(contentStream, Players.values()[i]);\n\t\t\tcontentStream.endText();\n\t\t\tcontentStream.close();\n\t\t\tif (i < Players.values().length - 1) {\n\t\t\t\tpage = new PDPage();\n\t\t\t\tdocument.addPage(page);\n\t\t\t\tcontentStream = new PDPageContentStream(document, page);\n\t\t\t}\n\t\t}\n\t}\n\n\t\/**\n\t * Write statistics to given <code>contentStream<\/code> of a pdf page.\n\t * \n\t * @param contentStream\n\t *            The <code>contentStream<\/code> of the pdf page to write on.\n\t * @throws IOException\n\t *\/\n\tprivate void createOverallContent(PDPageContentStream contentStream)\n\t\t\tthrows IOException {\n\t\tOverallStatistics data = gui.model.gameDB.getOverallStatistics();\n\n\t\tcontentStream.moveTextPositionByAmount(50, 650);\n\t\tcontentStream.drawString(\"#Spiele (ohne weiter): \"\n\t\t\t\t+ data.getAnzahlSpieleGesamt() + \" (gewonnen: \"\n\t\t\t\t+ String.format(\"%.2f\", data.getGesamtWinPerc()) + \"%)\");\n\n\t\tcontentStream.moveTextPositionByAmount(0, -16);\n\t\tcontentStream.drawString(\"#Rufspiele: \" + data.getAnzahlRufspiele()\n\t\t\t\t+ \" (gewonnen: \"\n\t\t\t\t+ String.format(\"%.2f\", data.getRufspieleWinPerc()) + \"%)\");\n\n\t\tcontentStream.moveTextPositionByAmount(50, -16);\n\t\tcontentStream.drawString(\"-> teuerstes Rufspiel: \"\n\t\t\t\t+ data.getTeuerstesRufspiel());\n\n\t\tcontentStream.moveTextPositionByAmount(-50, -16);\n\t\tcontentStream.drawString(\"#Soli gesamt: \" + data.getAnzahlSoliGesamt()\n\t\t\t\t+ \" (gewonnen: \"\n\t\t\t\t+ String.format(\"%.2f\", data.getSoliGesamtWinPerc()) + \"%)\");\n\n\t\tcontentStream.moveTextPositionByAmount(0, -16);\n\t\tcontentStream.drawString(\"#Soli normal: \" + data.getAnzahlSoli()\n\t\t\t\t+ \" (gewonnen: \"\n\t\t\t\t+ String.format(\"%.2f\", data.getSoliNormalWinPerc()) + \"%)\");\n\n\t\tcontentStream.moveTextPositionByAmount(50, -16);\n\t\tcontentStream.drawString(\"-> teuerstes Solo: \"\n\t\t\t\t+ data.getTeuerstesSolo());\n\n\t\tcontentStream.moveTextPositionByAmount(-50, -16);\n\t\tcontentStream.drawString(\"#Solo Tout: \" + data.getAnzahlSoliTout()\n\t\t\t\t+ \" (gewonnen: \"\n\t\t\t\t+ String.format(\"%.2f\", data.getSoliToutWinPerc()) + \"%)\");\n\n\t\tcontentStream.moveTextPositionByAmount(50, -16);\n\t\tcontentStream.drawString(\"-> teuerstes Solo Tout: \"\n\t\t\t\t+ data.getTeuerstesSoloTout());\n\n\t\tcontentStream.moveTextPositionByAmount(-50, -16);\n\t\tcontentStream.drawString(\"#Solo Sie: \" + data.getAnzahlSoliSie());\n\n\t\tcontentStream.moveTextPositionByAmount(50, -16);\n\t\tcontentStream.drawString(\"-> teuerstes Solo Sie: \"\n\t\t\t\t+ data.getTeuerstesSoloSie());\n\n\t\tcontentStream.moveTextPositionByAmount(-50, -16);\n\t\tcontentStream.drawString(\"#Weiter: \" + data.getAnzahlWeiter());\n\t}\n\n\tprivate void createIndividualContent(PDPageContentStream contentStream,\n\t\t\tPlayers player) throws IOException {\n\t\tcontentStream.moveTextPositionByAmount(50, 650);\n\t\tcontentStream.drawString(player.toString());\n\n\t\tcontentStream.moveTextPositionByAmount(0, -22);\n\n\t\tPlayerWiseStatistics data = gui.model.getGameData()\n\t\t\t\t.getPlayerWiseStatistics(player);\n\n\t\tcontentStream.drawString(\"Gespielte Spiele:\");\n\t\tcontentStream.moveTextPositionByAmount(50, -16);\n\t\tcontentStream.drawString(\"- Gesamt: \" + data.getGamesPlayedTot()\n\t\t\t\t+ \", davon gewonnen: \" + data.getGamesWonTot() + \" (\"\n\t\t\t\t+ String.format(\"%.2f\", data.getGamesWonPerc()) + \"%)\");\n\n\t\tfor (Games game : Games.values()) {\n\t\t\tif (game != Games.WEITER && game != Games.NONE) {\n\t\t\t\tint i = game.ordinal();\n\t\t\t\tcontentStream.moveTextPositionByAmount(0, -16);\n\t\t\t\tcontentStream.drawString(\"- \"\n\t\t\t\t\t\t+ game.toString()\n\t\t\t\t\t\t+ \": \"\n\t\t\t\t\t\t+ data.getGamesPlayedPerType()[i]\n\t\t\t\t\t\t+ \", davon gewonnen: \"\n\t\t\t\t\t\t+ data.getGamesWonPerType()[i]\n\t\t\t\t\t\t+ \" (\"\n\t\t\t\t\t\t+ String.format(\"%.2f\",\n\t\t\t\t\t\t\t\tdata.getGamesWonPerTypePerc()[i]) + \"%\");\n\t\t\t}\n\t\t}\n\n\t\tcontentStream.moveTextPositionByAmount(-50, -16);\n\t\tcontentStream\n\t\t\t\t.drawString(\"H\u00f6chster Kontostand: \" + data.getHighestAcc());\n\n\t\tcontentStream.moveTextPositionByAmount(0, -16);\n\t\tcontentStream.drawString(\"Niedrigster Kontostand: \"\n\t\t\t\t+ data.getLowestAcc());\n\n\t\tcontentStream.moveTextPositionByAmount(0, -16);\n\t\tcontentStream.drawString(\"Gr\u00f6\u00dfter Gewinn: \" + data.getHighestWin());\n\n\t\tcontentStream.moveTextPositionByAmount(0, -16);\n\t\tcontentStream.drawString(\"Gr\u00f6\u00dfter Verlust: \" + data.getHighestLoss());\n\n\t\tcontentStream.moveTextPositionByAmount(0, -32);\n\t}\n\n}\n","old_contents":"import java.io.IOException;\n\nimport org.apache.pdfbox.pdmodel.PDDocument;\nimport org.apache.pdfbox.pdmodel.PDPage;\nimport org.apache.pdfbox.pdmodel.edit.PDPageContentStream;\nimport org.apache.pdfbox.pdmodel.font.PDType1Font;\n\nimport view.GUI;\n\npublic privileged aspect StatisticsExport {\n\n    declare precedence: StatisticsExport, GraphExport, PdfExport;\n    private GUI gui;\n\n    \/**\n     * catch constructor call, so that we have the correct gui, to refer to everywhere\n     *\/\n    after() returning(GUI gui): call(GUI.new(*)) {\n        this.gui = gui;\n    }\n    \n    \/**\n     * Catch the call on {@link PDFReportListener.drawTable(PDDocument)} to get the pdf\n     * creator object.\n     * \n     * @param document\n     * @throws IOException\n     *\/\n    after(PDDocument document) returning() throws IOException\n    : call(* PDFReportListener.drawTable(PDDocument))\n    && args(document) {\n        PDPage page = new PDPage();\n        document.addPage(page);\n        PDPageContentStream contentStream = new PDPageContentStream(document,\n                page);\n        \n        contentStream.beginText();\n        contentStream.setFont(PDType1Font.HELVETICA_BOLD, 15);\n        contentStream.moveTextPositionByAmount(100, 680);\n        contentStream.drawString(\"Statistik ueber das gesamte Spiel\");\n        contentStream.endText();\n        \n        contentStream.beginText();\n        contentStream.setFont(PDType1Font.HELVETICA_BOLD, 10);\n        createOverallContent(contentStream);\n        contentStream.endText();\n        contentStream.close();\n    }\n\t\n\t\/**\n\t * Write statistics to given <code>contentStream<\/code> of a pdf page.\n\t * \n\t * @param contentStream The <code>contentStream<\/code> of the pdf page to write on.\n\t * @throws IOException\n\t *\/\n\tprivate void createOverallContent(PDPageContentStream contentStream) throws IOException {\n\t\tOverallStatistics data = gui.model.gameDB.getOverallStatistics();\n\n        contentStream.moveTextPositionByAmount(50, 650);\n        contentStream.drawString(\"#Spiele (ohne weiter): \" + data.getAnzahlSpieleGesamt()\n        \t\t+ \" (gewonnen: \"\n        \t\t+ String.format(\"%.2f\", data.getGesamtWinPerc()) + \"%)\");\n        \n        contentStream.moveTextPositionByAmount(0, -16);\n        contentStream.drawString(\"#Rufspiele: \" + data.getAnzahlRufspiele() + \" (gewonnen: \"\n        \t\t+ String.format(\"%.2f\", data.getRufspieleWinPerc()) + \"%)\");\n        \n        contentStream.moveTextPositionByAmount(50, -16);\n        contentStream.drawString(\"-> teuerstes Rufspiel: \"\n        + data.getTeuerstesRufspiel());\n        \n        contentStream.moveTextPositionByAmount(-50, -16);\n        contentStream.drawString(\"#Soli gesamt: \"\n        \t\t+ data.getAnzahlSoliGesamt() + \" (gewonnen: \"\n        \t\t+ String.format(\"%.2f\", data.getSoliGesamtWinPerc())\n        \t\t+ \"%)\");\n        \n        contentStream.moveTextPositionByAmount(0, -16);\n        contentStream.drawString(\"#Soli normal: \" + data.getAnzahlSoli()\n        \t\t+ \" (gewonnen: \"\n        \t\t+ String.format(\"%.2f\", data.getSoliNormalWinPerc()) + \"%)\");\n        \n        contentStream.moveTextPositionByAmount(50, -16);\n        contentStream.drawString(\"-> teuerstes Solo: \" + data.getTeuerstesSolo());\n        \n        contentStream.moveTextPositionByAmount(-50, -16);\n        contentStream.drawString(\"#Solo Tout: \" + data.getAnzahlSoliTout()\n        \t\t+ \" (gewonnen: \"\n        \t\t+ String.format(\"%.2f\", data.getSoliToutWinPerc()) + \"%)\");\n        \n        contentStream.moveTextPositionByAmount(50, -16);\n        contentStream.drawString(\"-> teuerstes Solo Tout: \"\n        \t\t+ data.getTeuerstesSoloTout());\n        \n        contentStream.moveTextPositionByAmount(-50, -16);\n        contentStream.drawString(\"#Solo Sie: \" + data.getAnzahlSoliSie());\n        \n        contentStream.moveTextPositionByAmount(50, -16);\n        contentStream.drawString(\"-> teuerstes Solo Sie: \" + data.getTeuerstesSoloSie());\n        \n        contentStream.moveTextPositionByAmount(-50, -16);\n        contentStream.drawString(\"#Weiter: \" + data.getAnzahlWeiter());\n\t}\n}\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"7f1863e18b663e3adefb8288d55a9c2fdcce0e3d","subject":"remove Games.None from playerstatistics (forgotten before)","message":"remove Games.None from playerstatistics (forgotten before)\n","repos":"stieglma\/Schafkopfauswerter","old_file":"src\/StatPlayerWiseTxt.aj","new_file":"src\/StatPlayerWiseTxt.aj","new_contents":"import java.awt.GridLayout;\nimport java.util.Iterator;\n\nimport javax.swing.JPanel;\nimport javax.swing.JTabbedPane;\nimport javax.swing.JTextArea;\n\nimport view.GUI;\nimport view.UIUpdater;\nimport model.db.GameData;\nimport model.SystemValues.Games;\nimport model.SystemValues.Players;\nimport model.SystemValues.WIN;\nimport model.db.DataObject;\n\npublic privileged aspect StatPlayerWiseTxt {\n    declare precedence : StatPlayerWiseTxt, StatOverallGraph, StatOverallTxt;\n\n    private static GUI gui;\n    private static JPanel panel = new JPanel();\n    private static JTextArea statText = new JTextArea();\n\n    after() returning(GUI gui): call(GUI.new(*)) {\n        StatPlayerWiseTxt.gui = gui;\n    }\n\n    after(JTabbedPane tabbedPane): \n                        execution(public static void StatisticsHelper.StatisticsPaneCreated(JTabbedPane))\n                        && args(tabbedPane) {\n        statText.setEditable(false);\n        panel.setLayout(new GridLayout(0, 1));\n        panel.add(statText);\n        ((JTabbedPane) tabbedPane).addTab(\"PlayerWiseText\", panel);\n    }\n\n    after() : execution(* UIUpdater.run()) {\n        statText.setText(gui.model.getGameData()\n                .getPlayerWiseStatisticsString());\n    }\n\n    public String GameData.getPlayerWiseStatisticsString() {\n        StringBuilder result = new StringBuilder();\n\n        for (Players player : Players.values()) {\n            result.append(player);\n            result.append(\":\" + System.lineSeparator() + System.lineSeparator());\n\n            int gamesPlayedTot = 0;\n            int gamesWonTot = 0;\n            int highestAcc = 0;\n            int lowestAcc = 0;\n            int highestWin = 0;\n            int highestLoss = 0;\n\n            int[] gamesPlayedPerType = new int[Games.values().length];\n            int[] gamesWonPerType = new int[Games.values().length];\n\n            Iterator<DataObject> it = data.iterator();\n            DataObject lastObj = it.next();\n\n            while (it.hasNext()) {\n                DataObject dataObj = it.next();\n\n                if (dataObj.getPlayer().equals(player.toString())) {\n                    gamesPlayedTot++;\n                    gamesPlayedPerType[dataObj.getGameKind().ordinal()]++;\n                    if (dataObj.getGameWon() == WIN.PLAYER) {\n                        gamesWonTot++;\n                        gamesWonPerType[dataObj.getGameKind().ordinal()]++;\n                    }\n                }\n                int gameVal = dataObj.getPlayerVal(player) - lastObj.getPlayerVal(player);\n                if (gameVal > highestWin) {\n                    highestWin = gameVal;\n                } else if (gameVal < highestLoss) {\n                    highestLoss = gameVal;\n                }\n\n                int accVal = dataObj.getPlayerVal(player);\n                if (accVal > highestAcc) {\n                    highestAcc = accVal;\n                } else if (accVal < lowestAcc) {\n                    lowestAcc = accVal;\n                }\n                \n                lastObj = dataObj;\n            }\n\n            double gamesWonPerc = ((gamesPlayedTot + gamesWonTot) > 0 ? (double) gamesWonTot\n                    \/ gamesPlayedTot\n                    : 0.0) * 100;\n\n            double gamesWonPerTypePerc[] = new double[Games.values().length];\n            for (Games game : Games.values()) {\n                int i = game.ordinal();\n                gamesWonPerTypePerc[i] = ((gamesPlayedPerType[i] + gamesWonPerType[i]) > 0 ? (double) gamesWonPerType[i]\n                        \/ gamesPlayedPerType[i]\n                        : 0.0) * 100;\n            }\n\n            result.append(\n                    \"Gespielte Spiele:\" + System.lineSeparator() + \"\\t\"\n                            + \"- Gesamt: \" + gamesPlayedTot)\n                    .append(\", davon gewonnen: \" + gamesWonTot)\n                    .append(\" (\" + String.format(\"%.2f\", gamesWonPerc) + \"%)\"\n                            + System.lineSeparator());\n\n            for (Games game : Games.values()) {\n                if (game != Games.WEITER && game != Games.NONE) {\n                    int i = game.ordinal();\n                    result.append(\n                            \"\\t- \" + game.toString() + \": \"\n                                    + gamesPlayedPerType[i])\n                            .append(\", davon gewonnen: \" + gamesWonPerType[i])\n                            .append(\" (\"\n                                    + String.format(\"%.2f\",\n                                            gamesWonPerTypePerc[i]) + \"%)\"\n                                    + System.lineSeparator());\n                }\n            }\n\n            result.append(\"H\u00f6chster Kontostand: \" + highestAcc\n                    + System.lineSeparator() + \"Niedrigster Kontostand: \"\n                    + lowestAcc + System.lineSeparator());\n\n            result.append(\"Gr\u00f6\u00dfter Gewinn: \" + highestWin\n                    + System.lineSeparator());\n            result.append(\"Gr\u00f6\u00dfter Verlust: \" + highestLoss\n                    + System.lineSeparator());\n\n            result.append(System.lineSeparator());\n        }\n        return result.toString();\n    }\n}","old_contents":"import java.awt.GridLayout;\nimport java.util.Iterator;\n\nimport javax.swing.JPanel;\nimport javax.swing.JTabbedPane;\nimport javax.swing.JTextArea;\n\nimport view.GUI;\nimport view.UIUpdater;\nimport model.db.GameData;\nimport model.SystemValues.Games;\nimport model.SystemValues.Players;\nimport model.SystemValues.WIN;\nimport model.db.DataObject;\n\npublic privileged aspect StatPlayerWiseTxt {\n    declare precedence : StatPlayerWiseTxt, StatOverallGraph, StatOverallTxt;\n\n    private static GUI gui;\n    private static JPanel panel = new JPanel();\n    private static JTextArea statText = new JTextArea();\n\n    after() returning(GUI gui): call(GUI.new(*)) {\n        StatPlayerWiseTxt.gui = gui;\n    }\n\n    after(JTabbedPane tabbedPane): \n                        execution(public static void StatisticsHelper.StatisticsPaneCreated(JTabbedPane))\n                        && args(tabbedPane) {\n        statText.setEditable(false);\n        panel.setLayout(new GridLayout(0, 1));\n        panel.add(statText);\n        ((JTabbedPane) tabbedPane).addTab(\"PlayerWiseText\", panel);\n    }\n\n    after() : execution(* UIUpdater.run()) {\n        statText.setText(gui.model.getGameData()\n                .getPlayerWiseStatisticsString());\n    }\n\n    public String GameData.getPlayerWiseStatisticsString() {\n        StringBuilder result = new StringBuilder();\n\n        for (Players player : Players.values()) {\n            result.append(player);\n            result.append(\":\" + System.lineSeparator() + System.lineSeparator());\n\n            int gamesPlayedTot = 0;\n            int gamesWonTot = 0;\n            int highestAcc = 0;\n            int lowestAcc = 0;\n            int highestWin = 0;\n            int highestLoss = 0;\n\n            int[] gamesPlayedPerType = new int[Games.values().length];\n            int[] gamesWonPerType = new int[Games.values().length];\n\n            Iterator<DataObject> it = data.iterator();\n            DataObject lastObj = it.next();\n\n            while (it.hasNext()) {\n                DataObject dataObj = it.next();\n\n                if (dataObj.getPlayer().equals(player.toString())) {\n                    gamesPlayedTot++;\n                    gamesPlayedPerType[dataObj.getGameKind().ordinal()]++;\n                    if (dataObj.getGameWon() == WIN.PLAYER) {\n                        gamesWonTot++;\n                        gamesWonPerType[dataObj.getGameKind().ordinal()]++;\n                    }\n                }\n                int gameVal = dataObj.getPlayerVal(player) - lastObj.getPlayerVal(player);\n                if (gameVal > highestWin) {\n                    highestWin = gameVal;\n                } else if (gameVal < highestLoss) {\n                    highestLoss = gameVal;\n                }\n\n                int accVal = dataObj.getPlayerVal(player);\n                if (accVal > highestAcc) {\n                    highestAcc = accVal;\n                } else if (accVal < lowestAcc) {\n                    lowestAcc = accVal;\n                }\n                \n                lastObj = dataObj;\n            }\n\n            double gamesWonPerc = ((gamesPlayedTot + gamesWonTot) > 0 ? (double) gamesWonTot\n                    \/ gamesPlayedTot\n                    : 0.0) * 100;\n\n            double gamesWonPerTypePerc[] = new double[Games.values().length];\n            for (Games game : Games.values()) {\n                int i = game.ordinal();\n                gamesWonPerTypePerc[i] = ((gamesPlayedPerType[i] + gamesWonPerType[i]) > 0 ? (double) gamesWonPerType[i]\n                        \/ gamesPlayedPerType[i]\n                        : 0.0) * 100;\n            }\n\n            result.append(\n                    \"Gespielte Spiele:\" + System.lineSeparator() + \"\\t\"\n                            + \"- Gesamt: \" + gamesPlayedTot)\n                    .append(\", davon gewonnen: \" + gamesWonTot)\n                    .append(\" (\" + String.format(\"%.2f\", gamesWonPerc) + \"%)\"\n                            + System.lineSeparator());\n\n            for (Games game : Games.values()) {\n                if (game != Games.WEITER) {\n                    int i = game.ordinal();\n                    result.append(\n                            \"\\t- \" + game.toString() + \": \"\n                                    + gamesPlayedPerType[i])\n                            .append(\", davon gewonnen: \" + gamesWonPerType[i])\n                            .append(\" (\"\n                                    + String.format(\"%.2f\",\n                                            gamesWonPerTypePerc[i]) + \"%)\"\n                                    + System.lineSeparator());\n                }\n            }\n\n            result.append(\"H\u00f6chster Kontostand: \" + highestAcc\n                    + System.lineSeparator() + \"Niedrigster Kontostand: \"\n                    + lowestAcc + System.lineSeparator());\n\n            result.append(\"Gr\u00f6\u00dfter Gewinn: \" + highestWin\n                    + System.lineSeparator());\n            result.append(\"Gr\u00f6\u00dfter Verlust: \" + highestLoss\n                    + System.lineSeparator());\n\n            result.append(System.lineSeparator());\n        }\n        return result.toString();\n    }\n}","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"c49e1bfa423282e2f8216a3b3b5dc2a18a50b242","subject":"Corrected pointcut and factored out recursive call.","message":"Corrected pointcut and factored out recursive call.\n\ngit-svn-id: f4ecfe233223879a4a16cd7937f11b5152963d8e@18953 5e8d7ff9-d8ef-0310-90f0-a4852d11357a\n","repos":"romanowski\/scala-ide,scala-ide\/scala-ide,Duhemm\/scala-ide,aleksi-lukkarinen\/scala-ide,sschaef\/scala-ide,Duhemm\/scala-ide,dragos\/scala-ide,dragos\/scala-ide,dragos\/scala-ide,pilipolio\/scala-ide,andrey-ilinykh\/scala-ide,andrey-ilinykh\/scala-ide,romanowski\/scala-ide,Kwestor\/scala-ide,wpopielarski\/scala-ide,pilipolio\/scala-ide,sschaef\/scala-ide,wpopielarski\/scala-ide,sschaef\/scala-ide,Kwestor\/scala-ide,andrey-ilinykh\/scala-ide,romanowski\/scala-ide,wpopielarski\/scala-ide,wpopielarski\/scala-ide,stephenh\/scala-ide,pilipolio\/scala-ide,romanowski\/scala-ide,mlangc\/scala-ide,stephenh\/scala-ide,aleksi-lukkarinen\/scala-ide,stephenh\/scala-ide,mlangc\/scala-ide,Kwestor\/scala-ide,mlangc\/scala-ide,aleksi-lukkarinen\/scala-ide,andrey-ilinykh\/scala-ide,sschaef\/scala-ide,Kwestor\/scala-ide,scala-ide\/scala-ide,stephenh\/scala-ide,aleksi-lukkarinen\/scala-ide,dragos\/scala-ide,mlangc\/scala-ide,Duhemm\/scala-ide,scala-ide\/scala-ide,Duhemm\/scala-ide,pilipolio\/scala-ide,scala-ide\/scala-ide","old_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/hierarchy\/HierarchyAspect.aj","new_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/hierarchy\/HierarchyAspect.aj","new_contents":"\/*\n * Copyright 2005-2009 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.hierarchy;\n\nimport java.util.ArrayList;\n\nimport org.eclipse.jdt.core.ICompilationUnit;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IMember;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.internal.core.hierarchy.ChangeCollector;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaElement;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect HierarchyAspect {\n  \n  pointcut getAllTypesFromElement(ChangeCollector cc, IJavaElement element, ArrayList allTypes) :\n    execution(void ChangeCollector.getAllTypesFromElement(IJavaElement, ArrayList)) &&\n    args(element, allTypes) &&\n    target(cc);\n  \n  void around(ChangeCollector cc, IJavaElement element, ArrayList allTypes) throws JavaModelException :\n    getAllTypesFromElement(cc, element, allTypes) {\n    getAllTypesFromElement0(cc, element, allTypes);\n  }\n\n  public void getAllTypesFromElement0(ChangeCollector cc, IJavaElement element, ArrayList allTypes) throws JavaModelException {\n    switch (element.getElementType()) {\n      case IJavaElement.COMPILATION_UNIT:\n        IType[] types = ((ICompilationUnit)element).getTypes();\n        for (int i = 0, length = types.length; i < length; i++) {\n          IType type = types[i];\n          allTypes.add(type);\n          getAllTypesFromElement0(cc, type, allTypes);\n        }\n        break;\n      case IJavaElement.TYPE:\n        types = ((IType)element).getTypes();\n        for (int i = 0, length = types.length; i < length; i++) {\n          IType type = types[i];\n          allTypes.add(type);\n          getAllTypesFromElement0(cc, type, allTypes);\n        }\n        break;\n      case IJavaElement.INITIALIZER:\n      case IJavaElement.FIELD:\n      case IJavaElement.METHOD:\n        IJavaElement[] children = ((IMember)element).getChildren();\n        for (int i = 0, length = children.length; i < length; i++) {\n          IJavaElement child = children[i];\n          if (child instanceof IType) {\n            IType type = (IType)child;\n            allTypes.add(type);\n            getAllTypesFromElement0(cc, type, allTypes);\n          } else if(child instanceof IScalaElement) {\n            getAllTypesFromElement0(cc, child, allTypes);\n          }\n        }\n        break;\n    }\n  }\n}\n","old_contents":"\/*\n * Copyright 2005-2009 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.hierarchy;\n\nimport java.util.ArrayList;\n\nimport org.eclipse.jdt.core.ICompilationUnit;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IMember;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.internal.core.JavaElement;\nimport org.eclipse.jdt.internal.core.hierarchy.ChangeCollector;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaElement;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect HierarchyAspect {\n  \n  pointcut getAllTypesFromElement(ChangeCollector cc, JavaElement element, ArrayList allTypes) :\n    execution(void ChangeCollector.getAllTypesFromElement(JavaElement, ArrayList)) &&\n    args(element, allTypes) &&\n    target(cc);\n  \n  void around(ChangeCollector cc, JavaElement element, ArrayList allTypes) throws JavaModelException :\n    getAllTypesFromElement(cc, element, allTypes) {\n    switch (element.getElementType()) {\n      case IJavaElement.COMPILATION_UNIT:\n        IType[] types = ((ICompilationUnit)element).getTypes();\n        for (int i = 0, length = types.length; i < length; i++) {\n          IType type = types[i];\n          allTypes.add(type);\n          cc.getAllTypesFromElement(type, allTypes);\n        }\n        break;\n      case IJavaElement.TYPE:\n        types = ((IType)element).getTypes();\n        for (int i = 0, length = types.length; i < length; i++) {\n          IType type = types[i];\n          allTypes.add(type);\n          cc.getAllTypesFromElement(type, allTypes);\n        }\n        break;\n      case IJavaElement.INITIALIZER:\n      case IJavaElement.FIELD:\n      case IJavaElement.METHOD:\n        IJavaElement[] children = ((IMember)element).getChildren();\n        for (int i = 0, length = children.length; i < length; i++) {\n          IJavaElement child = children[i];\n          if (child instanceof IType) {\n            IType type = (IType)child;\n            allTypes.add(type);\n            cc.getAllTypesFromElement(type, allTypes);\n          } else if(child instanceof IScalaElement) {\n            cc.getAllTypesFromElement(child, allTypes);\n          }\n        }\n        break;\n    }\n  }\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"6cd72c5c201c2a5974a98a9c96346e3eb2a728ff","subject":"Ignore all getters from security checkers","message":"Ignore all getters from security checkers\n","repos":"madama\/crepuscolo","old_file":"crepuscolo-core\/src\/main\/java\/net\/etalia\/crepuscolo\/check\/CheckAspect.aj","new_file":"crepuscolo-core\/src\/main\/java\/net\/etalia\/crepuscolo\/check\/CheckAspect.aj","new_contents":"package net.etalia.crepuscolo.check;\n\nimport java.lang.reflect.Method;\nimport java.util.Stack;\n\nimport javax.persistence.Entity;\nimport javax.persistence.MappedSuperclass;\n\nimport net.etalia.crepuscolo.domain.Authenticable;\nimport net.etalia.crepuscolo.services.AuthService;\nimport net.etalia.crepuscolo.services.AuthService.Verification;\n\nimport org.aspectj.lang.JoinPoint;\nimport org.aspectj.lang.reflect.MethodSignature;\nimport org.springframework.beans.factory.annotation.Autowired;\nimport org.springframework.beans.factory.annotation.Configurable;\nimport org.springframework.stereotype.Controller;\nimport org.springframework.transaction.annotation.Propagation;\nimport org.springframework.transaction.annotation.Transactional;\n\n\n@Configurable\npublic aspect CheckAspect {\n\n\tpointcut checkMethod() : \n\t\t(\n\t\texecution(@(@CheckerAnnotation *) * *.*(..))\n\t\t||\n\t\texecution(* *.*(@(@CheckerAnnotation *) (*),..))\n\t\t||\n\t\texecution(* *.*(*, @(@CheckerAnnotation *) (*),..))\n\t\t||\n\t\texecution(* *.*(*, *, @(@CheckerAnnotation *) (*),..))\n\t\t||\n\t\texecution(* *.*(*, *, *, @(@CheckerAnnotation *) (*),..))\n\t\t||\n\t\texecution(@CheckerAnnotation * *.*(..))\n\t\t)\n\t\t&& !execution(* *.get*())\n\t\t&& !execution(* *.is*());\n\n\t@Autowired(required=true)\n\tprivate AuthService authService;\n\t\n\tprivate CheckerFactory checkerFactory;\n\t\n\tpublic void setAuthService(AuthService authService) {\n\t\tthis.authService = authService;\n\t}\n\t\n\tpublic void setCheckerFactory(CheckerFactory cf) {\n\t\tthis.checkerFactory = cf;\n\t}\n\n\tprivate ThreadLocal<Boolean> probing = new ThreadLocal<Boolean>();\n\tprivate ThreadLocal<Boolean> skip = new ThreadLocal<Boolean>();\n\tprivate ThreadLocal<Boolean> nullAuth = new ThreadLocal<Boolean>();\n\tprivate ThreadLocal<Stack<String>> mode = new ThreadLocal<Stack<String>>();\n\n\tpublic class JoinPointCheckPoint implements CheckPoint {\n\t\n\t\tprivate JoinPoint jp;\n\t\t\n\t\tpublic JoinPointCheckPoint(JoinPoint jp) {\n\t\t\tthis.jp = jp;\n\t\t}\n\t\n\t\t@Override\n\t\t@Transactional(propagation=Propagation.REQUIRES_NEW)\n\t\tpublic String getAuthenticableId(Verification level) {\n\t\t\tif (nullAuth.get() == Boolean.TRUE) return null;\n\t\t\treturn authService.getPrincipalUserId(level);\n\t\t}\n\t\t\n\t\t@Override\n\t\t@Transactional(propagation=Propagation.REQUIRES_NEW)\n\t\tpublic Authenticable getAuthenticable(Verification level) {\n\t\t\tif (nullAuth.get() == Boolean.TRUE) return null;\n\t\t\treturn authService.getPrincipalUser(level);\n\t\t}\n\t\n\t\t@Override\n\t\tpublic Object getInstance() {\n\t\t\treturn jp.getThis();\n\t\t}\n\t\n\t\t@Override\n\t\tpublic Method getMethod() {\n\t\t\treturn ((MethodSignature)jp.getSignature()).getMethod();\n\t\t}\n\t\n\t\t@Override\n\t\tpublic Object[] getParameters() {\n\t\t\treturn jp.getArgs();\n\t\t}\n\n\t\t@Override\n\t\tpublic boolean isInMode(String testMode) {\n\t\t\treturn CheckAspect.this.isInMode(testMode);\n\t\t}\n\t\t\n\t}\n\n\tbefore() : \n\t\tcheckMethod() \n\t\t&& !cflowbelow(checkMethod())\n\t{\n\t\tif (checkerFactory == null) return;\n\t\tif (skip.get() == Boolean.TRUE) return;\n\t\t\n\t\tChecker checker = checkerFactory.getFor(((MethodSignature)thisJoinPointStaticPart.getSignature()).getMethod());\n\t\t\n\t\tint code = checker.check(new JoinPointCheckPoint(thisJoinPoint));\n\t\tif (code != 0) {\n\t\t\tthrow new AuthException().statusCode(code);\n\t\t}\n\t\tif (this.probing.get() == Boolean.TRUE) {\n\t\t\tthrow new AuthException().statusCode(100);\n\t\t}\n\t}\n\t\n\tpublic void probing(boolean set) {\n\t\tif (set) {\n\t\t\tthis.probing.set(true);\n\t\t} else {\n\t\t\tthis.probing.remove();\n\t\t}\n\t}\n\t\n\tpublic void nullAuth(boolean set) {\n\t\tif (set) {\n\t\t\tthis.nullAuth.set(true);\n\t\t} else {\n\t\t\tthis.nullAuth.remove();\n\t\t}\n\t}\n\t\n\tpublic void skip(boolean set) {\n\t\tif (set) {\n\t\t\tthis.skip.set(true);\n\t\t} else {\n\t\t\tthis.skip.remove();\n\t\t}\n\t}\n\t\n\tpublic boolean isSkipping() {\n\t\treturn this.skip.get() == Boolean.TRUE;\n\t}\n\tpublic boolean isProbing() {\n\t\treturn this.probing.get() == Boolean.TRUE;\n\t}\n\tpublic boolean isNullAuth() {\n\t\treturn this.nullAuth.get() == Boolean.TRUE;\n\t}\n\t\n\tpublic void enterMode(String pmode) {\n\t\tStack<String> stack = mode.get();\n\t\tif (stack == null) {\n\t\t\tstack = new Stack<String>();\n\t\t\tmode.set(stack);\n\t\t}\n\t\tstack.add(pmode);\n\t}\n\t\n\tpublic void exitMode() {\n\t\tStack<String> stack = mode.get();\n\t\tif (stack == null) return;\n\t\tstack.pop();\n\t}\n\t\n\tpublic boolean isInMode(String testMode) {\n\t\tStack<String> stack = mode.get();\n\t\tif (stack == null || stack.size() == 0) return testMode == null;\n\t\treturn stack.contains(testMode);\t\t\n\t}\n\t\n\tObject around() :\n\t\texecution (@CheckNoAuth * *.*(..))\n\t{\n\t\tboolean prenullauth = this.nullAuth.get() == Boolean.TRUE;\n\t\ttry {\n\t\t\tnullAuth(true);\n\t\t\treturn proceed();\n\t\t} finally {\n\t\t\tnullAuth(prenullauth);\n\t\t}\n\t}\n\t\n\tObject around() :\n\t\texecution (@CheckNoChecks * *.*(..))\n\t{\n\t\tboolean preskip = this.skip.get() == Boolean.TRUE;\n\t\ttry {\n\t\t\tskip(true);\n\t\t\treturn proceed();\n\t\t} finally {\n\t\t\tskip(preskip);\n\t\t}\n\t}\n\n\tbefore(String setMode) :\n\t\texecution (@CheckMode * (@Controller *).*(..))\n\t\t&& @annotation(CheckMode(setMode))\n\t{\n\t\tenterMode(setMode);\n\t}\n\t\n\tObject around(String setMode) :\n\t\texecution (@CheckMode * *.*(..))\n\t\t&& @annotation(CheckMode(setMode))\n\t{\n\t\tenterMode(setMode);\n\t\ttry {\n\t\t\treturn proceed(setMode);\n\t\t} finally {\n\t\t\texitMode();\n\t\t}\n\t}\n\t\n\tpublic void clear() {\n\t\tthis.mode.remove();\n\t\tthis.nullAuth.remove();\n\t\tthis.probing.remove();\n\t\tthis.skip.remove();\n\t}\n}\n","old_contents":"package net.etalia.crepuscolo.check;\n\nimport java.lang.reflect.Method;\nimport java.util.Stack;\n\nimport javax.persistence.Entity;\nimport javax.persistence.MappedSuperclass;\n\nimport net.etalia.crepuscolo.domain.Authenticable;\nimport net.etalia.crepuscolo.services.AuthService;\nimport net.etalia.crepuscolo.services.AuthService.Verification;\n\nimport org.aspectj.lang.JoinPoint;\nimport org.aspectj.lang.reflect.MethodSignature;\nimport org.springframework.beans.factory.annotation.Autowired;\nimport org.springframework.beans.factory.annotation.Configurable;\nimport org.springframework.stereotype.Controller;\nimport org.springframework.transaction.annotation.Propagation;\nimport org.springframework.transaction.annotation.Transactional;\n\n\n@Configurable\npublic aspect CheckAspect {\n\n\tpointcut checkMethod() : \n\t\t(\n\t\texecution(@(@CheckerAnnotation *) * *.*(..))\n\t\t||\n\t\texecution(* *.*(@(@CheckerAnnotation *) (*),..))\n\t\t||\n\t\texecution(* *.*(*, @(@CheckerAnnotation *) (*),..))\n\t\t||\n\t\texecution(* *.*(*, *, @(@CheckerAnnotation *) (*),..))\n\t\t||\n\t\texecution(* *.*(*, *, *, @(@CheckerAnnotation *) (*),..))\n\t\t||\n\t\texecution(@CheckerAnnotation * *.*(..))\n\t\t)\n\t\t&& !execution(* (@(Entity || MappedSuperclass) *).get*())\n\t\t&& !execution(* (@(Entity || MappedSuperclass) *).is*());\n\n\t@Autowired(required=true)\n\tprivate AuthService authService;\n\t\n\tprivate CheckerFactory checkerFactory;\n\t\n\tpublic void setAuthService(AuthService authService) {\n\t\tthis.authService = authService;\n\t}\n\t\n\tpublic void setCheckerFactory(CheckerFactory cf) {\n\t\tthis.checkerFactory = cf;\n\t}\n\n\tprivate ThreadLocal<Boolean> probing = new ThreadLocal<Boolean>();\n\tprivate ThreadLocal<Boolean> skip = new ThreadLocal<Boolean>();\n\tprivate ThreadLocal<Boolean> nullAuth = new ThreadLocal<Boolean>();\n\tprivate ThreadLocal<Stack<String>> mode = new ThreadLocal<Stack<String>>();\n\n\tpublic class JoinPointCheckPoint implements CheckPoint {\n\t\n\t\tprivate JoinPoint jp;\n\t\t\n\t\tpublic JoinPointCheckPoint(JoinPoint jp) {\n\t\t\tthis.jp = jp;\n\t\t}\n\t\n\t\t@Override\n\t\t@Transactional(propagation=Propagation.REQUIRES_NEW)\n\t\tpublic String getAuthenticableId(Verification level) {\n\t\t\tif (nullAuth.get() == Boolean.TRUE) return null;\n\t\t\treturn authService.getPrincipalUserId(level);\n\t\t}\n\t\t\n\t\t@Override\n\t\t@Transactional(propagation=Propagation.REQUIRES_NEW)\n\t\tpublic Authenticable getAuthenticable(Verification level) {\n\t\t\tif (nullAuth.get() == Boolean.TRUE) return null;\n\t\t\treturn authService.getPrincipalUser(level);\n\t\t}\n\t\n\t\t@Override\n\t\tpublic Object getInstance() {\n\t\t\treturn jp.getThis();\n\t\t}\n\t\n\t\t@Override\n\t\tpublic Method getMethod() {\n\t\t\treturn ((MethodSignature)jp.getSignature()).getMethod();\n\t\t}\n\t\n\t\t@Override\n\t\tpublic Object[] getParameters() {\n\t\t\treturn jp.getArgs();\n\t\t}\n\n\t\t@Override\n\t\tpublic boolean isInMode(String testMode) {\n\t\t\treturn CheckAspect.this.isInMode(testMode);\n\t\t}\n\t\t\n\t}\n\n\tbefore() : \n\t\tcheckMethod() \n\t\t&& !cflowbelow(checkMethod())\n\t{\n\t\tif (checkerFactory == null) return;\n\t\tif (skip.get() == Boolean.TRUE) return;\n\t\t\n\t\tChecker checker = checkerFactory.getFor(((MethodSignature)thisJoinPointStaticPart.getSignature()).getMethod());\n\t\t\n\t\tint code = checker.check(new JoinPointCheckPoint(thisJoinPoint));\n\t\tif (code != 0) {\n\t\t\tthrow new AuthException().statusCode(code);\n\t\t}\n\t\tif (this.probing.get() == Boolean.TRUE) {\n\t\t\tthrow new AuthException().statusCode(100);\n\t\t}\n\t}\n\t\n\tpublic void probing(boolean set) {\n\t\tif (set) {\n\t\t\tthis.probing.set(true);\n\t\t} else {\n\t\t\tthis.probing.remove();\n\t\t}\n\t}\n\t\n\tpublic void nullAuth(boolean set) {\n\t\tif (set) {\n\t\t\tthis.nullAuth.set(true);\n\t\t} else {\n\t\t\tthis.nullAuth.remove();\n\t\t}\n\t}\n\t\n\tpublic void skip(boolean set) {\n\t\tif (set) {\n\t\t\tthis.skip.set(true);\n\t\t} else {\n\t\t\tthis.skip.remove();\n\t\t}\n\t}\n\t\n\tpublic boolean isSkipping() {\n\t\treturn this.skip.get() == Boolean.TRUE;\n\t}\n\tpublic boolean isProbing() {\n\t\treturn this.probing.get() == Boolean.TRUE;\n\t}\n\tpublic boolean isNullAuth() {\n\t\treturn this.nullAuth.get() == Boolean.TRUE;\n\t}\n\t\n\tpublic void enterMode(String pmode) {\n\t\tStack<String> stack = mode.get();\n\t\tif (stack == null) {\n\t\t\tstack = new Stack<String>();\n\t\t\tmode.set(stack);\n\t\t}\n\t\tstack.add(pmode);\n\t}\n\t\n\tpublic void exitMode() {\n\t\tStack<String> stack = mode.get();\n\t\tif (stack == null) return;\n\t\tstack.pop();\n\t}\n\t\n\tpublic boolean isInMode(String testMode) {\n\t\tStack<String> stack = mode.get();\n\t\tif (stack == null || stack.size() == 0) return testMode == null;\n\t\treturn stack.contains(testMode);\t\t\n\t}\n\t\n\tObject around() :\n\t\texecution (@CheckNoAuth * *.*(..))\n\t{\n\t\tboolean prenullauth = this.nullAuth.get() == Boolean.TRUE;\n\t\ttry {\n\t\t\tnullAuth(true);\n\t\t\treturn proceed();\n\t\t} finally {\n\t\t\tnullAuth(prenullauth);\n\t\t}\n\t}\n\t\n\tObject around() :\n\t\texecution (@CheckNoChecks * *.*(..))\n\t{\n\t\tboolean preskip = this.skip.get() == Boolean.TRUE;\n\t\ttry {\n\t\t\tskip(true);\n\t\t\treturn proceed();\n\t\t} finally {\n\t\t\tskip(preskip);\n\t\t}\n\t}\n\n\tbefore(String setMode) :\n\t\texecution (@CheckMode * (@Controller *).*(..))\n\t\t&& @annotation(CheckMode(setMode))\n\t{\n\t\tenterMode(setMode);\n\t}\n\t\n\tObject around(String setMode) :\n\t\texecution (@CheckMode * *.*(..))\n\t\t&& @annotation(CheckMode(setMode))\n\t{\n\t\tenterMode(setMode);\n\t\ttry {\n\t\t\treturn proceed(setMode);\n\t\t} finally {\n\t\t\texitMode();\n\t\t}\n\t}\n\t\n\tpublic void clear() {\n\t\tthis.mode.remove();\n\t\tthis.nullAuth.remove();\n\t\tthis.probing.remove();\n\t\tthis.skip.remove();\n\t}\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"7619373645b97526b15d5faa61563f32029663e2","subject":"Removes aspectj files which are no longer used","message":"Removes aspectj files which are no longer used\n","repos":"tschechlovdev\/jabref,ayanai1\/jabref,obraliar\/jabref,jhshinn\/jabref,grimes2\/jabref,mairdl\/jabref,Siedlerchr\/jabref,bartsch-dev\/jabref,mairdl\/jabref,ayanai1\/jabref,JabRef\/jabref,tschechlovdev\/jabref,shitikanth\/jabref,Mr-DLib\/jabref,Braunch\/jabref,tschechlovdev\/jabref,tobiasdiez\/jabref,bartsch-dev\/jabref,bartsch-dev\/jabref,Mr-DLib\/jabref,zellerdev\/jabref,ayanai1\/jabref,Mr-DLib\/jabref,Siedlerchr\/jabref,mairdl\/jabref,tobiasdiez\/jabref,ayanai1\/jabref,obraliar\/jabref,mredaelli\/jabref,Mr-DLib\/jabref,shitikanth\/jabref,obraliar\/jabref,shitikanth\/jabref,bartsch-dev\/jabref,grimes2\/jabref,mredaelli\/jabref,zellerdev\/jabref,grimes2\/jabref,shitikanth\/jabref,tschechlovdev\/jabref,sauliusg\/jabref,mredaelli\/jabref,jhshinn\/jabref,shitikanth\/jabref,grimes2\/jabref,bartsch-dev\/jabref,oscargus\/jabref,mredaelli\/jabref,tobiasdiez\/jabref,JabRef\/jabref,motokito\/jabref,sauliusg\/jabref,zellerdev\/jabref,obraliar\/jabref,Mr-DLib\/jabref,sauliusg\/jabref,Braunch\/jabref,sauliusg\/jabref,oscargus\/jabref,zellerdev\/jabref,motokito\/jabref,JabRef\/jabref,Braunch\/jabref,ayanai1\/jabref,tobiasdiez\/jabref,grimes2\/jabref,tschechlovdev\/jabref,jhshinn\/jabref,oscargus\/jabref,mredaelli\/jabref,motokito\/jabref,Braunch\/jabref,zellerdev\/jabref,Siedlerchr\/jabref,motokito\/jabref,Braunch\/jabref,Siedlerchr\/jabref,obraliar\/jabref,oscargus\/jabref,jhshinn\/jabref,motokito\/jabref,jhshinn\/jabref,oscargus\/jabref,mairdl\/jabref,mairdl\/jabref,JabRef\/jabref","old_file":"src\/java\/net\/sf\/jabref\/aspects\/violations\/DetectSwingSingleThreadRuleViolations.aj","new_file":"src\/java\/net\/sf\/jabref\/aspects\/violations\/DetectSwingSingleThreadRuleViolations.aj","new_contents":"","old_contents":"\/*\n * Package package net.sf.jabref.aspects.violations;\n * Created on Nov 6, 2004\n * Author mspiegel\n *\n *\/\npackage net.sf.jabref.aspects.violations;\n\nimport java.awt.Component;\nimport java.awt.EventQueue;\n\npublic aspect DetectSwingSingleThreadRuleViolations {\n\n\tpointcut guiUpdates(Component component)\n\t\t:\tcall(* java..Component+.*(..)) && \n\t\t    !call(* net..jabref+.*(..)) && target(component);\t\t\t\n    \n\tpointcut safeGuiCalls()\n\t\t: call (* javax..JComponent.repaint(..))\n\t\t\t|| call(* javax..JComponent.revalidate(..))\n\t\t    || call(* javax..JComponent.invalidate(..))\n\t\t    || call(* javax..*.add*Listener(..))\n\t\t    || call(* javax..*.remove*Listener(..));\n\t\t        \n\tpointcut unsafeGuiCalls(Component component)\n\t\t: guiUpdates(component) && !safeGuiCalls();\n    \n    before(Component component) : unsafeGuiCalls(component) \n    \t&& if (!EventQueue.isDispatchThread() && (component != null) &&\n    \t        \tcomponent.isDisplayable() && !Thread.currentThread().getName().equals(\"main\")) {\n            System.err.println(\t\n                    \"Violation: Swing component method called from nonAWT thread\"\n                    + \"\\nCalled method: \" + thisJoinPointStaticPart.getSignature()\n                    + \"\\nCaller:\" + thisEnclosingJoinPointStaticPart.getSignature()\n                    + \"\\nSource Location:\" + thisJoinPointStaticPart.getSourceLocation()\n                    + \"\\nThread:\" + Thread.currentThread() \n                    + \"\\nChange code to use EventQueue.invokeLater() or EventQueue.invokeAndWait()\"\n                    + \"\\n\");\n    \t}\n    \n}\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"5c4b5ad4c544e15eac4b73a694b3a5032b92de44","subject":"Allow to specify more than one Program to use the same ExecutorService","message":"Allow to specify more than one Program to use the same ExecutorService\n","repos":"awltech\/org.parallelj,christophe-w\/parallelj.runtime","old_file":"parallelj-launching\/src\/main\/java\/org\/parallelj\/launching\/internal\/LaunchManagement.aj","new_file":"parallelj-launching\/src\/main\/java\/org\/parallelj\/launching\/internal\/LaunchManagement.aj","new_contents":"\/*\n *     ParallelJ, framework for parallel computing\n *\n *     Copyright (C) 2010, 2011, 2012 Atos Worldline or third-party contributors as\n *     indicated by the @author tags or express copyright attribution\n *     statements applied by the authors.\n *\n *     This library is free software; you can redistribute it and\/or\n *     modify it under the terms of the GNU Lesser General Public\n *     License as published by the Free Software Foundation; either\n *     version 2.1 of the License.\n *\n *     This library is distributed in the hope that it will be useful,\n *     but WITHOUT ANY WARRANTY; without even the implied warranty of\n *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n *     Lesser General Public License for more details.\n *\n *     You should have received a copy of the GNU Lesser General Public\n *     License along with this library; if not, write to the Free Software\n *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n *\/\npackage org.parallelj.launching.internal;\n\nimport java.util.Map;\nimport java.util.concurrent.ConcurrentHashMap;\nimport java.util.concurrent.ExecutorService;\n\nimport org.parallelj.Programs;\nimport org.parallelj.internal.conf.ConfigurationService;\nimport org.parallelj.internal.conf.ParalleljConfigurationManager;\nimport org.parallelj.internal.conf.pojos.CExecutor;\nimport org.parallelj.internal.conf.pojos.CExecutors;\nimport org.parallelj.internal.conf.pojos.ParalleljConfiguration;\nimport org.parallelj.internal.kernel.KProcessor;\nimport org.parallelj.internal.kernel.procedure.CallableProcedure.CallableCall.CallableCallRunnable;\nimport org.parallelj.internal.kernel.procedure.RunnableProcedure.RunnableCall.RunnableCallRunnable;\nimport org.parallelj.internal.kernel.procedure.SubProcessProcedure.SubProcessCall.SubProcessRunnable;\nimport org.parallelj.internal.reflect.ProcessHelperImpl;\nimport org.parallelj.internal.reflect.ProgramAdapter.Adapter;\nimport org.parallelj.launching.Launch;\nimport org.parallelj.launching.LaunchException;\nimport org.parallelj.launching.LaunchingMessageKind;\nimport org.parallelj.launching.ProgramReturnCodes;\nimport org.parallelj.mirror.ExecutorServiceKind;\nimport org.parallelj.mirror.ParallelJThreadFactory;\n\n\/**\n * Implements the synchLaunch(..) and aSynchLaunch(..) methods of Launch.\n * \n * \n *\/\nprivileged aspect LaunchManagement { \n\t\n\tprivate static Map<KProcessor, LaunchImpl> phl = new ConcurrentHashMap<>(); \n\t\n\tstatic privileged public aspect LaunchAdapter percflow(launchInstance() ) {\n\t\n\t\tdeclare precedence :\n\t\t\torg.parallelj.internal.kernel.Identifiers,\n\t\t\torg.parallelj.internal.reflect.ProgramAdapter,\n\t\t\torg.parallelj.internal.util.sm.impl.KStateMachines,\n\t\t\torg.parallelj.internal.util.sm.impl.KStateMachines.PerMachine,\n\t\t\torg.parallelj.Executables$PerExecutable,\n\t\t\torg.parallelj.internal.reflect.ProgramAdapter.PerProgram,\n\t\t\torg.parallelj.internal.log.Logs;\n\t\n\t\tpointcut launchInstance() : execution(* Launch+.*(..));\n\t\n\t\tinterface IKProcessorLaunch {}\n\t\tLaunchImpl IKProcessorLaunch.launch;\n\t\tdeclare parents: KProcessor implements IKProcessorLaunch;\n\t\t\n\t\tinterface ILaunchExecutors {}\n\t\tMap<String, ExecutorService> ILaunchExecutors.executors = new ConcurrentHashMap<>();\n\t\tExecutorService ILaunchExecutors.defaultExecutor = null;\n\t\tdeclare parents: LaunchImpl implements ILaunchExecutors;\n\t\t\n\t\tprivate LaunchingObservable observable = new LaunchingObservable();\n\t\t\n\t\tboolean stopExecutorServiceAfterExecution = false;\n\t\n\t\tprivate static class AsyncThread implements Runnable {\n\t\n\t\t\tprivate LaunchAdapter launchAdapter;\n\t\t\tprivate LaunchImpl<?> launch;\n\t\n\t\t\tpublic AsyncThread(LaunchImpl<?> launch, LaunchAdapter launchAdapter) {\n\t\t\t\tthis.launch = launch;\n\t\t\t\tthis.launchAdapter = launchAdapter;\n\t\t\t}\n\t\n\t\t\t@Override\n\t\t\tpublic void run() {\n\t\t\t\tthis.launchAdapter.internalSyncLaunch(this.launch);\n\t\t\t}\n\t\t}\n\t\t\n\t\t@SuppressWarnings({ \"rawtypes\", \"unchecked\" })\n\t\tLaunch around(LaunchImpl launch) throws LaunchException: \n\t\t\t\t\texecution(public Launch Launch+.synchLaunch(..) throws LaunchException)\n\t\t\t\t\t\t&& this(launch) {\n\t\t\tproceed(launch);\n\t\t\tlaunch.processHelper = Programs.as(launch.jobInstance);\n\t\t\tlaunch.getLaunchResult().setStatusCode(ProgramReturnCodes.RUNNING);\n\t\t\tthis.observable.prepareLaunching(launch);\n\t\n\t\t\treturn internalSyncLaunch(launch);\n\t\t}\n\t\n\t\t@SuppressWarnings({ \"rawtypes\", \"unchecked\" })\n\t\tLaunch around(LaunchImpl launch) throws LaunchException: \n\t\t\t\t\texecution(public Launch Launch+.aSynchLaunch() throws LaunchException)\n\t\t\t\t\t\t&& this(launch) {\n\t\t\tproceed(launch);\n\t\t\tlaunch.processHelper = Programs.as(launch.jobInstance);\n\t\t\tlaunch.getLaunchResult().setStatusCode(ProgramReturnCodes.RUNNING);\n\t\t\tthis.observable.prepareLaunching(launch);\n\t\t\tif (launch.getExecutorService()!=null) {\n\t\t\t\tlaunch.getExecutorService().execute(new AsyncThread(launch, this));\n\t\t\t} else {\n\t\t\t\tParallelJThreadFactory.getInstance().newThread(new AsyncThread(launch, this)).start();\n\t \t\t}\n\t\t\treturn launch;\n\t\t}\n\t\n\t\t@SuppressWarnings(\"rawtypes\")\n\t\tprivate Launch<?> internalSyncLaunch(LaunchImpl<?> launch) {\n\t\t\tLaunchingMessageKind.ILAUNCH0002.format(launch.getJobInstance()\n\t\t\t\t\t.getClass().getCanonicalName(), launch.getLaunchId());\n\t\t\tinitializeExecutors(launch);\n\t\t\tProcessHelperImpl processHelper = (ProcessHelperImpl)launch.getProcessHelper();\n\t\t\tKProcessor processor = processHelper.processor;\n\t\t\tif (processor == null) {\n\t\t\t\tif ( ((ILaunchExecutors)launch).defaultExecutor!=null) {\n\t\t\t\t\tprocessor = new KProcessor(((ILaunchExecutors)launch).defaultExecutor);\n\t\t\t\t} else {\n\t\t\t\t\tprocessor = new KProcessor(launch.getExecutorService());\n\t\t\t\t}\n\t\t\t\t((IKProcessorLaunch)processor).launch = launch;\n\t\t\t\tphl.put(processor, launch);\n\t\t\t}\n\t\t\tprocessor.execute(processHelper.process);\n\t\t\tlaunch.getProcessHelper().join();\n\t\t\tthis.observable.finalizeLaunching(launch);\n\t\t\tlaunch.complete();\n\t\t\tcleanExecutors(launch);\n\t\t\tphl.remove(processor);\n\t\t\t\n\t\t\tif (launch.getLaunchResult().getStatusCode()!=ProgramReturnCodes.FAILURE\n\t\t\t\t\t&&launch.getLaunchResult().getStatusCode()!=ProgramReturnCodes.ABORTED) {\n\t\t\t\tlaunch.getLaunchResult().setStatusCode(ProgramReturnCodes.SUCCESS);\n\t\t\t}\n\t\t\tLaunchingMessageKind.ILAUNCH0003.format(launch.getJobInstance()\n\t\t\t\t\t.getClass().getCanonicalName(), launch.getLaunchId(), launch\n\t\t\t\t\t.getLaunchResult().getStatusCode(), launch.getLaunchResult()\n\t\t\t\t\t.getReturnCode());\n\t\t\treturn launch;\n\t\t}\n\t\t\n\t\tprivate void initializeExecutors(LaunchImpl<?> launch) {\n\t\t\tParalleljConfiguration configuration = (ParalleljConfiguration) ConfigurationService\n\t\t\t\t\t.getConfigurationService().getConfigurationManager()\n\t\t\t\t\t.get(ParalleljConfigurationManager.class)\n\t\t\t\t\t.getConfiguration();\n\t\t\tMap<String, ExecutorService> executors = ((ILaunchExecutors) launch).executors;\n\t\t\tCExecutors cExecutors = configuration != null ? configuration\n\t\t\t\t\t.getExecutorServices() : null;\n\t\t\tif (cExecutors != null) {\n\t\t\t\tif (cExecutors.getDefaultServiceType() != null\n\t\t\t\t\t\t|| cExecutors.getDefaultPoolSize() != null\n\t\t\t\t\t\t|| cExecutors.getDefaultServiceClass() != null) {\n\t\t\t\t\ttry {\n\t\t\t\t\t\tExecutorService defaultService = ExecutorServiceKind\n\t\t\t\t\t\t\t\t.valueOf(\n\t\t\t\t\t\t\t\t\t\tcExecutors.getDefaultServiceType()\n\t\t\t\t\t\t\t\t\t\t\t\t.value()).create(\n\t\t\t\t\t\t\t\t\t\tcExecutors.getDefaultPoolSize()\n\t\t\t\t\t\t\t\t\t\t\t\t.intValue(),\n\t\t\t\t\t\t\t\t\t\tcExecutors.getDefaultServiceClass());\n\t\t\t\t\t\t((ILaunchExecutors) launch).defaultExecutor = defaultService;\n\t\t\t\t\t} catch (InstantiationException | IllegalAccessException\n\t\t\t\t\t\t\t| ClassNotFoundException e) {\n\t\t\t\t\t\t\/\/ Do nothing..\n\t\t\t\t\t} catch (Exception e) {\n\t\t\t\t\t\tLaunchingMessageKind.ELAUNCH0011.format(e);\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\tif (cExecutors.getExecutorService() != null) {\n\t\t\t\t\tfor (CExecutor cExecutor : cExecutors.getExecutorService()) {\n\t\t\t\t\t\tString[] names = cExecutor.getProgramName().split(\",\");\n\t\t\t\t\t\tboolean instanciate = false;\n\t\t\t\t\t\tfor (String name : names) {\n\t\t\t\t\t\t\tif (name.length() > 0 && name.trim().length() > 0) {\n\t\t\t\t\t\t\t\tinstanciate = true;\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t\tif (instanciate) {\n\t\t\t\t\t\t\tExecutorService executor = null;\n\t\t\t\t\t\t\tif (cExecutor.getServiceType() != null) {\n\t\t\t\t\t\t\t\tString type = cExecutor.getServiceType()\n\t\t\t\t\t\t\t\t\t\t.value();\n\t\t\t\t\t\t\t\ttry {\n\t\t\t\t\t\t\t\t\tint size = cExecutor.getPoolSize() != null ? cExecutor\n\t\t\t\t\t\t\t\t\t\t\t.getPoolSize().intValue() : 0;\n\t\t\t\t\t\t\t\t\texecutor = ExecutorServiceKind\n\t\t\t\t\t\t\t\t\t\t\t.valueOf(type)\n\t\t\t\t\t\t\t\t\t\t\t.create(size,\n\t\t\t\t\t\t\t\t\t\t\t\t\tcExecutor.getServiceClass());\n\t\t\t\t\t\t\t\t\tboolean foundProgram = false;\n\t\t\t\t\t\t\t\t\tfor (String name : names) {\n\t\t\t\t\t\t\t\t\t\tif (name.length() > 0 && name.trim().length() > 0) {\n\t\t\t\t\t\t\t\t\t\t\texecutors.put(\n\t\t\t\t\t\t\t\t\t\t\t\t\tname,\n\t\t\t\t\t\t\t\t\t\t\t\t\texecutor);\n\t\t\t\t\t\t\t\t\t\t\tfoundProgram = true;\n\t\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t\tif (!foundProgram) {\n\t\t\t\t\t\t\t\t\t\texecutor.shutdown();\n\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t} catch (InstantiationException\n\t\t\t\t\t\t\t\t\t\t| IllegalAccessException\n\t\t\t\t\t\t\t\t\t\t| ClassNotFoundException e) {\n\t\t\t\t\t\t\t\t\t\/\/ Do Nothing..\n\t\t\t\t\t\t\t\t} catch (Exception e) {\n\t\t\t\t\t\t\t\t\tLaunchingMessageKind.ELAUNCH0012.format(e);\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\n\t\tprivate void cleanExecutors(LaunchImpl<?> launch) {\n\t\t\tMap<String, ExecutorService> executors = ((ILaunchExecutors)launch).executors;\n\t\t\tfor (String key : executors.keySet()) {\n\t\t\t\texecutors.get(key).shutdown();\n\t\t\t\texecutors.remove(key);\n\t\t\t}\n\t\t\tif (((ILaunchExecutors)launch).defaultExecutor!=null) {\n\t\t\t\t((ILaunchExecutors)launch).defaultExecutor.shutdown();\n\t\t\t}\n\t\t}\n\t}\n\n\t@SuppressWarnings(\"rawtypes\")\n\tvoid around(KProcessor kProcessor, SubProcessRunnable runnable):execution(public void submit(..))\n\t\t&& args(runnable)\n\t\t&&this(kProcessor){\n\t\n\t\tAdapter context = (Adapter)runnable.getSubProcessCall().getProcess().getContext();\n\t\tLaunchImpl launch = phl.get(kProcessor);\n\t\tif (launch!=null) {\n\t\t\tExecutorService service = launch.executors.get(context.getClass().getCanonicalName());\n\t\t\tif (service!=null) {\n\t\t\t\tkProcessor.submit(runnable, service);\n\t\t\t} else {\n\t\t\t\tproceed(kProcessor, runnable);\n\t\t\t}\n\t\t} else {\n\t\t\tproceed(kProcessor, runnable);\n\t\t}\n}\n\n\t@SuppressWarnings(\"rawtypes\")\n\tvoid around(KProcessor kProcessor, CallableCallRunnable runnable):execution(public void submit(..))\n\t\t&& args(runnable)\n\t\t&&this(kProcessor){\n\t\t\n\t\tAdapter context = (Adapter)runnable.getCallableCall().getProcess().getContext();\n\t\tLaunchImpl launch = phl.get(kProcessor);\n\t\tif (launch!=null) {\n\t\t\tExecutorService service = launch.executors.get(context.getClass().getCanonicalName());\n\t\t\tif (service!=null) {\n\t\t\t\tkProcessor.submit(runnable, service);\n\t\t\t} else {\n\t\t\t\tproceed(kProcessor, runnable);\n\t\t\t}\n\t\t} else {\n\t\t\tproceed(kProcessor, runnable);\n\t\t}\n\t}\n\t\n\t@SuppressWarnings(\"rawtypes\")\n\tvoid around(KProcessor kProcessor, RunnableCallRunnable runnable):execution(public void submit(..))\n\t\t&& args(runnable)\n\t\t&&this(kProcessor) {\n\t\t\n\t\tAdapter context = (Adapter)runnable.getRunnableCall().getProcess().getContext();\n\t\tLaunchImpl launch = phl.get(kProcessor);\n\t\tif (launch!=null) {\n\t\t\tExecutorService service = launch.executors.get(context.getClass().getCanonicalName());\n\t\t\tif (service!=null) {\n\t\t\t\tkProcessor.submit(runnable, service);\n\t\t\t} else {\n\t\t\t\tproceed(kProcessor, runnable);\n\t\t\t}\n\t\t} else {\n\t\t\tproceed(kProcessor, runnable);\n\t\t}\n\t}\n}\n","old_contents":"\/*\n *     ParallelJ, framework for parallel computing\n *\n *     Copyright (C) 2010, 2011, 2012 Atos Worldline or third-party contributors as\n *     indicated by the @author tags or express copyright attribution\n *     statements applied by the authors.\n *\n *     This library is free software; you can redistribute it and\/or\n *     modify it under the terms of the GNU Lesser General Public\n *     License as published by the Free Software Foundation; either\n *     version 2.1 of the License.\n *\n *     This library is distributed in the hope that it will be useful,\n *     but WITHOUT ANY WARRANTY; without even the implied warranty of\n *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n *     Lesser General Public License for more details.\n *\n *     You should have received a copy of the GNU Lesser General Public\n *     License along with this library; if not, write to the Free Software\n *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n *\/\npackage org.parallelj.launching.internal;\n\nimport java.util.Map;\nimport java.util.concurrent.ConcurrentHashMap;\nimport java.util.concurrent.ExecutorService;\n\nimport org.parallelj.Programs;\nimport org.parallelj.internal.conf.ConfigurationService;\nimport org.parallelj.internal.conf.ParalleljConfigurationManager;\nimport org.parallelj.internal.conf.pojos.CExecutor;\nimport org.parallelj.internal.conf.pojos.CExecutors;\nimport org.parallelj.internal.conf.pojos.ParalleljConfiguration;\nimport org.parallelj.internal.kernel.KProcessor;\nimport org.parallelj.internal.kernel.procedure.CallableProcedure.CallableCall.CallableCallRunnable;\nimport org.parallelj.internal.kernel.procedure.RunnableProcedure.RunnableCall.RunnableCallRunnable;\nimport org.parallelj.internal.kernel.procedure.SubProcessProcedure.SubProcessCall.SubProcessRunnable;\nimport org.parallelj.internal.reflect.ProcessHelperImpl;\nimport org.parallelj.internal.reflect.ProgramAdapter.Adapter;\nimport org.parallelj.launching.Launch;\nimport org.parallelj.launching.LaunchException;\nimport org.parallelj.launching.LaunchingMessageKind;\nimport org.parallelj.launching.ProgramReturnCodes;\nimport org.parallelj.mirror.ExecutorServiceKind;\nimport org.parallelj.mirror.ParallelJThreadFactory;\n\n\/**\n * Implements the synchLaunch(..) and aSynchLaunch(..) methods of Launch.\n * \n * \n *\/\nprivileged aspect LaunchManagement { \n\t\n\tprivate static Map<KProcessor, LaunchImpl> phl = new ConcurrentHashMap<>(); \n\t\n\tstatic privileged public aspect LaunchAdapter percflow(launchInstance() ) {\n\t\n\t\tdeclare precedence :\n\t\t\torg.parallelj.internal.kernel.Identifiers,\n\t\t\torg.parallelj.internal.reflect.ProgramAdapter,\n\t\t\torg.parallelj.internal.util.sm.impl.KStateMachines,\n\t\t\torg.parallelj.internal.util.sm.impl.KStateMachines.PerMachine,\n\t\t\torg.parallelj.Executables$PerExecutable,\n\t\t\torg.parallelj.internal.reflect.ProgramAdapter.PerProgram,\n\t\t\torg.parallelj.internal.log.Logs;\n\t\n\t\tpointcut launchInstance() : execution(* Launch+.*(..));\n\t\n\t\tinterface IKProcessorLaunch {}\n\t\tLaunchImpl IKProcessorLaunch.launch;\n\t\tdeclare parents: KProcessor implements IKProcessorLaunch;\n\t\t\n\t\tinterface ILaunchExecutors {}\n\t\tMap<String, ExecutorService> ILaunchExecutors.executors = new ConcurrentHashMap<>();\n\t\tExecutorService ILaunchExecutors.defaultExecutor = null;\n\t\tdeclare parents: LaunchImpl implements ILaunchExecutors;\n\t\t\n\t\tprivate LaunchingObservable observable = new LaunchingObservable();\n\t\t\n\t\tboolean stopExecutorServiceAfterExecution = false;\n\t\n\t\tprivate static class AsyncThread implements Runnable {\n\t\n\t\t\tprivate LaunchAdapter launchAdapter;\n\t\t\tprivate LaunchImpl<?> launch;\n\t\n\t\t\tpublic AsyncThread(LaunchImpl<?> launch, LaunchAdapter launchAdapter) {\n\t\t\t\tthis.launch = launch;\n\t\t\t\tthis.launchAdapter = launchAdapter;\n\t\t\t}\n\t\n\t\t\t@Override\n\t\t\tpublic void run() {\n\t\t\t\tthis.launchAdapter.internalSyncLaunch(this.launch);\n\t\t\t}\n\t\t}\n\t\t\n\t\t@SuppressWarnings({ \"rawtypes\", \"unchecked\" })\n\t\tLaunch around(LaunchImpl launch) throws LaunchException: \n\t\t\t\t\texecution(public Launch Launch+.synchLaunch(..) throws LaunchException)\n\t\t\t\t\t\t&& this(launch) {\n\t\t\tproceed(launch);\n\t\t\tlaunch.processHelper = Programs.as(launch.jobInstance);\n\t\t\tlaunch.getLaunchResult().setStatusCode(ProgramReturnCodes.RUNNING);\n\t\t\tthis.observable.prepareLaunching(launch);\n\t\n\t\t\treturn internalSyncLaunch(launch);\n\t\t}\n\t\n\t\t@SuppressWarnings({ \"rawtypes\", \"unchecked\" })\n\t\tLaunch around(LaunchImpl launch) throws LaunchException: \n\t\t\t\t\texecution(public Launch Launch+.aSynchLaunch() throws LaunchException)\n\t\t\t\t\t\t&& this(launch) {\n\t\t\tproceed(launch);\n\t\t\tlaunch.processHelper = Programs.as(launch.jobInstance);\n\t\t\tlaunch.getLaunchResult().setStatusCode(ProgramReturnCodes.RUNNING);\n\t\t\tthis.observable.prepareLaunching(launch);\n\t\t\tif (launch.getExecutorService()!=null) {\n\t\t\t\tlaunch.getExecutorService().execute(new AsyncThread(launch, this));\n\t\t\t} else {\n\t\t\t\tParallelJThreadFactory.getInstance().newThread(new AsyncThread(launch, this)).start();\n\t \t\t}\n\t\t\treturn launch;\n\t\t}\n\t\n\t\t@SuppressWarnings(\"rawtypes\")\n\t\tprivate Launch<?> internalSyncLaunch(LaunchImpl<?> launch) {\n\t\t\tLaunchingMessageKind.ILAUNCH0002.format(launch.getJobInstance()\n\t\t\t\t\t.getClass().getCanonicalName(), launch.getLaunchId());\n\t\t\tinitializeExecutors(launch);\n\t\t\tProcessHelperImpl processHelper = (ProcessHelperImpl)launch.getProcessHelper();\n\t\t\tKProcessor processor = processHelper.processor;\n\t\t\tif (processor == null) {\n\t\t\t\tif ( ((ILaunchExecutors)launch).defaultExecutor!=null) {\n\t\t\t\t\tprocessor = new KProcessor(((ILaunchExecutors)launch).defaultExecutor);\n\t\t\t\t} else {\n\t\t\t\t\tprocessor = new KProcessor(launch.getExecutorService());\n\t\t\t\t}\n\t\t\t\t((IKProcessorLaunch)processor).launch = launch;\n\t\t\t\tphl.put(processor, launch);\n\t\t\t}\n\t\t\tprocessor.execute(processHelper.process);\n\t\t\tlaunch.getProcessHelper().join();\n\t\t\tthis.observable.finalizeLaunching(launch);\n\t\t\tlaunch.complete();\n\t\t\tcleanExecutors(launch);\n\t\t\tphl.remove(processor);\n\t\t\t\n\t\t\tif (launch.getLaunchResult().getStatusCode()!=ProgramReturnCodes.FAILURE\n\t\t\t\t\t&&launch.getLaunchResult().getStatusCode()!=ProgramReturnCodes.ABORTED) {\n\t\t\t\tlaunch.getLaunchResult().setStatusCode(ProgramReturnCodes.SUCCESS);\n\t\t\t}\n\t\t\tLaunchingMessageKind.ILAUNCH0003.format(launch.getJobInstance()\n\t\t\t\t\t.getClass().getCanonicalName(), launch.getLaunchId(), launch\n\t\t\t\t\t.getLaunchResult().getStatusCode(), launch.getLaunchResult()\n\t\t\t\t\t.getReturnCode());\n\t\t\treturn launch;\n\t\t}\n\t\t\n\t\tprivate void initializeExecutors(LaunchImpl<?> launch) {\n\t\t\tParalleljConfiguration configuration = (ParalleljConfiguration) ConfigurationService\n\t\t\t\t\t.getConfigurationService().getConfigurationManager()\n\t\t\t\t\t.get(ParalleljConfigurationManager.class).getConfiguration();\n\t\t\tMap<String, ExecutorService> executors = ((ILaunchExecutors)launch).executors;\n\t\t\tCExecutors cExecutors = configuration!=null?configuration.getExecutorServices():null;\n\t\t\tif (cExecutors != null) {\n\t\t\t\tif(cExecutors.getDefaultServiceType()!=null || cExecutors.getDefaultPoolSize()!=null||cExecutors.getDefaultServiceClass()!=null) {\n\t\t\t\t\ttry {\n\t\t\t\t\t\tExecutorService defaultService = ExecutorServiceKind.valueOf(cExecutors.getDefaultServiceType().value()).create(cExecutors.getDefaultPoolSize().intValue(), cExecutors.getDefaultServiceClass());\n\t\t\t\t\t\t((ILaunchExecutors)launch).defaultExecutor=defaultService;\n\t\t\t\t\t} catch (InstantiationException | IllegalAccessException\n\t\t\t\t\t\t\t| ClassNotFoundException e) {\n\t\t\t\t\t\t\/\/ Do nothing..\n\t\t\t\t\t} catch (Exception e) {\n\t\t\t\t\t\tLaunchingMessageKind.ELAUNCH0011.format(e);\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\tif(cExecutors.getExecutorService() != null) {\n\t\t\t\t\tfor(CExecutor cExecutor:cExecutors.getExecutorService()) {\n\t\t\t\t\t\tif (executors.get(cExecutor.getProgramName()) == null) {\n\t\t\t\t\t\t\tString type = cExecutor.getServiceType().value();\n\t\t\t\t\t\t\ttry {\n\t\t\t\t\t\t\t\tint size = cExecutor.getPoolSize()!=null?cExecutor.getPoolSize().intValue():0;\n\t\t\t\t\t\t\t\tExecutorService executor = ExecutorServiceKind.valueOf(type).create(size, cExecutor.getServiceClass());\n\t\t\t\t\t\t\t\texecutors.put(cExecutor.getProgramName(), executor);\n\t\t\t\t\t\t\t} catch (InstantiationException | IllegalAccessException\n\t\t\t\t\t\t\t\t\t| ClassNotFoundException e) {\n\t\t\t\t\t\t\t\t\/\/ Do Nothing..\n\t\t\t\t\t\t\t} catch (Exception e) {\n\t\t\t\t\t\t\t\tLaunchingMessageKind.ELAUNCH0012.format(e);\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\n\t\tprivate void cleanExecutors(LaunchImpl<?> launch) {\n\t\t\tMap<String, ExecutorService> executors = ((ILaunchExecutors)launch).executors;\n\t\t\tfor (String key : executors.keySet()) {\n\t\t\t\texecutors.get(key).shutdown();\n\t\t\t\texecutors.remove(key);\n\t\t\t}\n\t\t\tif (((ILaunchExecutors)launch).defaultExecutor!=null) {\n\t\t\t\t((ILaunchExecutors)launch).defaultExecutor.shutdown();\n\t\t\t}\n\t\t}\n\t}\n\n\t@SuppressWarnings(\"rawtypes\")\n\tvoid around(KProcessor kProcessor, SubProcessRunnable runnable):execution(public void submit(..))\n\t\t&& args(runnable)\n\t\t&&this(kProcessor){\n\t\n\t\tAdapter context = (Adapter)runnable.getSubProcessCall().getProcess().getContext();\n\t\tLaunchImpl launch = phl.get(kProcessor);\n\t\tif (launch!=null) {\n\t\t\tExecutorService service = launch.executors.get(context.getClass().getCanonicalName());\n\t\t\tif (service!=null) {\n\t\t\t\tkProcessor.submit(runnable, service);\n\t\t\t} else {\n\t\t\t\tproceed(kProcessor, runnable);\n\t\t\t}\n\t\t} else {\n\t\t\tproceed(kProcessor, runnable);\n\t\t}\n}\n\n\t@SuppressWarnings(\"rawtypes\")\n\tvoid around(KProcessor kProcessor, CallableCallRunnable runnable):execution(public void submit(..))\n\t\t&& args(runnable)\n\t\t&&this(kProcessor){\n\t\t\n\t\tAdapter context = (Adapter)runnable.getCallableCall().getProcess().getContext();\n\t\tLaunchImpl launch = phl.get(kProcessor);\n\t\tif (launch!=null) {\n\t\t\tExecutorService service = launch.executors.get(context.getClass().getCanonicalName());\n\t\t\tif (service!=null) {\n\t\t\t\tkProcessor.submit(runnable, service);\n\t\t\t} else {\n\t\t\t\tproceed(kProcessor, runnable);\n\t\t\t}\n\t\t} else {\n\t\t\tproceed(kProcessor, runnable);\n\t\t}\n\t}\n\t\n\t@SuppressWarnings(\"rawtypes\")\n\tvoid around(KProcessor kProcessor, RunnableCallRunnable runnable):execution(public void submit(..))\n\t\t&& args(runnable)\n\t\t&&this(kProcessor) {\n\t\t\n\t\tAdapter context = (Adapter)runnable.getRunnableCall().getProcess().getContext();\n\t\tLaunchImpl launch = phl.get(kProcessor);\n\t\tif (launch!=null) {\n\t\t\tExecutorService service = launch.executors.get(context.getClass().getCanonicalName());\n\t\t\tif (service!=null) {\n\t\t\t\tkProcessor.submit(runnable, service);\n\t\t\t} else {\n\t\t\t\tproceed(kProcessor, runnable);\n\t\t\t}\n\t\t} else {\n\t\t\tproceed(kProcessor, runnable);\n\t\t}\n\t}\n}\n","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"e24d199cdb480b5bafbc262fec679dddcf3d69cd","subject":"Refinement of previous commit r696.","message":"Refinement of previous commit r696.\n","repos":"permazen\/permazen,tempbottle\/jsimpledb,tempbottle\/jsimpledb,archiecobbs\/jsimpledb,archiecobbs\/jsimpledb,archiecobbs\/jsimpledb,permazen\/permazen,tempbottle\/jsimpledb,permazen\/permazen","old_file":"src\/java\/org\/dellroad\/stuff\/spring\/RetryTransactionAspect.aj","new_file":"src\/java\/org\/dellroad\/stuff\/spring\/RetryTransactionAspect.aj","new_contents":"\n\/*\n * Copyright (C) 2011 Archie L. Cobbs and other authors. All rights reserved.\n *\n * $Id$\n *\/\n\npackage org.dellroad.stuff.spring;\n\nimport java.lang.reflect.Method;\nimport java.util.Random;\n\nimport org.aspectj.lang.reflect.MethodSignature;\nimport org.dellroad.stuff.java.ThreadLocalHolder;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\nimport org.springframework.beans.factory.InitializingBean;\nimport org.springframework.core.annotation.AnnotationUtils;\nimport org.springframework.dao.DataAccessException;\nimport org.springframework.dao.TransientDataAccessException;\nimport org.springframework.dao.UncategorizedDataAccessException;\nimport org.springframework.dao.support.PersistenceExceptionTranslator;\nimport org.springframework.transaction.TransactionDefinition;\nimport org.springframework.transaction.annotation.AnnotationTransactionAttributeSource;\nimport org.springframework.transaction.annotation.Propagation;\nimport org.springframework.transaction.annotation.Transactional;\nimport org.springframework.transaction.interceptor.TransactionAttribute;\nimport org.springframework.transaction.support.TransactionSynchronizationManager;\n\n\/**\n * An aspect that automatically retries failed but \"retryable\" transactions.\n *\n * @see RetryTransaction\n *\/\npublic aspect RetryTransactionAspect implements RetryTransactionProvider, InitializingBean {\n\n    private final Logger log = LoggerFactory.getLogger(this.getClass());\n    private final ThreadLocalHolder<Integer> attemptHolder = new ThreadLocalHolder<Integer>();\n    private final Random random = new Random();\n\n    \/\/ Default values for retry settings\n    private int maxRetriesDefault = RetryTransaction.DEFAULT_MAX_RETRIES;\n    private long initialDelayDefault = RetryTransaction.DEFAULT_INITIAL_DELAY;\n    private long maximumDelayDefault = RetryTransaction.DEFAULT_MAXIMUM_DELAY;\n\n    \/\/ This knows how to read information from @Transactional annotation\n    private final AnnotationTransactionAttributeSource transactionAttributeSource = new AnnotationTransactionAttributeSource(false);\n\n    \/\/ Tells us what is a \"transient\" exception; must be explicitly configured\n    private PersistenceExceptionTranslator persistenceExceptionTranslator;\n\n\/\/ Property accessors and RetryTransactionProvider implementation\n\n    @Override\n    public PersistenceExceptionTranslator getPersistenceExceptionTranslator() {\n        return this.persistenceExceptionTranslator;\n    }\n    public void setPersistenceExceptionTranslator(PersistenceExceptionTranslator persistenceExceptionTranslator) {\n        this.persistenceExceptionTranslator = persistenceExceptionTranslator;\n    }\n\n    @Override\n    public int getMaxRetriesDefault() {\n        return this.maxRetriesDefault;\n    }\n    public void setMaxRetriesDefault(int maxRetriesDefault) {\n        this.maxRetriesDefault = maxRetriesDefault;\n    }\n\n    @Override\n    public long getInitialDelayDefault() {\n        return this.initialDelayDefault;\n    }\n    public void setInitialDelayDefault(long initialDelayDefault) {\n        this.initialDelayDefault = initialDelayDefault;\n    }\n\n    @Override\n    public long getMaximumDelayDefault() {\n        return this.maximumDelayDefault;\n    }\n    public void setMaximumDelayDefault(long maximumDelayDefault) {\n        this.maximumDelayDefault = maximumDelayDefault;\n    }\n\n    @Override\n    public int getAttemptNumber() {\n        final Integer attempt = this.attemptHolder.get();\n        return attempt != null ? attempt : 0;\n    }\n\n\/\/ InitializingBean\n\n    @Override\n    public void afterPropertiesSet() throws Exception {\n        if (this.persistenceExceptionTranslator == null)\n            throw new IllegalArgumentException(\"no PersistenceExceptionTranslator configured\");\n    }\n\n\/\/ Aspect\n\n    \/\/ Ensure that this aspect is woven outside of the AnnotationTransactionAspect\n    declare precedence : RetryTransactionAspect, org.springframework.transaction.aspectj.*;\n\n    \/**\n     * Attempt to execute a transactional method. If the method throws any exception which is translated\n     * to a subclass of TransientDataAccessException, the method will be executed again, with a delay\n     * between attempts.\n     *\/\n    Object around(final Object txObject) : retryTransactionalMethodExecution(txObject) {\n\n        \/\/ Get method info\n        final MethodSignature methodSignature = (MethodSignature)thisJoinPoint.getSignature();\n        final Method method = methodSignature.getMethod();\n\n        \/\/ Get transaction attribute from @Transactional annotation\n        final TransactionAttribute transactionAttribute = this.transactionAttributeSource\n          .getTransactionAttribute(method, txObject.getClass());\n        if (transactionAttribute == null) {\n            throw new RuntimeException(\"no @Transactional annotation found for method \"\n              + method + \"; required for @RetryTransaction\");\n        }\n\n        \/\/ Do nothing unless this method is about to create a new transaction\n        switch (transactionAttribute.getPropagationBehavior()) {\n        case TransactionDefinition.PROPAGATION_REQUIRES_NEW:\n            break;\n        case TransactionDefinition.PROPAGATION_REQUIRED:\n            if (TransactionSynchronizationManager.isActualTransactionActive()) {\n                if (this.log.isTraceEnabled())\n                    this.log.trace(\"skipping retry logic; transaction already open in @Transactional method {}\", method);\n                return proceed(txObject);\n            }\n            break;\n        default:\n            return proceed(txObject);\n        }\n\n        \/\/ Get @RetryTransaction annotation\n        final RetryTransaction retryTransaction = AnnotationUtils.getAnnotation(method, RetryTransaction.class);\n        if (retryTransaction == null)\n            throw new RuntimeException(\"internal error: no @RetryTransaction annotation found for method \" + method);\n\n        \/\/ Get retry parameters, applying defaults if necessary\n        final int maxRetries = retryTransaction.maxRetries() != -1 ?\n          retryTransaction.maxRetries() : this.maxRetriesDefault;\n        final long initialDelay = retryTransaction.initialDelay() != -1 ?\n          retryTransaction.initialDelay() : this.initialDelayDefault;\n        final long maximumDelay = retryTransaction.maximumDelay() != -1 ?\n          retryTransaction.maximumDelay() : this.maximumDelayDefault;\n\n        \/\/ Sanity check we are configured\n        if (this.persistenceExceptionTranslator == null)\n            throw new RuntimeException(\"@RetryTransaction aspect must be configured before use\");\n\n        \/\/ Perform attempts\n        TransientDataAccessException transientException;\n        int attempt = 1;\n        do {\n\n            \/\/ If this is not the first attempt, sleep for a while\n            if (attempt > 1) {\n                final long delay = this.calculateDelay(attempt, initialDelay, maximumDelay);\n                if (this.log.isDebugEnabled())\n                    this.log.debug(\"pausing {}ms before retrying @Transactional method {}\", delay, method);\n                this.pause(delay);\n                if (this.log.isDebugEnabled())\n                    this.log.debug(\"retrying @Transactional method {} (attempt #{})\", method, attempt);\n            }\n\n            \/\/ Make attempt\n            try {\n\n                \/\/ Make next attempt\n                if (this.log.isTraceEnabled())\n                    this.log.trace(\"starting @Transactional method {} (attempt #{})\", method, attempt);\n                final Object[] result = new Object[1];\n                this.attemptHolder.invoke(attempt, new Runnable() {\n                    @Override\n                    public void run() {\n                        result[0] = proceed(txObject);\n                    }\n                });\n                if (attempt > 1) {\n                    if (this.log.isDebugEnabled())\n                        this.log.debug(\"successfully completed @Transactional method {} on re-try attempt #{}\", method, attempt);\n                } else {\n                    if (this.log.isTraceEnabled())\n                        this.log.trace(\"successfully completed @Transactional method {} on first attempt\", method);\n                }\n\n                \/\/ We're done\n                return result[0];\n            } catch (RuntimeException e) {\n\n                \/\/ Handle case that Spring has already wrapped and hidden the real exception without recognizing it\n                DataAccessException translatedException = null;\n                if (e instanceof UncategorizedDataAccessException) {\n                    for (Throwable t = e.getCause(); translatedException == null && t != null; t = t.getCause()) {\n                        if (t instanceof RuntimeException)\n                            translatedException = this.persistenceExceptionTranslator.translateExceptionIfPossible((RuntimeException)t);\n                    }\n                }\n\n                \/\/ Translate the exception, if not already translated above\n                if (translatedException == null) {\n                    translatedException = e instanceof DataAccessException ?\n                      (DataAccessException)e : this.persistenceExceptionTranslator.translateExceptionIfPossible(e);\n                }\n\n                \/\/ Log result\n                if (this.log.isDebugEnabled()) {\n                    this.log.debug(\"exception from @Transactional method {} on attempt #{}: {} (translates to {})\",\n                      method, attempt, e, translatedException != null ? translatedException.getClass().getSimpleName() : null);\n                }\n\n                \/\/ If it's not a transient exception, re-throw the original exception\n                if (!(translatedException instanceof TransientDataAccessException))\n                    throw e;\n\n                \/\/ Re-throw the transient exception when we've run out of attempts\n                transientException = (TransientDataAccessException)translatedException;\n            }\n        }\n        while (attempt++ <= maxRetries);\n\n        \/\/ All attempts failed\n        this.log.error(\"@Transactional method {} failed after {} attempts, giving up!\", method, maxRetries);\n        throw transientException;\n    }\n\n\/\/ Static methods\n\n    \/**\n     * Get the current transaction attempt number.\n     *\n     * @return transaction attempt number, or zero if this aspect is not active in the current thread\n     * @deprecated Use {@link RetryTransactionProvider#getAttemptNumber} instead\n     *\/\n    public static int getAttempt() {\n        final Integer attempt = RetryTransactionAspect.aspectOf().attemptHolder.get();\n        return attempt != null ? attempt : 0;\n    }\n\n\/\/ Helper methods\n\n    \/**\n     * Calculate how long to sleep.\n     *\n     * @param attempt attempt number (one-based)\n     * @param initialDelay initial delay\n     * @param maximumDelay maximum delay\n     *\/\n    protected long calculateDelay(int attempt, long initialDelay, long maximumDelay) {\n\n        \/\/ Enforce sanity\n        initialDelay = Math.max(initialDelay, 1);\n        maximumDelay = Math.max(maximumDelay, 1);\n        initialDelay = Math.min(initialDelay, maximumDelay);\n\n        \/\/ Calculate nominal delay for this attempt, using exponential back-off; be careful to avoid overflow\n        long delay = initialDelay;\n        while (attempt-- > 1) {\n            delay <<= 1;\n            if (delay >= maximumDelay) {\n                delay = maximumDelay;\n                break;\n            }\n        }\n\n        \/\/ Add in +\/- 12.5% randomness\n        final int randomRange = Math.max(1, (int)(delay >> 3));\n        synchronized (this.random) {\n            delay += this.random.nextInt(randomRange) - randomRange \/ 2;\n        }\n\n        \/\/ Enforce upper bound again\n        delay = Math.min(delay, maximumDelay);\n\n        \/\/ Done\n        return delay;\n    }\n\n    \/**\n     * Sleep for the specified period.\n     *\n     * @param delay delay in milliseconds\n     *\/\n    protected void pause(long delay) {\n        try {\n            Thread.sleep(delay);\n        } catch (InterruptedException e) {\n            Thread.currentThread().interrupt();\n        }\n    }\n\n    \/*\n     * Matches the execution of any public method in a type with the @Transactional annotation, or any subtype of a type with the\n     * @Transactional annotation.\n     *\/\n    private pointcut executionOfPublicMethodInTransactionalType() : execution(public * ((@Transactional *)+).*(..));\n\n    \/*\n     * Matches the execution of any public method in a type with the @RetryTransaction annotation, or any subtype of a type with the\n     * @RetryTransaction annotation.\n     *\/\n    private pointcut executionOfPublicMethodInRetryTransactionType() : execution(public * ((@RetryTransaction *)+).*(..));\n\n    \/*\n     * Matches the execution of any method with the @Transactional annotation.\n     *\/\n    private pointcut executionOfTransactionalMethod() : execution(@Transactional * *(..));\n\n    \/*\n     * Matches the execution of any method with the @RetryTransaction annotation.\n     *\/\n    private pointcut executionOfRetryTransactionMethod() : execution(@RetryTransaction * *(..));\n\n    \/*\n     * Main pointcut - matched join points have both @Transactional and @RetryTransaction on method and\/or type\n     *\/\n    private pointcut retryTransactionalMethodExecution(Object txObject) : this(txObject)\n        && (executionOfPublicMethodInTransactionalType() || executionOfTransactionalMethod())\n        && (executionOfPublicMethodInRetryTransactionType() || executionOfRetryTransactionMethod());\n}\n\n","old_contents":"\n\/*\n * Copyright (C) 2011 Archie L. Cobbs and other authors. All rights reserved.\n *\n * $Id$\n *\/\n\npackage org.dellroad.stuff.spring;\n\nimport java.lang.reflect.Method;\nimport java.util.Random;\n\nimport org.aspectj.lang.reflect.MethodSignature;\nimport org.dellroad.stuff.java.ThreadLocalHolder;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\nimport org.springframework.beans.factory.InitializingBean;\nimport org.springframework.core.annotation.AnnotationUtils;\nimport org.springframework.dao.DataAccessException;\nimport org.springframework.dao.TransientDataAccessException;\nimport org.springframework.dao.UncategorizedDataAccessException;\nimport org.springframework.dao.support.PersistenceExceptionTranslator;\nimport org.springframework.transaction.TransactionDefinition;\nimport org.springframework.transaction.annotation.AnnotationTransactionAttributeSource;\nimport org.springframework.transaction.annotation.Propagation;\nimport org.springframework.transaction.annotation.Transactional;\nimport org.springframework.transaction.interceptor.TransactionAttribute;\nimport org.springframework.transaction.support.TransactionSynchronizationManager;\n\n\/**\n * An aspect that automatically retries failed but \"retryable\" transactions.\n *\n * @see RetryTransaction\n *\/\npublic aspect RetryTransactionAspect implements RetryTransactionProvider, InitializingBean {\n\n    private final Logger log = LoggerFactory.getLogger(this.getClass());\n    private final ThreadLocalHolder<Integer> attemptHolder = new ThreadLocalHolder<Integer>();\n    private final Random random = new Random();\n\n    \/\/ Default values for retry settings\n    private int maxRetriesDefault = RetryTransaction.DEFAULT_MAX_RETRIES;\n    private long initialDelayDefault = RetryTransaction.DEFAULT_INITIAL_DELAY;\n    private long maximumDelayDefault = RetryTransaction.DEFAULT_MAXIMUM_DELAY;\n\n    \/\/ This knows how to read information from @Transactional annotation\n    private final AnnotationTransactionAttributeSource transactionAttributeSource = new AnnotationTransactionAttributeSource(false);\n\n    \/\/ Tells us what is a \"transient\" exception; must be explicitly configured\n    private PersistenceExceptionTranslator persistenceExceptionTranslator;\n\n\/\/ Property accessors and RetryTransactionProvider implementation\n\n    @Override\n    public PersistenceExceptionTranslator getPersistenceExceptionTranslator() {\n        return this.persistenceExceptionTranslator;\n    }\n    public void setPersistenceExceptionTranslator(PersistenceExceptionTranslator persistenceExceptionTranslator) {\n        this.persistenceExceptionTranslator = persistenceExceptionTranslator;\n    }\n\n    @Override\n    public int getMaxRetriesDefault() {\n        return this.maxRetriesDefault;\n    }\n    public void setMaxRetriesDefault(int maxRetriesDefault) {\n        this.maxRetriesDefault = maxRetriesDefault;\n    }\n\n    @Override\n    public long getInitialDelayDefault() {\n        return this.initialDelayDefault;\n    }\n    public void setInitialDelayDefault(long initialDelayDefault) {\n        this.initialDelayDefault = initialDelayDefault;\n    }\n\n    @Override\n    public long getMaximumDelayDefault() {\n        return this.maximumDelayDefault;\n    }\n    public void setMaximumDelayDefault(long maximumDelayDefault) {\n        this.maximumDelayDefault = maximumDelayDefault;\n    }\n\n    @Override\n    public int getAttemptNumber() {\n        final Integer attempt = this.attemptHolder.get();\n        return attempt != null ? attempt : 0;\n    }\n\n\/\/ InitializingBean\n\n    @Override\n    public void afterPropertiesSet() throws Exception {\n        if (this.persistenceExceptionTranslator == null)\n            throw new IllegalArgumentException(\"no PersistenceExceptionTranslator configured\");\n    }\n\n\/\/ Aspect\n\n    \/\/ Ensure that this aspect is woven outside of the AnnotationTransactionAspect\n    declare precedence : RetryTransactionAspect, org.springframework.transaction.aspectj.*;\n\n    \/**\n     * Attempt to execute a transactional method. If the method throws any exception which is translated\n     * to a subclass of TransientDataAccessException, the method will be executed again, with a delay\n     * between attempts.\n     *\/\n    Object around(final Object txObject) : retryTransactionalMethodExecution(txObject) {\n\n        \/\/ Get method info\n        final MethodSignature methodSignature = (MethodSignature)thisJoinPoint.getSignature();\n        final Method method = methodSignature.getMethod();\n\n        \/\/ Get transaction attribute from @Transactional annotation\n        final TransactionAttribute transactionAttribute = this.transactionAttributeSource\n          .getTransactionAttribute(method, txObject.getClass());\n        if (transactionAttribute == null) {\n            throw new RuntimeException(\"no @Transactional annotation found for method \"\n              + method + \"; required for @RetryTransaction\");\n        }\n\n        \/\/ Do nothing unless this method is about to create a new transaction\n        switch (transactionAttribute.getPropagationBehavior()) {\n        case TransactionDefinition.PROPAGATION_REQUIRES_NEW:\n            break;\n        case TransactionDefinition.PROPAGATION_REQUIRED:\n            if (TransactionSynchronizationManager.isActualTransactionActive()) {\n                if (this.log.isTraceEnabled())\n                    this.log.trace(\"skipping retry logic; transaction already open in @Transactional method {}\", method);\n                return proceed(txObject);\n            }\n            break;\n        default:\n            return proceed(txObject);\n        }\n\n        \/\/ Get @RetryTransaction annotation\n        final RetryTransaction retryTransaction = AnnotationUtils.getAnnotation(method, RetryTransaction.class);\n        if (retryTransaction == null)\n            throw new RuntimeException(\"internal error: no @RetryTransaction annotation found for method \" + method);\n\n        \/\/ Get retry parameters, applying defaults if necessary\n        final int maxRetries = retryTransaction.maxRetries() != -1 ?\n          retryTransaction.maxRetries() : this.maxRetriesDefault;\n        final long initialDelay = retryTransaction.initialDelay() != -1 ?\n          retryTransaction.initialDelay() : this.initialDelayDefault;\n        final long maximumDelay = retryTransaction.maximumDelay() != -1 ?\n          retryTransaction.maximumDelay() : this.maximumDelayDefault;\n\n        \/\/ Sanity check we are configured\n        if (this.persistenceExceptionTranslator == null)\n            throw new RuntimeException(\"@RetryTransaction aspect must be configured before use\");\n\n        \/\/ Perform attempts\n        TransientDataAccessException transientException;\n        int attempt = 1;\n        do {\n\n            \/\/ If this is not the first attempt, sleep for a while\n            if (attempt > 1) {\n                final long delay = this.calculateDelay(attempt, initialDelay, maximumDelay);\n                if (this.log.isDebugEnabled())\n                    this.log.debug(\"pausing {}ms before retrying @Transactional method {}\", delay, method);\n                this.pause(delay);\n                if (this.log.isDebugEnabled())\n                    this.log.debug(\"retrying @Transactional method {} (attempt #{})\", method, attempt);\n            }\n\n            \/\/ Make attempt\n            try {\n\n                \/\/ Make next attempt\n                if (this.log.isTraceEnabled())\n                    this.log.trace(\"starting @Transactional method {} (attempt #{})\", method, attempt);\n                final Object[] result = new Object[1];\n                this.attemptHolder.invoke(attempt, new Runnable() {\n                    @Override\n                    public void run() {\n                        result[0] = proceed(txObject);\n                    }\n                });\n                if (attempt > 1) {\n                    if (this.log.isDebugEnabled())\n                        this.log.debug(\"successfully completed @Transactional method {} on re-try attempt #{}\", method, attempt);\n                } else {\n                    if (this.log.isTraceEnabled())\n                        this.log.trace(\"successfully completed @Transactional method {} on first attempt\", method);\n                }\n\n                \/\/ We're done\n                return result[0];\n            } catch (RuntimeException e) {\n\n                \/\/ Handle case that Spring has already wrapped and hidden the real exception without recognizing it\n                DataAccessException translatedException = null;\n                if (e instanceof UncategorizedDataAccessException) {\n                    final Throwable cause = ((UncategorizedDataAccessException)e).getCause();\n                    if (cause instanceof RuntimeException) {\n                        translatedException = this.persistenceExceptionTranslator.translateExceptionIfPossible(\n                          (RuntimeException)cause);\n                    }\n                }\n\n                \/\/ Translate the exception, if not already translated above\n                if (translatedException == null) {\n                    translatedException = e instanceof DataAccessException ?\n                      (DataAccessException)e : this.persistenceExceptionTranslator.translateExceptionIfPossible(e);\n                }\n\n                \/\/ Log result\n                if (this.log.isDebugEnabled()) {\n                    this.log.debug(\"exception from @Transactional method {} on attempt #{}: {} (translates to {})\",\n                      method, attempt, e, translatedException != null ? translatedException.getClass().getSimpleName() : null);\n                }\n\n                \/\/ If it's not a transient exception, re-throw the original exception\n                if (!(translatedException instanceof TransientDataAccessException))\n                    throw e;\n\n                \/\/ Re-throw the transient exception when we've run out of attempts\n                transientException = (TransientDataAccessException)translatedException;\n            }\n        }\n        while (attempt++ <= maxRetries);\n\n        \/\/ All attempts failed\n        this.log.error(\"@Transactional method {} failed after {} attempts, giving up!\", method, maxRetries);\n        throw transientException;\n    }\n\n\/\/ Static methods\n\n    \/**\n     * Get the current transaction attempt number.\n     *\n     * @return transaction attempt number, or zero if this aspect is not active in the current thread\n     * @deprecated Use {@link RetryTransactionProvider#getAttemptNumber} instead\n     *\/\n    public static int getAttempt() {\n        final Integer attempt = RetryTransactionAspect.aspectOf().attemptHolder.get();\n        return attempt != null ? attempt : 0;\n    }\n\n\/\/ Helper methods\n\n    \/**\n     * Calculate how long to sleep.\n     *\n     * @param attempt attempt number (one-based)\n     * @param initialDelay initial delay\n     * @param maximumDelay maximum delay\n     *\/\n    protected long calculateDelay(int attempt, long initialDelay, long maximumDelay) {\n\n        \/\/ Enforce sanity\n        initialDelay = Math.max(initialDelay, 1);\n        maximumDelay = Math.max(maximumDelay, 1);\n        initialDelay = Math.min(initialDelay, maximumDelay);\n\n        \/\/ Calculate nominal delay for this attempt, using exponential back-off; be careful to avoid overflow\n        long delay = initialDelay;\n        while (attempt-- > 1) {\n            delay <<= 1;\n            if (delay >= maximumDelay) {\n                delay = maximumDelay;\n                break;\n            }\n        }\n\n        \/\/ Add in +\/- 12.5% randomness\n        final int randomRange = Math.max(1, (int)(delay >> 3));\n        synchronized (this.random) {\n            delay += this.random.nextInt(randomRange) - randomRange \/ 2;\n        }\n\n        \/\/ Enforce upper bound again\n        delay = Math.min(delay, maximumDelay);\n\n        \/\/ Done\n        return delay;\n    }\n\n    \/**\n     * Sleep for the specified period.\n     *\n     * @param delay delay in milliseconds\n     *\/\n    protected void pause(long delay) {\n        try {\n            Thread.sleep(delay);\n        } catch (InterruptedException e) {\n            Thread.currentThread().interrupt();\n        }\n    }\n\n    \/*\n     * Matches the execution of any public method in a type with the @Transactional annotation, or any subtype of a type with the\n     * @Transactional annotation.\n     *\/\n    private pointcut executionOfPublicMethodInTransactionalType() : execution(public * ((@Transactional *)+).*(..));\n\n    \/*\n     * Matches the execution of any public method in a type with the @RetryTransaction annotation, or any subtype of a type with the\n     * @RetryTransaction annotation.\n     *\/\n    private pointcut executionOfPublicMethodInRetryTransactionType() : execution(public * ((@RetryTransaction *)+).*(..));\n\n    \/*\n     * Matches the execution of any method with the @Transactional annotation.\n     *\/\n    private pointcut executionOfTransactionalMethod() : execution(@Transactional * *(..));\n\n    \/*\n     * Matches the execution of any method with the @RetryTransaction annotation.\n     *\/\n    private pointcut executionOfRetryTransactionMethod() : execution(@RetryTransaction * *(..));\n\n    \/*\n     * Main pointcut - matched join points have both @Transactional and @RetryTransaction on method and\/or type\n     *\/\n    private pointcut retryTransactionalMethodExecution(Object txObject) : this(txObject)\n        && (executionOfPublicMethodInTransactionalType() || executionOfTransactionalMethod())\n        && (executionOfPublicMethodInRetryTransactionType() || executionOfRetryTransactionMethod());\n}\n\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"26e3e12362902b52c0578c48fe1c669e66729118","subject":"Check if location updates are already enabled directly in the requestLocationUpdates() method","message":"Check if location updates are already enabled directly in the requestLocationUpdates() method","repos":"hongnguyenpro\/ignition,beni55\/ignition,Applied-Duality\/ignition,treejames\/ignition,mttkay\/ignition","old_file":"ignition-location\/ignition-location-lib\/src\/com\/github\/ignition\/location\/IgnitedLocationManager.aj","new_file":"ignition-location\/ignition-location-lib\/src\/com\/github\/ignition\/location\/IgnitedLocationManager.aj","new_contents":"\/*\n * Copyright 2011 Google Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * This code has been modified by Stefano Dacchille.\n *\/\n\npackage com.github.ignition.location;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\n\nimport android.app.Activity;\nimport android.app.PendingIntent;\nimport android.content.BroadcastReceiver;\nimport android.content.Context;\nimport android.content.Intent;\nimport android.content.IntentFilter;\nimport android.content.SharedPreferences;\nimport android.content.SharedPreferences.Editor;\nimport android.location.Criteria;\nimport android.location.Location;\nimport android.location.LocationListener;\nimport android.location.LocationManager;\nimport android.os.AsyncTask;\nimport android.os.BatteryManager;\nimport android.os.Bundle;\nimport android.os.Handler;\nimport android.util.Log;\n\nimport com.github.ignition.location.annotations.IgnitedLocation;\nimport com.github.ignition.location.annotations.IgnitedLocationActivity;\nimport com.github.ignition.location.receivers.IgnitedLocationChangedReceiver;\nimport com.github.ignition.location.receivers.IgnitedPassiveLocationChangedReceiver;\nimport com.github.ignition.location.tasks.IgnitedLastKnownLocationAsyncTask;\nimport com.github.ignition.location.templates.ILastLocationFinder;\nimport com.github.ignition.location.templates.LocationUpdateRequester;\nimport com.github.ignition.location.templates.OnIgnitedLocationChangedListener;\nimport com.github.ignition.location.utils.PlatformSpecificImplementationFactory;\nimport com.github.ignition.support.IgnitedDiagnostics;\n\n@SuppressAjWarnings\npublic aspect IgnitedLocationManager {\n    public static final String LOG_TAG = IgnitedLocationManager.class.getSimpleName();\n\n    declare parents : (@IgnitedLocationActivity *) implements OnIgnitedLocationChangedListener;\n\n    private Criteria defaultCriteria;\n    protected LocationUpdateRequester locationUpdateRequester;\n    protected PendingIntent locationListenerPendingIntent, locationListenerPassivePendingIntent;\n    protected LocationManager locationManager;\n    protected IgnitedLocationListener bestInactiveLocationProviderListener;\n\n    private Context context;\n    private volatile Location currentLocation;\n    private long locationUpdatesInterval, passiveLocationUpdatesInterval;\n    private int locationUpdatesDistanceDiff, passiveLocationUpdatesDistanceDiff;\n    private boolean requestLocationUpdates;\n    private boolean locationUpdatesDisabled = true;\n\n    private AsyncTask<Void, Void, Location> ignitedLastKnownLocationTask;\n    private SharedPreferences prefs;\n    private Handler handler;\n\n    \/\/ Switch to another provider if gps doesn't return a location quickly enough.\n    private Runnable removeGpsUpdates = new Runnable() {\n        @Override\n        public void run() {\n            Log.d(LOG_TAG,\n                    \"It looks like GPS isn't available at this time (i.e.: maybe you're indoors). Removing GPS location updates and requesting network updates.\");\n\n            disableLocationUpdates(false);\n            requestLocationUpdates(context);\n        }\n    };\n\n    \/**\n     * If the Location Provider we're using to receive location updates is disabled while the app is\n     * running, this Receiver will be notified, allowing us to re-register our Location Receivers\n     * using the best available Location Provider is still available.\n     *\/\n    protected BroadcastReceiver locationProviderDisabledReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            boolean providerDisabled = !intent.getBooleanExtra(\n                    LocationManager.KEY_PROVIDER_ENABLED, false);\n            \/\/ Re-register the location listeners using the best available\n            \/\/ Location Provider.\n            if (providerDisabled) {\n                disableLocationUpdates(false);\n                requestLocationUpdates(context);\n            }\n        }\n    };\n\n    \/**\n     * If the battery state is low disable the passive location update receiver.\n     *\/\n    protected BroadcastReceiver refreshLocationUpdatesReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            disableLocationUpdates(false);\n            requestLocationUpdates(context);\n        }\n    };\n\n    after(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onCreate(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n\n        \/\/ Get a reference to the Context\n        this.context = context;\n        \/\/ Set pref file\n        prefs = context.getSharedPreferences(IgnitedLocationConstants.SHARED_PREFERENCE_FILE,\n                Context.MODE_PRIVATE);\n        \/\/ Get references to the managers\n        locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);\n        handler = new Handler();\n\n        \/\/ Specify the Criteria to use when requesting location updates while\n        \/\/ the application is Active\n        defaultCriteria = new Criteria();\n        \/\/ Use gps if it's enabled and if battery level is at least 15%\n        boolean useGps = prefs.getBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS,\n                IgnitedLocationConstants.USE_GPS_DEFAULT);\n        if (useGps) {\n            defaultCriteria.setAccuracy(Criteria.ACCURACY_FINE);\n        } else {\n            defaultCriteria.setPowerRequirement(Criteria.POWER_LOW);\n        }\n\n        \/\/ Setup the location update Pending Intent\n        Intent activeIntent = new Intent(IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_ACTION);\n        locationListenerPendingIntent = PendingIntent.getBroadcast(context, 0, activeIntent,\n                PendingIntent.FLAG_UPDATE_CURRENT);\n        \/\/ Setup the passive location update Pending Intent\n        Intent passiveIntent = new Intent(context, IgnitedPassiveLocationChangedReceiver.class);\n        locationListenerPassivePendingIntent = PendingIntent.getBroadcast(context, 0,\n                passiveIntent, PendingIntent.FLAG_UPDATE_CURRENT);\n\n        \/\/ Instantiate a Location Update Requester class based on the available\n        \/\/ platform version. This will be used to request location updates.\n        locationUpdateRequester = PlatformSpecificImplementationFactory\n                .getLocationUpdateRequester(context);\n    }\n\n    private boolean isBatteryOk() {\n        IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);\n        Intent intent = context.registerReceiver(null, filter);\n        double currentLevel = 100.0;\n        if (intent != null) {\n            currentLevel = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1);\n        }\n\n        return currentLevel >= prefs.getInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                IgnitedLocationConstants.MIN_BATTERY_LEVEL_DEFAULT);\n    }\n\n    before(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onResume(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n        \/\/ Get a reference to the Context if this context is null\n        if (this.context == null) {\n            this.context = context;\n        }\n\n        saveToPreferences(context, ignitedAnnotation);\n\n        Log.d(LOG_TAG, \"Retrieving last known location...\");\n        \/\/ Get the last known location. This isn't directly affecting the UI, so put it on a\n        \/\/ worker thread.\n        ignitedLastKnownLocationTask = new IgnitedLastKnownLocationAsyncTask(\n                context, locationUpdatesDistanceDiff, locationUpdatesInterval);\n        ignitedLastKnownLocationTask.execute();\n    }\n\n    \/**\n     * Save last settings to preferences.\n     * \n     * @param context\n     * @param locationAnnotation\n     *\/\n    private void saveToPreferences(Context context, IgnitedLocationActivity locationAnnotation) {\n        requestLocationUpdates = locationAnnotation.requestLocationUpdates();\n        locationUpdatesDistanceDiff = locationAnnotation.locationUpdatesDistanceDiff();\n        locationUpdatesInterval = locationAnnotation.locationUpdatesInterval();\n        passiveLocationUpdatesDistanceDiff = locationAnnotation\n                .passiveLocationUpdatesDistanceDiff();\n        passiveLocationUpdatesInterval = locationAnnotation.passiveLocationUpdatesInterval();\n        boolean enablePassiveLocationUpdates = locationAnnotation.enablePassiveUpdates();\n        boolean useGps = locationAnnotation.useGps();\n\n        Editor editor = prefs.edit();\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_LOCATION_UPDATES,\n                requestLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                enablePassiveLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS, useGps);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_DISTANCE_DIFF,\n                locationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_INTERVAL,\n                locationUpdatesInterval);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_DISTANCE_DIFF,\n                passiveLocationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_INTERVAL,\n                passiveLocationUpdatesInterval);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_RUN_ONCE, true);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                locationAnnotation.minBatteryLevel());\n        editor.putLong(IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                locationAnnotation.waitForGpsFix());\n        editor.commit();\n\n    }\n\n    before(Activity activity, IgnitedLocationActivity ignitedAnnotation) : execution(* Activity.onPause(..)) \n        && @this(ignitedAnnotation) && this(activity)\n        && within(@IgnitedLocationActivity *) && if (ignitedAnnotation.requestLocationUpdates()) {\n\n        disableLocationUpdates(true);\n\n        handler.removeCallbacks(removeGpsUpdates);\n\n        boolean finishing = activity.isFinishing();\n        if (finishing) {\n            if (ignitedLastKnownLocationTask != null && ignitedLastKnownLocationTask.getStatus() != AsyncTask.Status.FINISHED) {\n                ignitedLastKnownLocationTask.cancel(true);\n            } else {\n                PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            }\n\n            context = null;\n        }\n    }\n\n    \/\/ after() : execution(* Activity.onDestroy(..)) && @this(IgnitedLocationActivity)\n    \/\/ && within(@IgnitedLocationActivity *) {\n    \/\/ }\n\n    Location around() : get(@IgnitedLocation Location *) {\n        return currentLocation;\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && within(IgnitedPassiveLocationChangedReceiver) && !adviceexecution() {\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, long): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude());\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && (within(IgnitedLocationChangedReceiver) || within(com.github.ignition.location.utils.*)\n                || within(IgnitedLastKnownLocationAsyncTask)) && !adviceexecution() {\n\n        if (context == null) {\n            return;\n        }\n        final Activity activity = (Activity) context;\n        if (freshLocation == null) {\n            activity.showDialog(R.id.ign_loc_dialog_wait_for_fix);\n            return;\n        }\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, long): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude());\n        boolean keepRequestingLocationUpdates = ((OnIgnitedLocationChangedListener) context)\n                .onIgnitedLocationChanged(currentLocation);\n        if (!keepRequestingLocationUpdates) {\n            disableLocationUpdates(true);\n            PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            return;\n        } else if (requestLocationUpdates\n                && !freshLocation.getExtras().getBoolean(\n                        ILastLocationFinder.LAST_LOCATION_TOO_OLD_EXTRA)) {\n            \/\/ If we requested location updates, turn them on here.\n            requestLocationUpdates(context);\n        }\n\n        \/\/ If gps is enabled location comes from gps, remove runnable that removes gps updates\n        boolean lastLocation = freshLocation.getExtras().getBoolean(\n                IgnitedLocationConstants.IGNITED_LAST_LOCATION_EXTRA);\n        if (!lastLocation && defaultCriteria.getAccuracy() == Criteria.ACCURACY_FINE\n                && currentLocation.getProvider().equals(LocationManager.GPS_PROVIDER)) {\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n    }\n\n    \/**\n     * Start listening for location updates.\n     *\/\n    protected void requestLocationUpdates(Context context) {\n        if (!locationUpdatesDisabled) {\n            return;\n        }\n        Criteria locationUpdateCriteria;\n        if (isBatteryOk()) {\n            locationUpdateCriteria = defaultCriteria;\n        } else {\n            locationUpdateCriteria = lowBatteryConsumptionCriteria();\n        }\n\n        Log.d(LOG_TAG, \"Disabling passive location updates\");\n        locationManager.removeUpdates(locationListenerPassivePendingIntent);\n\n        Log.d(LOG_TAG, \"Requesting location updates\");\n        \/\/ Normal updates while activity is visible.\n        locationUpdateRequester.requestLocationUpdates(locationUpdatesInterval,\n                locationUpdatesDistanceDiff, locationUpdateCriteria, locationListenerPendingIntent);\n\n        \/\/ Register a receiver that listens for when the provider I'm using has\n        \/\/ been disabled.\n        IntentFilter locationProviderDisabledIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_PROVIDER_DISABLED_ACTION);\n        context.registerReceiver(locationProviderDisabledReceiver,\n                locationProviderDisabledIntentFilter);\n\n        IntentFilter refreshLocationUpdatesIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.UPDATE_LOCATION_UPDATES_CRITERIA_ACTION);\n        context.registerReceiver(refreshLocationUpdatesReceiver, refreshLocationUpdatesIntentFilter);\n\n        \/\/ Register a receiver that listens for when a better provider than I'm\n        \/\/ using becomes available.\n        String bestProvider = locationManager.getBestProvider(locationUpdateCriteria, false);\n        String bestAvailableProvider = locationManager.getBestProvider(locationUpdateCriteria, true);\n        if (bestProvider != null && !bestProvider.equals(bestAvailableProvider)) {\n            bestInactiveLocationProviderListener = new IgnitedLocationListener(context);\n            locationManager.requestLocationUpdates(bestProvider, 0, 0,\n                    bestInactiveLocationProviderListener, context.getMainLooper());\n        }\n\n        if (bestAvailableProvider.equals(LocationManager.GPS_PROVIDER)) {\n            Log.d(LOG_TAG, \"Posting delayed remove GPS updates message\");\n            \/\/ Post a runnable that will remove gps updates if no gps location is returned after 1\n            \/\/ minute in order to avoid draining the battery.\n            handler.postDelayed(removeGpsUpdates, prefs.getLong(\n                    IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                    IgnitedLocationConstants.WAIT_FOR_GPS_FIX_INTERVAL_DEFAULT));\n        }\n\n        locationUpdatesDisabled = false;\n    }\n\n    \/**\n     * Stop listening for location updates\n     * \n     * @param enablePassiveLocationUpdates\n     *\/\n    protected void disableLocationUpdates(boolean requestPassiveLocationUpdates) {\n        if (locationUpdatesDisabled) {\n            return;\n        }\n\n        Log.d(LOG_TAG, \"Disabling location updates\");\n        context.unregisterReceiver(locationProviderDisabledReceiver);\n        context.unregisterReceiver(refreshLocationUpdatesReceiver);\n\n        locationUpdateRequester.removeLocationUpdates();\n        if (bestInactiveLocationProviderListener != null) {\n            locationManager.removeUpdates(bestInactiveLocationProviderListener);\n        }\n\n        boolean finishing = ((Activity) context).isFinishing();\n\n        if (requestPassiveLocationUpdates && !finishing) {\n            requestPassiveLocationUpdates();\n        }\n\n        locationUpdatesDisabled = true;\n    }\n\n    private void requestPassiveLocationUpdates() {\n        if (IgnitedDiagnostics.SUPPORTS_FROYO\n                && prefs.getBoolean(\n                        IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                        IgnitedLocationConstants.ENABLE_PASSIVE_LOCATION_UPDATES_DEFAULT)) {\n            Log.d(LOG_TAG, \"Requesting passive location updates\");\n            \/\/ Passive location updates from 3rd party apps when the Activity isn't\n            \/\/ visible. Only for Android 2.2+.\n            locationUpdateRequester.requestPassiveLocationUpdates(passiveLocationUpdatesInterval,\n                    passiveLocationUpdatesDistanceDiff, locationListenerPassivePendingIntent);\n        }\n    }\n\n    public boolean isLocationUpdatesDisabled() {\n        return locationUpdatesDisabled;\n    }\n\n    public Criteria lowBatteryConsumptionCriteria() {\n        Criteria criteria = new Criteria();\n        criteria.setPowerRequirement(Criteria.POWER_LOW);\n        criteria.setAccuracy(Criteria.NO_REQUIREMENT);\n        return criteria;\n    }\n\n    \/**\n     * If the best Location Provider (usually GPS) is not available when we request location\n     * updates, this listener will be notified if \/ when it becomes available. It calls\n     * requestLocationUpdates to re-register the location listeners using the better Location\n     * Provider.\n     *\/\n    private class IgnitedLocationListener implements LocationListener {\n        private Context context;\n\n        public IgnitedLocationListener(Context appContext) {\n            this.context = appContext;\n        }\n\n        @Override\n        public void onLocationChanged(Location l) {\n        }\n\n        @Override\n        public void onProviderDisabled(String provider) {\n        }\n\n        @Override\n        public void onStatusChanged(String provider, int status, Bundle extras) {\n        }\n\n        @Override\n        public void onProviderEnabled(String provider) {\n            \/\/ Re-register the location listeners using the better Location\n            \/\/ Provider.\n            disableLocationUpdates(false);\n            requestLocationUpdates(context);\n        }\n    }\n\n}\n","old_contents":"\/*\n * Copyright 2011 Google Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * This code has been modified by Stefano Dacchille.\n *\/\n\npackage com.github.ignition.location;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\n\nimport android.app.Activity;\nimport android.app.PendingIntent;\nimport android.content.BroadcastReceiver;\nimport android.content.Context;\nimport android.content.Intent;\nimport android.content.IntentFilter;\nimport android.content.SharedPreferences;\nimport android.content.SharedPreferences.Editor;\nimport android.location.Criteria;\nimport android.location.Location;\nimport android.location.LocationListener;\nimport android.location.LocationManager;\nimport android.os.AsyncTask;\nimport android.os.BatteryManager;\nimport android.os.Bundle;\nimport android.os.Handler;\nimport android.util.Log;\n\nimport com.github.ignition.location.annotations.IgnitedLocation;\nimport com.github.ignition.location.annotations.IgnitedLocationActivity;\nimport com.github.ignition.location.receivers.IgnitedLocationChangedReceiver;\nimport com.github.ignition.location.receivers.IgnitedPassiveLocationChangedReceiver;\nimport com.github.ignition.location.tasks.IgnitedLastKnownLocationAsyncTask;\nimport com.github.ignition.location.templates.ILastLocationFinder;\nimport com.github.ignition.location.templates.LocationUpdateRequester;\nimport com.github.ignition.location.templates.OnIgnitedLocationChangedListener;\nimport com.github.ignition.location.utils.PlatformSpecificImplementationFactory;\nimport com.github.ignition.support.IgnitedDiagnostics;\n\n@SuppressAjWarnings\npublic aspect IgnitedLocationManager {\n    public static final String LOG_TAG = IgnitedLocationManager.class.getSimpleName();\n\n    declare parents : (@IgnitedLocationActivity *) implements OnIgnitedLocationChangedListener;\n\n    private Criteria defaultCriteria;\n    protected LocationUpdateRequester locationUpdateRequester;\n    protected PendingIntent locationListenerPendingIntent, locationListenerPassivePendingIntent;\n    protected LocationManager locationManager;\n    protected IgnitedLocationListener bestInactiveLocationProviderListener;\n\n    private Context context;\n    private volatile Location currentLocation;\n    private long locationUpdatesInterval, passiveLocationUpdatesInterval;\n    private int locationUpdatesDistanceDiff, passiveLocationUpdatesDistanceDiff;\n    private boolean requestLocationUpdates;\n    private boolean locationUpdatesDisabled = true;\n\n    private AsyncTask<Void, Void, Location> ignitedLastKnownLocationTask;\n    private SharedPreferences prefs;\n    private Handler handler;\n\n    \/\/ Switch to another provider if gps doesn't return a location quickly enough.\n    private Runnable removeGpsUpdates = new Runnable() {\n        @Override\n        public void run() {\n            Log.d(LOG_TAG,\n                    \"It looks like GPS isn't available at this time (i.e.: maybe you're indoors). Removing GPS location updates and requesting network updates.\");\n\n            disableLocationUpdates(false);\n            requestLocationUpdates(context);\n        }\n    };\n\n    \/**\n     * If the Location Provider we're using to receive location updates is disabled while the app is\n     * running, this Receiver will be notified, allowing us to re-register our Location Receivers\n     * using the best available Location Provider is still available.\n     *\/\n    protected BroadcastReceiver locationProviderDisabledReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            boolean providerDisabled = !intent.getBooleanExtra(\n                    LocationManager.KEY_PROVIDER_ENABLED, false);\n            \/\/ Re-register the location listeners using the best available\n            \/\/ Location Provider.\n            if (providerDisabled) {\n                disableLocationUpdates(false);\n                requestLocationUpdates(context);\n            }\n        }\n    };\n\n    \/**\n     * If the battery state is low disable the passive location update receiver.\n     *\/\n    protected BroadcastReceiver refreshLocationUpdatesReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            disableLocationUpdates(false);\n            requestLocationUpdates(context);\n        }\n    };\n\n    after(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onCreate(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n\n        \/\/ Get a reference to the Context\n        this.context = context;\n        \/\/ Set pref file\n        prefs = context.getSharedPreferences(IgnitedLocationConstants.SHARED_PREFERENCE_FILE,\n                Context.MODE_PRIVATE);\n        \/\/ Get references to the managers\n        locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);\n        handler = new Handler();\n\n        \/\/ Specify the Criteria to use when requesting location updates while\n        \/\/ the application is Active\n        defaultCriteria = new Criteria();\n        \/\/ Use gps if it's enabled and if battery level is at least 15%\n        boolean useGps = prefs.getBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS,\n                IgnitedLocationConstants.USE_GPS_DEFAULT);\n        if (useGps) {\n            defaultCriteria.setAccuracy(Criteria.ACCURACY_FINE);\n        } else {\n            defaultCriteria.setPowerRequirement(Criteria.POWER_LOW);\n        }\n\n        \/\/ Setup the location update Pending Intent\n        Intent activeIntent = new Intent(IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_ACTION);\n        locationListenerPendingIntent = PendingIntent.getBroadcast(context, 0, activeIntent,\n                PendingIntent.FLAG_UPDATE_CURRENT);\n        \/\/ Setup the passive location update Pending Intent\n        Intent passiveIntent = new Intent(context, IgnitedPassiveLocationChangedReceiver.class);\n        locationListenerPassivePendingIntent = PendingIntent.getBroadcast(context, 0,\n                passiveIntent, PendingIntent.FLAG_UPDATE_CURRENT);\n\n        \/\/ Instantiate a Location Update Requester class based on the available\n        \/\/ platform version. This will be used to request location updates.\n        locationUpdateRequester = PlatformSpecificImplementationFactory\n                .getLocationUpdateRequester(context);\n    }\n\n    private boolean isBatteryOk() {\n        IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);\n        Intent intent = context.registerReceiver(null, filter);\n        double currentLevel = 100.0;\n        if (intent != null) {\n            currentLevel = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1);\n        }\n\n        return currentLevel >= prefs.getInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                IgnitedLocationConstants.MIN_BATTERY_LEVEL_DEFAULT);\n    }\n\n    before(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onResume(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n        \/\/ Get a reference to the Context if this context is null\n        if (this.context == null) {\n            this.context = context;\n        }\n\n        saveToPreferences(context, ignitedAnnotation);\n\n        Log.d(LOG_TAG, \"Retrieving last known location...\");\n        \/\/ Get the last known location. This isn't directly affecting the UI, so put it on a\n        \/\/ worker thread.\n        ignitedLastKnownLocationTask = new IgnitedLastKnownLocationAsyncTask(\n                context, locationUpdatesDistanceDiff, locationUpdatesInterval);\n        ignitedLastKnownLocationTask.execute();\n    }\n\n    \/**\n     * Save last settings to preferences.\n     * \n     * @param context\n     * @param locationAnnotation\n     *\/\n    private void saveToPreferences(Context context, IgnitedLocationActivity locationAnnotation) {\n        requestLocationUpdates = locationAnnotation.requestLocationUpdates();\n        locationUpdatesDistanceDiff = locationAnnotation.locationUpdatesDistanceDiff();\n        locationUpdatesInterval = locationAnnotation.locationUpdatesInterval();\n        passiveLocationUpdatesDistanceDiff = locationAnnotation\n                .passiveLocationUpdatesDistanceDiff();\n        passiveLocationUpdatesInterval = locationAnnotation.passiveLocationUpdatesInterval();\n        boolean enablePassiveLocationUpdates = locationAnnotation.enablePassiveUpdates();\n        boolean useGps = locationAnnotation.useGps();\n\n        Editor editor = prefs.edit();\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_LOCATION_UPDATES,\n                requestLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                enablePassiveLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS, useGps);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_DISTANCE_DIFF,\n                locationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_INTERVAL,\n                locationUpdatesInterval);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_DISTANCE_DIFF,\n                passiveLocationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_INTERVAL,\n                passiveLocationUpdatesInterval);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_RUN_ONCE, true);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                locationAnnotation.minBatteryLevel());\n        editor.putLong(IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                locationAnnotation.waitForGpsFix());\n        editor.commit();\n\n    }\n\n    before(Activity activity, IgnitedLocationActivity ignitedAnnotation) : execution(* Activity.onPause(..)) \n        && @this(ignitedAnnotation) && this(activity)\n        && within(@IgnitedLocationActivity *) && if (ignitedAnnotation.requestLocationUpdates()) {\n\n        disableLocationUpdates(true);\n\n        handler.removeCallbacks(removeGpsUpdates);\n\n        boolean finishing = activity.isFinishing();\n        if (finishing) {\n            if (ignitedLastKnownLocationTask != null && ignitedLastKnownLocationTask.getStatus() != AsyncTask.Status.FINISHED) {\n                ignitedLastKnownLocationTask.cancel(true);\n            } else {\n                PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            }\n\n            context = null;\n        }\n    }\n\n    \/\/ after() : execution(* Activity.onDestroy(..)) && @this(IgnitedLocationActivity)\n    \/\/ && within(@IgnitedLocationActivity *) {\n    \/\/ }\n\n    Location around() : get(@IgnitedLocation Location *) {\n        return currentLocation;\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && within(IgnitedPassiveLocationChangedReceiver) && !adviceexecution() {\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, long): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude());\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && (within(IgnitedLocationChangedReceiver) || within(com.github.ignition.location.utils.*)\n                || within(IgnitedLastKnownLocationAsyncTask)) && !adviceexecution() {\n\n        if (context == null) {\n            return;\n        }\n        final Activity activity = (Activity) context;\n        if (freshLocation == null) {\n            activity.showDialog(R.id.ign_loc_dialog_wait_for_fix);\n            return;\n        }\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, long): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude());\n        boolean keepRequestingLocationUpdates = ((OnIgnitedLocationChangedListener) context)\n                .onIgnitedLocationChanged(currentLocation);\n        if (!keepRequestingLocationUpdates) {\n            if (!locationUpdatesDisabled) {\n                disableLocationUpdates(true);\n            }\n            PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            return;\n                && locationUpdatesDisabled\n        } else if (requestLocationUpdates\n                && !freshLocation.getExtras().getBoolean(\n                        ILastLocationFinder.LAST_LOCATION_TOO_OLD_EXTRA)) {\n            \/\/ If we requested location updates, turn them on here.\n            requestLocationUpdates(context);\n        }\n\n        \/\/ If gps is enabled location comes from gps, remove runnable that removes gps updates\n        boolean lastLocation = freshLocation.getExtras().getBoolean(\n                IgnitedLocationConstants.IGNITED_LAST_LOCATION_EXTRA);\n        if (!lastLocation && defaultCriteria.getAccuracy() == Criteria.ACCURACY_FINE\n                && currentLocation.getProvider().equals(LocationManager.GPS_PROVIDER)) {\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n    }\n\n    \/**\n     * Start listening for location updates.\n     *\/\n    protected void requestLocationUpdates(Context context) {\n        Criteria locationUpdateCriteria;\n        if (isBatteryOk()) {\n            locationUpdateCriteria = defaultCriteria;\n        } else {\n            locationUpdateCriteria = lowBatteryConsumptionCriteria();\n        }\n\n        Log.d(LOG_TAG, \"Disabling passive location updates\");\n        locationManager.removeUpdates(locationListenerPassivePendingIntent);\n\n        Log.d(LOG_TAG, \"Requesting location updates\");\n        \/\/ Normal updates while activity is visible.\n        locationUpdateRequester.requestLocationUpdates(locationUpdatesInterval,\n                locationUpdatesDistanceDiff, locationUpdateCriteria, locationListenerPendingIntent);\n\n        \/\/ Register a receiver that listens for when the provider I'm using has\n        \/\/ been disabled.\n        IntentFilter locationProviderDisabledIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_PROVIDER_DISABLED_ACTION);\n        context.registerReceiver(locationProviderDisabledReceiver,\n                locationProviderDisabledIntentFilter);\n\n        IntentFilter refreshLocationUpdatesIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.UPDATE_LOCATION_UPDATES_CRITERIA_ACTION);\n        context.registerReceiver(refreshLocationUpdatesReceiver, refreshLocationUpdatesIntentFilter);\n\n        \/\/ Register a receiver that listens for when a better provider than I'm\n        \/\/ using becomes available.\n        String bestProvider = locationManager.getBestProvider(locationUpdateCriteria, false);\n        String bestAvailableProvider = locationManager.getBestProvider(locationUpdateCriteria, true);\n        if (bestProvider != null && !bestProvider.equals(bestAvailableProvider)) {\n            bestInactiveLocationProviderListener = new IgnitedLocationListener(context);\n            locationManager.requestLocationUpdates(bestProvider, 0, 0,\n                    bestInactiveLocationProviderListener, context.getMainLooper());\n        }\n\n        if (bestAvailableProvider.equals(LocationManager.GPS_PROVIDER)) {\n            Log.d(LOG_TAG, \"Posting delayed remove GPS updates message\");\n            \/\/ Post a runnable that will remove gps updates if no gps location is returned after 1\n            \/\/ minute in order to avoid draining the battery.\n            handler.postDelayed(removeGpsUpdates, prefs.getLong(\n                    IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                    IgnitedLocationConstants.WAIT_FOR_GPS_FIX_INTERVAL_DEFAULT));\n        }\n\n        locationUpdatesDisabled = false;\n    }\n\n    \/**\n     * Stop listening for location updates\n     * \n     * @param enablePassiveLocationUpdates\n     *\/\n    protected void disableLocationUpdates(boolean requestPassiveLocationUpdates) {\n        if (locationUpdatesDisabled) {\n            return;\n        }\n\n        Log.d(LOG_TAG, \"Disabling location updates\");\n        context.unregisterReceiver(locationProviderDisabledReceiver);\n        context.unregisterReceiver(refreshLocationUpdatesReceiver);\n\n        locationUpdateRequester.removeLocationUpdates();\n        if (bestInactiveLocationProviderListener != null) {\n            locationManager.removeUpdates(bestInactiveLocationProviderListener);\n        }\n\n        boolean finishing = ((Activity) context).isFinishing();\n\n        if (requestPassiveLocationUpdates && !finishing) {\n            requestPassiveLocationUpdates();\n        }\n\n        locationUpdatesDisabled = true;\n    }\n\n    private void requestPassiveLocationUpdates() {\n        if (IgnitedDiagnostics.SUPPORTS_FROYO\n                && prefs.getBoolean(\n                        IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                        IgnitedLocationConstants.ENABLE_PASSIVE_LOCATION_UPDATES_DEFAULT)) {\n            Log.d(LOG_TAG, \"Requesting passive location updates\");\n            \/\/ Passive location updates from 3rd party apps when the Activity isn't\n            \/\/ visible. Only for Android 2.2+.\n            locationUpdateRequester.requestPassiveLocationUpdates(passiveLocationUpdatesInterval,\n                    passiveLocationUpdatesDistanceDiff, locationListenerPassivePendingIntent);\n        }\n    }\n\n    public boolean isLocationUpdatesDisabled() {\n        return locationUpdatesDisabled;\n    }\n\n    public Criteria lowBatteryConsumptionCriteria() {\n        Criteria criteria = new Criteria();\n        criteria.setPowerRequirement(Criteria.POWER_LOW);\n        criteria.setAccuracy(Criteria.NO_REQUIREMENT);\n        return criteria;\n    }\n\n    \/**\n     * If the best Location Provider (usually GPS) is not available when we request location\n     * updates, this listener will be notified if \/ when it becomes available. It calls\n     * requestLocationUpdates to re-register the location listeners using the better Location\n     * Provider.\n     *\/\n    private class IgnitedLocationListener implements LocationListener {\n        private Context context;\n\n        public IgnitedLocationListener(Context appContext) {\n            this.context = appContext;\n        }\n\n        @Override\n        public void onLocationChanged(Location l) {\n        }\n\n        @Override\n        public void onProviderDisabled(String provider) {\n        }\n\n        @Override\n        public void onStatusChanged(String provider, int status, Bundle extras) {\n        }\n\n        @Override\n        public void onProviderEnabled(String provider) {\n            \/\/ Re-register the location listeners using the better Location\n            \/\/ Provider.\n            disableLocationUpdates(false);\n            requestLocationUpdates(context);\n        }\n    }\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"c093c2606cb6223748c189e295b403bbdc3072fd","subject":"Changed heartbeat event","message":"Changed heartbeat event\n","repos":"Aloja\/AOP4Hadoop","old_file":"src\/1.0.3\/Aspectj.aj","new_file":"src\/1.0.3\/Aspectj.aj","new_contents":"import java.io.*;\nimport java.util.*;\nimport java.lang.management.ManagementFactory;\nimport java.sql.Timestamp;\nimport java.text.SimpleDateFormat;\nimport java.net.InetAddress;\nimport java.lang.ClassLoader;\nimport org.apache.hadoop.io.DataInputBuffer;\nimport org.apache.hadoop.mapred.TaskStatus;\nimport org.apache.hadoop.fs.permission.FsPermission;\nimport org.apache.hadoop.util.Progressable;\nimport org.apache.hadoop.hdfs.protocol.DatanodeInfo;\nimport org.apache.hadoop.util.DataChecksum;\nimport java.net.Socket;\n\n\nimport org.apache.hadoop.security.token.Token;\nimport org.apache.hadoop.security.token.TokenIdentifier;\nimport org.apache.hadoop.hdfs.security.token.block.BlockTokenIdentifier;\n\n\nimport org.apache.hadoop.fs.FSDataInputStream;\nimport org.apache.hadoop.hdfs.DFSClient;\n\nimport org.apache.hadoop.mapred.TaskTrackerStatus;\n\nimport org.apache.commons.logging.Log;\nimport org.apache.commons.logging.LogFactory;\n\n\nimport org.apache.hadoop.conf.Configuration;\n\n\n\n\n\n\n\/**\n *\n * @author Alejandro\n *\/\n\naspect AlojaAspect {\t\t\n\n\tprivate static final Log LOG = LogFactory.getLog(AlojaAspect.class);\n\n\t\/*\n\tTYPES\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\n    public static class Events {\n\n        public static final int JobTracker = 11111;\n        public static final int TaskTracker = 11112;\n        public static final int NameNode = 11113;\n        public static final int SecondaryNameNode = 11114;\n        public static final int DataNode = 11115;\n        public static final int Task = 11116;\n        public static final int HeartBeat = 11119;\n\/\/        public static final int MapTask = 11117;\n\/\/        public static final int ReduceTask = 11118;\n        public static final int MapOutputBuffer = 33333;\n        public static final int MapTaskOutputSize = 44444;\n    }\n\n    public static class Values {\n\n       \t\/\/ Generic\n\t\tpublic static final int End = 0;        \n        public static final int Start = 1;\n        \n        \/\/ Events.TaskTracker \n\t\tpublic static final int RunMapper = 8;\n        public static final int RunReducer = 9;\n        public static final int ReducerCopyPhase = 10;\n        public static final int ReducerSortPhase = 11;\n        public static final int ReducerReducePhase = 12;\n\n\t\t\/\/ Events.MapOutputBuffer\n        public static final int Flush = 1;\n        public static final int SortAndSpill = 2;\n        public static final int Sort = 3;        \n        public static final int CreateSpillIndexFile = 5;\n        \/\/public static final int TotalIndexCacheMemory = 6;\n        public static final int SpillRecordDumped = 7;\n        public static final int Combine = 4;\n    }    \n\n\n\t\/*\n\tFUNCTIONS\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\t\n\tprivate static long getPID() {\n\t\tString name = java.lang.management.ManagementFactory.getRuntimeMXBean().getName();\n\t\treturn Long.parseLong(name.split(\"@\")[0]);\n\t}\n\n\tprivate void generateEvent(Integer key, Integer value) {\n\t\t\/\/2:cpu:app:task:thread:time:type:value\n\t\ttry{\n\t\t\tString hostname = InetAddress.getLocalHost().getHostName();\n\t\t\tlong pid = getPID();\n\t\t\tLOG.info(hostname+\",\"+pid+\",2:\"+hostname+\":2:\"+pid+\":1:\"+System.currentTimeMillis()+\":\"+key+\":\"+value);\n\t\t}\n\t\tcatch (Exception e) {\n\t\t\tLOG.error(e, e);\n\n\t\t}\n\t}\n\n\n\tprivate void generateEvent(Integer key, String value) {\n\t\t\/\/2:cpu:app:task:thread:time:type:value\n\t\ttry{\n\t\t\tString hostname = InetAddress.getLocalHost().getHostName();\n\t\t\tlong pid = getPID();\n\t\t\tLOG.info(hostname+\",\"+pid+\",2:\"+hostname+\":2:\"+pid+\":1:\"+System.currentTimeMillis()+\":\"+key+\":\"+value);\n\t\t}\n\t\tcatch (Exception e) {\n\t\t\tLOG.error(e, e);\n\n\t\t}\n\t}\n\n\n\t\/*private void generateEVent(Integer key[], Integer value) {\n\n\t\tStringBuffer output = new StringBuffer();\n\n\n\t\toutput.append()\n\n\t}*\/\n\n\tprivate void instrumentation(String event, String when) {\n\n\t\tinstrumentation(event, when, \"\");\n\n\t}\n\tprivate void instrumentation(String event, String when, String additional) {\n\t\ttry {\n\t\t\t\/\/Add hostname\n\t\t\tString log = InetAddress.getLocalHost().getHostName();\n\t\t\t\/\/Add PID \n\t\t\tlog += \",\" + getPID();\n\t\t\t\/\/Specify event\n\t\t\tlog += \",\" + when + \",\" + event;\n\t\t\t\/\/Specify event\n\t\t\tlog += additional;\n\t\t\t\/\/LOG.info(log);\n\t\t\t\/\/writeLog(logFile,log);\n\n\n\t\t}\n\t\tcatch (IOException e) {\n\t\t\te.printStackTrace();\n\t\t}\n\t}\n\n\n\t\/*\n\tPOINTCUTS\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\n\t\/\/RegisterDataNode Pointcut\n\n\tpointcut startDataNode(): execution(* org.apache.hadoop.hdfs.server.datanode.DataNode.startDataNode(..));\n\n\t\/\/RegisterNameNode Pointcut\n\n\tpointcut initializeNameNode():  execution(* org.apache.hadoop.hdfs.server.namenode.NameNode.initialize(..));\n\n\t\/\/RegisterSecondaryNamenode Pointcut\n\n\tpointcut initializeSecondaryNameNode(): execution(* org.apache.hadoop.hdfs.server.namenode.SecondaryNameNode.initialize(..));\n\n\t\/\/RegisterTask - CHILD\n\n\t\/\/pointcut initializeChild(): call(* org.apache.hadoop.mapred.Child.initMetrics(..)) && withincode(* org.apache.hadoop.mapred.Child.main(..)); \n\n\tpointcut initializeChild(): execution(* org.apache.hadoop.mapred.Child.main(..)); \n\n\t\/\/Register JobTracker Pointcut\n\n\tpointcut registerJobTracker(): execution(* org.apache.hadoop.mapred.JobTracker.startTracker(..));\n\n\t\/\/HEARTBEAT\n\n\tpointcut heartbeat(TaskTrackerStatus status,boolean restarted,boolean initialContact,boolean acceptNewTasks,short responseId): execution(* org.apache.hadoop.mapred.JobTracker.heartbeat(..)) && args(status, restarted, initialContact, acceptNewTasks,responseId);\n\n\t\/*\n\t\t###########################################################################\n\t\t############################Task###########################################\n\t\t###########################################################################\n\t*\/\n\n\n\tpointcut outputSize(): call (* *.getLen(..)) && withincode(* org.apache.hadoop.mapred.Task.calculateOutputSize());\n\n\t\/*\n\t\t###########################################################################\n\t\t############################MAPPER#########################################\n\t\t###########################################################################\n\t*\/\n\n\t\/\/pointcut maptask(): execution(* org.apache.hadoop.mapred.MapTask.run(..));\n\tpointcut mapper(): call(* org.apache.hadoop.mapred.MapTask.runNewMapper(..)) && withincode(* org.apache.hadoop.mapred.MapTask.run(..));\n\n\n\t\/\/  ############################SORT AND SPILL#################################\n\n\t\/\/Start-End\n\tpointcut taskSortAndSpill(): execution(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\n\tpointcut flush(): execution(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.flush());\n\n\t\/\/Spill File Size\n\tpointcut sortAndSpillSpillFile(int numSpills, long size) : call (* *.getSpillFileForWrite(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(numSpills, size);\n\n\t\/\/SpillIndex File Size\n\tpointcut sortAndSpillSpillIndexFile(int numSpills, long partitions) : call (* *.getSpillIndexFileForWrite(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(numSpills, partitions);\n\n\t\/\/Sort \n\tpointcut sortAndSpillSort(int kvstart, int endPosition, Object reporter): call(* *.sort(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(..,kvstart,endPosition,reporter);\n\n\t\/\/Init Writer\n\t\/\/pointcut sortAndSpillInitWriter() : call (org.apache.hadoop.mapred.IFile.Writer.new(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Close Writer\n\t\/\/pointcut sortAndSpillCloseWriter() : call (void org.apache.hadoop.mapred.IFile.Writer.close(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Write key-value\n\tpointcut sortAndSpillWrite(DataInputBuffer key, DataInputBuffer value): call (* *.append(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(key,value);\n\t\n\t\/\/Combiner\n\tpointcut sortAndSpillCombiner(): call(* *.combine(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Spill Index File\n\tpointcut sortAndSpillSpillIndexWrite(): call(* *.writeToFile(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/*\n\t\t###########################################################################\n\t\t############################REDUCER########################################\n\t\t###########################################################################\n\t*\/\n\n\t\/\/REDUCETASK RUN\n\tpointcut reducer(): execution(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\tpointcut initCodec(): call(* *.initCodec(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\tpointcut setPhase(TaskStatus.Phase phase): call(* *.setPhase(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..)) && args(phase);\n\n\t\n\t\/\/pointcut endCopy(): call(* *.setPhase(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\t\/\/pointcut endSort(): call(* *.getMapOutputKeyClass(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\t\n\n\t\/*\n\t\t###########################################################################\n\t\t############################NETWORK########################################\n\t\t###########################################################################\n\t*\/\n\n\tpointcut defaultBlockSize(): call(* org.apache.hadoop.hdfs.DFSClient.getDefaultBlockSize());\n\t\/\/pointcut blockSize(): call(* org.apache.hadoop.hdfs.DFSClient.getBlockSize(..));\n\tpointcut createDFSFile(String src,FsPermission permission,boolean overwrite,boolean createParent,short replication,long blockSize,Progressable progress, int buffersize): execution (* org.apache.hadoop.hdfs.DFSClient.create(..)) && args(src,permission,overwrite,createParent,replication,blockSize,progress,buffersize);\n\tpointcut runDataStreamer(): execution (* org.apache.hadoop.hdfs.DFSClient.DFSOutputStream.DataStreamer.run());\n\t\/\/pointcut readEntireBufferFromDataNode(byte buf[],int off,int len): execution(* org.apache.hadoop.hdfs.DFSClient.DFSInputStream.read(..)) && args(buf[],off,len);\n\t\/\/pointcut readFromDataNode(): call (* org.apache.hadoop.hdfs.DFSClient.DFSInputStream.blockSeekTo(..)) && withincode(* org.apache.hadoop.hdfs.DFSClient.DFSInputStream.read(..));\n\tpointcut newBlockReader(Socket sock, String file, long blockId, Token<BlockTokenIdentifier> accessToken, long genStamp, long startOffset, long len, int bufferSize, boolean verifyChecksum, String clientName): execution (* org.apache.hadoop.hdfs.DFSClient.BlockReader.newBlockReader(..)) && args(sock,file,blockId,accessToken,genStamp,startOffset,len,bufferSize,verifyChecksum,clientName);\n\n\t\/*\n\tAdvices\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\n\t\/\/ RegiterJobTracker\n\n\tafter() : registerJobTracker(){\n\t\tgenerateEvent(Events.JobTracker, Values.Start);\n\n\t}\n\n\t\/\/RegisterTaskTracker ?\n\n\n\t\/\/RegisterNameNode\n\n\tafter() : initializeNameNode(){\n\t\tgenerateEvent(Events.NameNode, Values.Start);\n\t}\n\n\t\/\/RegisterDataNode \n\n\tafter() : startDataNode(){\n\t\tgenerateEvent(Events.DataNode, Values.Start);\n\t}\n\n\n\t\/\/RegisterSecondaryNamenode\n\n\tafter() : initializeSecondaryNameNode(){\n\t\tgenerateEvent(Events.SecondaryNameNode, Values.Start);\n\t}\n\n\n\t\/\/HEARTBEAT \n\tafter(TaskTrackerStatus status,boolean restarted,boolean initialContact,boolean acceptNewTasks,short responseId) : heartbeat(status, restarted, initialContact, acceptNewTasks,responseId){\n\t\t\/\/ SAMPLE trackername: tracker_vagrant-99-01:localhost\/127.0.0.1:38149\n\t\tgenerateEvent(Events.HeartBeat, status.getTrackerName().replace(':','-').replace('\/','_'));\n\t}\n\n\n\t\/*\n\t\t###########################################################################\n\t\t############################Task###########################################\n\t\t###########################################################################\n\t*\/\n\n\t\/\/RegisterTask CHILD \n\tafter() : initializeChild() { \/\/We need the  PID of this task to be registered\n\t\tgenerateEvent(Events.Task, Values.Start);\n\t}\n\n\n\/*\tafter() returning(long size) : outputSize() {\n\t\tString s = \"Task-outputSize\";\n\t\tinstrumentation(s,\"after\",\", size: \" + Long.toString(size));\n\t}\n\n\t\/*\n\t\t###########################################################################\n\t\t############################Mapper#########################################\n\t\t###########################################################################\n\t*\/\n\n\n\t\/*before() : maptask(){\n\t\tgenerateEvent(Events.MapTask, Values.Start);\n\t}*\/\n\n\tbefore() : mapper(){\n\t\tgenerateEvent(Events.TaskTracker, Values.RunMapper);\n\t}\n\n\tafter() : mapper(){\n\t\tgenerateEvent(Events.TaskTracker, Values.End);\n\t}\n\n\n\t\n\n\t\/\/  ############################SORT AND SPILL#################################\n\n\tbefore() : taskSortAndSpill(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.SortAndSpill);\n\t}\n\n\n\tafter() : taskSortAndSpill(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\n\t}\n\n\t\/\/flush\n\n\tbefore() : flush(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.Flush);\n\t}\n\n\tafter() : flush(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\n\t}\n\n\n\n\t\/\/ Spill File Size\n\n\tafter(int numSpills, long size) returning : sortAndSpillSpillFile(numSpills, size){\n\t\tString s = \"sortAndSpillSpillFile\";\n\t\tinstrumentation(s,\"after\",\", numSpills: \" +Integer.toString(numSpills) + \";size: \" + Long.toString((size*numSpills) + size));\n\t}\n\n\t\/\/ SpillIndex File Size\n\n\tafter(int numSpills, long partitions) returning : sortAndSpillSpillIndexFile(numSpills, partitions){\n\t\tString s = \"sortAndSpillSpillIndexFile\";\n\t\tinstrumentation(s,\"after\",\",\" + Long.toString(numSpills * partitions));\n\t}\n\n\/*\n\tbefore(int length) : kvbufferState(length){\n\n\t\tString s = \"kvbufferState\";\n\t\tFile logFile = getFile();\n\t\tinstrumentation(logFile,s,\"before\");\n\t\twriteLog(logFile,Integer.toString(length));\n\t}\n\n*\/\n\n\tbefore(int kvstart, int endPosition, Object reporter) : sortAndSpillSort(kvstart,endPosition,reporter){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.Sort);\n\t\t\/\/instrumentation(s,\"before\",\",\" + Integer.toString(endPosition - kvstart));\n\t}\n\tafter(int kvstart, int endPosition, Object reporter) returning : sortAndSpillSort(kvstart,endPosition,reporter){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\n\t\t\/\/instrumentation(s,\"after\",\",\" + Integer.toString(endPosition - kvstart));\n\t}\n\n\t\/\/ Init writer\n\/*\tafter() returning : sortAndSpillInitWriter(){\n\t\tString s = \"sortAndSpillInitWriter\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\t\/\/ Close writer\n\tafter() returning : sortAndSpillCloseWriter(){\n\t\tString s = \"sortAndSpillCloseWriter\";\n\t\tinstrumentation(s,\"after\");\n\t}\n*\/\n\n\tafter(DataInputBuffer key, DataInputBuffer value) returning : sortAndSpillWrite(key,value){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.SpillRecordDumped);\n\t}\n\n\tbefore() : sortAndSpillCombiner(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.Combine);\n\t}\n\n\tafter() returning : sortAndSpillCombiner(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\t\n\t}\n\n\tbefore() : sortAndSpillSpillIndexWrite(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.CreateSpillIndexFile);\n\t}\n\n\tafter() returning : sortAndSpillSpillIndexWrite(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\n\t}\n\n\t\/*\n\t\t###########################################################################\n\t\t############################REDUCER########################################\n\t\t###########################################################################\n\t*\/\n\n\/*\tbefore() : reducer(){\n\t\tString s = \"Reducer\";\n\t\tinstrumentation(s,\"before\");\n\t}\n*\/\n\n\tbefore() : initCodec() {\n\t\tgenerateEvent(Events.TaskTracker, Values.RunReducer);\n\t}\n\n\n\tafter() returning : initCodec() {\n\t\tgenerateEvent(Events.TaskTracker, Values.ReducerCopyPhase);\n\t}\n\n\tbefore(TaskStatus.Phase phase) : setPhase(phase) { \/\/END OF A PHASE (SORT OR COPY)\n\t\t\tgenerateEvent(Events.TaskTracker, Values.End);\n\t}\n\n\tafter(TaskStatus.Phase phase) returning: setPhase(phase) { \n\t\tif (phase == TaskStatus.Phase.SORT) {\n\t\t\tgenerateEvent(Events.TaskTracker, Values.ReducerSortPhase);\n\t\t}\n\t\telse if (phase == TaskStatus.Phase.REDUCE) {\n\t\t\tgenerateEvent(Events.TaskTracker, Values.ReducerReducePhase);\n\t\t}\n\t}\n\n\tafter() : reducer(){ \/\/END OF REDUCE PHASE\n\t\t\tgenerateEvent(Events.TaskTracker, Values.End);\t}\n\n\t\/*\n\t\t###########################################################################\n\t\t############################NETWORK########################################\n\t\t###########################################################################\n\t*\/\n\n\tafter() returning(long blockSize) : defaultBlockSize() {\n\t\tString s = \"Network-defaultBlockSize\";\n\t\tinstrumentation(s,\"after\",\", size: \" + Long.toString(blockSize));\n\t}\n\t\/\/ after() returning(long blockSize) : blockSize() {\n\t\/\/ \tString s = \"Network-blockSize\";\n\t\/\/ \tFile logFile = getFile();\n\t\/\/ \tinstrumentation(logFile,s,\"after\");\n\t\/\/ \tString log = \", size: \" + Long.toString(blockSize);\n\t\/\/ \twriteLog(logFile,log);\n\t\/\/ }\n\n\tafter(String src,FsPermission permission,boolean overwrite, boolean createParent,short replication,long blockSize,Progressable progress, int buffersize): createDFSFile(src,permission,overwrite,createParent,replication,blockSize,progress,buffersize) {\n\t\tString s = \"Network-CreateDFSFile\";\n\n\t\t\/\/MODIFIED!!!!!!-----!!!!!!!!!!!\n\t\tinstrumentation(s,\"after\",\", path: \" + src + \";permission: \" + permission.toString() + \";overwrite: \" + String.valueOf(overwrite) + \";createParent: \" + String.valueOf(createParent) + \";replication: \" + Short.toString(replication) + \";blockSize: \" + Long.toString(blockSize) + \";buffersize: \" + Integer.toString(buffersize));\n\t}\n\tbefore(): runDataStreamer() {\n\t\tString s = \"DataStreamer\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\t\/\/ before(byte buf[],int off, int len) : readEntireBufferFromDataNode(buf[],off,len){\n\t\/\/ \tString s = \"Network-ReadEntireBuffer\";\n\t\/\/ \tinstrumentation(s,\"after\",\", bufferLength: \" + Integer.toString(len));\n\t\/\/ }\n\n\t\/\/ after() returning(DatanodeInfo datanode) : readFromDataNode(){\n\t\/\/ \tString s = \"Network-fromDataNode\";\n\t\/\/ \tinstrumentation(s,\"after\", \", from : \" + datanode.getHostName());\n\t\/\/ }\n\n\tafter(Socket sock, String file, long blockId, Token<BlockTokenIdentifier> accessToken, long genStamp, long startOffset, long len, int bufferSize, boolean verifyChecksum, String clientName) : newBlockReader(sock,file,blockId,accessToken,genStamp,startOffset,len,bufferSize,verifyChecksum,clientName) {\n\t\tString s = \"Network-NewBlockReader\";\n\t\tString extra = \", DataNode: \" + sock.getInetAddress().getCanonicalHostName();\n\t\textra += \";file: \" + file;\n\t\t\/\/extra += \", length: \" + Long.toString(len) + \"B\";\n\t\textra += \";\" + Long.toString(len);\n\t\textra += \";blockId: \" + Long.toString(blockId);\n\t\textra += \";startOffset: \" + Long.toString(startOffset);\t\t\n\t\tinstrumentation(s,\"after\",extra);\n\t}\n}\n\n\n\n\n","old_contents":"import java.io.*;\nimport java.util.*;\nimport java.lang.management.ManagementFactory;\nimport java.sql.Timestamp;\nimport java.text.SimpleDateFormat;\nimport java.net.InetAddress;\nimport java.lang.ClassLoader;\nimport org.apache.hadoop.io.DataInputBuffer;\nimport org.apache.hadoop.mapred.TaskStatus;\nimport org.apache.hadoop.fs.permission.FsPermission;\nimport org.apache.hadoop.util.Progressable;\nimport org.apache.hadoop.hdfs.protocol.DatanodeInfo;\nimport org.apache.hadoop.util.DataChecksum;\nimport java.net.Socket;\n\n\nimport org.apache.hadoop.security.token.Token;\nimport org.apache.hadoop.security.token.TokenIdentifier;\nimport org.apache.hadoop.hdfs.security.token.block.BlockTokenIdentifier;\n\n\nimport org.apache.hadoop.fs.FSDataInputStream;\nimport org.apache.hadoop.hdfs.DFSClient;\n\nimport org.apache.hadoop.mapred.TaskTrackerStatus;\n\nimport org.apache.commons.logging.Log;\nimport org.apache.commons.logging.LogFactory;\n\n\nimport org.apache.hadoop.conf.Configuration;\n\n\n\n\n\n\n\/**\n *\n * @author Alejandro\n *\/\n\naspect AlojaAspect {\t\t\n\n\tprivate static final Log LOG = LogFactory.getLog(AlojaAspect.class);\n\n\t\/*\n\tTYPES\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\n    public static class Events {\n\n        public static final int JobTracker = 11111;\n        public static final int TaskTracker = 11112;\n        public static final int NameNode = 11113;\n        public static final int SecondaryNameNode = 11114;\n        public static final int DataNode = 11115;\n        public static final int Task = 11116;\n\/\/        public static final int MapTask = 11117;\n\/\/        public static final int ReduceTask = 11118;\n        public static final int MapOutputBuffer = 33333;\n        public static final int MapTaskOutputSize = 44444;\n    }\n\n    public static class Values {\n\n       \t\/\/ Generic\n\t\tpublic static final int End = 0;        \n        public static final int Start = 1;\n        \n        \/\/ Events.TaskTracker \n\t\tpublic static final int RunMapper = 8;\n        public static final int RunReducer = 9;\n        public static final int ReducerCopyPhase = 10;\n        public static final int ReducerSortPhase = 11;\n        public static final int ReducerReducePhase = 12;\n\n\t\t\/\/ Events.JobTracker\n\t\tpublic static final int HeartBeat = 13;\n\n\n\t\t\/\/ Events.MapOutputBuffer\n        public static final int Flush = 1;\n        public static final int SortAndSpill = 2;\n        public static final int Sort = 3;        \n        public static final int CreateSpillIndexFile = 5;\n        \/\/public static final int TotalIndexCacheMemory = 6;\n        public static final int SpillRecordDumped = 7;\n        public static final int Combine = 4;\n    }    \n\n\n\t\/*\n\tFUNCTIONS\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\t\n\tprivate static long getPID() {\n\t\tString name = java.lang.management.ManagementFactory.getRuntimeMXBean().getName();\n\t\treturn Long.parseLong(name.split(\"@\")[0]);\n\t}\n\n\tprivate void generateEvent(Integer key, Integer value) {\n\t\t\/\/2:cpu:app:task:thread:time:type:value\n\t\ttry{\n\t\t\tString hostname = InetAddress.getLocalHost().getHostName();\n\t\t\tlong pid = getPID();\n\t\t\tLOG.info(hostname+\",\"+pid+\",2:\"+hostname+\":2:\"+pid+\":1:\"+System.currentTimeMillis()+\":\"+key+\":\"+value);\n\t\t}\n\t\tcatch (Exception e) {\n\t\t\tLOG.error(e, e);\n\n\t\t}\n\t}\n\n\n\tprivate void generateEvent(Integer key, String value) {\n\t\t\/\/2:cpu:app:task:thread:time:type:value\n\t\ttry{\n\t\t\tString hostname = InetAddress.getLocalHost().getHostName();\n\t\t\tlong pid = getPID();\n\t\t\tLOG.info(hostname+\",\"+pid+\",2:\"+hostname+\":2:\"+pid+\":1:\"+System.currentTimeMillis()+\":\"+key+\":\"+value);\n\t\t}\n\t\tcatch (Exception e) {\n\t\t\tLOG.error(e, e);\n\n\t\t}\n\t}\n\n\n\t\/*private void generateEVent(Integer key[], Integer value) {\n\n\t\tStringBuffer output = new StringBuffer();\n\n\n\t\toutput.append()\n\n\t}*\/\n\n\tprivate void instrumentation(String event, String when) {\n\n\t\tinstrumentation(event, when, \"\");\n\n\t}\n\tprivate void instrumentation(String event, String when, String additional) {\n\t\ttry {\n\t\t\t\/\/Add hostname\n\t\t\tString log = InetAddress.getLocalHost().getHostName();\n\t\t\t\/\/Add PID \n\t\t\tlog += \",\" + getPID();\n\t\t\t\/\/Specify event\n\t\t\tlog += \",\" + when + \",\" + event;\n\t\t\t\/\/Specify event\n\t\t\tlog += additional;\n\t\t\t\/\/LOG.info(log);\n\t\t\t\/\/writeLog(logFile,log);\n\n\n\t\t}\n\t\tcatch (IOException e) {\n\t\t\te.printStackTrace();\n\t\t}\n\t}\n\n\n\t\/*\n\tPOINTCUTS\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\n\t\/\/RegisterDataNode Pointcut\n\n\tpointcut startDataNode(): execution(* org.apache.hadoop.hdfs.server.datanode.DataNode.startDataNode(..));\n\n\t\/\/RegisterNameNode Pointcut\n\n\tpointcut initializeNameNode():  execution(* org.apache.hadoop.hdfs.server.namenode.NameNode.initialize(..));\n\n\t\/\/RegisterSecondaryNamenode Pointcut\n\n\tpointcut initializeSecondaryNameNode(): execution(* org.apache.hadoop.hdfs.server.namenode.SecondaryNameNode.initialize(..));\n\n\t\/\/RegisterTask - CHILD\n\n\t\/\/pointcut initializeChild(): call(* org.apache.hadoop.mapred.Child.initMetrics(..)) && withincode(* org.apache.hadoop.mapred.Child.main(..)); \n\n\tpointcut initializeChild(): execution(* org.apache.hadoop.mapred.Child.main(..)); \n\n\t\/\/Register JobTracker Pointcut\n\n\tpointcut registerJobTracker(): execution(* org.apache.hadoop.mapred.JobTracker.startTracker(..));\n\n\t\/\/HEARTBEAT\n\n\tpointcut heartbeat(TaskTrackerStatus status,boolean restarted,boolean initialContact,boolean acceptNewTasks,short responseId): execution(* org.apache.hadoop.mapred.JobTracker.heartbeat(..)) && args(status, restarted, initialContact, acceptNewTasks,responseId);\n\n\t\/*\n\t\t###########################################################################\n\t\t############################Task###########################################\n\t\t###########################################################################\n\t*\/\n\n\n\tpointcut outputSize(): call (* *.getLen(..)) && withincode(* org.apache.hadoop.mapred.Task.calculateOutputSize());\n\n\t\/*\n\t\t###########################################################################\n\t\t############################MAPPER#########################################\n\t\t###########################################################################\n\t*\/\n\n\t\/\/pointcut maptask(): execution(* org.apache.hadoop.mapred.MapTask.run(..));\n\tpointcut mapper(): call(* org.apache.hadoop.mapred.MapTask.runNewMapper(..)) && withincode(* org.apache.hadoop.mapred.MapTask.run(..));\n\n\n\t\/\/  ############################SORT AND SPILL#################################\n\n\t\/\/Start-End\n\tpointcut taskSortAndSpill(): execution(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\n\tpointcut flush(): execution(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.flush());\n\n\t\/\/Spill File Size\n\tpointcut sortAndSpillSpillFile(int numSpills, long size) : call (* *.getSpillFileForWrite(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(numSpills, size);\n\n\t\/\/SpillIndex File Size\n\tpointcut sortAndSpillSpillIndexFile(int numSpills, long partitions) : call (* *.getSpillIndexFileForWrite(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(numSpills, partitions);\n\n\t\/\/Sort \n\tpointcut sortAndSpillSort(int kvstart, int endPosition, Object reporter): call(* *.sort(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(..,kvstart,endPosition,reporter);\n\n\t\/\/Init Writer\n\t\/\/pointcut sortAndSpillInitWriter() : call (org.apache.hadoop.mapred.IFile.Writer.new(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Close Writer\n\t\/\/pointcut sortAndSpillCloseWriter() : call (void org.apache.hadoop.mapred.IFile.Writer.close(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Write key-value\n\tpointcut sortAndSpillWrite(DataInputBuffer key, DataInputBuffer value): call (* *.append(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(key,value);\n\t\n\t\/\/Combiner\n\tpointcut sortAndSpillCombiner(): call(* *.combine(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Spill Index File\n\tpointcut sortAndSpillSpillIndexWrite(): call(* *.writeToFile(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/*\n\t\t###########################################################################\n\t\t############################REDUCER########################################\n\t\t###########################################################################\n\t*\/\n\n\t\/\/REDUCETASK RUN\n\tpointcut reducer(): execution(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\tpointcut initCodec(): call(* *.initCodec(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\tpointcut setPhase(TaskStatus.Phase phase): call(* *.setPhase(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..)) && args(phase);\n\n\t\n\t\/\/pointcut endCopy(): call(* *.setPhase(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\t\/\/pointcut endSort(): call(* *.getMapOutputKeyClass(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\t\n\n\t\/*\n\t\t###########################################################################\n\t\t############################NETWORK########################################\n\t\t###########################################################################\n\t*\/\n\n\tpointcut defaultBlockSize(): call(* org.apache.hadoop.hdfs.DFSClient.getDefaultBlockSize());\n\t\/\/pointcut blockSize(): call(* org.apache.hadoop.hdfs.DFSClient.getBlockSize(..));\n\tpointcut createDFSFile(String src,FsPermission permission,boolean overwrite,boolean createParent,short replication,long blockSize,Progressable progress, int buffersize): execution (* org.apache.hadoop.hdfs.DFSClient.create(..)) && args(src,permission,overwrite,createParent,replication,blockSize,progress,buffersize);\n\tpointcut runDataStreamer(): execution (* org.apache.hadoop.hdfs.DFSClient.DFSOutputStream.DataStreamer.run());\n\t\/\/pointcut readEntireBufferFromDataNode(byte buf[],int off,int len): execution(* org.apache.hadoop.hdfs.DFSClient.DFSInputStream.read(..)) && args(buf[],off,len);\n\t\/\/pointcut readFromDataNode(): call (* org.apache.hadoop.hdfs.DFSClient.DFSInputStream.blockSeekTo(..)) && withincode(* org.apache.hadoop.hdfs.DFSClient.DFSInputStream.read(..));\n\tpointcut newBlockReader(Socket sock, String file, long blockId, Token<BlockTokenIdentifier> accessToken, long genStamp, long startOffset, long len, int bufferSize, boolean verifyChecksum, String clientName): execution (* org.apache.hadoop.hdfs.DFSClient.BlockReader.newBlockReader(..)) && args(sock,file,blockId,accessToken,genStamp,startOffset,len,bufferSize,verifyChecksum,clientName);\n\n\t\/*\n\tAdvices\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\n\t\/\/ RegiterJobTracker\n\n\tafter() : registerJobTracker(){\n\t\tgenerateEvent(Events.JobTracker, Values.Start);\n\n\t}\n\n\t\/\/RegisterTaskTracker ?\n\n\n\t\/\/RegisterNameNode\n\n\tafter() : initializeNameNode(){\n\t\tgenerateEvent(Events.NameNode, Values.Start);\n\t}\n\n\t\/\/RegisterDataNode \n\n\tafter() : startDataNode(){\n\t\tgenerateEvent(Events.DataNode, Values.Start);\n\t}\n\n\n\t\/\/RegisterSecondaryNamenode\n\n\tafter() : initializeSecondaryNameNode(){\n\t\tgenerateEvent(Events.SecondaryNameNode, Values.Start);\n\t}\n\n\n\t\/\/HEARTBEAT \n\tafter(TaskTrackerStatus status,boolean restarted,boolean initialContact,boolean acceptNewTasks,short responseId) : heartbeat(status, restarted, initialContact, acceptNewTasks,responseId){\n\t\t\/\/ SAMPLE trackername: tracker_vagrant-99-01:localhost\/127.0.0.1:38149\n\t\tgenerateEvent(Events.JobTracker, status.getTrackerName().replace(':','-').replace('\/','_'));\n\t}\n\n\n\t\/*\n\t\t###########################################################################\n\t\t############################Task###########################################\n\t\t###########################################################################\n\t*\/\n\n\t\/\/RegisterTask CHILD \n\tafter() : initializeChild() { \/\/We need the  PID of this task to be registered\n\t\tgenerateEvent(Events.Task, Values.Start);\n\t}\n\n\n\/*\tafter() returning(long size) : outputSize() {\n\t\tString s = \"Task-outputSize\";\n\t\tinstrumentation(s,\"after\",\", size: \" + Long.toString(size));\n\t}\n\n\t\/*\n\t\t###########################################################################\n\t\t############################Mapper#########################################\n\t\t###########################################################################\n\t*\/\n\n\n\t\/*before() : maptask(){\n\t\tgenerateEvent(Events.MapTask, Values.Start);\n\t}*\/\n\n\tbefore() : mapper(){\n\t\tgenerateEvent(Events.TaskTracker, Values.RunMapper);\n\t}\n\n\tafter() : mapper(){\n\t\tgenerateEvent(Events.TaskTracker, Values.End);\n\t}\n\n\n\t\n\n\t\/\/  ############################SORT AND SPILL#################################\n\n\tbefore() : taskSortAndSpill(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.SortAndSpill);\n\t}\n\n\n\tafter() : taskSortAndSpill(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\n\t}\n\n\t\/\/flush\n\n\tbefore() : flush(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.Flush);\n\t}\n\n\tafter() : flush(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\n\t}\n\n\n\n\t\/\/ Spill File Size\n\n\tafter(int numSpills, long size) returning : sortAndSpillSpillFile(numSpills, size){\n\t\tString s = \"sortAndSpillSpillFile\";\n\t\tinstrumentation(s,\"after\",\", numSpills: \" +Integer.toString(numSpills) + \";size: \" + Long.toString((size*numSpills) + size));\n\t}\n\n\t\/\/ SpillIndex File Size\n\n\tafter(int numSpills, long partitions) returning : sortAndSpillSpillIndexFile(numSpills, partitions){\n\t\tString s = \"sortAndSpillSpillIndexFile\";\n\t\tinstrumentation(s,\"after\",\",\" + Long.toString(numSpills * partitions));\n\t}\n\n\/*\n\tbefore(int length) : kvbufferState(length){\n\n\t\tString s = \"kvbufferState\";\n\t\tFile logFile = getFile();\n\t\tinstrumentation(logFile,s,\"before\");\n\t\twriteLog(logFile,Integer.toString(length));\n\t}\n\n*\/\n\n\tbefore(int kvstart, int endPosition, Object reporter) : sortAndSpillSort(kvstart,endPosition,reporter){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.Sort);\n\t\t\/\/instrumentation(s,\"before\",\",\" + Integer.toString(endPosition - kvstart));\n\t}\n\tafter(int kvstart, int endPosition, Object reporter) returning : sortAndSpillSort(kvstart,endPosition,reporter){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\n\t\t\/\/instrumentation(s,\"after\",\",\" + Integer.toString(endPosition - kvstart));\n\t}\n\n\t\/\/ Init writer\n\/*\tafter() returning : sortAndSpillInitWriter(){\n\t\tString s = \"sortAndSpillInitWriter\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\t\/\/ Close writer\n\tafter() returning : sortAndSpillCloseWriter(){\n\t\tString s = \"sortAndSpillCloseWriter\";\n\t\tinstrumentation(s,\"after\");\n\t}\n*\/\n\n\tafter(DataInputBuffer key, DataInputBuffer value) returning : sortAndSpillWrite(key,value){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.SpillRecordDumped);\n\t}\n\n\tbefore() : sortAndSpillCombiner(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.Combine);\n\t}\n\n\tafter() returning : sortAndSpillCombiner(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\t\n\t}\n\n\tbefore() : sortAndSpillSpillIndexWrite(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.CreateSpillIndexFile);\n\t}\n\n\tafter() returning : sortAndSpillSpillIndexWrite(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\n\t}\n\n\t\/*\n\t\t###########################################################################\n\t\t############################REDUCER########################################\n\t\t###########################################################################\n\t*\/\n\n\/*\tbefore() : reducer(){\n\t\tString s = \"Reducer\";\n\t\tinstrumentation(s,\"before\");\n\t}\n*\/\n\n\tbefore() : initCodec() {\n\t\tgenerateEvent(Events.TaskTracker, Values.RunReducer);\n\t}\n\n\n\tafter() returning : initCodec() {\n\t\tgenerateEvent(Events.TaskTracker, Values.ReducerCopyPhase);\n\t}\n\n\tbefore(TaskStatus.Phase phase) : setPhase(phase) { \/\/END OF A PHASE (SORT OR COPY)\n\t\t\tgenerateEvent(Events.TaskTracker, Values.End);\n\t}\n\n\tafter(TaskStatus.Phase phase) returning: setPhase(phase) { \n\t\tif (phase == TaskStatus.Phase.SORT) {\n\t\t\tgenerateEvent(Events.TaskTracker, Values.ReducerSortPhase);\n\t\t}\n\t\telse if (phase == TaskStatus.Phase.REDUCE) {\n\t\t\tgenerateEvent(Events.TaskTracker, Values.ReducerReducePhase);\n\t\t}\n\t}\n\n\tafter() : reducer(){ \/\/END OF REDUCE PHASE\n\t\t\tgenerateEvent(Events.TaskTracker, Values.End);\t}\n\n\t\/*\n\t\t###########################################################################\n\t\t############################NETWORK########################################\n\t\t###########################################################################\n\t*\/\n\n\tafter() returning(long blockSize) : defaultBlockSize() {\n\t\tString s = \"Network-defaultBlockSize\";\n\t\tinstrumentation(s,\"after\",\", size: \" + Long.toString(blockSize));\n\t}\n\t\/\/ after() returning(long blockSize) : blockSize() {\n\t\/\/ \tString s = \"Network-blockSize\";\n\t\/\/ \tFile logFile = getFile();\n\t\/\/ \tinstrumentation(logFile,s,\"after\");\n\t\/\/ \tString log = \", size: \" + Long.toString(blockSize);\n\t\/\/ \twriteLog(logFile,log);\n\t\/\/ }\n\n\tafter(String src,FsPermission permission,boolean overwrite, boolean createParent,short replication,long blockSize,Progressable progress, int buffersize): createDFSFile(src,permission,overwrite,createParent,replication,blockSize,progress,buffersize) {\n\t\tString s = \"Network-CreateDFSFile\";\n\n\t\t\/\/MODIFIED!!!!!!-----!!!!!!!!!!!\n\t\tinstrumentation(s,\"after\",\", path: \" + src + \";permission: \" + permission.toString() + \";overwrite: \" + String.valueOf(overwrite) + \";createParent: \" + String.valueOf(createParent) + \";replication: \" + Short.toString(replication) + \";blockSize: \" + Long.toString(blockSize) + \";buffersize: \" + Integer.toString(buffersize));\n\t}\n\tbefore(): runDataStreamer() {\n\t\tString s = \"DataStreamer\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\t\/\/ before(byte buf[],int off, int len) : readEntireBufferFromDataNode(buf[],off,len){\n\t\/\/ \tString s = \"Network-ReadEntireBuffer\";\n\t\/\/ \tinstrumentation(s,\"after\",\", bufferLength: \" + Integer.toString(len));\n\t\/\/ }\n\n\t\/\/ after() returning(DatanodeInfo datanode) : readFromDataNode(){\n\t\/\/ \tString s = \"Network-fromDataNode\";\n\t\/\/ \tinstrumentation(s,\"after\", \", from : \" + datanode.getHostName());\n\t\/\/ }\n\n\tafter(Socket sock, String file, long blockId, Token<BlockTokenIdentifier> accessToken, long genStamp, long startOffset, long len, int bufferSize, boolean verifyChecksum, String clientName) : newBlockReader(sock,file,blockId,accessToken,genStamp,startOffset,len,bufferSize,verifyChecksum,clientName) {\n\t\tString s = \"Network-NewBlockReader\";\n\t\tString extra = \", DataNode: \" + sock.getInetAddress().getCanonicalHostName();\n\t\textra += \";file: \" + file;\n\t\t\/\/extra += \", length: \" + Long.toString(len) + \"B\";\n\t\textra += \";\" + Long.toString(len);\n\t\textra += \";blockId: \" + Long.toString(blockId);\n\t\textra += \";startOffset: \" + Long.toString(startOffset);\t\t\n\t\tinstrumentation(s,\"after\",extra);\n\t}\n}\n\n\n\n\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"1c45660eb3801ce4c7990652baad2ba468697f2f","subject":"In some case, the KStateMachines aspect may throw a NullPointerException. Add a test to avoid such an exception.","message":"In some case, the KStateMachines aspect may throw a NullPointerException.\nAdd a test to avoid such an exception.\n","repos":"christophe-w\/parallelj.runtime,awltech\/org.parallelj","old_file":"parallelj-core\/src\/main\/java\/org\/parallelj\/internal\/util\/sm\/impl\/KStateMachines.aj","new_file":"parallelj-core\/src\/main\/java\/org\/parallelj\/internal\/util\/sm\/impl\/KStateMachines.aj","new_contents":"\/*\n *     ParallelJ, framework for parallel computing\n *\n *     Copyright (C) 2010, 2011, 2012 Atos Worldline or third-party contributors as\n *     indicated by the @author tags or express copyright attribution\n *     statements applied by the authors.\n *\n *     This library is free software; you can redistribute it and\/or\n *     modify it under the terms of the GNU Lesser General Public\n *     License as published by the Free Software Foundation; either\n *     version 2.1 of the License.\n *\n *     This library is distributed in the hope that it will be useful,\n *     but WITHOUT ANY WARRANTY; without even the implied warranty of\n *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n *     Lesser General Public License for more details.\n *\n *     You should have received a copy of the GNU Lesser General Public\n *     License along with this library; if not, write to the Free Software\n *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n *\/\npackage org.parallelj.internal.util.sm.impl;\n\nimport javax.xml.bind.annotation.XmlTransient;\n\nimport org.aspectj.lang.reflect.MethodSignature;\nimport org.parallelj.internal.util.sm.StateListener;\nimport org.parallelj.internal.util.sm.impl.KStateMachine.KVertex;\nimport org.parallelj.internal.util.sm.impl.KStateMachine.Occurrence;\n\npublic privileged aspect KStateMachines {\n\n\t\/**\n\t * \n\t *\/\n\tpublic static interface Adapter {\n\n\t}\n\n\t\/**\n\t * Inter type declaration in order to link annotated classes and state\n\t * machine occurrence.\n\t *\/\n\t@XmlTransient\n\tpublic Occurrence Adapter.occurrence;\n\n\tdeclare parents:\n\t\t(@org.parallelj.internal.util.sm.StateMachine *) implements Adapter;\n\n\tpublic static privileged aspect PerMachine pertypewithin(@org.parallelj.internal.util.sm.StateMachine *) {\n\n\t\tKStateMachine machine;\n\n\t\tafter() : staticinitialization(@org.parallelj.internal.util.sm.StateMachine *) {\n\t\t\tthis.machine = new KStateMachine(thisJoinPoint.getSignature()\n\t\t\t\t\t.getDeclaringType());\n\t\t\tSystem.out.println(this.machine);\n\t\t}\n\n\t\tafter(Object self): execution((@org.parallelj.internal.util.sm.StateMachine *).new(..)) && this(self) {\n\t\t\t((Adapter) self).occurrence = this.machine.newOccurrence(self);\n\t\t}\n\n\t\tvoid around(Object self): execution(@org.parallelj.internal.util.sm.Trigger * *(..)) && this(self) {\n\t\t\tOccurrence occurrence = ((Adapter) self).occurrence;\n\t\t\tKVertex previous = occurrence.getCurrent();\n\t\t\tKTrigger trigger = this.machine\n\t\t\t\t\t.getTrigger(((MethodSignature) thisJoinPoint.getSignature())\n\t\t\t\t\t\t\t.getName());\n\t\t\toccurrence.trigger(trigger.trigger(occurrence,\n\t\t\t\t\tthisJoinPoint.getArgs()));\n\t\t\tKVertex current = occurrence.getCurrent();\n\t\t\tif (previous != current && current != null) {\n\t\t\t\toccurrence.getSupport().fireStateChanded(current.value);\n\t\t\t}\n\t\t}\n\t}\n\n\tvoid around(Object machine, StateListener listener): execution(* org.parallelj.internal.util.sm.StateMachines.addStateListener(..)) && args(machine, listener, ..) {\n\t\tOccurrence occurrence = ((Adapter) machine).occurrence;\n\t\toccurrence.getSupport().addStateListener(listener);\n\t}\n\n\tvoid around(Object machine, StateListener listener): execution(* org.parallelj.internal.util.sm.StateMachines.removeStateListener(..)) && args(machine, listener, ..) {\n\t\tOccurrence occurrence = ((Adapter) machine).occurrence;\n\t\toccurrence.getSupport().removeStateListener(listener);\n\t}\n\n}\n","old_contents":"\/*\n *     ParallelJ, framework for parallel computing\n *\n *     Copyright (C) 2010, 2011, 2012 Atos Worldline or third-party contributors as\n *     indicated by the @author tags or express copyright attribution\n *     statements applied by the authors.\n *\n *     This library is free software; you can redistribute it and\/or\n *     modify it under the terms of the GNU Lesser General Public\n *     License as published by the Free Software Foundation; either\n *     version 2.1 of the License.\n *\n *     This library is distributed in the hope that it will be useful,\n *     but WITHOUT ANY WARRANTY; without even the implied warranty of\n *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n *     Lesser General Public License for more details.\n *\n *     You should have received a copy of the GNU Lesser General Public\n *     License along with this library; if not, write to the Free Software\n *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n *\/\npackage org.parallelj.internal.util.sm.impl;\n\nimport javax.xml.bind.annotation.XmlTransient;\n\nimport org.aspectj.lang.reflect.MethodSignature;\nimport org.parallelj.internal.util.sm.StateListener;\nimport org.parallelj.internal.util.sm.impl.KStateMachine.KVertex;\nimport org.parallelj.internal.util.sm.impl.KStateMachine.Occurrence;\n\npublic privileged aspect KStateMachines {\n\n\t\/**\n\t * \n\t *\/\n\tpublic static interface Adapter {\n\n\t}\n\n\t\/**\n\t * Inter type declaration in order to link annotated classes and state\n\t * machine occurrence.\n\t *\/\n\t@XmlTransient\n\tpublic Occurrence Adapter.occurrence;\n\n\tdeclare parents:\n\t\t(@org.parallelj.internal.util.sm.StateMachine *) implements Adapter;\n\n\tpublic static privileged aspect PerMachine pertypewithin(@org.parallelj.internal.util.sm.StateMachine *) {\n\n\t\tKStateMachine machine;\n\n\t\tafter() : staticinitialization(@org.parallelj.internal.util.sm.StateMachine *) {\n\t\t\tthis.machine = new KStateMachine(thisJoinPoint.getSignature()\n\t\t\t\t\t.getDeclaringType());\n\t\t\tSystem.out.println(this.machine);\n\t\t}\n\n\t\tafter(Object self): execution((@org.parallelj.internal.util.sm.StateMachine *).new(..)) && this(self) {\n\t\t\t((Adapter) self).occurrence = this.machine.newOccurrence(self);\n\t\t}\n\n\t\tvoid around(Object self): execution(@org.parallelj.internal.util.sm.Trigger * *(..)) && this(self) {\n\t\t\tOccurrence occurrence = ((Adapter) self).occurrence;\n\t\t\tKVertex previous = occurrence.getCurrent();\n\t\t\tKTrigger trigger = this.machine\n\t\t\t\t\t.getTrigger(((MethodSignature) thisJoinPoint.getSignature())\n\t\t\t\t\t\t\t.getName());\n\t\t\toccurrence.trigger(trigger.trigger(occurrence,\n\t\t\t\t\tthisJoinPoint.getArgs()));\n\t\t\tKVertex current = occurrence.getCurrent();\n\t\t\tif (previous != current) {\n\t\t\t\toccurrence.getSupport().fireStateChanded(current.value);\n\t\t\t}\n\t\t}\n\t}\n\n\tvoid around(Object machine, StateListener listener): execution(* org.parallelj.internal.util.sm.StateMachines.addStateListener(..)) && args(machine, listener, ..) {\n\t\tOccurrence occurrence = ((Adapter) machine).occurrence;\n\t\toccurrence.getSupport().addStateListener(listener);\n\t}\n\n\tvoid around(Object machine, StateListener listener): execution(* org.parallelj.internal.util.sm.StateMachines.removeStateListener(..)) && args(machine, listener, ..) {\n\t\tOccurrence occurrence = ((Adapter) machine).occurrence;\n\t\toccurrence.getSupport().removeStateListener(listener);\n\t}\n\n}\n","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"b2ce5602b88684c937a793a08648d1caba691df6","subject":"Add missing AspectJ blurb that was not copied from Spring.","message":"Add missing AspectJ blurb that was not copied from Spring.\n","repos":"permazen\/permazen,permazen\/permazen,archiecobbs\/jsimpledb,archiecobbs\/jsimpledb,tempbottle\/jsimpledb,permazen\/permazen,tempbottle\/jsimpledb,archiecobbs\/jsimpledb,tempbottle\/jsimpledb","old_file":"src\/java\/org\/dellroad\/stuff\/vaadin\/VaadinConfigurableAspect.aj","new_file":"src\/java\/org\/dellroad\/stuff\/vaadin\/VaadinConfigurableAspect.aj","new_contents":"\n\/*\n * Copyright (C) 2011 Archie L. Cobbs and other authors. All rights reserved.\n *\n * $Id$\n *\/\n\npackage org.dellroad.stuff.vaadin;\n\nimport java.io.ObjectStreamException;\nimport java.io.Serializable;\n\nimport org.springframework.beans.factory.aspectj.AbstractDependencyInjectionAspect;\n\n\/**\n * Aspect that autowires classes marked with the {@link VaadinConfigurable @VaadinConfigurable} annotation to a\n * {@link SpringContextApplication} application context.\n *\n * <p>\n * This aspect does the same thing that Spring's {@code AnnotationBeanConfigurerAspect} aspect does,\n * except that this aspect configures beans using the application context associated with the current\n * {@link SpringContextApplication} Vaadin application rather than the one associated with the overall\n * servlet context (i.e., its parent).\n * <\/p>\n *\n * <p>\n * As a result, objects so annotated will be configured for their specific {@link SpringContextApplication}\n * instance, and therefore can only be instantiated by threads associated with a current {@link SpringContextApplication}\n * (see {@link ContextApplication#get}). This will be the case when executing within a {@link SpringContextApplication}\n * Vaadin application HTTP request or an invocation of {@link ContextApplication#invoke} on same.\n * <\/p>\n *\n * <p>\n * This implementation is derived from Spring's {@code AnnotationBeanConfigurerAspect} implementation\n * and therefore shares its license (also Apache).\n * <\/p>\n *\n * @see SpringContextApplication\n * @see ContextApplication#get\n * @see VaadinConfigurable\n *\/\npublic aspect VaadinConfigurableAspect extends AbstractDependencyInjectionAspect {\n\n\/\/ Stuff copied from AbstractInterfaceDrivenDependencyInjectionAspect.aj\n\n    public pointcut beanConstruction(Object bean) :\n        initialization(VaadinConfigurableObject+.new(..)) && this(bean);\n\n    public pointcut beanDeserialization(Object bean) :\n        execution(Object VaadinConfigurableDeserializationSupport+.readResolve()) &&\n        this(bean);\n\n    public pointcut leastSpecificSuperTypeConstruction() : initialization(VaadinConfigurableObject.new(..));\n\n    declare parents: \n        VaadinConfigurableObject+ && Serializable+ implements VaadinConfigurableDeserializationSupport;\n\n    static interface VaadinConfigurableDeserializationSupport extends Serializable {\n    }\n\n    public Object VaadinConfigurableDeserializationSupport.readResolve() throws ObjectStreamException {\n        return this;\n    }\n\n\/\/ Stuff copied from AnnotationBeanConfigurerAspect.aj\n\n    public pointcut inConfigurableBean() : @this(VaadinConfigurable);\n\n    public pointcut preConstructionConfiguration() : preConstructionConfigurationSupport(*);\n\n    declare parents: @VaadinConfigurable * implements VaadinConfigurableObject;\n\n    private pointcut preConstructionConfigurationSupport(VaadinConfigurable c) : @this(c) && if(c.preConstruction());\n\n\tdeclare parents: @VaadinConfigurable Serializable+ implements VaadinConfigurableDeserializationSupport;\n\n\/\/ Our implementation\n\n    @Override\n    public void configureBean(Object bean) {\n        SpringContextApplication.get().configureBean(bean);\n    }\n}\n\n","old_contents":"\n\/*\n * Copyright (C) 2011 Archie L. Cobbs and other authors. All rights reserved.\n *\n * $Id$\n *\/\n\npackage org.dellroad.stuff.vaadin;\n\nimport java.io.ObjectStreamException;\nimport java.io.Serializable;\n\nimport org.springframework.beans.factory.aspectj.AbstractDependencyInjectionAspect;\n\n\/**\n * Aspect that autowires classes marked with the {@link VaadinConfigurable @VaadinConfigurable} annotation to a\n * {@link SpringContextApplication} application context.\n *\n * <p>\n * This aspect does the same thing that Spring's {@code AnnotationBeanConfigurerAspect} aspect does,\n * except that this aspect configures beans using the application context associated with the current\n * {@link SpringContextApplication} Vaadin application rather than the one associated with the overall\n * servlet context (i.e., its parent).\n * <\/p>\n *\n * <p>\n * As a result, objects so annotated will be configured for their specific {@link SpringContextApplication}\n * instance, and therefore can only be instantiated by threads associated with a current {@link SpringContextApplication}\n * (see {@link ContextApplication#get}). This will be the case when executing within a {@link SpringContextApplication}\n * Vaadin application HTTP request or an invocation of {@link ContextApplication#invoke} on same.\n * <\/p>\n *\n * <p>\n * This implementation is derived from Spring's {@code AnnotationBeanConfigurerAspect} implementation\n * and therefore shares its license (also Apache).\n * <\/p>\n *\n * @see SpringContextApplication\n * @see ContextApplication#get\n * @see VaadinConfigurable\n *\/\npublic aspect VaadinConfigurableAspect extends AbstractDependencyInjectionAspect {\n\n\/\/ Stuff copied from AbstractInterfaceDrivenDependencyInjectionAspect.aj\n\n    public pointcut beanConstruction(Object bean) :\n        initialization(VaadinConfigurableObject+.new(..)) && this(bean);\n\n    public pointcut beanDeserialization(Object bean) :\n        execution(Object VaadinConfigurableDeserializationSupport+.readResolve()) &&\n        this(bean);\n\n    public pointcut leastSpecificSuperTypeConstruction() : initialization(VaadinConfigurableObject.new(..));\n\n    static interface VaadinConfigurableDeserializationSupport extends Serializable {\n    }\n\n    public Object VaadinConfigurableDeserializationSupport.readResolve() throws ObjectStreamException {\n        return this;\n    }\n\n\/\/ Stuff copied from AnnotationBeanConfigurerAspect.aj\n\n    public pointcut inConfigurableBean() : @this(VaadinConfigurable);\n\n    public pointcut preConstructionConfiguration() : preConstructionConfigurationSupport(*);\n\n    declare parents: @VaadinConfigurable * implements VaadinConfigurableObject;\n\n    private pointcut preConstructionConfigurationSupport(VaadinConfigurable c) : @this(c) && if(c.preConstruction());\n\n\tdeclare parents: @VaadinConfigurable Serializable+ implements VaadinConfigurableDeserializationSupport;\n\n\/\/ Our implementation\n\n    @Override\n    public void configureBean(Object bean) {\n        SpringContextApplication.get().configureBean(bean);\n    }\n}\n\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"aa9a5e6a0209460678ccb5e0e84f64b6c4ceb10f","subject":"fix for SPR-2521","message":"fix for SPR-2521\n\n\ngit-svn-id: b619a0c99665f88f1afe72824344cefe9a1c8c90@11518 fd5a2b45-1f63-4059-99e9-3c7cb7fd75c8\n","repos":"cbeams-archive\/spring-framework-2.5.x,cbeams-archive\/spring-framework-2.5.x,cbeams-archive\/spring-framework-2.5.x,cbeams-archive\/spring-framework-2.5.x","old_file":"aspectj\/src\/org\/springframework\/transaction\/aspectj\/AnnotationTransactionAspect.aj","new_file":"aspectj\/src\/org\/springframework\/transaction\/aspectj\/AnnotationTransactionAspect.aj","new_contents":"\/*\n * Copyright 2002-2005 the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.springframework.transaction.aspectj;\n\nimport org.springframework.transaction.annotation.AnnotationTransactionAttributeSource;\nimport org.springframework.transaction.annotation.Transactional;\n\n\/**\n * Concrete AspectJ transaction aspect using Spring Transactional annotation\n * for JDK 1.5+.\n * \n * <p>\n * When using this aspect, you <i>must<\/i> annotate the implementation class \n * (and\/or methods within that class), <i>not<\/i> the interface (if any) that\n * the class implements. AspectJ follows Java's rule that annotations on \n * interfaces are <i>not<\/i> inherited.\n * <\/p>\n * <p>A @Transactional annotation on a class specifies the default transaction\n * semantics for the execution of any <b>public<\/b> operation in the class.<\/p>\n * <p>A @Transactional annotation on a method within the class overrides the\n * default transaction semantics given by the class annotation (if present). \n * Methods with public, protected, and default visibility may all be annotated.\n * Annotating protected and default visibility methods directly is the only way\n * to get transaction demarcation for the execution of such operations.<\/p> \n *\n * @author Rod Johnson\n * @author Ramnivas Laddad\n * @author Adrian Colyer\n * @since 2.0\n * @see org.springframework.transaction.annotation.Transactional\n *\/\npublic aspect AnnotationTransactionAspect extends AbstractTransactionAspect {\n\t\n\tpublic AnnotationTransactionAspect() {\n\t\tsuper(new AnnotationTransactionAttributeSource());\n\t}\n\n\t\/**\n\t * Matches the execution of any public method in a type with the\n\t * Transactional annotation, or any subtype of a type with the\n\t * Transactional annotation.\n\t *\/\n\tprivate pointcut executionOfAnyPublicMethodInAtTransactionalType() :\n\t\texecution(public * ((@Transactional *)+).*(..)) && @this(Transactional);\n\t\n\t\/**\n\t * Matches the execution of any non-private method with the \n\t * Transactional annotation.\n\t *\/\n\tprivate pointcut executionOfTransactionalNonPrivateMethod() :\n\t\texecution(!private * *(..)) && @annotation(Transactional);\n\t\n\t\/**\n\t * Definition of pointcut from super aspect - matched join points\n\t * will have Spring transaction management applied.\n\t *\/\t\n\tprotected pointcut transactionalMethodExecution(Object txObject) :\n\t\t(executionOfAnyPublicMethodInAtTransactionalType()\n\t\t || executionOfTransactionalNonPrivateMethod() )\n\t\t && this(txObject);\n\n\t\/**\n\t * Annotating private methods with @Transactional has no effect...\n\t *\/\n\tdeclare warning \n\t    \/\/ note, we should be able to say the following in one execution pcd, but\n\t    \/\/ aj doesn't like it...\n\t\t: execution(@Transactional * *(..)) &&\n\t\t  execution(private * *(..))\n\t\t: \"@Transactional annotation on private method will be ignored\";\n}\n","old_contents":"\/*\n * Copyright 2002-2005 the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.springframework.transaction.aspectj;\n\nimport org.springframework.transaction.annotation.AnnotationTransactionAttributeSource;\nimport org.springframework.transaction.annotation.Transactional;\n\n\/**\n * Concrete AspectJ transaction aspect using Spring Transactional annotation\n * for JDK 1.5+.\n * \n * <p>\n * When using this aspect, you <i>must<\/i> annotate the implementation class \n * (and\/or methods within that class), <i>not<\/i> the interface (if any) that\n * the class implements. AspectJ follows Java's rule that annotations on \n * interfaces are <i>not<\/i> inherited.\n * <\/p>\n * <p>A @Transactional annotation on a class specifies the default transaction\n * semantics for the execution of any <b>public<\/b> operation in the class.<\/p>\n * <p>A @Transactional annotation on a method within the class overrides the\n * default transaction semantics given by the class annotation (if present). \n * Methods with public, protected, and default visibility may all be annotated.\n * Annotating protected and default visibility methods directly is the only way\n * to get transaction demarcation for the execution of such operations.<\/p> \n *\n * @author Rod Johnson\n * @author Ramnivas Laddad\n * @author Adrian Colyer\n * @since 2.0\n * @see org.springframework.transaction.annotation.Transactional\n *\/\npublic aspect AnnotationTransactionAspect extends AbstractTransactionAspect {\n\t\n\tpublic AnnotationTransactionAspect() {\n\t\tsuper(new AnnotationTransactionAttributeSource());\n\t}\n\n\n\t\/**\n\t * Matches the execution of any public method in a type with the\n\t * Transactional annotation, or any subtype of a type with the\n\t * Transactional annotation.\n\t *\/\n\tprivate pointcut executionOfAnyPublicMethodInAtTransactionalType() :\n\t\texecution(public * ((@Transactional *)+).*(..));\n\t\n\t\/**\n\t * Matches the execution of any non-private method with the \n\t * Transactional annotation.\n\t *\/\n\tprivate pointcut executionOfTransactionalNonPrivateMethod() :\n\t\texecution(!private * *(..)) && @annotation(Transactional);\n\t\n\t\/**\n\t * Definition of pointcut from super aspect - matched join points\n\t * will have Spring transaction management applied.\n\t *\/\t\n\tprotected pointcut transactionalMethodExecution(Object txObject) :\n\t\t(executionOfAnyPublicMethodInAtTransactionalType() \n\t\t || executionOfTransactionalNonPrivateMethod())\n\t\t && this(txObject);\n\n\t\/**\n\t * Annotating private methods with @Transactional has no effect...\n\t *\/\n\tdeclare warning \n\t    \/\/ note, we should be able to say the following in one execution pcd, but\n\t    \/\/ aj doesn't like it...\n\t\t: execution(@Transactional * *(..)) &&\n\t\t  execution(private * *(..))\n\t\t: \"@Transactional annotation on private method will be ignored\";\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"13f1edc4e517f3a7345eba3a29ba8d05e59f717c","subject":"added svn:ignore settings, added license header","message":"added svn:ignore settings,\nadded license header\n","repos":"palava\/palava-jpa-jta","old_file":"src\/main\/java\/de\/cosmocode\/palava\/jpa\/jta\/UserTransactionAspect.aj","new_file":"src\/main\/java\/de\/cosmocode\/palava\/jpa\/jta\/UserTransactionAspect.aj","new_contents":"\/**\n * palava - a java-php-bridge\n * Copyright (C) 2007-2010  CosmoCode GmbH\n *\n * This program is free software; you can redistribute it and\/or\n * modify it under the terms of the GNU General Public License\n * as published by the Free Software Foundation; either version 2\n * of the License, or (at your option) any later version.\n *\n * This program is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n * along with this program; if not, write to the Free Software\n * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n * MA  02110-1301, USA.\n *\/\n\npackage de.cosmocode.palava.jpa.jta;\n\nimport de.cosmocode.palava.jta.AbstractUserTransactionAspect;\n\nimport de.cosmocode.palava.jpa.Transactional;\n\npublic aspect UserTransactionAspect extends AbstractUserTransactionAspect {\n\n    protected pointcut transactional(): execution(@Transactional * *.*(..));\n\n}\n","old_contents":"package de.cosmocode.palava.jpa.jta;\n\nimport de.cosmocode.palava.jta.AbstractUserTransactionAspect;\n\nimport de.cosmocode.palava.jpa.Transactional;\n\npublic aspect UserTransactionAspect extends AbstractUserTransactionAspect {\n\n    protected pointcut transactional(): execution(@Transactional * *.*(..));\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"e95f64d3ab352e0f3afd38be7d278b932e50f45c","subject":"Program status incorrect using remote launching and Handlers on RunnableProgram status","message":"Program status incorrect using remote launching and Handlers on RunnableProgram status\n\nhttps:\/\/github.com\/XA-Labs\/org.parallelj\/issues\/74\n","repos":"christophe-w\/parallelj.runtime,awltech\/org.parallelj","old_file":"parallelj-launching\/src\/main\/java\/org\/parallelj\/launching\/quartz\/ProgramJobsAdapter.aj","new_file":"parallelj-launching\/src\/main\/java\/org\/parallelj\/launching\/quartz\/ProgramJobsAdapter.aj","new_contents":"\/*\n *     ParallelJ, framework for parallel computing\n *\n *     Copyright (C) 2010, 2011, 2012 Atos Worldline or third-party contributors as\n *     indicated by the @author tags or express copyright attribution\n *     statements applied by the authors.\n *\n *     This library is free software; you can redistribute it and\/or\n *     modify it under the terms of the GNU Lesser General Public\n *     License as published by the Free Software Foundation; either\n *     version 2.1 of the License.\n *\n *     This library is distributed in the hope that it will be useful,\n *     but WITHOUT ANY WARRANTY; without even the implied warranty of\n *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n *     Lesser General Public License for more details.\n *\n *     You should have received a copy of the GNU Lesser General Public\n *     License along with this library; if not, write to the Free Software\n *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n *\/\npackage org.parallelj.launching.quartz;\n\nimport java.util.HashMap;\nimport java.util.HashSet;\nimport java.util.Map;\nimport java.util.Set;\nimport java.util.concurrent.ExecutorService;\nimport java.util.concurrent.Executors;\n\nimport org.parallelj.Programs;\nimport org.parallelj.Programs.ProcessHelper;\nimport org.parallelj.internal.kernel.KProcess;\nimport org.parallelj.internal.kernel.KProcessor;\nimport org.parallelj.internal.kernel.KProgram;\nimport org.parallelj.internal.kernel.procedure.CallableProcedure;\nimport org.parallelj.internal.kernel.procedure.RunnableProcedure;\nimport org.parallelj.internal.reflect.ProgramAdapter.Adapter;\nimport org.parallelj.launching.LaunchingMessageKind;\nimport org.parallelj.launching.ReturnCodes;\nimport org.parallelj.mirror.ProgramType;\nimport org.quartz.Job;\nimport org.quartz.JobDataMap;\nimport org.quartz.JobExecutionContext;\nimport org.quartz.JobExecutionException;\n\n\/**\n * Implements the Job.execute(..) method\n * \n * \n *\/\nprivileged public aspect ProgramJobsAdapter {\n\n\t\/*\n\t * The Aspect JobsAdapter must be passed before this.\n\t *\/\n\tdeclare precedence :\n\t\torg.parallelj.internal.kernel.Identifiers,\n\t\torg.parallelj.internal.reflect.ProgramAdapter,\n\t\torg.parallelj.internal.util.sm.impl.KStateMachines,\n\t\torg.parallelj.internal.util.sm.impl.KStateMachines.PerMachine,\n\t\torg.parallelj.Executables$PerExecutable,\n\t\torg.parallelj.internal.reflect.ProgramAdapter.PerProgram,\n\t\torg.parallelj.internal.log.Logs,\n\t\torg.parallelj.launching.quartz.JobsAdapter;\n\n\t\/*\n\t * Add the interface IProceduresInError to the KProcessor\n\t*\/\n\tprivate interface IProceduresInError {\n\t\tpublic void addProcedureInError(String name, Exception exception);\n\t}\n\tpublic Map<String, Set<String>> IProceduresInError.proceduresInError=new HashMap<String, Set<String>>();\n\t\n\tpublic synchronized void IProceduresInError.addProcedureInError(String name, Exception exception) {\n\t\tSet<String> exceptions = ((IProceduresInError)this).proceduresInError.get(name);\n\t\tif (exceptions==null) {\n\t\t\t\/\/ This is the first \"name\" Procedure in error\n\t\t\texceptions = new HashSet<String>();\n\t\t}\n\t\tif (!exceptions.contains(exception.getClass().getCanonicalName())) {\n\t\t\texceptions.add(exception.getClass().getCanonicalName());\n\t\t}\n\t\t((IProceduresInError)this).proceduresInError.put(name, exceptions);\n\t}\n\t\n\tdeclare parents: org.parallelj.internal.kernel.KProcessor implements IProceduresInError;\n\n\t\/**\n\t * Launch a Program and initialize the Result as a JobDataMap.\n\t * \n\t * @param self\n\t * @param context\n\t * @throws JobExecutionException\n\t *\/\n\tvoid around(Job self, JobExecutionContext context)\n\t\t\tthrows JobExecutionException : \n\t\texecution( public void  Job+.execute(..) throws JobExecutionException) \n\t\t\t&& (within(@org.parallelj.Program *) || within(JobsAdapter)) \n\t\t\t\t&& args(context) && this(self) {\n\t\tJobDataMap jobDataMap = new JobDataMap();\n\t\tcontext.setResult(jobDataMap);\n\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.SUCCESS);\n\n\t\tproceed(self, context);\n\n\t\ttry {\n\t\t\t\/\/ Initialize an ExecutorService with the Capacity of the Program\n\t\t\tProcessHelper<?> processHelper = Programs.as((Adapter) self);\n\t\t\tif (processHelper == null) {\n\t\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.NOTSTARTED);\n\t\t\t\tthrow new JobExecutionException(LaunchingMessageKind.ELAUNCH0003.getFormatedMessage(self));\n\t\t\t}\n\t\t\tProgramType programType = processHelper.getProcess().getProgram();\n\t\t\tExecutorService service = null;\n\t\t\t\/\/ If an executorService was specified, we use it\n\n\t\t\tif (context.getJobDetail().getJobDataMap().get(Launch.DEFAULT_EXECUTOR_KEY) != null) {\n\t\t\t\tservice = (ExecutorService)context.getJobDetail().getJobDataMap().get(Launch.DEFAULT_EXECUTOR_KEY);\n\t\t\t} else \n\t\t\tif (programType instanceof KProgram) {\n\t\t\t\tshort programCapacity = ((KProgram) programType)\n\t\t\t\t\t\t.getCapacity();\n\t\t\t\tservice = (programCapacity == Short.MAX_VALUE) ? Executors\n\t\t\t\t\t\t.newCachedThreadPool() : Executors\n\t\t\t\t\t\t.newFixedThreadPool(programCapacity);\n\t\t\t} else {\n\t\t\t\tservice = Executors\n\t\t\t\t\t\t.newCachedThreadPool();\n\t\t\t}\n\n\t\t\t\/\/ Launch the program with the initialized ExecutorService\n\t\t\tprocessHelper.execute(service).join();\n\t\t\t\n\t\t\tKProcessor rootProcessor = ((KProcessor)processHelper.getProcess().getProcessor());\n\t\t\tIProceduresInError procedures = (IProceduresInError)rootProcessor;\n\t\t\tif(procedures.proceduresInError.size()>0) {\n\t\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.FAILURE);\n\t\t\t}\n\t\t\n\t\t\tProgramFieldsBinder.getProgramOutputFields(this, context);\n\t\t\tservice.shutdown();\n\t\t\t\n\t\t\tif (procedures.proceduresInError.size()>0){\n\t\t\t\tjobDataMap.put(QuartzUtils.PROCEDURES_IN_ERROR, procedures.proceduresInError);\n\t\t\t\tthrow new JobExecutionException();\n\t\t\t}\n\t\t} catch (IllegalAccessException e) {\n\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.FAILURE);\n\t\t\tthrow new JobExecutionException(e);\n\t\t} catch (NoSuchFieldException e) {\n\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.FAILURE);\n\t\t\tthrow new JobExecutionException(e);\n\t\t}\n\t}\n\t\n\t\/*\n\t * Add the interface IExceptionTracking to all Runnable and Callable\n\t *\/\n    public interface IExceptionTracking {};\n  \tprivate Object IExceptionTracking.context = null;\n\t\n    declare parents:           \n    \t(java.lang.Runnable+ ) implements IExceptionTracking;\n    declare parents:           \n    \t(java.util.concurrent.Callable+ ) implements IExceptionTracking;    \n  \t\n\t\/\/ Interception around Runnable execution      \n  \tafter(Object self) returning (Runnable ret): \n  \t\texecution(* org.parallelj.internal.kernel.procedure.RunnableProcedure.RunnableCall.toRunnable())\n      && this(self)  {\n   \t  ((IExceptionTracking)ret).context = ((org.parallelj.internal.kernel.KCall)self);\n    }\n\n\t\/\/ Interception around Callable execution      \n  \tafter(Object self) returning (Runnable ret): \n  \t\texecution(* org.parallelj.internal.kernel.procedure.CallableProcedure.CallableCall.toRunnable())\n      && this(self)  {\n   \t  ((IExceptionTracking)ret).context = ((org.parallelj.internal.kernel.KCall)self);\n    }\n\n\t\/\/ Interception around Runnable execution      \n\t void around(Object self): call(void complete())\n\t&& within(org.parallelj.internal.kernel.procedure.RunnableProcedure.RunnableCall)  \n\t\t&& this(self)  {\n\t \n\t\t\tRunnableProcedure.RunnableCall runnable = (RunnableProcedure.RunnableCall)((IExceptionTracking)self).context;\n\t\t\tRunnableProcedure procedure = (RunnableProcedure)runnable.getProcedure();\n\t\t\tif (procedure.getHandler() == null\n\t\t\t\t\t&& runnable.getException() != null) {\n\t\t\t\t\/\/ There is an error !!!\n\t\t\t\tKProcess process = ((RunnableProcedure.RunnableCall)((IExceptionTracking)self).context).getProcess();\n\t\t\t\tKProcessor rootProcessor = process.getProcessor();\/\/.getRootProcessor();\n\t\t\t\t((IProceduresInError)rootProcessor).addProcedureInError(procedure.getType(), runnable.getException());\n\t\t\t}\n\t\tproceed(self);\n\t}\n\n\t\/\/ Interception around Callable execution      \n\t void around(Object self): call(void complete())\n\t\t && within(org.parallelj.internal.kernel.procedure.CallableProcedure.CallableCall)  \n\t\t&& this(self)  {\n\t \n\t\t\tCallableProcedure.CallableCall callable = (CallableProcedure.CallableCall)((IExceptionTracking)self).context;\n\t\t\tCallableProcedure procedure = (CallableProcedure)callable.getProcedure(); \n\t\t\t\n\t\t\tif (\n\t\t\t\t\tprocedure.getHandler() == null\n\t\t\t\t\t&& callable.getException() != null\n\t\t\t\t\t) {\n\t\t\t\t\/\/ There is an error !!!\n\t\t\t\tKProcess process = ((CallableProcedure.CallableCall)((IExceptionTracking)self).context).getProcess();\n\t\t\t\tKProcessor rootProcessor = process.getProcessor();\/\/.getRootProcessor();\n\t\t\t\t((IProceduresInError)rootProcessor).addProcedureInError(procedure.getType(), callable.getException());\n\t\t\t}\n\t\tproceed(self);\n\t}\n\t \n\t\/*\n\t * Allow to get the procedures in error of a Process (the root Process !!!)\n\t *\/\n\tpublic static synchronized Map<String, Set<String>> getProceduresInErrors(\n\t\t\torg.parallelj.mirror.Process process) {\n\t\tKProcessor rootProcessor = ((KProcessor) process.getProcessor());\n\t\tIProceduresInError procedures = (IProceduresInError) rootProcessor;\n\t\treturn procedures.proceduresInError;\n\t}\n}\n","old_contents":"\/*\n *     ParallelJ, framework for parallel computing\n *\n *     Copyright (C) 2010, 2011, 2012 Atos Worldline or third-party contributors as\n *     indicated by the @author tags or express copyright attribution\n *     statements applied by the authors.\n *\n *     This library is free software; you can redistribute it and\/or\n *     modify it under the terms of the GNU Lesser General Public\n *     License as published by the Free Software Foundation; either\n *     version 2.1 of the License.\n *\n *     This library is distributed in the hope that it will be useful,\n *     but WITHOUT ANY WARRANTY; without even the implied warranty of\n *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n *     Lesser General Public License for more details.\n *\n *     You should have received a copy of the GNU Lesser General Public\n *     License along with this library; if not, write to the Free Software\n *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n *\/\npackage org.parallelj.launching.quartz;\n\nimport java.util.HashMap;\nimport java.util.HashSet;\nimport java.util.Map;\nimport java.util.Set;\nimport java.util.concurrent.ExecutorService;\nimport java.util.concurrent.Executors;\n\nimport org.parallelj.Programs;\nimport org.parallelj.Programs.ProcessHelper;\nimport org.parallelj.internal.kernel.KProcess;\nimport org.parallelj.internal.kernel.KProcessor;\nimport org.parallelj.internal.kernel.KProgram;\nimport org.parallelj.internal.kernel.procedure.CallableProcedure;\nimport org.parallelj.internal.kernel.procedure.RunnableProcedure;\nimport org.parallelj.internal.reflect.ProgramAdapter.Adapter;\nimport org.parallelj.launching.LaunchingMessageKind;\nimport org.parallelj.launching.ReturnCodes;\nimport org.parallelj.mirror.ProgramType;\nimport org.quartz.Job;\nimport org.quartz.JobDataMap;\nimport org.quartz.JobExecutionContext;\nimport org.quartz.JobExecutionException;\n\n\/**\n * Implements the Job.execute(..) method\n * \n * \n *\/\nprivileged public aspect ProgramJobsAdapter {\n\n\t\/*\n\t * The Aspect JobsAdapter must be passed before this.\n\t *\/\n\tdeclare precedence :\n\t\torg.parallelj.internal.kernel.Identifiers,\n\t\torg.parallelj.internal.reflect.ProgramAdapter,\n\t\torg.parallelj.internal.util.sm.impl.KStateMachines,\n\t\torg.parallelj.internal.util.sm.impl.KStateMachines.PerMachine,\n\t\torg.parallelj.Executables$PerExecutable,\n\t\torg.parallelj.internal.reflect.ProgramAdapter.PerProgram,\n\t\torg.parallelj.internal.log.Logs,\n\t\torg.parallelj.launching.quartz.JobsAdapter;\n\n\t\/*\n\t * Add the interface IProceduresInError to the KProcessor\n\t*\/\n\tprivate interface IProceduresInError {\n\t\tpublic void addProcedureInError(String name, Exception exception);\n\t}\n\tpublic Map<String, Set<String>> IProceduresInError.proceduresInError=new HashMap<String, Set<String>>();\n\t\n\tpublic synchronized void IProceduresInError.addProcedureInError(String name, Exception exception) {\n\t\tSet<String> exceptions = ((IProceduresInError)this).proceduresInError.get(name);\n\t\tif (exceptions==null) {\n\t\t\t\/\/ This is the first \"name\" Procedure in error\n\t\t\texceptions = new HashSet<String>();\n\t\t}\n\t\tif (!exceptions.contains(exception.getClass().getCanonicalName())) {\n\t\t\texceptions.add(exception.getClass().getCanonicalName());\n\t\t}\n\t\t((IProceduresInError)this).proceduresInError.put(name, exceptions);\n\t}\n\t\n\tdeclare parents: org.parallelj.internal.kernel.KProcessor implements IProceduresInError;\n\n\t\/**\n\t * Launch a Program and initialize the Result as a JobDataMap.\n\t * \n\t * @param self\n\t * @param context\n\t * @throws JobExecutionException\n\t *\/\n\tvoid around(Job self, JobExecutionContext context)\n\t\t\tthrows JobExecutionException : \n\t\texecution( public void  Job+.execute(..) throws JobExecutionException) \n\t\t\t&& (within(@org.parallelj.Program *) || within(JobsAdapter)) \n\t\t\t\t&& args(context) && this(self) {\n\t\tJobDataMap jobDataMap = new JobDataMap();\n\t\tcontext.setResult(jobDataMap);\n\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.SUCCESS);\n\n\t\tproceed(self, context);\n\n\t\ttry {\n\t\t\t\/\/ Initialize an ExecutorService with the Capacity of the Program\n\t\t\tProcessHelper<?> processHelper = Programs.as((Adapter) self);\n\t\t\tif (processHelper == null) {\n\t\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.NOTSTARTED);\n\t\t\t\tthrow new JobExecutionException(LaunchingMessageKind.ELAUNCH0003.getFormatedMessage(self));\n\t\t\t}\n\t\t\tProgramType programType = processHelper.getProcess().getProgram();\n\t\t\tExecutorService service = null;\n\t\t\t\/\/ If an executorService was specified, we use it\n\n\t\t\tif (context.getJobDetail().getJobDataMap().get(Launch.DEFAULT_EXECUTOR_KEY) != null) {\n\t\t\t\tservice = (ExecutorService)context.getJobDetail().getJobDataMap().get(Launch.DEFAULT_EXECUTOR_KEY);\n\t\t\t} else \n\t\t\tif (programType instanceof KProgram) {\n\t\t\t\tshort programCapacity = ((KProgram) programType)\n\t\t\t\t\t\t.getCapacity();\n\t\t\t\tservice = (programCapacity == Short.MAX_VALUE) ? Executors\n\t\t\t\t\t\t.newCachedThreadPool() : Executors\n\t\t\t\t\t\t.newFixedThreadPool(programCapacity);\n\t\t\t} else {\n\t\t\t\tservice = Executors\n\t\t\t\t\t\t.newCachedThreadPool();\n\t\t\t}\n\n\t\t\t\/\/ Launch the program with the initialized ExecutorService\n\t\t\tprocessHelper.execute(service).join();\n\t\t\t\n\t\t\tKProcessor rootProcessor = ((KProcessor)processHelper.getProcess().getProcessor());\n\t\t\tIProceduresInError procedures = (IProceduresInError)rootProcessor;\n\t\t\tif(procedures.proceduresInError.size()>0) {\n\t\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.FAILURE);\n\t\t\t}\n\t\t\n\t\t\tProgramFieldsBinder.getProgramOutputFields(this, context);\n\t\t\tservice.shutdown();\n\t\t\t\n\t\t\tif (procedures.proceduresInError.size()>0){\n\t\t\t\tjobDataMap.put(QuartzUtils.PROCEDURES_IN_ERROR, procedures.proceduresInError);\n\t\t\t\tthrow new JobExecutionException();\n\t\t\t}\n\t\t} catch (IllegalAccessException e) {\n\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.FAILURE);\n\t\t\tthrow new JobExecutionException(e);\n\t\t} catch (NoSuchFieldException e) {\n\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.FAILURE);\n\t\t\tthrow new JobExecutionException(e);\n\t\t}\n\t}\n\t\n\t\/*\n\t * Add the interface IExceptionTracking to all Runnable and Callable\n\t *\/\n    public interface IExceptionTracking {};\n  \tprivate Object IExceptionTracking.context = null;\n\t\n    declare parents:           \n    \t(java.lang.Runnable+ ) implements IExceptionTracking;\n    declare parents:           \n    \t(java.util.concurrent.Callable+ ) implements IExceptionTracking;    \n  \t\n\t\/\/ Interception around Runnable execution      \n  \tafter(Object self) returning (Runnable ret): \n  \t\texecution(* org.parallelj.internal.kernel.procedure.RunnableProcedure.RunnableCall.toRunnable())\n      && this(self)  {\n   \t  ((IExceptionTracking)ret).context = ((org.parallelj.internal.kernel.KCall)self);\n    }\n\n\t\/\/ Interception around Callable execution      \n  \tafter(Object self) returning (Runnable ret): \n  \t\texecution(* org.parallelj.internal.kernel.procedure.CallableProcedure.CallableCall.toRunnable())\n      && this(self)  {\n   \t  ((IExceptionTracking)ret).context = ((org.parallelj.internal.kernel.KCall)self);\n    }\n\n\t\/\/ Interception around Runnable execution      \n\t void around(Object self): call(void complete())\n\t&& within(org.parallelj.internal.kernel.procedure.RunnableProcedure.RunnableCall)  \n\t\t&& this(self)  {\n\t \n\t\t\tRunnableProcedure.RunnableCall runnable = (RunnableProcedure.RunnableCall)((IExceptionTracking)self).context;\n\t\t\tRunnableProcedure procedure = (RunnableProcedure)runnable.getProcedure();\n\t\t\tif (runnable.getException() != null) {\n\t\t\t\tKProcess process = ((RunnableProcedure.RunnableCall)((IExceptionTracking)self).context).getProcess();\n\t\t\t\tKProcessor rootProcessor = process.getProcessor();\/\/.getRootProcessor();\n\t\t\t\t((IProceduresInError)rootProcessor).addProcedureInError(procedure.getType(), runnable.getException());\n\t\t\t}\n\t\tproceed(self);\n\t}\n\n\t\/\/ Interception around Callable execution      \n\t void around(Object self): call(void complete())\n\t\t && within(org.parallelj.internal.kernel.procedure.CallableProcedure.CallableCall)  \n\t\t&& this(self)  {\n\t \n\t\t\tCallableProcedure.CallableCall callable = (CallableProcedure.CallableCall)((IExceptionTracking)self).context;\n\t\t\tCallableProcedure procedure = (CallableProcedure)callable.getProcedure(); \n\t\t\t\n\t\t\tif (\n\t\t\t\t\tprocedure.getHandler() == null\n\t\t\t\t\t&& callable.getException() != null\n\t\t\t\t\t) {\n\t\t\t\t\/\/ There is an error !!!\n\t\t\t\tKProcess process = ((CallableProcedure.CallableCall)((IExceptionTracking)self).context).getProcess();\n\t\t\t\tKProcessor rootProcessor = process.getProcessor();\/\/.getRootProcessor();\n\t\t\t\t((IProceduresInError)rootProcessor).addProcedureInError(procedure.getType(), callable.getException());\n\t\t\t}\n\t\tproceed(self);\n\t}\n\t \n\t\/*\n\t * Allow to get the procedures in error of a Process (the root Process !!!)\n\t *\/\n\tpublic static synchronized Map<String, Set<String>> getProceduresInErrors(\n\t\t\torg.parallelj.mirror.Process process) {\n\t\tKProcessor rootProcessor = ((KProcessor) process.getProcessor());\n\t\tIProceduresInError procedures = (IProceduresInError) rootProcessor;\n\t\treturn procedures.proceduresInError;\n\t}\n}\n","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"a2cb190bcfd5e7b12ef6b2edfc57d319d986abaf","subject":"attempt to fix rollback\/inactive bug","message":"attempt to fix rollback\/inactive bug\n","repos":"palava\/palava-jpa-aspectj","old_file":"src\/main\/java\/de\/cosmocode\/palava\/jpa\/aspectj\/EntityTransactionAspect.aj","new_file":"src\/main\/java\/de\/cosmocode\/palava\/jpa\/aspectj\/EntityTransactionAspect.aj","new_contents":"\/**\n * Copyright 2010 CosmoCode GmbH\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage de.cosmocode.palava.jpa.aspectj;\n\nimport javax.persistence.EntityManager;\nimport javax.persistence.EntityTransaction;\nimport javax.persistence.PersistenceException;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\nimport de.cosmocode.palava.jpa.Transactional;\n\npublic final aspect EntityTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(EntityTransactionAspect.class);\n\n    private Provider<EntityManager> currentManager;\n    \n    @Inject\n    public void setProvider(Provider<EntityManager> manager) {\n        this.currentManager = Preconditions.checkNotNull(manager, \"Manager\");\n    }\n    \n    pointcut transactional(): execution(@Transactional * *.*(..));\n\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        final EntityManager manager = currentManager.get();\n        LOG.trace(\"Retrieved entitymanager {}\", manager);\n        final EntityTransaction tx = manager.getTransaction();\n        LOG.trace(\"Using transaction {}\", tx);\n        final boolean localTx = !tx.isActive();\n        \n        if (localTx) {\n            LOG.trace(\"Beginning automatic transaction\");\n            tx.begin();\n        } else {\n            LOG.trace(\"Transaction already active\");\n        }\n        \n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (RuntimeException e) {\n            LOG.error(\"Exception inside automatic transaction context\", e);\n            tx.rollback();\n            throw e;\n        }\n        \n        if (localTx && tx.isActive()) {\n            if (tx.getRollbackOnly()) {\n                LOG.trace(\"Transaction was marked as rollback only. Rolling back...\");\n                tx.rollback();\n            } else {\n                try {\n                    tx.commit();\n                    LOG.trace(\"Committed automatic transaction\");\n                } catch (PersistenceException e) {\n                    LOG.error(\"Commit in automatic transaction context failed\", e);\n                    if (tx.isActive()) {\n                        LOG.info(\"Rolling back {}\", tx);\n                        tx.rollback();\n                    } else {\n                        LOG.info(\"Can't roll back inactive transaction {}\", tx);\n                    }\n                    throw e;\n                }\n            }\n        }\n        \n        return returnValue;\n    }\n    \n}\n","old_contents":"\/**\n * Copyright 2010 CosmoCode GmbH\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage de.cosmocode.palava.jpa.aspectj;\n\nimport javax.persistence.EntityManager;\nimport javax.persistence.EntityTransaction;\nimport javax.persistence.PersistenceException;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\nimport de.cosmocode.palava.jpa.Transactional;\n\npublic final aspect EntityTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(EntityTransactionAspect.class);\n\n    private Provider<EntityManager> currentManager;\n    \n    @Inject\n    public void setProvider(Provider<EntityManager> manager) {\n        this.currentManager = Preconditions.checkNotNull(manager, \"Manager\");\n    }\n    \n    pointcut transactional(): execution(@Transactional * *.*(..));\n\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        final EntityManager manager = currentManager.get();\n        LOG.trace(\"Retrieved entitymanager {}\", manager);\n        final EntityTransaction tx = manager.getTransaction();\n        LOG.trace(\"Using transaction {}\", tx);\n        final boolean localTx = !tx.isActive();\n        \n        if (localTx) {\n            LOG.trace(\"Beginning automatic transaction\");\n            tx.begin();\n        } else {\n            LOG.trace(\"Transaction already active\");\n        }\n        \n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (RuntimeException e) {\n            LOG.error(\"Exception inside automatic transaction context\", e);\n            tx.rollback();\n            throw e;\n        }\n        \n        if (localTx && tx.isActive()) {\n            if (tx.getRollbackOnly()) {\n                LOG.trace(\"Transaction was marked as rollback only. Rolling back...\");\n                tx.rollback();\n            } else {\n                try {\n                    tx.commit();\n                    LOG.trace(\"Committed automatic transaction\");\n                } catch (PersistenceException e) {\n                    LOG.error(\"Commit in automatic transaction context failed\", e);\n                    tx.rollback();\n                    throw e;\n                }\n            }\n        }\n        \n        return returnValue;\n    }\n    \n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"174d9eefa3ddf32047e16734feb74b9042cd6084","subject":"log commits with debug instead of trace","message":"log commits with debug instead of trace\n\n","repos":"palava\/palava-jpa-aspectj","old_file":"src\/main\/java\/de\/cosmocode\/palava\/jpa\/aspectj\/EntityTransactionAspect.aj","new_file":"src\/main\/java\/de\/cosmocode\/palava\/jpa\/aspectj\/EntityTransactionAspect.aj","new_contents":"\/**\n * Copyright 2010 CosmoCode GmbH\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage de.cosmocode.palava.jpa.aspectj;\n\nimport javax.persistence.EntityManager;\nimport javax.persistence.EntityTransaction;\nimport javax.persistence.PersistenceException;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.gag.annotation.remark.Hack;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\nimport de.cosmocode.palava.jpa.Transactional;\n\npublic final aspect EntityTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(EntityTransactionAspect.class);\n\n    private Provider<EntityManager> currentManager;\n    \n    @Inject\n    public void setProvider(Provider<EntityManager> manager) {\n        this.currentManager = Preconditions.checkNotNull(manager, \"Manager\");\n    }\n    \n    pointcut transactional(): execution(@Transactional * *.*(..));\n\n    @SuppressWarnings(\"finally\")\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        final EntityManager manager = currentManager.get();\n        LOG.trace(\"Retrieved entitymanager {}\", manager);\n        final EntityTransaction tx = manager.getTransaction();\n        LOG.trace(\"Using transaction {}\", tx);\n        \n        final boolean local = !tx.isActive();\n        \n        if (local) {\n            LOG.debug(\"Beginning automatic transaction {}\", tx);\n            tx.begin();\n        } else {\n            LOG.trace(\"Transaction {} already active\", tx);\n        }\n        \n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (Exception e) {\n            try {\n                if (local && (tx.isActive() || tx.getRollbackOnly())) {\n                    LOG.debug(\"Rolling back local\/active transaction {}\", tx);\n                    tx.rollback();\n                } else if (!tx.getRollbackOnly()) {\n                    LOG.debug(\"Setting transaction {} as rollback only\", tx);\n                    tx.setRollbackOnly();\n                }\n            } catch (PersistenceException inner) {\n                LOG.error(\"Rollback failed\", inner);\n            } finally {\n                \/\/ hack to support throwing checked exceptions\n                return sneakyThrow(e);\n            }\n        }\n        \n        if (local && tx.isActive()) {\n            if (tx.getRollbackOnly()) {\n                LOG.debug(\"Rolling back marked transaction {}\", tx);\n                tx.rollback();\n            } else {\n                try {\n                    tx.commit();\n                    LOG.debug(\"Committed automatic transaction {}\", tx);\n                } catch (PersistenceException e) {\n                    try {\n                        LOG.debug(\"Rolling back transaction {}\", tx);\n                        tx.rollback();\n                    } catch (PersistenceException inner) {\n                        LOG.error(\"Rollback failed\", inner);\n                    }\n                    throw e;\n                }\n            }\n        } else {\n            LOG.trace(\"Not committing non-local transaction {}\", tx);\n        }\n        \n        return returnValue;\n    }\n    \n    @Hack(\"Why is this possible?\")\n    private Object sneakyThrow(Throwable t) {\n        this.<RuntimeException>doSneakyThrow(t);\n        return null;\n    }\n\n    @SuppressWarnings(\"unchecked\")\n    private <T extends Throwable> T doSneakyThrow(Throwable t) throws T {\n        throw (T) t;\n    }\n    \n}\n","old_contents":"\/**\n * Copyright 2010 CosmoCode GmbH\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage de.cosmocode.palava.jpa.aspectj;\n\nimport javax.persistence.EntityManager;\nimport javax.persistence.EntityTransaction;\nimport javax.persistence.PersistenceException;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.gag.annotation.remark.Hack;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\nimport de.cosmocode.palava.jpa.Transactional;\n\npublic final aspect EntityTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(EntityTransactionAspect.class);\n\n    private Provider<EntityManager> currentManager;\n    \n    @Inject\n    public void setProvider(Provider<EntityManager> manager) {\n        this.currentManager = Preconditions.checkNotNull(manager, \"Manager\");\n    }\n    \n    pointcut transactional(): execution(@Transactional * *.*(..));\n\n    @SuppressWarnings(\"finally\")\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        final EntityManager manager = currentManager.get();\n        LOG.trace(\"Retrieved entitymanager {}\", manager);\n        final EntityTransaction tx = manager.getTransaction();\n        LOG.trace(\"Using transaction {}\", tx);\n        \n        final boolean local = !tx.isActive();\n        \n        if (local) {\n            LOG.debug(\"Beginning automatic transaction {}\", tx);\n            tx.begin();\n        } else {\n            LOG.trace(\"Transaction {} already active\", tx);\n        }\n        \n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (Exception e) {\n            try {\n                if (local && (tx.isActive() || tx.getRollbackOnly())) {\n                    LOG.debug(\"Rolling back local\/active transaction {}\", tx);\n                    tx.rollback();\n                } else if (!tx.getRollbackOnly()) {\n                    LOG.debug(\"Setting transaction {} as rollback only\", tx);\n                    tx.setRollbackOnly();\n                }\n            } catch (PersistenceException inner) {\n                LOG.error(\"Rollback failed\", inner);\n            } finally {\n                \/\/ hack to support throwing checked exceptions\n                return sneakyThrow(e);\n            }\n        }\n        \n        if (local && tx.isActive()) {\n            if (tx.getRollbackOnly()) {\n                LOG.debug(\"Rolling back marked transaction {}\", tx);\n                tx.rollback();\n            } else {\n                try {\n                    tx.commit();\n                    LOG.trace(\"Committed automatic transaction {}\", tx);\n                } catch (PersistenceException e) {\n                    try {\n                        LOG.debug(\"Rolling back transaction {}\", tx);\n                        tx.rollback();\n                    } catch (PersistenceException inner) {\n                        LOG.error(\"Rollback failed\", inner);\n                    }\n                    throw e;\n                }\n            }\n        } else {\n            LOG.trace(\"Not committing non-local transaction {}\", tx);\n        }\n        \n        return returnValue;\n    }\n    \n    @Hack(\"Why is this possible?\")\n    private Object sneakyThrow(Throwable t) {\n        this.<RuntimeException>doSneakyThrow(t);\n        return null;\n    }\n\n    @SuppressWarnings(\"unchecked\")\n    private <T extends Throwable> T doSneakyThrow(Throwable t) throws T {\n        throw (T) t;\n    }\n    \n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"260858fa2f95dfcefc5e0f3ce3797b7d8a31bf92","subject":"[misc] Remove unused imports","message":"[misc] Remove unused imports\n","repos":"pbondoer\/xwiki-platform,pbondoer\/xwiki-platform,pbondoer\/xwiki-platform,pbondoer\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,xwiki\/xwiki-platform,xwiki\/xwiki-platform,xwiki\/xwiki-platform,xwiki\/xwiki-platform","old_file":"xwiki-platform-core\/xwiki-platform-legacy\/xwiki-platform-legacy-oldcore\/src\/main\/aspect\/compatibility\/com\/xpn\/xwiki\/doc\/XWikiDocumentCompatibilityAspect.aj","new_file":"xwiki-platform-core\/xwiki-platform-legacy\/xwiki-platform-legacy-oldcore\/src\/main\/aspect\/compatibility\/com\/xpn\/xwiki\/doc\/XWikiDocumentCompatibilityAspect.aj","new_contents":"\/*\n * See the NOTICE file distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This is free software; you can redistribute it and\/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF site: http:\/\/www.fsf.org.\n *\/\npackage com.xpn.xwiki.doc;\n\nimport java.io.ByteArrayOutputStream;\nimport java.io.IOException;\nimport java.io.OutputStream;\nimport java.util.ArrayList;\nimport java.util.Collections;\nimport java.util.LinkedHashMap;\nimport java.util.List;\nimport java.util.Map;\nimport java.util.Vector;\nimport java.util.regex.Matcher;\nimport java.util.regex.Pattern;\n\nimport org.dom4j.Document;\nimport org.dom4j.io.OutputFormat;\nimport org.xwiki.model.reference.DocumentReference;\nimport org.xwiki.model.reference.EntityReference;\nimport org.xwiki.rendering.block.Block;\nimport org.xwiki.rendering.block.HeaderBlock;\nimport org.xwiki.rendering.block.XDOM;\nimport org.xwiki.rendering.block.match.ClassBlockMatcher;\nimport org.xwiki.rendering.listener.HeaderLevel;\nimport org.xwiki.rendering.syntax.Syntax;\nimport org.xwiki.rendering.transformation.TransformationContext;\nimport org.xwiki.rendering.transformation.TransformationManager;\n\nimport com.xpn.xwiki.XWikiContext;\nimport com.xpn.xwiki.XWikiException;\nimport com.xpn.xwiki.api.DocumentSection;\nimport com.xpn.xwiki.internal.xml.XMLWriter;\nimport com.xpn.xwiki.objects.BaseObject;\nimport com.xpn.xwiki.objects.classes.BaseClass;\nimport com.xpn.xwiki.objects.classes.PropertyClass;\nimport com.xpn.xwiki.plugin.query.XWikiCriteria;\nimport com.xpn.xwiki.web.Utils;\n\n\/**\n * Add a backward compatibility layer to the {@link com.xpn.xwiki.doc.XWikiDocument} class.\n *\n * @version $Id$\n *\/\nprivileged public aspect XWikiDocumentCompatibilityAspect\n{\n    \/**\n     * @deprecated since 3.0M3 use {@code Syntax.XWIKI_1_0} instead\n     *\/\n    @Deprecated\n    public static final String XWikiDocument.XWIKI10_SYNTAXID = Syntax.XWIKI_1_0.toIdString();\n\n    \/**\n     * @deprecated since 3.0M3 use {@code Syntax.XWIKI_2_0} instead\n     *\/\n    @Deprecated\n    public static final String XWikiDocument.XWIKI20_SYNTAXID = Syntax.XWIKI_2_0.toIdString();\n\n    \/**\n     * @deprecated use setStringListValue or setDBStringListProperty\n     *\/\n    @Deprecated\n    public void XWikiDocument.setListValue(String className, String fieldName, List value)\n    {\n        BaseObject bobject = getObject(className);\n        if (bobject == null) {\n            bobject = new BaseObject();\n            addObject(className, bobject);\n        }\n        bobject.setName(getFullName());\n        bobject.setClassName(className);\n        bobject.setListValue(fieldName, value);\n        setContentDirty(true);\n    }\n    \n    \/**\n     * This method to split section according to title.\n     * \n     * @return the sections in the current document\n     * @throws XWikiException\n     * @deprecated use {@link #getSections()} instead, since 1.6M1\n     *\/\n    @Deprecated\n    public List<DocumentSection> XWikiDocument.getSplitSectionsAccordingToTitle() throws XWikiException\n    {\n        return getSections();\n    }\n    \n    \/**\n     * @deprecated use {@link #getUniqueLinkedPages(XWikiContext)}\n     *\/\n    @Deprecated\n    public List<String> XWikiDocument.getLinkedPages(XWikiContext context)\n    {\n        return new ArrayList<String>(getUniqueLinkedPages(context));\n    }\n    \n    \/**\n     * @deprecated use {@link #getUniqueWikiLinkedPages(XWikiContext)} instead\n     *\/\n    @Deprecated\n    public List<XWikiLink> XWikiDocument.getLinks(XWikiContext context) throws XWikiException\n    {\n        return getWikiLinkedPages(context);\n    }\n\n    \/**\n     * @deprecated use {@link #getUniqueWikiLinkedPages(XWikiContext)} instead\n     *\/\n    @Deprecated\n    public List<XWikiLink> XWikiDocument.getWikiLinkedPages(XWikiContext context) throws XWikiException\n    {\n        return new ArrayList<XWikiLink>(getUniqueWikiLinkedPages(context));\n    }\n    \n    \/**\n     * @deprecated use {@link #getBackLinkedPages(XWikiContext)} instead\n     *\/\n    @Deprecated\n    public List<String> XWikiDocument.getBacklinks(XWikiContext context) throws XWikiException\n    {\n        return getBackLinkedPages(context);\n    }\n    \n    \/**\n     * @param text the text to render\n     * @param context the XWiki Context object\n     * @return the given text rendered in the context of this document\n     * @deprecated since 1.6M1 use {@link #getRenderedContent(String, String, com.xpn.xwiki.XWikiContext)}\n     *\/\n    @Deprecated\n    public String XWikiDocument.getRenderedContent(String text, XWikiContext context)\n    {\n        return getRenderedContent(text, Syntax.XWIKI_1_0.toIdString(), context);\n    }\n\n    @Deprecated\n    public String XWikiDocument.displaySearch(PropertyClass pclass, String prefix, XWikiCriteria criteria, XWikiContext context)\n    {\n        return (pclass == null) ? \"\" : pclass.displaySearch(pclass.getName(), prefix, criteria, context);\n    }\n\n    \/**\n     * @param context the XWiki context used to get access to the com.xpn.xwiki.render.XWikiRenderingEngine object\n     * @return the document title. If a title has not been provided, look for a section title in the document's content\n     *         and if not found return the page name. The returned title is also interpreted which means it's allowed to\n     *         use Velocity, Groovy, etc syntax within a title.\n     * @deprecated use {@link #getRenderedTitle(Syntax, XWikiContext)} instead\n     *\/\n    @Deprecated\n    public String XWikiDocument.getDisplayTitle(XWikiContext context)\n    {\n        return getRenderedTitle(Syntax.XHTML_1_0, context);\n    }\n\n    \/**\n     * @deprecated since 2.2M1, use {@link #getXClass()} instead\n     *\/\n    @Deprecated\n    public BaseClass XWikiDocument.getxWikiClass()\n    {\n        return getXClass();\n    }\n\n    \/**\n     * @deprecated since 2.2M2 use {@link #addXObjectFromRequest(XWikiContext)}\n     *\/\n    @Deprecated\n    public BaseObject XWikiDocument.addObjectFromRequest(XWikiContext context) throws XWikiException\n    {\n        return addXObjectFromRequest(context);\n    }\n\n    \/**\n     * @deprecated since 2.2M2 use {@link #setXObjectsToRemove(List)} instead\n     *\/\n    @Deprecated\n    public void XWikiDocument.setObjectsToRemove(ArrayList<BaseObject> objectsToRemove)\n    {\n        setXObjectsToRemove(objectsToRemove);\n    }\n\n    \/**\n     * @deprecated since 2.2M1, use {@link #setXClass(BaseClass)} instead\n     *\/\n    @Deprecated\n    public void XWikiDocument.setxWikiClass(BaseClass xwikiClass)\n    {\n        setXClass(xwikiClass);\n    }\n\n    \/**\n     * @deprecated since 2.2M1 use {@link #getXObjects()} instead. Warning: if you used to modify the returned Map note\n     *             that since 2.2M1 this will no longer work and you'll need to call the setXObject methods instead (or\n     *             setxWikiObjects()). Obviously the best is to move to the new API.\n     *\/\n    @Deprecated\n    public Map<String, Vector<BaseObject>> XWikiDocument.getxWikiObjects()\n    {\n        \/\/ Use a liked hash map to ensure we keep the order stored from the internal objects map.\n        Map<String, Vector<BaseObject>> objects = new LinkedHashMap<String, Vector<BaseObject>>();\n\n        for (Map.Entry<DocumentReference, List<BaseObject>> entry : getXObjects().entrySet()) {\n            objects.put(this.compactWikiEntityReferenceSerializer.serialize(entry.getKey()), new Vector<BaseObject>(\n                entry.getValue()));\n        }\n\n        return objects;\n    }\n\n    \/**\n     * @deprecated since 2.2M1 use {@link #setXObjects(Map)} instead\n     *\/\n    @Deprecated\n    public void XWikiDocument.setxWikiObjects(Map<String, Vector<BaseObject>> objects)\n    {\n        \/\/ Use a liked hash map to ensure we keep the order stored from the internal objects map.\n        Map<DocumentReference, List<BaseObject>> newObjects = new LinkedHashMap<DocumentReference, List<BaseObject>>();\n\n        for (Map.Entry<String, Vector<BaseObject>> entry : objects.entrySet()) {\n            newObjects.put(resolveClassReference(entry.getKey()), new ArrayList<BaseObject>(entry.getValue()));\n        }\n\n        setXObjects(newObjects);\n    }\n\n    \/**\n     * @deprecated since 2.2M1 use {@link #getXClasses(XWikiContext)} instead\n     *\/\n    @Deprecated\n    public List<BaseClass> XWikiDocument.getxWikiClasses(XWikiContext context)\n    {\n        return getXClasses(context);\n    }\n\n    \/**\n     * @deprecated since 2.2M1 use {@link #setXObjects(DocumentReference, List)} instead\n     *\/\n    @Deprecated\n    public void XWikiDocument.setObjects(String className, Vector<BaseObject> objects)\n    {\n        setXObjects(resolveClassReference(className), new ArrayList<BaseObject>(objects));\n    }\n\n    \/**\n     * @deprecated since 3.2M3, use {@link #getRenderedTitle(Syntax, XWikiContext)} instead\n     *\/\n    @Deprecated\n    public String XWikiDocument.extractTitle()\n    {\n        String title = \"\";\n\n        try {\n            if (is10Syntax()) {\n                title = extractTitle10();\n            } else {\n                List<HeaderBlock> blocks =\n                    getXDOM().getBlocks(new ClassBlockMatcher(HeaderBlock.class), Block.Axes.DESCENDANT);\n                if (!blocks.isEmpty()) {\n                    HeaderBlock header = blocks.get(0);\n                    if (header.getLevel().compareTo(HeaderLevel.LEVEL2) <= 0) {\n                        XDOM headerXDOM = new XDOM(Collections.<Block> singletonList(header));\n\n                        \/\/ transform\n                        TransformationContext context = new TransformationContext(headerXDOM, getSyntax());\n                        Utils.getComponent(TransformationManager.class).performTransformations(headerXDOM, context);\n\n                        \/\/ render\n                        Block headerBlock = headerXDOM.getChildren().get(0);\n                        if (headerBlock instanceof HeaderBlock) {\n                            title = renderXDOM(new XDOM(headerBlock.getChildren()), Syntax.XHTML_1_0);\n                        }\n                    }\n                }\n            }\n        } catch (Exception e) {\n            \/\/ Don't stop when there's a problem rendering the title.\n        }\n\n        return title;\n    }\n\n    \/**\n     * Regex for finding the first level 1 or 2 heading in the document title, to be used as the document title.\n     * \n     * @deprecated since 3.2M3\n     **\/\n    @Deprecated\n    private static final Pattern HEADING_PATTERN_10 = Pattern.compile(\"^\\\\s*+1(?:\\\\.1)?\\\\s++(.++)$\", Pattern.MULTILINE);\n\n    \/**\n     * @return the first level 1 or level 1.1 title text in the document's content or \"\" if none are found\n     * @deprecated since 3.2M3\n     *\/\n    @Deprecated\n    private String XWikiDocument.extractTitle10()\n    {\n        String content = getContent();\n        Matcher m = HEADING_PATTERN_10.matcher(content);\n        if (m.find()) {\n            return m.group(1).trim();\n        }\n\n        return \"\";\n    }\n\n    \/**\n     * Convert a {@link Document} into an XML string. You should prefer\n     * {@link #toXML(OutputStream, boolean, boolean, boolean, boolean, XWikiContext)} or\n     * {@link #toXML(com.xpn.xwiki.internal.xml.XMLWriter, boolean, boolean, boolean, boolean, XWikiContext)} when\n     * possible to avoid memory load.\n     * \n     * @param doc the {@link Document} to convert to a String\n     * @param context current XWikiContext\n     * @return an XML representation of the {@link Document}\n     * @deprecated this method has nothing to do here and is apparently unused\n     *\/\n    @Deprecated\n    public String XWikiDocument.toXML(Document doc, XWikiContext context)\n    {\n        String encoding = context.getWiki().getEncoding();\n\n        ByteArrayOutputStream os = new ByteArrayOutputStream();\n        try {\n            XMLWriter wr = new XMLWriter(os, new OutputFormat(\"\", true, encoding));\n            wr.write(doc);\n            return os.toString(encoding);\n        } catch (IOException e) {\n            LOGGER.error(\"Exception while doc.toXML\", e);\n            return \"\";\n        }\n    }\n\n    \/**\n     * @deprecated since 2.2M1 use {@link #cloneXObjects(XWikiDocument)} instead\n     *\/\n    @Deprecated\n    public void XWikiDocument.clonexWikiObjects(XWikiDocument templatedoc)\n    {\n        cloneXObjects(templatedoc);\n    }\n    \n    \/**\n     * @deprecated since 5.2M1 use {@link #removeAttachment(XWikiAttachment)} instead\n     *\/\n    @Deprecated\n    public void XWikiDocument.deleteAttachment(XWikiAttachment attachment, XWikiContext context) throws XWikiException\n    {\n        deleteAttachment(attachment, true, context);\n    }\n\n    \/**\n     * @deprecated since 5.2M1 use {@link #removeAttachment(XWikiAttachment)} instead\n     *\/\n    @Deprecated\n    public void XWikiDocument.deleteAttachment(XWikiAttachment attachment, boolean toRecycleBin, XWikiContext context)\n        throws XWikiException\n    {\n        deleteAttachment(attachment, true, toRecycleBin, context);\n    }\n\n    \/**\n     * @deprecated since 5.2M1 use {@link #removeAttachment(XWikiAttachment)} instead\n     *\/\n    @Deprecated\n    private void XWikiDocument.deleteAttachment(XWikiAttachment attachment, boolean saveDocument, boolean toRecycleBin,\n        XWikiContext context) throws XWikiException\n    {\n        removeAttachment(attachment, toRecycleBin);\n\n        if (saveDocument) {\n            \/\/ Save the document\n            context.getWiki().saveDocument(this, \"Deleted attachment [\" + attachment.getFilename() + \"]\", context);\n        }\n    }\n\n    \/**\n     * Convert a full document reference into the proper relative document reference (wiki part is removed if it's the\n     * same as document wiki) to store as parent.\n     * \n     * @deprecated since 2.2.3 use {@link #setParentReference(org.xwiki.model.reference.EntityReference)} instead\n     *\/\n    @Deprecated\n    public void XWikiDocument.setParentReference(DocumentReference parentReference)\n    {\n        if (parentReference != null) {\n            setParent(serializeReference(parentReference, this.compactWikiEntityReferenceSerializer,\n                getDocumentReference()));\n        } else {\n            setParentReference((EntityReference) null);\n        }\n    }\n}\n","old_contents":"\/*\n * See the NOTICE file distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This is free software; you can redistribute it and\/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF site: http:\/\/www.fsf.org.\n *\/\npackage com.xpn.xwiki.doc;\n\nimport java.io.ByteArrayOutputStream;\nimport java.io.IOException;\nimport java.io.OutputStream;\nimport java.util.ArrayList;\nimport java.util.Collections;\nimport java.util.LinkedHashMap;\nimport java.util.List;\nimport java.util.Map;\nimport java.util.Vector;\nimport java.util.regex.Matcher;\nimport java.util.regex.Pattern;\n\nimport org.dom4j.Document;\nimport org.dom4j.io.OutputFormat;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\nimport org.xwiki.model.reference.DocumentReference;\nimport org.xwiki.model.reference.EntityReference;\nimport org.xwiki.rendering.block.Block;\nimport org.xwiki.rendering.block.HeaderBlock;\nimport org.xwiki.rendering.block.XDOM;\nimport org.xwiki.rendering.block.match.ClassBlockMatcher;\nimport org.xwiki.rendering.listener.HeaderLevel;\nimport org.xwiki.rendering.syntax.Syntax;\nimport org.xwiki.rendering.transformation.TransformationContext;\nimport org.xwiki.rendering.transformation.TransformationManager;\n\nimport com.xpn.xwiki.XWikiContext;\nimport com.xpn.xwiki.XWikiException;\nimport com.xpn.xwiki.api.DocumentSection;\nimport com.xpn.xwiki.internal.xml.XMLWriter;\nimport com.xpn.xwiki.objects.BaseObject;\nimport com.xpn.xwiki.objects.classes.BaseClass;\nimport com.xpn.xwiki.objects.classes.PropertyClass;\nimport com.xpn.xwiki.plugin.query.XWikiCriteria;\nimport com.xpn.xwiki.web.Utils;\n\n\/**\n * Add a backward compatibility layer to the {@link com.xpn.xwiki.doc.XWikiDocument} class.\n *\n * @version $Id$\n *\/\nprivileged public aspect XWikiDocumentCompatibilityAspect\n{\n    \/**\n     * @deprecated since 3.0M3 use {@code Syntax.XWIKI_1_0} instead\n     *\/\n    @Deprecated\n    public static final String XWikiDocument.XWIKI10_SYNTAXID = Syntax.XWIKI_1_0.toIdString();\n\n    \/**\n     * @deprecated since 3.0M3 use {@code Syntax.XWIKI_2_0} instead\n     *\/\n    @Deprecated\n    public static final String XWikiDocument.XWIKI20_SYNTAXID = Syntax.XWIKI_2_0.toIdString();\n\n    \/**\n     * @deprecated use setStringListValue or setDBStringListProperty\n     *\/\n    @Deprecated\n    public void XWikiDocument.setListValue(String className, String fieldName, List value)\n    {\n        BaseObject bobject = getObject(className);\n        if (bobject == null) {\n            bobject = new BaseObject();\n            addObject(className, bobject);\n        }\n        bobject.setName(getFullName());\n        bobject.setClassName(className);\n        bobject.setListValue(fieldName, value);\n        setContentDirty(true);\n    }\n    \n    \/**\n     * This method to split section according to title.\n     * \n     * @return the sections in the current document\n     * @throws XWikiException\n     * @deprecated use {@link #getSections()} instead, since 1.6M1\n     *\/\n    @Deprecated\n    public List<DocumentSection> XWikiDocument.getSplitSectionsAccordingToTitle() throws XWikiException\n    {\n        return getSections();\n    }\n    \n    \/**\n     * @deprecated use {@link #getUniqueLinkedPages(XWikiContext)}\n     *\/\n    @Deprecated\n    public List<String> XWikiDocument.getLinkedPages(XWikiContext context)\n    {\n        return new ArrayList<String>(getUniqueLinkedPages(context));\n    }\n    \n    \/**\n     * @deprecated use {@link #getUniqueWikiLinkedPages(XWikiContext)} instead\n     *\/\n    @Deprecated\n    public List<XWikiLink> XWikiDocument.getLinks(XWikiContext context) throws XWikiException\n    {\n        return getWikiLinkedPages(context);\n    }\n\n    \/**\n     * @deprecated use {@link #getUniqueWikiLinkedPages(XWikiContext)} instead\n     *\/\n    @Deprecated\n    public List<XWikiLink> XWikiDocument.getWikiLinkedPages(XWikiContext context) throws XWikiException\n    {\n        return new ArrayList<XWikiLink>(getUniqueWikiLinkedPages(context));\n    }\n    \n    \/**\n     * @deprecated use {@link #getBackLinkedPages(XWikiContext)} instead\n     *\/\n    @Deprecated\n    public List<String> XWikiDocument.getBacklinks(XWikiContext context) throws XWikiException\n    {\n        return getBackLinkedPages(context);\n    }\n    \n    \/**\n     * @param text the text to render\n     * @param context the XWiki Context object\n     * @return the given text rendered in the context of this document\n     * @deprecated since 1.6M1 use {@link #getRenderedContent(String, String, com.xpn.xwiki.XWikiContext)}\n     *\/\n    @Deprecated\n    public String XWikiDocument.getRenderedContent(String text, XWikiContext context)\n    {\n        return getRenderedContent(text, Syntax.XWIKI_1_0.toIdString(), context);\n    }\n\n    @Deprecated\n    public String XWikiDocument.displaySearch(PropertyClass pclass, String prefix, XWikiCriteria criteria, XWikiContext context)\n    {\n        return (pclass == null) ? \"\" : pclass.displaySearch(pclass.getName(), prefix, criteria, context);\n    }\n\n    \/**\n     * @param context the XWiki context used to get access to the com.xpn.xwiki.render.XWikiRenderingEngine object\n     * @return the document title. If a title has not been provided, look for a section title in the document's content\n     *         and if not found return the page name. The returned title is also interpreted which means it's allowed to\n     *         use Velocity, Groovy, etc syntax within a title.\n     * @deprecated use {@link #getRenderedTitle(Syntax, XWikiContext)} instead\n     *\/\n    @Deprecated\n    public String XWikiDocument.getDisplayTitle(XWikiContext context)\n    {\n        return getRenderedTitle(Syntax.XHTML_1_0, context);\n    }\n\n    \/**\n     * @deprecated since 2.2M1, use {@link #getXClass()} instead\n     *\/\n    @Deprecated\n    public BaseClass XWikiDocument.getxWikiClass()\n    {\n        return getXClass();\n    }\n\n    \/**\n     * @deprecated since 2.2M2 use {@link #addXObjectFromRequest(XWikiContext)}\n     *\/\n    @Deprecated\n    public BaseObject XWikiDocument.addObjectFromRequest(XWikiContext context) throws XWikiException\n    {\n        return addXObjectFromRequest(context);\n    }\n\n    \/**\n     * @deprecated since 2.2M2 use {@link #setXObjectsToRemove(List)} instead\n     *\/\n    @Deprecated\n    public void XWikiDocument.setObjectsToRemove(ArrayList<BaseObject> objectsToRemove)\n    {\n        setXObjectsToRemove(objectsToRemove);\n    }\n\n    \/**\n     * @deprecated since 2.2M1, use {@link #setXClass(BaseClass)} instead\n     *\/\n    @Deprecated\n    public void XWikiDocument.setxWikiClass(BaseClass xwikiClass)\n    {\n        setXClass(xwikiClass);\n    }\n\n    \/**\n     * @deprecated since 2.2M1 use {@link #getXObjects()} instead. Warning: if you used to modify the returned Map note\n     *             that since 2.2M1 this will no longer work and you'll need to call the setXObject methods instead (or\n     *             setxWikiObjects()). Obviously the best is to move to the new API.\n     *\/\n    @Deprecated\n    public Map<String, Vector<BaseObject>> XWikiDocument.getxWikiObjects()\n    {\n        \/\/ Use a liked hash map to ensure we keep the order stored from the internal objects map.\n        Map<String, Vector<BaseObject>> objects = new LinkedHashMap<String, Vector<BaseObject>>();\n\n        for (Map.Entry<DocumentReference, List<BaseObject>> entry : getXObjects().entrySet()) {\n            objects.put(this.compactWikiEntityReferenceSerializer.serialize(entry.getKey()), new Vector<BaseObject>(\n                entry.getValue()));\n        }\n\n        return objects;\n    }\n\n    \/**\n     * @deprecated since 2.2M1 use {@link #setXObjects(Map)} instead\n     *\/\n    @Deprecated\n    public void XWikiDocument.setxWikiObjects(Map<String, Vector<BaseObject>> objects)\n    {\n        \/\/ Use a liked hash map to ensure we keep the order stored from the internal objects map.\n        Map<DocumentReference, List<BaseObject>> newObjects = new LinkedHashMap<DocumentReference, List<BaseObject>>();\n\n        for (Map.Entry<String, Vector<BaseObject>> entry : objects.entrySet()) {\n            newObjects.put(resolveClassReference(entry.getKey()), new ArrayList<BaseObject>(entry.getValue()));\n        }\n\n        setXObjects(newObjects);\n    }\n\n    \/**\n     * @deprecated since 2.2M1 use {@link #getXClasses(XWikiContext)} instead\n     *\/\n    @Deprecated\n    public List<BaseClass> XWikiDocument.getxWikiClasses(XWikiContext context)\n    {\n        return getXClasses(context);\n    }\n\n    \/**\n     * @deprecated since 2.2M1 use {@link #setXObjects(DocumentReference, List)} instead\n     *\/\n    @Deprecated\n    public void XWikiDocument.setObjects(String className, Vector<BaseObject> objects)\n    {\n        setXObjects(resolveClassReference(className), new ArrayList<BaseObject>(objects));\n    }\n\n    \/**\n     * @deprecated since 3.2M3, use {@link #getRenderedTitle(Syntax, XWikiContext)} instead\n     *\/\n    @Deprecated\n    public String XWikiDocument.extractTitle()\n    {\n        String title = \"\";\n\n        try {\n            if (is10Syntax()) {\n                title = extractTitle10();\n            } else {\n                List<HeaderBlock> blocks =\n                    getXDOM().getBlocks(new ClassBlockMatcher(HeaderBlock.class), Block.Axes.DESCENDANT);\n                if (!blocks.isEmpty()) {\n                    HeaderBlock header = blocks.get(0);\n                    if (header.getLevel().compareTo(HeaderLevel.LEVEL2) <= 0) {\n                        XDOM headerXDOM = new XDOM(Collections.<Block> singletonList(header));\n\n                        \/\/ transform\n                        TransformationContext context = new TransformationContext(headerXDOM, getSyntax());\n                        Utils.getComponent(TransformationManager.class).performTransformations(headerXDOM, context);\n\n                        \/\/ render\n                        Block headerBlock = headerXDOM.getChildren().get(0);\n                        if (headerBlock instanceof HeaderBlock) {\n                            title = renderXDOM(new XDOM(headerBlock.getChildren()), Syntax.XHTML_1_0);\n                        }\n                    }\n                }\n            }\n        } catch (Exception e) {\n            \/\/ Don't stop when there's a problem rendering the title.\n        }\n\n        return title;\n    }\n\n    \/**\n     * Regex for finding the first level 1 or 2 heading in the document title, to be used as the document title.\n     * \n     * @deprecated since 3.2M3\n     **\/\n    @Deprecated\n    private static final Pattern HEADING_PATTERN_10 = Pattern.compile(\"^\\\\s*+1(?:\\\\.1)?\\\\s++(.++)$\", Pattern.MULTILINE);\n\n    \/**\n     * @return the first level 1 or level 1.1 title text in the document's content or \"\" if none are found\n     * @deprecated since 3.2M3\n     *\/\n    @Deprecated\n    private String XWikiDocument.extractTitle10()\n    {\n        String content = getContent();\n        Matcher m = HEADING_PATTERN_10.matcher(content);\n        if (m.find()) {\n            return m.group(1).trim();\n        }\n\n        return \"\";\n    }\n\n    \/**\n     * Convert a {@link Document} into an XML string. You should prefer\n     * {@link #toXML(OutputStream, boolean, boolean, boolean, boolean, XWikiContext)} or\n     * {@link #toXML(com.xpn.xwiki.internal.xml.XMLWriter, boolean, boolean, boolean, boolean, XWikiContext)} when\n     * possible to avoid memory load.\n     * \n     * @param doc the {@link Document} to convert to a String\n     * @param context current XWikiContext\n     * @return an XML representation of the {@link Document}\n     * @deprecated this method has nothing to do here and is apparently unused\n     *\/\n    @Deprecated\n    public String XWikiDocument.toXML(Document doc, XWikiContext context)\n    {\n        String encoding = context.getWiki().getEncoding();\n\n        ByteArrayOutputStream os = new ByteArrayOutputStream();\n        try {\n            XMLWriter wr = new XMLWriter(os, new OutputFormat(\"\", true, encoding));\n            wr.write(doc);\n            return os.toString(encoding);\n        } catch (IOException e) {\n            LOGGER.error(\"Exception while doc.toXML\", e);\n            return \"\";\n        }\n    }\n\n    \/**\n     * @deprecated since 2.2M1 use {@link #cloneXObjects(XWikiDocument)} instead\n     *\/\n    @Deprecated\n    public void XWikiDocument.clonexWikiObjects(XWikiDocument templatedoc)\n    {\n        cloneXObjects(templatedoc);\n    }\n    \n    \/**\n     * @deprecated since 5.2M1 use {@link #removeAttachment(XWikiAttachment)} instead\n     *\/\n    @Deprecated\n    public void XWikiDocument.deleteAttachment(XWikiAttachment attachment, XWikiContext context) throws XWikiException\n    {\n        deleteAttachment(attachment, true, context);\n    }\n\n    \/**\n     * @deprecated since 5.2M1 use {@link #removeAttachment(XWikiAttachment)} instead\n     *\/\n    @Deprecated\n    public void XWikiDocument.deleteAttachment(XWikiAttachment attachment, boolean toRecycleBin, XWikiContext context)\n        throws XWikiException\n    {\n        deleteAttachment(attachment, true, toRecycleBin, context);\n    }\n\n    \/**\n     * @deprecated since 5.2M1 use {@link #removeAttachment(XWikiAttachment)} instead\n     *\/\n    @Deprecated\n    private void XWikiDocument.deleteAttachment(XWikiAttachment attachment, boolean saveDocument, boolean toRecycleBin,\n        XWikiContext context) throws XWikiException\n    {\n        removeAttachment(attachment, toRecycleBin);\n\n        if (saveDocument) {\n            \/\/ Save the document\n            context.getWiki().saveDocument(this, \"Deleted attachment [\" + attachment.getFilename() + \"]\", context);\n        }\n    }\n\n    \/**\n     * Convert a full document reference into the proper relative document reference (wiki part is removed if it's the\n     * same as document wiki) to store as parent.\n     * \n     * @deprecated since 2.2.3 use {@link #setParentReference(org.xwiki.model.reference.EntityReference)} instead\n     *\/\n    @Deprecated\n    public void XWikiDocument.setParentReference(DocumentReference parentReference)\n    {\n        if (parentReference != null) {\n            setParent(serializeReference(parentReference, this.compactWikiEntityReferenceSerializer,\n                getDocumentReference()));\n        } else {\n            setParentReference((EntityReference) null);\n        }\n    }\n}\n","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"22ba950d68815be6b5d343fd91fcd96828c6b809","subject":"made AbstractPalavaAspect deprecated","message":"made AbstractPalavaAspect deprecated\n","repos":"palava\/palava-core,palava\/palava-core","old_file":"src\/main\/java\/de\/cosmocode\/palava\/core\/aop\/AbstractPalavaAspect.aj","new_file":"src\/main\/java\/de\/cosmocode\/palava\/core\/aop\/AbstractPalavaAspect.aj","new_contents":"\/**\n * Copyright 2010 CosmoCode GmbH\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage de.cosmocode.palava.core.aop;\n\nimport java.util.Collections;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.common.collect.Iterables;\nimport com.google.inject.Binder;\nimport com.google.inject.Guice;\nimport com.google.inject.Injector;\nimport com.google.inject.Module;\nimport com.google.inject.Stage;\n\n\/**\n * Abstract aspect which intercepts {@link Guice#createInjector(..)} calls\n * to get hands on the injector.\n *\n * @deprecated use {@link PalavaAspect}\n * @since 2.0\n * @author Willi Schoenborn\n *\/\n@Deprecated\npublic abstract aspect AbstractPalavaAspect {\n\n    private static final Logger LOG = LoggerFactory.getLogger(AbstractPalavaAspect.class);\n    \n    private final Module module = new Module() {\n        \n        @Override\n        public void configure(Binder binder) {\n            final AbstractPalavaAspect self = AbstractPalavaAspect.this;\n            LOG.trace(\"Injecting members on {}\", self);\n            Preconditions.checkState(!alreadyInjected, \"Members have been already injected on %s\", self);\n            binder.requestInjection(self);\n            alreadyInjected = true;\n        }\n        \n    };\n    \n    private boolean alreadyInjected;\n    \n    private Module[] append(Module[] modules) {\n        final Module[] array = new Module[modules.length + 1];\n        System.arraycopy(modules, 0, array, 0, modules.length);\n        array[modules.length] = module;\n        return array;\n    }\n    \n    private Iterable<Module> append(Iterable<? extends Module> modules) {\n        return Iterables.concat(modules, Collections.singleton(module));\n    }\n    \n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Injector around(Module[] modules): call(Injector Guice.createInjector(Module...)) && args(modules) {\n        return proceed(append(modules));\n    }\n\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Injector around(Iterable<? extends Module> modules): \n        call(Injector Guice.createInjector(Iterable<? extends Module>)) && args(modules) {\n        return proceed(append(modules));\n    }\n\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Injector around(Stage stage, Module[] modules): \n        call(Injector Guice.createInjector(Stage, Module...)) && args(stage, modules) {\n        return proceed(stage, append(modules));\n    }\n\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Injector around(Stage stage, Iterable<? extends Module> modules): \n        call(Injector Guice.createInjector(Stage, Iterable<? extends Module>)) && args(stage, modules) {\n        return proceed(stage, append(modules));\n    }\n    \n    protected final void checkState() {\n        Preconditions.checkState(alreadyInjected, \"Members have not been injected on %s\", this);\n    }\n\n}\n","old_contents":"\/**\n * Copyright 2010 CosmoCode GmbH\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage de.cosmocode.palava.core.aop;\n\nimport java.util.Collections;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.common.collect.Iterables;\nimport com.google.inject.Binder;\nimport com.google.inject.Guice;\nimport com.google.inject.Injector;\nimport com.google.inject.Module;\nimport com.google.inject.Stage;\n\n\/**\n * Abstract aspect which intercepts {@link Guice#createInjector(..)} calls\n * to get hands on the injector.\n *\n * @since 2.0\n * @author Willi Schoenborn\n *\/\npublic abstract aspect AbstractPalavaAspect {\n\n    private static final Logger LOG = LoggerFactory.getLogger(AbstractPalavaAspect.class);\n    \n    private final Module module = new Module() {\n        \n        @Override\n        public void configure(Binder binder) {\n            final AbstractPalavaAspect self = AbstractPalavaAspect.this;\n            LOG.trace(\"Injecting members on {}\", self);\n            Preconditions.checkState(!alreadyInjected, \"Members have been already injected on %s\", self);\n            binder.requestInjection(self);\n            alreadyInjected = true;\n        }\n        \n    };\n    \n    private boolean alreadyInjected;\n    \n    private Module[] append(Module[] modules) {\n        final Module[] array = new Module[modules.length + 1];\n        System.arraycopy(modules, 0, array, 0, modules.length);\n        array[modules.length] = module;\n        return array;\n    }\n    \n    private Iterable<Module> append(Iterable<? extends Module> modules) {\n        return Iterables.concat(modules, Collections.singleton(module));\n    }\n    \n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Injector around(Module[] modules): call(Injector Guice.createInjector(Module...)) && args(modules) {\n        return proceed(append(modules));\n    }\n\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Injector around(Iterable<? extends Module> modules): \n        call(Injector Guice.createInjector(Iterable<? extends Module>)) && args(modules) {\n        return proceed(append(modules));\n    }\n\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Injector around(Stage stage, Module[] modules): \n        call(Injector Guice.createInjector(Stage, Module...)) && args(stage, modules) {\n        return proceed(stage, append(modules));\n    }\n\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Injector around(Stage stage, Iterable<? extends Module> modules): \n        call(Injector Guice.createInjector(Stage, Iterable<? extends Module>)) && args(stage, modules) {\n        return proceed(stage, append(modules));\n    }\n    \n    protected final void checkState() {\n        Preconditions.checkState(alreadyInjected, \"Members have not been injected on %s\", this);\n    }\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"7a514f3fe62f17bbfeea8620b99df10c7be8b2ef","subject":"Fixed #3034. Review by community.","message":"Fixed #3034. Review by community.\n\ngit-svn-id: f4ecfe233223879a4a16cd7937f11b5152963d8e@20893 5e8d7ff9-d8ef-0310-90f0-a4852d11357a\n","repos":"Kwestor\/scala-ide,Duhemm\/scala-ide,dragos\/scala-ide,andrey-ilinykh\/scala-ide,sschaef\/scala-ide,sschaef\/scala-ide,aleksi-lukkarinen\/scala-ide,dragos\/scala-ide,aleksi-lukkarinen\/scala-ide,romanowski\/scala-ide,aleksi-lukkarinen\/scala-ide,romanowski\/scala-ide,andrey-ilinykh\/scala-ide,pilipolio\/scala-ide,mlangc\/scala-ide,scala-ide\/scala-ide,stephenh\/scala-ide,andrey-ilinykh\/scala-ide,stephenh\/scala-ide,pilipolio\/scala-ide,Kwestor\/scala-ide,Duhemm\/scala-ide,wpopielarski\/scala-ide,sschaef\/scala-ide,wpopielarski\/scala-ide,romanowski\/scala-ide,Kwestor\/scala-ide,andrey-ilinykh\/scala-ide,Duhemm\/scala-ide,Kwestor\/scala-ide,mlangc\/scala-ide,pilipolio\/scala-ide,scala-ide\/scala-ide,scala-ide\/scala-ide,stephenh\/scala-ide,dragos\/scala-ide,sschaef\/scala-ide,scala-ide\/scala-ide,mlangc\/scala-ide,romanowski\/scala-ide,stephenh\/scala-ide,aleksi-lukkarinen\/scala-ide,wpopielarski\/scala-ide,wpopielarski\/scala-ide,mlangc\/scala-ide,pilipolio\/scala-ide,Duhemm\/scala-ide,dragos\/scala-ide","old_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/core\/RefactoringAvailabilityAspect.aj","new_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/core\/RefactoringAvailabilityAspect.aj","new_contents":"\/*\n * Copyright 2005-2010 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.core;\n\nimport org.eclipse.jface.viewers.IStructuredSelection;\n\nimport java.util.ArrayList;\nimport java.util.Arrays;\nimport java.util.Iterator;\nimport java.util.List;\n\nimport org.eclipse.core.resources.IResource;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.internal.corext.refactoring.RefactoringAvailabilityTester;\nimport org.eclipse.jdt.internal.corext.refactoring.reorg.ReorgUtils;\nimport org.eclipse.jdt.internal.ui.refactoring.actions.RenameResourceAction;\nimport org.eclipse.jface.viewers.IStructuredSelection;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaElement;\n\n@SuppressWarnings(\"restriction\")\npublic aspect RefactoringAvailabilityAspect {\n  pointcut isAvailable(Object arg) :\n    execution(static boolean RefactoringAvailabilityTester.is*Available(!IResource)) &&\n    args(arg);\n\n  pointcut isAvailable2(IResource[] arg1, IJavaElement[] arg2) :\n    execution(static boolean RefactoringAvailabilityTester.is*Available(IResource[], IJavaElement[])) &&\n    args(arg1, arg2);\n\n  pointcut getResources(Object[] elements) :\n    execution(static IResource[] RefactoringAvailabilityTester.getResources(Object[])) &&\n    args(elements);\n\n  pointcut getJavaElements(Object[] elements) :\n    execution(static IJavaElement[] RefactoringAvailabilityTester.getJavaElements(Object[])) &&\n    args(elements);\n  \n  pointcut getResources2(List elements) :\n    execution(static IResource[] ReorgUtils.getResources(List)) &&\n    args(elements);\n\n  pointcut getJavaElements2(List elements) :\n    execution(static IJavaElement[] ReorgUtils.getJavaElements(List)) &&\n    args(elements);\n  \n  pointcut getResource(IStructuredSelection selection) :\n    execution(static IResource RenameResourceAction.getResource(IStructuredSelection)) &&\n    args(selection);\n\n  boolean around(Object arg) :\n    isAvailable(arg) {\n    if (arg instanceof IScalaElement)\n      return false;\n    else if (arg instanceof IStructuredSelection)\n      for(Iterator i = ((IStructuredSelection)arg).iterator(); i.hasNext();)\n        if (i.next() instanceof IScalaElement)\n          return false;\n     \n    return proceed(arg);\n  }\n  \n  boolean around(IResource[] resources, IJavaElement[] elements) :\n    isAvailable2(resources, elements) {\n    if (elements == null || elements.length == 0)\n      return proceed(resources, elements);\n    \n    int numElements = elements.length;\n    boolean hasScalaElement = false;\n    for (int i = 0; i < numElements; ++i)\n      if (elements[i] instanceof IScalaElement) {\n        hasScalaElement = true;\n        break;\n      }\n    \n    if (!hasScalaElement)\n      return proceed(resources, elements);\n    \n    List newElements = new ArrayList();\n    \n    List newResources = new ArrayList();\n    if (resources != null)\n      newResources.addAll(Arrays.asList(resources));\n    \n    for (int i = 0; i < numElements; ++i) {\n      IJavaElement elem = elements[i];\n      if (elem instanceof IScalaElement) {\n        try {\n          IResource resource = elem.getCorrespondingResource();\n          if (resource != null)\n            newResources.add(resource);\n        } catch (JavaModelException ex) {\n          \/\/ Deliberately ignored\n        }\n      } else\n        newElements.add(elem);\n    }\n\n    return proceed(\n      (IResource[])newResources.toArray(new IResource[newResources.size()]),\n      (IJavaElement[])newElements.toArray(new IJavaElement[newElements.size()]));\n  }\n  \n  IResource[] around(Object[] elements) :\n    getResources(elements) {\n    List result= new ArrayList();\n    for (int index= 0; index < elements.length; index++) {\n      Object elem = elements[index]; \n      if (elem instanceof IResource)\n        result.add(elem);\n      else if (elem instanceof IScalaElement) {\n        try {\n          IResource resource = ((IJavaElement)elem).getCorrespondingResource();\n          if (resource != null)\n            result.add(resource);\n        } catch (JavaModelException ex) {\n          \/\/ Deliberately ignored\n        }\n      }\n    }\n    return (IResource[]) result.toArray(new IResource[result.size()]);\n  }\n\n  IJavaElement[] around(Object[] elements) :\n    getJavaElements(elements) {\n    List result= new ArrayList();\n    for (int index= 0; index < elements.length; index++) {\n      Object elem = elements[index]; \n      if ((elem instanceof IJavaElement) && !(elem instanceof IScalaElement))\n        result.add(elem);\n    }\n    return (IJavaElement[]) result.toArray(new IJavaElement[result.size()]);\n  }\n  \n  IResource[] around(List elements) :\n    getResources2(elements) {\n    List result= new ArrayList();\n    for (Iterator i = elements.iterator(); i.hasNext(); ) {\n      Object elem = i.next(); \n      if (elem instanceof IResource)\n        result.add(elem);\n      else if (elem instanceof IScalaElement) {\n        try {\n          IResource resource = ((IJavaElement)elem).getCorrespondingResource();\n          if (resource != null)\n            result.add(resource);\n        } catch (JavaModelException ex) {\n          \/\/ Deliberately ignored\n        }\n      }\n    }\n    return (IResource[]) result.toArray(new IResource[result.size()]);\n  }\n\n  IJavaElement[] around(List elements) :\n    getJavaElements2(elements) {\n    List result= new ArrayList();\n    for (Iterator i = elements.iterator(); i.hasNext(); ) {\n      Object elem = i.next(); \n      if ((elem instanceof IJavaElement) && !(elem instanceof IScalaElement))\n        result.add(elem);\n    }\n    return (IJavaElement[]) result.toArray(new IJavaElement[result.size()]);\n  }\n\n  IResource around(IStructuredSelection selection) :\n    getResource(selection) {\n    if (selection.size() != 1)\n      return null;\n    Object first= selection.getFirstElement();\n    if (first instanceof IScalaElement) {\n      try {\n        return ((IJavaElement)first).getCorrespondingResource();\n      } catch (JavaModelException ex) {\n        return null;\n      }\n    }\n    else if (!(first instanceof IResource))\n      return null;\n    return (IResource)first;\n  }\n}\n","old_contents":"\/*\n * Copyright 2005-2010 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.core;\n\nimport org.eclipse.jface.viewers.IStructuredSelection;\n\nimport java.util.ArrayList;\nimport java.util.Iterator;\nimport java.util.List;\n\nimport org.eclipse.core.resources.IResource;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.internal.corext.refactoring.RefactoringAvailabilityTester;\nimport org.eclipse.jdt.internal.corext.refactoring.reorg.ReorgUtils;\nimport org.eclipse.jdt.internal.ui.refactoring.actions.RenameResourceAction;\nimport org.eclipse.jface.viewers.IStructuredSelection;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaElement;\n\n@SuppressWarnings(\"restriction\")\npublic aspect RefactoringAvailabilityAspect {\n  pointcut isAvailable(Object arg) :\n    execution(static boolean RefactoringAvailabilityTester.is*Available(!IResource)) &&\n    args(arg);\n\n  pointcut isAvailable2(IResource[] arg1, IJavaElement[] arg2) :\n    execution(static boolean RefactoringAvailabilityTester.is*Available(IResource[], IJavaElement[])) &&\n    args(arg1, arg2);\n\n  pointcut getResources(Object[] elements) :\n    execution(static IResource[] RefactoringAvailabilityTester.getResources(Object[])) &&\n    args(elements);\n\n  pointcut getJavaElements(Object[] elements) :\n    execution(static IJavaElement[] RefactoringAvailabilityTester.getJavaElements(Object[])) &&\n    args(elements);\n  \n  pointcut getResources2(List elements) :\n    execution(static IResource[] ReorgUtils.getResources(List)) &&\n    args(elements);\n\n  pointcut getJavaElements2(List elements) :\n    execution(static IJavaElement[] ReorgUtils.getJavaElements(List)) &&\n    args(elements);\n  \n  pointcut getResource(IStructuredSelection selection) :\n    execution(static IResource RenameResourceAction.getResource(IStructuredSelection)) &&\n    args(selection);\n\n  boolean around(Object arg) :\n    isAvailable(arg) {\n    if (arg instanceof IScalaElement)\n      return false;\n    else if (arg instanceof IStructuredSelection)\n      for(Iterator i = ((IStructuredSelection)arg).iterator(); i.hasNext();)\n        if (i.next() instanceof IScalaElement)\n          return false;\n     \n    return proceed(arg);\n  }\n  \n  boolean around(IResource[] resources, IJavaElement[] elements) :\n    isAvailable2(resources, elements) {\n    if (elements == null || elements.length == 0)\n      return proceed(resources, elements);\n    else if (resources == null || resources.length == 0) {\n      if (elements == null || elements.length == 0)\n        return false;\n      \n      int limit = elements.length;\n      IResource[] newResources = new IResource[limit];\n      for (int i = 0; i < limit; ++i) {\n        IJavaElement elem = elements[i]; \n        if (elem instanceof IResource)\n          newResources[i] = (IResource)elem;\n        else\n          return false;\n      }\n      return proceed(newResources, null);\n    }\n    else {\n      int limit = elements.length;\n      IResource[] newResources = new IResource[resources.length+limit];\n      System.arraycopy(resources, 0, newResources, 0, resources.length);\n      for (int i = 0, j = resources.length; i < limit; ++i, ++j) {\n        IJavaElement elem = elements[i]; \n        if (elem instanceof IResource)\n          newResources[j] = (IResource)elem;\n        else\n          return false;\n      }\n      return proceed(newResources, null);\n    }\n  }\n  \n  IResource[] around(Object[] elements) :\n    getResources(elements) {\n    List result= new ArrayList();\n    for (int index= 0; index < elements.length; index++) {\n      Object elem = elements[index]; \n      if (elem instanceof IResource)\n        result.add(elem);\n      else if (elem instanceof IScalaElement) {\n        try {\n          IResource resource = ((IJavaElement)elem).getCorrespondingResource();\n          if (resource != null)\n            result.add(resource);\n        } catch (JavaModelException ex) {\n          \/\/ Deliberately ignored\n        }\n      }\n    }\n    return (IResource[]) result.toArray(new IResource[result.size()]);\n  }\n\n  IJavaElement[] around(Object[] elements) :\n    getJavaElements(elements) {\n    List result= new ArrayList();\n    for (int index= 0; index < elements.length; index++) {\n      Object elem = elements[index]; \n      if ((elem instanceof IJavaElement) && !(elem instanceof IScalaElement))\n        result.add(elem);\n    }\n    return (IJavaElement[]) result.toArray(new IJavaElement[result.size()]);\n  }\n  \n  IResource[] around(List elements) :\n    getResources2(elements) {\n    List result= new ArrayList();\n    for (Iterator i = elements.iterator(); i.hasNext(); ) {\n      Object elem = i.next(); \n      if (elem instanceof IResource)\n        result.add(elem);\n      else if (elem instanceof IScalaElement) {\n        try {\n          IResource resource = ((IJavaElement)elem).getCorrespondingResource();\n          if (resource != null)\n            result.add(resource);\n        } catch (JavaModelException ex) {\n          \/\/ Deliberately ignored\n        }\n      }\n    }\n    return (IResource[]) result.toArray(new IResource[result.size()]);\n  }\n\n  IJavaElement[] around(List elements) :\n    getJavaElements2(elements) {\n    List result= new ArrayList();\n    for (Iterator i = elements.iterator(); i.hasNext(); ) {\n      Object elem = i.next(); \n      if ((elem instanceof IJavaElement) && !(elem instanceof IScalaElement))\n        result.add(elem);\n    }\n    return (IJavaElement[]) result.toArray(new IJavaElement[result.size()]);\n  }\n\n  IResource around(IStructuredSelection selection) :\n    getResource(selection) {\n    if (selection.size() != 1)\n      return null;\n    Object first= selection.getFirstElement();\n    if (first instanceof IScalaElement) {\n      try {\n        return ((IJavaElement)first).getCorrespondingResource();\n      } catch (JavaModelException ex) {\n        return null;\n      }\n    }\n    else if (!(first instanceof IResource))\n      return null;\n    return (IResource)first;\n  }\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"6d0563662c4fde3c5747a84ce958f0f422e57dea","subject":"Improve error reporting bindings for two exception cases, to get away from handler(..) pointcuts which are less versatile for later debugging aspects to manipulate.","message":"Improve error reporting bindings for two exception cases, to get away from handler(..) pointcuts which are less versatile for later debugging aspects to manipulate.\n\ngit-svn-id: 2c527eb49caa05e19d6b2be874bf74fa9d7ea670@614317 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"pkozelka\/maven,xasx\/maven,ChristianSchulte\/maven,Mounika-Chirukuri\/maven,gorcz\/maven,mizdebsk\/maven,wangyuesong\/maven,olamy\/maven,likaiwalkman\/maven,changbai1980\/maven,apache\/maven,wangyuesong0\/maven,Tibor17\/maven,lbndev\/maven,barthel\/maven,wangyuesong\/maven,stephenc\/maven,lbndev\/maven,trajano\/maven,aheritier\/maven,dsyer\/maven,aheritier\/maven,wangyuesong0\/maven,cstamas\/maven,pkozelka\/maven,mcculls\/maven,stephenc\/maven,aheritier\/maven,josephw\/maven,kidaa\/maven-1,cstamas\/maven,karthikjaps\/maven,cstamas\/maven,kidaa\/maven-1,vedmishr\/demo1,josephw\/maven,trajano\/maven,atanasenko\/maven,rogerchina\/maven,skitt\/maven,dsyer\/maven,changbai1980\/maven,trajano\/maven,skitt\/maven,barthel\/maven,Tibor17\/maven,changbai1980\/maven,keith-turner\/maven,olamy\/maven,karthikjaps\/maven,mizdebsk\/maven,likaiwalkman\/maven,josephw\/maven,atanasenko\/maven,Mounika-Chirukuri\/maven,gorcz\/maven,mcculls\/maven,wangyuesong\/maven,runepeter\/maven-deploy-plugin-2.8.1,olamy\/maven,dsyer\/maven,karthikjaps\/maven,kidaa\/maven-1,keith-turner\/maven,runepeter\/maven-deploy-plugin-2.8.1,njuneau\/maven,rogerchina\/maven,xasx\/maven,apache\/maven,barthel\/maven,ChristianSchulte\/maven,atanasenko\/maven,likaiwalkman\/maven,rogerchina\/maven,pkozelka\/maven,vedmishr\/demo1,wangyuesong0\/maven,xasx\/maven,apache\/maven,njuneau\/maven,vedmishr\/demo1,stephenc\/maven,mizdebsk\/maven,lbndev\/maven,keith-turner\/maven,Distrotech\/maven,mcculls\/maven,skitt\/maven,gorcz\/maven,njuneau\/maven,Mounika-Chirukuri\/maven,ChristianSchulte\/maven,Distrotech\/maven","old_file":"maven-core\/src\/main\/aspect\/org\/apache\/maven\/errors\/LifecycleErrorReporterAspect.aj","new_file":"maven-core\/src\/main\/aspect\/org\/apache\/maven\/errors\/LifecycleErrorReporterAspect.aj","new_contents":"package org.apache.maven.errors;\n\nimport org.codehaus.plexus.logging.console.ConsoleLogger;\nimport org.codehaus.plexus.logging.Logger;\nimport org.codehaus.plexus.util.introspection.ReflectionValueExtractor;\nimport org.apache.maven.project.path.PathTranslator;\nimport org.apache.maven.plugin.MojoExecution;\nimport org.apache.maven.artifact.resolver.ArtifactResolutionException;\nimport org.apache.maven.artifact.resolver.MultipleArtifactsNotFoundException;\nimport org.apache.maven.plugin.PluginConfigurationException;\nimport org.apache.maven.plugin.descriptor.Parameter;\nimport org.apache.maven.plugin.loader.PluginLoaderException;\nimport org.apache.maven.plugin.loader.PluginLoader;\nimport org.apache.maven.plugin.PluginExecutionException;\nimport org.apache.maven.plugin.MojoExecutionException;\nimport org.apache.maven.artifact.resolver.ArtifactNotFoundException;\nimport org.apache.maven.execution.MavenSession;\nimport org.apache.maven.lifecycle.model.MojoBinding;\nimport org.apache.maven.lifecycle.statemgmt.StateManagementUtils;\nimport org.apache.maven.lifecycle.DefaultLifecycleExecutor;\nimport org.apache.maven.lifecycle.LifecycleException;\nimport org.apache.maven.lifecycle.LifecycleExecutionException;\nimport org.apache.maven.project.MavenProject;\nimport org.apache.maven.plugin.DefaultPluginManager;\nimport org.apache.maven.plugin.PluginManager;\nimport org.apache.maven.plugin.PluginParameterExpressionEvaluator;\nimport org.apache.maven.plugin.PluginParameterException;\nimport org.apache.maven.plugin.Mojo;\nimport org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;\nimport org.codehaus.plexus.component.repository.exception.ComponentLookupException;\nimport org.codehaus.plexus.configuration.PlexusConfiguration;\nimport org.codehaus.plexus.PlexusContainer;\nimport org.codehaus.plexus.util.introspection.ReflectionValueExtractor;\n\nimport java.util.List;\n\npublic privileged aspect LifecycleErrorReporterAspect\n    extends AbstractCoreReporterAspect\n{\n\n    private pointcut le_executeGoalAndHandleFailures( MojoBinding binding ):\n        execution( void DefaultLifecycleExecutor.executeGoalAndHandleFailures( MojoBinding, .. ) )\n        && args( binding, .. );\n\n    private pointcut le_executeGoalAndHandleFailures_withSession( MojoBinding binding, MavenSession session ):\n        execution( void DefaultLifecycleExecutor.executeGoalAndHandleFailures( MojoBinding, MavenSession, .. ) )\n        && args( binding, session, .. );\n\n    private pointcut pm_executeMojo( MavenProject project ):\n        execution( void PluginManager+.executeMojo( MavenProject, .. ) )\n        && args( project, .. );\n\n    private pointcut within_pm_executeMojo( MavenProject project ):\n        withincode( void PluginManager+.executeMojo( MavenProject, .. ) )\n        && args( project, .. );\n\n    after( MojoBinding binding, MavenProject project ) throwing ( PluginLoaderException cause ):\n        cflow( le_executeGoalAndHandleFailures( MojoBinding ) )\n        && call( * PluginLoader+.loadPlugin( MojoBinding, MavenProject, .. ) )\n        && args( binding, project, .. )\n    {\n        getReporter().reportErrorLoadingPlugin( binding, project, cause );\n    }\n\n    after( MojoBinding binding, MavenProject project ) throwing ( MojoExecutionException cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && call( void Mojo+.execute() )\n    {\n        \/\/ this will be covered by the reportErrorLoadingPlugin(..) method.\n        if ( !StateManagementUtils.RESOLVE_LATE_BOUND_PLUGIN_GOAL.equals( binding.getGoal() ) )\n        {\n            getReporter().reportMojoExecutionException( binding, project, cause );\n        }\n    }\n\n    PluginExecutionException around( MojoBinding binding, MavenProject project ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && call( PluginExecutionException.new( .., String ) )\n    {\n        PluginExecutionException cause = proceed( binding, project );\n        getReporter().reportInvalidPluginExecutionEnvironment( binding, project, cause );\n\n        return cause;\n    }\n\n    after( MojoBinding binding, MavenProject project ) throwing ( ComponentLookupException cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && withincode( Mojo DefaultPluginManager.getConfiguredMojo( .. ) )\n        && call( Object PlexusContainer+.lookup( .. ) )\n    {\n        getReporter().reportMojoLookupError( binding, project, cause );\n    }\n\n    Parameter currentParameter;\n\n    private pointcut paramGetName( Parameter parameter ):\n        call( String Parameter.getName() )\n        && target( parameter );\n\n    private pointcut pm_validatePomConfig():\n        execution( void DefaultPluginManager.validatePomConfiguration( .. ) );\n\n    private pointcut within_pm_validatePomConfig():\n        withincode( void DefaultPluginManager.validatePomConfiguration( .. ) );\n\n    private pointcut pm_checkRequiredParameters():\n        execution( void DefaultPluginManager.checkRequiredParameters( .. ) );\n\n    private pointcut within_pm_checkRequiredParameters():\n        withincode( void DefaultPluginManager.checkRequiredParameters( .. ) );\n\n    before( Parameter parameter ):\n        ( within_pm_validatePomConfig()\n          || within_pm_checkRequiredParameters() )\n        && paramGetName( parameter )\n    {\n        currentParameter = parameter;\n    }\n\n    after() returning:\n        pm_validatePomConfig() ||\n        pm_checkRequiredParameters()\n    {\n        currentParameter = null;\n    }\n\n    private pointcut pm_executeMojoWithSessionAndExec( MavenProject project, MojoExecution exec, MavenSession session, DefaultPluginManager manager ):\n        execution( void DefaultPluginManager.executeMojo( MavenProject, MojoExecution, MavenSession ) )\n        && args( project, exec, session )\n        && this( manager );\n\n    after( MojoBinding binding, MavenProject project, MojoExecution exec, MavenSession session, DefaultPluginManager manager ) throwing( PluginConfigurationException cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojoWithSessionAndExec( project, exec, session, manager ) )\n        && pm_validatePomConfig()\n    {\n        PathTranslator translator = manager.pathTranslator;\n        Logger logger = new ConsoleLogger( Logger.LEVEL_INFO, \"error reporting\" );\n        getReporter().reportAttemptToOverrideUneditableMojoParameter( currentParameter, binding, project, session, exec, translator, logger, cause );\n    }\n\n    PluginParameterException around( MojoBinding binding, MavenProject project, List invalidParameters ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && cflow( pm_checkRequiredParameters() )\n        && call( PluginParameterException.new( .., List ) )\n        && args( .., invalidParameters )\n    {\n        PluginParameterException err = proceed( binding, project, invalidParameters );\n\n        getReporter().reportMissingRequiredMojoParameter( binding, project, invalidParameters, err );\n\n        return err;\n    }\n\n    private pointcut ppee_evaluate( String expression ):\n        execution( Object PluginParameterExpressionEvaluator.evaluate( String ) )\n        && args( expression );\n\n    private pointcut within_ppee_evaluate( String expression ):\n        withincode( Object PluginParameterExpressionEvaluator.evaluate( String ) )\n        && args( expression );\n\n    before( MojoBinding binding, MavenProject project, String expression, ExpressionEvaluationException err ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && cflow( pm_checkRequiredParameters() )\n        && cflow( ppee_evaluate( expression ) )\n        && execution( ExpressionEvaluationException.new( String ) )\n        && this( err )\n    {\n        getReporter().reportUseOfBannedMojoParameter( currentParameter,\n                                                      binding,\n                                                      project,\n                                                      expression,\n                                                      (String) PluginParameterExpressionEvaluator.BANNED_EXPRESSIONS.get( expression ),\n                                                      err );\n    }\n\n    after( MojoBinding binding, MavenProject project, String expression ) throwing ( Exception cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && cflow( pm_checkRequiredParameters() )\n        && cflow( ppee_evaluate( expression ) )\n        && within( PluginParameterExpressionEvaluator )\n        && call( Object ReflectionValueExtractor.evaluate( String, Object ) )\n    {\n        getReporter().reportReflectionErrorWhileEvaluatingMojoParameter( currentParameter,\n                                                      binding,\n                                                      project,\n                                                      expression,\n                                                      cause );\n    }\n\n    after( MojoBinding binding, MavenProject project, PlexusConfiguration config ) throwing( PluginConfigurationException cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && execution( void DefaultPluginManager.populatePluginFields( *, *, PlexusConfiguration, .. ) )\n        && args( *, *, config, .. )\n    {\n        getReporter().reportErrorApplyingMojoConfiguration( binding, project, config, cause );\n    }\n\n    private pointcut pm_resolveTransitiveDependencies( MavenProject project, String scope ):\n        execution( void DefaultPluginManager.resolveTransitiveDependencies( *, *, String, *, MavenProject ) )\n        && args( *, *, scope, *, project );\n\n    after( MavenProject project, String scope ) throwing( ArtifactNotFoundException cause ):\n        pm_resolveTransitiveDependencies( project, scope )\n    {\n        getReporter().reportProjectDependenciesNotFound( project, scope, cause );\n    }\n\n    after( MavenProject project, String scope ) throwing( ArtifactResolutionException cause ):\n        pm_resolveTransitiveDependencies( project, scope )\n    {\n        if ( cause instanceof MultipleArtifactsNotFoundException )\n        {\n            getReporter().reportProjectDependenciesNotFound( project, scope, (MultipleArtifactsNotFoundException) cause );\n        }\n        else\n        {\n            getReporter().reportProjectDependenciesUnresolvable( project, scope, cause );\n        }\n    }\n\n    private pointcut le_getLifecycleBindings( List tasks, MavenProject configuringProject, String targetDescription ):\n        execution( List DefaultLifecycleExecutor.getLifecycleBindings( List, MavenProject, *, String ) )\n        && args( tasks, configuringProject, *, targetDescription );\n\n    before( List tasks, MavenProject configuringProject, String targetDescription, LifecycleException cause ):\n        cflow( le_getLifecycleBindings( tasks, configuringProject, targetDescription ) )\n        && call( LifecycleExecutionException.new( .., LifecycleException ) )\n        && args( .., cause )\n    {\n        getReporter().reportErrorFormulatingBuildPlan( tasks, configuringProject, targetDescription, cause );\n    }\n\n}\n","old_contents":"package org.apache.maven.errors;\n\nimport org.codehaus.plexus.logging.console.ConsoleLogger;\nimport org.codehaus.plexus.logging.Logger;\nimport org.apache.maven.project.path.PathTranslator;\nimport org.apache.maven.plugin.MojoExecution;\nimport org.apache.maven.artifact.resolver.ArtifactResolutionException;\nimport org.apache.maven.artifact.resolver.MultipleArtifactsNotFoundException;\nimport org.apache.maven.plugin.PluginConfigurationException;\nimport org.apache.maven.plugin.descriptor.Parameter;\nimport org.apache.maven.plugin.loader.PluginLoaderException;\nimport org.apache.maven.plugin.loader.PluginLoader;\nimport org.apache.maven.plugin.PluginExecutionException;\nimport org.apache.maven.plugin.MojoExecutionException;\nimport org.apache.maven.artifact.resolver.ArtifactNotFoundException;\nimport org.apache.maven.execution.MavenSession;\nimport org.apache.maven.lifecycle.model.MojoBinding;\nimport org.apache.maven.lifecycle.statemgmt.StateManagementUtils;\nimport org.apache.maven.lifecycle.DefaultLifecycleExecutor;\nimport org.apache.maven.lifecycle.LifecycleException;\nimport org.apache.maven.lifecycle.LifecycleExecutionException;\nimport org.apache.maven.project.MavenProject;\nimport org.apache.maven.plugin.DefaultPluginManager;\nimport org.apache.maven.plugin.PluginManager;\nimport org.apache.maven.plugin.PluginParameterExpressionEvaluator;\nimport org.apache.maven.plugin.PluginParameterException;\nimport org.apache.maven.plugin.Mojo;\nimport org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;\nimport org.codehaus.plexus.component.repository.exception.ComponentLookupException;\nimport org.codehaus.plexus.configuration.PlexusConfiguration;\nimport org.codehaus.plexus.PlexusContainer;\n\nimport java.util.List;\n\npublic privileged aspect LifecycleErrorReporterAspect\n    extends AbstractCoreReporterAspect\n{\n\n    private pointcut le_executeGoalAndHandleFailures( MojoBinding binding ):\n        execution( void DefaultLifecycleExecutor.executeGoalAndHandleFailures( MojoBinding, .. ) )\n        && args( binding, .. );\n\n    private pointcut le_executeGoalAndHandleFailures_withSession( MojoBinding binding, MavenSession session ):\n        execution( void DefaultLifecycleExecutor.executeGoalAndHandleFailures( MojoBinding, MavenSession, .. ) )\n        && args( binding, session, .. );\n\n    private pointcut pm_executeMojo( MavenProject project ):\n        execution( void PluginManager+.executeMojo( MavenProject, .. ) )\n        && args( project, .. );\n\n    private pointcut within_pm_executeMojo( MavenProject project ):\n        withincode( void PluginManager+.executeMojo( MavenProject, .. ) )\n        && args( project, .. );\n\n    after( MojoBinding binding, MavenProject project ) throwing ( PluginLoaderException cause ):\n        cflow( le_executeGoalAndHandleFailures( MojoBinding ) )\n        && call( * PluginLoader+.loadPlugin( MojoBinding, MavenProject, .. ) )\n        && args( binding, project, .. )\n    {\n        getReporter().reportErrorLoadingPlugin( binding, project, cause );\n    }\n\n    before( MojoBinding binding, MavenProject project, MojoExecutionException cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && handler( MojoExecutionException )\n        && args( cause )\n    {\n        \/\/ this will be covered by the reportErrorLoadingPlugin(..) method.\n        if ( !StateManagementUtils.RESOLVE_LATE_BOUND_PLUGIN_GOAL.equals( binding.getGoal() ) )\n        {\n            getReporter().reportMojoExecutionException( binding, project, cause );\n        }\n    }\n\n    PluginExecutionException around( MojoBinding binding, MavenProject project ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && call( PluginExecutionException.new( .., String ) )\n    {\n        PluginExecutionException cause = proceed( binding, project );\n        getReporter().reportInvalidPluginExecutionEnvironment( binding, project, cause );\n\n        return cause;\n    }\n\n    after( MojoBinding binding, MavenProject project ) throwing ( ComponentLookupException cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && withincode( Mojo DefaultPluginManager.getConfiguredMojo( .. ) )\n        && call( Object PlexusContainer+.lookup( .. ) )\n    {\n        getReporter().reportMojoLookupError( binding, project, cause );\n    }\n\n    Parameter currentParameter;\n\n    private pointcut paramGetName( Parameter parameter ):\n        call( String Parameter.getName() )\n        && target( parameter );\n\n    private pointcut pm_validatePomConfig():\n        execution( void DefaultPluginManager.validatePomConfiguration( .. ) );\n\n    private pointcut within_pm_validatePomConfig():\n        withincode( void DefaultPluginManager.validatePomConfiguration( .. ) );\n\n    private pointcut pm_checkRequiredParameters():\n        execution( void DefaultPluginManager.checkRequiredParameters( .. ) );\n\n    private pointcut within_pm_checkRequiredParameters():\n        withincode( void DefaultPluginManager.checkRequiredParameters( .. ) );\n\n    before( Parameter parameter ):\n        ( within_pm_validatePomConfig()\n          || within_pm_checkRequiredParameters() )\n        && paramGetName( parameter )\n    {\n        currentParameter = parameter;\n    }\n\n    after() returning:\n        pm_validatePomConfig() ||\n        pm_checkRequiredParameters()\n    {\n        currentParameter = null;\n    }\n\n    private pointcut pm_executeMojoWithSessionAndExec( MavenProject project, MojoExecution exec, MavenSession session, DefaultPluginManager manager ):\n        execution( void DefaultPluginManager.executeMojo( MavenProject, MojoExecution, MavenSession ) )\n        && args( project, exec, session )\n        && this( manager );\n\n    after( MojoBinding binding, MavenProject project, MojoExecution exec, MavenSession session, DefaultPluginManager manager ) throwing( PluginConfigurationException cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojoWithSessionAndExec( project, exec, session, manager ) )\n        && pm_validatePomConfig()\n    {\n        PathTranslator translator = manager.pathTranslator;\n        Logger logger = new ConsoleLogger( Logger.LEVEL_INFO, \"error reporting\" );\n        getReporter().reportAttemptToOverrideUneditableMojoParameter( currentParameter, binding, project, session, exec, translator, logger, cause );\n    }\n\n    PluginParameterException around( MojoBinding binding, MavenProject project, List invalidParameters ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && cflow( pm_checkRequiredParameters() )\n        && call( PluginParameterException.new( .., List ) )\n        && args( .., invalidParameters )\n    {\n        PluginParameterException err = proceed( binding, project, invalidParameters );\n\n        getReporter().reportMissingRequiredMojoParameter( binding, project, invalidParameters, err );\n\n        return err;\n    }\n\n    private pointcut ppee_evaluate( String expression ):\n        execution( Object PluginParameterExpressionEvaluator.evaluate( String ) )\n        && args( expression );\n\n    private pointcut within_ppee_evaluate( String expression ):\n        withincode( Object PluginParameterExpressionEvaluator.evaluate( String ) )\n        && args( expression );\n\n    before( MojoBinding binding, MavenProject project, String expression, ExpressionEvaluationException err ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && cflow( pm_checkRequiredParameters() )\n        && cflow( ppee_evaluate( expression ) )\n        && execution( ExpressionEvaluationException.new( String ) )\n        && this( err )\n    {\n        getReporter().reportUseOfBannedMojoParameter( currentParameter,\n                                                      binding,\n                                                      project,\n                                                      expression,\n                                                      (String) PluginParameterExpressionEvaluator.BANNED_EXPRESSIONS.get( expression ),\n                                                      err );\n    }\n\n    before( MojoBinding binding, MavenProject project, String expression, Exception cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && cflow( pm_checkRequiredParameters() )\n        && cflow( ppee_evaluate( expression ) )\n        && within( PluginParameterExpressionEvaluator )\n        && handler( Exception )\n        && args( cause )\n    {\n        getReporter().reportReflectionErrorWhileEvaluatingMojoParameter( currentParameter,\n                                                      binding,\n                                                      project,\n                                                      expression,\n                                                      cause );\n    }\n\n    after( MojoBinding binding, MavenProject project, PlexusConfiguration config ) throwing( PluginConfigurationException cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && execution( void DefaultPluginManager.populatePluginFields( *, *, PlexusConfiguration, .. ) )\n        && args( *, *, config, .. )\n    {\n        getReporter().reportErrorApplyingMojoConfiguration( binding, project, config, cause );\n    }\n\n    private pointcut pm_resolveTransitiveDependencies( MavenProject project, String scope ):\n        execution( void DefaultPluginManager.resolveTransitiveDependencies( *, *, String, *, MavenProject ) )\n        && args( *, *, scope, *, project );\n\n    after( MavenProject project, String scope ) throwing( ArtifactNotFoundException cause ):\n        pm_resolveTransitiveDependencies( project, scope )\n    {\n        getReporter().reportProjectDependenciesNotFound( project, scope, cause );\n    }\n\n    after( MavenProject project, String scope ) throwing( ArtifactResolutionException cause ):\n        pm_resolveTransitiveDependencies( project, scope )\n    {\n        if ( cause instanceof MultipleArtifactsNotFoundException )\n        {\n            getReporter().reportProjectDependenciesNotFound( project, scope, (MultipleArtifactsNotFoundException) cause );\n        }\n        else\n        {\n            getReporter().reportProjectDependenciesUnresolvable( project, scope, cause );\n        }\n    }\n\n    private pointcut le_getLifecycleBindings( List tasks, MavenProject configuringProject, String targetDescription ):\n        execution( List DefaultLifecycleExecutor.getLifecycleBindings( List, MavenProject, *, String ) )\n        && args( tasks, configuringProject, *, targetDescription );\n\n    before( List tasks, MavenProject configuringProject, String targetDescription, LifecycleException cause ):\n        cflow( le_getLifecycleBindings( tasks, configuringProject, targetDescription ) )\n        && call( LifecycleExecutionException.new( .., LifecycleException ) )\n        && args( .., cause )\n    {\n        getReporter().reportErrorFormulatingBuildPlan( tasks, configuringProject, targetDescription, cause );\n    }\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"bd189f88773d953d8ff9e1a2464aac92341a14ec","subject":"Cleaned up some imports.","message":"Cleaned up some imports.\n","repos":"spring-projects\/spring-data-graph","old_file":"src\/main\/java\/org\/springframework\/persistence\/graph\/neo4j\/Neo4jNodeBacking.aj","new_file":"src\/main\/java\/org\/springframework\/persistence\/graph\/neo4j\/Neo4jNodeBacking.aj","new_contents":"package org.springframework.persistence.graph.neo4j;\n\nimport java.lang.reflect.Field;\nimport java.util.Collection;\nimport java.util.HashSet;\nimport java.util.Set;\n\nimport org.aspectj.lang.reflect.FieldSignature;\nimport org.neo4j.graphdb.Direction;\nimport org.neo4j.graphdb.DynamicRelationshipType;\nimport org.neo4j.graphdb.GraphDatabaseService;\nimport org.neo4j.graphdb.Node;\nimport org.neo4j.graphdb.NotInTransactionException;\nimport org.neo4j.graphdb.RelationshipType;\nimport org.neo4j.util.GraphDatabaseUtil;\nimport org.springframework.beans.factory.annotation.Autowired;\nimport org.springframework.dao.InvalidDataAccessApiUsageException;\nimport org.springframework.dao.InvalidDataAccessResourceUsageException;\nimport org.springframework.persistence.graph.GraphEntity;\nimport org.springframework.persistence.graph.Relationship;\nimport org.springframework.persistence.support.AbstractTypeAnnotatingMixinFields;\nimport org.springframework.persistence.support.EntityInstantiator;\n\n\/**\n * Aspect to turn an object annotated with GraphEntity into a graph entity using Neo4J.\n * Delegates all field access (except for fields assumed to be transient)\n * to an underlying Neo4 graph node.\n * \n * @author Rod Johnson\n *\/\npublic aspect Neo4jNodeBacking extends AbstractTypeAnnotatingMixinFields<GraphEntity,NodeBacked> {\n\t\n\t\/\/-------------------------------------------------------------------------\n\t\/\/ Configure aspect for whole system.\n\t\/\/ init() method can be invoked automatically if the aspect is a Spring\n\t\/\/ bean, or called in user code.\n\t\/\/-------------------------------------------------------------------------\n\t\/\/ Aspect shared Neo4J Graph Database Service\n\tprivate GraphDatabaseService graphDatabaseService;\n\t\n\tprivate EntityInstantiator<NodeBacked,Node> graphEntityInstantiator;\n\t\n\tprivate GraphDatabaseUtil graphDatabaseUtil;\n\n\tprivate RelationshipInfoFactory relationshipInfoFactory;\n\t\n\t@Autowired\n\tpublic void init(GraphDatabaseService gds, EntityInstantiator<NodeBacked, Node> gei) {\n\t\tthis.graphDatabaseService = gds;\n\t\tthis.graphEntityInstantiator = gei;\n\t\tthis.graphDatabaseUtil = new GraphDatabaseUtil(gds);\n\t\tthis.relationshipInfoFactory = new RelationshipInfoFactory(graphEntityInstantiator);\n\t}\n\t\n\t\n\t\/\/-------------------------------------------------------------------------\n\t\/\/ Advise user-defined constructors of NodeBacked objects to create a new\n\t\/\/ Neo4J backing node\n\t\/\/-------------------------------------------------------------------------\n\tpointcut arbitraryUserConstructorOfNodeBackedObject(NodeBacked entity) : \n\t\texecution((@GraphEntity *).new(..)) &&\n\t\t!execution((@GraphEntity *).new(Node)) &&\n\t\tthis(entity);\n\t\n\t\n\t\/\/ Create a new node in the Graph if no Node was passed in a constructor\n\tbefore(NodeBacked entity) : arbitraryUserConstructorOfNodeBackedObject(entity) {\n\t\ttry {\n\t\t\tentity.setUnderlyingNode(graphDatabaseService.createNode());\n\t\t\tlog.info(\"User-defined constructor called on class \" + entity.getClass() + \"; created Node [\" + entity.getUnderlyingNode() +\"]; \" +\n\t\t\t\t\t\"Updating metamodel\");\n\t\t\t\/\/ TODO pull naming out into a strategy interface, todo a separate one, or the Entity Instatiator\n\t\t\t\/\/ graphEntityInstantiator.postEntityCreation(entity);\n\t\t\tpostEntityCreation(entity);\n\t\t} catch(NotInTransactionException e) {\n\t\t\tthrow new InvalidDataAccessResourceUsageException(\"Not in a Neo4j transaction.\", e);\n\t\t}\n\t}\n\n\tprivate void postEntityCreation(NodeBacked entity) {\n\t\tNode subReference = Neo4jHelper.findSubreferenceNode(entity.getClass(), graphDatabaseService);\n\t\tentity.getUnderlyingNode().createRelationshipTo(subReference, Neo4jHelper.INSTANCE_OF_RELATIONSHIP_TYPE);\n\t\tgraphDatabaseUtil.incrementAndGetCounter(subReference, Neo4jHelper.SUBREFERENCE_NODE_COUNTER_KEY);\n\t}\n\t\n\t\/\/ Introduced field\n\tprivate Node NodeBacked.underlyingNode;\n\t\n\tpublic void NodeBacked.setUnderlyingNode(Node n) {\n\t\tthis.underlyingNode = n;\n\t}\n\t\n\tpublic Node NodeBacked.getUnderlyingNode() {\n\t\treturn underlyingNode;\n\t}\n\n\t\n\t\/\/-------------------------------------------------------------------------\n\t\/\/ Equals and hashCode for Neo4j entities.\n\t\/\/ Final to prevent overriding.\n\t\/\/-------------------------------------------------------------------------\n\t\/\/ TODO could use template method for further checks if needed\n\tpublic final boolean NodeBacked.equals(Object obj) {\n\t\tif (obj instanceof NodeBacked) {\n\t\t\treturn this.getUnderlyingNode().equals(((NodeBacked) obj).getUnderlyingNode());\n\t\t}\n\t\treturn false;\n\t}\n\t\n\tpublic final int NodeBacked.hashCode() {\n\t\treturn getUnderlyingNode().hashCode();\n\t}\n\n\n\tObject around(NodeBacked entity) : entityFieldGet(entity) {\t\n\t\tFieldSignature fieldSignature=(FieldSignature) thisJoinPoint.getSignature();\n\t\tField f = fieldSignature.getField();\n\t\t\n\t\t\/\/ TODO fix arrays, TODO serialize other types as byte[] or string (for indexing, querying) via Annotation\n\t\tif (f.getType().isPrimitive() || f.getType().equals(String.class)) {\n\t\t\tString propName = getNeo4jPropertyName(f);\n\t\t\tlog.info(\"GET \" + f + \" <- Neo4J simple node property [\" + propName + \"]\");\n\t\t\treturn entity.getUnderlyingNode().getProperty(propName, null);\n\t\t}\n\t\t\n\t\tRelationshipInfo relInfo = relationshipInfoFactory.forField(f);\n\t\tObject obj = relInfo.readObject(entity);\n\t\tif (obj == null) {\n\t\t\tlog.info(\"Ignored GET \" + f + \": \" + f.getType().getName() + \" not primitive or GraphEntity\");\n\t\t\treturn proceed(entity);\n\t\t}\n\t\treturn obj;\n\t}\n\t\n\tObject around(NodeBacked entity, Object newVal) : entityFieldSet(entity, newVal) {\n\t\ttry {\n\t\t\tFieldSignature fieldSignature=(FieldSignature) thisJoinPoint.getSignature();\n\t\t\tField f = fieldSignature.getField();\n\t\t\t\/\/ TODO fix arrays\n\t\t\tif (f.getType().isPrimitive() || f.getType().equals(String.class)) {\n\t\t\t\tString propName = getNeo4jPropertyName(f);\n\t\t\t\tentity.getUnderlyingNode().setProperty(propName, newVal);\n\t\t\t\tlog.info(\"SET \" + f + \" -> Neo4J simple node property [\" + propName + \"] with value=[\" + newVal + \"]\");\n\t\t\t\treturn null;\n\t\t\t}\n\t\t\t\n\t\t\tRelationshipInfo relInfo = relationshipInfoFactory.forField(f);\n\t\t\tif (relInfo == null) {\n\t\t\t\tlog.info(\"Ignored SET \" + f + \": \" + f.getType().getName() + \" not primitive or GraphEntity\");\n\t\t\t\treturn proceed(entity, newVal);\n\t\t\t}\n\t\t\tlog.info(\"SET \" + f + \" -> Neo4J relationship with value=[\" + newVal + \"]\");\n\t\t\trelInfo.apply(entity, newVal);\n\t\t\treturn null;\n\t\t} catch(NotInTransactionException e) {\n\t\t\tthrow new InvalidDataAccessResourceUsageException(\"Not in a Neo4j transaction.\", e);\n\t\t}\n\t}\n\t\n\tprivate boolean isSingleRelationshipField(Field f) {\n\t\treturn f.getType().isAnnotationPresent(GraphEntity.class);\n\t\t\/\/return NodeBacked.class.isAssignableFrom(f.getType());\n\t}\n\t\n\tprivate static String getNeo4jPropertyName(Field field) {\n\t\treturn String.format(\"%s.%s\",field.getDeclaringClass().getSimpleName(),field.getName());\n\t}\n\t\n\tpublic static interface RelationshipInfo {\n\t\t\/\/ Set entity field to newVal\n\t\tvoid apply(NodeBacked entity, Object newVal);\n\n\t\t\/\/ Read object from entity field\n\t\tObject readObject(NodeBacked entity);\n\t}\n\t\n\tpublic static class RelationshipInfoFactory {\n\t\tprivate final EntityInstantiator<NodeBacked, Node> graphEntityInstantiator;\n\n\t\tpublic RelationshipInfoFactory(EntityInstantiator<NodeBacked,Node> graphEntityInstantiator) {\n\t\t\tthis.graphEntityInstantiator = graphEntityInstantiator;\n\t\t}\n\t\t\n\t\tpublic RelationshipInfo forField(Field field) {\n\t\t\tif (isSingleRelationshipField(field)) {\n\t\t\t\tfinal Relationship relAnnotation = field.getAnnotation(Relationship.class);\n\t\t\t\tif (relAnnotation != null) {\n\t\t\t\t\treturn new SingleRelationshipInfo(DynamicRelationshipType.withName(relAnnotation.type()), \n\t\t\t\t\t\t\trelAnnotation.direction().toNeo4jDir(), field.getType(), graphEntityInstantiator);\n\t\t\t\t}\n\t\t\t\treturn new SingleRelationshipInfo(DynamicRelationshipType.withName(getNeo4jPropertyName(field)), \n\t\t\t\t\t\tDirection.OUTGOING, field.getType(), graphEntityInstantiator);\n\t\t\t}\n\t\t\tif (isOneToNRelationshipField(field)) {\n\t\t\t\tfinal Relationship relAnnotation = field.getAnnotation(Relationship.class);\n\t\t\t\treturn new OneToNRelationshipInfo(DynamicRelationshipType.withName(relAnnotation.type()), \n\t\t\t\t\t\trelAnnotation.direction().toNeo4jDir(), relAnnotation.elementClass(), graphEntityInstantiator);\n\t\t\t}\n\t\t\tthrow new IllegalArgumentException(\"Not a Neo4j relationship field.\");\n\t\t}\n\n\t\tprivate static boolean isSingleRelationshipField(Field f) {\n\/\/\t\t\treturn f.getType().isAnnotationPresent(GraphEntity.class);\n\t\t\treturn NodeBacked.class.isAssignableFrom(f.getType());\n\t\t}\n\t\t\n\t\tprivate static boolean isOneToNRelationshipField(Field f) {\n\t\t\treturn f.isAnnotationPresent(Relationship.class) \n\t\t\t\t&& !Void.class.isAssignableFrom(f.getAnnotation(Relationship.class).elementClass())\n\t\t\t\t&& Collection.class.isAssignableFrom(f.getType());\n\t\t}\n\t}\n\t\n\tpublic static class SingleRelationshipInfo implements RelationshipInfo {\n\n\t\tprivate final RelationshipType type;\n\t\tprivate final Direction direction;\n\t\tprivate final Class<?> clazz;\n\t\tprivate final EntityInstantiator<NodeBacked, Node> graphEntityInstantiator;\n\t\t\n\t\tpublic SingleRelationshipInfo(RelationshipType type, Direction direction, Class<?> clazz, EntityInstantiator<NodeBacked,Node> graphEntityInstantiator) {\n\t\t\tthis.type = type;\n\t\t\tthis.direction = direction;\n\t\t\tthis.clazz = clazz;\n\t\t\tthis.graphEntityInstantiator = graphEntityInstantiator;\n\t\t}\n\n\t\tpublic void apply(NodeBacked entity, Object newVal) {\n\t\t\tif (newVal != null && !(newVal instanceof NodeBacked)) {\n\t\t\t\tthrow new IllegalArgumentException(\"New value must be NodeBacked.\");\n\t\t\t}\n\t\t\tNode entityNode = entity.getUnderlyingNode();\n\t\t\tfor ( org.neo4j.graphdb.Relationship relationship : entityNode.getRelationships(type, direction) ) {\n\t\t\t\trelationship.delete();\n\t\t\t}\n\t\t\tif (newVal == null) {\n\t\t\t\treturn;\n\t\t\t}\n\t\t\tNode targetNode = ((NodeBacked) newVal).getUnderlyingNode();\n\t\t\tif (entityNode.equals(targetNode)) {\n\t\t\t\tthrow new InvalidDataAccessApiUsageException(\"Cannot create circular reference.\");\n\t\t\t}\n\t\t\tswitch(direction) {\n\t\t\t\tcase OUTGOING : entityNode.createRelationshipTo(targetNode, type); break;\n\t\t\t\tcase INCOMING : targetNode.createRelationshipTo(entityNode, type); break;\n\t\t\t\tdefault : throw new IllegalArgumentException(\"invalid direction \" + direction); \n\t\t\t}\n\t\t}\n\n\t\t@Override\n\t\tpublic Object readObject(NodeBacked entity) {\n\t\t\t\/\/ does it have to be there, isn't it enough to have a nodebacked as target?\n\t\t\tNode entityNode = entity.getUnderlyingNode();\n\t\t\tif (entityNode == null) {\n\t\t\t\tthrow new IllegalStateException(\"Entity must have a backing Node\");\n\t\t\t}\n\t\t\torg.neo4j.graphdb.Relationship singleRelationship = entityNode.getSingleRelationship(type, direction);\n\t\t\t\n\t\t\t\/\/ TODO is this correct\n\t\t\t\/\/ [mh] i assume only for null\n\t\t\tif (singleRelationship == null) {\n\t\t\t\treturn null;\n\t\t\t}\n\t\t\tNode targetNode = singleRelationship.getOtherNode(entityNode);\n\/\/\t\t\tlog.info(\"GET \" + f + \": \" + f.getType().getName() + \": setting from relationship \" + singleRelationship);\n\t\t\treturn graphEntityInstantiator.createEntityFromState(targetNode, (Class<NodeBacked>) clazz);\n\t\t}\n\t\t\n\t}\n\t\n\tpublic static class OneToNRelationshipInfo implements RelationshipInfo {\n\n\t\tprivate final RelationshipType type;\n\t\tprivate final Direction direction;\n\t\tprivate final Class<?> elementClass;\n\t\tprivate final EntityInstantiator<NodeBacked, Node> graphEntityInstantiator;\n\n\t\tpublic OneToNRelationshipInfo(RelationshipType type, Direction direction, Class<?> elementClass, EntityInstantiator<NodeBacked, Node> graphEntityInstantiator) {\n\t\t\tthis.type = type;\n\t\t\tthis.direction = direction;\n\t\t\tthis.elementClass = elementClass;\n\t\t\tthis.graphEntityInstantiator = graphEntityInstantiator;\n\t\t}\n\n\t\tpublic void apply(NodeBacked entity, Object newVal) {\n\t\t\tNode entityNode = entity.getUnderlyingNode();\n\t\t\t\n\t\t\tif (newVal != null) {\n\t\t\t\tif (!(newVal instanceof Set)) {\n\t\t\t\t\tthrow new IllegalArgumentException(\"New value must be a Set, was: \" + newVal.getClass());\n\t\t\t\t}\n\t\t\t\tSet<Object> set = (Set<Object>) newVal;\n\t\t\t\tfor (Object obj : set) {\n\t\t\t\t\tif (!(obj instanceof NodeBacked)) {\n\t\t\t\t\t\tthrow new IllegalArgumentException(\"New value elements must be NodeBacked.\");\n\t\t\t\t\t}\n\t\t\t\t\tif (entityNode.equals(((NodeBacked) obj).getUnderlyingNode())) {\n\t\t\t\t\t\tthrow new InvalidDataAccessApiUsageException(\"Cannot create circular reference.\");\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t\tfor ( org.neo4j.graphdb.Relationship relationship : entityNode.getRelationships(type, direction) ) {\n\t\t\t\trelationship.delete();\n\t\t\t}\n\t\t\tif (newVal == null) {\n\t\t\t\treturn;\n\t\t\t}\n\t\t\t\n\t\t\tfor (Object obj : (Set<Object>) newVal) {\n\t\t\t\tNodeBacked nb = (NodeBacked) obj;\n\t\t\t\tNode targetNode = nb.getUnderlyingNode();\n\t\t\t\tswitch(direction) {\n\t\t\t\t\tcase OUTGOING : entityNode.createRelationshipTo(targetNode, type); break;\n\t\t\t\t\tcase INCOMING : targetNode.createRelationshipTo(entityNode, type); break;\n\t\t\t\t\tdefault : throw new IllegalArgumentException(\"invalid direction \" + direction); \n\t\t\t\t}\n\t\t\t}\n\t\t\t\n\t\t}\n\t\t\n\t\t@Override\n\t\tpublic Object readObject(NodeBacked entity) {\n\t\t\tNode entityNode = entity.getUnderlyingNode();\n\t\t\tif (entityNode == null) {\n\t\t\t\tthrow new IllegalStateException(\"Entity must have a backing Node\");\n\t\t\t}\n\t\t\tIterable<org.neo4j.graphdb.Relationship> rels = entityNode.getRelationships(type, direction);\n\t\t\tSet<Object> result = new HashSet<Object>();\n\t\t\tfor (org.neo4j.graphdb.Relationship rel : rels) {\n\t\t\t\tresult.add(graphEntityInstantiator.createEntityFromState(rel.getOtherNode(entityNode), (Class<NodeBacked>) elementClass));\n\t\t\t}\n\t\t\treturn result; \n\t\t}\n\t\t\n\t}\n\n}\n","old_contents":"package org.springframework.persistence.graph.neo4j;\n\nimport java.lang.reflect.Field;\nimport java.lang.reflect.Type;\nimport java.util.Collection;\nimport java.util.HashSet;\nimport java.util.Set;\n\nimport org.aspectj.lang.JoinPoint;\nimport org.aspectj.lang.Signature;\nimport org.aspectj.lang.reflect.FieldSignature;\nimport org.neo4j.graphdb.Direction;\nimport org.neo4j.graphdb.DynamicRelationshipType;\nimport org.neo4j.graphdb.GraphDatabaseService;\nimport org.neo4j.graphdb.Node;\nimport org.neo4j.graphdb.NotInTransactionException;\nimport org.neo4j.graphdb.RelationshipType;\nimport org.neo4j.util.GraphDatabaseUtil;\nimport org.springframework.beans.factory.annotation.Autowired;\nimport org.springframework.dao.InvalidDataAccessApiUsageException;\nimport org.springframework.dao.InvalidDataAccessResourceUsageException;\nimport org.springframework.persistence.graph.GraphEntity;\nimport org.springframework.persistence.graph.Relationship;\nimport org.springframework.persistence.graph.neo4j.Neo4jNodeBacking.RelationshipInfoFactory;\nimport org.springframework.persistence.support.AbstractTypeAnnotatingMixinFields;\nimport org.springframework.persistence.support.EntityInstantiator;\n\n\/**\n * Aspect to turn an object annotated with GraphEntity into a graph entity using Neo4J.\n * Delegates all field access (except for fields assumed to be transient)\n * to an underlying Neo4 graph node.\n * \n * @author Rod Johnson\n *\/\npublic aspect Neo4jNodeBacking extends AbstractTypeAnnotatingMixinFields<GraphEntity,NodeBacked> {\n\t\n\t\/\/-------------------------------------------------------------------------\n\t\/\/ Configure aspect for whole system.\n\t\/\/ init() method can be invoked automatically if the aspect is a Spring\n\t\/\/ bean, or called in user code.\n\t\/\/-------------------------------------------------------------------------\n\t\/\/ Aspect shared Neo4J Graph Database Service\n\tprivate GraphDatabaseService graphDatabaseService;\n\t\n\tprivate EntityInstantiator<NodeBacked,Node> graphEntityInstantiator;\n\t\n\tprivate GraphDatabaseUtil graphDatabaseUtil;\n\n\tprivate RelationshipInfoFactory relationshipInfoFactory;\n\t\n\t@Autowired\n\tpublic void init(GraphDatabaseService gds, EntityInstantiator<NodeBacked, Node> gei) {\n\t\tthis.graphDatabaseService = gds;\n\t\tthis.graphEntityInstantiator = gei;\n\t\tthis.graphDatabaseUtil = new GraphDatabaseUtil(gds);\n\t\tthis.relationshipInfoFactory = new RelationshipInfoFactory(graphEntityInstantiator);\n\t}\n\t\n\t\n\t\/\/-------------------------------------------------------------------------\n\t\/\/ Advise user-defined constructors of NodeBacked objects to create a new\n\t\/\/ Neo4J backing node\n\t\/\/-------------------------------------------------------------------------\n\tpointcut arbitraryUserConstructorOfNodeBackedObject(NodeBacked entity) : \n\t\texecution((@GraphEntity *).new(..)) &&\n\t\t!execution((@GraphEntity *).new(Node)) &&\n\t\tthis(entity);\n\t\n\t\n\t\/\/ Create a new node in the Graph if no Node was passed in a constructor\n\tbefore(NodeBacked entity) : arbitraryUserConstructorOfNodeBackedObject(entity) {\n\t\ttry {\n\t\t\tentity.setUnderlyingNode(graphDatabaseService.createNode());\n\t\t\tlog.info(\"User-defined constructor called on class \" + entity.getClass() + \"; created Node [\" + entity.getUnderlyingNode() +\"]; \" +\n\t\t\t\t\t\"Updating metamodel\");\n\t\t\t\/\/ TODO pull naming out into a strategy interface, todo a separate one, or the Entity Instatiator\n\t\t\t\/\/ graphEntityInstantiator.postEntityCreation(entity);\n\t\t\tpostEntityCreation(entity);\n\t\t} catch(NotInTransactionException e) {\n\t\t\tthrow new InvalidDataAccessResourceUsageException(\"Not in a Neo4j transaction.\", e);\n\t\t}\n\t}\n\n\tprivate void postEntityCreation(NodeBacked entity) {\n\t\tNode subReference = Neo4jHelper.findSubreferenceNode(entity.getClass(), graphDatabaseService);\n\t\tentity.getUnderlyingNode().createRelationshipTo(subReference, Neo4jHelper.INSTANCE_OF_RELATIONSHIP_TYPE);\n\t\tgraphDatabaseUtil.incrementAndGetCounter(subReference, Neo4jHelper.SUBREFERENCE_NODE_COUNTER_KEY);\n\t}\n\t\n\t\/\/ Introduced field\n\tprivate Node NodeBacked.underlyingNode;\n\t\n\tpublic void NodeBacked.setUnderlyingNode(Node n) {\n\t\tthis.underlyingNode = n;\n\t}\n\t\n\tpublic Node NodeBacked.getUnderlyingNode() {\n\t\treturn underlyingNode;\n\t}\n\n\t\n\t\/\/-------------------------------------------------------------------------\n\t\/\/ Equals and hashCode for Neo4j entities.\n\t\/\/ Final to prevent overriding.\n\t\/\/-------------------------------------------------------------------------\n\t\/\/ TODO could use template method for further checks if needed\n\tpublic final boolean NodeBacked.equals(Object obj) {\n\t\tif (obj instanceof NodeBacked) {\n\t\t\treturn this.getUnderlyingNode().equals(((NodeBacked) obj).getUnderlyingNode());\n\t\t}\n\t\treturn false;\n\t}\n\t\n\tpublic final int NodeBacked.hashCode() {\n\t\treturn getUnderlyingNode().hashCode();\n\t}\n\n\n\tObject around(NodeBacked entity) : entityFieldGet(entity) {\t\n\t\tFieldSignature fieldSignature=(FieldSignature) thisJoinPoint.getSignature();\n\t\tField f = fieldSignature.getField();\n\t\t\n\t\t\/\/ TODO fix arrays, TODO serialize other types as byte[] or string (for indexing, querying) via Annotation\n\t\tif (f.getType().isPrimitive() || f.getType().equals(String.class)) {\n\t\t\tString propName = getNeo4jPropertyName(f);\n\t\t\tlog.info(\"GET \" + f + \" <- Neo4J simple node property [\" + propName + \"]\");\n\t\t\treturn entity.getUnderlyingNode().getProperty(propName, null);\n\t\t}\n\t\t\n\t\tRelationshipInfo relInfo = relationshipInfoFactory.forField(f);\n\t\tObject obj = relInfo.readObject(entity);\n\t\tif (obj == null) {\n\t\t\tlog.info(\"Ignored GET \" + f + \": \" + f.getType().getName() + \" not primitive or GraphEntity\");\n\t\t\treturn proceed(entity);\n\t\t}\n\t\treturn obj;\n\t}\n\t\n\tObject around(NodeBacked entity, Object newVal) : entityFieldSet(entity, newVal) {\n\t\ttry {\n\t\t\tFieldSignature fieldSignature=(FieldSignature) thisJoinPoint.getSignature();\n\t\t\tField f = fieldSignature.getField();\n\t\t\t\/\/ TODO fix arrays\n\t\t\tif (f.getType().isPrimitive() || f.getType().equals(String.class)) {\n\t\t\t\tString propName = getNeo4jPropertyName(f);\n\t\t\t\tentity.getUnderlyingNode().setProperty(propName, newVal);\n\t\t\t\tlog.info(\"SET \" + f + \" -> Neo4J simple node property [\" + propName + \"] with value=[\" + newVal + \"]\");\n\t\t\t\treturn null;\n\t\t\t}\n\t\t\t\n\t\t\tRelationshipInfo relInfo = relationshipInfoFactory.forField(f);\n\t\t\tif (relInfo == null) {\n\t\t\t\tlog.info(\"Ignored SET \" + f + \": \" + f.getType().getName() + \" not primitive or GraphEntity\");\n\t\t\t\treturn proceed(entity, newVal);\n\t\t\t}\n\t\t\tlog.info(\"SET \" + f + \" -> Neo4J relationship with value=[\" + newVal + \"]\");\n\t\t\trelInfo.apply(entity, newVal);\n\t\t\treturn null;\n\t\t} catch(NotInTransactionException e) {\n\t\t\tthrow new InvalidDataAccessResourceUsageException(\"Not in a Neo4j transaction.\", e);\n\t\t}\n\t}\n\t\n\tprivate boolean isSingleRelationshipField(Field f) {\n\t\treturn f.getType().isAnnotationPresent(GraphEntity.class);\n\t\t\/\/return NodeBacked.class.isAssignableFrom(f.getType());\n\t}\n\t\n\tprivate static String getNeo4jPropertyName(Field field) {\n\t\treturn String.format(\"%s.%s\",field.getDeclaringClass().getSimpleName(),field.getName());\n\t}\n\t\n\tpublic static interface RelationshipInfo {\n\t\t\/\/ Set entity field to newVal\n\t\tvoid apply(NodeBacked entity, Object newVal);\n\n\t\t\/\/ Read object from entity field\n\t\tObject readObject(NodeBacked entity);\n\t}\n\t\n\tpublic static class RelationshipInfoFactory {\n\t\tprivate final EntityInstantiator<NodeBacked, Node> graphEntityInstantiator;\n\n\t\tpublic RelationshipInfoFactory(EntityInstantiator<NodeBacked,Node> graphEntityInstantiator) {\n\t\t\tthis.graphEntityInstantiator = graphEntityInstantiator;\n\t\t}\n\t\t\n\t\tpublic RelationshipInfo forField(Field field) {\n\t\t\tif (isSingleRelationshipField(field)) {\n\t\t\t\tfinal Relationship relAnnotation = field.getAnnotation(Relationship.class);\n\t\t\t\tif (relAnnotation != null) {\n\t\t\t\t\treturn new SingleRelationshipInfo(DynamicRelationshipType.withName(relAnnotation.type()), \n\t\t\t\t\t\t\trelAnnotation.direction().toNeo4jDir(), field.getType(), graphEntityInstantiator);\n\t\t\t\t}\n\t\t\t\treturn new SingleRelationshipInfo(DynamicRelationshipType.withName(getNeo4jPropertyName(field)), \n\t\t\t\t\t\tDirection.OUTGOING, field.getType(), graphEntityInstantiator);\n\t\t\t}\n\t\t\tif (isOneToNRelationshipField(field)) {\n\t\t\t\tfinal Relationship relAnnotation = field.getAnnotation(Relationship.class);\n\t\t\t\treturn new OneToNRelationshipInfo(DynamicRelationshipType.withName(relAnnotation.type()), \n\t\t\t\t\t\trelAnnotation.direction().toNeo4jDir(), relAnnotation.elementClass(), graphEntityInstantiator);\n\t\t\t}\n\t\t\tthrow new IllegalArgumentException(\"Not a Neo4j relationship field.\");\n\t\t}\n\n\t\tprivate static boolean isSingleRelationshipField(Field f) {\n\/\/\t\t\treturn f.getType().isAnnotationPresent(GraphEntity.class);\n\t\t\treturn NodeBacked.class.isAssignableFrom(f.getType());\n\t\t}\n\t\t\n\t\tprivate static boolean isOneToNRelationshipField(Field f) {\n\t\t\treturn f.isAnnotationPresent(Relationship.class) \n\t\t\t\t&& !Void.class.isAssignableFrom(f.getAnnotation(Relationship.class).elementClass())\n\t\t\t\t&& Collection.class.isAssignableFrom(f.getType());\n\t\t}\n\t}\n\t\n\tpublic static class SingleRelationshipInfo implements RelationshipInfo {\n\n\t\tprivate final RelationshipType type;\n\t\tprivate final Direction direction;\n\t\tprivate final Class<?> clazz;\n\t\tprivate final EntityInstantiator<NodeBacked, Node> graphEntityInstantiator;\n\t\t\n\t\tpublic SingleRelationshipInfo(RelationshipType type, Direction direction, Class<?> clazz, EntityInstantiator<NodeBacked,Node> graphEntityInstantiator) {\n\t\t\tthis.type = type;\n\t\t\tthis.direction = direction;\n\t\t\tthis.clazz = clazz;\n\t\t\tthis.graphEntityInstantiator = graphEntityInstantiator;\n\t\t}\n\n\t\tpublic void apply(NodeBacked entity, Object newVal) {\n\t\t\tif (newVal != null && !(newVal instanceof NodeBacked)) {\n\t\t\t\tthrow new IllegalArgumentException(\"New value must be NodeBacked.\");\n\t\t\t}\n\t\t\tNode entityNode = entity.getUnderlyingNode();\n\t\t\tfor ( org.neo4j.graphdb.Relationship relationship : entityNode.getRelationships(type, direction) ) {\n\t\t\t\trelationship.delete();\n\t\t\t}\n\t\t\tif (newVal == null) {\n\t\t\t\treturn;\n\t\t\t}\n\t\t\tNode targetNode = ((NodeBacked) newVal).getUnderlyingNode();\n\t\t\tif (entityNode.equals(targetNode)) {\n\t\t\t\tthrow new InvalidDataAccessApiUsageException(\"Cannot create circular reference.\");\n\t\t\t}\n\t\t\tswitch(direction) {\n\t\t\t\tcase OUTGOING : entityNode.createRelationshipTo(targetNode, type); break;\n\t\t\t\tcase INCOMING : targetNode.createRelationshipTo(entityNode, type); break;\n\t\t\t\tdefault : throw new IllegalArgumentException(\"invalid direction \" + direction); \n\t\t\t}\n\t\t}\n\n\t\t@Override\n\t\tpublic Object readObject(NodeBacked entity) {\n\t\t\t\/\/ does it have to be there, isn't it enough to have a nodebacked as target?\n\t\t\tNode entityNode = entity.getUnderlyingNode();\n\t\t\tif (entityNode == null) {\n\t\t\t\tthrow new IllegalStateException(\"Entity must have a backing Node\");\n\t\t\t}\n\t\t\torg.neo4j.graphdb.Relationship singleRelationship = entityNode.getSingleRelationship(type, direction);\n\t\t\t\n\t\t\t\/\/ TODO is this correct\n\t\t\t\/\/ [mh] i assume only for null\n\t\t\tif (singleRelationship == null) {\n\t\t\t\treturn null;\n\t\t\t}\n\t\t\tNode targetNode = singleRelationship.getOtherNode(entityNode);\n\/\/\t\t\tlog.info(\"GET \" + f + \": \" + f.getType().getName() + \": setting from relationship \" + singleRelationship);\n\t\t\treturn graphEntityInstantiator.createEntityFromState(targetNode, (Class<NodeBacked>) clazz);\n\t\t}\n\t\t\n\t}\n\t\n\tpublic static class OneToNRelationshipInfo implements RelationshipInfo {\n\n\t\tprivate final RelationshipType type;\n\t\tprivate final Direction direction;\n\t\tprivate final Class<?> elementClass;\n\t\tprivate final EntityInstantiator<NodeBacked, Node> graphEntityInstantiator;\n\n\t\tpublic OneToNRelationshipInfo(RelationshipType type, Direction direction, Class<?> elementClass, EntityInstantiator<NodeBacked, Node> graphEntityInstantiator) {\n\t\t\tthis.type = type;\n\t\t\tthis.direction = direction;\n\t\t\tthis.elementClass = elementClass;\n\t\t\tthis.graphEntityInstantiator = graphEntityInstantiator;\n\t\t}\n\n\t\tpublic void apply(NodeBacked entity, Object newVal) {\n\t\t\tNode entityNode = entity.getUnderlyingNode();\n\t\t\t\n\t\t\tif (newVal != null) {\n\t\t\t\tif (!(newVal instanceof Set)) {\n\t\t\t\t\tthrow new IllegalArgumentException(\"New value must be a Set, was: \" + newVal.getClass());\n\t\t\t\t}\n\t\t\t\tSet<Object> set = (Set<Object>) newVal;\n\t\t\t\tfor (Object obj : set) {\n\t\t\t\t\tif (!(obj instanceof NodeBacked)) {\n\t\t\t\t\t\tthrow new IllegalArgumentException(\"New value elements must be NodeBacked.\");\n\t\t\t\t\t}\n\t\t\t\t\tif (entityNode.equals(((NodeBacked) obj).getUnderlyingNode())) {\n\t\t\t\t\t\tthrow new InvalidDataAccessApiUsageException(\"Cannot create circular reference.\");\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t\tfor ( org.neo4j.graphdb.Relationship relationship : entityNode.getRelationships(type, direction) ) {\n\t\t\t\trelationship.delete();\n\t\t\t}\n\t\t\tif (newVal == null) {\n\t\t\t\treturn;\n\t\t\t}\n\t\t\t\n\t\t\tfor (Object obj : (Set<Object>) newVal) {\n\t\t\t\tNodeBacked nb = (NodeBacked) obj;\n\t\t\t\tNode targetNode = nb.getUnderlyingNode();\n\t\t\t\tswitch(direction) {\n\t\t\t\t\tcase OUTGOING : entityNode.createRelationshipTo(targetNode, type); break;\n\t\t\t\t\tcase INCOMING : targetNode.createRelationshipTo(entityNode, type); break;\n\t\t\t\t\tdefault : throw new IllegalArgumentException(\"invalid direction \" + direction); \n\t\t\t\t}\n\t\t\t}\n\t\t\t\n\t\t}\n\t\t\n\t\t@Override\n\t\tpublic Object readObject(NodeBacked entity) {\n\t\t\tNode entityNode = entity.getUnderlyingNode();\n\t\t\tif (entityNode == null) {\n\t\t\t\tthrow new IllegalStateException(\"Entity must have a backing Node\");\n\t\t\t}\n\t\t\tIterable<org.neo4j.graphdb.Relationship> rels = entityNode.getRelationships(type, direction);\n\t\t\tSet<Object> result = new HashSet<Object>();\n\t\t\tfor (org.neo4j.graphdb.Relationship rel : rels) {\n\t\t\t\tresult.add(graphEntityInstantiator.createEntityFromState(rel.getOtherNode(entityNode), (Class<NodeBacked>) elementClass));\n\t\t\t}\n\t\t\treturn result; \n\t\t}\n\t\t\n\t}\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"2fd4901cf5ce65f5f369c1dc8c36383c562b839e","subject":"Don't allow akka internal `ask` timer to expire","message":"Don't allow akka internal `ask` timer to expire\n","repos":"NetSys\/demi,NetSys\/demi-applications,NetSys\/demi-applications,NetSys\/demi-applications","old_file":"src\/main\/aspectj\/WeaveActor.aj","new_file":"src\/main\/aspectj\/WeaveActor.aj","new_contents":"package sample;\n\nimport static java.lang.Thread.sleep;\n\nimport akka.dispatch.verification.Instrumenter;\nimport akka.dispatch.verification.WrappedCancellable;\n\nimport akka.actor.ActorRef;\nimport akka.actor.ScalaActorRef;\nimport akka.actor.InternalActorRef;\nimport akka.actor.Actor;\nimport akka.actor.Props;\nimport akka.actor.ActorCell;\nimport akka.actor.ActorSystem;\nimport akka.actor.ActorSystemImpl;\nimport akka.actor.ActorContext;\nimport akka.actor.Scheduler;\nimport akka.actor.Cancellable;\nimport akka.actor.LightArrayRevolverScheduler;\nimport akka.actor.LocalActorRefProvider;\nimport akka.actor.VirtualPathContainer;\nimport akka.actor.ActorPath;\n\nimport akka.pattern.AskSupport;\nimport akka.pattern.PromiseActorRef;\n\nimport akka.dispatch.Envelope;\nimport akka.dispatch.MessageQueue;\nimport akka.dispatch.MessageDispatcher;\nimport akka.dispatch.Mailbox;\n\nimport scala.concurrent.impl.CallbackRunnable;\nimport scala.concurrent.duration.FiniteDuration;\nimport scala.concurrent.ExecutionContext;\nimport scala.Function0;\nimport scala.runtime.BoxedUnit;\nimport java.lang.Runnable;\n\nprivileged public aspect WeaveActor {\n  Instrumenter inst = Instrumenter.apply();\n  \n  before(ActorCell me, Object msg):\n  execution(* akka.actor.ActorCell.receiveMessage(Object)) &&\n  args(msg, ..) && this(me) {\n    inst.beforeMessageReceive(me, msg);\n  }\n  \n  after(ActorCell me, Object msg):\n  execution(* akka.actor.ActorCell.receiveMessage(Object)) &&\n  args(msg, ..) && this(me) {\n    inst.afterMessageReceive(me, msg);\n  }\n\n  after(Mailbox me):\n  execution(* akka.dispatch.Mailbox.run()) && this(me) {\n    inst.mailboxIdle(me);\n  }\n\n  pointcut dispatchOperation(MessageDispatcher me, ActorCell receiver, Envelope handle): \n  execution(* akka.dispatch.MessageDispatcher.dispatch(..)) &&\n  args(receiver, handle, ..) && this(me);\n\n  Object around(MessageDispatcher me, ActorCell receiver, Envelope handle):\n  dispatchOperation(me, receiver, handle) {\n    if (inst.aroundDispatch(me, receiver, handle))\n      return proceed(me, receiver, handle);\n    else\n      return null;\n  }\n\n  \/\/ Interposition on `ask`. See this doc for more details:\n  \/\/ https:\/\/docs.google.com\/document\/d\/1_LUceHvQoamlBtNNbqA4CxBH-zvUKlZhnSjLwTc16q4\/edit#\n  pointcut receiveAnswer(PromiseActorRef me, Object message, ActorRef sender):\n  execution(public void akka.pattern.PromiseActorRef.$bang(Object, ActorRef)) &&\n  args(message, sender) && this(me);\n\n  Object around(PromiseActorRef me, Object message, ActorRef sender):\n  receiveAnswer(me, message, sender) {\n    if (inst.receiveAskAnswer(me, message, sender)) {\n      Object ret = proceed(me, message, sender);\n      inst.afterReceiveAskAnswer(me, message, sender);\n      return ret;\n    }\n    return null;\n  }\n\n  \/\/ Sanity check: make sure we don't allocate two temp actors at the same\n  \/\/ time with the same name.\n  before(VirtualPathContainer me, String name, InternalActorRef ref):\n  execution(* VirtualPathContainer.addChild(String, InternalActorRef)) &&\n  this(me) && args(name, ref) {\n    if (me.children.containsKey(name)) {\n      System.err.println(\"WARNING: temp name already taken: \" + name);\n    }\n  }\n\n  \/*\n   For debugging redundant temp names:\n  before(VirtualPathContainer me, String name, InternalActorRef ref):\n  execution(* VirtualPathContainer.removeChild(String, InternalActorRef)) &&\n  this(me) && args(name, ref) {\n    System.out.println(\"removeChild: \" + name);\n  }\n\n  before(VirtualPathContainer me, String name):\n  execution(* VirtualPathContainer.removeChild(String)) &&\n  this(me) && args(name) {\n    System.out.println(\"removeChild: \" + name);\n  }\n  *\/\n\n  \/\/ Interposition on the code that assigns IDs to temporary actors. See this\n  \/\/ doc for more details:\n  \/\/ https:\/\/docs.google.com\/document\/d\/1rAM8EEy3WnLRhhPROvHmBhAREv0rmihz0Gw0GgF1xC4\/edit#\n  pointcut tempPath(LocalActorRefProvider me):\n  execution(public ActorPath LocalActorRefProvider.tempPath()) && this(me);\n\n  Object around(LocalActorRefProvider me): tempPath(me) {\n    return inst.assignTempPath(me.tempNode);\n  }\n\n  \/\/ newActor is invoked before preStart is called!\n  after(ActorCell me):\n  execution(* akka.actor.ActorCell.newActor()) &&\n  this(me) {\n    inst.new_actor(me.system(), me.props, me.self);\n  }\n\n  \/\/ after preStart has been called, i.e. actor is ready to receive messages.\n  after(ActorCell me):\n  execution(* akka.actor.ActorCell.create(..)) &&\n  this(me) {\n    inst.preStartCalled(me.self);\n  }\n\n  \/\/ Block until the actor has actually been created and preStart has been invoked!\n  \/\/ (which is done asynchronously)\n  after(ActorSystem me, Props props) returning(ActorRef actor):\n  execution(ActorRef akka.actor.ActorSystem.actorOf(Props)) &&\n  args(props) && this(me) {\n    inst.blockUntilPreStartCalled(actor);\n  }\n\n  \/\/ Block until the actor has actually been created and preStart has been invoked!\n  \/\/ (which is done asynchronously)\n  after(ActorSystem me, Props props, String name) returning(ActorRef actor):\n  execution(ActorRef akka.actor.ActorSystem.actorOf(Props, String)) &&\n  args(props, name) && this(me) {\n    inst.blockUntilPreStartCalled(actor);\n  }\n\n  \/\/ Block until the actor has actually been created and preStart has been invoked!\n  \/\/ (which is done asynchronously)\n  after(ActorContext me, Props props) returning(ActorRef actor):\n  execution(ActorRef akka.actor.ActorContext.actorOf(Props)) &&\n  args(props) && this(me) {\n    inst.blockUntilPreStartCalled(actor);\n  }\n\n  \/\/ Block until the actor has actually been created and preStart has been invoked!\n  \/\/ (which is done asynchronously)\n  after(ActorContext me, Props props, String name) returning(ActorRef actor):\n  execution(ActorRef akka.actor.ActorContext.actorOf(Props, String)) &&\n  args(props, name) && this(me) {\n    inst.blockUntilPreStartCalled(actor);\n  }\n\n  Object around(ActorRef me, Object msg, ActorRef sender):\n  execution(* akka.actor.ScalaActorRef.$bang(Object, ActorRef)) &&\n  args(msg, sender) && this(me) {\n    if (inst.tell(me, msg, sender)) {\n      return proceed(me, msg, sender);\n    }\n    return null;\n  }\n\n  \/\/ Override akka.actor.Scheduler.schedulerOnce\n  pointcut scheduleOnce(LightArrayRevolverScheduler me, FiniteDuration delay, ActorRef receiver, Object msg, ExecutionContext exc, ActorRef sender):\n  execution(public * akka.actor.LightArrayRevolverScheduler.scheduleOnce(FiniteDuration,ActorRef,Object,ExecutionContext,ActorRef)) &&\n  args(delay, receiver, msg, exc, sender) && this(me);\n\n  \/\/ Never actually proceed(), just schedule our own timer, which does not use\n  \/\/ ! directly, but instead calls enqueue_message..\n  Object around(LightArrayRevolverScheduler me, FiniteDuration delay, ActorRef receiver, Object msg, ExecutionContext exc, ActorRef sender):\n  scheduleOnce(me, delay, receiver, msg, exc, sender) {\n    if (!inst.actorKnown(receiver)) {\n      return proceed(me,delay,receiver,msg,exc,sender);\n    }\n    class MyRunnable implements java.lang.Runnable {\n      \/\/ Make it a no-op!\n      public void run() {\n      }\n    }\n    MyRunnable runnable = new MyRunnable();\n    Cancellable c = new WrappedCancellable(\n      me.scheduleOnce(delay, runnable, exc), receiver.path().name(), msg);\n    inst.registerCancellable(c, false, receiver.path().name(), msg);\n    return c;\n  }\n\n  \/\/ Override akka.actor.Scheduler.scheduler\n  pointcut schedule(LightArrayRevolverScheduler me, FiniteDuration delay, FiniteDuration interval, ActorRef receiver, Object msg, ExecutionContext exc, ActorRef sender):\n  execution(public * akka.actor.LightArrayRevolverScheduler.schedule(FiniteDuration,FiniteDuration,ActorRef,Object,ExecutionContext,ActorRef)) &&\n  args(delay, interval, receiver, msg, exc, sender) && this(me);\n\n  \/\/ Never actually proceed(), just schedule our own timer, which does not use\n  \/\/ ! directly, but instead calls enqueue_message..\n  Object around(LightArrayRevolverScheduler me, FiniteDuration delay, FiniteDuration interval, ActorRef receiver, Object msg, ExecutionContext exc, ActorRef sender):\n  schedule(me, delay, interval, receiver, msg, exc, sender) {\n    if (!inst.actorKnown(receiver)) {\n      return proceed(me,delay,interval,receiver,msg,exc,sender);\n    }\n    class MyRunnable implements java.lang.Runnable {\n      \/\/ Make it a no-op!\n      public void run() {\n      }\n    }\n    MyRunnable runnable = new MyRunnable();\n    Cancellable c = new WrappedCancellable(\n      me.schedule(delay, interval, runnable, exc), receiver.path().name(), msg);\n    inst.registerCancellable(c, true, receiver.path().name(), msg);\n    return c;\n  }\n\n  \/\/ Override akka.actor.Scheduler.scheduler(block)\n  pointcut scheduleBlock(LightArrayRevolverScheduler me, FiniteDuration delay, FiniteDuration interval, scala.Function0<scala.runtime.BoxedUnit> block, ExecutionContext exc):\n  execution(public * schedule(scala.concurrent.duration.FiniteDuration, scala.concurrent.duration.FiniteDuration, scala.Function0<scala.runtime.BoxedUnit>, scala.concurrent.ExecutionContext)) &&\n  args(delay, interval, block, exc) && this(me);\n\n  \/\/ Wrap the function in a special \"Message\" wrapper, that appears to\n  \/\/ STS2 schedulers like a message, but which the Instrumenter understands as a\n  \/\/ function to be invoked rather than a message to be sent.\n  \/\/ TODO(cs): issue: no receiver.\n  Object around(LightArrayRevolverScheduler me, FiniteDuration delay, FiniteDuration interval, scala.Function0<scala.runtime.BoxedUnit> block, ExecutionContext exc):\n  scheduleBlock(me, delay, interval, block, exc) {\n    if (!inst.actorSystemInitialized() || Instrumenter.akkaInternalCodeBlockSchedule()) {\n      return proceed(me, delay, interval, block, exc);\n    }\n\n    class MyRunnable implements java.lang.Runnable {\n      \/\/ Make it a no-op!\n      public void run() {\n      }\n    }\n    MyRunnable runnable = new MyRunnable();\n    Cancellable c = new WrappedCancellable(me.schedule(delay, interval, runnable, exc), \"ScheduleFunction\", block);\n    inst.registerCancellable(c, true, \"ScheduleFunction\", block);\n    return c;\n  }\n\n  \/\/ Override akka.actor.Scheduler.scheduler(block)\n  pointcut scheduleOnceBlock(LightArrayRevolverScheduler me, FiniteDuration delay, scala.Function0<scala.runtime.BoxedUnit> block, ExecutionContext exc):\n  execution(public * scheduleOnce(scala.concurrent.duration.FiniteDuration, scala.Function0<scala.runtime.BoxedUnit>, scala.concurrent.ExecutionContext)) &&\n  args(delay, block, exc) && this(me);\n\n  \/\/ Wrap the function in a special \"Message\" wrapper, that appears to\n  \/\/ STS2 schedulers like a message, but which the Instrumenter understands as a\n  \/\/ function to be invoked rather than a message to be sent.\n  \/\/ TODO(cs): issue: no receiver.\n  Object around(LightArrayRevolverScheduler me, FiniteDuration delay, scala.Function0<scala.runtime.BoxedUnit> block, ExecutionContext exc):\n  scheduleOnceBlock(me, delay, block, exc) {\n    if (!inst.actorSystemInitialized()) {\n      return proceed(me, delay, block, exc);\n    }\n\n    class MyRunnable implements java.lang.Runnable {\n      \/\/ Make it a no-op!\n      public void run() {\n      }\n    }\n    MyRunnable runnable = new MyRunnable();\n    if (Instrumenter.akkaInternalCodeBlockSchedule()) {\n      \/\/ Don't ever allow the `ask` timer to expire\n      return me.scheduleOnce(delay, runnable, exc);\n    }\n    Cancellable c = new WrappedCancellable(me.scheduleOnce(delay, runnable, exc), \"ScheduleFunction\", block);\n    inst.registerCancellable(c, false, \"ScheduleFunction\", block);\n    return c;\n  }\n}\n","old_contents":"package sample;\n\nimport static java.lang.Thread.sleep;\n\nimport akka.dispatch.verification.Instrumenter;\nimport akka.dispatch.verification.WrappedCancellable;\n\nimport akka.actor.ActorRef;\nimport akka.actor.ScalaActorRef;\nimport akka.actor.InternalActorRef;\nimport akka.actor.Actor;\nimport akka.actor.Props;\nimport akka.actor.ActorCell;\nimport akka.actor.ActorSystem;\nimport akka.actor.ActorSystemImpl;\nimport akka.actor.ActorContext;\nimport akka.actor.Scheduler;\nimport akka.actor.Cancellable;\nimport akka.actor.LightArrayRevolverScheduler;\nimport akka.actor.LocalActorRefProvider;\nimport akka.actor.VirtualPathContainer;\nimport akka.actor.ActorPath;\n\nimport akka.pattern.AskSupport;\nimport akka.pattern.PromiseActorRef;\n\nimport akka.dispatch.Envelope;\nimport akka.dispatch.MessageQueue;\nimport akka.dispatch.MessageDispatcher;\nimport akka.dispatch.Mailbox;\n\nimport scala.concurrent.impl.CallbackRunnable;\nimport scala.concurrent.duration.FiniteDuration;\nimport scala.concurrent.ExecutionContext;\nimport scala.Function0;\nimport scala.runtime.BoxedUnit;\nimport java.lang.Runnable;\n\nprivileged public aspect WeaveActor {\n  Instrumenter inst = Instrumenter.apply();\n  \n  before(ActorCell me, Object msg):\n  execution(* akka.actor.ActorCell.receiveMessage(Object)) &&\n  args(msg, ..) && this(me) {\n    inst.beforeMessageReceive(me, msg);\n  }\n  \n  after(ActorCell me, Object msg):\n  execution(* akka.actor.ActorCell.receiveMessage(Object)) &&\n  args(msg, ..) && this(me) {\n    inst.afterMessageReceive(me, msg);\n  }\n\n  after(Mailbox me):\n  execution(* akka.dispatch.Mailbox.run()) && this(me) {\n    inst.mailboxIdle(me);\n  }\n\n  pointcut dispatchOperation(MessageDispatcher me, ActorCell receiver, Envelope handle): \n  execution(* akka.dispatch.MessageDispatcher.dispatch(..)) &&\n  args(receiver, handle, ..) && this(me);\n\n  Object around(MessageDispatcher me, ActorCell receiver, Envelope handle):\n  dispatchOperation(me, receiver, handle) {\n    if (inst.aroundDispatch(me, receiver, handle))\n      return proceed(me, receiver, handle);\n    else\n      return null;\n  }\n\n  \/\/ Interposition on `ask`. See this doc for more details:\n  \/\/ https:\/\/docs.google.com\/document\/d\/1_LUceHvQoamlBtNNbqA4CxBH-zvUKlZhnSjLwTc16q4\/edit#\n  pointcut receiveAnswer(PromiseActorRef me, Object message, ActorRef sender):\n  execution(public void akka.pattern.PromiseActorRef.$bang(Object, ActorRef)) &&\n  args(message, sender) && this(me);\n\n  Object around(PromiseActorRef me, Object message, ActorRef sender):\n  receiveAnswer(me, message, sender) {\n    if (inst.receiveAskAnswer(me, message, sender)) {\n      Object ret = proceed(me, message, sender);\n      inst.afterReceiveAskAnswer(me, message, sender);\n      return ret;\n    }\n    return null;\n  }\n\n  \/\/ Sanity check: make sure we don't allocate two temp actors at the same\n  \/\/ time with the same name.\n  before(VirtualPathContainer me, String name, InternalActorRef ref):\n  execution(* VirtualPathContainer.addChild(String, InternalActorRef)) &&\n  this(me) && args(name, ref) {\n    if (me.children.containsKey(name)) {\n      System.err.println(\"WARNING: temp name already taken: \" + name);\n    }\n  }\n\n  \/*\n   For debugging redundant temp names:\n  before(VirtualPathContainer me, String name, InternalActorRef ref):\n  execution(* VirtualPathContainer.removeChild(String, InternalActorRef)) &&\n  this(me) && args(name, ref) {\n    System.out.println(\"removeChild: \" + name);\n  }\n\n  before(VirtualPathContainer me, String name):\n  execution(* VirtualPathContainer.removeChild(String)) &&\n  this(me) && args(name) {\n    System.out.println(\"removeChild: \" + name);\n  }\n  *\/\n\n  \/\/ Interposition on the code that assigns IDs to temporary actors. See this\n  \/\/ doc for more details:\n  \/\/ https:\/\/docs.google.com\/document\/d\/1rAM8EEy3WnLRhhPROvHmBhAREv0rmihz0Gw0GgF1xC4\/edit#\n  pointcut tempPath(LocalActorRefProvider me):\n  execution(public ActorPath LocalActorRefProvider.tempPath()) && this(me);\n\n  Object around(LocalActorRefProvider me): tempPath(me) {\n    return inst.assignTempPath(me.tempNode);\n  }\n\n  \/\/ newActor is invoked before preStart is called!\n  after(ActorCell me):\n  execution(* akka.actor.ActorCell.newActor()) &&\n  this(me) {\n    inst.new_actor(me.system(), me.props, me.self);\n  }\n\n  \/\/ after preStart has been called, i.e. actor is ready to receive messages.\n  after(ActorCell me):\n  execution(* akka.actor.ActorCell.create(..)) &&\n  this(me) {\n    inst.preStartCalled(me.self);\n  }\n\n  \/\/ Block until the actor has actually been created and preStart has been invoked!\n  \/\/ (which is done asynchronously)\n  after(ActorSystem me, Props props) returning(ActorRef actor):\n  execution(ActorRef akka.actor.ActorSystem.actorOf(Props)) &&\n  args(props) && this(me) {\n    inst.blockUntilPreStartCalled(actor);\n  }\n\n  \/\/ Block until the actor has actually been created and preStart has been invoked!\n  \/\/ (which is done asynchronously)\n  after(ActorSystem me, Props props, String name) returning(ActorRef actor):\n  execution(ActorRef akka.actor.ActorSystem.actorOf(Props, String)) &&\n  args(props, name) && this(me) {\n    inst.blockUntilPreStartCalled(actor);\n  }\n\n  \/\/ Block until the actor has actually been created and preStart has been invoked!\n  \/\/ (which is done asynchronously)\n  after(ActorContext me, Props props) returning(ActorRef actor):\n  execution(ActorRef akka.actor.ActorContext.actorOf(Props)) &&\n  args(props) && this(me) {\n    inst.blockUntilPreStartCalled(actor);\n  }\n\n  \/\/ Block until the actor has actually been created and preStart has been invoked!\n  \/\/ (which is done asynchronously)\n  after(ActorContext me, Props props, String name) returning(ActorRef actor):\n  execution(ActorRef akka.actor.ActorContext.actorOf(Props, String)) &&\n  args(props, name) && this(me) {\n    inst.blockUntilPreStartCalled(actor);\n  }\n\n  Object around(ActorRef me, Object msg, ActorRef sender):\n  execution(* akka.actor.ScalaActorRef.$bang(Object, ActorRef)) &&\n  args(msg, sender) && this(me) {\n    if (inst.tell(me, msg, sender)) {\n      return proceed(me, msg, sender);\n    }\n    return null;\n  }\n\n  \/\/ Override akka.actor.Scheduler.schedulerOnce\n  pointcut scheduleOnce(LightArrayRevolverScheduler me, FiniteDuration delay, ActorRef receiver, Object msg, ExecutionContext exc, ActorRef sender):\n  execution(public * akka.actor.LightArrayRevolverScheduler.scheduleOnce(FiniteDuration,ActorRef,Object,ExecutionContext,ActorRef)) &&\n  args(delay, receiver, msg, exc, sender) && this(me);\n\n  \/\/ Never actually proceed(), just schedule our own timer, which does not use\n  \/\/ ! directly, but instead calls enqueue_message..\n  Object around(LightArrayRevolverScheduler me, FiniteDuration delay, ActorRef receiver, Object msg, ExecutionContext exc, ActorRef sender):\n  scheduleOnce(me, delay, receiver, msg, exc, sender) {\n    if (!inst.actorKnown(receiver)) {\n      return proceed(me,delay,receiver,msg,exc,sender);\n    }\n    class MyRunnable implements java.lang.Runnable {\n      \/\/ Make it a no-op!\n      public void run() {\n      }\n    }\n    MyRunnable runnable = new MyRunnable();\n    Cancellable c = new WrappedCancellable(\n      me.scheduleOnce(delay, runnable, exc), receiver.path().name(), msg);\n    inst.registerCancellable(c, false, receiver.path().name(), msg);\n    return c;\n  }\n\n  \/\/ Override akka.actor.Scheduler.scheduler\n  pointcut schedule(LightArrayRevolverScheduler me, FiniteDuration delay, FiniteDuration interval, ActorRef receiver, Object msg, ExecutionContext exc, ActorRef sender):\n  execution(public * akka.actor.LightArrayRevolverScheduler.schedule(FiniteDuration,FiniteDuration,ActorRef,Object,ExecutionContext,ActorRef)) &&\n  args(delay, interval, receiver, msg, exc, sender) && this(me);\n\n  \/\/ Never actually proceed(), just schedule our own timer, which does not use\n  \/\/ ! directly, but instead calls enqueue_message..\n  Object around(LightArrayRevolverScheduler me, FiniteDuration delay, FiniteDuration interval, ActorRef receiver, Object msg, ExecutionContext exc, ActorRef sender):\n  schedule(me, delay, interval, receiver, msg, exc, sender) {\n    if (!inst.actorKnown(receiver)) {\n      return proceed(me,delay,interval,receiver,msg,exc,sender);\n    }\n    class MyRunnable implements java.lang.Runnable {\n      \/\/ Make it a no-op!\n      public void run() {\n      }\n    }\n    MyRunnable runnable = new MyRunnable();\n    Cancellable c = new WrappedCancellable(\n      me.schedule(delay, interval, runnable, exc), receiver.path().name(), msg);\n    inst.registerCancellable(c, true, receiver.path().name(), msg);\n    return c;\n  }\n\n  \/\/ Override akka.actor.Scheduler.scheduler(block)\n  pointcut scheduleBlock(LightArrayRevolverScheduler me, FiniteDuration delay, FiniteDuration interval, scala.Function0<scala.runtime.BoxedUnit> block, ExecutionContext exc):\n  execution(public * schedule(scala.concurrent.duration.FiniteDuration, scala.concurrent.duration.FiniteDuration, scala.Function0<scala.runtime.BoxedUnit>, scala.concurrent.ExecutionContext)) &&\n  args(delay, interval, block, exc) && this(me);\n\n  \/\/ Wrap the function in a special \"Message\" wrapper, that appears to\n  \/\/ STS2 schedulers like a message, but which the Instrumenter understands as a\n  \/\/ function to be invoked rather than a message to be sent.\n  \/\/ TODO(cs): issue: no receiver.\n  Object around(LightArrayRevolverScheduler me, FiniteDuration delay, FiniteDuration interval, scala.Function0<scala.runtime.BoxedUnit> block, ExecutionContext exc):\n  scheduleBlock(me, delay, interval, block, exc) {\n    if (!inst.actorSystemInitialized() || Instrumenter.akkaInternalCodeBlockSchedule()) {\n      return proceed(me, delay, interval, block, exc);\n    }\n\n    class MyRunnable implements java.lang.Runnable {\n      \/\/ Make it a no-op!\n      public void run() {\n      }\n    }\n    MyRunnable runnable = new MyRunnable();\n    Cancellable c = new WrappedCancellable(me.schedule(delay, interval, runnable, exc), \"ScheduleFunction\", block);\n    inst.registerCancellable(c, true, \"ScheduleFunction\", block);\n    return c;\n  }\n\n  \/\/ Override akka.actor.Scheduler.scheduler(block)\n  pointcut scheduleOnceBlock(LightArrayRevolverScheduler me, FiniteDuration delay, scala.Function0<scala.runtime.BoxedUnit> block, ExecutionContext exc):\n  execution(public * scheduleOnce(scala.concurrent.duration.FiniteDuration, scala.Function0<scala.runtime.BoxedUnit>, scala.concurrent.ExecutionContext)) &&\n  args(delay, block, exc) && this(me);\n\n  \/\/ Wrap the function in a special \"Message\" wrapper, that appears to\n  \/\/ STS2 schedulers like a message, but which the Instrumenter understands as a\n  \/\/ function to be invoked rather than a message to be sent.\n  \/\/ TODO(cs): issue: no receiver.\n  Object around(LightArrayRevolverScheduler me, FiniteDuration delay, scala.Function0<scala.runtime.BoxedUnit> block, ExecutionContext exc):\n  scheduleOnceBlock(me, delay, block, exc) {\n    if (!inst.actorSystemInitialized() || Instrumenter.akkaInternalCodeBlockSchedule()) {\n      return proceed(me, delay, block, exc);\n    }\n\n    class MyRunnable implements java.lang.Runnable {\n      \/\/ Make it a no-op!\n      public void run() {\n      }\n    }\n    MyRunnable runnable = new MyRunnable();\n    Cancellable c = new WrappedCancellable(me.scheduleOnce(delay, runnable, exc), \"ScheduleFunction\", block);\n    inst.registerCancellable(c, false, \"ScheduleFunction\", block);\n    return c;\n  }\n}\n","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"AspectJ"}
{"commit":"d06d47e2f5adf40582066b2ac751b2c818941856","subject":"commit cff4ddd772af65522337ba3380d2e75b7b5d61e0 Author: Konstantin Boudnik <cos@yahoo-inc.com> Date:   Tue May 4 18:47:13 2010 -0700","message":"commit cff4ddd772af65522337ba3380d2e75b7b5d61e0\nAuthor: Konstantin Boudnik <cos@yahoo-inc.com>\nDate:   Tue May 4 18:47:13 2010 -0700\n\n    HADOOP-6332 from https:\/\/issues.apache.org\/jira\/secure\/attachment\/12443668\/6332-phase2.fix1.patch\n      on top of https:\/\/issues.apache.org\/jira\/secure\/attachment\/12443539\/6332-phase2.patch\n      fixing the issue with FileSystem access from Herriot via RPC\n\n\ngit-svn-id: 7e7a2d564dde2945c3a26e08d1235fcc0cb7aba1@1077439 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"awylie\/hadoop,awylie\/hadoop,awylie\/hadoop,awylie\/hadoop,awylie\/hadoop,awylie\/hadoop,awylie\/hadoop,awylie\/hadoop,awylie\/hadoop,awylie\/hadoop","old_file":"src\/test\/system\/aop\/org\/apache\/hadoop\/test\/system\/DaemonProtocolAspect.aj","new_file":"src\/test\/system\/aop\/org\/apache\/hadoop\/test\/system\/DaemonProtocolAspect.aj","new_contents":"\/**\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements.  See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership.  The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * \"License\"); you may not use this file except in compliance\n * with the License.  You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.apache.hadoop.test.system;\n\nimport java.io.File;\nimport java.io.IOException;\nimport java.security.PrivilegedExceptionAction;\nimport java.util.HashMap;\nimport java.util.List;\nimport java.util.ArrayList;\nimport java.util.Map;\nimport java.util.Properties;\nimport org.apache.commons.logging.Log;\nimport org.apache.commons.logging.LogFactory;\nimport org.apache.hadoop.io.Writable;\nimport org.apache.hadoop.security.UserGroupInformation;\nimport org.apache.hadoop.util.Shell.ShellCommandExecutor;\nimport org.apache.hadoop.fs.FileStatus;\nimport org.apache.hadoop.fs.FileSystem;\nimport org.apache.hadoop.fs.Path;\nimport org.apache.hadoop.conf.Configuration;\n\n\/**\n * Default DaemonProtocolAspect which is used to provide default implementation\n * for all the common daemon methods. If a daemon requires more specialized\n * version of method, it is responsibility of the DaemonClient to introduce the\n * same in woven classes.\n * \n *\/\npublic aspect DaemonProtocolAspect {\n\n  private boolean DaemonProtocol.ready;\n  \n  @SuppressWarnings(\"unchecked\")\n  private HashMap<Object, List<ControlAction>> DaemonProtocol.actions = \n    new HashMap<Object, List<ControlAction>>();\n  private static final Log LOG = LogFactory.getLog(\n      DaemonProtocolAspect.class.getName());\n  \/**\n   * Set if the daemon process is ready or not, concrete daemon protocol should\n   * implement pointcuts to determine when the daemon is ready and use the\n   * setter to set the ready state.\n   * \n   * @param ready\n   *          true if the Daemon is ready.\n   *\/\n  public void DaemonProtocol.setReady(boolean ready) {\n    this.ready = ready;\n  }\n\n  \/**\n   * Checks if the daemon process is alive or not.\n   * \n   * @throws IOException\n   *           if daemon is not alive.\n   *\/\n  public void DaemonProtocol.ping() throws IOException {\n  }\n\n  \/**\n   * Checks if the daemon process is ready to accepting RPC connections after it\n   * finishes initialization. <br\/>\n   * \n   * @return true if ready to accept connection.\n   * \n   * @throws IOException\n   *\/\n  public boolean DaemonProtocol.isReady() throws IOException {\n    return ready;\n  }\n\n  \/**\n   * Returns the process related information regarding the daemon process. <br\/>\n   * \n   * @return process information.\n   * @throws IOException\n   *\/\n  public ProcessInfo DaemonProtocol.getProcessInfo() throws IOException {\n    int activeThreadCount = Thread.activeCount();\n    long currentTime = System.currentTimeMillis();\n    long maxmem = Runtime.getRuntime().maxMemory();\n    long freemem = Runtime.getRuntime().freeMemory();\n    long totalmem = Runtime.getRuntime().totalMemory();\n    Map<String, String> envMap = System.getenv();\n    Properties sysProps = System.getProperties();\n    Map<String, String> props = new HashMap<String, String>();\n    for (Map.Entry entry : sysProps.entrySet()) {\n      props.put((String) entry.getKey(), (String) entry.getValue());\n    }\n    ProcessInfo info = new ProcessInfoImpl(activeThreadCount, currentTime,\n        freemem, maxmem, totalmem, envMap, props);\n    return info;\n  }\n\n  public void DaemonProtocol.enable(List<Enum<?>> faults) throws IOException {\n  }\n\n  public void DaemonProtocol.disableAll() throws IOException {\n  }\n\n  public abstract Configuration DaemonProtocol.getDaemonConf()\n    throws IOException;\n\n  public FileStatus DaemonProtocol.getFileStatus(String path, boolean local) \n    throws IOException {\n    Path p = new Path(path);\n    FileSystem fs = getFS(p, local);\n    p.makeQualified(fs);\n    FileStatus fileStatus = fs.getFileStatus(p);\n    return cloneFileStatus(fileStatus);\n  }\n\n  public FileStatus[] DaemonProtocol.listStatus(String path, boolean local) \n    throws IOException {\n    Path p = new Path(path);\n    FileSystem fs = getFS(p, local);\n    FileStatus[] status = fs.listStatus(p);\n    if (status != null) {\n      FileStatus[] result = new FileStatus[status.length];\n      int i = 0;\n      for (FileStatus fileStatus : status) {\n        result[i++] = cloneFileStatus(fileStatus);\n      }\n      return result;\n    }\n    return status;\n  }\n\n  \/**\n   * FileStatus object may not be serializable. Clone it into raw FileStatus \n   * object.\n   *\/\n  private FileStatus DaemonProtocol.cloneFileStatus(FileStatus fileStatus) {\n    return new FileStatus(fileStatus.getLen(),\n        fileStatus.isDir(),\n        fileStatus.getReplication(),\n        fileStatus.getBlockSize(),\n        fileStatus.getModificationTime(),\n        fileStatus.getAccessTime(),\n        fileStatus.getPermission(),\n        fileStatus.getOwner(),\n        fileStatus.getGroup(),\n        fileStatus.getPath());\n  }\n\n  private FileSystem DaemonProtocol.getFS(final Path path, final boolean local)\n      throws IOException {\n    FileSystem ret = null;\n    try {\n      ret = UserGroupInformation.getLoginUser().doAs (\n          new PrivilegedExceptionAction<FileSystem>() {\n            public FileSystem run() throws IOException {\n              FileSystem fs = null;\n              if (local) {\n                fs = FileSystem.getLocal(getDaemonConf());\n              } else {\n                fs = path.getFileSystem(getDaemonConf());\n              }\n              return fs;\n            }\n          });\n    } catch (InterruptedException ie) {\n    }\n    return ret;\n  }\n  \n  @SuppressWarnings(\"unchecked\")\n  public ControlAction[] DaemonProtocol.getActions(Writable key) \n    throws IOException {\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(key);\n      if(actionList == null) {\n        return new ControlAction[0];\n      } else {\n        return (ControlAction[]) actionList.toArray(new ControlAction[actionList\n                                                                      .size()]);\n      }\n    }\n  }\n\n\n  @SuppressWarnings(\"unchecked\")\n  public void DaemonProtocol.sendAction(ControlAction action) \n      throws IOException {\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(action.getTarget());\n      if(actionList == null) {\n        actionList = new ArrayList<ControlAction>();\n        actions.put(action.getTarget(), actionList);\n      }\n      actionList.add(action);\n    } \n  }\n \n  @SuppressWarnings(\"unchecked\")\n  public boolean DaemonProtocol.isActionPending(ControlAction action) \n    throws IOException{\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(action.getTarget());\n      if(actionList == null) {\n        return false;\n      } else {\n        return actionList.contains(action);\n      }\n    }\n  }\n  \n  \n  @SuppressWarnings(\"unchecked\")\n  public void DaemonProtocol.removeAction(ControlAction action) \n    throws IOException {\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(action.getTarget());\n      if(actionList == null) {\n        return;\n      } else {\n        actionList.remove(action);\n      }\n    }\n  }\n  \n  public void DaemonProtocol.clearActions() throws IOException {\n    synchronized (actions) {\n      actions.clear();\n    }\n  }\n\n  public String DaemonProtocol.getFilePattern() {\n    \/\/We use the environment variable HADOOP_LOGFILE to get the\n    \/\/pattern to use in the search.\n    String logDir = System.getenv(\"HADOOP_LOG_DIR\");\n    String daemonLogPattern = System.getenv(\"HADOOP_LOGFILE\");\n    if(daemonLogPattern == null && daemonLogPattern.isEmpty()) {\n      return \"*\";\n    }\n    return  logDir+File.separator+daemonLogPattern+\"*\";\n  }\n\n  public int DaemonProtocol.getNumberOfMatchesInLogFile(String pattern,\n      String[] list) throws IOException {\n    StringBuffer filePattern = new StringBuffer(getFilePattern());    \n    if(list != null){\n      for(int i =0; i < list.length; ++i)\n      {\n        filePattern.append(\" | grep -v \" + list[i] );\n      }\n    }  \n    String[] cmd =\n        new String[] {\n            \"bash\",\n            \"-c\",\n            \"grep -c \"\n                + pattern + \" \" + filePattern\n                + \" | awk -F: '{s+=$2} END {print s}'\" };    \n    ShellCommandExecutor shexec = new ShellCommandExecutor(cmd);\n    shexec.execute();\n    String output = shexec.getOutput();\n    return Integer.parseInt(output.replaceAll(\"\\n\", \"\").trim());\n  }\n\n  private String DaemonProtocol.user = null;\n  \n  public String DaemonProtocol.getDaemonUser() {\n    return user;\n  }\n  \n  public void DaemonProtocol.setUser(String user) {\n    this.user = user;\n  }\n}\n\n","old_contents":"\/**\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements.  See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership.  The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * \"License\"); you may not use this file except in compliance\n * with the License.  You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.apache.hadoop.test.system;\n\nimport java.io.File;\nimport java.io.IOException;\nimport java.util.HashMap;\nimport java.util.List;\nimport java.util.ArrayList;\nimport java.util.Map;\nimport java.util.Properties;\nimport org.apache.commons.logging.Log;\nimport org.apache.commons.logging.LogFactory;\nimport org.apache.hadoop.io.Writable;\nimport org.apache.hadoop.util.Shell.ShellCommandExecutor;\nimport org.apache.hadoop.fs.FileStatus;\nimport org.apache.hadoop.fs.FileSystem;\nimport org.apache.hadoop.fs.Path;\nimport org.apache.hadoop.conf.Configuration;\n\n\/**\n * Default DaemonProtocolAspect which is used to provide default implementation\n * for all the common daemon methods. If a daemon requires more specialized\n * version of method, it is responsibility of the DaemonClient to introduce the\n * same in woven classes.\n * \n *\/\npublic aspect DaemonProtocolAspect {\n\n  private boolean DaemonProtocol.ready;\n  \n  @SuppressWarnings(\"unchecked\")\n  private HashMap<Object, List<ControlAction>> DaemonProtocol.actions = \n    new HashMap<Object, List<ControlAction>>();\n  private static final Log LOG = LogFactory.getLog(\n      DaemonProtocolAspect.class.getName());\n  \/**\n   * Set if the daemon process is ready or not, concrete daemon protocol should\n   * implement pointcuts to determine when the daemon is ready and use the\n   * setter to set the ready state.\n   * \n   * @param ready\n   *          true if the Daemon is ready.\n   *\/\n  public void DaemonProtocol.setReady(boolean ready) {\n    this.ready = ready;\n  }\n\n  \/**\n   * Checks if the daemon process is alive or not.\n   * \n   * @throws IOException\n   *           if daemon is not alive.\n   *\/\n  public void DaemonProtocol.ping() throws IOException {\n  }\n\n  \/**\n   * Checks if the daemon process is ready to accepting RPC connections after it\n   * finishes initialization. <br\/>\n   * \n   * @return true if ready to accept connection.\n   * \n   * @throws IOException\n   *\/\n  public boolean DaemonProtocol.isReady() throws IOException {\n    return ready;\n  }\n\n  \/**\n   * Returns the process related information regarding the daemon process. <br\/>\n   * \n   * @return process information.\n   * @throws IOException\n   *\/\n  public ProcessInfo DaemonProtocol.getProcessInfo() throws IOException {\n    int activeThreadCount = Thread.activeCount();\n    long currentTime = System.currentTimeMillis();\n    long maxmem = Runtime.getRuntime().maxMemory();\n    long freemem = Runtime.getRuntime().freeMemory();\n    long totalmem = Runtime.getRuntime().totalMemory();\n    Map<String, String> envMap = System.getenv();\n    Properties sysProps = System.getProperties();\n    Map<String, String> props = new HashMap<String, String>();\n    for (Map.Entry entry : sysProps.entrySet()) {\n      props.put((String) entry.getKey(), (String) entry.getValue());\n    }\n    ProcessInfo info = new ProcessInfoImpl(activeThreadCount, currentTime,\n        freemem, maxmem, totalmem, envMap, props);\n    return info;\n  }\n\n  public void DaemonProtocol.enable(List<Enum<?>> faults) throws IOException {\n  }\n\n  public void DaemonProtocol.disableAll() throws IOException {\n  }\n\n  public abstract Configuration DaemonProtocol.getDaemonConf()\n    throws IOException;\n\n  public FileStatus DaemonProtocol.getFileStatus(String path, boolean local) \n    throws IOException {\n    Path p = new Path(path);\n    FileSystem fs = getFS(p, local);\n    p.makeQualified(fs);\n    FileStatus fileStatus = fs.getFileStatus(p);\n    return cloneFileStatus(fileStatus);\n  }\n\n  public FileStatus[] DaemonProtocol.listStatus(String path, boolean local) \n    throws IOException {\n    Path p = new Path(path);\n    FileSystem fs = getFS(p, local);\n    FileStatus[] status = fs.listStatus(p);\n    if (status != null) {\n      FileStatus[] result = new FileStatus[status.length];\n      int i = 0;\n      for (FileStatus fileStatus : status) {\n        result[i++] = cloneFileStatus(fileStatus);\n      }\n      return result;\n    }\n    return status;\n  }\n\n  \/**\n   * FileStatus object may not be serializable. Clone it into raw FileStatus \n   * object.\n   *\/\n  private FileStatus DaemonProtocol.cloneFileStatus(FileStatus fileStatus) {\n    return new FileStatus(fileStatus.getLen(),\n        fileStatus.isDir(),\n        fileStatus.getReplication(),\n        fileStatus.getBlockSize(),\n        fileStatus.getModificationTime(),\n        fileStatus.getAccessTime(),\n        fileStatus.getPermission(),\n        fileStatus.getOwner(),\n        fileStatus.getGroup(),\n        fileStatus.getPath());\n  }\n\n  private FileSystem DaemonProtocol.getFS(Path path, boolean local) \n    throws IOException {\n    FileSystem fs = null;\n    if (local) {\n      fs = FileSystem.getLocal(getDaemonConf());\n    } else {\n      fs = path.getFileSystem(getDaemonConf());\n    }\n    return fs;\n  }\n  \n  \n  @SuppressWarnings(\"unchecked\")\n  public ControlAction[] DaemonProtocol.getActions(Writable key) \n    throws IOException {\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(key);\n      if(actionList == null) {\n        return new ControlAction[0];\n      } else {\n        return (ControlAction[]) actionList.toArray(new ControlAction[actionList\n                                                                      .size()]);\n      }\n    }\n  }\n\n\n  @SuppressWarnings(\"unchecked\")\n  public void DaemonProtocol.sendAction(ControlAction action) \n      throws IOException {\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(action.getTarget());\n      if(actionList == null) {\n        actionList = new ArrayList<ControlAction>();\n        actions.put(action.getTarget(), actionList);\n      }\n      actionList.add(action);\n    } \n  }\n \n  @SuppressWarnings(\"unchecked\")\n  public boolean DaemonProtocol.isActionPending(ControlAction action) \n    throws IOException{\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(action.getTarget());\n      if(actionList == null) {\n        return false;\n      } else {\n        return actionList.contains(action);\n      }\n    }\n  }\n  \n  \n  @SuppressWarnings(\"unchecked\")\n  public void DaemonProtocol.removeAction(ControlAction action) \n    throws IOException {\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(action.getTarget());\n      if(actionList == null) {\n        return;\n      } else {\n        actionList.remove(action);\n      }\n    }\n  }\n  \n  public void DaemonProtocol.clearActions() throws IOException {\n    synchronized (actions) {\n      actions.clear();\n    }\n  }\n\n  public String DaemonProtocol.getFilePattern() {\n    \/\/We use the environment variable HADOOP_LOGFILE to get the\n    \/\/pattern to use in the search.\n    String logDir = System.getenv(\"HADOOP_LOG_DIR\");\n    String daemonLogPattern = System.getenv(\"HADOOP_LOGFILE\");\n    if(daemonLogPattern == null && daemonLogPattern.isEmpty()) {\n      return \"*\";\n    }\n    return  logDir+File.separator+daemonLogPattern+\"*\";\n  }\n\n  public int DaemonProtocol.getNumberOfMatchesInLogFile(String pattern,\n      String[] list) throws IOException {\n    StringBuffer filePattern = new StringBuffer(getFilePattern());    \n    if(list != null){\n      for(int i =0; i < list.length; ++i)\n      {\n        filePattern.append(\" | grep -v \" + list[i] );\n      }\n    }  \n    String[] cmd =\n        new String[] {\n            \"bash\",\n            \"-c\",\n            \"grep -c \"\n                + pattern + \" \" + filePattern\n                + \" | awk -F: '{s+=$2} END {print s}'\" };    \n    ShellCommandExecutor shexec = new ShellCommandExecutor(cmd);\n    shexec.execute();\n    String output = shexec.getOutput();\n    return Integer.parseInt(output.replaceAll(\"\\n\", \"\").trim());\n  }\n\n  private String DaemonProtocol.user = null;\n  \n  public String DaemonProtocol.getDaemonUser() {\n    return user;\n  }\n  \n  public void DaemonProtocol.setUser(String user) {\n    this.user = user;\n  }\n}\n\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"e21cb2fcd4e619aae7b8a7021f86cbbd164fd559","subject":"fix NPE in DOMAspect.aj","message":"fix NPE in DOMAspect.aj\n","repos":"andrey-ilinykh\/scala-ide,sschaef\/scala-ide,Kwestor\/scala-ide,wpopielarski\/scala-ide,romanowski\/scala-ide,aleksi-lukkarinen\/scala-ide,sschaef\/scala-ide,dragos\/scala-ide,Duhemm\/scala-ide,scala-ide\/scala-ide,romanowski\/scala-ide,dragos\/scala-ide,mlangc\/scala-ide,dragos\/scala-ide,andrey-ilinykh\/scala-ide,scala-ide\/scala-ide,Duhemm\/scala-ide,aleksi-lukkarinen\/scala-ide,stephenh\/scala-ide,Duhemm\/scala-ide,aleksi-lukkarinen\/scala-ide,aleksi-lukkarinen\/scala-ide,stephenh\/scala-ide,mlangc\/scala-ide,Kwestor\/scala-ide,sschaef\/scala-ide,pilipolio\/scala-ide,scala-ide\/scala-ide,andrey-ilinykh\/scala-ide,Duhemm\/scala-ide,pilipolio\/scala-ide,wpopielarski\/scala-ide,mlangc\/scala-ide,stephenh\/scala-ide,pilipolio\/scala-ide,mlangc\/scala-ide,Kwestor\/scala-ide,sschaef\/scala-ide,wpopielarski\/scala-ide,romanowski\/scala-ide,dragos\/scala-ide,Kwestor\/scala-ide,andrey-ilinykh\/scala-ide,stephenh\/scala-ide,pilipolio\/scala-ide,romanowski\/scala-ide,wpopielarski\/scala-ide,scala-ide\/scala-ide","old_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/core\/DOMAspect.aj","new_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/core\/DOMAspect.aj","new_contents":"\/*\n * Copyright 2005-2010 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.core;\n\nimport java.util.Locale;\nimport java.util.Map;\n\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.core.ICompilationUnit;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.core.compiler.CharOperation;\nimport org.eclipse.jdt.core.dom.AST;\nimport org.eclipse.jdt.core.dom.ASTNode;\nimport org.eclipse.jdt.core.dom.ASTParser;\nimport org.eclipse.jdt.internal.compiler.CompilationResult;\nimport org.eclipse.jdt.internal.compiler.DefaultErrorHandlingPolicies;\nimport org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.AbstractVariableDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.AnnotationMethodDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.Argument;\nimport org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.ConstructorDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.Expression;\nimport org.eclipse.jdt.internal.compiler.ast.MethodDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.QualifiedAllocationExpression;\nimport org.eclipse.jdt.internal.compiler.ast.Statement;\nimport org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.TypeParameter;\nimport org.eclipse.jdt.internal.compiler.ast.TypeReference;\nimport org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;\nimport org.eclipse.jdt.internal.compiler.env.AccessRestriction;\nimport org.eclipse.jdt.internal.compiler.env.IBinaryType;\nimport org.eclipse.jdt.internal.compiler.env.INameEnvironment;\nimport org.eclipse.jdt.internal.compiler.env.ISourceType;\nimport org.eclipse.jdt.internal.compiler.impl.CompilerOptions;\nimport org.eclipse.jdt.internal.compiler.impl.ITypeRequestor;\nimport org.eclipse.jdt.internal.compiler.lookup.LookupEnvironment;\nimport org.eclipse.jdt.internal.compiler.lookup.PackageBinding;\nimport org.eclipse.jdt.internal.compiler.parser.SourceTypeConverter;\nimport org.eclipse.jdt.internal.compiler.problem.DefaultProblemFactory;\nimport org.eclipse.jdt.internal.compiler.problem.ProblemReporter;\nimport org.eclipse.jdt.internal.core.DefaultWorkingCopyOwner;\nimport org.eclipse.jdt.internal.core.JavaProject;\nimport org.eclipse.jdt.internal.core.SourceAnnotationMethodInfo;\nimport org.eclipse.jdt.internal.core.SourceMethod;\nimport org.eclipse.jdt.internal.core.SourceMethodElementInfo;\nimport org.eclipse.jdt.internal.core.SourceType;\nimport org.eclipse.jdt.internal.core.SourceTypeElementInfo;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaCompilationUnit;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect DOMAspect {\n  pointcut internalCreateAST(ASTParser parser, IProgressMonitor monitor) :\n    execution(ASTNode ASTParser.internalCreateAST(IProgressMonitor)) &&\n    args(monitor) &&\n    target(parser);\n  \n  pointcut convert(SourceTypeConverter stc, SourceMethod methodHandle, SourceMethodElementInfo methodInfo, CompilationResult compilationResult) :\n    execution(AbstractMethodDeclaration SourceTypeConverter.convert(SourceMethod, SourceMethodElementInfo, CompilationResult)) &&\n    args(methodHandle, methodInfo, compilationResult) &&\n    target(stc);\n  \n  ASTNode around(ASTParser parser, IProgressMonitor monitor) :\n    internalCreateAST(parser, monitor) {\n    try {\n      if (!(parser.typeRoot instanceof IScalaCompilationUnit))\n        return proceed(parser, monitor);\n      \n      ICompilationUnit cu = (ICompilationUnit)parser.typeRoot;\n      org.eclipse.jdt.internal.compiler.env.ICompilationUnit sourceUnit = (org.eclipse.jdt.internal.compiler.env.ICompilationUnit)cu;\n      \n      IType[] topLevelTypes = cu.getTypes();\n      int length = topLevelTypes.length;\n      if (length == 0)\n        throw new IllegalStateException();\n      \n      SourceTypeElementInfo[] topLevelInfos = new SourceTypeElementInfo[length];\n      for (int i = 0; i < length; i++) {\n        topLevelInfos[i] = (SourceTypeElementInfo) ((SourceType)topLevelTypes[i]).getElementInfo();\n      }\n      char[] fileName = ((ISourceType)topLevelInfos[0]).getFileName();\n      \n      CompilationResult result = new CompilationResult(fileName, 1, 1, 100);\n\n      JavaProject javaProject = (JavaProject)cu.getJavaProject(); \n      Map compilerOptions0 = javaProject.getOptions(true);\n      CompilerOptions compilerOptions = new CompilerOptions(compilerOptions0);\n      compilerOptions.storeAnnotations = true;\n      \n      ProblemReporter problemReporter =\n        new ProblemReporter(\n          DefaultErrorHandlingPolicies.proceedWithAllProblems(),\n          compilerOptions,\n          new DefaultProblemFactory(Locale.getDefault()));\n      \n      int flags = SourceTypeConverter.FIELD_AND_METHOD | SourceTypeConverter.MEMBER_TYPE;\n      \n      CompilationUnitDeclaration unit =\n        SourceTypeConverter.buildCompilationUnit(topLevelInfos, flags, problemReporter, result);\n      \n      INameEnvironment ne = javaProject.newSearchableNameEnvironment(DefaultWorkingCopyOwner.PRIMARY);\n      final LookupEnvironment le = new LookupEnvironment(null, compilerOptions, problemReporter, ne);\n      ITypeRequestor typeRequestor = new ITypeRequestor() {\n        public void accept(IBinaryType binaryType, PackageBinding packageBinding, AccessRestriction accessRestriction) {\n          le.createBinaryTypeFrom(binaryType, packageBinding, accessRestriction);\n        }\n        public void accept(org.eclipse.jdt.internal.compiler.env.ICompilationUnit unit, AccessRestriction accessRestriction) {}\n        public void accept(ISourceType[] sourceType, PackageBinding packageBinding, AccessRestriction accessRestriction) {}\n      };\n      le.typeRequestor = typeRequestor;\n      \n      le.buildTypeBindings(unit, null);\n      le.completeTypeBindings();\n      fixTypes(unit.types);\n      \n      AST ast = AST.newAST(AST.JLS3);\n      ast.setFlag(AST.RESOLVED_BINDINGS);\n      ast.setDefaultNodeFlag(ASTNode.ORIGINAL);\n\n      org.eclipse.jdt.core.dom.ASTConverter converter =\n        new org.eclipse.jdt.core.dom.ASTConverter(compilerOptions0, true, monitor);\n      \n      org.eclipse.jdt.core.dom.BindingResolver resolver =\n        new org.eclipse.jdt.core.dom.DefaultBindingResolver(\n          unit.scope,\n          DefaultWorkingCopyOwner.PRIMARY,\n          new org.eclipse.jdt.core.dom.DefaultBindingResolver.BindingTables(),\n          true);\n      ast.setBindingResolver(resolver);\n      converter.setAST(ast);\n      \n      ASTNode node = converter.convert(unit, sourceUnit.getContents());\n      return node;\n    } catch (JavaModelException ex) {\n      throw new IllegalArgumentException(ex);\n    }\n  }\n  \n  private void fixTypes(TypeDeclaration[] types) {\n    for(int i = 0, iLimit = types.length; i < iLimit ; ++i) {\n      TypeDeclaration tpe = types[i];\n      if (tpe != null) {\n        if (tpe.binding != null) {\n          tpe.binding.getAnnotationTagBits();\n        }\n        if (tpe.scope != null) {\n          tpe.scope.buildFields();\n          tpe.scope.buildMethods();\n        }\n        fixFields(tpe.fields);\n        fixMethods(tpe.methods);\n        fixTypes(tpe.memberTypes);\n      }\n    }\n  }\n  \n  private void fixMethods(AbstractMethodDeclaration[] methods) {\n    if (methods == null)\n      return;\n    \n    for(int i = 0, iLimit = methods.length; i < iLimit; ++i) {\n      AbstractMethodDeclaration m = methods[i];\n      m.bodyStart = m.declarationSourceStart;\n      m.bodyEnd = m.declarationSourceEnd;\n      if (m.binding != null) {\n        m.binding.getAnnotationTagBits();\n      }\n    }\n  }\n  \n  private void fixFields(AbstractVariableDeclaration[] fields) {\n    if (fields == null)\n      return;\n    \n    for(int i = 0, iLimit = fields.length; i < iLimit; ++i) {\n      AbstractVariableDeclaration f = fields[i];\n      f.declarationEnd = f.declarationSourceEnd;\n    }\n  }\n\n  AbstractMethodDeclaration around(SourceTypeConverter stc, SourceMethod methodHandle, SourceMethodElementInfo methodInfo, CompilationResult compilationResult) throws JavaModelException :\n    convert(stc, methodHandle, methodInfo, compilationResult) {\n    AbstractMethodDeclaration method;\n\n    \/* only source positions available *\/\n    int start = methodInfo.getNameSourceStart();\n    int end = methodInfo.getNameSourceEnd();\n\n    \/\/ convert 1.5 specific constructs only if compliance is 1.5 or above\n    TypeParameter[] typeParams = null;\n    if (stc.has1_5Compliance) {\n      \/* convert type parameters *\/\n      char[][] typeParameterNames = methodInfo.getTypeParameterNames();\n      if (typeParameterNames != null) {\n        int parameterCount = typeParameterNames.length;\n        if (parameterCount > 0) { \/\/ method's type parameters must be null if no type parameter\n          char[][][] typeParameterBounds = methodInfo.getTypeParameterBounds();\n          typeParams = new TypeParameter[parameterCount];\n          for (int i = 0; i < parameterCount; i++) {\n            typeParams[i] = stc.createTypeParameter(typeParameterNames[i], typeParameterBounds[i], start, end);\n          }\n        }\n      }\n    }\n\n    int modifiers = methodInfo.getModifiers();\n    if (methodInfo.isConstructor()) {\n      ConstructorDeclaration decl = new ConstructorDeclaration(compilationResult);\n      decl.bits &= ~org.eclipse.jdt.internal.compiler.ast.ASTNode.IsDefaultConstructor;\n      method = decl;\n      decl.typeParameters = typeParams;\n    } else {\n      MethodDeclaration decl;\n      if (methodInfo.isAnnotationMethod()) {\n        AnnotationMethodDeclaration annotationMethodDeclaration = new AnnotationMethodDeclaration(compilationResult);\n\n        \/* conversion of default value *\/\n        SourceAnnotationMethodInfo annotationMethodInfo = (SourceAnnotationMethodInfo) methodInfo;\n        boolean hasDefaultValue = annotationMethodInfo.defaultValueStart != -1 || annotationMethodInfo.defaultValueEnd != -1;\n        if ((stc.flags & SourceTypeConverter.FIELD_INITIALIZATION) != 0) {\n          if (hasDefaultValue) {\n            char[] defaultValueSource = CharOperation.subarray(stc.getSource(), annotationMethodInfo.defaultValueStart, annotationMethodInfo.defaultValueEnd+1);\n            if (defaultValueSource != null) {\n                Expression expression =  stc.parseMemberValue(defaultValueSource);\n                if (expression != null) {\n                  annotationMethodDeclaration.defaultValue = expression;\n                }\n            } else {\n              \/\/ could not retrieve the default value\n              hasDefaultValue = false;\n            }\n          }\n        }\n        if (hasDefaultValue)\n          modifiers |= ClassFileConstants.AccAnnotationDefault;\n        decl = annotationMethodDeclaration;\n      } else {\n        decl = new MethodDeclaration(compilationResult);\n      }\n\n      \/\/ convert return type\n      decl.returnType = stc.createTypeReference(methodInfo.getReturnTypeName(), start, end);\n\n      \/\/ type parameters\n      decl.typeParameters = typeParams;\n\n      method = decl;\n    }\n    method.selector = methodHandle.getElementName().toCharArray();\n    boolean isVarargs = (modifiers & ClassFileConstants.AccVarargs) != 0;\n    method.modifiers = modifiers & ~ClassFileConstants.AccVarargs;\n    method.sourceStart = start;\n    method.sourceEnd = end;\n    method.declarationSourceStart = methodInfo.getDeclarationSourceStart();\n    method.declarationSourceEnd = methodInfo.getDeclarationSourceEnd();\n\n    \/\/ convert 1.5 specific constructs only if compliance is 1.5 or above\n    if (stc.has1_5Compliance) {\n      \/* convert annotations *\/\n      method.annotations = stc.convertAnnotations(methodHandle);\n    }\n\n    \/* convert arguments *\/\n    String[] argumentTypeSignatures = methodHandle.getParameterTypes();\n    char[][] argumentNames = methodInfo.getArgumentNames();\n    int argumentCount = argumentTypeSignatures == null ? 0 : argumentTypeSignatures.length;\n    if (argumentCount > 0) {\n      long position = ((long) start << 32) + end;\n      method.arguments = new Argument[argumentCount];\n      for (int i = 0; i < argumentCount; i++) {\n        TypeReference typeReference = stc.createTypeReference(argumentTypeSignatures[i], start, end);\n        if (isVarargs && i == argumentCount-1) {\n          typeReference.bits |= org.eclipse.jdt.internal.compiler.ast.ASTNode.IsVarArgs;\n        }\n        method.arguments[i] =\n          new Argument(\n            argumentNames[i],\n            position,\n            typeReference,\n            ClassFileConstants.AccDefault);\n        \/\/ do not care whether was final or not\n      }\n    }\n\n    \/* convert thrown exceptions *\/\n    char[][] exceptionTypeNames = methodInfo.getExceptionTypeNames();\n    int exceptionCount = exceptionTypeNames == null ? 0 : exceptionTypeNames.length;\n    if (exceptionCount > 0) {\n      method.thrownExceptions = new TypeReference[exceptionCount];\n      for (int i = 0; i < exceptionCount; i++) {\n        method.thrownExceptions[i] =\n          stc.createTypeReference(exceptionTypeNames[i], start, end);\n      }\n    }\n\n    \/* convert local and anonymous types *\/\n    if ((stc.flags & SourceTypeConverter.LOCAL_TYPE) != 0) {\n      IJavaElement[] children = methodInfo.getChildren();\n      int typesLength = 0;\n      int childrenLength = children.length;\n      for (int i = 0; i < childrenLength; ++i)\n        if (children[i] instanceof SourceType)\n          ++typesLength;\n      \n      if (typesLength != 0) {\n        Statement[] statements = new Statement[typesLength];\n        int typeIndex = 0;\n        for (int i = 0; i < childrenLength; i++) {\n          if (children[i] instanceof SourceType) {\n            SourceType type = (SourceType) children[i];\n            TypeDeclaration localType = stc.convert(type, compilationResult);\n            if ((localType.bits & org.eclipse.jdt.internal.compiler.ast.ASTNode.IsAnonymousType) != 0) {\n              QualifiedAllocationExpression expression = new QualifiedAllocationExpression(localType);\n              expression.type = localType.superclass;\n              localType.superclass = null;\n              localType.superInterfaces = null;\n              localType.allocation = expression;\n              statements[typeIndex] = expression;\n            } else {\n              statements[typeIndex] = localType;\n            }\n            ++typeIndex;\n          }\n        }\n        method.statements = statements;\n      }\n    }\n\n    return method;\n  }\n}\n","old_contents":"\/*\n * Copyright 2005-2010 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.core;\n\nimport java.util.Locale;\nimport java.util.Map;\n\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.core.ICompilationUnit;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.core.compiler.CharOperation;\nimport org.eclipse.jdt.core.dom.AST;\nimport org.eclipse.jdt.core.dom.ASTNode;\nimport org.eclipse.jdt.core.dom.ASTParser;\nimport org.eclipse.jdt.internal.compiler.CompilationResult;\nimport org.eclipse.jdt.internal.compiler.DefaultErrorHandlingPolicies;\nimport org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.AbstractVariableDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.AnnotationMethodDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.Argument;\nimport org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.ConstructorDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.Expression;\nimport org.eclipse.jdt.internal.compiler.ast.MethodDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.QualifiedAllocationExpression;\nimport org.eclipse.jdt.internal.compiler.ast.Statement;\nimport org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.TypeParameter;\nimport org.eclipse.jdt.internal.compiler.ast.TypeReference;\nimport org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;\nimport org.eclipse.jdt.internal.compiler.env.AccessRestriction;\nimport org.eclipse.jdt.internal.compiler.env.IBinaryType;\nimport org.eclipse.jdt.internal.compiler.env.INameEnvironment;\nimport org.eclipse.jdt.internal.compiler.env.ISourceType;\nimport org.eclipse.jdt.internal.compiler.impl.CompilerOptions;\nimport org.eclipse.jdt.internal.compiler.impl.ITypeRequestor;\nimport org.eclipse.jdt.internal.compiler.lookup.LookupEnvironment;\nimport org.eclipse.jdt.internal.compiler.lookup.PackageBinding;\nimport org.eclipse.jdt.internal.compiler.parser.SourceTypeConverter;\nimport org.eclipse.jdt.internal.compiler.problem.DefaultProblemFactory;\nimport org.eclipse.jdt.internal.compiler.problem.ProblemReporter;\nimport org.eclipse.jdt.internal.core.DefaultWorkingCopyOwner;\nimport org.eclipse.jdt.internal.core.JavaProject;\nimport org.eclipse.jdt.internal.core.SourceAnnotationMethodInfo;\nimport org.eclipse.jdt.internal.core.SourceMethod;\nimport org.eclipse.jdt.internal.core.SourceMethodElementInfo;\nimport org.eclipse.jdt.internal.core.SourceType;\nimport org.eclipse.jdt.internal.core.SourceTypeElementInfo;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaCompilationUnit;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect DOMAspect {\n  pointcut internalCreateAST(ASTParser parser, IProgressMonitor monitor) :\n    execution(ASTNode ASTParser.internalCreateAST(IProgressMonitor)) &&\n    args(monitor) &&\n    target(parser);\n  \n  pointcut convert(SourceTypeConverter stc, SourceMethod methodHandle, SourceMethodElementInfo methodInfo, CompilationResult compilationResult) :\n    execution(AbstractMethodDeclaration SourceTypeConverter.convert(SourceMethod, SourceMethodElementInfo, CompilationResult)) &&\n    args(methodHandle, methodInfo, compilationResult) &&\n    target(stc);\n  \n  ASTNode around(ASTParser parser, IProgressMonitor monitor) :\n    internalCreateAST(parser, monitor) {\n    try {\n      if (!(parser.typeRoot instanceof IScalaCompilationUnit))\n        return proceed(parser, monitor);\n      \n      ICompilationUnit cu = (ICompilationUnit)parser.typeRoot;\n      org.eclipse.jdt.internal.compiler.env.ICompilationUnit sourceUnit = (org.eclipse.jdt.internal.compiler.env.ICompilationUnit)cu;\n      \n      IType[] topLevelTypes = cu.getTypes();\n      int length = topLevelTypes.length;\n      if (length == 0)\n        throw new IllegalStateException();\n      \n      SourceTypeElementInfo[] topLevelInfos = new SourceTypeElementInfo[length];\n      for (int i = 0; i < length; i++) {\n        topLevelInfos[i] = (SourceTypeElementInfo) ((SourceType)topLevelTypes[i]).getElementInfo();\n      }\n      char[] fileName = ((ISourceType)topLevelInfos[0]).getFileName();\n      \n      CompilationResult result = new CompilationResult(fileName, 1, 1, 100);\n\n      JavaProject javaProject = (JavaProject)cu.getJavaProject(); \n      Map compilerOptions0 = javaProject.getOptions(true);\n      CompilerOptions compilerOptions = new CompilerOptions(compilerOptions0);\n      compilerOptions.storeAnnotations = true;\n      \n      ProblemReporter problemReporter =\n        new ProblemReporter(\n          DefaultErrorHandlingPolicies.proceedWithAllProblems(),\n          compilerOptions,\n          new DefaultProblemFactory(Locale.getDefault()));\n      \n      int flags = SourceTypeConverter.FIELD_AND_METHOD | SourceTypeConverter.MEMBER_TYPE;\n      \n      CompilationUnitDeclaration unit =\n        SourceTypeConverter.buildCompilationUnit(topLevelInfos, flags, problemReporter, result);\n      \n      INameEnvironment ne = javaProject.newSearchableNameEnvironment(DefaultWorkingCopyOwner.PRIMARY);\n      final LookupEnvironment le = new LookupEnvironment(null, compilerOptions, problemReporter, ne);\n      ITypeRequestor typeRequestor = new ITypeRequestor() {\n        public void accept(IBinaryType binaryType, PackageBinding packageBinding, AccessRestriction accessRestriction) {\n          le.createBinaryTypeFrom(binaryType, packageBinding, accessRestriction);\n        }\n        public void accept(org.eclipse.jdt.internal.compiler.env.ICompilationUnit unit, AccessRestriction accessRestriction) {}\n        public void accept(ISourceType[] sourceType, PackageBinding packageBinding, AccessRestriction accessRestriction) {}\n      };\n      le.typeRequestor = typeRequestor;\n      \n      le.buildTypeBindings(unit, null);\n      le.completeTypeBindings();\n      fixTypes(unit.types);\n      \n      AST ast = AST.newAST(AST.JLS3);\n      ast.setFlag(AST.RESOLVED_BINDINGS);\n      ast.setDefaultNodeFlag(ASTNode.ORIGINAL);\n\n      org.eclipse.jdt.core.dom.ASTConverter converter =\n        new org.eclipse.jdt.core.dom.ASTConverter(compilerOptions0, true, monitor);\n      \n      org.eclipse.jdt.core.dom.BindingResolver resolver =\n        new org.eclipse.jdt.core.dom.DefaultBindingResolver(\n          unit.scope,\n          DefaultWorkingCopyOwner.PRIMARY,\n          new org.eclipse.jdt.core.dom.DefaultBindingResolver.BindingTables(),\n          true);\n      ast.setBindingResolver(resolver);\n      converter.setAST(ast);\n      \n      ASTNode node = converter.convert(unit, sourceUnit.getContents());\n      return node;\n    } catch (JavaModelException ex) {\n      throw new IllegalArgumentException(ex);\n    }\n  }\n  \n  private void fixTypes(TypeDeclaration[] types) {\n    for(int i = 0, iLimit = types.length; i < iLimit ; ++i) {\n      TypeDeclaration tpe = types[i];\n      tpe.binding.getAnnotationTagBits();\n      tpe.scope.buildFields();\n      tpe.scope.buildMethods();\n      fixFields(tpe.fields);\n      fixMethods(tpe.methods);\n      fixTypes(tpe.memberTypes);\n    }\n  }\n  \n  private void fixMethods(AbstractMethodDeclaration[] methods) {\n    if (methods == null)\n      return;\n    \n    for(int i = 0, iLimit = methods.length; i < iLimit; ++i) {\n      AbstractMethodDeclaration m = methods[i];\n      m.bodyStart = m.declarationSourceStart;\n      m.bodyEnd = m.declarationSourceEnd;\n      m.binding.getAnnotationTagBits();\n    }\n  }\n  \n  private void fixFields(AbstractVariableDeclaration[] fields) {\n    if (fields == null)\n      return;\n    \n    for(int i = 0, iLimit = fields.length; i < iLimit; ++i) {\n      AbstractVariableDeclaration f = fields[i];\n      f.declarationEnd = f.declarationSourceEnd;\n    }\n  }\n\n  AbstractMethodDeclaration around(SourceTypeConverter stc, SourceMethod methodHandle, SourceMethodElementInfo methodInfo, CompilationResult compilationResult) throws JavaModelException :\n    convert(stc, methodHandle, methodInfo, compilationResult) {\n    AbstractMethodDeclaration method;\n\n    \/* only source positions available *\/\n    int start = methodInfo.getNameSourceStart();\n    int end = methodInfo.getNameSourceEnd();\n\n    \/\/ convert 1.5 specific constructs only if compliance is 1.5 or above\n    TypeParameter[] typeParams = null;\n    if (stc.has1_5Compliance) {\n      \/* convert type parameters *\/\n      char[][] typeParameterNames = methodInfo.getTypeParameterNames();\n      if (typeParameterNames != null) {\n        int parameterCount = typeParameterNames.length;\n        if (parameterCount > 0) { \/\/ method's type parameters must be null if no type parameter\n          char[][][] typeParameterBounds = methodInfo.getTypeParameterBounds();\n          typeParams = new TypeParameter[parameterCount];\n          for (int i = 0; i < parameterCount; i++) {\n            typeParams[i] = stc.createTypeParameter(typeParameterNames[i], typeParameterBounds[i], start, end);\n          }\n        }\n      }\n    }\n\n    int modifiers = methodInfo.getModifiers();\n    if (methodInfo.isConstructor()) {\n      ConstructorDeclaration decl = new ConstructorDeclaration(compilationResult);\n      decl.bits &= ~org.eclipse.jdt.internal.compiler.ast.ASTNode.IsDefaultConstructor;\n      method = decl;\n      decl.typeParameters = typeParams;\n    } else {\n      MethodDeclaration decl;\n      if (methodInfo.isAnnotationMethod()) {\n        AnnotationMethodDeclaration annotationMethodDeclaration = new AnnotationMethodDeclaration(compilationResult);\n\n        \/* conversion of default value *\/\n        SourceAnnotationMethodInfo annotationMethodInfo = (SourceAnnotationMethodInfo) methodInfo;\n        boolean hasDefaultValue = annotationMethodInfo.defaultValueStart != -1 || annotationMethodInfo.defaultValueEnd != -1;\n        if ((stc.flags & SourceTypeConverter.FIELD_INITIALIZATION) != 0) {\n          if (hasDefaultValue) {\n            char[] defaultValueSource = CharOperation.subarray(stc.getSource(), annotationMethodInfo.defaultValueStart, annotationMethodInfo.defaultValueEnd+1);\n            if (defaultValueSource != null) {\n                Expression expression =  stc.parseMemberValue(defaultValueSource);\n                if (expression != null) {\n                  annotationMethodDeclaration.defaultValue = expression;\n                }\n            } else {\n              \/\/ could not retrieve the default value\n              hasDefaultValue = false;\n            }\n          }\n        }\n        if (hasDefaultValue)\n          modifiers |= ClassFileConstants.AccAnnotationDefault;\n        decl = annotationMethodDeclaration;\n      } else {\n        decl = new MethodDeclaration(compilationResult);\n      }\n\n      \/\/ convert return type\n      decl.returnType = stc.createTypeReference(methodInfo.getReturnTypeName(), start, end);\n\n      \/\/ type parameters\n      decl.typeParameters = typeParams;\n\n      method = decl;\n    }\n    method.selector = methodHandle.getElementName().toCharArray();\n    boolean isVarargs = (modifiers & ClassFileConstants.AccVarargs) != 0;\n    method.modifiers = modifiers & ~ClassFileConstants.AccVarargs;\n    method.sourceStart = start;\n    method.sourceEnd = end;\n    method.declarationSourceStart = methodInfo.getDeclarationSourceStart();\n    method.declarationSourceEnd = methodInfo.getDeclarationSourceEnd();\n\n    \/\/ convert 1.5 specific constructs only if compliance is 1.5 or above\n    if (stc.has1_5Compliance) {\n      \/* convert annotations *\/\n      method.annotations = stc.convertAnnotations(methodHandle);\n    }\n\n    \/* convert arguments *\/\n    String[] argumentTypeSignatures = methodHandle.getParameterTypes();\n    char[][] argumentNames = methodInfo.getArgumentNames();\n    int argumentCount = argumentTypeSignatures == null ? 0 : argumentTypeSignatures.length;\n    if (argumentCount > 0) {\n      long position = ((long) start << 32) + end;\n      method.arguments = new Argument[argumentCount];\n      for (int i = 0; i < argumentCount; i++) {\n        TypeReference typeReference = stc.createTypeReference(argumentTypeSignatures[i], start, end);\n        if (isVarargs && i == argumentCount-1) {\n          typeReference.bits |= org.eclipse.jdt.internal.compiler.ast.ASTNode.IsVarArgs;\n        }\n        method.arguments[i] =\n          new Argument(\n            argumentNames[i],\n            position,\n            typeReference,\n            ClassFileConstants.AccDefault);\n        \/\/ do not care whether was final or not\n      }\n    }\n\n    \/* convert thrown exceptions *\/\n    char[][] exceptionTypeNames = methodInfo.getExceptionTypeNames();\n    int exceptionCount = exceptionTypeNames == null ? 0 : exceptionTypeNames.length;\n    if (exceptionCount > 0) {\n      method.thrownExceptions = new TypeReference[exceptionCount];\n      for (int i = 0; i < exceptionCount; i++) {\n        method.thrownExceptions[i] =\n          stc.createTypeReference(exceptionTypeNames[i], start, end);\n      }\n    }\n\n    \/* convert local and anonymous types *\/\n    if ((stc.flags & SourceTypeConverter.LOCAL_TYPE) != 0) {\n      IJavaElement[] children = methodInfo.getChildren();\n      int typesLength = 0;\n      int childrenLength = children.length;\n      for (int i = 0; i < childrenLength; ++i)\n        if (children[i] instanceof SourceType)\n          ++typesLength;\n      \n      if (typesLength != 0) {\n        Statement[] statements = new Statement[typesLength];\n        int typeIndex = 0;\n        for (int i = 0; i < childrenLength; i++) {\n          if (children[i] instanceof SourceType) {\n            SourceType type = (SourceType) children[i];\n            TypeDeclaration localType = stc.convert(type, compilationResult);\n            if ((localType.bits & org.eclipse.jdt.internal.compiler.ast.ASTNode.IsAnonymousType) != 0) {\n              QualifiedAllocationExpression expression = new QualifiedAllocationExpression(localType);\n              expression.type = localType.superclass;\n              localType.superclass = null;\n              localType.superInterfaces = null;\n              localType.allocation = expression;\n              statements[typeIndex] = expression;\n            } else {\n              statements[typeIndex] = localType;\n            }\n            ++typeIndex;\n          }\n        }\n        method.statements = statements;\n      }\n    }\n\n    return method;\n  }\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"e0d2c56a37eed862f525c7f156389f53bd1fca29","subject":"fixed imports","message":"fixed imports\n","repos":"palava\/palava-jpa-aspectj","old_file":"src\/main\/java\/de\/cosmocode\/palava\/jpa\/aspectj\/TransactionAspect.aj","new_file":"src\/main\/java\/de\/cosmocode\/palava\/jpa\/aspectj\/TransactionAspect.aj","new_contents":"\/**\n * palava - a java-php-bridge\n * Copyright (C) 2007-2010  CosmoCode GmbH\n *\n * This program is free software; you can redistribute it and\/or\n * modify it under the terms of the GNU General Public License\n * as published by the Free Software Foundation; either version 2\n * of the License, or (at your option) any later version.\n *\n * This program is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n * along with this program; if not, write to the Free Software\n * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.\n *\/\n\npackage de.cosmocode.palava.jpa.aspectj;\n\nimport javax.persistence.EntityManager;\nimport javax.persistence.EntityTransaction;\nimport javax.persistence.PersistenceException;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\nimport de.cosmocode.palava.jpa.Transactional;\n\npublic final aspect TransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(TransactionAspect.class);\n\n    private Provider<EntityManager> currentManager;\n    \n    @Inject\n    public void setProvider(Provider<EntityManager> manager) {\n        this.currentManager = Preconditions.checkNotNull(manager, \"Manager\");\n    }\n    \n    pointcut transactional(): execution(@Transactional * *.*(..));\n\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        final EntityManager manager = currentManager.get();\n        LOG.trace(\"Retrieved entitymanager {}\", manager);\n        final EntityTransaction tx = manager.getTransaction();\n        LOG.trace(\"Using transaction {}\", tx);\n        final boolean localTx = !tx.isActive();\n        if (localTx) {\n            LOG.trace(\"Beginning automatic transaction\");\n            tx.begin();\n        } else {\n            LOG.trace(\"Transaction already active\");\n        }\n        \n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (RuntimeException e) {\n            LOG.error(\"Exception inside automatic transaction context\", e);\n            tx.rollback();\n            throw e;\n        }\n        \n        try {\n            if (localTx && tx.isActive()) {\n                tx.commit();\n                LOG.trace(\"Committed automatic transaction\");\n            }\n            return returnValue;\n        } catch (PersistenceException e) {\n            LOG.error(\"Commit in automatic transaction context failed\", e);\n            tx.rollback();\n            throw e;\n        }\n    }\n    \n}\n","old_contents":"\/**\n * palava - a java-php-bridge\n * Copyright (C) 2007-2010  CosmoCode GmbH\n *\n * This program is free software; you can redistribute it and\/or\n * modify it under the terms of the GNU General Public License\n * as published by the Free Software Foundation; either version 2\n * of the License, or (at your option) any later version.\n *\n * This program is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n * along with this program; if not, write to the Free Software\n * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.\n *\/\n\npackage de.cosmocode.palava.jpa;\n\nimport javax.persistence.EntityManager;\nimport javax.persistence.EntityTransaction;\nimport javax.persistence.PersistenceException;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\n\npublic final aspect TransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(TransactionAspect.class);\n\n    private Provider<EntityManager> currentManager;\n    \n    @Inject\n    public void setProvider(Provider<EntityManager> manager) {\n        this.currentManager = Preconditions.checkNotNull(manager, \"Manager\");\n    }\n    \n    pointcut transactional(): execution(@Transactional * *.*(..));\n\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        final EntityManager manager = currentManager.get();\n        LOG.trace(\"Retrieved entitymanager {}\", manager);\n        final EntityTransaction tx = manager.getTransaction();\n        LOG.trace(\"Using transaction {}\", tx);\n        final boolean localTx = !tx.isActive();\n        if (localTx) {\n            LOG.trace(\"Beginning automatic transaction\");\n            tx.begin();\n        } else {\n            LOG.trace(\"Transaction already active\");\n        }\n        \n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (RuntimeException e) {\n            LOG.error(\"Exception inside automatic transaction context\", e);\n            tx.rollback();\n            throw e;\n        }\n        \n        try {\n            if (localTx && tx.isActive()) {\n                tx.commit();\n                LOG.trace(\"Committed automatic transaction\");\n            }\n            return returnValue;\n        } catch (PersistenceException e) {\n            LOG.error(\"Commit in automatic transaction context failed\", e);\n            tx.rollback();\n            throw e;\n        }\n    }\n    \n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"a476526ff1b79b2c81f23bfd6d0f747c8edf3fef","subject":"More fixes to RetryTransactionAspect exception categorization: if the exception we catch is already translated into a Spring DAO exception, don't just accept it if it's an UncategorizedDataAccessException, because that means Spring didn't know how to categorize it.","message":"More fixes to RetryTransactionAspect exception categorization: if the\nexception we catch is already translated into a Spring DAO exception, don't\njust accept it if it's an UncategorizedDataAccessException, because that means\nSpring didn't know how to categorize it.\n","repos":"permazen\/permazen,permazen\/permazen,archiecobbs\/jsimpledb,tempbottle\/jsimpledb,permazen\/permazen,archiecobbs\/jsimpledb,tempbottle\/jsimpledb,tempbottle\/jsimpledb,archiecobbs\/jsimpledb","old_file":"src\/java\/org\/dellroad\/stuff\/spring\/RetryTransactionAspect.aj","new_file":"src\/java\/org\/dellroad\/stuff\/spring\/RetryTransactionAspect.aj","new_contents":"\n\/*\n * Copyright (C) 2011 Archie L. Cobbs and other authors. All rights reserved.\n *\n * $Id$\n *\/\n\npackage org.dellroad.stuff.spring;\n\nimport java.lang.reflect.Method;\nimport java.util.Random;\n\nimport org.aspectj.lang.reflect.MethodSignature;\nimport org.dellroad.stuff.java.ThreadLocalHolder;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\nimport org.springframework.beans.factory.InitializingBean;\nimport org.springframework.core.annotation.AnnotationUtils;\nimport org.springframework.dao.DataAccessException;\nimport org.springframework.dao.TransientDataAccessException;\nimport org.springframework.dao.UncategorizedDataAccessException;\nimport org.springframework.dao.support.PersistenceExceptionTranslator;\nimport org.springframework.transaction.TransactionDefinition;\nimport org.springframework.transaction.annotation.AnnotationTransactionAttributeSource;\nimport org.springframework.transaction.annotation.Propagation;\nimport org.springframework.transaction.annotation.Transactional;\nimport org.springframework.transaction.interceptor.TransactionAttribute;\nimport org.springframework.transaction.support.TransactionSynchronizationManager;\n\n\/**\n * An aspect that automatically retries failed but \"retryable\" transactions.\n *\n * @see RetryTransaction\n *\/\npublic aspect RetryTransactionAspect implements RetryTransactionProvider, InitializingBean {\n\n    private final Logger log = LoggerFactory.getLogger(this.getClass());\n    private final ThreadLocalHolder<Integer> attemptHolder = new ThreadLocalHolder<Integer>();\n    private final Random random = new Random();\n\n    \/\/ Default values for retry settings\n    private int maxRetriesDefault = RetryTransaction.DEFAULT_MAX_RETRIES;\n    private long initialDelayDefault = RetryTransaction.DEFAULT_INITIAL_DELAY;\n    private long maximumDelayDefault = RetryTransaction.DEFAULT_MAXIMUM_DELAY;\n\n    \/\/ This knows how to read information from @Transactional annotation\n    private final AnnotationTransactionAttributeSource transactionAttributeSource = new AnnotationTransactionAttributeSource(false);\n\n    \/\/ Tells us what is a \"transient\" exception; must be explicitly configured\n    private PersistenceExceptionTranslator persistenceExceptionTranslator;\n\n\/\/ Property accessors and RetryTransactionProvider implementation\n\n    @Override\n    public PersistenceExceptionTranslator getPersistenceExceptionTranslator() {\n        return this.persistenceExceptionTranslator;\n    }\n    public void setPersistenceExceptionTranslator(PersistenceExceptionTranslator persistenceExceptionTranslator) {\n        this.persistenceExceptionTranslator = persistenceExceptionTranslator;\n    }\n\n    @Override\n    public int getMaxRetriesDefault() {\n        return this.maxRetriesDefault;\n    }\n    public void setMaxRetriesDefault(int maxRetriesDefault) {\n        this.maxRetriesDefault = maxRetriesDefault;\n    }\n\n    @Override\n    public long getInitialDelayDefault() {\n        return this.initialDelayDefault;\n    }\n    public void setInitialDelayDefault(long initialDelayDefault) {\n        this.initialDelayDefault = initialDelayDefault;\n    }\n\n    @Override\n    public long getMaximumDelayDefault() {\n        return this.maximumDelayDefault;\n    }\n    public void setMaximumDelayDefault(long maximumDelayDefault) {\n        this.maximumDelayDefault = maximumDelayDefault;\n    }\n\n    @Override\n    public int getAttemptNumber() {\n        final Integer attempt = this.attemptHolder.get();\n        return attempt != null ? attempt : 0;\n    }\n\n\/\/ InitializingBean\n\n    @Override\n    public void afterPropertiesSet() throws Exception {\n        if (this.persistenceExceptionTranslator == null)\n            throw new IllegalArgumentException(\"no PersistenceExceptionTranslator configured\");\n    }\n\n\/\/ Aspect\n\n    \/\/ Ensure that this aspect is woven outside of the AnnotationTransactionAspect\n    declare precedence : RetryTransactionAspect, org.springframework.transaction.aspectj.*;\n\n    \/**\n     * Attempt to execute a transactional method. If the method throws any exception which is translated\n     * to a subclass of TransientDataAccessException, the method will be executed again, with a delay\n     * between attempts.\n     *\/\n    Object around(final Object txObject) : retryTransactionalMethodExecution(txObject) {\n\n        \/\/ Get method info\n        final MethodSignature methodSignature = (MethodSignature)thisJoinPoint.getSignature();\n        final Method method = methodSignature.getMethod();\n\n        \/\/ Get transaction attribute from @Transactional annotation\n        final TransactionAttribute transactionAttribute = this.transactionAttributeSource\n          .getTransactionAttribute(method, txObject.getClass());\n        if (transactionAttribute == null) {\n            throw new RuntimeException(\"no @Transactional annotation found for method \"\n              + method + \"; required for @RetryTransaction\");\n        }\n\n        \/\/ Do nothing unless this method is about to create a new transaction\n        switch (transactionAttribute.getPropagationBehavior()) {\n        case TransactionDefinition.PROPAGATION_REQUIRES_NEW:\n            break;\n        case TransactionDefinition.PROPAGATION_REQUIRED:\n            if (TransactionSynchronizationManager.isActualTransactionActive()) {\n                if (this.log.isTraceEnabled())\n                    this.log.trace(\"skipping retry logic; transaction already open in @Transactional method {}\", method);\n                return proceed(txObject);\n            }\n            break;\n        default:\n            return proceed(txObject);\n        }\n\n        \/\/ Get @RetryTransaction annotation\n        final RetryTransaction retryTransaction = AnnotationUtils.getAnnotation(method, RetryTransaction.class);\n        if (retryTransaction == null)\n            throw new RuntimeException(\"internal error: no @RetryTransaction annotation found for method \" + method);\n\n        \/\/ Get retry parameters, applying defaults if necessary\n        final int maxRetries = retryTransaction.maxRetries() != -1 ?\n          retryTransaction.maxRetries() : this.maxRetriesDefault;\n        final long initialDelay = retryTransaction.initialDelay() != -1 ?\n          retryTransaction.initialDelay() : this.initialDelayDefault;\n        final long maximumDelay = retryTransaction.maximumDelay() != -1 ?\n          retryTransaction.maximumDelay() : this.maximumDelayDefault;\n\n        \/\/ Sanity check we are configured\n        if (this.persistenceExceptionTranslator == null)\n            throw new RuntimeException(\"@RetryTransaction aspect must be configured before use\");\n\n        \/\/ Perform attempts\n        TransientDataAccessException transientException;\n        int attempt = 1;\n        do {\n\n            \/\/ If this is not the first attempt, sleep for a while\n            if (attempt > 1) {\n                final long delay = this.calculateDelay(attempt, initialDelay, maximumDelay);\n                if (this.log.isDebugEnabled())\n                    this.log.debug(\"pausing {}ms before retrying @Transactional method {}\", delay, method);\n                this.pause(delay);\n                if (this.log.isDebugEnabled())\n                    this.log.debug(\"retrying @Transactional method {} (attempt #{})\", method, attempt);\n            }\n\n            \/\/ Make attempt\n            try {\n\n                \/\/ Make next attempt\n                if (this.log.isTraceEnabled())\n                    this.log.trace(\"starting @Transactional method {} (attempt #{})\", method, attempt);\n                final Object[] result = new Object[1];\n                this.attemptHolder.invoke(attempt, new Runnable() {\n                    @Override\n                    public void run() {\n                        result[0] = proceed(txObject);\n                    }\n                });\n                if (attempt > 1) {\n                    if (this.log.isDebugEnabled())\n                        this.log.debug(\"successfully completed @Transactional method {} on re-try attempt #{}\", method, attempt);\n                } else {\n                    if (this.log.isTraceEnabled())\n                        this.log.trace(\"successfully completed @Transactional method {} on first attempt\", method);\n                }\n\n                \/\/ We're done\n                return result[0];\n            } catch (RuntimeException e) {\n\n                \/\/ Translate the exception, if not already translated into something recognizable\n                DataAccessException translatedException;\n                if (e instanceof UncategorizedDataAccessException && e.getCause() instanceof RuntimeException) {\n                    translatedException = this.persistenceExceptionTranslator\n                      .translateExceptionIfPossible((RuntimeException)e.getCause());\n                } else if (e instanceof DataAccessException)\n                    translatedException = (DataAccessException)e;               \/\/ exception is already translated\n                else\n                    translatedException = this.persistenceExceptionTranslator.translateExceptionIfPossible(e);\n                if (this.log.isDebugEnabled()) {\n                    this.log.debug(\"exception from @Transactional method {} on attempt #{}: {} (translates to {})\",\n                      method, attempt, e, translatedException != null ? translatedException.getClass().getSimpleName() : null);\n                }\n\n                \/\/ If it's not a transient exception, re-throw it\n                if (!(translatedException instanceof TransientDataAccessException))\n                    throw e;\n\n                \/\/ Re-throw the transient exception when we've run out of attempts\n                transientException = (TransientDataAccessException)translatedException;\n            }\n        }\n        while (attempt++ <= maxRetries);\n\n        \/\/ All attempts failed\n        this.log.error(\"@Transactional method {} failed after {} attempts, giving up!\", method, maxRetries);\n        throw transientException;\n    }\n\n\/\/ Static methods\n\n    \/**\n     * Get the current transaction attempt number.\n     *\n     * @return transaction attempt number, or zero if this aspect is not active in the current thread\n     * @deprecated Use {@link RetryTransactionProvider#getAttemptNumber} instead\n     *\/\n    public static int getAttempt() {\n        final Integer attempt = RetryTransactionAspect.aspectOf().attemptHolder.get();\n        return attempt != null ? attempt : 0;\n    }\n\n\/\/ Helper methods\n\n    \/**\n     * Calculate how long to sleep.\n     *\n     * @param attempt attempt number (one-based)\n     * @param initialDelay initial delay\n     * @param maximumDelay maximum delay\n     *\/\n    protected long calculateDelay(int attempt, long initialDelay, long maximumDelay) {\n\n        \/\/ Enforce sanity\n        initialDelay = Math.max(initialDelay, 1);\n        maximumDelay = Math.max(maximumDelay, 1);\n        initialDelay = Math.min(initialDelay, maximumDelay);\n\n        \/\/ Calculate nominal delay for this attempt, using exponential back-off; be careful to avoid overflow\n        long delay = initialDelay;\n        while (attempt-- > 1) {\n            delay <<= 1;\n            if (delay >= maximumDelay) {\n                delay = maximumDelay;\n                break;\n            }\n        }\n\n        \/\/ Add in +\/- 12.5% randomness\n        final int randomRange = Math.max(1, (int)(delay >> 3));\n        synchronized (this.random) {\n            delay += this.random.nextInt(randomRange) - randomRange \/ 2;\n        }\n\n        \/\/ Enforce upper bound again\n        delay = Math.min(delay, maximumDelay);\n\n        \/\/ Done\n        return delay;\n    }\n\n    \/**\n     * Sleep for the specified period.\n     *\n     * @param delay delay in milliseconds\n     *\/\n    protected void pause(long delay) {\n        try {\n            Thread.sleep(delay);\n        } catch (InterruptedException e) {\n            Thread.currentThread().interrupt();\n        }\n    }\n\n    \/*\n     * Matches the execution of any public method in a type with the @Transactional annotation, or any subtype of a type with the\n     * @Transactional annotation.\n     *\/\n    private pointcut executionOfPublicMethodInTransactionalType() : execution(public * ((@Transactional *)+).*(..));\n\n    \/*\n     * Matches the execution of any public method in a type with the @RetryTransaction annotation, or any subtype of a type with the\n     * @RetryTransaction annotation.\n     *\/\n    private pointcut executionOfPublicMethodInRetryTransactionType() : execution(public * ((@RetryTransaction *)+).*(..));\n\n    \/*\n     * Matches the execution of any method with the @Transactional annotation.\n     *\/\n    private pointcut executionOfTransactionalMethod() : execution(@Transactional * *(..));\n\n    \/*\n     * Matches the execution of any method with the @RetryTransaction annotation.\n     *\/\n    private pointcut executionOfRetryTransactionMethod() : execution(@RetryTransaction * *(..));\n\n    \/*\n     * Main pointcut - matched join points have both @Transactional and @RetryTransaction on method and\/or type\n     *\/\n    private pointcut retryTransactionalMethodExecution(Object txObject) : this(txObject)\n        && (executionOfPublicMethodInTransactionalType() || executionOfTransactionalMethod())\n        && (executionOfPublicMethodInRetryTransactionType() || executionOfRetryTransactionMethod());\n}\n\n","old_contents":"\n\/*\n * Copyright (C) 2011 Archie L. Cobbs and other authors. All rights reserved.\n *\n * $Id$\n *\/\n\npackage org.dellroad.stuff.spring;\n\nimport java.lang.reflect.Method;\nimport java.util.Random;\n\nimport org.aspectj.lang.reflect.MethodSignature;\nimport org.dellroad.stuff.java.ThreadLocalHolder;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\nimport org.springframework.beans.factory.InitializingBean;\nimport org.springframework.core.annotation.AnnotationUtils;\nimport org.springframework.dao.DataAccessException;\nimport org.springframework.dao.TransientDataAccessException;\nimport org.springframework.dao.support.PersistenceExceptionTranslator;\nimport org.springframework.transaction.TransactionDefinition;\nimport org.springframework.transaction.annotation.AnnotationTransactionAttributeSource;\nimport org.springframework.transaction.annotation.Propagation;\nimport org.springframework.transaction.annotation.Transactional;\nimport org.springframework.transaction.interceptor.TransactionAttribute;\nimport org.springframework.transaction.support.TransactionSynchronizationManager;\n\n\/**\n * An aspect that automatically retries failed but \"retryable\" transactions.\n *\n * @see RetryTransaction\n *\/\npublic aspect RetryTransactionAspect implements RetryTransactionProvider, InitializingBean {\n\n    private final Logger log = LoggerFactory.getLogger(this.getClass());\n    private final ThreadLocalHolder<Integer> attemptHolder = new ThreadLocalHolder<Integer>();\n    private final Random random = new Random();\n\n    \/\/ Default values for retry settings\n    private int maxRetriesDefault = RetryTransaction.DEFAULT_MAX_RETRIES;\n    private long initialDelayDefault = RetryTransaction.DEFAULT_INITIAL_DELAY;\n    private long maximumDelayDefault = RetryTransaction.DEFAULT_MAXIMUM_DELAY;\n\n    \/\/ This knows how to read information from @Transactional annotation\n    private final AnnotationTransactionAttributeSource transactionAttributeSource = new AnnotationTransactionAttributeSource(false);\n\n    \/\/ Tells us what is a \"transient\" exception; must be explicitly configured\n    private PersistenceExceptionTranslator persistenceExceptionTranslator;\n\n\/\/ Property accessors and RetryTransactionProvider implementation\n\n    @Override\n    public PersistenceExceptionTranslator getPersistenceExceptionTranslator() {\n        return this.persistenceExceptionTranslator;\n    }\n    public void setPersistenceExceptionTranslator(PersistenceExceptionTranslator persistenceExceptionTranslator) {\n        this.persistenceExceptionTranslator = persistenceExceptionTranslator;\n    }\n\n    @Override\n    public int getMaxRetriesDefault() {\n        return this.maxRetriesDefault;\n    }\n    public void setMaxRetriesDefault(int maxRetriesDefault) {\n        this.maxRetriesDefault = maxRetriesDefault;\n    }\n\n    @Override\n    public long getInitialDelayDefault() {\n        return this.initialDelayDefault;\n    }\n    public void setInitialDelayDefault(long initialDelayDefault) {\n        this.initialDelayDefault = initialDelayDefault;\n    }\n\n    @Override\n    public long getMaximumDelayDefault() {\n        return this.maximumDelayDefault;\n    }\n    public void setMaximumDelayDefault(long maximumDelayDefault) {\n        this.maximumDelayDefault = maximumDelayDefault;\n    }\n\n    @Override\n    public int getAttemptNumber() {\n        final Integer attempt = this.attemptHolder.get();\n        return attempt != null ? attempt : 0;\n    }\n\n\/\/ InitializingBean\n\n    @Override\n    public void afterPropertiesSet() throws Exception {\n        if (this.persistenceExceptionTranslator == null)\n            throw new IllegalArgumentException(\"no PersistenceExceptionTranslator configured\");\n    }\n\n\/\/ Aspect\n\n    \/\/ Ensure that this aspect is woven outside of the AnnotationTransactionAspect\n    declare precedence : RetryTransactionAspect, org.springframework.transaction.aspectj.*;\n\n    \/**\n     * Attempt to execute a transactional method. If the method throws any exception which is translated\n     * to a subclass of TransientDataAccessException, the method will be executed again, with a delay\n     * between attempts.\n     *\/\n    Object around(final Object txObject) : retryTransactionalMethodExecution(txObject) {\n\n        \/\/ Get method info\n        final MethodSignature methodSignature = (MethodSignature)thisJoinPoint.getSignature();\n        final Method method = methodSignature.getMethod();\n\n        \/\/ Get transaction attribute from @Transactional annotation\n        final TransactionAttribute transactionAttribute = this.transactionAttributeSource\n          .getTransactionAttribute(method, txObject.getClass());\n        if (transactionAttribute == null) {\n            throw new RuntimeException(\"no @Transactional annotation found for method \"\n              + method + \"; required for @RetryTransaction\");\n        }\n\n        \/\/ Do nothing unless this method is about to create a new transaction\n        switch (transactionAttribute.getPropagationBehavior()) {\n        case TransactionDefinition.PROPAGATION_REQUIRES_NEW:\n            break;\n        case TransactionDefinition.PROPAGATION_REQUIRED:\n            if (TransactionSynchronizationManager.isActualTransactionActive()) {\n                if (this.log.isTraceEnabled())\n                    this.log.trace(\"skipping retry logic; transaction already open in @Transactional method {}\", method);\n                return proceed(txObject);\n            }\n            break;\n        default:\n            return proceed(txObject);\n        }\n\n        \/\/ Get @RetryTransaction annotation\n        final RetryTransaction retryTransaction = AnnotationUtils.getAnnotation(method, RetryTransaction.class);\n        if (retryTransaction == null)\n            throw new RuntimeException(\"internal error: no @RetryTransaction annotation found for method \" + method);\n\n        \/\/ Get retry parameters, applying defaults if necessary\n        final int maxRetries = retryTransaction.maxRetries() != -1 ?\n          retryTransaction.maxRetries() : this.maxRetriesDefault;\n        final long initialDelay = retryTransaction.initialDelay() != -1 ?\n          retryTransaction.initialDelay() : this.initialDelayDefault;\n        final long maximumDelay = retryTransaction.maximumDelay() != -1 ?\n          retryTransaction.maximumDelay() : this.maximumDelayDefault;\n\n        \/\/ Sanity check we are configured\n        if (this.persistenceExceptionTranslator == null)\n            throw new RuntimeException(\"@RetryTransaction aspect must be configured before use\");\n\n        \/\/ Perform attempts\n        TransientDataAccessException transientException;\n        int attempt = 1;\n        do {\n\n            \/\/ If this is not the first attempt, sleep for a while\n            if (attempt > 1) {\n                final long delay = this.calculateDelay(attempt, initialDelay, maximumDelay);\n                if (this.log.isDebugEnabled())\n                    this.log.debug(\"pausing {}ms before retrying @Transactional method {}\", delay, method);\n                this.pause(delay);\n                if (this.log.isDebugEnabled())\n                    this.log.debug(\"retrying @Transactional method {} (attempt #{})\", method, attempt);\n            }\n\n            \/\/ Make attempt\n            try {\n\n                \/\/ Make next attempt\n                if (this.log.isTraceEnabled())\n                    this.log.trace(\"starting @Transactional method {} (attempt #{})\", method, attempt);\n                final Object[] result = new Object[1];\n                this.attemptHolder.invoke(attempt, new Runnable() {\n                    @Override\n                    public void run() {\n                        result[0] = proceed(txObject);\n                    }\n                });\n                if (attempt > 1) {\n                    if (this.log.isDebugEnabled())\n                        this.log.debug(\"successfully completed @Transactional method {} on re-try attempt #{}\", method, attempt);\n                } else {\n                    if (this.log.isTraceEnabled())\n                        this.log.trace(\"successfully completed @Transactional method {} on first attempt\", method);\n                }\n\n                \/\/ We're done\n                return result[0];\n            } catch (RuntimeException e) {\n\n                \/\/ Translate the exception\n                final DataAccessException translatedException = e instanceof DataAccessException ?\n                  (DataAccessException)e : this.persistenceExceptionTranslator.translateExceptionIfPossible(e);\n                if (this.log.isDebugEnabled()) {\n                    this.log.debug(\"exception from @Transactional method {} on attempt #{}: {} (translates to {})\",\n                      method, attempt, e, translatedException != null ? translatedException.getClass().getSimpleName() : null);\n                }\n\n                \/\/ If it's not a transient exception, re-throw it\n                if (!(translatedException instanceof TransientDataAccessException))\n                    throw e;\n\n                \/\/ Re-throw the transient exception when we've run out of attempts\n                transientException = (TransientDataAccessException)translatedException;\n            }\n        }\n        while (attempt++ <= maxRetries);\n\n        \/\/ All attempts failed\n        this.log.error(\"@Transactional method {} failed after {} attempts, giving up!\", method, maxRetries);\n        throw transientException;\n    }\n\n\/\/ Static methods\n\n    \/**\n     * Get the current transaction attempt number.\n     *\n     * @return transaction attempt number, or zero if this aspect is not active in the current thread\n     * @deprecated Use {@link RetryTransactionProvider#getAttemptNumber} instead\n     *\/\n    public static int getAttempt() {\n        final Integer attempt = RetryTransactionAspect.aspectOf().attemptHolder.get();\n        return attempt != null ? attempt : 0;\n    }\n\n\/\/ Helper methods\n\n    \/**\n     * Calculate how long to sleep.\n     *\n     * @param attempt attempt number (one-based)\n     * @param initialDelay initial delay\n     * @param maximumDelay maximum delay\n     *\/\n    protected long calculateDelay(int attempt, long initialDelay, long maximumDelay) {\n\n        \/\/ Enforce sanity\n        initialDelay = Math.max(initialDelay, 1);\n        maximumDelay = Math.max(maximumDelay, 1);\n        initialDelay = Math.min(initialDelay, maximumDelay);\n\n        \/\/ Calculate nominal delay for this attempt, using exponential back-off; be careful to avoid overflow\n        long delay = initialDelay;\n        while (attempt-- > 1) {\n            delay <<= 1;\n            if (delay >= maximumDelay) {\n                delay = maximumDelay;\n                break;\n            }\n        }\n\n        \/\/ Add in +\/- 12.5% randomness\n        final int randomRange = Math.max(1, (int)(delay >> 3));\n        synchronized (this.random) {\n            delay += this.random.nextInt(randomRange) - randomRange \/ 2;\n        }\n\n        \/\/ Enforce upper bound again\n        delay = Math.min(delay, maximumDelay);\n\n        \/\/ Done\n        return delay;\n    }\n\n    \/**\n     * Sleep for the specified period.\n     *\n     * @param delay delay in milliseconds\n     *\/\n    protected void pause(long delay) {\n        try {\n            Thread.sleep(delay);\n        } catch (InterruptedException e) {\n            Thread.currentThread().interrupt();\n        }\n    }\n\n    \/*\n     * Matches the execution of any public method in a type with the @Transactional annotation, or any subtype of a type with the\n     * @Transactional annotation.\n     *\/\n    private pointcut executionOfPublicMethodInTransactionalType() : execution(public * ((@Transactional *)+).*(..));\n\n    \/*\n     * Matches the execution of any public method in a type with the @RetryTransaction annotation, or any subtype of a type with the\n     * @RetryTransaction annotation.\n     *\/\n    private pointcut executionOfPublicMethodInRetryTransactionType() : execution(public * ((@RetryTransaction *)+).*(..));\n\n    \/*\n     * Matches the execution of any method with the @Transactional annotation.\n     *\/\n    private pointcut executionOfTransactionalMethod() : execution(@Transactional * *(..));\n\n    \/*\n     * Matches the execution of any method with the @RetryTransaction annotation.\n     *\/\n    private pointcut executionOfRetryTransactionMethod() : execution(@RetryTransaction * *(..));\n\n    \/*\n     * Main pointcut - matched join points have both @Transactional and @RetryTransaction on method and\/or type\n     *\/\n    private pointcut retryTransactionalMethodExecution(Object txObject) : this(txObject)\n        && (executionOfPublicMethodInTransactionalType() || executionOfTransactionalMethod())\n        && (executionOfPublicMethodInRetryTransactionType() || executionOfRetryTransactionMethod());\n}\n\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"b7f5359f06c7d01e835cbea26f875251c28d0da9","subject":"HIGHLY UNTESTED COMMIT: another attempt to sneaky throw checked exception","message":"HIGHLY UNTESTED COMMIT:\nanother attempt to sneaky throw checked exception\n","repos":"palava\/palava-jta","old_file":"src\/main\/java\/de\/cosmocode\/palava\/jta\/AbstractUserTransactionAspect.aj","new_file":"src\/main\/java\/de\/cosmocode\/palava\/jta\/AbstractUserTransactionAspect.aj","new_contents":"\/**\n * Copyright 2010 CosmoCode GmbH\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage de.cosmocode.palava.jta;\n\nimport javax.transaction.NotSupportedException;\nimport javax.transaction.Status;\nimport javax.transaction.SystemException;\nimport javax.transaction.UserTransaction;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.Registry;\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\n\npublic abstract aspect AbstractUserTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(AbstractUserTransactionAspect.class);\n\n    private Provider<UserTransaction> provider;\n\n    private TransactionBeginEvent begin;\n    private TransactionBeganEvent began;\n    private TransactionCommitEvent commit;\n    private TransactionCommittedEvent committed;\n    private TransactionRollbackEvent rollback;\n    private TransactionRolledbackEvent rolledback;\n    \n    @Inject\n    void setProvider(Provider<UserTransaction> provider) {\n        this.provider = Preconditions.checkNotNull(provider, \"Provider\");\n    }\n    \n    @Inject\n    void setRegistry(Registry registry) {\n        Preconditions.checkNotNull(registry, \"Registry\");\n        this.begin = registry.proxy(TransactionBeginEvent.class);\n        this.began = registry.proxy(TransactionBeganEvent.class);\n        this.commit = registry.proxy(TransactionCommitEvent.class);\n        this.committed = registry.proxy(TransactionCommittedEvent.class);\n        this.rollback = registry.proxy(TransactionRollbackEvent.class);\n        this.rolledback = registry.proxy(TransactionRolledbackEvent.class);\n    }\n    \n    protected abstract pointcut transactional();\n    \n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        Preconditions.checkNotNull(provider, \"Provider not injected yet\");\n        final UserTransaction tx = provider.get();\n        LOG.trace(\"Using transaction {}\", tx);\n\n        try {\n            LOG.trace(\"Status of transaction: {}\", tx.getStatus());\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        int status;\n        final boolean local;\n        try {\n            status = tx.getStatus();\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        local = status == Status.STATUS_NO_TRANSACTION;\n\n        if (local) {\n            LOG.debug(\"Beginning automatic transaction {}\", tx);\n            try {\n                begin.eventTransactionBegin(tx);\n                tx.begin();\n                began.eventTransactionBegan(tx);\n            } catch (NotSupportedException e) {\n                throw new IllegalStateException(e);\n            } catch (SystemException e) {\n                throw new IllegalStateException(e);\n            }\n        } else {\n            LOG.trace(\"Transaction {} already active (Status: {})\", tx, status);\n        }\n\n        try {\n            status = tx.getStatus();\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        final Object returnValue;\n        \n        try {\n            LOG.trace(\"Status before execution: {}\", status);\n            returnValue = proceed();\n        } catch (Exception e) {\n            try {\n                if (local && \n                    (tx.getStatus() == Status.STATUS_ACTIVE || tx.getStatus() == Status.STATUS_MARKED_ROLLBACK)) {\n                    LOG.info(\"Rolling back local\/active transaction {}\", tx);\n                    rollback(tx);\n                } else if (tx.getStatus() != Status.STATUS_ROLLEDBACK || tx.getStatus() != Status.STATUS_ROLLING_BACK) {\n                    LOG.debug(\"Setting transaction {} as rollback only\", tx);\n                    tx.setRollbackOnly();\n                }\n            } catch (Exception inner) {\n                LOG.error(\"Rollback failed\", inner);\n            }\n            \/\/ FIXME this effectively shadows the real exceptions thus preventing correct exception handling\n            \/\/throw new IllegalStateException(e);\n            return sneakyThrow(e);\n        }\n        \n        try {\n            status = tx.getStatus();\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        LOG.trace(\"Status after execution: {}\", status);\n        \n        if (local) {\n            if (status == Status.STATUS_MARKED_ROLLBACK) {\n                try {\n                    LOG.debug(\"Rolling back marked transaction {}\", tx);\n                    rollback(tx);\n                } catch (SystemException e) {\n                    throw new IllegalStateException(e);\n                }\n            } else {\n                try {\n                    commit.eventTransactionCommit(tx);\n                    tx.commit();\n                    committed.eventTransactionCommitted(tx);\n                    LOG.debug(\"Committed automatic transaction {}\", tx);\n                } catch (Exception e) {\n                    try {\n                        LOG.info(\"Rolling back transaction {}\", tx);\n                        rollback(tx);\n                    } catch (Exception inner) {\n                        LOG.error(\"Rollback failed\", inner);\n                    }\n                    throw new IllegalStateException(e);\n                }\n            }\n        }\n        \n        return returnValue;\n    }\n    \n    private void rollback(UserTransaction tx) throws SystemException {\n        rollback.eventTransactionRollback(tx);\n        tx.rollback();\n        rolledback.eventTransactionRolledback(tx);\n    }\n    \n    private RuntimeException sneakyThrow(Throwable t) {\n        this.<RuntimeException>doSneakyThrow(t);\n        return null;\n    }\n\n    @SuppressWarnings(\"unchecked\")\n    private <T extends Throwable> T doSneakyThrow(Throwable t) throws T {\n        throw (T) t;\n    }\n    \n}\n","old_contents":"\/**\n * Copyright 2010 CosmoCode GmbH\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage de.cosmocode.palava.jta;\n\nimport javax.transaction.NotSupportedException;\nimport javax.transaction.Status;\nimport javax.transaction.SystemException;\nimport javax.transaction.UserTransaction;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.Registry;\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\n\npublic abstract aspect AbstractUserTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(AbstractUserTransactionAspect.class);\n\n    private Provider<UserTransaction> provider;\n\n    private TransactionBeginEvent begin;\n    private TransactionBeganEvent began;\n    private TransactionCommitEvent commit;\n    private TransactionCommittedEvent committed;\n    private TransactionRollbackEvent rollback;\n    private TransactionRolledbackEvent rolledback;\n    \n    @Inject\n    void setProvider(Provider<UserTransaction> provider) {\n        this.provider = Preconditions.checkNotNull(provider, \"Provider\");\n    }\n    \n    @Inject\n    void setRegistry(Registry registry) {\n        Preconditions.checkNotNull(registry, \"Registry\");\n        this.begin = registry.proxy(TransactionBeginEvent.class);\n        this.began = registry.proxy(TransactionBeganEvent.class);\n        this.commit = registry.proxy(TransactionCommitEvent.class);\n        this.committed = registry.proxy(TransactionCommittedEvent.class);\n        this.rollback = registry.proxy(TransactionRollbackEvent.class);\n        this.rolledback = registry.proxy(TransactionRolledbackEvent.class);\n    }\n    \n    protected abstract pointcut transactional();\n    \n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        Preconditions.checkNotNull(provider, \"Provider not injected yet\");\n        final UserTransaction tx = provider.get();\n        LOG.trace(\"Using transaction {}\", tx);\n\n        try {\n            LOG.trace(\"Status of transaction: {}\", tx.getStatus());\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        int status;\n        final boolean local;\n        try {\n            status = tx.getStatus();\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        local = status == Status.STATUS_NO_TRANSACTION;\n\n        if (local) {\n            LOG.debug(\"Beginning automatic transaction {}\", tx);\n            try {\n                begin.eventTransactionBegin(tx);\n                tx.begin();\n                began.eventTransactionBegan(tx);\n            } catch (NotSupportedException e) {\n                throw new IllegalStateException(e);\n            } catch (SystemException e) {\n                throw new IllegalStateException(e);\n            }\n        } else {\n            LOG.trace(\"Transaction {} already active (Status: {})\", tx, status);\n        }\n\n        try {\n            status = tx.getStatus();\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        final Object returnValue;\n        \n        try {\n            LOG.trace(\"Status before execution: {}\", status);\n            returnValue = proceed();\n        } catch (Exception e) {\n            try {\n                if (local && \n                    (tx.getStatus() == Status.STATUS_ACTIVE || tx.getStatus() == Status.STATUS_MARKED_ROLLBACK)) {\n                    LOG.info(\"Rolling back local\/active transaction {}\", tx);\n                    rollback(tx);\n                } else if (tx.getStatus() != Status.STATUS_ROLLEDBACK || tx.getStatus() != Status.STATUS_ROLLING_BACK) {\n                    LOG.debug(\"Setting transaction {} as rollback only\", tx);\n                    tx.setRollbackOnly();\n                }\n            } catch (Exception inner) {\n                LOG.error(\"Rollback failed\", inner);\n            }\n            \/\/ FIXME this effectively shadows the real exceptions thus preventing correct exception handling\n            throw sneakyThrow(e);\n            \/\/throw new IllegalStateException(e);\n        }\n        \n        try {\n            status = tx.getStatus();\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        LOG.trace(\"Status after execution: {}\", status);\n        \n        if (local) {\n            if (status == Status.STATUS_MARKED_ROLLBACK) {\n                try {\n                    LOG.debug(\"Rolling back marked transaction {}\", tx);\n                    rollback(tx);\n                } catch (SystemException e) {\n                    throw new IllegalStateException(e);\n                }\n            } else {\n                try {\n                    commit.eventTransactionCommit(tx);\n                    tx.commit();\n                    committed.eventTransactionCommitted(tx);\n                    LOG.debug(\"Committed automatic transaction {}\", tx);\n                } catch (Exception e) {\n                    try {\n                        LOG.info(\"Rolling back transaction {}\", tx);\n                        rollback(tx);\n                    } catch (Exception inner) {\n                        LOG.error(\"Rollback failed\", inner);\n                    }\n                    throw new IllegalStateException(e);\n                }\n            }\n        }\n        \n        return returnValue;\n    }\n    \n    private void rollback(UserTransaction tx) throws SystemException {\n        rollback.eventTransactionRollback(tx);\n        tx.rollback();\n        rolledback.eventTransactionRolledback(tx);\n    }\n    \n    private RuntimeException sneakyThrow(Throwable t) {\n        return this.<RuntimeException>doSneakyThrow(t);\n    }\n\n    @SuppressWarnings(\"unchecked\")\n    private <T extends Throwable> T doSneakyThrow(Throwable t) throws T {\n        return (T)t;\n    }\n    \n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"28a279bb203f0978189246d79ac4ea77d6d3413e","subject":"Fixed a bad interaction between Scala object naming conventions (trailing '$') and JDT indexing of binary-only inner classes.","message":"Fixed a bad interaction between Scala object naming conventions (trailing '$') and JDT indexing of binary-only inner classes.\n\ngit-svn-id: f4ecfe233223879a4a16cd7937f11b5152963d8e@19512 5e8d7ff9-d8ef-0310-90f0-a4852d11357a\n","repos":"andrey-ilinykh\/scala-ide,romanowski\/scala-ide,aleksi-lukkarinen\/scala-ide,scala-ide\/scala-ide,sschaef\/scala-ide,sschaef\/scala-ide,Duhemm\/scala-ide,scala-ide\/scala-ide,mlangc\/scala-ide,wpopielarski\/scala-ide,Kwestor\/scala-ide,andrey-ilinykh\/scala-ide,Kwestor\/scala-ide,wpopielarski\/scala-ide,wpopielarski\/scala-ide,aleksi-lukkarinen\/scala-ide,sschaef\/scala-ide,pilipolio\/scala-ide,andrey-ilinykh\/scala-ide,stephenh\/scala-ide,stephenh\/scala-ide,pilipolio\/scala-ide,romanowski\/scala-ide,stephenh\/scala-ide,wpopielarski\/scala-ide,mlangc\/scala-ide,pilipolio\/scala-ide,andrey-ilinykh\/scala-ide,mlangc\/scala-ide,Duhemm\/scala-ide,mlangc\/scala-ide,romanowski\/scala-ide,pilipolio\/scala-ide,aleksi-lukkarinen\/scala-ide,scala-ide\/scala-ide,dragos\/scala-ide,Duhemm\/scala-ide,Kwestor\/scala-ide,dragos\/scala-ide,Kwestor\/scala-ide,romanowski\/scala-ide,dragos\/scala-ide,sschaef\/scala-ide,aleksi-lukkarinen\/scala-ide,scala-ide\/scala-ide,Duhemm\/scala-ide,stephenh\/scala-ide,dragos\/scala-ide","old_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/cfprovider\/ClassFileProviderAspect.aj","new_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/cfprovider\/ClassFileProviderAspect.aj","new_contents":"\/*\n * Copyright 2005-2009 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.cfprovider;\n\nimport java.util.HashSet;\n\nimport org.eclipse.core.filebuffers.FileBuffers;\nimport org.eclipse.core.filebuffers.ITextFileBuffer;\nimport org.eclipse.core.filebuffers.ITextFileBufferManager;\nimport org.eclipse.core.filebuffers.LocationKind;\nimport org.eclipse.core.resources.IResource;\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.core.IBuffer;\nimport org.eclipse.jdt.core.IClassFile;\nimport org.eclipse.jdt.core.IImportDeclaration;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IOpenable;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.ITypeRoot;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.core.dom.CompilationUnit;\nimport org.eclipse.jdt.core.search.TypeNameMatch;\nimport org.eclipse.jdt.internal.compiler.CompilationResult;\nimport org.eclipse.jdt.internal.compiler.ast.ASTNode;\nimport org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.ImportReference;\nimport org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.TypeReference;\nimport org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;\nimport org.eclipse.jdt.internal.compiler.env.IBinaryType;\nimport org.eclipse.jdt.internal.compiler.env.ICompilationUnit;\nimport org.eclipse.jdt.internal.compiler.env.IGenericType;\nimport org.eclipse.jdt.internal.compiler.env.ISourceImport;\nimport org.eclipse.jdt.internal.compiler.env.ISourceType;\nimport org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer;\nimport org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding;\nimport org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding;\nimport org.eclipse.jdt.internal.compiler.parser.Parser;\nimport org.eclipse.jdt.internal.compiler.parser.SourceTypeConverter;\nimport org.eclipse.jdt.internal.core.BinaryType;\nimport org.eclipse.jdt.internal.core.ClassFile;\nimport org.eclipse.jdt.internal.core.CompilationUnitElementInfo;\nimport org.eclipse.jdt.internal.core.ImportDeclaration;\nimport org.eclipse.jdt.internal.core.JavaElement;\nimport org.eclipse.jdt.internal.core.NameLookup;\nimport org.eclipse.jdt.internal.core.Openable;\nimport org.eclipse.jdt.internal.core.PackageFragment;\nimport org.eclipse.jdt.internal.core.SearchableEnvironment;\nimport org.eclipse.jdt.internal.core.SourceMapper;\nimport org.eclipse.jdt.internal.core.SourceType;\nimport org.eclipse.jdt.internal.core.SourceTypeElementInfo;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyResolver;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyType;\nimport org.eclipse.jdt.internal.core.util.Util;\nimport org.eclipse.jdt.internal.corext.util.OpenTypeHistory;\nimport org.eclipse.jdt.internal.ui.filters.InnerClassFilesFilter;\nimport org.eclipse.jdt.ui.SharedASTProvider;\nimport org.eclipse.jface.viewers.Viewer;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaClassFile;\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaElement;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect ClassFileProviderAspect {\n\n  pointcut classFileCreations(PackageFragment parent, String name) : \n    call(protected ClassFile.new(PackageFragment, String)) &&\n    within(org.eclipse.jdt..*) &&\n    args(parent, name);\n  \n  pointcut getTypeName(ClassFile cf) :\n    execution(public String ClassFile.getTypeName()) &&\n    target(cf);\n  \n  pointcut mapSource() :\n    execution(IBuffer ClassFile.mapSource(SourceMapper, IBinaryType)) &&\n    target(IScalaClassFile);\n  \n  pointcut mapSource2() :\n    execution(void SourceMapper.mapSource(IType, char[], IBinaryType));\n  \n  pointcut getSourceFileName(BinaryType bt) :\n    execution(String BinaryType.getSourceFileName(IBinaryType)) &&\n    target(bt);\n  \n  pointcut select(Viewer viewer, Object parentElement, Object element) :\n    execution(boolean InnerClassFilesFilter.select(Viewer, Object, Object)) &&\n    args(viewer, parentElement, element);\n  \n  pointcut getChildren(BinaryType bt) :\n    execution(IJavaElement[] BinaryType.getChildren()) &&\n    target(bt);\n  \n  pointcut getAST(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) : \n    execution(CompilationUnit SharedASTProvider.getAST(ITypeRoot, SharedASTProvider.WAIT_FLAG, IProgressMonitor)) &&\n    args(element, waitFlag, progressMonitor);\n  \n  pointcut resolve(HierarchyResolver hr, IGenericType suppliedType) :\n    execution(void HierarchyResolver.resolve(IGenericType)) &&\n    target(hr) &&\n    args(suppliedType);\n  \n  pointcut remember(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    execution(void HierarchyResolver.remember(IType, ReferenceBinding)) &&\n    target(hr) &&\n    args(type, typeBinding);\n  \n  pointcut acceptType(IType type, int acceptFlags, boolean isSourceType) :\n    execution(boolean NameLookup.acceptType(IType, int, boolean)) &&\n    args(type, acceptFlags, isSourceType);\n  \n  pointcut find(SearchableEnvironment se, String typeName, String packageName) :\n    execution(NameEnvironmentAnswer find(String, String)) &&\n    target(se) &&\n    args(typeName, packageName);\n  \n  pointcut convert(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) :\n    execution(CompilationUnitDeclaration SourceTypeConverter.convert(ISourceType[], CompilationResult)) &&\n    target(stc) &&\n    args(sourceTypes, compilationResult);\n  \n  pointcut getAncestor(JavaElement je, int ancestorType) :\n    execution(IJavaElement JavaElement.getAncestor(int)) &&\n    target(je) &&\n    args(ancestorType);\n  \n  pointcut isContainerDirty(TypeNameMatch match) :\n    execution(boolean OpenTypeHistory.isContainerDirty(TypeNameMatch)) &&\n    args(match);\n  \n  ClassFile around(PackageFragment parent, String name) : \n    classFileCreations(parent, name) {\n\n    ClassFile javaClassFile = proceed(parent, name);\n    byte[] bytes;\n    \n    try {\n      bytes = javaClassFile.getBytes();\n    } catch(Throwable t) {\n      return javaClassFile; \n    }\n    \n    for (IClassFileProvider provider : ClassFileProviderRegistry.getInstance().getProviders()) {\n      ClassFile cf = provider.create(bytes, parent, name);\n      if (cf != null)\n        return cf;\n    }\n    \n    return javaClassFile;\n  }\n  \n  void around() :\n    mapSource2() &&\n    cflow(mapSource()) {\n    return;\n  }\n  \n  String around(ClassFile cf) :\n    getTypeName(cf) {\n    if(cf instanceof IScalaClassFile) {\n      int lastDollar = cf.name.lastIndexOf('$');\n      return (lastDollar == -1 || lastDollar == cf.name.length()-1) ? cf.name : Util.localTypeName(cf.name, lastDollar, cf.name.length());\n    } else\n      return proceed(cf);\n  }\n  \n  boolean around(Viewer viewer, Object parentElement, Object element) :\n    select(viewer, parentElement, element) {\n    if (element instanceof IScalaClassFile) {\n      IClassFile classFile = (IClassFile) element;\n      String name = classFile.getElementName(); \n      int dollarIndex = name.indexOf('$');\n      return dollarIndex == -1 || dollarIndex == name.length()-7; \/\/ Trailing '$' implies object rather than inner class \n    }\n    return proceed(viewer, parentElement, element);\n  }\n  \n  IJavaElement[] around(BinaryType bt) throws JavaModelException :\n    getChildren(bt) && \n    target(BinaryType) {\n    ClassFile cf = (ClassFile)bt.parent;\n    if (cf instanceof IScalaClassFile)\n      return cf.getChildren();\n    else\n      return proceed(bt);\n  }\n  \n  CompilationUnit around(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) :\n    getAST(element, waitFlag, progressMonitor) {\n      if (element instanceof IScalaElement)\n        return null;\n      else\n        return proceed(element, waitFlag, progressMonitor);\n  }\n  \n  void around(HierarchyResolver hr, IGenericType suppliedType) :\n    resolve(hr, suppliedType) {\n    if (!suppliedType.isBinaryType()) {\n      IType tpe = ((SourceTypeElementInfo)suppliedType).getHandle();\n      IClassFile cf = tpe.getClassFile();\n      if (cf instanceof IScalaClassFile) {\n        hr.resolve(new Openable[]{(Openable)cf}, new HashSet(), null);\n        return;\n      }\n    }\n      \n    proceed(hr, suppliedType);\n  }\n  \n  void around(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    remember(hr, type, typeBinding) {\n    if (((IOpenable)type.getCompilationUnit()).isOpen()) {\n      try {\n        IGenericType genericType = (IGenericType)((JavaElement)type).getElementInfo();\n        hr.remember(genericType, typeBinding);\n      } catch (JavaModelException e) {\n        \/\/ cannot happen since element is open\n        return;\n      }\n    } else {\n      if (typeBinding == null) return;\n\n      TypeDeclaration typeDeclaration = ((SourceTypeBinding)typeBinding).scope.referenceType();\n\n      \/\/ simple super class name\n      char[] superclassName = null;\n      TypeReference superclass;\n      if ((typeDeclaration.bits & ASTNode.IsAnonymousType) != 0) {\n        superclass = typeDeclaration.allocation.type;\n      } else {\n        superclass = typeDeclaration.superclass;\n      }\n      if (superclass != null) {\n        char[][] typeName = superclass.getTypeName();\n        superclassName = typeName == null ? null : typeName[typeName.length-1];\n      }\n\n      \/\/ simple super interface names\n      char[][] superInterfaceNames = null;\n      TypeReference[] superInterfaces = typeDeclaration.superInterfaces;\n      if (superInterfaces != null) {\n        int length = superInterfaces.length;\n        superInterfaceNames = new char[length][];\n        for (int i = 0; i < length; i++) {\n          TypeReference superInterface = superInterfaces[i];\n          char[][] typeName = superInterface.getTypeName();\n          superInterfaceNames[i] = typeName[typeName.length-1];\n        }\n      }\n\n      HierarchyType hierarchyType = new HierarchyType(\n        type,\n        typeDeclaration.name,\n        typeDeclaration.binding.modifiers,\n        superclassName,\n        superInterfaceNames);\n      hr.remember(hierarchyType, typeDeclaration.binding);\n    }\n  }\n  \n  String around(BinaryType bt) :\n    getSourceFileName(bt) {\n    IJavaElement parent = bt.getParent(); \n    if (parent instanceof IScalaClassFile)\n      return ((IScalaClassFile)parent).getSourceFileName();\n    else\n      return proceed(bt);\n  }\n  \n  boolean around(IType type, int acceptFlags, boolean isSourceType) :\n    acceptType(type, acceptFlags, isSourceType) {\n    if (!isSourceType && (type instanceof SourceType)) {\n      IJavaElement parent = type.getParent(); \n      if (parent instanceof IScalaClassFile)\n        return proceed(type, acceptFlags, true);\n    }\n    \n    return proceed(type, acceptFlags, isSourceType);\n  }\n  \n  CompilationUnitDeclaration around(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) throws JavaModelException :\n    convert(stc, sourceTypes, compilationResult) {\n    stc.unit = new CompilationUnitDeclaration(stc.problemReporter, compilationResult, 0);\n    \/\/ not filled at this point\n\n    if (sourceTypes.length == 0) return stc.unit;\n    SourceTypeElementInfo topLevelTypeInfo = (SourceTypeElementInfo) sourceTypes[0];\n    org.eclipse.jdt.core.ICompilationUnit cuHandle = topLevelTypeInfo.getHandle().getCompilationUnit();\n    stc.cu = (ICompilationUnit) cuHandle;\n\n    CompilationUnitElementInfo cuei = null;\n    Object info = ((JavaElement)stc.cu).getElementInfo();\n    if (info instanceof CompilationUnitElementInfo)\n      cuei = (CompilationUnitElementInfo)info;\n    \n    \n    if (stc.has1_5Compliance && cuei != null && cuei.annotationNumber > 10) { \/\/ experimental value\n      \/\/ if more than 10 annotations, diet parse as this is faster\n      return new Parser(stc.problemReporter, true).dietParse(stc.cu, compilationResult);\n    }\n\n    \/* only positions available *\/\n    int start = topLevelTypeInfo.getNameSourceStart();\n    int end = topLevelTypeInfo.getNameSourceEnd();\n\n    \/* convert package and imports *\/\n    String[] packageName = ((PackageFragment) cuHandle.getParent()).names;\n    if (packageName.length > 0)\n      \/\/ if its null then it is defined in the default package\n      stc.unit.currentPackage =\n        stc.createImportReference(packageName, start, end, false, ClassFileConstants.AccDefault);\n    IImportDeclaration[] importDeclarations = topLevelTypeInfo.getHandle().getCompilationUnit().getImports();\n    int importCount = importDeclarations.length;\n    stc.unit.imports = new ImportReference[importCount];\n    for (int i = 0; i < importCount; i++) {\n      ImportDeclaration importDeclaration = (ImportDeclaration) importDeclarations[i];\n      ISourceImport sourceImport = (ISourceImport) importDeclaration.getElementInfo();\n      String nameWithoutStar = importDeclaration.getNameWithoutStar();\n      stc.unit.imports[i] = stc.createImportReference(\n        Util.splitOn('.', nameWithoutStar, 0, nameWithoutStar.length()),\n        sourceImport.getDeclarationSourceStart(),\n        sourceImport.getDeclarationSourceEnd(),\n        importDeclaration.isOnDemand(),\n        sourceImport.getModifiers());\n    }\n    \/* convert type(s) *\/\n    try {\n      int typeCount = sourceTypes.length;\n      final TypeDeclaration[] types = new TypeDeclaration[typeCount];\n      \/*\n       * We used a temporary types collection to prevent this.unit.types from being null during a call to\n       * convert(...) when the source is syntactically incorrect and the parser is flushing the unit's types.\n       * See https:\/\/bugs.eclipse.org\/bugs\/show_bug.cgi?id=97466\n       *\/\n      for (int i = 0; i < typeCount; i++) {\n        SourceTypeElementInfo typeInfo = (SourceTypeElementInfo) sourceTypes[i];\n        types[i] = stc.convert((SourceType) typeInfo.getHandle(), compilationResult);\n      }\n      stc.unit.types = types;\n      return stc.unit;\n    } catch (SourceTypeConverter.AnonymousMemberFound e) {\n      return new Parser(stc.problemReporter, true).parse(stc.cu, compilationResult);\n    }\n  }\n  \n  IJavaElement around(JavaElement je, int ancestorType) :\n    getAncestor(je, ancestorType) {\n    IJavaElement element = je;\n    while (element != null) {\n      if (element.getElementType() == ancestorType)\n        return element;\n      else if (element instanceof IScalaClassFile && ancestorType == IJavaElement.COMPILATION_UNIT)\n        return ((JavaElement)element).getCompilationUnit();\n      element= element.getParent();\n    }\n    return null;\n  }\n\n  boolean around(TypeNameMatch match) :\n    isContainerDirty(match) {\n    org.eclipse.jdt.core.ICompilationUnit cu = match.getType().getCompilationUnit();\n    if (cu == null) {\n      return false;\n    }\n    IResource resource= cu.getResource();\n    if (resource == null)\n      return false;\n    \n    ITextFileBufferManager manager= FileBuffers.getTextFileBufferManager();\n    ITextFileBuffer textFileBuffer= manager.getTextFileBuffer(resource.getFullPath(), LocationKind.IFILE);\n    if (textFileBuffer != null) {\n      return textFileBuffer.isDirty();\n    }\n    return false;\n  }\n}\n","old_contents":"\/*\n * Copyright 2005-2009 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.cfprovider;\n\nimport java.util.HashSet;\n\nimport org.eclipse.core.filebuffers.FileBuffers;\nimport org.eclipse.core.filebuffers.ITextFileBuffer;\nimport org.eclipse.core.filebuffers.ITextFileBufferManager;\nimport org.eclipse.core.filebuffers.LocationKind;\nimport org.eclipse.core.resources.IResource;\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.core.IBuffer;\nimport org.eclipse.jdt.core.IClassFile;\nimport org.eclipse.jdt.core.IImportDeclaration;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IOpenable;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.ITypeRoot;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.core.dom.CompilationUnit;\nimport org.eclipse.jdt.core.search.TypeNameMatch;\nimport org.eclipse.jdt.internal.compiler.CompilationResult;\nimport org.eclipse.jdt.internal.compiler.ast.ASTNode;\nimport org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.ImportReference;\nimport org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.TypeReference;\nimport org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;\nimport org.eclipse.jdt.internal.compiler.env.IBinaryType;\nimport org.eclipse.jdt.internal.compiler.env.ICompilationUnit;\nimport org.eclipse.jdt.internal.compiler.env.IGenericType;\nimport org.eclipse.jdt.internal.compiler.env.ISourceImport;\nimport org.eclipse.jdt.internal.compiler.env.ISourceType;\nimport org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer;\nimport org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding;\nimport org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding;\nimport org.eclipse.jdt.internal.compiler.parser.Parser;\nimport org.eclipse.jdt.internal.compiler.parser.SourceTypeConverter;\nimport org.eclipse.jdt.internal.core.BinaryType;\nimport org.eclipse.jdt.internal.core.ClassFile;\nimport org.eclipse.jdt.internal.core.CompilationUnitElementInfo;\nimport org.eclipse.jdt.internal.core.ImportDeclaration;\nimport org.eclipse.jdt.internal.core.JavaElement;\nimport org.eclipse.jdt.internal.core.NameLookup;\nimport org.eclipse.jdt.internal.core.Openable;\nimport org.eclipse.jdt.internal.core.PackageFragment;\nimport org.eclipse.jdt.internal.core.SearchableEnvironment;\nimport org.eclipse.jdt.internal.core.SourceMapper;\nimport org.eclipse.jdt.internal.core.SourceType;\nimport org.eclipse.jdt.internal.core.SourceTypeElementInfo;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyResolver;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyType;\nimport org.eclipse.jdt.internal.core.util.Util;\nimport org.eclipse.jdt.internal.corext.util.OpenTypeHistory;\nimport org.eclipse.jdt.internal.ui.filters.InnerClassFilesFilter;\nimport org.eclipse.jdt.ui.SharedASTProvider;\nimport org.eclipse.jface.viewers.Viewer;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaClassFile;\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaElement;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect ClassFileProviderAspect {\n\n  pointcut classFileCreations(PackageFragment parent, String name) : \n    call(protected ClassFile.new(PackageFragment, String)) &&\n    within(org.eclipse.jdt..*) &&\n    args(parent, name);\n  \n  pointcut mapSource() :\n    execution(IBuffer ClassFile.mapSource(SourceMapper, IBinaryType)) &&\n    target(IScalaClassFile);\n  \n  pointcut mapSource2() :\n    execution(void SourceMapper.mapSource(IType, char[], IBinaryType));\n  \n  pointcut getSourceFileName(BinaryType bt) :\n    execution(String BinaryType.getSourceFileName(IBinaryType)) &&\n    target(bt);\n  \n  pointcut select(Viewer viewer, Object parentElement, Object element) :\n    execution(boolean InnerClassFilesFilter.select(Viewer, Object, Object)) &&\n    args(viewer, parentElement, element);\n  \n  pointcut getChildren(BinaryType bt) :\n    execution(IJavaElement[] BinaryType.getChildren()) &&\n    target(bt);\n  \n  pointcut getAST(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) : \n    execution(CompilationUnit SharedASTProvider.getAST(ITypeRoot, SharedASTProvider.WAIT_FLAG, IProgressMonitor)) &&\n    args(element, waitFlag, progressMonitor);\n  \n  pointcut resolve(HierarchyResolver hr, IGenericType suppliedType) :\n    execution(void HierarchyResolver.resolve(IGenericType)) &&\n    target(hr) &&\n    args(suppliedType);\n  \n  pointcut remember(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    execution(void HierarchyResolver.remember(IType, ReferenceBinding)) &&\n    target(hr) &&\n    args(type, typeBinding);\n  \n  pointcut acceptType(IType type, int acceptFlags, boolean isSourceType) :\n    execution(boolean NameLookup.acceptType(IType, int, boolean)) &&\n    args(type, acceptFlags, isSourceType);\n  \n  pointcut find(SearchableEnvironment se, String typeName, String packageName) :\n    execution(NameEnvironmentAnswer find(String, String)) &&\n    target(se) &&\n    args(typeName, packageName);\n  \n  pointcut convert(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) :\n    execution(CompilationUnitDeclaration SourceTypeConverter.convert(ISourceType[], CompilationResult)) &&\n    target(stc) &&\n    args(sourceTypes, compilationResult);\n  \n  pointcut getAncestor(JavaElement je, int ancestorType) :\n    execution(IJavaElement JavaElement.getAncestor(int)) &&\n    target(je) &&\n    args(ancestorType);\n  \n  pointcut isContainerDirty(TypeNameMatch match) :\n    execution(boolean OpenTypeHistory.isContainerDirty(TypeNameMatch)) &&\n    args(match);\n  \n  ClassFile around(PackageFragment parent, String name) : \n    classFileCreations(parent, name) {\n\n    ClassFile javaClassFile = proceed(parent, name);\n    byte[] bytes;\n    \n    try {\n      bytes = javaClassFile.getBytes();\n    } catch(Throwable t) {\n      return javaClassFile; \n    }\n    \n    for (IClassFileProvider provider : ClassFileProviderRegistry.getInstance().getProviders()) {\n      ClassFile cf = provider.create(bytes, parent, name);\n      if (cf != null)\n        return cf;\n    }\n    \n    return javaClassFile;\n  }\n  \n  void around() :\n    mapSource2() &&\n    cflow(mapSource()) {\n    return;\n  }\n  \n  boolean around(Viewer viewer, Object parentElement, Object element) :\n    select(viewer, parentElement, element) {\n    if (element instanceof IScalaClassFile) {\n      IClassFile classFile = (IClassFile) element;\n      String name = classFile.getElementName(); \n      int dollarIndex = name.indexOf('$');\n      return dollarIndex == -1 || dollarIndex == name.length()-7; \/\/ Trailing '$' implies object rather than inner class \n    }\n    return proceed(viewer, parentElement, element);\n  }\n  \n  IJavaElement[] around(BinaryType bt) throws JavaModelException :\n    getChildren(bt) && \n    target(BinaryType) {\n    ClassFile cf = (ClassFile)bt.parent;\n    if (cf instanceof IScalaClassFile)\n      return cf.getChildren();\n    else\n      return proceed(bt);\n  }\n  \n  CompilationUnit around(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) :\n    getAST(element, waitFlag, progressMonitor) {\n      if (element instanceof IScalaElement)\n        return null;\n      else\n        return proceed(element, waitFlag, progressMonitor);\n  }\n  \n  void around(HierarchyResolver hr, IGenericType suppliedType) :\n    resolve(hr, suppliedType) {\n    if (!suppliedType.isBinaryType()) {\n      IType tpe = ((SourceTypeElementInfo)suppliedType).getHandle();\n      IClassFile cf = tpe.getClassFile();\n      if (cf instanceof IScalaClassFile) {\n        hr.resolve(new Openable[]{(Openable)cf}, new HashSet(), null);\n        return;\n      }\n    }\n      \n    proceed(hr, suppliedType);\n  }\n  \n  void around(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    remember(hr, type, typeBinding) {\n    if (((IOpenable)type.getCompilationUnit()).isOpen()) {\n      try {\n        IGenericType genericType = (IGenericType)((JavaElement)type).getElementInfo();\n        hr.remember(genericType, typeBinding);\n      } catch (JavaModelException e) {\n        \/\/ cannot happen since element is open\n        return;\n      }\n    } else {\n      if (typeBinding == null) return;\n\n      TypeDeclaration typeDeclaration = ((SourceTypeBinding)typeBinding).scope.referenceType();\n\n      \/\/ simple super class name\n      char[] superclassName = null;\n      TypeReference superclass;\n      if ((typeDeclaration.bits & ASTNode.IsAnonymousType) != 0) {\n        superclass = typeDeclaration.allocation.type;\n      } else {\n        superclass = typeDeclaration.superclass;\n      }\n      if (superclass != null) {\n        char[][] typeName = superclass.getTypeName();\n        superclassName = typeName == null ? null : typeName[typeName.length-1];\n      }\n\n      \/\/ simple super interface names\n      char[][] superInterfaceNames = null;\n      TypeReference[] superInterfaces = typeDeclaration.superInterfaces;\n      if (superInterfaces != null) {\n        int length = superInterfaces.length;\n        superInterfaceNames = new char[length][];\n        for (int i = 0; i < length; i++) {\n          TypeReference superInterface = superInterfaces[i];\n          char[][] typeName = superInterface.getTypeName();\n          superInterfaceNames[i] = typeName[typeName.length-1];\n        }\n      }\n\n      HierarchyType hierarchyType = new HierarchyType(\n        type,\n        typeDeclaration.name,\n        typeDeclaration.binding.modifiers,\n        superclassName,\n        superInterfaceNames);\n      hr.remember(hierarchyType, typeDeclaration.binding);\n    }\n  }\n  \n  String around(BinaryType bt) :\n    getSourceFileName(bt) {\n    IJavaElement parent = bt.getParent(); \n    if (parent instanceof IScalaClassFile)\n      return ((IScalaClassFile)parent).getSourceFileName();\n    else\n      return proceed(bt);\n  }\n  \n  boolean around(IType type, int acceptFlags, boolean isSourceType) :\n    acceptType(type, acceptFlags, isSourceType) {\n    if (!isSourceType && (type instanceof SourceType)) {\n      IJavaElement parent = type.getParent(); \n      if (parent instanceof IScalaClassFile)\n        return proceed(type, acceptFlags, true);\n    }\n    \n    return proceed(type, acceptFlags, isSourceType);\n  }\n  \n  CompilationUnitDeclaration around(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) throws JavaModelException :\n    convert(stc, sourceTypes, compilationResult) {\n    stc.unit = new CompilationUnitDeclaration(stc.problemReporter, compilationResult, 0);\n    \/\/ not filled at this point\n\n    if (sourceTypes.length == 0) return stc.unit;\n    SourceTypeElementInfo topLevelTypeInfo = (SourceTypeElementInfo) sourceTypes[0];\n    org.eclipse.jdt.core.ICompilationUnit cuHandle = topLevelTypeInfo.getHandle().getCompilationUnit();\n    stc.cu = (ICompilationUnit) cuHandle;\n\n    CompilationUnitElementInfo cuei = null;\n    Object info = ((JavaElement)stc.cu).getElementInfo();\n    if (info instanceof CompilationUnitElementInfo)\n      cuei = (CompilationUnitElementInfo)info;\n    \n    \n    if (stc.has1_5Compliance && cuei != null && cuei.annotationNumber > 10) { \/\/ experimental value\n      \/\/ if more than 10 annotations, diet parse as this is faster\n      return new Parser(stc.problemReporter, true).dietParse(stc.cu, compilationResult);\n    }\n\n    \/* only positions available *\/\n    int start = topLevelTypeInfo.getNameSourceStart();\n    int end = topLevelTypeInfo.getNameSourceEnd();\n\n    \/* convert package and imports *\/\n    String[] packageName = ((PackageFragment) cuHandle.getParent()).names;\n    if (packageName.length > 0)\n      \/\/ if its null then it is defined in the default package\n      stc.unit.currentPackage =\n        stc.createImportReference(packageName, start, end, false, ClassFileConstants.AccDefault);\n    IImportDeclaration[] importDeclarations = topLevelTypeInfo.getHandle().getCompilationUnit().getImports();\n    int importCount = importDeclarations.length;\n    stc.unit.imports = new ImportReference[importCount];\n    for (int i = 0; i < importCount; i++) {\n      ImportDeclaration importDeclaration = (ImportDeclaration) importDeclarations[i];\n      ISourceImport sourceImport = (ISourceImport) importDeclaration.getElementInfo();\n      String nameWithoutStar = importDeclaration.getNameWithoutStar();\n      stc.unit.imports[i] = stc.createImportReference(\n        Util.splitOn('.', nameWithoutStar, 0, nameWithoutStar.length()),\n        sourceImport.getDeclarationSourceStart(),\n        sourceImport.getDeclarationSourceEnd(),\n        importDeclaration.isOnDemand(),\n        sourceImport.getModifiers());\n    }\n    \/* convert type(s) *\/\n    try {\n      int typeCount = sourceTypes.length;\n      final TypeDeclaration[] types = new TypeDeclaration[typeCount];\n      \/*\n       * We used a temporary types collection to prevent this.unit.types from being null during a call to\n       * convert(...) when the source is syntactically incorrect and the parser is flushing the unit's types.\n       * See https:\/\/bugs.eclipse.org\/bugs\/show_bug.cgi?id=97466\n       *\/\n      for (int i = 0; i < typeCount; i++) {\n        SourceTypeElementInfo typeInfo = (SourceTypeElementInfo) sourceTypes[i];\n        types[i] = stc.convert((SourceType) typeInfo.getHandle(), compilationResult);\n      }\n      stc.unit.types = types;\n      return stc.unit;\n    } catch (SourceTypeConverter.AnonymousMemberFound e) {\n      return new Parser(stc.problemReporter, true).parse(stc.cu, compilationResult);\n    }\n  }\n  \n  IJavaElement around(JavaElement je, int ancestorType) :\n    getAncestor(je, ancestorType) {\n    IJavaElement element = je;\n    while (element != null) {\n      if (element.getElementType() == ancestorType)\n        return element;\n      else if (element instanceof IScalaClassFile && ancestorType == IJavaElement.COMPILATION_UNIT)\n        return ((JavaElement)element).getCompilationUnit();\n      element= element.getParent();\n    }\n    return null;\n  }\n\n  boolean around(TypeNameMatch match) :\n    isContainerDirty(match) {\n    org.eclipse.jdt.core.ICompilationUnit cu = match.getType().getCompilationUnit();\n    if (cu == null) {\n      return false;\n    }\n    IResource resource= cu.getResource();\n    if (resource == null)\n      return false;\n    \n    ITextFileBufferManager manager= FileBuffers.getTextFileBufferManager();\n    ITextFileBuffer textFileBuffer= manager.getTextFileBuffer(resource.getFullPath(), LocationKind.IFILE);\n    if (textFileBuffer != null) {\n      return textFileBuffer.isDirty();\n    }\n    return false;\n  }\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"895c096d79b595715c7fb9a5e9bd59365e1f5b5b","subject":"redu\u00e7\u00e3o do uso de cflow","message":"redu\u00e7\u00e3o do uso de cflow\n","repos":"rslemos\/former-nlp","old_file":"brillevents\/src\/main\/java\/br\/eti\/rslemos\/brill\/events\/BrillTrainerPointcuts.aj","new_file":"brillevents\/src\/main\/java\/br\/eti\/rslemos\/brill\/events\/BrillTrainerPointcuts.aj","new_contents":"package br.eti.rslemos.brill.events;\n\nimport java.util.List;\n\nimport br.eti.rslemos.brill.BrillTrainer;\nimport br.eti.rslemos.tagger.Sentence;\nimport br.eti.rslemos.tagger.Tagger;\n\npublic abstract privileged aspect BrillTrainerPointcuts {\n\t\n\tpublic pointcut onTraining(BrillTrainer trainer, List<Sentence> overCorpus):\n\t\tthis(trainer) && \n\t\texecution(public * BrillTrainer+.train(List+)) && args(overCorpus) &&\n\t\twithin(BrillTrainer+);\n\n\tpublic pointcut onPreparing(BrillTrainer trainer):\n\t\tthis(trainer) &&\n\t\texecution(void BrillTrainer+.prepareTrainingCorpus()) && \n\t\twithin(BrillTrainer+);\n\t\n\tpublic pointcut onBaseTagging(BrillTrainer trainer, Sentence onSentence):\n\t\tthis(trainer) &&\n\t\tcall(void Tagger+.tag(Sentence+)) && args(onSentence) &&\n\t\twithin(BrillTrainer+);\n\t\n\tpublic pointcut onRuleDiscovery(BrillTrainer trainer):\n\t\tthis(trainer) &&\n\t\texecution(void BrillTrainer+.discoverRules()) && \n\t\twithin(BrillTrainer+);\n}\n","old_contents":"package br.eti.rslemos.brill.events;\n\nimport java.util.List;\n\nimport br.eti.rslemos.brill.BrillTrainer;\nimport br.eti.rslemos.tagger.Sentence;\nimport br.eti.rslemos.tagger.Tagger;\n\npublic abstract privileged aspect BrillTrainerPointcuts {\n\t\n\tpublic pointcut onTraining(BrillTrainer trainer, List<Sentence> overCorpus):\n\t\tthis(trainer) && \n\t\texecution(public * BrillTrainer+.train(List+)) && args(overCorpus) &&\n\t\twithin(BrillTrainer+);\n\n\tpublic pointcut onPreparing(BrillTrainer trainer):\n\t\texecution(void BrillTrainer+.prepareTrainingCorpus()) && \n\t\tcflow(onTraining(trainer, *)) && within(BrillTrainer+);\n\t\n\tpublic pointcut onBaseTagging(BrillTrainer trainer, Sentence onSentence):\n\t\tcall(void Tagger+.tag(Sentence+)) && args(onSentence) &&\n\t\tcflow(onTraining(trainer, *)) && within(BrillTrainer+);\n\t\n\tpublic pointcut onRuleDiscovery(BrillTrainer trainer):\n\t\texecution(void BrillTrainer+.discoverRules()) && \n\t\tcflow(onTraining(trainer, *)) && within(BrillTrainer+);\n}\n","returncode":0,"stderr":"","license":"agpl-3.0","lang":"AspectJ"}
{"commit":"83a63444eb6a6de32353917689851def152fed1b","subject":"Fixed #1233. Removed stray debugging code.","message":"Fixed #1233. Removed stray debugging code.\n\ngit-svn-id: f4ecfe233223879a4a16cd7937f11b5152963d8e@17128 5e8d7ff9-d8ef-0310-90f0-a4852d11357a\n","repos":"pilipolio\/scala-ide,pilipolio\/scala-ide,Kwestor\/scala-ide,Kwestor\/scala-ide,aleksi-lukkarinen\/scala-ide,Duhemm\/scala-ide,romanowski\/scala-ide,dragos\/scala-ide,scala-ide\/scala-ide,aleksi-lukkarinen\/scala-ide,scala-ide\/scala-ide,stephenh\/scala-ide,pilipolio\/scala-ide,romanowski\/scala-ide,dragos\/scala-ide,dragos\/scala-ide,Kwestor\/scala-ide,stephenh\/scala-ide,sschaef\/scala-ide,aleksi-lukkarinen\/scala-ide,andrey-ilinykh\/scala-ide,scala-ide\/scala-ide,wpopielarski\/scala-ide,sschaef\/scala-ide,romanowski\/scala-ide,andrey-ilinykh\/scala-ide,Duhemm\/scala-ide,pilipolio\/scala-ide,wpopielarski\/scala-ide,aleksi-lukkarinen\/scala-ide,sschaef\/scala-ide,andrey-ilinykh\/scala-ide,wpopielarski\/scala-ide,Kwestor\/scala-ide,mlangc\/scala-ide,mlangc\/scala-ide,romanowski\/scala-ide,stephenh\/scala-ide,Duhemm\/scala-ide,Duhemm\/scala-ide,scala-ide\/scala-ide,dragos\/scala-ide,wpopielarski\/scala-ide,sschaef\/scala-ide,mlangc\/scala-ide,andrey-ilinykh\/scala-ide,mlangc\/scala-ide,stephenh\/scala-ide","old_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/ui\/javaeditor\/SaveParticipantRegistryAspect.aj","new_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/ui\/javaeditor\/SaveParticipantRegistryAspect.aj","new_contents":"\/*\n * Copyright 2005-2009 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.ui.javaeditor;\n\nimport org.eclipse.core.resources.IProject;\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.internal.ui.javaeditor.CompilationUnitDocumentProvider;\nimport org.eclipse.jdt.internal.ui.javaeditor.saveparticipant.IPostSaveListener;\nimport org.eclipse.jdt.internal.ui.javaeditor.saveparticipant.SaveParticipantRegistry;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect SaveParticipantRegistryAspect {\n  pointcut getEnabledPostSaveListeners(IProject project) :\n    args(project) &&\n    execution(IPostSaveListener[] SaveParticipantRegistry.getEnabledPostSaveListeners(IProject));\n  \n  pointcut commitWorkingCopy(ScalaCompilationUnitDocumentProvider provider) :\n    target(provider) &&\n    execution(void CompilationUnitDocumentProvider.commitWorkingCopy(IProgressMonitor, Object, CompilationUnitDocumentProvider.CompilationUnitInfo, boolean));\n  \n  IPostSaveListener[] around(ScalaCompilationUnitDocumentProvider provider, IProject project) :\n    getEnabledPostSaveListeners(project) && cflow(commitWorkingCopy(provider)) {\n    return new IPostSaveListener[0];\n  }\n}\n","old_contents":"\/*\n * Copyright 2005-2009 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.ui.javaeditor;\n\nimport org.eclipse.core.resources.IProject;\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.internal.ui.javaeditor.CompilationUnitDocumentProvider;\nimport org.eclipse.jdt.internal.ui.javaeditor.saveparticipant.IPostSaveListener;\nimport org.eclipse.jdt.internal.ui.javaeditor.saveparticipant.SaveParticipantRegistry;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect SaveParticipantRegistryAspect {\n  pointcut getEnabledPostSaveListeners(IProject project) :\n    args(project) &&\n    execution(IPostSaveListener[] SaveParticipantRegistry.getEnabledPostSaveListeners(IProject));\n  \n  pointcut commitWorkingCopy(ScalaCompilationUnitDocumentProvider provider) :\n    target(provider) &&\n    execution(void CompilationUnitDocumentProvider.commitWorkingCopy(IProgressMonitor, Object, CompilationUnitDocumentProvider.CompilationUnitInfo, boolean));\n  \n  IPostSaveListener[] around(ScalaCompilationUnitDocumentProvider provider, IProject project) :\n    getEnabledPostSaveListeners(project) && cflow(commitWorkingCopy(provider)) {\n    System.err.println(\"Around getEnabledPostSaveListeners\");\n    return new IPostSaveListener[0];\n  }\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"c16870acbfdc6d5cff7443c691b5e98380e01c16","subject":"Update YARN aspects to log state machine exceptions","message":"Update YARN aspects to log state machine exceptions\n","repos":"brownsys\/tracing-framework,brownsys\/tracing-framework,brownsys\/tracing-framework,brownsys\/tracing-framework,brownsys\/tracing-framework,brownsys\/tracing-framework,brownsys\/tracing-framework","old_file":"xtrace\/aspects\/src\/main\/aspect\/edu\/brown\/cs\/systems\/xtrace\/hadoop\/YarnStateMachines.aj","new_file":"xtrace\/aspects\/src\/main\/aspect\/edu\/brown\/cs\/systems\/xtrace\/hadoop\/YarnStateMachines.aj","new_contents":"package edu.brown.cs.systems.xtrace.hadoop;\n\nimport java.lang.reflect.Field;\nimport java.util.List;\n\nimport org.apache.commons.lang3.StringUtils;\nimport org.apache.commons.lang3.exception.ExceptionUtils;\n\nimport com.google.common.collect.Lists;\n\nimport edu.brown.cs.systems.xtrace.XTrace;\nimport edu.brown.cs.systems.xtrace.logging.XTraceLogger;\n\n\/** Invoke X-Trace APIs when baggage is set and unset *\/\npublic aspect YarnStateMachines {\n\n    static XTraceLogger xtrace = XTrace.getLogger(YarnStateMachines.class);\n    \n    \/** Use reflection to get state machine current state to avoid weird classpath dependency issues *\/\n    static java.lang.reflect.Method stateMachineGetCurrentState = null;\n    static {\n        try {\n            Class<?> stateMachineClass = Class.forName(\"org.apache.hadoop.yarn.state.StateMachine\");\n            stateMachineGetCurrentState = stateMachineClass.getMethod(\"getCurrentState\");\n        } catch (Throwable t) {\n        }\n    }\n\n    before(Object operand, Object event): if(xtrace.valid()) && args(operand, event) && call(void org.apache.hadoop.yarn.state.SingleArcTransition+.transition(Object+, Object+)) {\n        xtrace.log(thisJoinPointStaticPart, \"StateMachine transition {} with {}\", operand, event.getClass().getSimpleName());\n    }\n\n    before(Object operand, Object event): if(xtrace.valid()) && args(operand, event) && call(Object+ org.apache.hadoop.yarn.state.MultipleArcTransition+.transition(Object+, Object+)) {\n        xtrace.log(thisJoinPointStaticPart, \"StateMachine transition {} with {}\", operand, event.getClass().getSimpleName());\n    }\n\n    Object around(Object stateMachine, Object operand, Object event): if(xtrace.valid()) && target(stateMachine) && args(operand, event) \n                && call(Object+ org.apache.hadoop.yarn.state.StateMachine+.doTransition(Object+, Object+)) {\n        Object newState = null, initialState = null;\n        try {\n            initialState = stateMachineGetCurrentState.invoke(stateMachine);\n        } catch (Throwable t) {\n            \/\/ ignore;\n        }\n        try {\n            newState = proceed(stateMachine, operand, event);\n            return newState;\n        } finally {\n            xtrace.log(thisJoinPointStaticPart, \"StateMachine transitioned from {} to {} with {} on {}\", initialState, newState, event.getClass().getSimpleName(), operand);\n        }\n    }\n    \n    after(Object stateMachine, Object operand, Object event) throwing (Throwable t) :  if(xtrace.valid()) && target(stateMachine) && args(operand, event) \n    && call(Object+ org.apache.hadoop.yarn.state.StateMachine+.doTransition(Object+, Object+)) {\n        Object initialState = null;\n        try {\n            initialState = stateMachineGetCurrentState.invoke(stateMachine);\n        } catch (Throwable t2) {\n            \/\/ ignore;\n        }\n        xtrace.log(thisJoinPointStaticPart, \"StateMachine failed in state {} with {} on {}: {} {}\", initialState, event.getClass().getSimpleName(), operand, t.getClass().getSimpleName(), t.getMessage(), \"StackTrace\", ExceptionUtils.getStackTrace(t));\n    }\n    \n    before(Object handler, Object event): if(xtrace.valid()) && this(handler) && args(event) && execution(void org.apache.hadoop.yarn.event.EventHandler+.handle(Object+)) {\n        String handlerName = handler.getClass().getSimpleName();\n        String eventName = event.getClass().getSimpleName();\n        Object[] eventDetails = EventDetails(event);\n        xtrace.log(thisJoinPointStaticPart, handlerName+\" handling \" + eventName, eventDetails);\n    }\n    \n    private static Object[] EventDetails(Object event) {\n        if (event == null) {\n            return new Object[0];\n        } else {\n            List<Object> pairs = Lists.newArrayList();\n            Class<?> current = event.getClass();\n            while(current.getSuperclass()!=null) {\n                for (Field f : current.getDeclaredFields()) {\n                    String fieldName = f.getName();\n                    try {\n                        f.setAccessible(true);\n                        String fieldValue = String.valueOf(f.get(event));\n                        pairs.add(fieldName);\n                        pairs.add(fieldValue);\n                    } catch (Throwable t) {\n                        pairs.add(fieldName);\n                        pairs.add(\"(Inaccessible: \"+t.getMessage()+\")\");\n                    }\n                }                \n                current = current.getSuperclass();\n            }\n            return pairs.toArray();\n        }\n    }\n    \n    \/** Use reflection to call shell methods *\/\n    static java.lang.reflect.Method shellCommandExecutorGetExecString = null;\n    static {\n        try {\n            Class<?> shellCommandExecutorClass = Class.forName(\"org.apache.hadoop.util.Shell.ShellCommandExecutor\");\n            shellCommandExecutorGetExecString = shellCommandExecutorClass.getMethod(\"getExecString\");\n        } catch (Throwable t) {\n        }\n    }\n    \n    before(Object o): target(o) && call(void org.apache.hadoop.util.Shell.ShellCommandExecutor+.execute()) && if(xtrace.valid()) {\n        try {\n            String[] execString = (String[]) shellCommandExecutorGetExecString.invoke(o);\n            xtrace.log(thisJoinPointStaticPart, StringUtils.join(execString, \" \"));\n        } catch (Throwable t) {\n            \/\/ Do nothing\n        }\n    }\n\n}\n","old_contents":"package edu.brown.cs.systems.xtrace.hadoop;\n\nimport java.lang.reflect.Field;\nimport java.util.List;\n\nimport org.apache.commons.lang3.StringUtils;\n\nimport com.google.common.collect.Lists;\n\nimport edu.brown.cs.systems.xtrace.XTrace;\nimport edu.brown.cs.systems.xtrace.logging.XTraceLogger;\n\n\/** Invoke X-Trace APIs when baggage is set and unset *\/\npublic aspect YarnStateMachines {\n\n    static XTraceLogger xtrace = XTrace.getLogger(YarnStateMachines.class);\n    \n    \/** Use reflection to get state machine current state to avoid weird classpath dependency issues *\/\n    static java.lang.reflect.Method stateMachineGetCurrentState = null;\n    static {\n        try {\n            Class<?> stateMachineClass = Class.forName(\"org.apache.hadoop.yarn.state.StateMachine\");\n            stateMachineGetCurrentState = stateMachineClass.getMethod(\"getCurrentState\");\n        } catch (Throwable t) {\n        }\n    }\n\n    before(Object operand, Object event): if(xtrace.valid()) && args(operand, event) && call(void org.apache.hadoop.yarn.state.SingleArcTransition+.transition(Object+, Object+)) {\n        xtrace.log(thisJoinPointStaticPart, \"StateMachine transition {} with {}\", operand, event.getClass().getSimpleName());\n    }\n\n    before(Object operand, Object event): if(xtrace.valid()) && args(operand, event) && call(Object+ org.apache.hadoop.yarn.state.MultipleArcTransition+.transition(Object+, Object+)) {\n        xtrace.log(thisJoinPointStaticPart, \"StateMachine transition {} with {}\", operand, event.getClass().getSimpleName());\n    }\n\n    Object around(Object stateMachine, Object operand, Object event): if(xtrace.valid()) && target(stateMachine) && args(operand, event) \n                && call(Object+ org.apache.hadoop.yarn.state.StateMachine+.doTransition(Object+, Object+)) {\n        Object newState = null, initialState = null;\n        try {\n            initialState = stateMachineGetCurrentState.invoke(stateMachine);\n        } catch (Throwable t) {\n            \/\/ ignore;\n        }\n        try {\n            newState = proceed(stateMachine, operand, event);\n            return newState;\n        } finally {\n            xtrace.log(thisJoinPointStaticPart, \"StateMachine transitioned from {} to {} with {} on {}\", initialState, newState, event.getClass().getSimpleName(), operand);            \n        }\n    }\n    \n    before(Object handler, Object event): if(xtrace.valid()) && this(handler) && args(event) && execution(void org.apache.hadoop.yarn.event.EventHandler+.handle(Object+)) {\n        String handlerName = handler.getClass().getSimpleName();\n        String eventName = event.getClass().getSimpleName();\n        Object[] eventDetails = EventDetails(event);\n        xtrace.log(thisJoinPointStaticPart, handlerName+\" handling \" + eventName, eventDetails);\n    }\n    \n    private static Object[] EventDetails(Object event) {\n        if (event == null) {\n            return new Object[0];\n        } else {\n            List<Object> pairs = Lists.newArrayList();\n            Class<?> current = event.getClass();\n            while(current.getSuperclass()!=null) {\n                for (Field f : current.getDeclaredFields()) {\n                    String fieldName = f.getName();\n                    try {\n                        f.setAccessible(true);\n                        String fieldValue = String.valueOf(f.get(event));\n                        pairs.add(fieldName);\n                        pairs.add(fieldValue);\n                    } catch (Throwable t) {\n                        pairs.add(fieldName);\n                        pairs.add(\"(Inaccessible: \"+t.getMessage()+\")\");\n                    }\n                }                \n                current = current.getSuperclass();\n            }\n            return pairs.toArray();\n        }\n    }\n    \n    \/** Use reflection to call shell methods *\/\n    static java.lang.reflect.Method shellCommandExecutorGetExecString = null;\n    static {\n        try {\n            Class<?> shellCommandExecutorClass = Class.forName(\"org.apache.hadoop.util.Shell.ShellCommandExecutor\");\n            shellCommandExecutorGetExecString = shellCommandExecutorClass.getMethod(\"getExecString\");\n        } catch (Throwable t) {\n        }\n    }\n    \n    before(Object o): target(o) && call(void org.apache.hadoop.util.Shell.ShellCommandExecutor+.execute()) && if(xtrace.valid()) {\n        try {\n            String[] execString = (String[]) shellCommandExecutorGetExecString.invoke(o);\n            xtrace.log(thisJoinPointStaticPart, StringUtils.join(execString, \" \"));\n        } catch (Throwable t) {\n            \/\/ Do nothing\n        }\n    }\n\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"9135e6f9551a51ce7dc2fdf3b1c0eaea36966c58","subject":"Alter JavaDoc","message":"Alter JavaDoc\n","repos":"DataDog\/monitor,eigengo\/monitor,DataDog\/monitor,eigengo\/monitor","old_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/ActorCellMonitoringAspect.aj","new_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/ActorCellMonitoringAspect.aj","new_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.actor.*;\nimport org.eigengo.monitor.agent.AgentConfiguration;\nimport org.eigengo.monitor.output.CounterInterface;\nimport scala.Option;\n\nimport java.util.ArrayList;\nimport java.util.List;\nimport java.util.concurrent.atomic.AtomicInteger;\nimport java.util.concurrent.atomic.AtomicLong;\nimport java.util.concurrent.ConcurrentHashMap;\n\n\/**\n * Contains advices for monitoring behaviour of an actor; typically imprisoned in an {@code ActorCell}.\n *\/\npublic aspect ActorCellMonitoringAspect extends AbstractMonitoringAspect issingleton() {\n    private AkkaAgentConfiguration agentConfiguration;\n    private final CounterInterface counterInterface;\n    private final Option<String> noActorClazz = Option.empty();\n    private final ConcurrentHashMap<Option<String>, AtomicLong> samplingCounters  = new ConcurrentHashMap<Option<String>, AtomicLong>();\n    private final ConcurrentHashMap<Option<String>, AtomicInteger> numberOfActors = new ConcurrentHashMap<Option<String>, AtomicInteger>();\n\n\n    \/**\n     * Constructs this aspect\n     *\/\n    public ActorCellMonitoringAspect() {\n        AgentConfiguration<AkkaAgentConfiguration> configuration = getAgentConfiguration(\"akka\", AkkaAgentConfigurationJapi.apply());\n        this.agentConfiguration = configuration.agent();\n        this.counterInterface = createCounterInterface(configuration.common());\n    }\n\n    \/**\n     * Injects the new {@code AkkaAgentConfiguration} instance.\n     *\n     * @param agentConfiguration the new configuration\n     *\/\n    synchronized final void setAgentConfiguration(AkkaAgentConfiguration agentConfiguration) {\n        this.agentConfiguration = agentConfiguration;\n    }\n\n    \/**\n     * decide whether to include this ActorCell in our measurements\n     * *\/\n    private boolean includeActorPath(final PathAndClass pathAndClass) {\n        \/\/ do not monitor our own output code\n        if (pathAndClass.actorClassName().isDefined()) {\n            if (pathAndClass.actorClassName().get().startsWith(\"org.eigengo.monitor.output\")) return false;\n        }\n\n        \/\/ skip if not included\n        if (!this.agentConfiguration.included().accept(pathAndClass)) return false;\n        \/\/ skip if excluded\n        if (this.agentConfiguration.excluded().accept(pathAndClass)) return false;\n\n        \/\/ skip system actor checks if we wish to monitor them\n        if (this.agentConfiguration.includeSystemAgents()) return true;\n\n        String userOrSystem = pathAndClass.actorPath().getElements().iterator().next();\n        return \"user\".equals(userOrSystem);\n    }\n\n    \/**\n     * get the sample rate for an actor\n     * *\/\n    private int getSampleRate(final PathAndClass pathAndClass) {\n        return this.agentConfiguration.sampling().getRate(pathAndClass);\n    }\n\n    \/**\n     * decide whether to sample an actor on a particular occasion\n     *\n     * @param pathAndClass\n     * @return true if we should sample this actor, otherwise false.\n     *\/\n    private final boolean sampleMessage(final PathAndClass pathAndClass) {\n        int sampleRate = getSampleRate(pathAndClass);\n        if (sampleRate == 1) return true;\n\n        this.samplingCounters.putIfAbsent(pathAndClass.actorClassName(), new AtomicLong(0));\n        long timesSeenSoFar = this.samplingCounters.get(pathAndClass.actorClassName()).incrementAndGet();\n        return (timesSeenSoFar % sampleRate == 1); \/\/ == 1 to log first value (incrementAndGet returns updated value)\n    }\n\n    \/**\n     * get the tags for the cell\n     * *\/\n    private String[] getTags(final ActorPath actorPath, final Actor actor) {\n        List<String> tags = new ArrayList<String>();\n\n        \/\/ TODO: Improve detection of routed actors. This relies only on the naming :(.\n        String lastPathElement = actorPath.elements().last();\n        if (lastPathElement.startsWith(\"$\")) {\n            \/\/ this is routed actor.\n            tags.add(actorPath.parent().toString());\n            if (this.agentConfiguration.includeRoutees()) tags.add(actorPath.toString());\n        } else {\n            \/\/ there is no supervisor\n            tags.add(actorPath.toString());\n        }\n        if (actor != null) {\n            tags.add(String.format(\"akka:%s.%s\", actor.context().system().name(), actor.getClass().getCanonicalName()));\n        }\n\n        return tags.toArray(new String[tags.size()]);\n    }\n\n    \/**\n     * returns the canonical name of the actor type associated with an ActorCell\n     * *\/\n    private String uncheckedActorNameFrom(final ActorCell actorCell) {\n        return uncheckedActorNameFrom(actorCell.props());\n    }\n\n    \/**\n     * returns the canonical name of the actor type associated with a Props instance\n     * *\/\n    private String uncheckedActorNameFrom(final Props props) {\n        return props.actorClass().getCanonicalName();\n    }\n\n    \/**\n     * Advises the {@code ActorCell.receiveMessage(message: Object): Unit}\n     * We proceed with the pointcut if the actor is to be included in the monitoring *and* this is\n     * the 'multiple-of-n'th time we've seen a message for an actor with a sample rate of n.\n     *\n     * Currently, we sample queue size, the fact that the message is delivered, the simple name of the class of the\n     * message, and the time taken to complete the actor's reactive action.\n     *\n     * @param actorCell the ActorCell where the actor that receives the message \"lives\"\n     * @param msg the incoming message\n     *\/\n    Object around(ActorCell actorCell, Object msg) : Pointcuts.actorCellReceiveMessage(actorCell, msg) {\n\n        final ActorPath actorPath = actorCell.self().path();\n        final PathAndClass pathAndClass = new PathAndClass(actorPath, Option.apply(uncheckedActorNameFrom(actorCell)));\n        if (!includeActorPath(pathAndClass) || !sampleMessage(pathAndClass)) return proceed(actorCell, msg);\n\n        int samplingRate = getSampleRate(pathAndClass);\n\n        \/\/ we tag by actor name\n        final String[] tags = getTags(actorPath, actorCell.actor());\n\n        \/\/ record the queue size\n        this.counterInterface.recordGaugeValue(\"akka.queue.size\", actorCell.numberOfMessages(), tags);\n        \/\/ record the message, general and specific\n        this.counterInterface.incrementCounter(\"akka.actor.delivered\", samplingRate, tags);\n        this.counterInterface.incrementCounter(\"akka.actor.delivered.\" + msg.getClass().getSimpleName(), samplingRate, tags);\n\n        \/\/ measure the time. we're using the ``nanoTime`` call to access the high-precision timer.\n        \/\/ since we're not really interested in wall time, but just some increasing measure of\n        \/\/ elapsed time\n        Object result = null;\n        final long start = System.nanoTime();\n        \/\/ result will always be ``null``, because target returns ``Unit``\n        result = proceed(actorCell, msg);\n        \/\/ ns or \u00b5s is too fine. ms will do for now.\n        final long duration = (System.nanoTime() - start) \/ 1000000;\n\n        \/\/ record the actor duration\n        this.counterInterface.recordExecutionTime(\"akka.actor.duration\", (int)duration, tags);\n\n        \/\/ return null would do the trick, but we want to be _proper_.\n        return result;\n    }\n\n    \/**\n     * Advises the {@code ActorCell.handleInvokeFailure(_, failure: Throwable): Unit}\n     *\n     * @param actorCell the ActorCell where the error spreads from\n     * @param failure the exception that escaped from the {@code receive} method\n     *\/\n    before(ActorCell actorCell, Throwable failure) : Pointcuts.actorCellHandleInvokeFailure(actorCell, failure) {\n        \/\/ record the error, general and specific\n        String[] tags = getTags(actorCell.self().path(), actorCell.actor());\n        this.counterInterface.incrementCounter(\"akka.actor.error\", tags);\n        this.counterInterface.incrementCounter(String.format(\"akka.actor.error.%s\", failure.getMessage()), tags);\n    }\n\n    \/**\n     * Advises the {@code EventStream.publish(event: Any): Unit}\n     *\n     * @param event the received event\n     *\/\n    before(Object event) : Pointcuts.eventStreamPublish(event) {\n        if (event instanceof UnhandledMessage) {\n            UnhandledMessage unhandledMessage = (UnhandledMessage)event;\n            String[] tags = getTags(unhandledMessage.recipient().path(), null);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered\", tags);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered.\" + unhandledMessage.getMessage().getClass().getSimpleName(), tags);\n        }\n    }\n\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorRefFactory} implementations\n     *\n     * @param props the {@code Props} instance used in the call\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after(Props props) returning (ActorRef actor): Pointcuts.anyActorOf(props) {\n        recordActorCreation(props, actor);\n    }\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorRefFactory} implementations when actor is named in construction\n     *\n     * @param props the {@code Props} instance used in the call\n     * @param actorName the {@code String} used to name the actor at creation site\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after(Props props, String actorName) returning (ActorRef actor): Pointcuts.namedActorOf(props, actorName) {\n        recordActorCreation(props, actor);\n    }\n\n    \/**\n     * method containing the recording logic for advising actor creation\n     * *\/\n    private void recordActorCreation(Props props, ActorRef actor) {\n        if (!includeActorPath(new PathAndClass(actor.path(), this.noActorClazz))) return;\n        final String uncheckedClassName = uncheckedActorNameFrom(props);\n        final Option<String> className = Option.apply(uncheckedClassName);\n\n        this.numberOfActors.putIfAbsent(className, new AtomicInteger(0));\n        \/\/ increment and get the current number of actors of this type (if the value was 0, then this returns 1 -- which is correct)\n        final int currentNumberOfActors = this.numberOfActors.get(className).incrementAndGet();\n\n        \/\/ record the current number of actors of this type\n        this.counterInterface.recordGaugeValue(\"akka.actor.count\", currentNumberOfActors, uncheckedClassName);\n    }\n\n    \/**\n     * Advises the {@code LocalActorRef.stop} method\n     *\n     * @param actorCell the {@code ActorCell} of the actor being stopped\n     *\/\n    after(ActorCell actorCell) : Pointcuts.actorCellInternalStop(actorCell) {\n        if (!includeActorPath(new PathAndClass(actorCell.self().path(), this.noActorClazz))) return;\n        final String uncheckedClassName = uncheckedActorNameFrom(actorCell);\n        final Option<String> className = Option.apply(uncheckedClassName);\n\n        this.numberOfActors.putIfAbsent(className, new AtomicInteger(0));\n        \/\/ decrement and get the current number of actors of this type (if the value was 1, then this returns 0 -- which is correct)\n        final int currentNumberOfActors = this.numberOfActors.get(className).decrementAndGet();\n\n        this.counterInterface.recordGaugeValue(\"akka.actor.count\", currentNumberOfActors, uncheckedClassName);\n    }\n\n}","old_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.actor.*;\nimport org.eigengo.monitor.agent.AgentConfiguration;\nimport org.eigengo.monitor.output.CounterInterface;\nimport scala.Option;\n\nimport java.util.ArrayList;\nimport java.util.List;\nimport java.util.concurrent.atomic.AtomicInteger;\nimport java.util.concurrent.atomic.AtomicLong;\nimport java.util.concurrent.ConcurrentHashMap;\n\n\/**\n * Contains advices for monitoring behaviour of an actor; typically imprisoned in an {@code ActorCell}.\n *\/\npublic aspect ActorCellMonitoringAspect extends AbstractMonitoringAspect issingleton() {\n    private AkkaAgentConfiguration agentConfiguration;\n    private final CounterInterface counterInterface;\n    private final Option<String> noActorClazz = Option.empty();\n    private final ConcurrentHashMap<Option<String>, AtomicLong> samplingCounters  = new ConcurrentHashMap<Option<String>, AtomicLong>();\n    private final ConcurrentHashMap<Option<String>, AtomicInteger> numberOfActors = new ConcurrentHashMap<Option<String>, AtomicInteger>();\n\n\n    \/**\n     * Constructs this aspect\n     *\/\n    public ActorCellMonitoringAspect() {\n        AgentConfiguration<AkkaAgentConfiguration> configuration = getAgentConfiguration(\"akka\", AkkaAgentConfigurationJapi.apply());\n        this.agentConfiguration = configuration.agent();\n        this.counterInterface = createCounterInterface(configuration.common());\n    }\n\n    \/**\n     * Injects the new {@code AkkaAgentConfiguration} instance.\n     *\n     * @param agentConfiguration the new configuration\n     *\/\n    synchronized final void setAgentConfiguration(AkkaAgentConfiguration agentConfiguration) {\n        this.agentConfiguration = agentConfiguration;\n    }\n\n    \/**\n     * decide whether to include this ActorCell in our measurements\n     * *\/\n    private boolean includeActorPath(final PathAndClass pathAndClass) {\n        \/\/ do not monitor our own output code\n        if (pathAndClass.actorClassName().isDefined()) {\n            if (pathAndClass.actorClassName().get().startsWith(\"org.eigengo.monitor.output\")) return false;\n        }\n\n        \/\/ skip if not included\n        if (!this.agentConfiguration.included().accept(pathAndClass)) return false;\n        \/\/ skip if excluded\n        if (this.agentConfiguration.excluded().accept(pathAndClass)) return false;\n\n        \/\/ skip system actor checks if we wish to monitor them\n        if (this.agentConfiguration.includeSystemAgents()) return true;\n\n        String userOrSystem = pathAndClass.actorPath().getElements().iterator().next();\n        return \"user\".equals(userOrSystem);\n    }\n\n    \/**\n     * get the sample rate for an actor\n     * *\/\n    private int getSampleRate(final PathAndClass pathAndClass) {\n        return this.agentConfiguration.sampling().getRate(pathAndClass);\n    }\n\n    \/**\n     * decide whether to sample an actor on a particular occasion\n     *\n     * @param pathAndClass\n     * @return true if we should sample this actor, otherwise false.\n     *\/\n    private final boolean sampleMessage(final PathAndClass pathAndClass) {\n        int sampleRate = getSampleRate(pathAndClass);\n        if (sampleRate == 1) return true;\n\n        this.samplingCounters.putIfAbsent(pathAndClass.actorClassName(), new AtomicLong(0));\n        long timesSeenSoFar = this.samplingCounters.get(pathAndClass.actorClassName()).incrementAndGet();\n        return (timesSeenSoFar % sampleRate == 1); \/\/ == 1 to log first value (incrementAndGet returns updated value)\n    }\n\n    \/**\n     * get the tags for the cell\n     * *\/\n    private String[] getTags(final ActorPath actorPath, final Actor actor) {\n        List<String> tags = new ArrayList<String>();\n\n        \/\/ TODO: Improve detection of routed actors. This relies only on the naming :(.\n        String lastPathElement = actorPath.elements().last();\n        if (lastPathElement.startsWith(\"$\")) {\n            \/\/ this is routed actor.\n            tags.add(actorPath.parent().toString());\n            if (this.agentConfiguration.includeRoutees()) tags.add(actorPath.toString());\n        } else {\n            \/\/ there is no supervisor\n            tags.add(actorPath.toString());\n        }\n        if (actor != null) {\n            tags.add(String.format(\"akka:%s.%s\", actor.context().system().name(), actor.getClass().getCanonicalName()));\n        }\n\n        return tags.toArray(new String[tags.size()]);\n    }\n\n    \/**\n     * returns the canonical name of the actor type associated with an ActorCell\n     * *\/\n    private String uncheckedActorNameFrom(final ActorCell actorCell) {\n        return uncheckedActorNameFrom(actorCell.props());\n    }\n\n    \/**\n     * returns the canonical name of the actor type associated with a Props instance\n     * *\/\n    private String uncheckedActorNameFrom(final Props props) {\n        return props.actorClass().getCanonicalName();\n    }\n\n    \/**\n     * Advises the {@code ActorCell.receiveMessage(message: Object): Unit}\n     * We proceed with the pointcut if the actor is to be included in the monitoring *and* this is\n     * the 'multiple-of-n'th time we've seen a message for an actor with a sample rate of n.\n     *\n     * Currently, we sample queue size, the fact that the message is delivered, the simple name of the class of the\n     * message, and the time taken to complete the actor's reactive action.\n     *\n     * @param actorCell the ActorCell where the actor that receives the message \"lives\"\n     * @param msg the incoming message\n     *\/\n    Object around(ActorCell actorCell, Object msg) : Pointcuts.actorCellReceiveMessage(actorCell, msg) {\n\n        final ActorPath actorPath = actorCell.self().path();\n        final PathAndClass pathAndClass = new PathAndClass(actorPath, Option.apply(uncheckedActorNameFrom(actorCell)));\n        if (!includeActorPath(pathAndClass) || !sampleMessage(pathAndClass)) return proceed(actorCell, msg);\n\n        int samplingRate = getSampleRate(pathAndClass);\n\n        \/\/ we tag by actor name\n        final String[] tags = getTags(actorPath, actorCell.actor());\n\n        \/\/ record the queue size\n        this.counterInterface.recordGaugeValue(\"akka.queue.size\", actorCell.numberOfMessages(), tags);\n        \/\/ record the message, general and specific\n        this.counterInterface.incrementCounter(\"akka.actor.delivered\", samplingRate, tags);\n        this.counterInterface.incrementCounter(\"akka.actor.delivered.\" + msg.getClass().getSimpleName(), samplingRate, tags);\n\n        \/\/ measure the time. we're using the ``nanoTime`` call to access the high-precision timer.\n        \/\/ since we're not really interested in wall time, but just some increasing measure of\n        \/\/ elapsed time\n        Object result = null;\n        final long start = System.nanoTime();\n        \/\/ result will always be ``null``, because target returns ``Unit``\n        result = proceed(actorCell, msg);\n        \/\/ ns or \u00b5s is too fine. ms will do for now.\n        final long duration = (System.nanoTime() - start) \/ 1000000;\n\n        \/\/ record the actor duration\n        this.counterInterface.recordExecutionTime(\"akka.actor.duration\", (int)duration, tags);\n\n        \/\/ return null would do the trick, but we want to be _proper_.\n        return result;\n    }\n\n    \/**\n     * Advises the {@code ActorCell.handleInvokeFailure(_, failure: Throwable): Unit}\n     *\n     * @param actorCell the ActorCell where the error spreads from\n     * @param failure the exception that escaped from the {@code receive} method\n     *\/\n    before(ActorCell actorCell, Throwable failure) : Pointcuts.actorCellHandleInvokeFailure(actorCell, failure) {\n        \/\/ record the error, general and specific\n        String[] tags = getTags(actorCell.self().path(), actorCell.actor());\n        this.counterInterface.incrementCounter(\"akka.actor.error\", tags);\n        this.counterInterface.incrementCounter(String.format(\"akka.actor.error.%s\", failure.getMessage()), tags);\n    }\n\n    \/**\n     * Advises the {@code EventStream.publish(event: Any): Unit}\n     *\n     * @param event the received event\n     *\/\n    before(Object event) : Pointcuts.eventStreamPublish(event) {\n        if (event instanceof UnhandledMessage) {\n            UnhandledMessage unhandledMessage = (UnhandledMessage)event;\n            String[] tags = getTags(unhandledMessage.recipient().path(), null);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered\", tags);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered.\" + unhandledMessage.getMessage().getClass().getSimpleName(), tags);\n        }\n    }\n\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorCell} and {@code ActorSystem}\n     *\n     * @param props the {@code Props} instance used in the call\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after(Props props) returning (ActorRef actor): Pointcuts.anyActorOf(props) {\n        recordActorCreation(props, actor);\n    }\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorCell} and {@code ActorSystem} when actor is named in construction\n     *\n     * @param props the {@code Props} instance used in the call\n     * @param actorName the {@code String} used to name the actor at creation site\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after(Props props, String actorName) returning (ActorRef actor): Pointcuts.namedActorOf(props, actorName) {\n        recordActorCreation(props, actor);\n    }\n\n    \/**\n     * method containing the recording logic for advising actor creation\n     * *\/\n    private void recordActorCreation(Props props, ActorRef actor) {\n        if (!includeActorPath(new PathAndClass(actor.path(), this.noActorClazz))) return;\n        final String uncheckedClassName = uncheckedActorNameFrom(props);\n        final Option<String> className = Option.apply(uncheckedClassName);\n\n        this.numberOfActors.putIfAbsent(className, new AtomicInteger(0));\n        \/\/ increment and get the current number of actors of this type (if the value was 0, then this returns 1 -- which is correct)\n        final int currentNumberOfActors = this.numberOfActors.get(className).incrementAndGet();\n\n        \/\/ record the current number of actors of this type\n        this.counterInterface.recordGaugeValue(\"akka.actor.count\", currentNumberOfActors, uncheckedClassName);\n    }\n\n    \/**\n     * Advises the {@code LocalActorRef.stop} method\n     *\n     * @param actorCell the {@code ActorCell} of the actor being stopped\n     *\/\n    after(ActorCell actorCell) : Pointcuts.actorCellInternalStop(actorCell) {\n        if (!includeActorPath(new PathAndClass(actorCell.self().path(), this.noActorClazz))) return;\n        final String uncheckedClassName = uncheckedActorNameFrom(actorCell);\n        final Option<String> className = Option.apply(uncheckedClassName);\n\n        this.numberOfActors.putIfAbsent(className, new AtomicInteger(0));\n        \/\/ decrement and get the current number of actors of this type (if the value was 1, then this returns 0 -- which is correct)\n        final int currentNumberOfActors = this.numberOfActors.get(className).decrementAndGet();\n\n        this.counterInterface.recordGaugeValue(\"akka.actor.count\", currentNumberOfActors, uncheckedClassName);\n    }\n\n}","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"83abcbe7892a714b89f2d379d9c9446b140701bb","subject":"Avoid ClassCastException when attempting to find source file corresponding to class file.","message":"Avoid ClassCastException when attempting to find source file corresponding to class file.\n\ngit-svn-id: f4ecfe233223879a4a16cd7937f11b5152963d8e@21615 5e8d7ff9-d8ef-0310-90f0-a4852d11357a\n","repos":"aleksi-lukkarinen\/scala-ide,aleksi-lukkarinen\/scala-ide,Duhemm\/scala-ide,scala-ide\/scala-ide,wpopielarski\/scala-ide,romanowski\/scala-ide,mlangc\/scala-ide,sschaef\/scala-ide,andrey-ilinykh\/scala-ide,mlangc\/scala-ide,Kwestor\/scala-ide,romanowski\/scala-ide,scala-ide\/scala-ide,andrey-ilinykh\/scala-ide,stephenh\/scala-ide,wpopielarski\/scala-ide,pilipolio\/scala-ide,pilipolio\/scala-ide,pilipolio\/scala-ide,scala-ide\/scala-ide,Duhemm\/scala-ide,romanowski\/scala-ide,dragos\/scala-ide,andrey-ilinykh\/scala-ide,dragos\/scala-ide,sschaef\/scala-ide,sschaef\/scala-ide,stephenh\/scala-ide,dragos\/scala-ide,dragos\/scala-ide,stephenh\/scala-ide,mlangc\/scala-ide,wpopielarski\/scala-ide,mlangc\/scala-ide,Kwestor\/scala-ide,wpopielarski\/scala-ide,Kwestor\/scala-ide,aleksi-lukkarinen\/scala-ide,sschaef\/scala-ide,stephenh\/scala-ide,aleksi-lukkarinen\/scala-ide,Duhemm\/scala-ide,romanowski\/scala-ide,andrey-ilinykh\/scala-ide,Duhemm\/scala-ide,Kwestor\/scala-ide,pilipolio\/scala-ide,scala-ide\/scala-ide","old_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/search\/SearchAspect.aj","new_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/search\/SearchAspect.aj","new_contents":"package scala.tools.eclipse.contribution.weaving.jdt.search;\n\nimport org.eclipse.core.runtime.CoreException;\nimport org.eclipse.jdt.internal.compiler.classfmt.ClassFileReader;\nimport org.eclipse.jdt.internal.core.BinaryType;\nimport org.eclipse.jdt.internal.core.ClassFile;\nimport org.eclipse.jdt.internal.core.search.matching.MatchLocator;\nimport org.eclipse.jdt.internal.core.search.matching.PossibleMatch;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaClassFile;\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaCompilationUnit;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect SearchAspect {\n  pointcut parseAndBuildBindings(MatchLocator ml, PossibleMatch possibleMatch, boolean mustResolve) :\n    execution(boolean MatchLocator.parseAndBuildBindings(PossibleMatch, boolean)) &&\n    target(ml) &&\n    args(possibleMatch, mustResolve);\n  \n  pointcut process(MatchLocator ml, PossibleMatch possibleMatch, boolean bindingsWereCreated) :\n    execution(void MatchLocator.process(PossibleMatch, boolean)) &&\n    target(ml) &&\n    args(possibleMatch, bindingsWereCreated);\n  \n  pointcut getSourceFileName(PossibleMatch pm) :\n    execution(String getSourceFileName()) &&\n    target(pm);\n    \n  boolean around(MatchLocator ml, PossibleMatch possibleMatch, boolean mustResolve) throws CoreException :\n    parseAndBuildBindings(ml, possibleMatch, mustResolve) {\n    if (!(possibleMatch.openable instanceof IScalaCompilationUnit))\n      return proceed(ml, possibleMatch, mustResolve);\n\n    possibleMatch.parsedUnit = null;\n    int size = ml.matchesToProcess.length;\n    if (ml.numberOfMatches == size)\n      System.arraycopy(ml.matchesToProcess, 0, ml.matchesToProcess = new PossibleMatch[size == 0 ? 1 : size * 2], 0, ml.numberOfMatches);\n    ml.matchesToProcess[ml.numberOfMatches++] = possibleMatch;\n    return false;\n  }\n  \n  void around(MatchLocator ml, PossibleMatch possibleMatch, boolean bindingsWereCreated) throws CoreException :\n    process(ml, possibleMatch, bindingsWereCreated) {\n    if (possibleMatch.openable instanceof IScalaCompilationUnit)\n      ((IScalaCompilationUnit)possibleMatch.openable).reportMatches(ml, possibleMatch);\n    else\n      proceed(ml, possibleMatch, bindingsWereCreated);\n  }\n\n  String around(PossibleMatch pm) :\n    getSourceFileName(pm) {\n    if (pm.sourceFileName != null || !(pm.openable instanceof IScalaClassFile))\n      return proceed(pm);\n\n    pm.sourceFileName = PossibleMatch.NO_SOURCE_FILE_NAME;\n    String fileName = ((IScalaClassFile)pm.openable).getSourceFileName();\n    if (fileName != null)\n      pm.sourceFileName = fileName;\n    return pm.sourceFileName;\n  }\n}\n","old_contents":"package scala.tools.eclipse.contribution.weaving.jdt.search;\n\nimport org.eclipse.core.runtime.CoreException;\nimport org.eclipse.jdt.internal.core.search.matching.MatchLocator;\nimport org.eclipse.jdt.internal.core.search.matching.PossibleMatch;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaCompilationUnit;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect SearchAspect {\n  pointcut parseAndBuildBindings(MatchLocator ml, PossibleMatch possibleMatch, boolean mustResolve) :\n    execution(boolean MatchLocator.parseAndBuildBindings(PossibleMatch, boolean)) &&\n    target(ml) &&\n    args(possibleMatch, mustResolve);\n  \n  pointcut process(MatchLocator ml, PossibleMatch possibleMatch, boolean bindingsWereCreated) :\n    execution(void MatchLocator.process(PossibleMatch, boolean)) &&\n    target(ml) &&\n    args(possibleMatch, bindingsWereCreated);\n    \n  boolean around(MatchLocator ml, PossibleMatch possibleMatch, boolean mustResolve) throws CoreException :\n    parseAndBuildBindings(ml, possibleMatch, mustResolve) {\n    if (!(possibleMatch.openable instanceof IScalaCompilationUnit))\n      return proceed(ml, possibleMatch, mustResolve);\n\n    possibleMatch.parsedUnit = null;\n    int size = ml.matchesToProcess.length;\n    if (ml.numberOfMatches == size)\n      System.arraycopy(ml.matchesToProcess, 0, ml.matchesToProcess = new PossibleMatch[size == 0 ? 1 : size * 2], 0, ml.numberOfMatches);\n    ml.matchesToProcess[ml.numberOfMatches++] = possibleMatch;\n    return false;\n  }\n  \n  void around(MatchLocator ml, PossibleMatch possibleMatch, boolean bindingsWereCreated) throws CoreException :\n    process(ml, possibleMatch, bindingsWereCreated) {\n    if (possibleMatch.openable instanceof IScalaCompilationUnit)\n      ((IScalaCompilationUnit)possibleMatch.openable).reportMatches(ml, possibleMatch);\n    else\n      proceed(ml, possibleMatch, bindingsWereCreated);\n  }\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"9954767b320514a880c897db0cda0a9f456d0d0c","subject":"simplifica\u00e7\u00e3o do c\u00f3digo de disparo de notifica\u00e7\u00f5es","message":"simplifica\u00e7\u00e3o do c\u00f3digo de disparo de notifica\u00e7\u00f5es\n","repos":"rslemos\/former-nlp","old_file":"brillevents\/src\/main\/java\/br\/eti\/rslemos\/brill\/events\/RuleBasedTaggerObserver.aj","new_file":"brillevents\/src\/main\/java\/br\/eti\/rslemos\/brill\/events\/RuleBasedTaggerObserver.aj","new_contents":"package br.eti.rslemos.brill.events;\n\nimport java.lang.reflect.InvocationTargetException;\nimport java.lang.reflect.Method;\nimport java.util.ArrayList;\nimport java.util.List;\n\nimport br.eti.rslemos.brill.Rule;\nimport br.eti.rslemos.brill.RuleBasedTagger;\nimport br.eti.rslemos.tagger.Sentence;\n\n@SuppressWarnings(\"unchecked\")\npublic aspect RuleBasedTaggerObserver extends RuleBasedTaggerEvents perthis(this(RuleBasedTagger+)) {\n\t\n\tprivate List<RuleBasedTaggerListener> listeners = new ArrayList<RuleBasedTaggerListener>();\n\t\n\tpublic void RuleBasedTagger.addRuleBasedTaggerListener(RuleBasedTaggerListener listener) {\n\t\taspectOf(this).listeners.add(listener);\n\t}\n\t\n\tpublic void RuleBasedTagger.removeRuleBasedTaggerListener(RuleBasedTaggerListener listener) {\n\t\taspectOf(this).listeners.remove(listener);\n\t}\n\n\tprivate void fireNotification(Method method, RuleBasedTaggerEvent prototype) {\n\t\tfor (RuleBasedTaggerListener listener : listeners) {\n\t\t\tRuleBasedTaggerEvent event = (RuleBasedTaggerEvent) prototype.clone();\n\t\t\ttry {\n\t\t\t\tmethod.invoke(listener, event);\n\t\t\t} catch (InvocationTargetException e) {\n\t\t\t\t\/\/ swallow\n\t\t\t} catch (Exception e) {\n\t\t\t\tthrow (Error)(new LinkageError().initCause(e));\n\t\t\t}\n\t\t}\n\t}\n\t\n\tprivate static final Method TAGGINGSENTENCE;\n\tprivate static final Method SENTENCETAGGED;\n\tprivate static final Method BEFOREBASETAGGER;\n\tprivate static final Method AFTERBASETAGGER;\n\tprivate static final Method BEFORERULEAPPLICATION;\n\tprivate static final Method AFTERRULEAPPLICATION;\n\t\n\tstatic {\n\t\tClass<RuleBasedTaggerListener> clazz = RuleBasedTaggerListener.class;\n\t\tClass[] args = new Class[] {RuleBasedTaggerEvent.class};\n\t\t\n\t\ttry {\n\t\t\tTAGGINGSENTENCE = clazz.getMethod(\"taggingSentence\", args);\n\t\t\tSENTENCETAGGED = clazz.getMethod(\"sentenceTagged\", args);\n\t\t\tBEFOREBASETAGGER = clazz.getMethod(\"beforeBaseTagger\", args);\n\t\t\tAFTERBASETAGGER = clazz.getMethod(\"afterBaseTagger\", args);\n\t\t\tBEFORERULEAPPLICATION = clazz.getMethod(\"beforeRuleApplication\", args);\n\t\t\tAFTERRULEAPPLICATION = clazz.getMethod(\"afterRuleApplication\", args);\n\t\t} catch (Exception e) {\n\t\t\tthrow (Error)(new LinkageError().initCause(e));\n\t\t}\n\t}\n\t\n\tbefore(RuleBasedTagger tagger, Sentence sentence): onTagSentence(tagger, sentence) {\n\t\tRuleBasedTaggerEvent prototype = new RuleBasedTaggerEvent(tagger);\n\t\tprototype.setOnSentence(sentence);\n\t\t\n\t\tfireNotification(TAGGINGSENTENCE, prototype);\n\t}\n\n\tafter(RuleBasedTagger tagger, Sentence sentence) returning: onTagSentence(tagger, sentence) {\n\t\tRuleBasedTaggerEvent prototype = new RuleBasedTaggerEvent(tagger);\n\t\tprototype.setOnSentence(sentence);\n\t\n\t\tfireNotification(SENTENCETAGGED, prototype);\n\t}\n\n\tbefore(RuleBasedTagger tagger, Sentence sentence): onBaseTagger(tagger, *, sentence) {\n\t\tRuleBasedTaggerEvent prototype = new RuleBasedTaggerEvent(tagger);\n\t\tprototype.setOnSentence(sentence);\n\t\n\t\tfireNotification(BEFOREBASETAGGER, prototype);\n\t}\n\n\tafter(RuleBasedTagger tagger, Sentence sentence) returning: onBaseTagger(tagger, *, sentence) {\n\t\tRuleBasedTaggerEvent prototype = new RuleBasedTaggerEvent(tagger);\n\t\tprototype.setOnSentence(sentence);\n\t\n\t\tfireNotification(AFTERBASETAGGER, prototype);\n\t}\n\n\tbefore(RuleBasedTagger tagger, Rule rule, Sentence sentence): onRuleApplication(tagger, rule, sentence) {\n\t\tRuleBasedTaggerEvent prototype = new RuleBasedTaggerEvent(tagger);\n\t\tprototype.setOnSentence(sentence);\n\t\tprototype.setActingRule(rule);\n\n\t\tfireNotification(BEFORERULEAPPLICATION, prototype);\n\t}\n\n\tafter(RuleBasedTagger tagger, Rule rule, Sentence sentence) returning: onRuleApplication(tagger, rule, sentence) {\n\t\tRuleBasedTaggerEvent prototype = new RuleBasedTaggerEvent(tagger);\n\t\tprototype.setOnSentence(sentence);\n\t\tprototype.setActingRule(rule);\n\n\t\tfireNotification(AFTERRULEAPPLICATION, prototype);\n\t}\n\n}\n","old_contents":"package br.eti.rslemos.brill.events;\n\nimport java.util.ArrayList;\nimport java.util.List;\n\nimport br.eti.rslemos.brill.Rule;\nimport br.eti.rslemos.brill.RuleBasedTagger;\nimport br.eti.rslemos.tagger.Sentence;\n\n@SuppressWarnings(\"unchecked\")\npublic aspect RuleBasedTaggerObserver extends RuleBasedTaggerEvents perthis(this(RuleBasedTagger+)) {\n\t\n\tprivate List<RuleBasedTaggerListener> listeners = new ArrayList<RuleBasedTaggerListener>();\n\t\n\tpublic void RuleBasedTagger.addRuleBasedTaggerListener(RuleBasedTaggerListener listener) {\n\t\taspectOf(this).listeners.add(listener);\n\t}\n\t\n\tpublic void RuleBasedTagger.removeRuleBasedTaggerListener(RuleBasedTaggerListener listener) {\n\t\taspectOf(this).listeners.remove(listener);\n\t}\n\n\tprivate static interface Method<T, A> {\n\t\tvoid invoke(T target, A argument);\n\t}\n\t\n\tprivate void fireNotification(Method<RuleBasedTaggerListener, RuleBasedTaggerEvent> method, RuleBasedTaggerEvent prototype) {\n\t\tfor (RuleBasedTaggerListener listener : listeners) {\n\t\t\tRuleBasedTaggerEvent event = (RuleBasedTaggerEvent) prototype.clone();\n\t\t\ttry {\n\t\t\t\tmethod.invoke(listener, event);\n\t\t\t} catch (Throwable t) {\n\t\t\t\t\/\/ swallow\n\t\t\t}\n\t\t}\n\t}\n\t\n\tprivate static final Method<RuleBasedTaggerListener, RuleBasedTaggerEvent> TAGGINGSENTENCE =\n\t\tnew Method<RuleBasedTaggerListener, RuleBasedTaggerEvent>() {\n\t\t\tpublic void invoke(RuleBasedTaggerListener target, RuleBasedTaggerEvent argument) {\n\t\t\t\ttarget.taggingSentence(argument);\n\t\t\t}\n\t};\n\t\n\tprivate static final Method<RuleBasedTaggerListener, RuleBasedTaggerEvent> SENTENCETAGGED =\n\t\tnew Method<RuleBasedTaggerListener, RuleBasedTaggerEvent>() {\n\t\t\tpublic void invoke(RuleBasedTaggerListener target, RuleBasedTaggerEvent argument) {\n\t\t\t\ttarget.sentenceTagged(argument);\n\t\t\t}\n\t};\n\t\n\tprivate static final Method<RuleBasedTaggerListener, RuleBasedTaggerEvent> BEFOREBASETAGGER =\n\t\tnew Method<RuleBasedTaggerListener, RuleBasedTaggerEvent>() {\n\t\t\tpublic void invoke(RuleBasedTaggerListener target, RuleBasedTaggerEvent argument) {\n\t\t\t\ttarget.beforeBaseTagger(argument);\n\t\t\t}\n\t};\n\t\n\tprivate static final Method<RuleBasedTaggerListener, RuleBasedTaggerEvent> AFTERBASETAGGER =\n\t\tnew Method<RuleBasedTaggerListener, RuleBasedTaggerEvent>() {\n\t\t\tpublic void invoke(RuleBasedTaggerListener target, RuleBasedTaggerEvent argument) {\n\t\t\t\ttarget.afterBaseTagger(argument);\n\t\t\t}\n\t};\n\t\n\tprivate static final Method<RuleBasedTaggerListener, RuleBasedTaggerEvent> BEFORERULEAPPLICATION =\n\t\tnew Method<RuleBasedTaggerListener, RuleBasedTaggerEvent>() {\n\t\t\tpublic void invoke(RuleBasedTaggerListener target, RuleBasedTaggerEvent argument) {\n\t\t\t\ttarget.beforeRuleApplication(argument);\n\t\t\t}\n\t};\n\t\n\tprivate static final Method<RuleBasedTaggerListener, RuleBasedTaggerEvent> AFTERRULEAPPLICATION =\n\t\tnew Method<RuleBasedTaggerListener, RuleBasedTaggerEvent>() {\n\t\t\tpublic void invoke(RuleBasedTaggerListener target, RuleBasedTaggerEvent argument) {\n\t\t\t\ttarget.afterRuleApplication(argument);\n\t\t\t}\n\t};\n\t\n\tbefore(RuleBasedTagger tagger, Sentence sentence): onTagSentence(tagger, sentence) {\n\t\tRuleBasedTaggerEvent prototype = new RuleBasedTaggerEvent(tagger);\n\t\tprototype.setOnSentence(sentence);\n\t\t\n\t\tfireNotification(TAGGINGSENTENCE, prototype);\n\t}\n\n\tafter(RuleBasedTagger tagger, Sentence sentence) returning: onTagSentence(tagger, sentence) {\n\t\tRuleBasedTaggerEvent prototype = new RuleBasedTaggerEvent(tagger);\n\t\tprototype.setOnSentence(sentence);\n\t\n\t\tfireNotification(SENTENCETAGGED, prototype);\n\t}\n\n\tbefore(RuleBasedTagger tagger, Sentence sentence): onBaseTagger(tagger, *, sentence) {\n\t\tRuleBasedTaggerEvent prototype = new RuleBasedTaggerEvent(tagger);\n\t\tprototype.setOnSentence(sentence);\n\t\n\t\tfireNotification(BEFOREBASETAGGER, prototype);\n\t}\n\n\tafter(RuleBasedTagger tagger, Sentence sentence) returning: onBaseTagger(tagger, *, sentence) {\n\t\tRuleBasedTaggerEvent prototype = new RuleBasedTaggerEvent(tagger);\n\t\tprototype.setOnSentence(sentence);\n\t\n\t\tfireNotification(AFTERBASETAGGER, prototype);\n\t}\n\n\tbefore(RuleBasedTagger tagger, Rule rule, Sentence sentence): onRuleApplication(tagger, rule, sentence) {\n\t\tRuleBasedTaggerEvent prototype = new RuleBasedTaggerEvent(tagger);\n\t\tprototype.setOnSentence(sentence);\n\t\tprototype.setActingRule(rule);\n\n\t\tfireNotification(BEFORERULEAPPLICATION, prototype);\n\t}\n\n\tafter(RuleBasedTagger tagger, Rule rule, Sentence sentence) returning: onRuleApplication(tagger, rule, sentence) {\n\t\tRuleBasedTaggerEvent prototype = new RuleBasedTaggerEvent(tagger);\n\t\tprototype.setOnSentence(sentence);\n\t\tprototype.setActingRule(rule);\n\n\t\tfireNotification(AFTERRULEAPPLICATION, prototype);\n\t}\n\n}\n","returncode":0,"stderr":"","license":"agpl-3.0","lang":"AspectJ"}
{"commit":"243162f0531ff21a657946eba2515fb83dc12592","subject":"XWIKI-11703: Remove mentions of ancient CAPTCHA implementation from API and documentation - Moved unused method to legacy","message":"XWIKI-11703: Remove mentions of ancient CAPTCHA implementation from API and documentation\n- Moved unused method to legacy\n","repos":"pbondoer\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,xwiki\/xwiki-platform","old_file":"xwiki-platform-core\/xwiki-platform-legacy\/xwiki-platform-legacy-oldcore\/src\/main\/aspect\/com\/xpn\/xwiki\/XWikiCompatibilityAspect.aj","new_file":"xwiki-platform-core\/xwiki-platform-legacy\/xwiki-platform-legacy-oldcore\/src\/main\/aspect\/com\/xpn\/xwiki\/XWikiCompatibilityAspect.aj","new_contents":"\/*\n * See the NOTICE file distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This is free software; you can redistribute it and\/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF site: http:\/\/www.fsf.org.\n *\/\npackage com.xpn.xwiki;\n\nimport java.io.UnsupportedEncodingException;\nimport java.io.File;\nimport java.lang.reflect.Type;\nimport java.net.URL;\nimport java.net.URLEncoder;\nimport java.util.ArrayList;\nimport java.util.HashMap;\nimport java.util.List;\nimport java.util.Map;\nimport java.net.InetAddress;\nimport java.lang.reflect.Method;\nimport java.lang.reflect.InvocationTargetException;\nimport java.io.IOException;\n\nimport org.apache.commons.net.smtp.SMTPClient;\nimport org.apache.commons.net.smtp.SMTPReply;\nimport org.apache.commons.lang3.StringUtils;\nimport org.xwiki.cache.CacheException;\nimport org.xwiki.cache.CacheFactory;\nimport org.xwiki.cache.CacheManager;\nimport org.xwiki.cache.config.CacheConfiguration;\nimport org.xwiki.cache.eviction.LRUEvictionConfiguration;\nimport org.xwiki.component.manager.ComponentLookupException;\nimport org.xwiki.context.Execution;\nimport org.xwiki.context.ExecutionContext;\nimport org.xwiki.environment.Environment;\nimport org.xwiki.rendering.syntax.Syntax;\nimport org.xwiki.xml.XMLUtils;\nimport org.xwiki.model.reference.EntityReference;\nimport org.xwiki.model.reference.EntityReferenceResolver;\nimport org.xwiki.model.reference.DocumentReference;\nimport org.xwiki.model.reference.EntityReferenceSerializer;\nimport org.xwiki.model.reference.WikiReference;\nimport org.xwiki.model.EntityType;\nimport org.xwiki.url.XWikiEntityURL;\nimport org.apache.velocity.VelocityContext;\n\nimport com.xpn.xwiki.cache.api.XWikiCache;\nimport com.xpn.xwiki.cache.api.XWikiCacheService;\nimport com.xpn.xwiki.cache.api.internal.XWikiCacheServiceStub;\nimport com.xpn.xwiki.cache.api.internal.XWikiCacheStub;\nimport com.xpn.xwiki.doc.XWikiDocument;\nimport com.xpn.xwiki.notify.XWikiNotificationManager;\nimport com.xpn.xwiki.objects.BaseObject;\nimport com.xpn.xwiki.objects.classes.BaseClass;\nimport com.xpn.xwiki.objects.classes.PropertyClass;\nimport com.xpn.xwiki.plugin.query.QueryPlugin;\nimport com.xpn.xwiki.plugin.query.XWikiCriteria;\nimport com.xpn.xwiki.plugin.query.XWikiQuery;\nimport com.xpn.xwiki.util.Util;\nimport com.xpn.xwiki.web.Utils;\nimport com.xpn.xwiki.web.XWikiMessageTool;\nimport com.xpn.xwiki.web.XWikiRequest;\n\n\/**\n * Add a backward compatibility layer to the {@link com.xpn.xwiki.XWiki} class.\n * \n * @version $Id$\n *\/\npublic privileged aspect XWikiCompatibilityAspect\n{\n    private static Map XWiki.threadMap = new HashMap();\n\n    private XWikiNotificationManager XWiki.notificationManager;\n\n    private EntityReferenceResolver<EntityReference> XWiki.defaultReferenceEntityReferenceResolver = Utils.getComponent(\n        EntityReferenceResolver.TYPE_REFERENCE);\n\n    private EntityReferenceSerializer<String> XWiki.localStringEntityReferenceSerializer = Utils.getComponent(\n        EntityReferenceSerializer.TYPE_STRING, \"local\");\n\n    \n    \/**\n     * Used to get the temporary and permanent directory.\n     *\/\n    private Environment XWiki.environment = Utils.getComponent((Type) Environment.class);\n\n    \/** Is the wiki running in test mode? Deprecated, was used when running Cactus tests. *\/\n    private boolean XWiki.test = false;\n\n    \/**\n     * Transform a text in a URL compatible text\n     *\n     * @param content text to transform\n     * @return encoded result\n     * @deprecated replaced by Util#encodeURI since 1.3M2\n     *\/\n    @Deprecated\n    public String XWiki.getURLEncoded(String content)\n    {\n        try {\n            return URLEncoder.encode(content, this.getEncoding());\n        } catch (UnsupportedEncodingException e) {\n            return content;\n        }\n    }\n\n    \/**\n     * @return true for multi-wiki\/false for mono-wiki\n     * @deprecated replaced by {@link XWiki#isVirtualMode()} since 1.4M1.\n     *\/\n    @Deprecated\n    public boolean XWiki.isVirtual()\n    {\n        return isVirtualMode();\n    }\n\n    \/**\n     * @deprecated Virtual mode is on by default, starting with XWiki 5.0M2. Use\n     *             {@link #getVirtualWikisDatabaseNames(XWikiContext)} to get the list of wikis if needed.\n     * @return true for multi-wiki\/false for mono-wiki\n     *\/\n    @Deprecated\n    public boolean XWiki.isVirtualMode()\n    {\n        return true;\n    }\n\n    \/**\n     * @deprecated Removed since it isn't used; since 1.5M1.\n     *\/\n    @Deprecated\n    public static Map XWiki.getThreadMap()\n    {\n        return XWiki.threadMap;\n    }\n\n    \/**\n     * @deprecated Removed since it isn't used; since 1.5M1.\n     *\/\n    @Deprecated\n    public static void XWiki.setThreadMap(Map threadMap)\n    {\n        XWiki.threadMap = threadMap;\n    }\n\n    \/**\n     * @return the cache service.\n     * @deprecated replaced by {@link XWiki#getCacheFactory(XWikiContext)} or\n     *             {@link XWiki#getLocalCacheFactory(XWikiContext)} since 1.5M2.\n     *\/\n    @Deprecated\n    public XWikiCacheService XWiki.getCacheService()\n    {\n        return new XWikiCacheServiceStub(getCacheFactory(), getLocalCacheFactory());\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getVirtualWikiCache(XWikiContext)} since 1.5M2.\n     *\/\n    @Deprecated\n    public XWikiCache XWiki.getVirtualWikiMap()\n    {\n        return new XWikiCacheStub(this.virtualWikiMap);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpaceCopyright(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebCopyright(XWikiContext context)\n    {\n        return this.getSpaceCopyright(context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, String defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, String, String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, String space, String defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, space, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsLong(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public long XWiki.getWebPreferenceAsLong(String preference, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsLong(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsLong(String, long, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public long XWiki.getWebPreferenceAsLong(String preference, long defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsLong(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsInt(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.getWebPreferenceAsInt(String preference, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsInt(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsInt(String, int, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.getWebPreferenceAsInt(String preference, int defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsInt(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#copySpaceBetweenWikis(String, String, String, String, XWikiContext)} since\n     *             2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.copyWikiWeb(String space, String sourceWiki, String targetWiki, String language, XWikiContext context)\n        throws XWikiException\n    {\n        return this.copySpaceBetweenWikis(space, sourceWiki, targetWiki, language, context);\n    }\n\n    \/**\n     * @deprecated replaced by\n     *             {@link XWiki#copySpaceBetweenWikis(String, String, String, String, boolean, XWikiContext)} since\n     *             2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.copyWikiWeb(String space, String sourceWiki, String targetWiki, String language, boolean clean,\n        XWikiContext context) throws XWikiException\n    {\n        return this.copySpaceBetweenWikis(space, sourceWiki, targetWiki, language, clean, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getDefaultSpace(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getDefaultWeb(XWikiContext context)\n    {\n        return this.getDefaultSpace(context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#skipDefaultSpaceInURLs(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public boolean XWiki.useDefaultWeb(XWikiContext context)\n    {\n        return this.skipDefaultSpaceInURLs(context);\n    }\n\n    \/**\n     * @deprecated use {@link XWikiMessageTool#get(String, List)} instead. You can access message tool using\n     *             {@link XWikiContext#getMessageTool()}.\n     *\/\n    @Deprecated\n    public String XWiki.getMessage(String item, XWikiContext context)\n    {\n        XWikiMessageTool msg = context.getMessageTool();\n        if (msg == null) {\n            return item;\n        } else {\n            return msg.get(item);\n        }\n    }\n\n    \/**\n     * @deprecated Removed since it isn't used; since 3.1M2.\n     *\/\n    @Deprecated\n    public String XWiki.getHTMLArea(String content, XWikiContext context)\n    {\n        StringBuilder result = new StringBuilder();\n\n        String scontent = XMLUtils.escape(content);\n        scontent = scontent.replaceAll(\"\\r?+\\n\", \"<br class=\\\"htmlarea\\\"\/>\");\n\n        result.append(\"<textarea name=\\\"content\\\" id=\\\"content\\\" rows=\\\"25\\\" cols=\\\"80\\\">\");\n        result.append(scontent);\n        result.append(\"<\/textarea>\");\n\n        return result.toString();\n    }\n\n    @Deprecated\n    public XWikiNotificationManager XWiki.getNotificationManager()\n    {\n        if (this.notificationManager == null) {\n          this.notificationManager = new XWikiNotificationManager();\n        }\n\n        return this.notificationManager;\n    }\n\n    @Deprecated\n    public void XWiki.setNotificationManager(XWikiNotificationManager notificationManager)\n    {\n        this.notificationManager = notificationManager;\n    }\n    \n    @Deprecated\n    public String XWiki.displaySearch(String fieldname, String className, XWikiCriteria criteria, XWikiContext context)\n        throws XWikiException\n    {\n        return displaySearch(fieldname, className, \"\", criteria, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearch(String fieldname, String className, XWikiContext context) throws XWikiException\n    {\n        return displaySearch(fieldname, className, \"\", new XWikiCriteria(), context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearch(String fieldname, String className, String prefix, XWikiCriteria criteria,\n        XWikiContext context) throws XWikiException\n    {\n        BaseClass bclass = getDocument(className, context).getXClass();\n        PropertyClass pclass = (PropertyClass) bclass.get(fieldname);\n        if (criteria == null) {\n            criteria = new XWikiCriteria();\n        }\n\n        if (pclass == null) {\n            return \"\";\n        } else {\n            return pclass.displaySearch(fieldname, prefix + className + \"_\", criteria, context);\n        }\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchColumns(String className, XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        return displaySearchColumns(className, \"\", query, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchColumns(String className, String prefix, XWikiQuery query, XWikiContext context)\n        throws XWikiException\n    {\n        BaseClass bclass = getDocument(className, context).getXClass();\n\n        if (query == null) {\n            query = new XWikiQuery();\n        }\n\n        return bclass.displaySearchColumns(className + \"_\" + prefix, query, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchOrder(String className, XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        return displaySearchOrder(className, \"\", query, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchOrder(String className, String prefix, XWikiQuery query, XWikiContext context)\n        throws XWikiException\n    {\n        BaseClass bclass = getDocument(className, context).getXClass();\n\n        if (query == null) {\n            query = new XWikiQuery();\n        }\n\n        return bclass.displaySearchOrder(className + \"_\" + prefix, query, context);\n    }\n\n    @Deprecated\n    public <T> List<T> XWiki.search(XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        QueryPlugin qp = (QueryPlugin) getPlugin(\"query\", context);\n        if (qp == null) {\n            return null;\n        }\n\n        return qp.search(query);\n    }\n\n    @Deprecated\n    public XWikiQuery XWiki.createQueryFromRequest(String className, XWikiContext context) throws XWikiException\n    {\n        return new XWikiQuery(context.getRequest(), className, context);\n    }\n\n    @Deprecated\n    public String XWiki.searchAsTable(XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        QueryPlugin qp = (QueryPlugin) getPlugin(\"query\", context);\n        if (qp == null) {\n            return null;\n        }\n\n        List<String> list = qp.search(query);\n        String result = \"{table}\\r\\n\";\n        List<String> headerColumns = new ArrayList<String>();\n        List<String> displayProperties = query.getDisplayProperties();\n        for (String propname : displayProperties) {\n            PropertyClass pclass = getPropertyClassFromName(propname, context);\n            if (pclass != null) {\n                headerColumns.add(pclass.getPrettyName());\n            } else {\n                if (propname.startsWith(\"doc.\")) {\n                    propname = propname.substring(4);\n                    headerColumns.add(XWikiDocument.getInternalPropertyName(propname, context));\n                } else {\n                    headerColumns.add(propname);\n                }\n\n            }\n        }\n\n        result += StringUtils.join(headerColumns.toArray(), \" | \") + \"\\r\\n\";\n        for (String docname : list) {\n            List<String> rowColumns = new ArrayList<String>();\n            XWikiDocument doc = getDocument(docname, context);\n            for (String propname : displayProperties) {\n                PropertyClass pclass = getPropertyClassFromName(propname, context);\n                if (pclass == null) {\n                    if (propname.startsWith(\"doc.\")) {\n                        propname = propname.substring(4);\n                    }\n                    String value = doc.getInternalProperty(propname);\n                    rowColumns.add((value == null) ? \" \" : value);\n                } else {\n                    BaseObject bobj = doc.getObject(pclass.getObject().getName());\n                    rowColumns.add(doc.display(pclass.getName(), \"view\", bobj, context));\n                }\n            }\n            result += StringUtils.join(rowColumns.toArray(), \" | \") + \"\\r\\n\";\n        }\n\n        result += \"{table}\\r\\n\";\n\n        return result;\n    }\n\n    @Deprecated\n    public String XWiki.getDocLanguagePreference(XWikiContext context)\n    {\n        return getLanguagePreference(context);\n    }\n\n    @Deprecated\n    public void XWiki.flushCache()\n    {\n        Execution execution = Utils.getComponent(Execution.class);\n\n        ExecutionContext ec = execution.getContext();\n\n        flushCache(ec != null ? (XWikiContext) ec.getProperty(\"xwikicontext\") : null);\n    }\n\n    \/**\n     * @deprecated use WikiManager plugin instead\n     *\/\n    @Deprecated\n    public int XWiki.createNewWiki(String wikiName, String wikiUrl, String wikiAdmin, String baseWikiName,\n        String description, String wikilanguage, boolean failOnExist, XWikiContext context) throws XWikiException\n    {\n        String database = context.getDatabase();\n        wikiName = wikiName.toLowerCase();\n\n        try {\n            XWikiDocument userdoc = getDocument(wikiAdmin, context);\n\n            \/\/ User does not exist\n            if (userdoc.isNew()) {\n                if (LOGGER.isErrorEnabled()) {\n                    LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"user does not exist\");\n                }\n                return -2;\n            }\n\n            \/\/ User is not active\n            if (!(userdoc.getIntValue(\"XWiki.XWikiUsers\", \"active\") == 1)) {\n                if (LOGGER.isErrorEnabled()) {\n                    LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"user is not active\");\n                }\n                return -3;\n            }\n\n            String wikiForbiddenList = Param(\"xwiki.virtual.reserved_wikis\");\n            if (Util.contains(wikiName, wikiForbiddenList, \", \")) {\n                if (LOGGER.isErrorEnabled()) {\n                    LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"wiki name is forbidden\");\n                }\n                return -4;\n            }\n\n            String wikiServerPage = \"XWikiServer\" + wikiName.substring(0, 1).toUpperCase() + wikiName.substring(1);\n            \/\/ Verify is server page already exist\n            XWikiDocument serverdoc = getDocument(SYSTEM_SPACE, wikiServerPage, context);\n            if (serverdoc.isNew()) {\n                \/\/ clear entry in virtual wiki cache\n                this.virtualWikiMap.remove(wikiUrl);\n\n                \/\/ Create Wiki Server page\n                serverdoc.setStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"server\", wikiUrl);\n                serverdoc.setStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"owner\", wikiAdmin);\n                if (description != null) {\n                    serverdoc.setLargeStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"description\", description);\n                }\n                if (wikilanguage != null) {\n                    serverdoc.setStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"language\", wikilanguage);\n                }\n                if (!getDefaultDocumentSyntax().equals(Syntax.XWIKI_1_0.toIdString())) {\n                    serverdoc.setContent(\"{{include document=\\\"XWiki.XWikiServerForm\\\"\/}}\\n\");\n                    serverdoc.setSyntax(Syntax.XWIKI_2_0);\n                } else {\n                    serverdoc.setContent(\"#includeForm(\\\"XWiki.XWikiServerForm\\\")\\n\");\n                    serverdoc.setSyntax(Syntax.XWIKI_1_0);\n                }\n                serverdoc.setParentReference(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE);\n                saveDocument(serverdoc, context);\n            } else {\n                \/\/ If we are not allowed to continue if server page already exists\n                if (failOnExist) {\n                    if (LOGGER.isErrorEnabled()) {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki server page already exists\");\n                    }\n                    return -5;\n                } else if (LOGGER.isWarnEnabled()) {\n                    LOGGER.warn(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"wiki server page already exists\");\n                }\n            }\n\n            \/\/ Create wiki database\n            try {\n                context.setDatabase(getDatabase());\n                getStore().createWiki(wikiName, context);\n            } catch (XWikiException e) {\n                if (LOGGER.isErrorEnabled()) {\n                    if (e.getCode() == 10010) {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki database already exists\");\n                    } else if (e.getCode() == 10011) {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki database creation failed\");\n                    } else {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki database creation threw exception\", e);\n                    }\n                }\n            } catch (Exception e) {\n                LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                    + \"wiki database creation threw exception\", e);\n            }\n\n            try {\n                updateDatabase(wikiName, true, false, context);\n            } catch (Exception e) {\n                LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                    + \"wiki database shema update threw exception\", e);\n                return -6;\n            }\n\n            \/\/ Copy base wiki\n            int nb = copyWiki(baseWikiName, wikiName, wikilanguage, context);\n            \/\/ Save the number of docs copied in the context\n            context.put(\"nbdocs\", Integer.valueOf(nb));\n\n            \/\/ Create user page in his wiki\n            \/\/ Let's not create it anymore.. this makes the creator loose\n            \/\/ super admin rights on his wiki\n            \/\/ copyDocument(wikiAdmin, getDatabase(), wikiName, wikilanguage, context);\n\n            \/\/ Modify rights in user wiki\n            context.setDatabase(wikiName);\n            \/*\n             * XWikiDocument wikiprefdoc = getDocument(\"XWiki.XWikiPreferences\", context);\n             * wikiprefdoc.setStringValue(\"XWiki.XWikiGlobalRights\", \"users\", wikiAdmin);\n             * wikiprefdoc.setStringValue(\"XWiki.XWikiGlobalRights\", \"levels\", \"admin, edit\");\n             * wikiprefdoc.setIntValue(\"XWiki.XWikiGlobalRights\", \"allow\", 1); saveDocument(wikiprefdoc, context);\n             *\/\n            return 1;\n        } catch (Exception e) {\n            LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                + \"wiki creation threw exception\", e);\n            return -10;\n        } finally {\n            context.setDatabase(database);\n        }\n    }\n\n    \/**\n     * Get the XWiki temporary filesystem directory (cleaned up automatically by XWiki).\n     *\n     * @param context\n     * @return temporary directory\n     * @since 1.1 Milestone 4\n     * @deprecated starting with 4.2M1 use {@link org.xwiki.environment.Environment#getTemporaryDirectory()}\n     *\/\n    @Deprecated\n    public File XWiki.getTempDirectory(XWikiContext context)\n    {\n        return this.environment.getTemporaryDirectory();\n    }\n\n    \/**\n     * Get a new directory in the xwiki work directory\n     *\n     * @param subdir desired directory name\n     * @param context\n     * @return work subdirectory\n     * @since 1.1 Milestone 4\n     * @deprecated starting with 4.2M1 use {@link org.xwiki.environment.Environment#getPermanentDirectory()}\n     *\/\n    @Deprecated\n    public File XWiki.getWorkSubdirectory(String subdir, XWikiContext context)\n    {\n        File fdir = new File(this.environment.getPermanentDirectory().getAbsolutePath(), subdir);\n        if (!fdir.exists()) {\n            fdir.mkdir();\n        }\n\n        return fdir;\n    }\n\n    \/**\n     * Get the XWiki work directory\n     *\n     * @param context\n     * @return work directory\n     * @since 1.1 Milestone 4\n     * @deprecated starting with 4.2M1 use {@link org.xwiki.environment.Environment#getPermanentDirectory()}\n     *\/\n    @Deprecated\n    public File XWiki.getWorkDirectory(XWikiContext context)\n    {\n        return this.environment.getPermanentDirectory();\n    }\n\n    \/**\n     * @deprecated starting with 5.1M1 use {@code org.xwiki.url.XWikiURLFactory} instead and starting with 5.3M1 use\n     *             {@link ResourceFactory} and since 6.1M2 use {@link org.xwiki.resource.ResourceReferenceResolver}\n     *\/\n    @Deprecated\n    public XWikiDocument XWiki.getDocumentFromPath(String path, XWikiContext context) throws XWikiException\n    {\n        return getDocument(getDocumentReferenceFromPath(path, context), context);\n    }\n\n    \/**\n     * @since 2.3M1\n     * @deprecated starting with 5.1M1 use {@code org.xwiki.url.XWikiURLFactory} instead and starting with 5.3M1 use\n     *             {@link ResourceFactory} and since 6.1M2 use {@link org.xwiki.resource.ResourceReferenceResolver}\n     *\/\n    @Deprecated\n    public DocumentReference XWiki.getDocumentReferenceFromPath(String path, XWikiContext context)\n    {\n        \/\/ TODO: Remove this and use XWikiURLFactory instead in XWikiAction and all entry points.\n        List<String> segments = new ArrayList<String>();\n        for (String segment : path.split(\"\/\", -1)) {\n            segments.add(Util.decodeURI(segment, context));\n        }\n        \/\/ Remove the first segment if it's empty to cater for cases when the path starts with \"\/\"\n        if (segments.size() > 0 && segments.get(0).length() == 0) {\n            segments.remove(0);\n        }\n\n        XWikiEntityURL entityURL = buildEntityURLFromPathSegments(new WikiReference(context.getDatabase()), segments);\n\n        return new DocumentReference(entityURL.getEntityReference().extractReference(EntityType.DOCUMENT));\n    }\n\n    \/**\n     * @deprecated since 2.3M1 use {@link #getDocumentReferenceFromPath(String, XWikiContext)} instead\n     *\/\n    @Deprecated\n    public String XWiki.getDocumentNameFromPath(String path, XWikiContext context)\n    {\n        return this.localStringEntityReferenceSerializer.serialize(getDocumentReferenceFromPath(path, context));\n    }\n\n    \/**\n     * @deprecated since 2.3M1 use {@link #getDocumentReferenceFromPath(String, XWikiContext)} instead\n     *\/\n    @Deprecated\n    public String XWiki.getDocumentName(XWikiRequest request, XWikiContext context)\n    {\n        return this.localStringEntityReferenceSerializer.serialize(getDocumentReference(request, context));\n    }\n\n    \/**\n     * @deprecated starting with 5.1M1 use {@code org.xwiki.url.XWikiURLFactory} instead and starting with 5.3M1 use\n     *             {@link ResourceFactory} and since 6.1M2 use {@link org.xwiki.resource.ResourceReferenceResolver}\n     *\/\n    @Deprecated\n    private XWikiEntityURL XWiki.buildEntityURLFromPathSegments(WikiReference wikiReference, List<String> pathSegments)\n    {\n        XWikiEntityURL entityURL;\n\n        \/\/ Rules based on counting the url segments:\n        \/\/ - 0 segments (e.g. \"\"): default document reference, \"view\" action\n        \/\/ - 1 segment (e.g. \"\/\", \"\/Document\"): default space, specified document (and default if empty), \"view\" action\n        \/\/ - 2 segments (e.g. \"\/Space\/\", \"\/Space\/Document\"): specified space, document (and default doc if empty),\n        \/\/   \"view\" action\n        \/\/ - 3 segments (e.g. \"\/action\/Space\/Document\"): specified space, document (and default doc if empty),\n        \/\/   specified action\n        \/\/ - 4 segments (e.g. \"\/download\/Space\/Document\/attachment\"): specified space, document and attachment (and\n        \/\/   default doc if empty), \"download\" action\n        \/\/ - 4 segments or more (e.g. \"\/action\/Space\/Document\/whatever\/else\"): specified space, document (and default\n        \/\/     doc if empty), specified \"action\" (if action != \"download\"), trailing segments ignored\n\n        String spaceName = null;\n        String pageName = null;\n        String attachmentName = null;\n        String action = \"view\";\n\n        if (pathSegments.size() == 1) {\n            pageName = pathSegments.get(0);\n        } else if (pathSegments.size() == 2) {\n            spaceName = pathSegments.get(0);\n            pageName = pathSegments.get(1);\n        } else if (pathSegments.size() >= 3) {\n            action = pathSegments.get(0);\n            spaceName = pathSegments.get(1);\n            pageName = pathSegments.get(2);\n            if (action.equals(\"download\") && pathSegments.size() >= 4) {\n                attachmentName = pathSegments.get(3);\n            }\n        }\n\n        \/\/ Normalize the extracted space\/page to resolve empty\/null values and replace them with default values.\n        EntityReference reference = wikiReference;\n        EntityType entityType = EntityType.DOCUMENT;\n        if (!StringUtils.isEmpty(spaceName)) {\n            reference = new EntityReference(spaceName, EntityType.SPACE, reference);\n        }\n        if (!StringUtils.isEmpty(pageName)) {\n            reference = new EntityReference(pageName, EntityType.DOCUMENT, reference);\n        }\n        if (!StringUtils.isEmpty(attachmentName)) {\n            reference = new EntityReference(attachmentName, EntityType.ATTACHMENT, reference);\n            entityType = EntityType.ATTACHMENT;\n        }\n        reference = this.defaultReferenceEntityReferenceResolver.resolve(reference, entityType);\n\n        entityURL = new XWikiEntityURL(reference);\n        entityURL.setAction(action);\n\n        return entityURL;\n    }\n\n    \/**\n     * Extracts the name of the wiki from a context's request. In some cases, including autowww, the main wiki may be\n     * returned instead of what was requested, as a result of some assumptions. Even so, the resulting wiki name is not\n     * guaranteed to exist, it is just what XWiki understood from the request.\n     *\n     * @param context the context which contains the request\n     * @return the name of the wiki that was requested\n     * @throws XWikiException if problems occur\n     * @deprecated starting with 5.2M1 use  use {@link ResourceFactory} instead and since 6.1M2 use\n     *             {@link org.xwiki.resource.ResourceReferenceResolver} instead\n     *\/\n    @Deprecated\n    public String XWiki.getRequestWikiName(XWikiContext context) throws XWikiException\n    {\n        \/\/ Host is full.host.name in DNS-based multiwiki, and wikiname in path-based multiwiki.\n        String host = \"\";\n        \/\/ Canonical name of the wiki (database).\n        String wikiName = \"\";\n        \/\/ wikiDefinition should be the document holding the definition of the virtual wiki, a document in the main\n        \/\/ wiki with a XWiki.XWikiServerClass object attached to it\n        DocumentReference wikiDefinition;\n\n        XWikiRequest request = context.getRequest();\n        try {\n            URL requestURL = context.getURL();\n            host = requestURL.getHost();\n        } catch (Exception e) {\n        }\n\n        \/\/ In path-based multi-wiki, the wiki name is an element of the request path.\n        \/\/ The url is in the form \/xwiki (app name)\/wiki (servlet name)\/wikiname\/\n        if (\"1\".equals(this.Param(\"xwiki.virtual.usepath\", \"1\"))) {\n            String uri = request.getRequestURI();\n            if (LOGGER.isDebugEnabled()) {\n                LOGGER.debug(\"Request uri is: \" + uri);\n            }\n            \/\/ Remove the (eventual) context path from the URI, usually \/xwiki\n            uri = stripSegmentFromPath(uri, request.getContextPath());\n            \/\/ Remove the (eventual) servlet path from the URI, usually \/wiki\n            String servletPath = request.getServletPath();\n            uri = stripSegmentFromPath(uri, servletPath);\n\n            if (servletPath.equals(\"\/\" + this.Param(\"xwiki.virtual.usepath.servletpath\", \"wiki\"))) {\n                \/\/ Requested path corresponds to a path-based wiki, now the wiki name is between the first and\n                \/\/ second \"\/\"\n                host = StringUtils.substringBefore(StringUtils.removeStart(uri, \"\/\"), \"\/\");\n            }\n        }\n\n        if (StringUtils.isEmpty(host) || host.equals(context.getMainXWiki())) {\n            \/\/ Can't find any wiki name, return the main wiki\n            return context.getMainXWiki();\n        }\n\n        \/\/ Try to use the full domain name\/path wiki name and see if it corresponds to any existing wiki descriptors\n        wikiDefinition = this.findWikiServer(host, context);\n\n        if (wikiDefinition == null) {\n            \/\/ No definition found based on the full domain name\/path wiki name, try to use the first part of the domain\n            \/\/ name as the wiki name\n            String servername = StringUtils.substringBefore(host, \".\");\n\n            \/\/ Note: Starting 5.0M2, the autowww behavior is default and the ability to disable it is now removed.\n            if (\"0\".equals(this.Param(\"xwiki.virtual.autowww\"))) {\n                LOGGER.warn(String.format(\"%s %s\", \"'xwiki.virtual.autowww' is no longer supported.\",\n                    \"Please update your configuration and\/or see XWIKI-8877 for more details.\"));\n            }\n\n            \/\/ As a convenience, we do not require the creation of an xwiki:XWiki.XWikiServerXwiki page for the main\n            \/\/ wiki and automatically go to the main wiki in certain cases:\n            \/\/ - \"www.<anyDomain>.<domainExtension>\" - if it starts with www, we first check if a subwiki with that\n            \/\/ name exists; if yes, the go to the \"www\" subwiki, if not, go to the main wiki\n            \/\/ - \"localhost\"\n            \/\/ - IP address\n            if (\"www\".equals(servername)) {\n                \/\/ Check that \"www\" is not actually the name of an existing subwiki.\n                wikiDefinition = this.findWikiServer(servername, context);\n                if (wikiDefinition == null) {\n                    \/\/ Not the case, use the main wiki.\n                    return context.getMainXWiki();\n                }\n            } else if (\"localhost\".equals(host) || host.matches(\"[0-9]{1,3}(?:\\\\.[0-9]{1,3}){3}\")) {\n                \/\/ Direct access to the main wiki.\n                return context.getMainXWiki();\n            }\n\n            \/\/ Use the name from the subdomain\n            wikiName = servername;\n\n            if (!context.isMainWiki(wikiName)\n                && !\"1\".equals(context.getWiki().Param(\"xwiki.virtual.failOnWikiDoesNotExist\", \"0\"))) {\n                \/\/ Check if the wiki really exists\n                if (!exists(getServerWikiPage(wikiName), context)) {\n                    \/\/ Fallback on main wiki\n                    wikiName = context.getMainXWiki();\n                }\n            }\n        } else {\n            \/\/ Use the name from the located wiki descriptor\n            wikiName = StringUtils.removeStart(wikiDefinition.getName(), \"XWikiServer\").toLowerCase();\n        }\n\n        return wikiName;\n    }\n\n    \/**\n     * Searches for the document containing the definition of the virtual wiki corresponding to the specified hostname.\n     *\n     * @param host the hostname, as specified in the request (for example: {@code forge.xwiki.org})\n     * @param context the current context\n     * @return the name of the document containing the wiki definition, or {@code null} if no wiki corresponds to the\n     *         hostname\n     * @throws XWikiException if a problem occurs while searching the storage\n     *\/\n    private DocumentReference XWiki.findWikiServer(String host, XWikiContext context) throws XWikiException\n    {\n        ensureVirtualWikiMapExists();\n        DocumentReference wikiName = this.virtualWikiMap.get(host);\n\n        if (wikiName == null) {\n            \/\/ Not loaded yet, search for it in the main wiki\n            String hql =\n                \", BaseObject as obj, StringProperty as prop WHERE obj.name=doc.fullName\"\n                    + \" AND doc.space='XWiki' AND doc.name LIKE 'XWikiServer%'\"\n                    + \" AND obj.className='XWiki.XWikiServerClass' AND prop.id.id = obj.id\"\n                    + \" AND prop.id.name = 'server' AND prop.value=?\";\n            List<String> parameters = new ArrayList<String>(1);\n            parameters.add(host);\n            try {\n                List<DocumentReference> list =\n                    context.getWiki().getStore().searchDocumentReferences(hql, parameters, context);\n                if ((list != null) && (list.size() > 0)) {\n                    wikiName = list.get(0);\n                }\n\n                this.virtualWikiMap.set(host, wikiName);\n            } catch (XWikiException e) {\n                LOGGER.warn(\"Error when searching for wiki name from URL host [\" + host + \"]\", e);\n            }\n        }\n\n        return wikiName;\n    }\n\n    private void XWiki.ensureVirtualWikiMapExists() throws XWikiException\n    {\n        synchronized (this) {\n            if (this.virtualWikiMap == null) {\n                int iCapacity = 1000;\n                try {\n                    String capacity = Param(\"xwiki.virtual.cache.capacity\");\n                    if (capacity != null) {\n                        iCapacity = Integer.parseInt(capacity);\n                    }\n                } catch (Exception e) {\n                }\n                try {\n                    CacheConfiguration configuration = new CacheConfiguration();\n                    configuration.setConfigurationId(\"xwiki.virtualwikimap\");\n                    LRUEvictionConfiguration lru = new LRUEvictionConfiguration();\n                    lru.setMaxEntries(iCapacity);\n                    configuration.put(LRUEvictionConfiguration.CONFIGURATIONID, lru);\n\n                    this.virtualWikiMap = getCacheFactory().newCache(configuration);\n                } catch (CacheException e) {\n                    throw new XWikiException(XWikiException.MODULE_XWIKI_CACHE,\n                        XWikiException.ERROR_CACHE_INITIALIZING, \"Failed to create new cache\", e);\n                }\n            }\n        }\n    }\n\n    \/**\n     * @deprecated replaced by {@link #setUserDefaultGroup(String fullwikiname, XWikiContext context)}\n     * @param context\n     * @param fullwikiname\n     * @throws XWikiException\n     *\/\n    @Deprecated\n    public void XWiki.SetUserDefaultGroup(XWikiContext context, String fullwikiname) throws XWikiException\n    {\n        this.setUserDefaultGroup(fullwikiname, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link #protectUserPage(String,String,XWikiDocument,XWikiContext)}\n     * @param context\n     * @param fullwikiname\n     * @param userRights\n     * @param doc\n     * @throws XWikiException\n     *\/\n    @Deprecated\n    public void XWiki.ProtectUserPage(XWikiContext context, String fullwikiname, String userRights, XWikiDocument doc)\n        throws XWikiException\n    {\n        this.protectUserPage(fullwikiname, userRights, doc, context);\n    }\n\n    \/**\n     * @return the cache factory.\n     * @since 1.5M2.\n     * @deprecated Since 1.7M1, use {@link CacheManager} component instead using {@link Utils#getComponent(Class)}\n     *\/\n    @Deprecated\n    public CacheFactory XWiki.getCacheFactory()\n    {\n        CacheFactory cacheFactory;\n\n        String cacheHint = Param(\"xwiki.cache.cachefactory.hint\", null);\n\n        if (StringUtils.isEmpty(cacheHint) || Utils.getComponent(CacheFactory.class, cacheHint) == null) {\n            CacheManager cacheManager = Utils.getComponent(CacheManager.class);\n            try {\n                cacheFactory = cacheManager.getCacheFactory();\n            } catch (ComponentLookupException e) {\n                throw new RuntimeException(\"Failed to get cache factory component\", e);\n            }\n        } else {\n            cacheFactory = Utils.getComponent(CacheFactory.class, cacheHint);\n        }\n\n        return cacheFactory;\n    }\n\n    \/**\n     * @return the cache factory creating local caches.\n     * @since 1.5M2.\n     * @deprecated Since 1.7M1, use {@link CacheManager} component instead using {@link Utils#getComponent(Class)}\n     *\/\n    @Deprecated\n    public CacheFactory XWiki.getLocalCacheFactory()\n    {\n        CacheFactory localCacheFactory;\n\n        String localCacheHint = Param(\"xwiki.cache.cachefactory.local.hint\", null);\n\n        if (StringUtils.isEmpty(localCacheHint) || Utils.getComponent(CacheFactory.class, localCacheHint) == null) {\n            CacheManager cacheManager = Utils.getComponent(CacheManager.class);\n            try {\n                localCacheFactory = cacheManager.getLocalCacheFactory();\n            } catch (ComponentLookupException e) {\n                throw new RuntimeException(\"Failed to get local cache factory component\", e);\n            }\n        } else {\n            localCacheFactory = Utils.getComponent(CacheFactory.class, localCacheHint);\n        }\n\n        return localCacheFactory;\n    }\n\n    \/**\n     * @deprecated since 2.3M1 use {@link #hasVersioning(XWikiContext)} instead\n     *\/\n    @Deprecated\n    public boolean XWiki.hasVersioning(String fullName, XWikiContext context)\n    {\n        return hasVersioning(context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link #include(String topic, boolean isForm, XWikiContext context)}\n     * @param topic\n     * @param context\n     * @param isForm\n     * @return\n     * @throws XWikiException\n     *\/\n    @Deprecated\n    public String XWiki.include(String topic, XWikiContext context, boolean isForm) throws XWikiException\n    {\n        return include(topic, isForm, context);\n    }\n    \n    \/**\n     * Checks if the wiki is running in test mode.\n     * \n     * @return {@code true} if the wiki is running Cactus tests, {@code false} otherwise\n     * @deprecated No longer used.\n     *\/\n    @Deprecated\n    public boolean XWiki.isTest()\n    {\n        return this.test;\n    }\n\n    \/**\n     * Marks that the wiki is running in test mode.\n     * \n     * @param test whether tests are being executed\n     * @deprecated No longer used.\n     *\/\n    @Deprecated\n    public void XWiki.setTest(boolean test)\n    {\n        this.test = test;\n    }\n\n    \/**\n     * @deprecated use {@link org.xwiki.localization.LocalizationManager} instead. From velocity you can access it using\n     *             the {@code $services.localization} binding, see {@code LocalizationScriptService}\n     *\/\n    @Deprecated\n    public String XWiki.parseMessage(XWikiContext context)\n    {\n        String message = (String) context.get(\"message\");\n        if (message == null) {\n            return null;\n        }\n\n        return parseMessage(message, context);\n    }\n\n    \/**\n     * @deprecated use {@link org.xwiki.localization.LocalizationManager} instead. From velocity you can access it using\n     *             the {@code $services.localization} binding, see {@code LocalizationScriptService}\n     *\/\n    @Deprecated\n    public String XWiki.parseMessage(String id, XWikiContext context)\n    {\n        XWikiMessageTool msg = context.getMessageTool();\n\n        List<?> parameters = (List<?>) context.get(\"messageParameters\");\n\n        String translatedMessage;\n        if (parameters != null) {\n            translatedMessage = msg.get(id, parameters);\n        } else {\n            translatedMessage = msg.get(id);\n        }\n\n        return parseContent(translatedMessage, context);\n    }\n\n    \/**\n     * @deprecated starting with 6.1M2 this method shouldn't be used. There's no replacement, it's just not the right\n     *             way to do this anymore and the flash.vm template doesn't exist anymore\n     *\/\n    @Deprecated\n    public String XWiki.getFlash(String url, String width, String height, XWikiContext context)\n    {\n        VelocityContext vorigcontext = ((VelocityContext) context.get(\"vcontext\"));\n        try {\n            VelocityContext vcontext = (VelocityContext) vorigcontext.clone();\n            vcontext.put(\"flashurl\", url);\n            vcontext.put(\"width\", width);\n            vcontext.put(\"height\", height);\n            context.put(\"vcontext\", vcontext);\n\n            return parseTemplate(\"flash.vm\", context);\n        } finally {\n            context.put(\"vcontext\", vorigcontext);\n        }\n    }\n\n    \/**\n     * @deprecated replaced by the <a href=\"http:\/\/code.xwiki.org\/xwiki\/bin\/view\/Plugins\/MailSenderPlugin\">Mail Sender\n     *             Plugin<\/a>\n     *\/\n    @Deprecated\n    public void XWiki.sendMessage(String sender, String[] recipients, String rawMessage, XWikiContext context)\n        throws XWikiException\n    {\n        LOGGER.trace(\"Entering sendMessage()\");\n\n        \/\/ We'll be using the MailSender plugin, which has much more advanced capabilities (authentication, TLS).\n        \/\/ Since the plugin is in another module, and it depends on the core, we have to use it through reflection in\n        \/\/ order to avoid cyclic dependencies. This should be fixed once the mailsender becomes a clean component\n        \/\/ instead of a plugin.\n        Object mailSender;\n        Class mailSenderClass;\n        Method mailSenderSendRaw;\n\n        try {\n            mailSender = getPluginApi(\"mailsender\", context);\n            mailSenderClass = Class.forName(\"com.xpn.xwiki.plugin.mailsender.MailSenderPluginApi\");\n\n            \/\/ public int sendRawMessage(String from, String to, String rawMessage)\n            mailSenderSendRaw =\n                mailSenderClass.getMethod(\"sendRawMessage\", new Class[] {String.class, String.class, String.class});\n        } catch (Exception e) {\n            LOGGER.error(\"Problem getting MailSender via Reflection. Using the old sendMessage mechanism.\", e);\n            sendMessageOld(sender, recipients, rawMessage, context);\n            return;\n        }\n\n        if (LOGGER.isTraceEnabled()) {\n            LOGGER.trace(\"Sending message = \\\"\" + rawMessage + \"\\\"\");\n        }\n\n        String messageRecipients = StringUtils.join(recipients, ',');\n\n        try {\n            mailSenderSendRaw.invoke(mailSender, sender, messageRecipients, rawMessage);\n        } catch (InvocationTargetException ite) {\n            Throwable cause = ite.getCause();\n            if (cause instanceof XWikiException) {\n                throw (XWikiException) cause;\n            } else {\n                throw new RuntimeException(cause);\n            }\n        } catch (Exception e) {\n            \/\/ Probably either IllegalAccessException or IllegalArgumentException\n            \/\/ Shouldn't happen unless there were an incompatible code change\n            throw new RuntimeException(e);\n        }\n\n        LOGGER.info(\"Exiting sendMessage(). It seems everything went ok.\");\n    }\n\n    \/**\n     * @deprecated replaced by the <a href=\"http:\/\/code.xwiki.org\/xwiki\/bin\/view\/Plugins\/MailSenderPlugin\">Mail Sender\n     *             Plugin<\/a>\n     *\/\n    @Deprecated\n    private void XWiki.sendMessageOld(String sender, String[] recipient, String message, XWikiContext context)\n        throws XWikiException\n    {\n        SMTPClient smtpc = null;\n        try {\n            String server = getXWikiPreference(\"smtp_server\", context);\n            String port = getXWikiPreference(\"smtp_port\", context);\n            String login = getXWikiPreference(\"smtp_login\", context);\n\n            if (context.get(\"debugMail\") != null) {\n                StringBuffer msg = new StringBuffer(message);\n                msg.append(\"\\n Recipient: \");\n                msg.append(recipient);\n                recipient = ((String) context.get(\"debugMail\")).split(\",\");\n                message = msg.toString();\n            }\n\n            if ((server == null) || server.equals(\"\")) {\n                server = \"127.0.0.1\";\n            }\n            if ((port == null) || (port.equals(\"\"))) {\n                port = \"25\";\n            }\n            if ((login == null) || login.equals(\"\")) {\n                login = InetAddress.getLocalHost().getHostName();\n            }\n\n            smtpc = new SMTPClient();\n            smtpc.connect(server, Integer.parseInt(port));\n            int reply = smtpc.getReplyCode();\n            if (!SMTPReply.isPositiveCompletion(reply)) {\n                Object[] args = {server, port, Integer.valueOf(reply), smtpc.getReplyString()};\n                throw new XWikiException(XWikiException.MODULE_XWIKI_EMAIL,\n                    XWikiException.ERROR_XWIKI_EMAIL_CONNECT_FAILED,\n                    \"Could not connect to server {0} port {1} error code {2} ({3})\", null, args);\n            }\n\n            if (smtpc.login(login) == false) {\n                reply = smtpc.getReplyCode();\n                Object[] args = {server, port, Integer.valueOf(reply), smtpc.getReplyString()};\n                throw new XWikiException(XWikiException.MODULE_XWIKI_EMAIL,\n                    XWikiException.ERROR_XWIKI_EMAIL_LOGIN_FAILED,\n                    \"Could not login to mail server {0} port {1} error code {2} ({3})\", null, args);\n            }\n\n            if (smtpc.sendSimpleMessage(sender, recipient, message) == false) {\n                reply = smtpc.getReplyCode();\n                Object[] args = {server, port, Integer.valueOf(reply), smtpc.getReplyString()};\n                throw new XWikiException(XWikiException.MODULE_XWIKI_EMAIL,\n                    XWikiException.ERROR_XWIKI_EMAIL_SEND_FAILED,\n                    \"Could not send mail to server {0} port {1} error code {2} ({3})\", null, args);\n            }\n\n        } catch (IOException e) {\n            Object[] args = {sender, recipient};\n            throw new XWikiException(XWikiException.MODULE_XWIKI_EMAIL,\n                XWikiException.ERROR_XWIKI_EMAIL_ERROR_SENDING_EMAIL, \"Exception while sending email from {0} to {1}\",\n                e, args);\n        } finally {\n            if ((smtpc != null) && (smtpc.isConnected())) {\n                try {\n                    smtpc.disconnect();\n                } catch (IOException e) {\n                    e.printStackTrace();\n                }\n            }\n        }\n    }\n\n    \/**\n     * @deprecated replaced by the <a href=\"http:\/\/code.xwiki.org\/xwiki\/bin\/view\/Plugins\/MailSenderPlugin\">Mail Sender\n     *             Plugin<\/a>\n     *\/\n    @Deprecated\n    public void XWiki.sendMessage(String sender, String recipient, String message, XWikiContext context)\n        throws XWikiException\n    {\n        String[] recip = recipient.split(\",\");\n        sendMessage(sender, recip, message, context);\n    }\n\n    \/**\n     * @deprecated since 7.0M1. This method should have actually been deprecated since 2.3M1, but it was left forgotten\n     *             and unused.\n     *\/\n    @Deprecated\n    public boolean XWiki.hasCaptcha(XWikiContext context)\n    {\n        return (this.getXWikiPreferenceAsInt(\"captcha_enabled\", \"xwiki.plugin.captcha\", 0, context) == 1);\n    }\n}\n","old_contents":"\/*\n * See the NOTICE file distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This is free software; you can redistribute it and\/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF site: http:\/\/www.fsf.org.\n *\/\npackage com.xpn.xwiki;\n\nimport java.io.UnsupportedEncodingException;\nimport java.io.File;\nimport java.lang.reflect.Type;\nimport java.net.URL;\nimport java.net.URLEncoder;\nimport java.util.ArrayList;\nimport java.util.HashMap;\nimport java.util.List;\nimport java.util.Map;\nimport java.net.InetAddress;\nimport java.lang.reflect.Method;\nimport java.lang.reflect.InvocationTargetException;\nimport java.io.IOException;\n\nimport org.apache.commons.net.smtp.SMTPClient;\nimport org.apache.commons.net.smtp.SMTPReply;\nimport org.apache.commons.lang3.StringUtils;\nimport org.xwiki.cache.CacheException;\nimport org.xwiki.cache.CacheFactory;\nimport org.xwiki.cache.CacheManager;\nimport org.xwiki.cache.config.CacheConfiguration;\nimport org.xwiki.cache.eviction.LRUEvictionConfiguration;\nimport org.xwiki.component.manager.ComponentLookupException;\nimport org.xwiki.context.Execution;\nimport org.xwiki.context.ExecutionContext;\nimport org.xwiki.environment.Environment;\nimport org.xwiki.rendering.syntax.Syntax;\nimport org.xwiki.xml.XMLUtils;\nimport org.xwiki.model.reference.EntityReference;\nimport org.xwiki.model.reference.EntityReferenceResolver;\nimport org.xwiki.model.reference.DocumentReference;\nimport org.xwiki.model.reference.EntityReferenceSerializer;\nimport org.xwiki.model.reference.WikiReference;\nimport org.xwiki.model.EntityType;\nimport org.xwiki.url.XWikiEntityURL;\nimport org.apache.velocity.VelocityContext;\n\nimport com.xpn.xwiki.cache.api.XWikiCache;\nimport com.xpn.xwiki.cache.api.XWikiCacheService;\nimport com.xpn.xwiki.cache.api.internal.XWikiCacheServiceStub;\nimport com.xpn.xwiki.cache.api.internal.XWikiCacheStub;\nimport com.xpn.xwiki.doc.XWikiDocument;\nimport com.xpn.xwiki.notify.XWikiNotificationManager;\nimport com.xpn.xwiki.objects.BaseObject;\nimport com.xpn.xwiki.objects.classes.BaseClass;\nimport com.xpn.xwiki.objects.classes.PropertyClass;\nimport com.xpn.xwiki.plugin.query.QueryPlugin;\nimport com.xpn.xwiki.plugin.query.XWikiCriteria;\nimport com.xpn.xwiki.plugin.query.XWikiQuery;\nimport com.xpn.xwiki.util.Util;\nimport com.xpn.xwiki.web.Utils;\nimport com.xpn.xwiki.web.XWikiMessageTool;\nimport com.xpn.xwiki.web.XWikiRequest;\n\n\/**\n * Add a backward compatibility layer to the {@link com.xpn.xwiki.XWiki} class.\n * \n * @version $Id$\n *\/\npublic privileged aspect XWikiCompatibilityAspect\n{\n    private static Map XWiki.threadMap = new HashMap();\n\n    private XWikiNotificationManager XWiki.notificationManager;\n\n    private EntityReferenceResolver<EntityReference> XWiki.defaultReferenceEntityReferenceResolver = Utils.getComponent(\n        EntityReferenceResolver.TYPE_REFERENCE);\n\n    private EntityReferenceSerializer<String> XWiki.localStringEntityReferenceSerializer = Utils.getComponent(\n        EntityReferenceSerializer.TYPE_STRING, \"local\");\n\n    \n    \/**\n     * Used to get the temporary and permanent directory.\n     *\/\n    private Environment XWiki.environment = Utils.getComponent((Type) Environment.class);\n\n    \/** Is the wiki running in test mode? Deprecated, was used when running Cactus tests. *\/\n    private boolean XWiki.test = false;\n\n    \/**\n     * Transform a text in a URL compatible text\n     *\n     * @param content text to transform\n     * @return encoded result\n     * @deprecated replaced by Util#encodeURI since 1.3M2\n     *\/\n    @Deprecated\n    public String XWiki.getURLEncoded(String content)\n    {\n        try {\n            return URLEncoder.encode(content, this.getEncoding());\n        } catch (UnsupportedEncodingException e) {\n            return content;\n        }\n    }\n\n    \/**\n     * @return true for multi-wiki\/false for mono-wiki\n     * @deprecated replaced by {@link XWiki#isVirtualMode()} since 1.4M1.\n     *\/\n    @Deprecated\n    public boolean XWiki.isVirtual()\n    {\n        return isVirtualMode();\n    }\n\n    \/**\n     * @deprecated Virtual mode is on by default, starting with XWiki 5.0M2. Use\n     *             {@link #getVirtualWikisDatabaseNames(XWikiContext)} to get the list of wikis if needed.\n     * @return true for multi-wiki\/false for mono-wiki\n     *\/\n    @Deprecated\n    public boolean XWiki.isVirtualMode()\n    {\n        return true;\n    }\n\n    \/**\n     * @deprecated Removed since it isn't used; since 1.5M1.\n     *\/\n    @Deprecated\n    public static Map XWiki.getThreadMap()\n    {\n        return XWiki.threadMap;\n    }\n\n    \/**\n     * @deprecated Removed since it isn't used; since 1.5M1.\n     *\/\n    @Deprecated\n    public static void XWiki.setThreadMap(Map threadMap)\n    {\n        XWiki.threadMap = threadMap;\n    }\n\n    \/**\n     * @return the cache service.\n     * @deprecated replaced by {@link XWiki#getCacheFactory(XWikiContext)} or\n     *             {@link XWiki#getLocalCacheFactory(XWikiContext)} since 1.5M2.\n     *\/\n    @Deprecated\n    public XWikiCacheService XWiki.getCacheService()\n    {\n        return new XWikiCacheServiceStub(getCacheFactory(), getLocalCacheFactory());\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getVirtualWikiCache(XWikiContext)} since 1.5M2.\n     *\/\n    @Deprecated\n    public XWikiCache XWiki.getVirtualWikiMap()\n    {\n        return new XWikiCacheStub(this.virtualWikiMap);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpaceCopyright(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebCopyright(XWikiContext context)\n    {\n        return this.getSpaceCopyright(context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, String defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, String, String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, String space, String defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, space, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsLong(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public long XWiki.getWebPreferenceAsLong(String preference, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsLong(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsLong(String, long, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public long XWiki.getWebPreferenceAsLong(String preference, long defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsLong(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsInt(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.getWebPreferenceAsInt(String preference, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsInt(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsInt(String, int, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.getWebPreferenceAsInt(String preference, int defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsInt(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#copySpaceBetweenWikis(String, String, String, String, XWikiContext)} since\n     *             2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.copyWikiWeb(String space, String sourceWiki, String targetWiki, String language, XWikiContext context)\n        throws XWikiException\n    {\n        return this.copySpaceBetweenWikis(space, sourceWiki, targetWiki, language, context);\n    }\n\n    \/**\n     * @deprecated replaced by\n     *             {@link XWiki#copySpaceBetweenWikis(String, String, String, String, boolean, XWikiContext)} since\n     *             2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.copyWikiWeb(String space, String sourceWiki, String targetWiki, String language, boolean clean,\n        XWikiContext context) throws XWikiException\n    {\n        return this.copySpaceBetweenWikis(space, sourceWiki, targetWiki, language, clean, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getDefaultSpace(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getDefaultWeb(XWikiContext context)\n    {\n        return this.getDefaultSpace(context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#skipDefaultSpaceInURLs(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public boolean XWiki.useDefaultWeb(XWikiContext context)\n    {\n        return this.skipDefaultSpaceInURLs(context);\n    }\n\n    \/**\n     * @deprecated use {@link XWikiMessageTool#get(String, List)} instead. You can access message tool using\n     *             {@link XWikiContext#getMessageTool()}.\n     *\/\n    @Deprecated\n    public String XWiki.getMessage(String item, XWikiContext context)\n    {\n        XWikiMessageTool msg = context.getMessageTool();\n        if (msg == null) {\n            return item;\n        } else {\n            return msg.get(item);\n        }\n    }\n\n    \/**\n     * @deprecated Removed since it isn't used; since 3.1M2.\n     *\/\n    @Deprecated\n    public String XWiki.getHTMLArea(String content, XWikiContext context)\n    {\n        StringBuilder result = new StringBuilder();\n\n        String scontent = XMLUtils.escape(content);\n        scontent = scontent.replaceAll(\"\\r?+\\n\", \"<br class=\\\"htmlarea\\\"\/>\");\n\n        result.append(\"<textarea name=\\\"content\\\" id=\\\"content\\\" rows=\\\"25\\\" cols=\\\"80\\\">\");\n        result.append(scontent);\n        result.append(\"<\/textarea>\");\n\n        return result.toString();\n    }\n\n    @Deprecated\n    public XWikiNotificationManager XWiki.getNotificationManager()\n    {\n        if (this.notificationManager == null) {\n          this.notificationManager = new XWikiNotificationManager();\n        }\n\n        return this.notificationManager;\n    }\n\n    @Deprecated\n    public void XWiki.setNotificationManager(XWikiNotificationManager notificationManager)\n    {\n        this.notificationManager = notificationManager;\n    }\n    \n    @Deprecated\n    public String XWiki.displaySearch(String fieldname, String className, XWikiCriteria criteria, XWikiContext context)\n        throws XWikiException\n    {\n        return displaySearch(fieldname, className, \"\", criteria, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearch(String fieldname, String className, XWikiContext context) throws XWikiException\n    {\n        return displaySearch(fieldname, className, \"\", new XWikiCriteria(), context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearch(String fieldname, String className, String prefix, XWikiCriteria criteria,\n        XWikiContext context) throws XWikiException\n    {\n        BaseClass bclass = getDocument(className, context).getXClass();\n        PropertyClass pclass = (PropertyClass) bclass.get(fieldname);\n        if (criteria == null) {\n            criteria = new XWikiCriteria();\n        }\n\n        if (pclass == null) {\n            return \"\";\n        } else {\n            return pclass.displaySearch(fieldname, prefix + className + \"_\", criteria, context);\n        }\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchColumns(String className, XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        return displaySearchColumns(className, \"\", query, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchColumns(String className, String prefix, XWikiQuery query, XWikiContext context)\n        throws XWikiException\n    {\n        BaseClass bclass = getDocument(className, context).getXClass();\n\n        if (query == null) {\n            query = new XWikiQuery();\n        }\n\n        return bclass.displaySearchColumns(className + \"_\" + prefix, query, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchOrder(String className, XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        return displaySearchOrder(className, \"\", query, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchOrder(String className, String prefix, XWikiQuery query, XWikiContext context)\n        throws XWikiException\n    {\n        BaseClass bclass = getDocument(className, context).getXClass();\n\n        if (query == null) {\n            query = new XWikiQuery();\n        }\n\n        return bclass.displaySearchOrder(className + \"_\" + prefix, query, context);\n    }\n\n    @Deprecated\n    public <T> List<T> XWiki.search(XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        QueryPlugin qp = (QueryPlugin) getPlugin(\"query\", context);\n        if (qp == null) {\n            return null;\n        }\n\n        return qp.search(query);\n    }\n\n    @Deprecated\n    public XWikiQuery XWiki.createQueryFromRequest(String className, XWikiContext context) throws XWikiException\n    {\n        return new XWikiQuery(context.getRequest(), className, context);\n    }\n\n    @Deprecated\n    public String XWiki.searchAsTable(XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        QueryPlugin qp = (QueryPlugin) getPlugin(\"query\", context);\n        if (qp == null) {\n            return null;\n        }\n\n        List<String> list = qp.search(query);\n        String result = \"{table}\\r\\n\";\n        List<String> headerColumns = new ArrayList<String>();\n        List<String> displayProperties = query.getDisplayProperties();\n        for (String propname : displayProperties) {\n            PropertyClass pclass = getPropertyClassFromName(propname, context);\n            if (pclass != null) {\n                headerColumns.add(pclass.getPrettyName());\n            } else {\n                if (propname.startsWith(\"doc.\")) {\n                    propname = propname.substring(4);\n                    headerColumns.add(XWikiDocument.getInternalPropertyName(propname, context));\n                } else {\n                    headerColumns.add(propname);\n                }\n\n            }\n        }\n\n        result += StringUtils.join(headerColumns.toArray(), \" | \") + \"\\r\\n\";\n        for (String docname : list) {\n            List<String> rowColumns = new ArrayList<String>();\n            XWikiDocument doc = getDocument(docname, context);\n            for (String propname : displayProperties) {\n                PropertyClass pclass = getPropertyClassFromName(propname, context);\n                if (pclass == null) {\n                    if (propname.startsWith(\"doc.\")) {\n                        propname = propname.substring(4);\n                    }\n                    String value = doc.getInternalProperty(propname);\n                    rowColumns.add((value == null) ? \" \" : value);\n                } else {\n                    BaseObject bobj = doc.getObject(pclass.getObject().getName());\n                    rowColumns.add(doc.display(pclass.getName(), \"view\", bobj, context));\n                }\n            }\n            result += StringUtils.join(rowColumns.toArray(), \" | \") + \"\\r\\n\";\n        }\n\n        result += \"{table}\\r\\n\";\n\n        return result;\n    }\n\n    @Deprecated\n    public String XWiki.getDocLanguagePreference(XWikiContext context)\n    {\n        return getLanguagePreference(context);\n    }\n\n    @Deprecated\n    public void XWiki.flushCache()\n    {\n        Execution execution = Utils.getComponent(Execution.class);\n\n        ExecutionContext ec = execution.getContext();\n\n        flushCache(ec != null ? (XWikiContext) ec.getProperty(\"xwikicontext\") : null);\n    }\n\n    \/**\n     * @deprecated use WikiManager plugin instead\n     *\/\n    @Deprecated\n    public int XWiki.createNewWiki(String wikiName, String wikiUrl, String wikiAdmin, String baseWikiName,\n        String description, String wikilanguage, boolean failOnExist, XWikiContext context) throws XWikiException\n    {\n        String database = context.getDatabase();\n        wikiName = wikiName.toLowerCase();\n\n        try {\n            XWikiDocument userdoc = getDocument(wikiAdmin, context);\n\n            \/\/ User does not exist\n            if (userdoc.isNew()) {\n                if (LOGGER.isErrorEnabled()) {\n                    LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"user does not exist\");\n                }\n                return -2;\n            }\n\n            \/\/ User is not active\n            if (!(userdoc.getIntValue(\"XWiki.XWikiUsers\", \"active\") == 1)) {\n                if (LOGGER.isErrorEnabled()) {\n                    LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"user is not active\");\n                }\n                return -3;\n            }\n\n            String wikiForbiddenList = Param(\"xwiki.virtual.reserved_wikis\");\n            if (Util.contains(wikiName, wikiForbiddenList, \", \")) {\n                if (LOGGER.isErrorEnabled()) {\n                    LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"wiki name is forbidden\");\n                }\n                return -4;\n            }\n\n            String wikiServerPage = \"XWikiServer\" + wikiName.substring(0, 1).toUpperCase() + wikiName.substring(1);\n            \/\/ Verify is server page already exist\n            XWikiDocument serverdoc = getDocument(SYSTEM_SPACE, wikiServerPage, context);\n            if (serverdoc.isNew()) {\n                \/\/ clear entry in virtual wiki cache\n                this.virtualWikiMap.remove(wikiUrl);\n\n                \/\/ Create Wiki Server page\n                serverdoc.setStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"server\", wikiUrl);\n                serverdoc.setStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"owner\", wikiAdmin);\n                if (description != null) {\n                    serverdoc.setLargeStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"description\", description);\n                }\n                if (wikilanguage != null) {\n                    serverdoc.setStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"language\", wikilanguage);\n                }\n                if (!getDefaultDocumentSyntax().equals(Syntax.XWIKI_1_0.toIdString())) {\n                    serverdoc.setContent(\"{{include document=\\\"XWiki.XWikiServerForm\\\"\/}}\\n\");\n                    serverdoc.setSyntax(Syntax.XWIKI_2_0);\n                } else {\n                    serverdoc.setContent(\"#includeForm(\\\"XWiki.XWikiServerForm\\\")\\n\");\n                    serverdoc.setSyntax(Syntax.XWIKI_1_0);\n                }\n                serverdoc.setParentReference(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE);\n                saveDocument(serverdoc, context);\n            } else {\n                \/\/ If we are not allowed to continue if server page already exists\n                if (failOnExist) {\n                    if (LOGGER.isErrorEnabled()) {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki server page already exists\");\n                    }\n                    return -5;\n                } else if (LOGGER.isWarnEnabled()) {\n                    LOGGER.warn(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"wiki server page already exists\");\n                }\n            }\n\n            \/\/ Create wiki database\n            try {\n                context.setDatabase(getDatabase());\n                getStore().createWiki(wikiName, context);\n            } catch (XWikiException e) {\n                if (LOGGER.isErrorEnabled()) {\n                    if (e.getCode() == 10010) {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki database already exists\");\n                    } else if (e.getCode() == 10011) {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki database creation failed\");\n                    } else {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki database creation threw exception\", e);\n                    }\n                }\n            } catch (Exception e) {\n                LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                    + \"wiki database creation threw exception\", e);\n            }\n\n            try {\n                updateDatabase(wikiName, true, false, context);\n            } catch (Exception e) {\n                LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                    + \"wiki database shema update threw exception\", e);\n                return -6;\n            }\n\n            \/\/ Copy base wiki\n            int nb = copyWiki(baseWikiName, wikiName, wikilanguage, context);\n            \/\/ Save the number of docs copied in the context\n            context.put(\"nbdocs\", Integer.valueOf(nb));\n\n            \/\/ Create user page in his wiki\n            \/\/ Let's not create it anymore.. this makes the creator loose\n            \/\/ super admin rights on his wiki\n            \/\/ copyDocument(wikiAdmin, getDatabase(), wikiName, wikilanguage, context);\n\n            \/\/ Modify rights in user wiki\n            context.setDatabase(wikiName);\n            \/*\n             * XWikiDocument wikiprefdoc = getDocument(\"XWiki.XWikiPreferences\", context);\n             * wikiprefdoc.setStringValue(\"XWiki.XWikiGlobalRights\", \"users\", wikiAdmin);\n             * wikiprefdoc.setStringValue(\"XWiki.XWikiGlobalRights\", \"levels\", \"admin, edit\");\n             * wikiprefdoc.setIntValue(\"XWiki.XWikiGlobalRights\", \"allow\", 1); saveDocument(wikiprefdoc, context);\n             *\/\n            return 1;\n        } catch (Exception e) {\n            LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                + \"wiki creation threw exception\", e);\n            return -10;\n        } finally {\n            context.setDatabase(database);\n        }\n    }\n\n    \/**\n     * Get the XWiki temporary filesystem directory (cleaned up automatically by XWiki).\n     *\n     * @param context\n     * @return temporary directory\n     * @since 1.1 Milestone 4\n     * @deprecated starting with 4.2M1 use {@link org.xwiki.environment.Environment#getTemporaryDirectory()}\n     *\/\n    @Deprecated\n    public File XWiki.getTempDirectory(XWikiContext context)\n    {\n        return this.environment.getTemporaryDirectory();\n    }\n\n    \/**\n     * Get a new directory in the xwiki work directory\n     *\n     * @param subdir desired directory name\n     * @param context\n     * @return work subdirectory\n     * @since 1.1 Milestone 4\n     * @deprecated starting with 4.2M1 use {@link org.xwiki.environment.Environment#getPermanentDirectory()}\n     *\/\n    @Deprecated\n    public File XWiki.getWorkSubdirectory(String subdir, XWikiContext context)\n    {\n        File fdir = new File(this.environment.getPermanentDirectory().getAbsolutePath(), subdir);\n        if (!fdir.exists()) {\n            fdir.mkdir();\n        }\n\n        return fdir;\n    }\n\n    \/**\n     * Get the XWiki work directory\n     *\n     * @param context\n     * @return work directory\n     * @since 1.1 Milestone 4\n     * @deprecated starting with 4.2M1 use {@link org.xwiki.environment.Environment#getPermanentDirectory()}\n     *\/\n    @Deprecated\n    public File XWiki.getWorkDirectory(XWikiContext context)\n    {\n        return this.environment.getPermanentDirectory();\n    }\n\n    \/**\n     * @deprecated starting with 5.1M1 use {@code org.xwiki.url.XWikiURLFactory} instead and starting with 5.3M1 use\n     *             {@link ResourceFactory} and since 6.1M2 use {@link org.xwiki.resource.ResourceReferenceResolver}\n     *\/\n    @Deprecated\n    public XWikiDocument XWiki.getDocumentFromPath(String path, XWikiContext context) throws XWikiException\n    {\n        return getDocument(getDocumentReferenceFromPath(path, context), context);\n    }\n\n    \/**\n     * @since 2.3M1\n     * @deprecated starting with 5.1M1 use {@code org.xwiki.url.XWikiURLFactory} instead and starting with 5.3M1 use\n     *             {@link ResourceFactory} and since 6.1M2 use {@link org.xwiki.resource.ResourceReferenceResolver}\n     *\/\n    @Deprecated\n    public DocumentReference XWiki.getDocumentReferenceFromPath(String path, XWikiContext context)\n    {\n        \/\/ TODO: Remove this and use XWikiURLFactory instead in XWikiAction and all entry points.\n        List<String> segments = new ArrayList<String>();\n        for (String segment : path.split(\"\/\", -1)) {\n            segments.add(Util.decodeURI(segment, context));\n        }\n        \/\/ Remove the first segment if it's empty to cater for cases when the path starts with \"\/\"\n        if (segments.size() > 0 && segments.get(0).length() == 0) {\n            segments.remove(0);\n        }\n\n        XWikiEntityURL entityURL = buildEntityURLFromPathSegments(new WikiReference(context.getDatabase()), segments);\n\n        return new DocumentReference(entityURL.getEntityReference().extractReference(EntityType.DOCUMENT));\n    }\n\n    \/**\n     * @deprecated since 2.3M1 use {@link #getDocumentReferenceFromPath(String, XWikiContext)} instead\n     *\/\n    @Deprecated\n    public String XWiki.getDocumentNameFromPath(String path, XWikiContext context)\n    {\n        return this.localStringEntityReferenceSerializer.serialize(getDocumentReferenceFromPath(path, context));\n    }\n\n    \/**\n     * @deprecated since 2.3M1 use {@link #getDocumentReferenceFromPath(String, XWikiContext)} instead\n     *\/\n    @Deprecated\n    public String XWiki.getDocumentName(XWikiRequest request, XWikiContext context)\n    {\n        return this.localStringEntityReferenceSerializer.serialize(getDocumentReference(request, context));\n    }\n\n    \/**\n     * @deprecated starting with 5.1M1 use {@code org.xwiki.url.XWikiURLFactory} instead and starting with 5.3M1 use\n     *             {@link ResourceFactory} and since 6.1M2 use {@link org.xwiki.resource.ResourceReferenceResolver}\n     *\/\n    @Deprecated\n    private XWikiEntityURL XWiki.buildEntityURLFromPathSegments(WikiReference wikiReference, List<String> pathSegments)\n    {\n        XWikiEntityURL entityURL;\n\n        \/\/ Rules based on counting the url segments:\n        \/\/ - 0 segments (e.g. \"\"): default document reference, \"view\" action\n        \/\/ - 1 segment (e.g. \"\/\", \"\/Document\"): default space, specified document (and default if empty), \"view\" action\n        \/\/ - 2 segments (e.g. \"\/Space\/\", \"\/Space\/Document\"): specified space, document (and default doc if empty),\n        \/\/   \"view\" action\n        \/\/ - 3 segments (e.g. \"\/action\/Space\/Document\"): specified space, document (and default doc if empty),\n        \/\/   specified action\n        \/\/ - 4 segments (e.g. \"\/download\/Space\/Document\/attachment\"): specified space, document and attachment (and\n        \/\/   default doc if empty), \"download\" action\n        \/\/ - 4 segments or more (e.g. \"\/action\/Space\/Document\/whatever\/else\"): specified space, document (and default\n        \/\/     doc if empty), specified \"action\" (if action != \"download\"), trailing segments ignored\n\n        String spaceName = null;\n        String pageName = null;\n        String attachmentName = null;\n        String action = \"view\";\n\n        if (pathSegments.size() == 1) {\n            pageName = pathSegments.get(0);\n        } else if (pathSegments.size() == 2) {\n            spaceName = pathSegments.get(0);\n            pageName = pathSegments.get(1);\n        } else if (pathSegments.size() >= 3) {\n            action = pathSegments.get(0);\n            spaceName = pathSegments.get(1);\n            pageName = pathSegments.get(2);\n            if (action.equals(\"download\") && pathSegments.size() >= 4) {\n                attachmentName = pathSegments.get(3);\n            }\n        }\n\n        \/\/ Normalize the extracted space\/page to resolve empty\/null values and replace them with default values.\n        EntityReference reference = wikiReference;\n        EntityType entityType = EntityType.DOCUMENT;\n        if (!StringUtils.isEmpty(spaceName)) {\n            reference = new EntityReference(spaceName, EntityType.SPACE, reference);\n        }\n        if (!StringUtils.isEmpty(pageName)) {\n            reference = new EntityReference(pageName, EntityType.DOCUMENT, reference);\n        }\n        if (!StringUtils.isEmpty(attachmentName)) {\n            reference = new EntityReference(attachmentName, EntityType.ATTACHMENT, reference);\n            entityType = EntityType.ATTACHMENT;\n        }\n        reference = this.defaultReferenceEntityReferenceResolver.resolve(reference, entityType);\n\n        entityURL = new XWikiEntityURL(reference);\n        entityURL.setAction(action);\n\n        return entityURL;\n    }\n\n    \/**\n     * Extracts the name of the wiki from a context's request. In some cases, including autowww, the main wiki may be\n     * returned instead of what was requested, as a result of some assumptions. Even so, the resulting wiki name is not\n     * guaranteed to exist, it is just what XWiki understood from the request.\n     *\n     * @param context the context which contains the request\n     * @return the name of the wiki that was requested\n     * @throws XWikiException if problems occur\n     * @deprecated starting with 5.2M1 use  use {@link ResourceFactory} instead and since 6.1M2 use\n     *             {@link org.xwiki.resource.ResourceReferenceResolver} instead\n     *\/\n    @Deprecated\n    public String XWiki.getRequestWikiName(XWikiContext context) throws XWikiException\n    {\n        \/\/ Host is full.host.name in DNS-based multiwiki, and wikiname in path-based multiwiki.\n        String host = \"\";\n        \/\/ Canonical name of the wiki (database).\n        String wikiName = \"\";\n        \/\/ wikiDefinition should be the document holding the definition of the virtual wiki, a document in the main\n        \/\/ wiki with a XWiki.XWikiServerClass object attached to it\n        DocumentReference wikiDefinition;\n\n        XWikiRequest request = context.getRequest();\n        try {\n            URL requestURL = context.getURL();\n            host = requestURL.getHost();\n        } catch (Exception e) {\n        }\n\n        \/\/ In path-based multi-wiki, the wiki name is an element of the request path.\n        \/\/ The url is in the form \/xwiki (app name)\/wiki (servlet name)\/wikiname\/\n        if (\"1\".equals(this.Param(\"xwiki.virtual.usepath\", \"1\"))) {\n            String uri = request.getRequestURI();\n            if (LOGGER.isDebugEnabled()) {\n                LOGGER.debug(\"Request uri is: \" + uri);\n            }\n            \/\/ Remove the (eventual) context path from the URI, usually \/xwiki\n            uri = stripSegmentFromPath(uri, request.getContextPath());\n            \/\/ Remove the (eventual) servlet path from the URI, usually \/wiki\n            String servletPath = request.getServletPath();\n            uri = stripSegmentFromPath(uri, servletPath);\n\n            if (servletPath.equals(\"\/\" + this.Param(\"xwiki.virtual.usepath.servletpath\", \"wiki\"))) {\n                \/\/ Requested path corresponds to a path-based wiki, now the wiki name is between the first and\n                \/\/ second \"\/\"\n                host = StringUtils.substringBefore(StringUtils.removeStart(uri, \"\/\"), \"\/\");\n            }\n        }\n\n        if (StringUtils.isEmpty(host) || host.equals(context.getMainXWiki())) {\n            \/\/ Can't find any wiki name, return the main wiki\n            return context.getMainXWiki();\n        }\n\n        \/\/ Try to use the full domain name\/path wiki name and see if it corresponds to any existing wiki descriptors\n        wikiDefinition = this.findWikiServer(host, context);\n\n        if (wikiDefinition == null) {\n            \/\/ No definition found based on the full domain name\/path wiki name, try to use the first part of the domain\n            \/\/ name as the wiki name\n            String servername = StringUtils.substringBefore(host, \".\");\n\n            \/\/ Note: Starting 5.0M2, the autowww behavior is default and the ability to disable it is now removed.\n            if (\"0\".equals(this.Param(\"xwiki.virtual.autowww\"))) {\n                LOGGER.warn(String.format(\"%s %s\", \"'xwiki.virtual.autowww' is no longer supported.\",\n                    \"Please update your configuration and\/or see XWIKI-8877 for more details.\"));\n            }\n\n            \/\/ As a convenience, we do not require the creation of an xwiki:XWiki.XWikiServerXwiki page for the main\n            \/\/ wiki and automatically go to the main wiki in certain cases:\n            \/\/ - \"www.<anyDomain>.<domainExtension>\" - if it starts with www, we first check if a subwiki with that\n            \/\/ name exists; if yes, the go to the \"www\" subwiki, if not, go to the main wiki\n            \/\/ - \"localhost\"\n            \/\/ - IP address\n            if (\"www\".equals(servername)) {\n                \/\/ Check that \"www\" is not actually the name of an existing subwiki.\n                wikiDefinition = this.findWikiServer(servername, context);\n                if (wikiDefinition == null) {\n                    \/\/ Not the case, use the main wiki.\n                    return context.getMainXWiki();\n                }\n            } else if (\"localhost\".equals(host) || host.matches(\"[0-9]{1,3}(?:\\\\.[0-9]{1,3}){3}\")) {\n                \/\/ Direct access to the main wiki.\n                return context.getMainXWiki();\n            }\n\n            \/\/ Use the name from the subdomain\n            wikiName = servername;\n\n            if (!context.isMainWiki(wikiName)\n                && !\"1\".equals(context.getWiki().Param(\"xwiki.virtual.failOnWikiDoesNotExist\", \"0\"))) {\n                \/\/ Check if the wiki really exists\n                if (!exists(getServerWikiPage(wikiName), context)) {\n                    \/\/ Fallback on main wiki\n                    wikiName = context.getMainXWiki();\n                }\n            }\n        } else {\n            \/\/ Use the name from the located wiki descriptor\n            wikiName = StringUtils.removeStart(wikiDefinition.getName(), \"XWikiServer\").toLowerCase();\n        }\n\n        return wikiName;\n    }\n\n    \/**\n     * Searches for the document containing the definition of the virtual wiki corresponding to the specified hostname.\n     *\n     * @param host the hostname, as specified in the request (for example: {@code forge.xwiki.org})\n     * @param context the current context\n     * @return the name of the document containing the wiki definition, or {@code null} if no wiki corresponds to the\n     *         hostname\n     * @throws XWikiException if a problem occurs while searching the storage\n     *\/\n    private DocumentReference XWiki.findWikiServer(String host, XWikiContext context) throws XWikiException\n    {\n        ensureVirtualWikiMapExists();\n        DocumentReference wikiName = this.virtualWikiMap.get(host);\n\n        if (wikiName == null) {\n            \/\/ Not loaded yet, search for it in the main wiki\n            String hql =\n                \", BaseObject as obj, StringProperty as prop WHERE obj.name=doc.fullName\"\n                    + \" AND doc.space='XWiki' AND doc.name LIKE 'XWikiServer%'\"\n                    + \" AND obj.className='XWiki.XWikiServerClass' AND prop.id.id = obj.id\"\n                    + \" AND prop.id.name = 'server' AND prop.value=?\";\n            List<String> parameters = new ArrayList<String>(1);\n            parameters.add(host);\n            try {\n                List<DocumentReference> list =\n                    context.getWiki().getStore().searchDocumentReferences(hql, parameters, context);\n                if ((list != null) && (list.size() > 0)) {\n                    wikiName = list.get(0);\n                }\n\n                this.virtualWikiMap.set(host, wikiName);\n            } catch (XWikiException e) {\n                LOGGER.warn(\"Error when searching for wiki name from URL host [\" + host + \"]\", e);\n            }\n        }\n\n        return wikiName;\n    }\n\n    private void XWiki.ensureVirtualWikiMapExists() throws XWikiException\n    {\n        synchronized (this) {\n            if (this.virtualWikiMap == null) {\n                int iCapacity = 1000;\n                try {\n                    String capacity = Param(\"xwiki.virtual.cache.capacity\");\n                    if (capacity != null) {\n                        iCapacity = Integer.parseInt(capacity);\n                    }\n                } catch (Exception e) {\n                }\n                try {\n                    CacheConfiguration configuration = new CacheConfiguration();\n                    configuration.setConfigurationId(\"xwiki.virtualwikimap\");\n                    LRUEvictionConfiguration lru = new LRUEvictionConfiguration();\n                    lru.setMaxEntries(iCapacity);\n                    configuration.put(LRUEvictionConfiguration.CONFIGURATIONID, lru);\n\n                    this.virtualWikiMap = getCacheFactory().newCache(configuration);\n                } catch (CacheException e) {\n                    throw new XWikiException(XWikiException.MODULE_XWIKI_CACHE,\n                        XWikiException.ERROR_CACHE_INITIALIZING, \"Failed to create new cache\", e);\n                }\n            }\n        }\n    }\n\n    \/**\n     * @deprecated replaced by {@link #setUserDefaultGroup(String fullwikiname, XWikiContext context)}\n     * @param context\n     * @param fullwikiname\n     * @throws XWikiException\n     *\/\n    @Deprecated\n    public void XWiki.SetUserDefaultGroup(XWikiContext context, String fullwikiname) throws XWikiException\n    {\n        this.setUserDefaultGroup(fullwikiname, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link #protectUserPage(String,String,XWikiDocument,XWikiContext)}\n     * @param context\n     * @param fullwikiname\n     * @param userRights\n     * @param doc\n     * @throws XWikiException\n     *\/\n    @Deprecated\n    public void XWiki.ProtectUserPage(XWikiContext context, String fullwikiname, String userRights, XWikiDocument doc)\n        throws XWikiException\n    {\n        this.protectUserPage(fullwikiname, userRights, doc, context);\n    }\n\n    \/**\n     * @return the cache factory.\n     * @since 1.5M2.\n     * @deprecated Since 1.7M1, use {@link CacheManager} component instead using {@link Utils#getComponent(Class)}\n     *\/\n    @Deprecated\n    public CacheFactory XWiki.getCacheFactory()\n    {\n        CacheFactory cacheFactory;\n\n        String cacheHint = Param(\"xwiki.cache.cachefactory.hint\", null);\n\n        if (StringUtils.isEmpty(cacheHint) || Utils.getComponent(CacheFactory.class, cacheHint) == null) {\n            CacheManager cacheManager = Utils.getComponent(CacheManager.class);\n            try {\n                cacheFactory = cacheManager.getCacheFactory();\n            } catch (ComponentLookupException e) {\n                throw new RuntimeException(\"Failed to get cache factory component\", e);\n            }\n        } else {\n            cacheFactory = Utils.getComponent(CacheFactory.class, cacheHint);\n        }\n\n        return cacheFactory;\n    }\n\n    \/**\n     * @return the cache factory creating local caches.\n     * @since 1.5M2.\n     * @deprecated Since 1.7M1, use {@link CacheManager} component instead using {@link Utils#getComponent(Class)}\n     *\/\n    @Deprecated\n    public CacheFactory XWiki.getLocalCacheFactory()\n    {\n        CacheFactory localCacheFactory;\n\n        String localCacheHint = Param(\"xwiki.cache.cachefactory.local.hint\", null);\n\n        if (StringUtils.isEmpty(localCacheHint) || Utils.getComponent(CacheFactory.class, localCacheHint) == null) {\n            CacheManager cacheManager = Utils.getComponent(CacheManager.class);\n            try {\n                localCacheFactory = cacheManager.getLocalCacheFactory();\n            } catch (ComponentLookupException e) {\n                throw new RuntimeException(\"Failed to get local cache factory component\", e);\n            }\n        } else {\n            localCacheFactory = Utils.getComponent(CacheFactory.class, localCacheHint);\n        }\n\n        return localCacheFactory;\n    }\n\n    \/**\n     * @deprecated since 2.3M1 use {@link #hasVersioning(XWikiContext)} instead\n     *\/\n    @Deprecated\n    public boolean XWiki.hasVersioning(String fullName, XWikiContext context)\n    {\n        return hasVersioning(context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link #include(String topic, boolean isForm, XWikiContext context)}\n     * @param topic\n     * @param context\n     * @param isForm\n     * @return\n     * @throws XWikiException\n     *\/\n    @Deprecated\n    public String XWiki.include(String topic, XWikiContext context, boolean isForm) throws XWikiException\n    {\n        return include(topic, isForm, context);\n    }\n    \n    \/**\n     * Checks if the wiki is running in test mode.\n     * \n     * @return {@code true} if the wiki is running Cactus tests, {@code false} otherwise\n     * @deprecated No longer used.\n     *\/\n    @Deprecated\n    public boolean XWiki.isTest()\n    {\n        return this.test;\n    }\n\n    \/**\n     * Marks that the wiki is running in test mode.\n     * \n     * @param test whether tests are being executed\n     * @deprecated No longer used.\n     *\/\n    @Deprecated\n    public void XWiki.setTest(boolean test)\n    {\n        this.test = test;\n    }\n\n    \/**\n     * @deprecated use {@link org.xwiki.localization.LocalizationManager} instead. From velocity you can access it using\n     *             the {@code $services.localization} binding, see {@code LocalizationScriptService}\n     *\/\n    @Deprecated\n    public String XWiki.parseMessage(XWikiContext context)\n    {\n        String message = (String) context.get(\"message\");\n        if (message == null) {\n            return null;\n        }\n\n        return parseMessage(message, context);\n    }\n\n    \/**\n     * @deprecated use {@link org.xwiki.localization.LocalizationManager} instead. From velocity you can access it using\n     *             the {@code $services.localization} binding, see {@code LocalizationScriptService}\n     *\/\n    @Deprecated\n    public String XWiki.parseMessage(String id, XWikiContext context)\n    {\n        XWikiMessageTool msg = context.getMessageTool();\n\n        List<?> parameters = (List<?>) context.get(\"messageParameters\");\n\n        String translatedMessage;\n        if (parameters != null) {\n            translatedMessage = msg.get(id, parameters);\n        } else {\n            translatedMessage = msg.get(id);\n        }\n\n        return parseContent(translatedMessage, context);\n    }\n\n    \/**\n     * @deprecated starting with 6.1M2 this method shouldn't be used. There's no replacement, it's just not the right\n     *             way to do this anymore and the flash.vm template doesn't exist anymore\n     *\/\n    @Deprecated\n    public String XWiki.getFlash(String url, String width, String height, XWikiContext context)\n    {\n        VelocityContext vorigcontext = ((VelocityContext) context.get(\"vcontext\"));\n        try {\n            VelocityContext vcontext = (VelocityContext) vorigcontext.clone();\n            vcontext.put(\"flashurl\", url);\n            vcontext.put(\"width\", width);\n            vcontext.put(\"height\", height);\n            context.put(\"vcontext\", vcontext);\n\n            return parseTemplate(\"flash.vm\", context);\n        } finally {\n            context.put(\"vcontext\", vorigcontext);\n        }\n    }\n\n    \/**\n     * @deprecated replaced by the <a href=\"http:\/\/code.xwiki.org\/xwiki\/bin\/view\/Plugins\/MailSenderPlugin\">Mail Sender\n     *             Plugin<\/a>\n     *\/\n    @Deprecated\n    public void XWiki.sendMessage(String sender, String[] recipients, String rawMessage, XWikiContext context)\n        throws XWikiException\n    {\n        LOGGER.trace(\"Entering sendMessage()\");\n\n        \/\/ We'll be using the MailSender plugin, which has much more advanced capabilities (authentication, TLS).\n        \/\/ Since the plugin is in another module, and it depends on the core, we have to use it through reflection in\n        \/\/ order to avoid cyclic dependencies. This should be fixed once the mailsender becomes a clean component\n        \/\/ instead of a plugin.\n        Object mailSender;\n        Class mailSenderClass;\n        Method mailSenderSendRaw;\n\n        try {\n            mailSender = getPluginApi(\"mailsender\", context);\n            mailSenderClass = Class.forName(\"com.xpn.xwiki.plugin.mailsender.MailSenderPluginApi\");\n\n            \/\/ public int sendRawMessage(String from, String to, String rawMessage)\n            mailSenderSendRaw =\n                mailSenderClass.getMethod(\"sendRawMessage\", new Class[] {String.class, String.class, String.class});\n        } catch (Exception e) {\n            LOGGER.error(\"Problem getting MailSender via Reflection. Using the old sendMessage mechanism.\", e);\n            sendMessageOld(sender, recipients, rawMessage, context);\n            return;\n        }\n\n        if (LOGGER.isTraceEnabled()) {\n            LOGGER.trace(\"Sending message = \\\"\" + rawMessage + \"\\\"\");\n        }\n\n        String messageRecipients = StringUtils.join(recipients, ',');\n\n        try {\n            mailSenderSendRaw.invoke(mailSender, sender, messageRecipients, rawMessage);\n        } catch (InvocationTargetException ite) {\n            Throwable cause = ite.getCause();\n            if (cause instanceof XWikiException) {\n                throw (XWikiException) cause;\n            } else {\n                throw new RuntimeException(cause);\n            }\n        } catch (Exception e) {\n            \/\/ Probably either IllegalAccessException or IllegalArgumentException\n            \/\/ Shouldn't happen unless there were an incompatible code change\n            throw new RuntimeException(e);\n        }\n\n        LOGGER.info(\"Exiting sendMessage(). It seems everything went ok.\");\n    }\n\n    \/**\n     * @deprecated replaced by the <a href=\"http:\/\/code.xwiki.org\/xwiki\/bin\/view\/Plugins\/MailSenderPlugin\">Mail Sender\n     *             Plugin<\/a>\n     *\/\n    @Deprecated\n    private void XWiki.sendMessageOld(String sender, String[] recipient, String message, XWikiContext context)\n        throws XWikiException\n    {\n        SMTPClient smtpc = null;\n        try {\n            String server = getXWikiPreference(\"smtp_server\", context);\n            String port = getXWikiPreference(\"smtp_port\", context);\n            String login = getXWikiPreference(\"smtp_login\", context);\n\n            if (context.get(\"debugMail\") != null) {\n                StringBuffer msg = new StringBuffer(message);\n                msg.append(\"\\n Recipient: \");\n                msg.append(recipient);\n                recipient = ((String) context.get(\"debugMail\")).split(\",\");\n                message = msg.toString();\n            }\n\n            if ((server == null) || server.equals(\"\")) {\n                server = \"127.0.0.1\";\n            }\n            if ((port == null) || (port.equals(\"\"))) {\n                port = \"25\";\n            }\n            if ((login == null) || login.equals(\"\")) {\n                login = InetAddress.getLocalHost().getHostName();\n            }\n\n            smtpc = new SMTPClient();\n            smtpc.connect(server, Integer.parseInt(port));\n            int reply = smtpc.getReplyCode();\n            if (!SMTPReply.isPositiveCompletion(reply)) {\n                Object[] args = {server, port, Integer.valueOf(reply), smtpc.getReplyString()};\n                throw new XWikiException(XWikiException.MODULE_XWIKI_EMAIL,\n                    XWikiException.ERROR_XWIKI_EMAIL_CONNECT_FAILED,\n                    \"Could not connect to server {0} port {1} error code {2} ({3})\", null, args);\n            }\n\n            if (smtpc.login(login) == false) {\n                reply = smtpc.getReplyCode();\n                Object[] args = {server, port, Integer.valueOf(reply), smtpc.getReplyString()};\n                throw new XWikiException(XWikiException.MODULE_XWIKI_EMAIL,\n                    XWikiException.ERROR_XWIKI_EMAIL_LOGIN_FAILED,\n                    \"Could not login to mail server {0} port {1} error code {2} ({3})\", null, args);\n            }\n\n            if (smtpc.sendSimpleMessage(sender, recipient, message) == false) {\n                reply = smtpc.getReplyCode();\n                Object[] args = {server, port, Integer.valueOf(reply), smtpc.getReplyString()};\n                throw new XWikiException(XWikiException.MODULE_XWIKI_EMAIL,\n                    XWikiException.ERROR_XWIKI_EMAIL_SEND_FAILED,\n                    \"Could not send mail to server {0} port {1} error code {2} ({3})\", null, args);\n            }\n\n        } catch (IOException e) {\n            Object[] args = {sender, recipient};\n            throw new XWikiException(XWikiException.MODULE_XWIKI_EMAIL,\n                XWikiException.ERROR_XWIKI_EMAIL_ERROR_SENDING_EMAIL, \"Exception while sending email from {0} to {1}\",\n                e, args);\n        } finally {\n            if ((smtpc != null) && (smtpc.isConnected())) {\n                try {\n                    smtpc.disconnect();\n                } catch (IOException e) {\n                    e.printStackTrace();\n                }\n            }\n        }\n    }\n\n    \/**\n     * @deprecated replaced by the <a href=\"http:\/\/code.xwiki.org\/xwiki\/bin\/view\/Plugins\/MailSenderPlugin\">Mail Sender\n     *             Plugin<\/a>\n     *\/\n    @Deprecated\n    public void XWiki.sendMessage(String sender, String recipient, String message, XWikiContext context)\n        throws XWikiException\n    {\n        String[] recip = recipient.split(\",\");\n        sendMessage(sender, recip, message, context);\n    }\n}\n","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"3a62aa053e6bff3d96d4c1b8640a29f06e0517c5","subject":"fixed pointcut for type-level annotation to only apply to public methods (SPR-8890)","message":"fixed pointcut for type-level annotation to only apply to public methods (SPR-8890)\n","repos":"spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework","old_file":"org.springframework.aspects\/src\/main\/java\/org\/springframework\/transaction\/aspectj\/AnnotationTransactionAspect.aj","new_file":"org.springframework.aspects\/src\/main\/java\/org\/springframework\/transaction\/aspectj\/AnnotationTransactionAspect.aj","new_contents":"\/*\r\n * Copyright 2002-2010 the original author or authors.\r\n *\r\n * Licensed under the Apache License, Version 2.0 (the \"License\");\r\n * you may not use this file except in compliance with the License.\r\n * You may obtain a copy of the License at\r\n *\r\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\r\n *\r\n * Unless required by applicable law or agreed to in writing, software\r\n * distributed under the License is distributed on an \"AS IS\" BASIS,\r\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n * See the License for the specific language governing permissions and\r\n * limitations under the License.\r\n *\/\r\n\r\npackage org.springframework.transaction.aspectj;\r\n\r\nimport org.springframework.transaction.annotation.AnnotationTransactionAttributeSource;\r\nimport org.springframework.transaction.annotation.Transactional;\r\n\r\n\/**\r\n * Concrete AspectJ transaction aspect using Spring's @Transactional annotation.\r\n * \r\n * <p>When using this aspect, you <i>must<\/i> annotate the implementation class\r\n * (and\/or methods within that class), <i>not<\/i> the interface (if any) that\r\n * the class implements. AspectJ follows Java's rule that annotations on \r\n * interfaces are <i>not<\/i> inherited.\r\n *\r\n * <p>An @Transactional annotation on a class specifies the default transaction\r\n * semantics for the execution of any <b>public<\/b> operation in the class.\r\n *\r\n * <p>An @Transactional annotation on a method within the class overrides the\r\n * default transaction semantics given by the class annotation (if present). \r\n * Any method may be annotated (regardless of visibility).\r\n * Annotating non-public methods directly is the only way\r\n * to get transaction demarcation for the execution of such operations.\r\n *\r\n * @author Rod Johnson\r\n * @author Ramnivas Laddad\r\n * @author Adrian Colyer\r\n * @since 2.0\r\n * @see org.springframework.transaction.annotation.Transactional\r\n *\/\r\npublic aspect AnnotationTransactionAspect extends AbstractTransactionAspect {\r\n\r\n\tpublic AnnotationTransactionAspect() {\r\n\t\tsuper(new AnnotationTransactionAttributeSource(false));\r\n\t}\r\n\r\n\t\/**\r\n\t * Matches the execution of any public method in a type with the\r\n\t * Transactional annotation, or any subtype of a type with the\r\n\t * Transactional annotation.\r\n\t *\/\r\n\tprivate pointcut executionOfAnyPublicMethodInAtTransactionalType() :\r\n\t\texecution(public * ((@Transactional *)+).*(..)) && within(@Transactional);\r\n\r\n\t\/**\r\n\t * Matches the execution of any method with the \r\n\t * Transactional annotation.\r\n\t *\/\r\n\tprivate pointcut executionOfTransactionalMethod() :\r\n\t\texecution(@Transactional * *(..));\r\n\r\n\t\/**\r\n\t * Definition of pointcut from super aspect - matched join points\r\n\t * will have Spring transaction management applied.\r\n\t *\/\t\r\n\tprotected pointcut transactionalMethodExecution(Object txObject) :\r\n\t\t(executionOfAnyPublicMethodInAtTransactionalType()\r\n\t\t || executionOfTransactionalMethod() )\r\n\t\t && this(txObject);\r\n\r\n}\r\n","old_contents":"\/*\r\n * Copyright 2002-2010 the original author or authors.\r\n *\r\n * Licensed under the Apache License, Version 2.0 (the \"License\");\r\n * you may not use this file except in compliance with the License.\r\n * You may obtain a copy of the License at\r\n *\r\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\r\n *\r\n * Unless required by applicable law or agreed to in writing, software\r\n * distributed under the License is distributed on an \"AS IS\" BASIS,\r\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n * See the License for the specific language governing permissions and\r\n * limitations under the License.\r\n *\/\r\n\r\npackage org.springframework.transaction.aspectj;\r\n\r\nimport org.springframework.transaction.annotation.AnnotationTransactionAttributeSource;\r\nimport org.springframework.transaction.annotation.Transactional;\r\n\r\n\/**\r\n * Concrete AspectJ transaction aspect using Spring's @Transactional annotation.\r\n * \r\n * <p>When using this aspect, you <i>must<\/i> annotate the implementation class\r\n * (and\/or methods within that class), <i>not<\/i> the interface (if any) that\r\n * the class implements. AspectJ follows Java's rule that annotations on \r\n * interfaces are <i>not<\/i> inherited.\r\n *\r\n * <p>An @Transactional annotation on a class specifies the default transaction\r\n * semantics for the execution of any <b>public<\/b> operation in the class.\r\n *\r\n * <p>An @Transactional annotation on a method within the class overrides the\r\n * default transaction semantics given by the class annotation (if present). \r\n * Any method may be annotated (regardless of visibility).\r\n * Annotating non-public methods directly is the only way\r\n * to get transaction demarcation for the execution of such operations.\r\n *\r\n * @author Rod Johnson\r\n * @author Ramnivas Laddad\r\n * @author Adrian Colyer\r\n * @since 2.0\r\n * @see org.springframework.transaction.annotation.Transactional\r\n *\/\r\npublic aspect AnnotationTransactionAspect extends AbstractTransactionAspect {\r\n\r\n\tpublic AnnotationTransactionAspect() {\r\n\t\tsuper(new AnnotationTransactionAttributeSource(false));\r\n\t}\r\n\r\n\t\/**\r\n\t * Matches the execution of any public method in a type with the\r\n\t * Transactional annotation, or any subtype of a type with the\r\n\t * Transactional annotation.\r\n\t *\/\r\n\tprivate pointcut executionOfAnyPublicMethodInAtTransactionalType() :\r\n\t\texecution(* *(..)) && within(@Transactional *);\r\n\r\n\t\/**\r\n\t * Matches the execution of any method with the \r\n\t * Transactional annotation.\r\n\t *\/\r\n\tprivate pointcut executionOfTransactionalMethod() :\r\n\t\texecution(@Transactional * *(..));\r\n\r\n\t\/**\r\n\t * Definition of pointcut from super aspect - matched join points\r\n\t * will have Spring transaction management applied.\r\n\t *\/\t\r\n\tprotected pointcut transactionalMethodExecution(Object txObject) :\r\n\t\t(executionOfAnyPublicMethodInAtTransactionalType()\r\n\t\t || executionOfTransactionalMethod() )\r\n\t\t && this(txObject);\r\n\r\n}\r\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"eb4b915cbba7c41f7b98e6b61b6321d6dc9bc617","subject":"txtUML multiproject: small fix in export.uml2.","message":"txtUML multiproject: small fix in export.uml2.\n","repos":"ELTE-Soft\/txtUML,ELTE-Soft\/txtUML,ELTE-Soft\/txtUML,ELTE-Soft\/txtUML","old_file":"hu.elte.txtuml.export.uml2\/src\/hu\/elte\/txtuml\/export\/uml2\/transform\/aspects\/ImporterSupportingAspect.aj","new_file":"hu.elte.txtuml.export.uml2\/src\/hu\/elte\/txtuml\/export\/uml2\/transform\/aspects\/ImporterSupportingAspect.aj","new_contents":"package hu.elte.txtuml.export.uml2.transform.aspects;\r\n\r\nimport hu.elte.txtuml.api.ModelElement;\r\nimport hu.elte.txtuml.api.Action;\r\nimport hu.elte.txtuml.api.Collection;\r\nimport hu.elte.txtuml.export.uml2.utils.ImportWarningProvider;\r\n\r\nimport java.lang.reflect.Field;\r\nimport java.lang.reflect.Method;\r\nimport java.util.LinkedList;\r\n\r\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\r\n\r\n\/**\r\n * This aspect contains advices supporting model import.\r\n * @author Adam Ancsin\r\n *\r\n *\/\r\npublic privileged aspect ImporterSupportingAspect extends AbstractImporterAspect {\r\n\t\r\n\t\/**\r\n\t * This advice shows an error message when a non-txtUML method is called from a method body\r\n\t * during model import.\r\n\t * \r\n\t * @author Adam Ancsin\r\n\t *\/\r\n\t@SuppressAjWarnings\r\n\tObject around() : \r\n\t\tcall(* (!ModelElement+).*(..)) && \r\n\t\t!call(* (java.lang..*).*(..)) &&\r\n\t\t!call(* (Collection+).*(..)) \r\n\t\t&& isActive()\r\n\t{\r\n\t\tImportWarningProvider.createWarning(\r\n\t\t\t\t\"non-txtUML method call - \" +\r\n\t\t\t\tthisJoinPoint.getSignature().getDeclaringType().getName() + \r\n\t\t\t\t\".\" + \r\n\t\t\t\tthisJoinPoint.getSignature().getName()\r\n\t\t\t);\r\n\t\treturn proceed();\r\n\t}\r\n\t\r\n\r\n\t\/**\r\n\t * This advice hides all the synthetic methods from the result of Class.getDeclaredMethods() calls.\r\n\t * It is needed to hide the private methods generated by AspectJ.\r\n\t * \r\n\t * @author Adam Ancsin\r\n\t *\/\r\n\t@SuppressAjWarnings\r\n\tMethod[] around(Object c) : target(c) && call(Method[] Class.getDeclaredMethods()) && withinExportUML2() {\r\n\t\tLinkedList<Method> methods = new LinkedList<>();\r\n\t\tfor(Method m : proceed(c)) {\r\n\t\t\tif (!m.isSynthetic()) {\r\n\t\t\t\tmethods.add(m);\r\n\t\t\t}\r\n\t\t}\r\n\t\treturn methods.toArray(new Method[0]);\r\n\t}\r\n\t\r\n\t\/**\r\n\t * This advice hides all the synthetic fields from the result of Class.getDeclaredFields() calls.\r\n\t * It is needed to hide the fields generated by the Java compiler. (e.g. this$0)\r\n\t * \r\n\t * @author Adam Ancsin\r\n\t *\/\r\n\t@SuppressAjWarnings\r\n\tField[] around(Object c) : target(c) && call(Field[] Class.getDeclaredFields()) && withinExportUML2() {\r\n\t\tLinkedList<Field> fields = new LinkedList<>();\r\n\t\tfor(Field f : proceed(c)) {\r\n\t\t\tif (!f.isSynthetic()) {\r\n\t\t\t\tfields.add(f);\r\n\t\t\t}\r\n\t\t}\r\n\t\treturn fields.toArray(new Field[0]);\r\n\t}\r\n\t\r\n\t\/**\r\n\t * This advice prevents execution of Action.start if called from outside the model (e.g. from glue code)\r\n\t * during model import, so none of the ModelClass instances start functioning. \r\n\t *\r\n\t * @author Adam Ancsin\r\n\t *\/\r\n\t@SuppressAjWarnings\r\n\tvoid around(): call(void Action.start(..)) && importing() && !withinModel()\r\n\t{\r\n\t\t\/\/do nothing\r\n\t}\r\n\t\r\n\t\/**\r\n\t * This advice prevents logging in models during model import.\r\n\t * \r\n\t * @author Adam Ancsin\r\n\t *\/\r\n\t@SuppressAjWarnings\r\n\tvoid around(): \r\n\t\t(\r\n\t\t\tcall(void Action.log(..)) || \r\n\t\t\tcall(void Action.logError(..)) ||\r\n\t\t\tcall(void ModelExecutor.executorLog(..)) ||\r\n\t\t\tcall(void ModelExecutor.executorErrorLog(..))\r\n\t\t)\r\n\t\t&& isActive()\r\n\t{\r\n\t\t\/\/do nothing\r\n\t}\r\n}","old_contents":"package hu.elte.txtuml.export.uml2.transform.aspects;\r\n\r\nimport hu.elte.txtuml.api.ModelElement;\r\nimport hu.elte.txtuml.api.Action;\r\nimport hu.elte.txtuml.api.Collection;\r\nimport hu.elte.txtuml.export.uml2.utils.ImportWarningProvider;\r\n\r\nimport java.lang.reflect.Field;\r\nimport java.lang.reflect.Method;\r\nimport java.util.LinkedList;\r\n\r\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\r\n\r\n\/**\r\n * This aspect contains advices supporting model import.\r\n * @author Adam Ancsin\r\n *\r\n *\/\r\npublic privileged aspect ImporterSupportingAspect extends AbstractImporterAspect {\r\n\t\r\n\t\/**\r\n\t * This advice shows an error message when a non-txtUML method is called from a method body\r\n\t * during model import.\r\n\t * \r\n\t * @author Adam Ancsin\r\n\t *\/\r\n\t@SuppressAjWarnings\r\n\tObject around() : \r\n\t\tcall(* (!ModelElement+).*(..)) && \r\n\t\t!call(* (java.lang..*).*(..)) &&\r\n\t\t!call(* (Collection+).*(..)) \r\n\t\t&& isActive()\r\n\t{\r\n\t\tImportWarningProvider.createWarning(\r\n\t\t\t\t\"non-txtUML method call - \" +\r\n\t\t\t\tthisJoinPoint.getSignature().getDeclaringType().getName() + \r\n\t\t\t\t\".\" + \r\n\t\t\t\tthisJoinPoint.getSignature().getName()\r\n\t\t\t);\r\n\t\treturn proceed();\r\n\t}\r\n\t\r\n\r\n\t\/**\r\n\t * This advice hides all the synthetic methods from the result of Class.getDeclaredMethods() calls.\r\n\t * It is needed to hide the private methods generated by AspectJ.\r\n\t * \r\n\t * @author Adam Ancsin\r\n\t *\/\r\n\t@SuppressAjWarnings\r\n\tMethod[] around(Object c) : target(c) && call(Method[] Class.getDeclaredMethods()) && withinExportUML2() {\r\n\t\tLinkedList<Method> methods = new LinkedList<>();\r\n\t\tfor(Method m : proceed(c)) {\r\n\t\t\tif (!m.isSynthetic()) {\r\n\t\t\t\tmethods.add(m);\r\n\t\t\t}\r\n\t\t}\r\n\t\treturn methods.toArray(new Method[0]);\r\n\t}\r\n\t\r\n\t\/**\r\n\t * This advice hides all the synthetic fields from the result of Class.getDeclaredFields() calls.\r\n\t * It is needed to hide the fields generated by the Java compiler. (e.g. this$0)\r\n\t * \r\n\t * @author Adam Ancsin\r\n\t *\/\r\n\t@SuppressAjWarnings\r\n\tField[] around(Object c) : target(c) && call(Field[] Class.getDeclaredFields()) && withinExportUML2() {\r\n\t\tLinkedList<Field> fields = new LinkedList<>();\r\n\t\tfor(Field f : proceed(c)) {\r\n\t\t\tif (!f.isSynthetic()) {\r\n\t\t\t\tfields.add(f);\r\n\t\t\t}\r\n\t\t}\r\n\t\treturn fields.toArray(new Field[0]);\r\n\t}\r\n\t\r\n\t\/**\r\n\t * This advice prevents execution of Action.start if called from outside the model (e.g. from glue code)\r\n\t * during model import, so none of the ModelClass instances start functioning. \r\n\t *\r\n\t * @author Adam Ancsin\r\n\t *\/\r\n\t@SuppressAjWarnings\r\n\tvoid around(): call(void Action.start(..)) && importing() && !withinModel()\r\n\t{\r\n\t\t\/\/do nothing\r\n\t}\r\n\t\r\n\t\/**\r\n\t * This advice prevents logging in models during model import.\r\n\t * \r\n\t * @author Adam Ancsin\r\n\t *\/\r\n\t@SuppressAjWarnings\r\n\tvoid around(): \r\n\t\t(\r\n\t\t\tcall(void Action.log(..)) || \r\n\t\t\tcall(void Action.logError(..)) ||\r\n\t\t\tcall(void Action.executorLog(..)) ||\r\n\t\t\tcall(void Action.executorFormattedLog(..)) ||\r\n\t\t\tcall(void Action.executorErrorLog(..))\r\n\t\t)\r\n\t\t&& isActive()\r\n\t{\r\n\t\t\/\/do nothing\r\n\t}\r\n}","returncode":0,"stderr":"","license":"epl-1.0","lang":"AspectJ"}
{"commit":"74e2f9e35c8beb046292a377c8b7cf13469e4342","subject":"don't add collections if the journaller thread didn't start","message":"don't add collections if the journaller thread didn't start\n","repos":"mebigfatguy\/hashshmash","old_file":"aj\/com\/mebigfatguy\/hashshmash\/HashCollector.aj","new_file":"aj\/com\/mebigfatguy\/hashshmash\/HashCollector.aj","new_contents":"package com.mebigfatguy.hashshmash;\n\nimport java.io.BufferedWriter;\nimport java.io.File;\nimport java.io.FileOutputStream;\nimport java.io.OutputStreamWriter;\nimport java.io.PrintWriter;\nimport java.lang.reflect.Field;\nimport java.text.SimpleDateFormat;\nimport java.util.Date;\nimport java.util.HashMap;\nimport java.util.HashSet;\nimport java.util.Map;\nimport java.util.Map.Entry;\nimport java.util.Set;\nimport java.util.concurrent.ConcurrentHashMap;\n\npublic aspect HashCollector {\n    \n    private static final Journaller journaller = new Journaller();\n\n    after() returning (Map m): call(HashMap.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashMapDetails details = new HashMapDetails(m, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    after() returning (Set s): call(HashSet.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashSetDetails details = new HashSetDetails(s, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    before(): execution(public static void *.main(String[])) {\n        Class<?> c = HashCollector.class;\n    }\n}\n\nfinal class Journaller implements Runnable {\n    \n    private static final int SLEEP_TIME = 5 * 1000;\n    \n    private Field tableField;\n    private ConcurrentHashMap<HashDetails, HashDetails> hDetails = new ConcurrentHashMap<HashDetails, HashDetails>();\n    private PrintWriter writer;\n    private boolean operational = false;\n\n    public Journaller() {\n        try {\n            System.out.println(\"*************************\");\n            System.out.println(\"HASHSHMASH ASPECT ENABLED\");\n            System.out.println(\"*************************\");\n            \n            tableField = HashMap.class.getDeclaredField(\"table\");\n            tableField.setAccessible(true);\n              \n            File dir = new File(System.getProperty(\"user.home\"), \".hashshmash\");\n            dir.mkdirs();  \n            \n            writer = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(new File(dir, new Date().toString() + \".txt\")))));\n            \n            Thread t = new Thread(this);\n            t.setDaemon(true);\n            t.start();\n        } catch (Exception e) {\n            operational = true;\n        }\n    }\n    \n    public void add(HashDetails details) {\n        if (operational)\n            hDetails.put(details,  details);\n    }\n    \n    public void run() {\n        try {\n            while (!Thread.interrupted()) {\n                Thread.sleep(SLEEP_TIME);\n                \n                for (HashDetails details : hDetails.keySet()) {\n                    try {\n                        Map<?, ?> map = details.getMap();\n                        if (map != null) {\n                            int newSize = details.getMap().size();\n                            if (newSize == details.size) {\n                                Entry<?, ?>[] table = (Entry<?, ?>[])tableField.get(map);\n                                details.totalSlots = table.length;\n                                for (Entry<?, ?> e : table) {\n                                    if (e != null) {\n                                        details.usedSlots++;\n                                    }\n                                }\n                                writer.println(details);\n                                hDetails.remove(details);\n                            } else\n                                details.size = newSize;\n                        } else {\n                            hDetails.remove(details);\n                        }\n                    } catch (Exception e) {\n                        \/\/might get ConcurrentModificationException or such, just ignore\n                    }\n                }\n                writer.flush();\n            }\n        } catch (InterruptedException ie) {    \n        }\n    }\n}\n\nabstract class HashDetails {\n    private static SimpleDateFormat FORMATTER = new SimpleDateFormat(\"MM\/dd\/yyyy HH:mm:ss\");\n    \n    public Date allocTime;\n    public String caller;\n    public int size;\n    public int usedSlots;\n    public int totalSlots;\n    \n    public abstract Map<?,?> getMap();\n    \n    public abstract String getDetailType();\n    \n    public String toString() {\n        return getDetailType() + \"\\t\" + FORMATTER.format(allocTime) + \"\\t\" + caller + \"\\t\" + getMap().size() + \"\\t\" + totalSlots + \"\\t\" + usedSlots;\n    }\n}\n\nclass HashMapDetails extends HashDetails {\n    public Map<?, ?> map;\n\n    public HashMapDetails(Map<?, ?> m, Date d, String c) {\n        map = m;\n        allocTime = d;\n        caller = c;\n        size = map.size();\n    }\n    \n    public Map<?,?> getMap() {\n        return map;\n    }\n    \n    public String getDetailType() {\n        return map.getClass().getSimpleName();\n    }\n}\n\nclass HashSetDetails extends HashDetails {\n    private static Field MAP_FIELD;\n    static {\n        try {\n            MAP_FIELD = HashSet.class.getDeclaredField(\"map\");\n            MAP_FIELD.setAccessible(true);\n        } catch (Exception e) {\n            MAP_FIELD = null;\n        }\n    }\n    \n    public Set<?> set;\n\n    public HashSetDetails(Set<?> s, Date d, String c) {\n        set = s;\n        allocTime = d;\n        caller = c;\n        size = set.size();\n    }\n    \n    public Map<?,?> getMap() {\n        try {\n            if (MAP_FIELD == null)\n                return null;\n            \n            return (Map<?,?>) MAP_FIELD.get(set);\n        } catch (Exception e) {\n            return null;\n        }\n    }\n    \n    public String getDetailType() {\n        return set.getClass().getSimpleName();\n    }\n}\n","old_contents":"package com.mebigfatguy.hashshmash;\n\nimport java.io.BufferedWriter;\nimport java.io.File;\nimport java.io.FileOutputStream;\nimport java.io.OutputStreamWriter;\nimport java.io.PrintWriter;\nimport java.lang.reflect.Field;\nimport java.text.SimpleDateFormat;\nimport java.util.Date;\nimport java.util.HashMap;\nimport java.util.HashSet;\nimport java.util.Map;\nimport java.util.Map.Entry;\nimport java.util.Set;\nimport java.util.concurrent.ConcurrentHashMap;\n\npublic aspect HashCollector {\n    \n    private static final Journaller journaller = new Journaller();\n\n    after() returning (Map m): call(HashMap.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashMapDetails details = new HashMapDetails(m, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    after() returning (Set s): call(HashSet.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashSetDetails details = new HashSetDetails(s, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    before(): execution(public static void *.main(String[])) {\n        Class<?> c = HashCollector.class;\n    }\n}\n\nfinal class Journaller implements Runnable {\n    \n    private static final int SLEEP_TIME = 5 * 1000;\n    \n    private Field tableField;\n    private ConcurrentHashMap<HashDetails, HashDetails> hDetails = new ConcurrentHashMap<HashDetails, HashDetails>();\n    private PrintWriter writer;\n\n    public Journaller() {\n        try {\n            tableField = HashMap.class.getDeclaredField(\"table\");\n            tableField.setAccessible(true);\n              \n            File dir = new File(System.getProperty(\"user.home\"), \".hashshmash\");\n            dir.mkdirs();  \n            \n            writer = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(new File(dir, new Date().toString() + \".txt\")))));\n            \n            Thread t = new Thread(this);\n            t.setDaemon(true);\n            t.start();\n        } catch (Exception e) {\n        }\n    }\n    \n    public void add(HashDetails details) {\n        hDetails.put(details,  details);\n    }\n    \n    public void run() {\n        try {\n            while (!Thread.interrupted()) {\n                Thread.sleep(SLEEP_TIME);\n                \n                for (HashDetails details : hDetails.keySet()) {\n                    try {\n                        Map<?, ?> map = details.getMap();\n                        if (map != null) {\n                            int newSize = details.getMap().size();\n                            if (newSize == details.size) {\n                                Entry<?, ?>[] table = (Entry<?, ?>[])tableField.get(map);\n                                details.totalSlots = table.length;\n                                for (Entry<?, ?> e : table) {\n                                    if (e != null) {\n                                        details.usedSlots++;\n                                    }\n                                }\n                                writer.println(details);\n                                hDetails.remove(details);\n                            } else\n                                details.size = newSize;\n                        } else {\n                            hDetails.remove(details);\n                        }\n                    } catch (Exception e) {\n                        \/\/might get ConcurrentModificationException or such, just ignore\n                    }\n                }\n                writer.flush();\n            }\n        } catch (InterruptedException ie) {    \n        }\n    }\n}\n\nabstract class HashDetails {\n    private static SimpleDateFormat FORMATTER = new SimpleDateFormat(\"MM\/dd\/yyyy HH:mm:ss\");\n    \n    public Date allocTime;\n    public String caller;\n    public int size;\n    public int usedSlots;\n    public int totalSlots;\n    \n    public abstract Map<?,?> getMap();\n    \n    public abstract String getDetailType();\n    \n    public String toString() {\n        return getDetailType() + \"\\t\" + FORMATTER.format(allocTime) + \"\\t\" + caller + \"\\t\" + getMap().size() + \"\\t\" + totalSlots + \"\\t\" + usedSlots;\n    }\n}\n\nclass HashMapDetails extends HashDetails {\n    public Map<?, ?> map;\n\n    public HashMapDetails(Map<?, ?> m, Date d, String c) {\n        map = m;\n        allocTime = d;\n        caller = c;\n        size = map.size();\n    }\n    \n    public Map<?,?> getMap() {\n        return map;\n    }\n    \n    public String getDetailType() {\n        return map.getClass().getSimpleName();\n    }\n}\n\nclass HashSetDetails extends HashDetails {\n    private static Field MAP_FIELD;\n    static {\n        try {\n            MAP_FIELD = HashSet.class.getDeclaredField(\"map\");\n            MAP_FIELD.setAccessible(true);\n        } catch (Exception e) {\n            MAP_FIELD = null;\n        }\n    }\n    \n    public Set<?> set;\n\n    public HashSetDetails(Set<?> s, Date d, String c) {\n        set = s;\n        allocTime = d;\n        caller = c;\n        size = set.size();\n    }\n    \n    public Map<?,?> getMap() {\n        try {\n            if (MAP_FIELD == null)\n                return null;\n            \n            return (Map<?,?>) MAP_FIELD.get(set);\n        } catch (Exception e) {\n            return null;\n        }\n    }\n    \n    public String getDetailType() {\n        return set.getClass().getSimpleName();\n    }\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"17e070c194cc324b18140a389422f040845e75b7","subject":"Fixed #3034. Review by community.","message":"Fixed #3034. Review by community.\n\ngit-svn-id: f4ecfe233223879a4a16cd7937f11b5152963d8e@20893 5e8d7ff9-d8ef-0310-90f0-a4852d11357a\n","repos":"stephenh\/scala-ide,Kwestor\/scala-ide,andrey-ilinykh\/scala-ide,andrey-ilinykh\/scala-ide,mlangc\/scala-ide,sschaef\/scala-ide,romanowski\/scala-ide,dragos\/scala-ide,Duhemm\/scala-ide,Kwestor\/scala-ide,scala-ide\/scala-ide,dragos\/scala-ide,Duhemm\/scala-ide,Kwestor\/scala-ide,Duhemm\/scala-ide,mlangc\/scala-ide,dragos\/scala-ide,romanowski\/scala-ide,aleksi-lukkarinen\/scala-ide,andrey-ilinykh\/scala-ide,scala-ide\/scala-ide,aleksi-lukkarinen\/scala-ide,romanowski\/scala-ide,pilipolio\/scala-ide,wpopielarski\/scala-ide,mlangc\/scala-ide,pilipolio\/scala-ide,scala-ide\/scala-ide,andrey-ilinykh\/scala-ide,wpopielarski\/scala-ide,Duhemm\/scala-ide,Kwestor\/scala-ide,wpopielarski\/scala-ide,dragos\/scala-ide,stephenh\/scala-ide,sschaef\/scala-ide,stephenh\/scala-ide,sschaef\/scala-ide,stephenh\/scala-ide,scala-ide\/scala-ide,wpopielarski\/scala-ide,romanowski\/scala-ide,pilipolio\/scala-ide,sschaef\/scala-ide,pilipolio\/scala-ide,aleksi-lukkarinen\/scala-ide,aleksi-lukkarinen\/scala-ide,mlangc\/scala-ide","old_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/core\/RefactoringAvailabilityAspect.aj","new_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/core\/RefactoringAvailabilityAspect.aj","new_contents":"\/*\n * Copyright 2005-2010 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.core;\n\nimport org.eclipse.jface.viewers.IStructuredSelection;\n\nimport java.util.ArrayList;\nimport java.util.Arrays;\nimport java.util.Iterator;\nimport java.util.List;\n\nimport org.eclipse.core.resources.IResource;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.internal.corext.refactoring.RefactoringAvailabilityTester;\nimport org.eclipse.jdt.internal.corext.refactoring.reorg.ReorgUtils;\nimport org.eclipse.jdt.internal.ui.refactoring.actions.RenameResourceAction;\nimport org.eclipse.jface.viewers.IStructuredSelection;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaElement;\n\n@SuppressWarnings(\"restriction\")\npublic aspect RefactoringAvailabilityAspect {\n  pointcut isAvailable(Object arg) :\n    execution(static boolean RefactoringAvailabilityTester.is*Available(!IResource)) &&\n    args(arg);\n\n  pointcut isAvailable2(IResource[] arg1, IJavaElement[] arg2) :\n    execution(static boolean RefactoringAvailabilityTester.is*Available(IResource[], IJavaElement[])) &&\n    args(arg1, arg2);\n\n  pointcut getResources(Object[] elements) :\n    execution(static IResource[] RefactoringAvailabilityTester.getResources(Object[])) &&\n    args(elements);\n\n  pointcut getJavaElements(Object[] elements) :\n    execution(static IJavaElement[] RefactoringAvailabilityTester.getJavaElements(Object[])) &&\n    args(elements);\n  \n  pointcut getResources2(List elements) :\n    execution(static IResource[] ReorgUtils.getResources(List)) &&\n    args(elements);\n\n  pointcut getJavaElements2(List elements) :\n    execution(static IJavaElement[] ReorgUtils.getJavaElements(List)) &&\n    args(elements);\n  \n  pointcut getResource(IStructuredSelection selection) :\n    execution(static IResource RenameResourceAction.getResource(IStructuredSelection)) &&\n    args(selection);\n\n  boolean around(Object arg) :\n    isAvailable(arg) {\n    if (arg instanceof IScalaElement)\n      return false;\n    else if (arg instanceof IStructuredSelection)\n      for(Iterator i = ((IStructuredSelection)arg).iterator(); i.hasNext();)\n        if (i.next() instanceof IScalaElement)\n          return false;\n     \n    return proceed(arg);\n  }\n  \n  boolean around(IResource[] resources, IJavaElement[] elements) :\n    isAvailable2(resources, elements) {\n    if (elements == null || elements.length == 0)\n      return proceed(resources, elements);\n    \n    int numElements = elements.length;\n    boolean hasScalaElement = false;\n    for (int i = 0; i < numElements; ++i)\n      if (elements[i] instanceof IScalaElement) {\n        hasScalaElement = true;\n        break;\n      }\n    \n    if (!hasScalaElement)\n      return proceed(resources, elements);\n    \n    List newElements = new ArrayList();\n    \n    List newResources = new ArrayList();\n    if (resources != null)\n      newResources.addAll(Arrays.asList(resources));\n    \n    for (int i = 0; i < numElements; ++i) {\n      IJavaElement elem = elements[i];\n      if (elem instanceof IScalaElement) {\n        try {\n          IResource resource = elem.getCorrespondingResource();\n          if (resource != null)\n            newResources.add(resource);\n        } catch (JavaModelException ex) {\n          \/\/ Deliberately ignored\n        }\n      } else\n        newElements.add(elem);\n    }\n\n    return proceed(\n      (IResource[])newResources.toArray(new IResource[newResources.size()]),\n      (IJavaElement[])newElements.toArray(new IJavaElement[newElements.size()]));\n  }\n  \n  IResource[] around(Object[] elements) :\n    getResources(elements) {\n    List result= new ArrayList();\n    for (int index= 0; index < elements.length; index++) {\n      Object elem = elements[index]; \n      if (elem instanceof IResource)\n        result.add(elem);\n      else if (elem instanceof IScalaElement) {\n        try {\n          IResource resource = ((IJavaElement)elem).getCorrespondingResource();\n          if (resource != null)\n            result.add(resource);\n        } catch (JavaModelException ex) {\n          \/\/ Deliberately ignored\n        }\n      }\n    }\n    return (IResource[]) result.toArray(new IResource[result.size()]);\n  }\n\n  IJavaElement[] around(Object[] elements) :\n    getJavaElements(elements) {\n    List result= new ArrayList();\n    for (int index= 0; index < elements.length; index++) {\n      Object elem = elements[index]; \n      if ((elem instanceof IJavaElement) && !(elem instanceof IScalaElement))\n        result.add(elem);\n    }\n    return (IJavaElement[]) result.toArray(new IJavaElement[result.size()]);\n  }\n  \n  IResource[] around(List elements) :\n    getResources2(elements) {\n    List result= new ArrayList();\n    for (Iterator i = elements.iterator(); i.hasNext(); ) {\n      Object elem = i.next(); \n      if (elem instanceof IResource)\n        result.add(elem);\n      else if (elem instanceof IScalaElement) {\n        try {\n          IResource resource = ((IJavaElement)elem).getCorrespondingResource();\n          if (resource != null)\n            result.add(resource);\n        } catch (JavaModelException ex) {\n          \/\/ Deliberately ignored\n        }\n      }\n    }\n    return (IResource[]) result.toArray(new IResource[result.size()]);\n  }\n\n  IJavaElement[] around(List elements) :\n    getJavaElements2(elements) {\n    List result= new ArrayList();\n    for (Iterator i = elements.iterator(); i.hasNext(); ) {\n      Object elem = i.next(); \n      if ((elem instanceof IJavaElement) && !(elem instanceof IScalaElement))\n        result.add(elem);\n    }\n    return (IJavaElement[]) result.toArray(new IJavaElement[result.size()]);\n  }\n\n  IResource around(IStructuredSelection selection) :\n    getResource(selection) {\n    if (selection.size() != 1)\n      return null;\n    Object first= selection.getFirstElement();\n    if (first instanceof IScalaElement) {\n      try {\n        return ((IJavaElement)first).getCorrespondingResource();\n      } catch (JavaModelException ex) {\n        return null;\n      }\n    }\n    else if (!(first instanceof IResource))\n      return null;\n    return (IResource)first;\n  }\n}\n","old_contents":"\/*\n * Copyright 2005-2010 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.core;\n\nimport org.eclipse.jface.viewers.IStructuredSelection;\n\nimport java.util.ArrayList;\nimport java.util.Iterator;\nimport java.util.List;\n\nimport org.eclipse.core.resources.IResource;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.internal.corext.refactoring.RefactoringAvailabilityTester;\nimport org.eclipse.jdt.internal.corext.refactoring.reorg.ReorgUtils;\nimport org.eclipse.jdt.internal.ui.refactoring.actions.RenameResourceAction;\nimport org.eclipse.jface.viewers.IStructuredSelection;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaElement;\n\n@SuppressWarnings(\"restriction\")\npublic aspect RefactoringAvailabilityAspect {\n  pointcut isAvailable(Object arg) :\n    execution(static boolean RefactoringAvailabilityTester.is*Available(!IResource)) &&\n    args(arg);\n\n  pointcut isAvailable2(IResource[] arg1, IJavaElement[] arg2) :\n    execution(static boolean RefactoringAvailabilityTester.is*Available(IResource[], IJavaElement[])) &&\n    args(arg1, arg2);\n\n  pointcut getResources(Object[] elements) :\n    execution(static IResource[] RefactoringAvailabilityTester.getResources(Object[])) &&\n    args(elements);\n\n  pointcut getJavaElements(Object[] elements) :\n    execution(static IJavaElement[] RefactoringAvailabilityTester.getJavaElements(Object[])) &&\n    args(elements);\n  \n  pointcut getResources2(List elements) :\n    execution(static IResource[] ReorgUtils.getResources(List)) &&\n    args(elements);\n\n  pointcut getJavaElements2(List elements) :\n    execution(static IJavaElement[] ReorgUtils.getJavaElements(List)) &&\n    args(elements);\n  \n  pointcut getResource(IStructuredSelection selection) :\n    execution(static IResource RenameResourceAction.getResource(IStructuredSelection)) &&\n    args(selection);\n\n  boolean around(Object arg) :\n    isAvailable(arg) {\n    if (arg instanceof IScalaElement)\n      return false;\n    else if (arg instanceof IStructuredSelection)\n      for(Iterator i = ((IStructuredSelection)arg).iterator(); i.hasNext();)\n        if (i.next() instanceof IScalaElement)\n          return false;\n     \n    return proceed(arg);\n  }\n  \n  boolean around(IResource[] resources, IJavaElement[] elements) :\n    isAvailable2(resources, elements) {\n    if (elements == null || elements.length == 0)\n      return proceed(resources, elements);\n    else if (resources == null || resources.length == 0) {\n      if (elements == null || elements.length == 0)\n        return false;\n      \n      int limit = elements.length;\n      IResource[] newResources = new IResource[limit];\n      for (int i = 0; i < limit; ++i) {\n        IJavaElement elem = elements[i]; \n        if (elem instanceof IResource)\n          newResources[i] = (IResource)elem;\n        else\n          return false;\n      }\n      return proceed(newResources, null);\n    }\n    else {\n      int limit = elements.length;\n      IResource[] newResources = new IResource[resources.length+limit];\n      System.arraycopy(resources, 0, newResources, 0, resources.length);\n      for (int i = 0, j = resources.length; i < limit; ++i, ++j) {\n        IJavaElement elem = elements[i]; \n        if (elem instanceof IResource)\n          newResources[j] = (IResource)elem;\n        else\n          return false;\n      }\n      return proceed(newResources, null);\n    }\n  }\n  \n  IResource[] around(Object[] elements) :\n    getResources(elements) {\n    List result= new ArrayList();\n    for (int index= 0; index < elements.length; index++) {\n      Object elem = elements[index]; \n      if (elem instanceof IResource)\n        result.add(elem);\n      else if (elem instanceof IScalaElement) {\n        try {\n          IResource resource = ((IJavaElement)elem).getCorrespondingResource();\n          if (resource != null)\n            result.add(resource);\n        } catch (JavaModelException ex) {\n          \/\/ Deliberately ignored\n        }\n      }\n    }\n    return (IResource[]) result.toArray(new IResource[result.size()]);\n  }\n\n  IJavaElement[] around(Object[] elements) :\n    getJavaElements(elements) {\n    List result= new ArrayList();\n    for (int index= 0; index < elements.length; index++) {\n      Object elem = elements[index]; \n      if ((elem instanceof IJavaElement) && !(elem instanceof IScalaElement))\n        result.add(elem);\n    }\n    return (IJavaElement[]) result.toArray(new IJavaElement[result.size()]);\n  }\n  \n  IResource[] around(List elements) :\n    getResources2(elements) {\n    List result= new ArrayList();\n    for (Iterator i = elements.iterator(); i.hasNext(); ) {\n      Object elem = i.next(); \n      if (elem instanceof IResource)\n        result.add(elem);\n      else if (elem instanceof IScalaElement) {\n        try {\n          IResource resource = ((IJavaElement)elem).getCorrespondingResource();\n          if (resource != null)\n            result.add(resource);\n        } catch (JavaModelException ex) {\n          \/\/ Deliberately ignored\n        }\n      }\n    }\n    return (IResource[]) result.toArray(new IResource[result.size()]);\n  }\n\n  IJavaElement[] around(List elements) :\n    getJavaElements2(elements) {\n    List result= new ArrayList();\n    for (Iterator i = elements.iterator(); i.hasNext(); ) {\n      Object elem = i.next(); \n      if ((elem instanceof IJavaElement) && !(elem instanceof IScalaElement))\n        result.add(elem);\n    }\n    return (IJavaElement[]) result.toArray(new IJavaElement[result.size()]);\n  }\n\n  IResource around(IStructuredSelection selection) :\n    getResource(selection) {\n    if (selection.size() != 1)\n      return null;\n    Object first= selection.getFirstElement();\n    if (first instanceof IScalaElement) {\n      try {\n        return ((IJavaElement)first).getCorrespondingResource();\n      } catch (JavaModelException ex) {\n        return null;\n      }\n    }\n    else if (!(first instanceof IResource))\n      return null;\n    return (IResource)first;\n  }\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"3de5fd63b4592f139ab84f35ebe5ff64be618096","subject":"Relationship backing aspect now also works in unitialized case","message":"Relationship backing aspect now also works in unitialized case\n","repos":"spring-projects\/spring-data-graph","old_file":"spring-data-neo4j\/src\/main\/java\/org\/springframework\/data\/graph\/neo4j\/support\/relationship\/Neo4jRelationshipBacking.aj","new_file":"spring-data-neo4j\/src\/main\/java\/org\/springframework\/data\/graph\/neo4j\/support\/relationship\/Neo4jRelationshipBacking.aj","new_contents":"\/*\n * Copyright 2010 the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.springframework.data.graph.neo4j.support.relationship;\n\nimport org.apache.commons.logging.Log;\nimport org.apache.commons.logging.LogFactory;\nimport org.aspectj.lang.JoinPoint;\nimport org.aspectj.lang.reflect.FieldSignature;\nimport org.neo4j.graphdb.Relationship;\nimport org.springframework.beans.factory.annotation.Configurable;\nimport org.springframework.data.graph.core.RelationshipBacked;\nimport org.springframework.data.graph.neo4j.fieldaccess.*;\nimport org.springframework.data.graph.neo4j.support.GraphDatabaseContext;\nimport org.springframework.data.graph.annotation.*;\n\nimport java.lang.reflect.Field;\n\nimport static org.springframework.data.graph.neo4j.fieldaccess.DoReturn.unwrap;\n\n\/**\n * Aspect for handling relationship entity creation and field access (read & write)\n * puts the underlying state into and delegates field access to an {@link org.springframework.data.graph.neo4j.fieldaccess.EntityState} instance,\n * created by a configured {@link org.springframework.data.graph.neo4j.fieldaccess.RelationshipEntityStateFactory}\n *\/\npublic aspect Neo4jRelationshipBacking {\n\t\n    protected final Log log = LogFactory.getLog(getClass());\n\n    declare parents : (@RelationshipEntity *) implements RelationshipBacked;\n    declare @type: RelationshipBacked+: @Configurable;\n\n\n    protected pointcut entityFieldGet(RelationshipBacked entity) :\n            get(* RelationshipBacked+.*) &&\n            this(entity) &&\n            !get(* RelationshipBacked.*);\n\n\n    protected pointcut entityFieldSet(RelationshipBacked entity, Object newVal) :\n            set(* RelationshipBacked+.*) &&\n            this(entity) &&\n            args(newVal) &&\n            !set(* RelationshipBacked.*);\n\n\tprivate GraphDatabaseContext graphDatabaseContext;\n    private RelationshipEntityStateFactory entityStateFactory;\n\n\n    public void setGraphDatabaseContext(GraphDatabaseContext graphDatabaseContext) {\n        this.graphDatabaseContext = graphDatabaseContext;\n    }\n\n    public void setRelationshipEntityStateFactory(RelationshipEntityStateFactory entityStateFactory) {\n        this.entityStateFactory = entityStateFactory;\n    }\n\n    \/**\n     * field for {@link org.springframework.data.graph.neo4j.fieldaccess.EntityState} that takes care of all entity operations\n     *\/\n    private EntityState<RelationshipBacked,Relationship> RelationshipBacked.entityState;\n\n    \/**\n     * creates a new {@link org.springframework.data.graph.neo4j.fieldaccess.EntityState} instance with the relationship parameter or updates an existing one\n     * @param r\n     *\/\n\tpublic void RelationshipBacked.setPersistentState(Relationship r) {\n        if (this.entityState == null) {\n            this.entityState = Neo4jRelationshipBacking.aspectOf().entityStateFactory.getEntityState(this);\n        }\n        this.entityState.setPersistentState(r);\n\t}\n\t\n\tpublic Relationship RelationshipBacked.getPersistentState() {\n\t\treturn this.entityState.getPersistentState();\n\t}\n\n\tpublic boolean RelationshipBacked.hasUnderlyingRelationship() {\n\t\treturn this.entityState!=null && this.entityState.hasPersistentState();\n\t}\n\n    \/**\n     * @return relationship id if there is an underlying relationship\n     *\/\n\tpublic Long RelationshipBacked.getRelationshipId() {\n        if (!hasUnderlyingRelationship()) return null;\n\t\treturn getPersistentState().getId();\n\t}\n\n\n    \/**\n     * @param obj\n     * @return result of equality check of the underlying relationship\n     *\/\n\tpublic final boolean RelationshipBacked.equals(Object obj) {\n\t\tif (obj instanceof RelationshipBacked) {\n\t\t\treturn this.getPersistentState().equals(((RelationshipBacked) obj).getPersistentState());\n\t\t}\n\t\treturn false;\n\t}\n\n    \/**\n     * @return hashCode of the underlying relationship\n     *\/\n\tpublic final int RelationshipBacked.hashCode() {\n\t\treturn getPersistentState().hashCode();\n\t}\n\n\tpublic void RelationshipBacked.remove() {\n\t     Neo4jRelationshipBacking.aspectOf().graphDatabaseContext.removeRelationshipEntity(this);\n\t}\n\n    public <R extends RelationshipBacked> R  RelationshipBacked.projectTo(Class<R> targetType) {\n        return (R)Neo4jRelationshipBacking.aspectOf().graphDatabaseContext.projectTo(this, targetType);\n    }\n\n    Object around(RelationshipBacked entity): entityFieldGet(entity) {\n        if (entity.entityState == null) return proceed(entity);\n        Object result = entity.entityState.getValue(field(thisJoinPoint));\n        if (result instanceof DoReturn) return unwrap(result);\n        return proceed(entity);\n    }\n\n    Object around(RelationshipBacked entity, Object newVal) : entityFieldSet(entity, newVal) {\n        if (entity.entityState == null) return proceed(entity,newVal);\n        Object result=entity.entityState.setValue(field(thisJoinPoint),newVal);\n        if (result instanceof DoReturn) return unwrap(result);\n        return proceed(entity,result);\n\t}\n\n\n    Field field(JoinPoint joinPoint) {\n        FieldSignature fieldSignature = (FieldSignature)joinPoint.getSignature();\n        return fieldSignature.getField();\n    }\n}\n","old_contents":"\/*\n * Copyright 2010 the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.springframework.data.graph.neo4j.support.relationship;\n\nimport org.apache.commons.logging.Log;\nimport org.apache.commons.logging.LogFactory;\nimport org.aspectj.lang.JoinPoint;\nimport org.aspectj.lang.reflect.FieldSignature;\nimport org.neo4j.graphdb.Relationship;\nimport org.springframework.beans.factory.annotation.Configurable;\nimport org.springframework.data.graph.core.RelationshipBacked;\nimport org.springframework.data.graph.neo4j.fieldaccess.*;\nimport org.springframework.data.graph.neo4j.support.GraphDatabaseContext;\nimport org.springframework.data.graph.annotation.*;\n\nimport java.lang.reflect.Field;\n\nimport static org.springframework.data.graph.neo4j.fieldaccess.DoReturn.unwrap;\n\n\/**\n * Aspect for handling relationship entity creation and field access (read & write)\n * puts the underlying state into and delegates field access to an {@link org.springframework.data.graph.neo4j.fieldaccess.EntityState} instance,\n * created by a configured {@link org.springframework.data.graph.neo4j.fieldaccess.RelationshipEntityStateFactory}\n *\/\npublic aspect Neo4jRelationshipBacking {\n\t\n    protected final Log log = LogFactory.getLog(getClass());\n\n    declare parents : (@RelationshipEntity *) implements RelationshipBacked;\n    declare @type: RelationshipBacked+: @Configurable;\n\n\n    protected pointcut entityFieldGet(RelationshipBacked entity) :\n            get(* RelationshipBacked+.*) &&\n            this(entity) &&\n            !get(* RelationshipBacked.*);\n\n\n    protected pointcut entityFieldSet(RelationshipBacked entity, Object newVal) :\n            set(* RelationshipBacked+.*) &&\n            this(entity) &&\n            args(newVal) &&\n            !set(* RelationshipBacked.*);\n\n\tprivate GraphDatabaseContext graphDatabaseContext;\n    private RelationshipEntityStateFactory entityStateFactory;\n\n\n    public void setGraphDatabaseContext(GraphDatabaseContext graphDatabaseContext) {\n        this.graphDatabaseContext = graphDatabaseContext;\n    }\n\n    public void setRelationshipEntityStateFactory(RelationshipEntityStateFactory entityStateFactory) {\n        this.entityStateFactory = entityStateFactory;\n    }\n\n    \/**\n     * field for {@link org.springframework.data.graph.neo4j.fieldaccess.EntityState} that takes care of all entity operations\n     *\/\n    private EntityState<RelationshipBacked,Relationship> RelationshipBacked.entityState;\n\n    \/**\n     * creates a new {@link org.springframework.data.graph.neo4j.fieldaccess.EntityState} instance with the relationship parameter or updates an existing one\n     * @param r\n     *\/\n\tpublic void RelationshipBacked.setPersistentState(Relationship r) {\n        if (this.entityState == null) {\n            this.entityState = Neo4jRelationshipBacking.aspectOf().entityStateFactory.getEntityState(this);\n        }\n        this.entityState.setPersistentState(r);\n\t}\n\t\n\tpublic Relationship RelationshipBacked.getPersistentState() {\n\t\treturn this.entityState.getPersistentState();\n\t}\n\n\tpublic boolean RelationshipBacked.hasUnderlyingRelationship() {\n\t\treturn this.entityState.hasPersistentState();\n\t}\n\n    \/**\n     * @return relationship id if there is an underlying relationship\n     *\/\n\tpublic Long RelationshipBacked.getRelationshipId() {\n        if (!hasUnderlyingRelationship()) return null;\n\t\treturn getPersistentState().getId();\n\t}\n\n\n    \/**\n     * @param obj\n     * @return result of equality check of the underlying relationship\n     *\/\n\tpublic final boolean RelationshipBacked.equals(Object obj) {\n\t\tif (obj instanceof RelationshipBacked) {\n\t\t\treturn this.getPersistentState().equals(((RelationshipBacked) obj).getPersistentState());\n\t\t}\n\t\treturn false;\n\t}\n\n    \/**\n     * @return hashCode of the underlying relationship\n     *\/\n\tpublic final int RelationshipBacked.hashCode() {\n\t\treturn getPersistentState().hashCode();\n\t}\n\n\tpublic void RelationshipBacked.remove() {\n\t     Neo4jRelationshipBacking.aspectOf().graphDatabaseContext.removeRelationshipEntity(this);\n\t}\n\n    public <R extends RelationshipBacked> R  RelationshipBacked.projectTo(Class<R> targetType) {\n        return (R)Neo4jRelationshipBacking.aspectOf().graphDatabaseContext.projectTo(this, targetType);\n    }\n\n    Object around(RelationshipBacked entity): entityFieldGet(entity) {\n        Object result=entity.entityState.getValue(field(thisJoinPoint));\n        if (result instanceof DoReturn) return unwrap(result);\n        return proceed(entity);\n    }\n\n    Object around(RelationshipBacked entity, Object newVal) : entityFieldSet(entity, newVal) {\n        Object result=entity.entityState.setValue(field(thisJoinPoint),newVal);\n        if (result instanceof DoReturn) return unwrap(result);\n        return proceed(entity,result);\n\t}\n\n\n    Field field(JoinPoint joinPoint) {\n        FieldSignature fieldSignature = (FieldSignature)joinPoint.getSignature();\n        return fieldSignature.getField();\n    }\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"971cc80e8d1770867c058caffe537b85f3f0a6f7","subject":"formatting","message":"formatting\n","repos":"stieglma\/Schafkopfauswerter","old_file":"src\/StatPlayerWiseGraph.aj","new_file":"src\/StatPlayerWiseGraph.aj","new_contents":"import java.awt.BasicStroke;\nimport java.awt.Color;\nimport java.awt.Font;\nimport java.awt.GridLayout;\nimport java.awt.LinearGradientPaint;\n\nimport javax.swing.JPanel;\nimport javax.swing.JTabbedPane;\n\nimport model.SystemValues.Games;\nimport model.SystemValues.Players;\nimport view.GUI;\nimport view.UIUpdater;\nimport de.erichseifert.gral.data.DataTable;\nimport de.erichseifert.gral.plots.BarPlot;\nimport de.erichseifert.gral.plots.BarPlot.BarRenderer;\nimport de.erichseifert.gral.plots.PiePlot;\nimport de.erichseifert.gral.plots.PiePlot.PieSliceRenderer;\nimport de.erichseifert.gral.plots.points.PointRenderer;\nimport de.erichseifert.gral.ui.InteractivePanel;\nimport de.erichseifert.gral.util.GraphicsUtils;\nimport de.erichseifert.gral.util.Insets2D;\nimport de.erichseifert.gral.util.Location;\n\npublic privileged aspect StatPlayerWiseGraph {\n    \/**\n     * Statistics has to be the last feature executed, such that the subfeatures\n     * have the correct gui object before statistics can create the tabbed pane\n     *\/\n    declare precedence : Statistics, StatPlayerWiseGraph, StatPlayerWiseTxt, StatOverallGraph, StatOverallTxt;\n\n    private static GUI gui;\n\n    private static final JTabbedPane playersTabs = new JTabbedPane();\n    private static final Color COLOR1 = Color.GREEN;\n\n    private static DataTable playedTypes[] = new DataTable[4];\n    private static DataTable wonGames[] = new DataTable[4];\n\n    after() returning(GUI gui): call(GUI.new(*)) {\n        StatPlayerWiseGraph.gui = gui;\n    }\n\n    @SuppressWarnings(\"unchecked\")\n    after(JTabbedPane tabbedPane): \n                        execution(public static void StatisticsHelper.StatisticsPaneCreated(JTabbedPane))\n                        && args(tabbedPane) {\n\n        for (int i = 0; i < Players.values().length; i++) {\n            playedTypes[i] = new DataTable(Integer.class, String.class);\n            wonGames[i] = new DataTable(Integer.class, Double.class,String.class);\n        }\n\n        updateData();\n;\n        for (Players player : Players.values()) {\n            playersTabs.addTab(player.toString(), createPlayersPanel(player));\n        }\n        tabbedPane.addTab(\"Einzelstatistiken\", playersTabs);\n    }\n\n    private JPanel createPlayersPanel(Players player) {\n        JPanel containerPanel = new JPanel();\n        containerPanel.setLayout(new GridLayout(2, 2));\n\n        containerPanel.add(new InteractivePanel(createWonGamesBarPlot(player)));\n        containerPanel.add(new InteractivePanel(createPlayedTypesPlot(player)));\n        return containerPanel;\n    }\n\n    after() : execution(* UIUpdater.run()) {\n        updateData();\n        for (Players player : Players.values()) {\n            playersTabs.setTitleAt(player.ordinal(), player.toString());\n        }\n    }\n\n    private static void updateData() {\n        for (Players player : Players.values()) {\n            PlayerWiseStatistics data = gui.model.getGameData().getPlayerWiseStatistics(player);\n\n            int curPlayer = player.ordinal();\n\n            while (playedTypes[curPlayer].getRowCount() > 0) {\n                playedTypes[curPlayer].removeLast();\n            }\n            playedTypes[curPlayer].add(data.getGamesPlayedPerType()[Games.RUFSPIEL.ordinal()], \"Rufspiele\");\n            playedTypes[curPlayer].add(data.getGamesPlayedPerType()[Games.SOLO.ordinal()], \"Soli\");\n            playedTypes[curPlayer].add(data.getGamesPlayedPerType()[Games.TOUT.ordinal()], \"Soli Tout\");\n            playedTypes[curPlayer].add(data.getGamesPlayedPerType()[Games.SIE.ordinal()],\"Soli Sie\");\n            playedTypes[curPlayer].add(data.getGamesPlayedPerType()[Games.WEITER.ordinal()], \"Weiter\");\n\n            \/\/ percentage of won games by gametype\n            int soliCompleteAmount = data.getGamesPlayedPerType()[Games.SOLO.ordinal()]\n                    + data.getGamesPlayedPerType()[Games.SIE.ordinal()]\n                    + data.getGamesPlayedPerType()[Games.TOUT.ordinal()];\n            int soliCompleteAmountWon = data.getGamesWonPerType()[Games.SOLO.ordinal()]\n                    + data.getGamesWonPerType()[Games.SIE.ordinal()]\n                    + data.getGamesWonPerType()[Games.TOUT.ordinal()];\n            double soliGesamtWonPerc = soliCompleteAmount > 0\n                    ? (double) soliCompleteAmountWon \/ soliCompleteAmount\n                    : 0.0;\n\n            while (wonGames[curPlayer].getRowCount() > 0) {\n                wonGames[curPlayer].removeLast();\n            }\n            wonGames[curPlayer].add(1, data.getGamesWonPerc(), \"Gesamt\");\n            wonGames[curPlayer].add(2, data.getGamesWonPerTypePerc()[Games.RUFSPIEL.ordinal()], \"Rufspiele\");\n            wonGames[curPlayer].add(3, soliGesamtWonPerc, \"Soli gesamt\");\n            wonGames[curPlayer].add(4, data.getGamesWonPerTypePerc()[Games.SOLO.ordinal()], \"Soli normal\");\n            wonGames[curPlayer].add(5, data.getGamesWonPerTypePerc()[Games.TOUT.ordinal()], \"Soli Tout\");\n            wonGames[curPlayer].add(6, data.getGamesWonPerTypePerc()[Games.SIE.ordinal()], \"Soli Sie\");\n        }\n    }\n\n    private static PiePlot createPlayedTypesPlot(Players player) {\n        int playerIndex = player.ordinal();\n\n        PiePlot plot = new PiePlot(playedTypes[playerIndex]);\n\n        PointRenderer pointRenderer = plot\n                .getPointRenderer(playedTypes[playerIndex]);\n        pointRenderer.setValueVisible(true);\n        pointRenderer.setValueColumn(1);\n\n        \/\/ Format plot\n        plot.getTitle().setText(\"Anzahl gespielter Spieltypen\");\n        \/\/ Change plot size\n        plot.setRadius(0.9);\n        \/\/ Display a legend\n        plot.setLegendVisible(true);\n        \/\/ Add some margin to the plot area\n        plot.setInsets(new Insets2D.Double(20.0, 40.0, 40.0, 40.0));\n\n        PieSliceRenderer pieSliceRenderer = (PieSliceRenderer) plot\n                .getPointRenderer(playedTypes[playerIndex]);\n\n        \/\/ Change relative size of inner region\n        pieSliceRenderer.setInnerRadius(0.4);\n        \/\/ Change the width of gaps between segments\n        pieSliceRenderer.setGap(0.2);\n        \/\/ Show labels\n        pieSliceRenderer.setValueVisible(true);\n        pieSliceRenderer.setValueColor(Color.WHITE);\n        pieSliceRenderer.setValueFont(Font.decode(null).deriveFont(Font.BOLD));\n\n        return plot;\n    }\n\n    public BarPlot createWonGamesBarPlot(Players player) {\n        int playerIndex = player.ordinal();\n\n        \/\/ Create new bar plot\n        BarPlot plot = new BarPlot(wonGames);\n\n        \/\/ Format plot\n        plot.getTitle().setText(\"Gewonnene Spiele pro Spieltyp (in %)\");\n        plot.setInsets(new Insets2D.Double(40.0, 40.0, 40.0, 40.0));\n        plot.setBarWidth(0.075);\n\n        \/\/ Format bars\n        PointRenderer pointRenderer = plot.getPointRenderer(wonGames[playerIndex]);\n        BarRenderer barRenderer = (BarRenderer) pointRenderer;\n\n        barRenderer.setColor(new LinearGradientPaint(0f, 0f, 0f, 1f,\n                new float[] { 0.0f, 1.0f }, new Color[] { COLOR1,\n                        GraphicsUtils.deriveBrighter(COLOR1) }));\n        barRenderer.setBorderStroke(new BasicStroke(3f));\n        barRenderer.setBorderColor(new LinearGradientPaint(0f, 0f, 0f, 1f,\n                new float[] { 0.0f, 1.0f }, new Color[] {\n                        GraphicsUtils.deriveBrighter(COLOR1), COLOR1 }));\n\n        pointRenderer.setValueVisible(true);\n        pointRenderer.setValueColumn(2);\n\n        pointRenderer.setValueLocation(Location.CENTER);\n        pointRenderer.setValueColor(GraphicsUtils.deriveDarker(COLOR1));\n        pointRenderer.setValueFont(Font.decode(null).deriveFont(Font.BOLD));\n\n        return plot;\n    }\n}","old_contents":"import java.awt.BasicStroke;\nimport java.awt.Color;\nimport java.awt.Font;\nimport java.awt.GridLayout;\nimport java.awt.LinearGradientPaint;\n\nimport javax.swing.JPanel;\nimport javax.swing.JTabbedPane;\n\nimport model.SystemValues.Games;\nimport model.SystemValues.Players;\nimport view.GUI;\nimport view.UIUpdater;\nimport de.erichseifert.gral.data.DataTable;\nimport de.erichseifert.gral.plots.BarPlot;\nimport de.erichseifert.gral.plots.BarPlot.BarRenderer;\nimport de.erichseifert.gral.plots.PiePlot;\nimport de.erichseifert.gral.plots.PiePlot.PieSliceRenderer;\nimport de.erichseifert.gral.plots.points.PointRenderer;\nimport de.erichseifert.gral.ui.InteractivePanel;\nimport de.erichseifert.gral.util.GraphicsUtils;\nimport de.erichseifert.gral.util.Insets2D;\nimport de.erichseifert.gral.util.Location;\n\npublic privileged aspect StatPlayerWiseGraph {\n    \/**\n     * Statistics has to be the last feature executed, such that the subfeatures\n     * have the correct gui object before statistics can create the tabbed pane\n     *\/\n    declare precedence : Statistics, StatPlayerWiseGraph, StatPlayerWiseTxt, StatOverallGraph, StatOverallTxt;\n\n    private static GUI gui;\n\n    private static final JTabbedPane playersTabs = new JTabbedPane();\n    private static final Color COLOR1 = Color.GREEN;\n\n    private static DataTable playedTypes[] = new DataTable[4];\n    private static DataTable wonGames[] = new DataTable[4];\n\n    after() returning(GUI gui): call(GUI.new(*)) {\n        StatPlayerWiseGraph.gui = gui;\n    }\n\n    @SuppressWarnings(\"unchecked\")\n    after(JTabbedPane tabbedPane): \n                        execution(public static void StatisticsHelper.StatisticsPaneCreated(JTabbedPane))\n                        && args(tabbedPane) {\n\n        for (int i = 0; i < Players.values().length; i++) {\n            playedTypes[i] = new DataTable(Integer.class, String.class);\n            wonGames[i] = new DataTable(Integer.class, Double.class,String.class);\n        }\n\n        updateData();\n;\n        for (Players player : Players.values()) {\n            playersTabs.addTab(player.toString(), createPlayersPanel(player));\n        }\n        tabbedPane.addTab(\"Einzelstatistiken\", playersTabs);\n    }\n\n    private JPanel createPlayersPanel(Players player) {\n        JPanel containerPanel = new JPanel();\n        containerPanel.setLayout(new GridLayout(2, 2));\n\n        containerPanel.add(new InteractivePanel(createWonGamesBarPlot(player)));\n        containerPanel.add(new InteractivePanel(createPlayedTypesPlot(player)));\n        return containerPanel;\n    }\n\n    after() : execution(* UIUpdater.run()) {\n        updateData();\n        for (Players player : Players.values()) {\n            playersTabs.setTitleAt(player.ordinal(), player.toString());\n        }\n    }\n\n    private static void updateData() {\n        for (Players player : Players.values()) {\n            PlayerWiseStatistics data = gui.model.getGameData()\n                    .getPlayerWiseStatistics(player);\n\n            int i = player.ordinal();\n\n            while (playedTypes[i].getRowCount() > 0) {\n                playedTypes[i].removeLast();\n            }\n            playedTypes[i].add(\n                    data.getGamesPlayedPerType()[Games.RUFSPIEL.ordinal()],\n                    \"Rufspiele\");\n            playedTypes[i].add(\n                    data.getGamesPlayedPerType()[Games.SOLO.ordinal()], \"Soli\");\n            playedTypes[i].add(\n                    data.getGamesPlayedPerType()[Games.TOUT.ordinal()],\n                    \"Soli Tout\");\n            playedTypes[i].add(\n                    data.getGamesPlayedPerType()[Games.SIE.ordinal()],\n                    \"Soli Sie\");\n            playedTypes[i].add(\n                    data.getGamesPlayedPerType()[Games.WEITER.ordinal()],\n                    \"Weiter\");\n\n            \/\/ percentage of won games by gametype\n            int soli_complete_amount = data.getGamesPlayedPerType()[Games.SOLO\n                    .ordinal()]\n                    + data.getGamesPlayedPerType()[Games.SIE.ordinal()]\n                    + data.getGamesPlayedPerType()[Games.TOUT.ordinal()];\n            int soli_complete_amount_won = data.getGamesWonPerType()[Games.SOLO\n                    .ordinal()]\n                    + data.getGamesWonPerType()[Games.SIE.ordinal()]\n                    + data.getGamesWonPerType()[Games.TOUT.ordinal()];\n            double soli_gesamt_won_perc = soli_complete_amount > 0 ? (double) soli_complete_amount_won\n                    \/ soli_complete_amount\n                    : 0.0;\n\n            while (wonGames[i].getRowCount() > 0) {\n                wonGames[i].removeLast();\n            }\n            wonGames[i].add(1, data.getGamesWonPerc(), \"Gesamt\");\n            wonGames[i].add(2,\n                    data.getGamesWonPerTypePerc()[Games.RUFSPIEL.ordinal()],\n                    \"Rufspiele\");\n            wonGames[i].add(3, soli_gesamt_won_perc, \"Soli gesamt\");\n            wonGames[i].add(4,\n                    data.getGamesWonPerTypePerc()[Games.SOLO.ordinal()],\n                    \"Soli normal\");\n            wonGames[i].add(5,\n                    data.getGamesWonPerTypePerc()[Games.TOUT.ordinal()],\n                    \"Soli Tout\");\n            wonGames[i].add(6,\n                    data.getGamesWonPerTypePerc()[Games.SIE.ordinal()],\n                    \"Soli Sie\");\n        }\n    }\n\n    private static PiePlot createPlayedTypesPlot(Players player) {\n        int playerIndex = player.ordinal();\n\n        PiePlot plot = new PiePlot(playedTypes[playerIndex]);\n\n        PointRenderer pointRenderer = plot\n                .getPointRenderer(playedTypes[playerIndex]);\n        pointRenderer.setValueVisible(true);\n        pointRenderer.setValueColumn(1);\n\n        \/\/ Format plot\n        plot.getTitle().setText(\"Anzahl gespielter Spieltypen\");\n        \/\/ Change plot size\n        plot.setRadius(0.9);\n        \/\/ Display a legend\n        plot.setLegendVisible(true);\n        \/\/ Add some margin to the plot area\n        plot.setInsets(new Insets2D.Double(20.0, 40.0, 40.0, 40.0));\n\n        PieSliceRenderer pieSliceRenderer = (PieSliceRenderer) plot\n                .getPointRenderer(playedTypes[playerIndex]);\n\n        \/\/ Change relative size of inner region\n        pieSliceRenderer.setInnerRadius(0.4);\n        \/\/ Change the width of gaps between segments\n        pieSliceRenderer.setGap(0.2);\n        \/\/ Show labels\n        pieSliceRenderer.setValueVisible(true);\n        pieSliceRenderer.setValueColor(Color.WHITE);\n        pieSliceRenderer.setValueFont(Font.decode(null).deriveFont(Font.BOLD));\n\n        return plot;\n    }\n\n    public BarPlot createWonGamesBarPlot(Players player) {\n        int playerIndex = player.ordinal();\n\n        \/\/ Create new bar plot\n        BarPlot plot = new BarPlot(wonGames);\n\n        \/\/ Format plot\n        plot.getTitle().setText(\"Gewonnene Spiele pro Spieltyp (in %)\");\n        plot.setInsets(new Insets2D.Double(40.0, 40.0, 40.0, 40.0));\n        plot.setBarWidth(0.075);\n\n        \/\/ Format bars\n        PointRenderer pointRenderer = plot\n                .getPointRenderer(wonGames[playerIndex]);\n        BarRenderer barRenderer = (BarRenderer) pointRenderer;\n\n        barRenderer.setColor(new LinearGradientPaint(0f, 0f, 0f, 1f,\n                new float[] { 0.0f, 1.0f }, new Color[] { COLOR1,\n                        GraphicsUtils.deriveBrighter(COLOR1) }));\n        barRenderer.setBorderStroke(new BasicStroke(3f));\n        barRenderer.setBorderColor(new LinearGradientPaint(0f, 0f, 0f, 1f,\n                new float[] { 0.0f, 1.0f }, new Color[] {\n                        GraphicsUtils.deriveBrighter(COLOR1), COLOR1 }));\n\n        pointRenderer.setValueVisible(true);\n        pointRenderer.setValueColumn(2);\n\n        pointRenderer.setValueLocation(Location.CENTER);\n        pointRenderer.setValueColor(GraphicsUtils.deriveDarker(COLOR1));\n        pointRenderer.setValueFont(Font.decode(null).deriveFont(Font.BOLD));\n\n        return plot;\n    }\n}","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"d563f5d4e9eaae4c40f1bed47385223ad707a882","subject":"Context may be null...","message":"Context may be null...\n","repos":"awltech\/org.parallelj,christophe-w\/parallelj.runtime","old_file":"org.parallelj\/parallelj\/parallelj-launching\/src\/main\/java\/org\/parallelj\/launching\/quartz\/ProgramJobsAdapter.aj","new_file":"org.parallelj\/parallelj\/parallelj-launching\/src\/main\/java\/org\/parallelj\/launching\/quartz\/ProgramJobsAdapter.aj","new_contents":"","old_contents":"","returncode":0,"stderr":"unknown","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"ef58f4caa7a6b31be07ec708f9542e5cece38cbf","subject":"initialise maps at declaration","message":"initialise maps at declaration\n","repos":"eigengo\/monitor,eigengo\/monitor,DataDog\/monitor,DataDog\/monitor","old_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/ActorCellMonitoringAspect.aj","new_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/ActorCellMonitoringAspect.aj","new_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.actor.*;\nimport org.eigengo.monitor.agent.AgentConfiguration;\nimport org.eigengo.monitor.output.CounterInterface;\nimport scala.Option;\n\nimport java.util.ArrayList;\nimport java.util.List;\nimport java.util.concurrent.atomic.AtomicInteger;\nimport java.util.concurrent.atomic.AtomicLong;\nimport java.util.concurrent.ConcurrentHashMap;\n\n\/**\n * Contains advices for monitoring behaviour of an actor; typically imprisoned in an {@code ActorCell}.\n *\/\npublic aspect ActorCellMonitoringAspect extends AbstractMonitoringAspect issingleton() {\n    private AkkaAgentConfiguration agentConfiguration;\n    private final CounterInterface counterInterface;\n    private final Option<String> noActorClazz = Option.empty();\n    private final Map<Option<String>, AtomicLong> samplingCounters  = new ConcurrentHashMap<Option<String>, AtomicLong>();\n    private final Map<Option<String>, AtomicInteger> numberOfActors = new ConcurrentHashMap<Option<String>, AtomicInteger>();\n\n\n    \/**\n     * Constructs this aspect\n     *\/\n    public ActorCellMonitoringAspect() {\n        AgentConfiguration<AkkaAgentConfiguration> configuration = getAgentConfiguration(\"akka\", AkkaAgentConfigurationJapi.apply());\n        this.agentConfiguration = configuration.agent();\n        this.counterInterface = createCounterInterface(configuration.common());\n    }\n\n    \/**\n     * Injects the new {@code AkkaAgentConfiguration} instance.\n     *\n     * @param agentConfiguration the new configuration\n     *\/\n    synchronized final void setAgentConfiguration(AkkaAgentConfiguration agentConfiguration) {\n        this.agentConfiguration = agentConfiguration;\n    }\n\n    \/\/ decide whether to include this ActorCell in our measurements\n    private boolean includeActorPath(final PathAndClass pathAndClass) {\n        if (!this.agentConfiguration.incuded().accept(pathAndClass)) return false;\n        if (this.agentConfiguration.excluded().accept(pathAndClass)) return false;\n\n        if (this.agentConfiguration.includeSystemAgents()) return true;\n\n        String userOrSystem = pathAndClass.actorPath().getElements().iterator().next();\n        return \"user\".equals(userOrSystem);\n    }\n\n    \/\/ get the sample rate for an actor\n    private int getSampleRate(final PathAndClass pathAndClass) {\n        return this.agentConfiguration.sampling().getRate(pathAndClass);\n    }\n\n    \/\/ decide whether to sample an actor on a particular occasion\n    private final boolean sampleMessage(final PathAndClass pathAndClass) {\n        int sampleRate = getSampleRate(pathAndClass);\n        if (sampleRate == 1) return true;\n\n        this.samplingCounters.putIfAbsent(pathAndClass.actorClassName(), new AtomicLong(0));\n        long timesSeenSoFar = this.samplingCounters.get(pathAndClass.actorClassName()).incrementAndGet();\n        return (timesSeenSoFar % sampleRate == 1); \/\/ == 1 to log first value (incrementAndGet returns updated value)\n    }\n\n    \/\/ get the tags for the cell\n    private String[] getTags(final ActorPath actorPath, final Actor actor) {\n        List<String> tags = new ArrayList<String>();\n\n        \/\/ TODO: Improve detection of routed actors. This relies only on the naming :(.\n        String lastPathElement = actorPath.elements().last();\n        if (lastPathElement.startsWith(\"$\")) {\n            \/\/ this is routed actor.\n            tags.add(actorPath.parent().toString());\n            if (this.agentConfiguration.includeRoutees()) tags.add(actorPath.toString());\n        } else {\n            \/\/ there is no supervisor\n            tags.add(actorPath.toString());\n        }\n        if (actor != null) {\n            tags.add(String.format(\"akka:%s.%s\", actor.context().system().name(), actor.getClass().getCanonicalName()));\n        }\n\n        return tags.toArray(new String[tags.size()]);\n    }\n\n    \/\/ returns the canonical name of the actor type associated with an ActorCell\n    private String uncheckedActorNameFrom(final ActorCell actorCell) {\n        return uncheckedActorNameFrom(actorCell.props());\n    }\n\n    \/\/ returns the canonical name of the actor type associated with a Props instance\n    private String uncheckedActorNameFrom(final Props props) {\n        return props.actorClass().getCanonicalName();\n    }\n\n    \/**\n     * Advises the {@code ActorCell.receiveMessage(message: Object): Unit}\n     * We proceed with the pointcut if the actor is to be included in the monitoring *and* this is\n     * the 'multiple-of-n'th time we've seen a message for an actor with a sample rate of n.\n     *\n     * Currently, we sample queue size, the fact that the message is delivered, the simple name of the class of the\n     * message, and the time taken to complete the actor's reactive action.\n     *\n     * @param actorCell the ActorCell where the actor that receives the message \"lives\"\n     * @param msg the incoming message\n     *\/\n    Object around(ActorCell actorCell, Object msg) : Pointcuts.actorCellReceiveMessage(actorCell, msg) {\n        final ActorPath actorPath = actorCell.self().path();\n        final PathAndClass pathAndClass = new PathAndClass(actorPath, Option.apply(uncheckedActorNameFrom(actorCell)));\n        if (!includeActorPath(pathAndClass) || !sampleMessage(pathAndClass)) return proceed(actorCell, msg);\n\n        int samplingRate = getSampleRate(pathAndClass);\n\n        \/\/ we tag by actor name\n        final String[] tags = getTags(actorPath, actorCell.actor());\n\n        \/\/ record the queue size\n        this.counterInterface.recordGaugeValue(\"akka.queue.size\", actorCell.numberOfMessages(), tags);\n        \/\/ record the message, general and specific\n        this.counterInterface.incrementCounter(\"akka.actor.delivered\", samplingRate, tags);\n        this.counterInterface.incrementCounter(\"akka.actor.delivered.\" + msg.getClass().getSimpleName(), samplingRate, tags);\n\n        \/\/ measure the time. we're using the ``nanoTime`` call to access the high-precision timer.\n        \/\/ since we're not really interested in wall time, but just some increasing measure of\n        \/\/ elapsed time\n        Object result = null;\n        final long start = System.nanoTime();\n        \/\/ result will always be ``null``, because target returns ``Unit``\n        result = proceed(actorCell, msg);\n        \/\/ ns or \u00b5s is too fine. ms will do for now.\n        final long duration = (System.nanoTime() - start) \/ 1000000;\n\n        \/\/ record the actor duration\n        this.counterInterface.recordExecutionTime(\"akka.actor.duration\", (int)duration, tags);\n\n        \/\/ return null would do the trick, but we want to be _proper_.\n        return result;\n    }\n\n    \/**\n     * Advises the {@code ActorCell.handleInvokeFailure(_, failure: Throwable): Unit}\n     *\n     * @param actorCell the ActorCell where the error spreads from\n     * @param failure the exception that escaped from the {@code receive} method\n     *\/\n    before(ActorCell actorCell, Throwable failure) : Pointcuts.actorCellHandleInvokeFailure(actorCell, failure) {\n        \/\/ record the error, general and specific\n        String[] tags = getTags(actorCell.self().path(), actorCell.actor());\n        this.counterInterface.incrementCounter(\"akka.actor.error\", tags);\n        this.counterInterface.incrementCounter(String.format(\"akka.actor.error.%s\", failure.getMessage()), tags);\n    }\n\n    \/**\n     * Advises the {@code EventStream.publish(event: Any): Unit}\n     *\n     * @param event the received event\n     *\/\n    before(Object event) : Pointcuts.eventStreamPublish(event) {\n        if (event instanceof UnhandledMessage) {\n            UnhandledMessage unhandledMessage = (UnhandledMessage)event;\n            String[] tags = getTags(unhandledMessage.recipient().path(), null);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered\", tags);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered.\" + unhandledMessage.getMessage().getClass().getSimpleName(), tags);\n        }\n    }\n\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorCell} and {@code ActorSystem}\n     *\n     * @param props the {@code Props} instance used in the call\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after(Props props) returning (ActorRef actor): Pointcuts.anyActorOf(props) {\n        recordActorCreation(props, actor);\n    }\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorCell} and {@code ActorSystem} when actor is named in construction\n     *\n     * @param props the {@code Props} instance used in the call\n     * @param actorName the {@code String} used to name the actor at creation site\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after(Props props, String actorName) returning (ActorRef actor): Pointcuts.namedActorOf(props, actorName) {\n        recordActorCreation(props, actor);\n    }\n\n    \/\/ method containing the recording logic for advising actor creation\n    private void recordActorCreation(Props props, ActorRef actor) {\n        if (!includeActorPath(new PathAndClass(actor.path(), this.noActorClazz))) return;\n        final String uncheckedClassName = uncheckedActorNameFrom(props);\n        final Option<String> className = Option.apply(uncheckedClassName);\n\n        this.numberOfActors.putIfAbsent(className, new AtomicInteger(0));\n        \/\/ increment and get the current number of actors of this type (if the value was 0, then this returns 1 -- which is correct)\n        final int currentNumberOfActors = this.numberOfActors.get(className).incrementAndGet();\n\n        \/\/ record the current number of actors of this type\n        this.counterInterface.recordGaugeValue(\"akka.actor.count\", currentNumberOfActors, uncheckedClassName);\n    }\n\n    \/**\n     * Advises the {@code LocalActorRef.stop} method\n     *\n     *\n     * @param actorCell the {@code ActorCell} of the actor being stopped\n     *\/\n    after(ActorCell actorCell) : Pointcuts.actorCellInternalStop(actorCell) {\n        if (!includeActorPath(new PathAndClass(actorCell.self().path(), this.noActorClazz))) return;\n        final String uncheckedClassName = uncheckedActorNameFrom(actorCell);\n        final Option<String> className = Option.apply(uncheckedClassName);\n\n        this.numberOfActors.putIfAbsent(className, new AtomicInteger(0));\n        \/\/ decrement and get the current number of actors of this type (if the value was 1, then this returns 0 -- which is correct)\n        final int currentNumberOfActors = this.numberOfActors.get(className).decrementAndGet();\n\n        this.counterInterface.recordGaugeValue(\"akka.actor.count\", currentNumberOfActors, uncheckedClassName);\n    }\n\n}","old_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.actor.*;\nimport org.eigengo.monitor.agent.AgentConfiguration;\nimport org.eigengo.monitor.output.CounterInterface;\nimport scala.Option;\n\nimport java.util.ArrayList;\nimport java.util.List;\nimport java.util.concurrent.atomic.AtomicInteger;\nimport java.util.concurrent.atomic.AtomicLong;\nimport java.util.concurrent.ConcurrentHashMap;\n\n\/**\n * Contains advices for monitoring behaviour of an actor; typically imprisoned in an {@code ActorCell}.\n *\/\npublic aspect ActorCellMonitoringAspect extends AbstractMonitoringAspect issingleton() {\n    private AkkaAgentConfiguration agentConfiguration;\n    private final CounterInterface counterInterface;\n    private final Option<String> noActorClazz = Option.empty();\n    private final ConcurrentHashMap<Option<String>, AtomicLong> samplingCounters;\n    private final ConcurrentHashMap<Option<String>, AtomicInteger> numberOfActors;\n\n\n    \/**\n     * Constructs this aspect\n     *\/\n    public ActorCellMonitoringAspect() {\n        AgentConfiguration<AkkaAgentConfiguration> configuration = getAgentConfiguration(\"akka\", AkkaAgentConfigurationJapi.apply());\n        this.agentConfiguration = configuration.agent();\n        this.counterInterface = createCounterInterface(configuration.common());\n        this.samplingCounters = new ConcurrentHashMap<Option<String>, AtomicLong>();\n        this.numberOfActors = new ConcurrentHashMap<Option<String>, AtomicInteger>();\n    }\n\n    \/**\n     * Injects the new {@code AkkaAgentConfiguration} instance.\n     *\n     * @param agentConfiguration the new configuration\n     *\/\n    synchronized final void setAgentConfiguration(AkkaAgentConfiguration agentConfiguration) {\n        this.agentConfiguration = agentConfiguration;\n    }\n\n    \/\/ decide whether to include this ActorCell in our measurements\n    private boolean includeActorPath(final PathAndClass pathAndClass) {\n        if (!this.agentConfiguration.incuded().accept(pathAndClass)) return false;\n        if (this.agentConfiguration.excluded().accept(pathAndClass)) return false;\n\n        if (this.agentConfiguration.includeSystemAgents()) return true;\n\n        String userOrSystem = pathAndClass.actorPath().getElements().iterator().next();\n        return \"user\".equals(userOrSystem);\n    }\n\n    \/\/ get the sample rate for an actor\n    private int getSampleRate(final PathAndClass pathAndClass) {\n        return this.agentConfiguration.sampling().getRate(pathAndClass);\n    }\n\n    \/\/ decide whether to sample an actor on a particular occasion\n    private final boolean sampleMessage(final PathAndClass pathAndClass) {\n        int sampleRate = getSampleRate(pathAndClass);\n        if (sampleRate == 1) return true;\n\n        this.samplingCounters.putIfAbsent(pathAndClass.actorClassName(), new AtomicLong(0));\n        long timesSeenSoFar = this.samplingCounters.get(pathAndClass.actorClassName()).incrementAndGet();\n        return (timesSeenSoFar % sampleRate == 1); \/\/ == 1 to log first value (incrementAndGet returns updated value)\n    }\n\n    \/\/ get the tags for the cell\n    private String[] getTags(final ActorPath actorPath, final Actor actor) {\n        List<String> tags = new ArrayList<String>();\n\n        \/\/ TODO: Improve detection of routed actors. This relies only on the naming :(.\n        String lastPathElement = actorPath.elements().last();\n        if (lastPathElement.startsWith(\"$\")) {\n            \/\/ this is routed actor.\n            tags.add(actorPath.parent().toString());\n            if (this.agentConfiguration.includeRoutees()) tags.add(actorPath.toString());\n        } else {\n            \/\/ there is no supervisor\n            tags.add(actorPath.toString());\n        }\n        if (actor != null) {\n            tags.add(String.format(\"akka:%s.%s\", actor.context().system().name(), actor.getClass().getCanonicalName()));\n        }\n\n        return tags.toArray(new String[tags.size()]);\n    }\n\n    \/\/ returns the canonical name of the actor type associated with an ActorCell\n    private String uncheckedActorNameFrom(final ActorCell actorCell) {\n        return uncheckedActorNameFrom(actorCell.props());\n    }\n\n    \/\/ returns the canonical name of the actor type associated with a Props instance\n    private String uncheckedActorNameFrom(final Props props) {\n        return props.actorClass().getCanonicalName();\n    }\n\n    \/**\n     * Advises the {@code ActorCell.receiveMessage(message: Object): Unit}\n     * We proceed with the pointcut if the actor is to be included in the monitoring *and* this is\n     * the 'multiple-of-n'th time we've seen a message for an actor with a sample rate of n.\n     *\n     * Currently, we sample queue size, the fact that the message is delivered, the simple name of the class of the\n     * message, and the time taken to complete the actor's reactive action.\n     *\n     * @param actorCell the ActorCell where the actor that receives the message \"lives\"\n     * @param msg the incoming message\n     *\/\n    Object around(ActorCell actorCell, Object msg) : Pointcuts.actorCellReceiveMessage(actorCell, msg) {\n        final ActorPath actorPath = actorCell.self().path();\n        final PathAndClass pathAndClass = new PathAndClass(actorPath, Option.apply(uncheckedActorNameFrom(actorCell)));\n        if (!includeActorPath(pathAndClass) || !sampleMessage(pathAndClass)) return proceed(actorCell, msg);\n\n        int samplingRate = getSampleRate(pathAndClass);\n\n        \/\/ we tag by actor name\n        final String[] tags = getTags(actorPath, actorCell.actor());\n\n        \/\/ record the queue size\n        this.counterInterface.recordGaugeValue(\"akka.queue.size\", actorCell.numberOfMessages(), tags);\n        \/\/ record the message, general and specific\n        this.counterInterface.incrementCounter(\"akka.actor.delivered\", samplingRate, tags);\n        this.counterInterface.incrementCounter(\"akka.actor.delivered.\" + msg.getClass().getSimpleName(), samplingRate, tags);\n\n        \/\/ measure the time. we're using the ``nanoTime`` call to access the high-precision timer.\n        \/\/ since we're not really interested in wall time, but just some increasing measure of\n        \/\/ elapsed time\n        Object result = null;\n        final long start = System.nanoTime();\n        \/\/ result will always be ``null``, because target returns ``Unit``\n        result = proceed(actorCell, msg);\n        \/\/ ns or \u00b5s is too fine. ms will do for now.\n        final long duration = (System.nanoTime() - start) \/ 1000000;\n\n        \/\/ record the actor duration\n        this.counterInterface.recordExecutionTime(\"akka.actor.duration\", (int)duration, tags);\n\n        \/\/ return null would do the trick, but we want to be _proper_.\n        return result;\n    }\n\n    \/**\n     * Advises the {@code ActorCell.handleInvokeFailure(_, failure: Throwable): Unit}\n     *\n     * @param actorCell the ActorCell where the error spreads from\n     * @param failure the exception that escaped from the {@code receive} method\n     *\/\n    before(ActorCell actorCell, Throwable failure) : Pointcuts.actorCellHandleInvokeFailure(actorCell, failure) {\n        \/\/ record the error, general and specific\n        String[] tags = getTags(actorCell.self().path(), actorCell.actor());\n        this.counterInterface.incrementCounter(\"akka.actor.error\", tags);\n        this.counterInterface.incrementCounter(String.format(\"akka.actor.error.%s\", failure.getMessage()), tags);\n    }\n\n    \/**\n     * Advises the {@code EventStream.publish(event: Any): Unit}\n     *\n     * @param event the received event\n     *\/\n    before(Object event) : Pointcuts.eventStreamPublish(event) {\n        if (event instanceof UnhandledMessage) {\n            UnhandledMessage unhandledMessage = (UnhandledMessage)event;\n            String[] tags = getTags(unhandledMessage.recipient().path(), null);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered\", tags);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered.\" + unhandledMessage.getMessage().getClass().getSimpleName(), tags);\n        }\n    }\n\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorCell} and {@code ActorSystem}\n     *\n     * @param props the {@code Props} instance used in the call\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after(Props props) returning (ActorRef actor): Pointcuts.anyActorOf(props) {\n        recordActorCreation(props, actor);\n    }\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorCell} and {@code ActorSystem} when actor is named in construction\n     *\n     * @param props the {@code Props} instance used in the call\n     * @param actorName the {@code String} used to name the actor at creation site\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after(Props props, String actorName) returning (ActorRef actor): Pointcuts.namedActorOf(props, actorName) {\n        recordActorCreation(props, actor);\n    }\n\n    \/\/ method containing the recording logic for advising actor creation\n    private void recordActorCreation(Props props, ActorRef actor) {\n        if (!includeActorPath(new PathAndClass(actor.path(), this.noActorClazz))) return;\n        final String uncheckedClassName = uncheckedActorNameFrom(props);\n        final Option<String> className = Option.apply(uncheckedClassName);\n\n        this.numberOfActors.putIfAbsent(className, new AtomicInteger(0));\n        \/\/ increment and get the current number of actors of this type (if the value was 0, then this returns 1 -- which is correct)\n        final int currentNumberOfActors = this.numberOfActors.get(className).incrementAndGet();\n\n        \/\/ record the current number of actors of this type\n        this.counterInterface.recordGaugeValue(\"akka.actor.count\", currentNumberOfActors, uncheckedClassName);\n    }\n\n    \/**\n     * Advises the {@code LocalActorRef.stop} method\n     *\n     *\n     * @param actorCell the {@code ActorCell} of the actor being stopped\n     *\/\n    after(ActorCell actorCell) : Pointcuts.actorCellInternalStop(actorCell) {\n        if (!includeActorPath(new PathAndClass(actorCell.self().path(), this.noActorClazz))) return;\n        final String uncheckedClassName = uncheckedActorNameFrom(actorCell);\n        final Option<String> className = Option.apply(uncheckedClassName);\n\n        this.numberOfActors.putIfAbsent(className, new AtomicInteger(0));\n        \/\/ decrement and get the current number of actors of this type (if the value was 1, then this returns 0 -- which is correct)\n        final int currentNumberOfActors = this.numberOfActors.get(className).decrementAndGet();\n\n        this.counterInterface.recordGaugeValue(\"akka.actor.count\", currentNumberOfActors, uncheckedClassName);\n    }\n\n}","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"d569f0f94261c20908ac04534cdf7c02e09446d2","subject":"Better variable naming","message":"Better variable naming","repos":"treejames\/ignition,Applied-Duality\/ignition,mttkay\/ignition,beni55\/ignition,hongnguyenpro\/ignition","old_file":"ignition-location\/ignition-location-lib\/src\/com\/github\/ignition\/location\/IgnitedLocationManager.aj","new_file":"ignition-location\/ignition-location-lib\/src\/com\/github\/ignition\/location\/IgnitedLocationManager.aj","new_contents":"\/*\n * Copyright 2011 Google Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * This code has been modified by Stefano Dacchille.\n *\/\n\npackage com.github.ignition.location;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\n\nimport android.app.Activity;\nimport android.app.PendingIntent;\nimport android.content.BroadcastReceiver;\nimport android.content.Context;\nimport android.content.Intent;\nimport android.content.IntentFilter;\nimport android.content.SharedPreferences;\nimport android.content.SharedPreferences.Editor;\nimport android.location.Criteria;\nimport android.location.Location;\nimport android.location.LocationListener;\nimport android.location.LocationManager;\nimport android.os.AsyncTask;\nimport android.os.BatteryManager;\nimport android.os.Bundle;\nimport android.os.Handler;\nimport android.util.Log;\n\nimport com.github.ignition.location.annotations.IgnitedLocation;\nimport com.github.ignition.location.annotations.IgnitedLocationActivity;\nimport com.github.ignition.location.receivers.IgnitedLocationChangedReceiver;\nimport com.github.ignition.location.receivers.IgnitedPassiveLocationChangedReceiver;\nimport com.github.ignition.location.tasks.IgnitedLastKnownLocationAsyncTask;\nimport com.github.ignition.location.templates.ILastLocationFinder;\nimport com.github.ignition.location.templates.LocationUpdateRequester;\nimport com.github.ignition.location.templates.OnIgnitedLocationChangedListener;\nimport com.github.ignition.location.utils.PlatformSpecificImplementationFactory;\nimport com.github.ignition.support.IgnitedDiagnostics;\n\n@SuppressAjWarnings\npublic aspect IgnitedLocationManager {\n    public static final String LOG_TAG = IgnitedLocationManager.class.getSimpleName();\n\n    declare parents : (@IgnitedLocationActivity *) implements OnIgnitedLocationChangedListener;\n\n    private Criteria defaultCriteria;\n    protected LocationUpdateRequester locationUpdateRequester;\n    protected PendingIntent locationListenerPendingIntent, locationListenerPassivePendingIntent;\n    protected LocationManager locationManager;\n    protected IgnitedLocationListener bestInactiveLocationProviderListener;\n\n    private Context context;\n    private volatile Location currentLocation;\n    private long locationUpdatesInterval, passiveLocationUpdatesInterval;\n    private int locationUpdatesDistanceDiff, passiveLocationUpdatesDistanceDiff;\n    private boolean requestLocationUpdates;\n    private boolean locationUpdatesDisabled = true;\n\n    private AsyncTask<Void, Void, Location> ignitedLastKnownLocationTask;\n    private SharedPreferences prefs;\n    private Handler handler;\n\n    \/\/ Switch to another provider if gps doesn't return a location quickly enough.\n    private Runnable removeGpsUpdates = new Runnable() {\n        @Override\n        public void run() {\n            Log.d(LOG_TAG,\n                    \"It looks like GPS isn't available at this time (i.e.: maybe you're indoors). Removing GPS location updates and requesting network updates.\");\n\n            disableLocationUpdates(false);\n            requestLocationUpdates(context);\n        }\n    };\n\n    \/**\n     * If the Location Provider we're using to receive location updates is disabled while the app is\n     * running, this Receiver will be notified, allowing us to re-register our Location Receivers\n     * using the best available Location Provider is still available.\n     *\/\n    protected BroadcastReceiver locationProviderDisabledReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            boolean providerDisabled = !intent.getBooleanExtra(\n                    LocationManager.KEY_PROVIDER_ENABLED, false);\n            \/\/ Re-register the location listeners using the best available\n            \/\/ Location Provider.\n            if (providerDisabled) {\n                disableLocationUpdates(false);\n                requestLocationUpdates(context);\n            }\n        }\n    };\n\n    \/**\n     * If the battery state is low disable the passive location update receiver.\n     *\/\n    protected BroadcastReceiver refreshLocationUpdatesReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            disableLocationUpdates(false);\n            requestLocationUpdates(context);\n        }\n    };\n\n    after(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onCreate(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n\n        \/\/ Get a reference to the Context\n        this.context = context;\n        \/\/ Set pref file\n        prefs = context.getSharedPreferences(IgnitedLocationConstants.SHARED_PREFERENCE_FILE,\n                Context.MODE_PRIVATE);\n        \/\/ Get references to the managers\n        locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);\n        handler = new Handler();\n\n        \/\/ Specify the Criteria to use when requesting location updates while\n        \/\/ the application is Active\n        defaultCriteria = new Criteria();\n        \/\/ Use gps if it's enabled and if battery level is at least 15%\n        boolean useGps = prefs.getBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS,\n                IgnitedLocationConstants.USE_GPS_DEFAULT);\n        if (useGps) {\n            defaultCriteria.setAccuracy(Criteria.ACCURACY_FINE);\n        } else {\n            defaultCriteria.setPowerRequirement(Criteria.POWER_LOW);\n        }\n\n        \/\/ Setup the location update Pending Intent\n        Intent activeIntent = new Intent(IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_ACTION);\n        locationListenerPendingIntent = PendingIntent.getBroadcast(context, 0, activeIntent,\n                PendingIntent.FLAG_UPDATE_CURRENT);\n        \/\/ Setup the passive location update Pending Intent\n        Intent passiveIntent = new Intent(context, IgnitedPassiveLocationChangedReceiver.class);\n        locationListenerPassivePendingIntent = PendingIntent.getBroadcast(context, 0,\n                passiveIntent, PendingIntent.FLAG_UPDATE_CURRENT);\n\n        \/\/ Instantiate a Location Update Requester class based on the available\n        \/\/ platform version. This will be used to request location updates.\n        locationUpdateRequester = PlatformSpecificImplementationFactory\n                .getLocationUpdateRequester(context);\n    }\n\n    private boolean isBatteryOk() {\n        IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);\n        Intent intent = context.registerReceiver(null, filter);\n        double currentLevel = 100.0;\n        if (intent != null) {\n            currentLevel = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1);\n        }\n\n        return currentLevel >= prefs.getInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                IgnitedLocationConstants.MIN_BATTERY_LEVEL_DEFAULT);\n    }\n\n    before(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onResume(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n        \/\/ Get a reference to the Context if this context is null\n        if (this.context == null) {\n            this.context = context;\n        }\n\n        saveToPreferences(context, ignitedAnnotation);\n\n        Log.d(LOG_TAG, \"Retrieving last known location...\");\n        \/\/ Get the last known location. This isn't directly affecting the UI, so put it on a\n        \/\/ worker thread.\n        ignitedLastKnownLocationTask = new IgnitedLastKnownLocationAsyncTask(\n                context, locationUpdatesDistanceDiff, locationUpdatesInterval);\n        ignitedLastKnownLocationTask.execute();\n    }\n\n    \/**\n     * Save last settings to preferences.\n     * \n     * @param context\n     * @param locationAnnotation\n     *\/\n    private void saveToPreferences(Context context, IgnitedLocationActivity locationAnnotation) {\n        requestLocationUpdates = locationAnnotation.requestLocationUpdates();\n        locationUpdatesDistanceDiff = locationAnnotation.locationUpdatesDistanceDiff();\n        locationUpdatesInterval = locationAnnotation.locationUpdatesInterval();\n        passiveLocationUpdatesDistanceDiff = locationAnnotation\n                .passiveLocationUpdatesDistanceDiff();\n        passiveLocationUpdatesInterval = locationAnnotation.passiveLocationUpdatesInterval();\n        boolean enablePassiveLocationUpdates = locationAnnotation.enablePassiveUpdates();\n        boolean useGps = locationAnnotation.useGps();\n\n        Editor editor = prefs.edit();\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_LOCATION_UPDATES,\n                requestLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                enablePassiveLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS, useGps);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_DISTANCE_DIFF,\n                locationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_INTERVAL,\n                locationUpdatesInterval);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_DISTANCE_DIFF,\n                passiveLocationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_INTERVAL,\n                passiveLocationUpdatesInterval);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_RUN_ONCE, true);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                locationAnnotation.minBatteryLevel());\n        editor.putLong(IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                locationAnnotation.waitForGpsFix());\n        editor.commit();\n\n    }\n\n    before(Activity activity, IgnitedLocationActivity ignitedAnnotation) : execution(* Activity.onPause(..)) \n        && @this(ignitedAnnotation) && this(activity)\n        && within(@IgnitedLocationActivity *) && if (ignitedAnnotation.requestLocationUpdates()) {\n\n        disableLocationUpdates(true);\n\n        handler.removeCallbacks(removeGpsUpdates);\n\n        boolean finishing = activity.isFinishing();\n        if (finishing) {\n            if (ignitedLastKnownLocationTask != null && ignitedLastKnownLocationTask.getStatus() != AsyncTask.Status.FINISHED) {\n                ignitedLastKnownLocationTask.cancel(true);\n            } else {\n                PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            }\n\n            context = null;\n        }\n    }\n\n    \/\/ after() : execution(* Activity.onDestroy(..)) && @this(IgnitedLocationActivity)\n    \/\/ && within(@IgnitedLocationActivity *) {\n    \/\/ }\n\n    Location around() : get(@IgnitedLocation Location *) {\n        return currentLocation;\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && within(IgnitedPassiveLocationChangedReceiver) && !adviceexecution() {\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, long): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude());\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && (within(IgnitedLocationChangedReceiver) || within(com.github.ignition.location.utils.*)\n                || within(IgnitedLastKnownLocationAsyncTask)) && !adviceexecution() {\n\n        if (context == null) {\n            return;\n        }\n        final Activity activity = (Activity) context;\n        if (freshLocation == null) {\n            activity.showDialog(R.id.ign_loc_dialog_wait_for_fix);\n            return;\n        }\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, long): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude());\n        boolean keepRequestingLocationUpdates = ((OnIgnitedLocationChangedListener) context)\n                .onIgnitedLocationChanged(currentLocation);\n        if (!keepRequestingLocationUpdates) {\n            if (!locationUpdatesDisabled) {\n                disableLocationUpdates(true);\n            }\n            PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            return;\n                && locationUpdatesDisabled\n        } else if (requestLocationUpdates\n                && !freshLocation.getExtras().getBoolean(\n                        ILastLocationFinder.LAST_LOCATION_TOO_OLD_EXTRA)) {\n            \/\/ If we requested location updates, turn them on here.\n            requestLocationUpdates(context);\n        }\n\n        \/\/ If gps is enabled location comes from gps, remove runnable that removes gps updates\n        boolean lastLocation = freshLocation.getExtras().getBoolean(\n                IgnitedLocationConstants.IGNITED_LAST_LOCATION_EXTRA);\n        if (!lastLocation && defaultCriteria.getAccuracy() == Criteria.ACCURACY_FINE\n                && currentLocation.getProvider().equals(LocationManager.GPS_PROVIDER)) {\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n    }\n\n    \/**\n     * Start listening for location updates.\n     *\/\n    protected void requestLocationUpdates(Context context) {\n        Criteria locationUpdateCriteria;\n        if (isBatteryOk()) {\n            locationUpdateCriteria = defaultCriteria;\n        } else {\n            locationUpdateCriteria = lowBatteryConsumptionCriteria();\n        }\n\n        Log.d(LOG_TAG, \"Disabling passive location updates\");\n        locationManager.removeUpdates(locationListenerPassivePendingIntent);\n\n        Log.d(LOG_TAG, \"Requesting location updates\");\n        \/\/ Normal updates while activity is visible.\n        locationUpdateRequester.requestLocationUpdates(locationUpdatesInterval,\n                locationUpdatesDistanceDiff, locationUpdateCriteria, locationListenerPendingIntent);\n\n        \/\/ Register a receiver that listens for when the provider I'm using has\n        \/\/ been disabled.\n        IntentFilter locationProviderDisabledIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_PROVIDER_DISABLED_ACTION);\n        context.registerReceiver(locationProviderDisabledReceiver,\n                locationProviderDisabledIntentFilter);\n\n        IntentFilter refreshLocationUpdatesIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.UPDATE_LOCATION_UPDATES_CRITERIA_ACTION);\n        context.registerReceiver(refreshLocationUpdatesReceiver, refreshLocationUpdatesIntentFilter);\n\n        \/\/ Register a receiver that listens for when a better provider than I'm\n        \/\/ using becomes available.\n        String bestProvider = locationManager.getBestProvider(locationUpdateCriteria, false);\n        String bestAvailableProvider = locationManager.getBestProvider(locationUpdateCriteria, true);\n        if (bestProvider != null && !bestProvider.equals(bestAvailableProvider)) {\n            bestInactiveLocationProviderListener = new IgnitedLocationListener(context);\n            locationManager.requestLocationUpdates(bestProvider, 0, 0,\n                    bestInactiveLocationProviderListener, context.getMainLooper());\n        }\n\n        if (bestAvailableProvider.equals(LocationManager.GPS_PROVIDER)) {\n            Log.d(LOG_TAG, \"Posting delayed remove GPS updates message\");\n            \/\/ Post a runnable that will remove gps updates if no gps location is returned after 1\n            \/\/ minute in order to avoid draining the battery.\n            handler.postDelayed(removeGpsUpdates, prefs.getLong(\n                    IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                    IgnitedLocationConstants.WAIT_FOR_GPS_FIX_INTERVAL_DEFAULT));\n        }\n\n        locationUpdatesDisabled = false;\n    }\n\n    \/**\n     * Stop listening for location updates\n     * \n     * @param enablePassiveLocationUpdates\n     *\/\n    protected void disableLocationUpdates(boolean requestPassiveLocationUpdates) {\n        if (locationUpdatesDisabled) {\n            return;\n        }\n\n        Log.d(LOG_TAG, \"Disabling location updates\");\n        context.unregisterReceiver(locationProviderDisabledReceiver);\n        context.unregisterReceiver(refreshLocationUpdatesReceiver);\n\n        locationUpdateRequester.removeLocationUpdates();\n        if (bestInactiveLocationProviderListener != null) {\n            locationManager.removeUpdates(bestInactiveLocationProviderListener);\n        }\n\n        boolean finishing = ((Activity) context).isFinishing();\n\n        if (requestPassiveLocationUpdates && !finishing) {\n            requestPassiveLocationUpdates();\n        }\n\n        locationUpdatesDisabled = true;\n    }\n\n    private void requestPassiveLocationUpdates() {\n        if (IgnitedDiagnostics.SUPPORTS_FROYO\n                && prefs.getBoolean(\n                        IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                        IgnitedLocationConstants.ENABLE_PASSIVE_LOCATION_UPDATES_DEFAULT)) {\n            Log.d(LOG_TAG, \"Requesting passive location updates\");\n            \/\/ Passive location updates from 3rd party apps when the Activity isn't\n            \/\/ visible. Only for Android 2.2+.\n            locationUpdateRequester.requestPassiveLocationUpdates(passiveLocationUpdatesInterval,\n                    passiveLocationUpdatesDistanceDiff, locationListenerPassivePendingIntent);\n        }\n    }\n\n    public boolean isLocationUpdatesDisabled() {\n        return locationUpdatesDisabled;\n    }\n\n    public Criteria lowBatteryConsumptionCriteria() {\n        Criteria criteria = new Criteria();\n        criteria.setPowerRequirement(Criteria.POWER_LOW);\n        criteria.setAccuracy(Criteria.NO_REQUIREMENT);\n        return criteria;\n    }\n\n    \/**\n     * If the best Location Provider (usually GPS) is not available when we request location\n     * updates, this listener will be notified if \/ when it becomes available. It calls\n     * requestLocationUpdates to re-register the location listeners using the better Location\n     * Provider.\n     *\/\n    private class IgnitedLocationListener implements LocationListener {\n        private Context context;\n\n        public IgnitedLocationListener(Context appContext) {\n            this.context = appContext;\n        }\n\n        @Override\n        public void onLocationChanged(Location l) {\n        }\n\n        @Override\n        public void onProviderDisabled(String provider) {\n        }\n\n        @Override\n        public void onStatusChanged(String provider, int status, Bundle extras) {\n        }\n\n        @Override\n        public void onProviderEnabled(String provider) {\n            \/\/ Re-register the location listeners using the better Location\n            \/\/ Provider.\n            disableLocationUpdates(false);\n            requestLocationUpdates(context);\n        }\n    }\n\n}\n","old_contents":"\/*\n * Copyright 2011 Google Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * This code has been modified by Stefano Dacchille.\n *\/\n\npackage com.github.ignition.location;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\n\nimport android.app.Activity;\nimport android.app.PendingIntent;\nimport android.content.BroadcastReceiver;\nimport android.content.Context;\nimport android.content.Intent;\nimport android.content.IntentFilter;\nimport android.content.SharedPreferences;\nimport android.content.SharedPreferences.Editor;\nimport android.location.Criteria;\nimport android.location.Location;\nimport android.location.LocationListener;\nimport android.location.LocationManager;\nimport android.os.AsyncTask;\nimport android.os.BatteryManager;\nimport android.os.Bundle;\nimport android.os.Handler;\nimport android.util.Log;\n\nimport com.github.ignition.location.annotations.IgnitedLocation;\nimport com.github.ignition.location.annotations.IgnitedLocationActivity;\nimport com.github.ignition.location.receivers.IgnitedLocationChangedReceiver;\nimport com.github.ignition.location.receivers.IgnitedPassiveLocationChangedReceiver;\nimport com.github.ignition.location.tasks.IgnitedLastKnownLocationAsyncTask;\nimport com.github.ignition.location.templates.ILastLocationFinder;\nimport com.github.ignition.location.templates.LocationUpdateRequester;\nimport com.github.ignition.location.templates.OnIgnitedLocationChangedListener;\nimport com.github.ignition.location.utils.PlatformSpecificImplementationFactory;\nimport com.github.ignition.support.IgnitedDiagnostics;\n\n@SuppressAjWarnings\npublic aspect IgnitedLocationManager {\n    public static final String LOG_TAG = IgnitedLocationManager.class.getSimpleName();\n\n    declare parents : (@IgnitedLocationActivity *) implements OnIgnitedLocationChangedListener;\n\n    private Criteria defaultCriteria;\n    protected LocationUpdateRequester locationUpdateRequester;\n    protected PendingIntent locationListenerPendingIntent, locationListenerPassivePendingIntent;\n    protected LocationManager locationManager;\n    protected IgnitedLocationListener bestInactiveLocationProviderListener;\n\n    private Context context;\n    private volatile Location currentLocation;\n    private long locationUpdatesInterval, passiveLocationUpdatesInterval;\n    private int locationUpdatesDistanceDiff, passiveLocationUpdatesDistanceDiff;\n    private boolean enableLocationUpdates;\n    private boolean locationUpdatesDisabled = true;\n\n    private AsyncTask<Void, Void, Location> ignitedLastKnownLocationTask;\n    private SharedPreferences prefs;\n    private Handler handler;\n\n    \/\/ Switch to another provider if gps doesn't return a location quickly enough.\n    private Runnable removeGpsUpdates = new Runnable() {\n        @Override\n        public void run() {\n            Log.d(LOG_TAG,\n                    \"It looks like GPS isn't available at this time (i.e.: maybe you're indoors). Removing GPS location updates and requesting network updates.\");\n\n            disableLocationUpdates(false);\n            requestLocationUpdates(context);\n        }\n    };\n\n    \/**\n     * If the Location Provider we're using to receive location updates is disabled while the app is\n     * running, this Receiver will be notified, allowing us to re-register our Location Receivers\n     * using the best available Location Provider is still available.\n     *\/\n    protected BroadcastReceiver locationProviderDisabledReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            boolean providerDisabled = !intent.getBooleanExtra(\n                    LocationManager.KEY_PROVIDER_ENABLED, false);\n            \/\/ Re-register the location listeners using the best available\n            \/\/ Location Provider.\n            if (providerDisabled) {\n                disableLocationUpdates(false);\n                requestLocationUpdates(context);\n            }\n        }\n    };\n\n    \/**\n     * If the battery state is low disable the passive location update receiver.\n     *\/\n    protected BroadcastReceiver refreshLocationUpdatesReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            disableLocationUpdates(false);\n            requestLocationUpdates(context);\n        }\n    };\n\n    after(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onCreate(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n\n        \/\/ Get a reference to the Context\n        this.context = context;\n        \/\/ Set pref file\n        prefs = context.getSharedPreferences(IgnitedLocationConstants.SHARED_PREFERENCE_FILE,\n                Context.MODE_PRIVATE);\n        \/\/ Get references to the managers\n        locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);\n        handler = new Handler();\n\n        \/\/ Specify the Criteria to use when requesting location updates while\n        \/\/ the application is Active\n        defaultCriteria = new Criteria();\n        \/\/ Use gps if it's enabled and if battery level is at least 15%\n        boolean useGps = prefs.getBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS,\n                IgnitedLocationConstants.USE_GPS_DEFAULT);\n        if (useGps) {\n            defaultCriteria.setAccuracy(Criteria.ACCURACY_FINE);\n        } else {\n            defaultCriteria.setPowerRequirement(Criteria.POWER_LOW);\n        }\n\n        \/\/ Setup the location update Pending Intent\n        Intent activeIntent = new Intent(IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_ACTION);\n        locationListenerPendingIntent = PendingIntent.getBroadcast(context, 0, activeIntent,\n                PendingIntent.FLAG_UPDATE_CURRENT);\n        \/\/ Setup the passive location update Pending Intent\n        Intent passiveIntent = new Intent(context, IgnitedPassiveLocationChangedReceiver.class);\n        locationListenerPassivePendingIntent = PendingIntent.getBroadcast(context, 0,\n                passiveIntent, PendingIntent.FLAG_UPDATE_CURRENT);\n\n        \/\/ Instantiate a Location Update Requester class based on the available\n        \/\/ platform version. This will be used to request location updates.\n        locationUpdateRequester = PlatformSpecificImplementationFactory\n                .getLocationUpdateRequester(context);\n    }\n\n    private boolean isBatteryOk() {\n        IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);\n        Intent intent = context.registerReceiver(null, filter);\n        double currentLevel = 100.0;\n        if (intent != null) {\n            currentLevel = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1);\n        }\n\n        return currentLevel >= prefs.getInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                IgnitedLocationConstants.MIN_BATTERY_LEVEL_DEFAULT);\n    }\n\n    before(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onResume(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n        \/\/ Get a reference to the Context if this context is null\n        if (this.context == null) {\n            this.context = context;\n        }\n\n        saveToPreferences(context, ignitedAnnotation);\n\n        Log.d(LOG_TAG, \"Retrieving last known location...\");\n        \/\/ Get the last known location. This isn't directly affecting the UI, so put it on a\n        \/\/ worker thread.\n        ignitedLastKnownLocationTask = new IgnitedLastKnownLocationAsyncTask(\n                context, locationUpdatesDistanceDiff, locationUpdatesInterval);\n        ignitedLastKnownLocationTask.execute();\n    }\n\n    \/**\n     * Save last settings to preferences.\n     * \n     * @param context\n     * @param locationAnnotation\n     *\/\n    private void saveToPreferences(Context context, IgnitedLocationActivity locationAnnotation) {\n        enableLocationUpdates = locationAnnotation.requestLocationUpdates();\n        locationUpdatesDistanceDiff = locationAnnotation.locationUpdatesDistanceDiff();\n        locationUpdatesInterval = locationAnnotation.locationUpdatesInterval();\n        passiveLocationUpdatesDistanceDiff = locationAnnotation\n                .passiveLocationUpdatesDistanceDiff();\n        passiveLocationUpdatesInterval = locationAnnotation.passiveLocationUpdatesInterval();\n        boolean enablePassiveLocationUpdates = locationAnnotation.enablePassiveUpdates();\n        boolean useGps = locationAnnotation.useGps();\n\n        Editor editor = prefs.edit();\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_LOCATION_UPDATES,\n                enableLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                enablePassiveLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS, useGps);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_DISTANCE_DIFF,\n                locationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_INTERVAL,\n                locationUpdatesInterval);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_DISTANCE_DIFF,\n                passiveLocationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_INTERVAL,\n                passiveLocationUpdatesInterval);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_RUN_ONCE, true);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                locationAnnotation.minBatteryLevel());\n        editor.putLong(IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                locationAnnotation.waitForGpsFix());\n        editor.commit();\n\n    }\n\n    before(Activity activity, IgnitedLocationActivity ignitedAnnotation) : execution(* Activity.onPause(..)) \n        && @this(ignitedAnnotation) && this(activity)\n        && within(@IgnitedLocationActivity *) && if (ignitedAnnotation.requestLocationUpdates()) {\n\n        disableLocationUpdates(true);\n\n        handler.removeCallbacks(removeGpsUpdates);\n\n        boolean finishing = activity.isFinishing();\n        if (finishing) {\n            if (ignitedLastKnownLocationTask != null && ignitedLastKnownLocationTask.getStatus() != AsyncTask.Status.FINISHED) {\n                ignitedLastKnownLocationTask.cancel(true);\n            } else {\n                PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            }\n\n            context = null;\n        }\n    }\n\n    \/\/ after() : execution(* Activity.onDestroy(..)) && @this(IgnitedLocationActivity)\n    \/\/ && within(@IgnitedLocationActivity *) {\n    \/\/ }\n\n    Location around() : get(@IgnitedLocation Location *) {\n        return currentLocation;\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && within(IgnitedPassiveLocationChangedReceiver) && !adviceexecution() {\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, long): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude());\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && (within(IgnitedLocationChangedReceiver) || within(com.github.ignition.location.utils.*)\n                || within(IgnitedLastKnownLocationAsyncTask)) && !adviceexecution() {\n\n        if (context == null) {\n            return;\n        }\n        final Activity activity = (Activity) context;\n        if (freshLocation == null) {\n            activity.showDialog(R.id.ign_loc_dialog_wait_for_fix);\n            return;\n        }\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, long): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude());\n        boolean keepRequestingLocationUpdates = ((OnIgnitedLocationChangedListener) context)\n                .onIgnitedLocationChanged(currentLocation);\n        if (!keepRequestingLocationUpdates) {\n            if (!locationUpdatesDisabled) {\n                disableLocationUpdates(true);\n            }\n            PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            return;\n        } else if (enableLocationUpdates\n                && locationUpdatesDisabled\n                && !freshLocation.getExtras().getBoolean(\n                        ILastLocationFinder.LAST_LOCATION_TOO_OLD_EXTRA)) {\n            \/\/ If we have requested location updates, turn them on here.\n            requestLocationUpdates(context);\n        }\n\n        \/\/ If gps is enabled location comes from gps, remove runnable that removes gps updates\n        boolean lastLocation = freshLocation.getExtras().getBoolean(\n                IgnitedLocationConstants.IGNITED_LAST_LOCATION_EXTRA);\n        if (!lastLocation && defaultCriteria.getAccuracy() == Criteria.ACCURACY_FINE\n                && currentLocation.getProvider().equals(LocationManager.GPS_PROVIDER)) {\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n    }\n\n    \/**\n     * Start listening for location updates.\n     *\/\n    protected void requestLocationUpdates(Context context) {\n        Criteria locationUpdateCriteria;\n        if (isBatteryOk()) {\n            locationUpdateCriteria = defaultCriteria;\n        } else {\n            locationUpdateCriteria = lowBatteryConsumptionCriteria();\n        }\n\n        Log.d(LOG_TAG, \"Disabling passive location updates\");\n        locationManager.removeUpdates(locationListenerPassivePendingIntent);\n\n        Log.d(LOG_TAG, \"Requesting location updates\");\n        \/\/ Normal updates while activity is visible.\n        locationUpdateRequester.requestLocationUpdates(locationUpdatesInterval,\n                locationUpdatesDistanceDiff, locationUpdateCriteria, locationListenerPendingIntent);\n\n        \/\/ Register a receiver that listens for when the provider I'm using has\n        \/\/ been disabled.\n        IntentFilter locationProviderDisabledIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_PROVIDER_DISABLED_ACTION);\n        context.registerReceiver(locationProviderDisabledReceiver,\n                locationProviderDisabledIntentFilter);\n\n        IntentFilter refreshLocationUpdatesIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.UPDATE_LOCATION_UPDATES_CRITERIA_ACTION);\n        context.registerReceiver(refreshLocationUpdatesReceiver, refreshLocationUpdatesIntentFilter);\n\n        \/\/ Register a receiver that listens for when a better provider than I'm\n        \/\/ using becomes available.\n        String bestProvider = locationManager.getBestProvider(locationUpdateCriteria, false);\n        String bestAvailableProvider = locationManager.getBestProvider(locationUpdateCriteria, true);\n        if (bestProvider != null && !bestProvider.equals(bestAvailableProvider)) {\n            bestInactiveLocationProviderListener = new IgnitedLocationListener(context);\n            locationManager.requestLocationUpdates(bestProvider, 0, 0,\n                    bestInactiveLocationProviderListener, context.getMainLooper());\n        }\n\n        if (bestAvailableProvider.equals(LocationManager.GPS_PROVIDER)) {\n            Log.d(LOG_TAG, \"Posting delayed remove GPS updates message\");\n            \/\/ Post a runnable that will remove gps updates if no gps location is returned after 1\n            \/\/ minute in order to avoid draining the battery.\n            handler.postDelayed(removeGpsUpdates, prefs.getLong(\n                    IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                    IgnitedLocationConstants.WAIT_FOR_GPS_FIX_INTERVAL_DEFAULT));\n        }\n\n        locationUpdatesDisabled = false;\n    }\n\n    \/**\n     * Stop listening for location updates\n     * \n     * @param enablePassiveLocationUpdates\n     *\/\n    protected void disableLocationUpdates(boolean requestPassiveLocationUpdates) {\n        if (locationUpdatesDisabled) {\n            return;\n        }\n\n        Log.d(LOG_TAG, \"Disabling location updates\");\n        context.unregisterReceiver(locationProviderDisabledReceiver);\n        context.unregisterReceiver(refreshLocationUpdatesReceiver);\n\n        locationUpdateRequester.removeLocationUpdates();\n        if (bestInactiveLocationProviderListener != null) {\n            locationManager.removeUpdates(bestInactiveLocationProviderListener);\n        }\n\n        boolean finishing = ((Activity) context).isFinishing();\n\n        if (requestPassiveLocationUpdates && !finishing) {\n            requestPassiveLocationUpdates();\n        }\n\n        locationUpdatesDisabled = true;\n    }\n\n    private void requestPassiveLocationUpdates() {\n        if (IgnitedDiagnostics.SUPPORTS_FROYO\n                && prefs.getBoolean(\n                        IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                        IgnitedLocationConstants.ENABLE_PASSIVE_LOCATION_UPDATES_DEFAULT)) {\n            Log.d(LOG_TAG, \"Requesting passive location updates\");\n            \/\/ Passive location updates from 3rd party apps when the Activity isn't\n            \/\/ visible. Only for Android 2.2+.\n            locationUpdateRequester.requestPassiveLocationUpdates(passiveLocationUpdatesInterval,\n                    passiveLocationUpdatesDistanceDiff, locationListenerPassivePendingIntent);\n        }\n    }\n\n    public boolean isLocationUpdatesDisabled() {\n        return locationUpdatesDisabled;\n    }\n\n    public Criteria lowBatteryConsumptionCriteria() {\n        Criteria criteria = new Criteria();\n        criteria.setPowerRequirement(Criteria.POWER_LOW);\n        criteria.setAccuracy(Criteria.NO_REQUIREMENT);\n        return criteria;\n    }\n\n    \/**\n     * If the best Location Provider (usually GPS) is not available when we request location\n     * updates, this listener will be notified if \/ when it becomes available. It calls\n     * requestLocationUpdates to re-register the location listeners using the better Location\n     * Provider.\n     *\/\n    private class IgnitedLocationListener implements LocationListener {\n        private Context context;\n\n        public IgnitedLocationListener(Context appContext) {\n            this.context = appContext;\n        }\n\n        @Override\n        public void onLocationChanged(Location l) {\n        }\n\n        @Override\n        public void onProviderDisabled(String provider) {\n        }\n\n        @Override\n        public void onStatusChanged(String provider, int status, Bundle extras) {\n        }\n\n        @Override\n        public void onProviderEnabled(String provider) {\n            \/\/ Re-register the location listeners using the better Location\n            \/\/ Provider.\n            disableLocationUpdates(false);\n            requestLocationUpdates(context);\n        }\n    }\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"5bd9570236abdb1704903ed24472cd10c7a9d02d","subject":"Fix legacy","message":"Fix legacy\n","repos":"xwiki\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform,pbondoer\/xwiki-platform,pbondoer\/xwiki-platform","old_file":"xwiki-platform-core\/xwiki-platform-legacy\/xwiki-platform-legacy-oldcore\/src\/main\/aspect\/com\/xpn\/xwiki\/XWikiCompatibilityAspect.aj","new_file":"xwiki-platform-core\/xwiki-platform-legacy\/xwiki-platform-legacy-oldcore\/src\/main\/aspect\/com\/xpn\/xwiki\/XWikiCompatibilityAspect.aj","new_contents":"\/*\n * See the NOTICE file distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This is free software; you can redistribute it and\/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF site: http:\/\/www.fsf.org.\n *\/\npackage com.xpn.xwiki;\n\nimport java.io.UnsupportedEncodingException;\nimport java.io.File;\nimport java.lang.reflect.Type;\nimport java.net.URL;\nimport java.net.URLEncoder;\nimport java.util.ArrayList;\nimport java.util.HashMap;\nimport java.util.List;\nimport java.util.Map;\n\nimport org.apache.commons.lang3.StringUtils;\nimport org.xwiki.cache.CacheException;\nimport org.xwiki.cache.CacheFactory;\nimport org.xwiki.cache.CacheManager;\nimport org.xwiki.cache.config.CacheConfiguration;\nimport org.xwiki.cache.eviction.LRUEvictionConfiguration;\nimport org.xwiki.component.manager.ComponentLookupException;\nimport org.xwiki.context.Execution;\nimport org.xwiki.context.ExecutionContext;\nimport org.xwiki.environment.Environment;\nimport org.xwiki.rendering.syntax.Syntax;\nimport org.xwiki.xml.XMLUtils;\nimport org.xwiki.model.reference.EntityReference;\nimport org.xwiki.model.reference.EntityReferenceResolver;\nimport org.xwiki.model.reference.DocumentReference;\nimport org.xwiki.model.reference.EntityReferenceSerializer;\nimport org.xwiki.model.reference.WikiReference;\nimport org.xwiki.model.EntityType;\nimport org.xwiki.url.XWikiEntityURL;\n\nimport com.xpn.xwiki.cache.api.XWikiCache;\nimport com.xpn.xwiki.cache.api.XWikiCacheService;\nimport com.xpn.xwiki.cache.api.internal.XWikiCacheServiceStub;\nimport com.xpn.xwiki.cache.api.internal.XWikiCacheStub;\nimport com.xpn.xwiki.doc.XWikiDocument;\nimport com.xpn.xwiki.notify.XWikiNotificationManager;\nimport com.xpn.xwiki.objects.BaseObject;\nimport com.xpn.xwiki.objects.classes.BaseClass;\nimport com.xpn.xwiki.objects.classes.PropertyClass;\nimport com.xpn.xwiki.plugin.query.QueryPlugin;\nimport com.xpn.xwiki.plugin.query.XWikiCriteria;\nimport com.xpn.xwiki.plugin.query.XWikiQuery;\nimport com.xpn.xwiki.util.Util;\nimport com.xpn.xwiki.web.Utils;\nimport com.xpn.xwiki.web.XWikiMessageTool;\nimport com.xpn.xwiki.web.XWikiRequest;\n\n\/**\n * Add a backward compatibility layer to the {@link com.xpn.xwiki.XWiki} class.\n * \n * @version $Id$\n *\/\npublic privileged aspect XWikiCompatibilityAspect\n{\n    private static Map XWiki.threadMap = new HashMap();\n\n    private XWikiNotificationManager XWiki.notificationManager;\n\n    private EntityReferenceResolver<EntityReference> XWiki.defaultReferenceEntityReferenceResolver = Utils.getComponent(\n        EntityReferenceResolver.TYPE_REFERENCE);\n\n    private EntityReferenceSerializer<String> XWiki.localStringEntityReferenceSerializer = Utils.getComponent(\n        EntityReferenceSerializer.TYPE_STRING, \"local\");\n\n    \n    \/**\n     * Used to get the temporary and permanent directory.\n     *\/\n    private Environment XWiki.environment = Utils.getComponent((Type) Environment.class);\n\n    \/** Is the wiki running in test mode? Deprecated, was used when running Cactus tests. *\/\n    private boolean XWiki.test = false;\n\n    \/**\n     * Transform a text in a URL compatible text\n     *\n     * @param content text to transform\n     * @return encoded result\n     * @deprecated replaced by Util#encodeURI since 1.3M2\n     *\/\n    @Deprecated\n    public String XWiki.getURLEncoded(String content)\n    {\n        try {\n            return URLEncoder.encode(content, this.getEncoding());\n        } catch (UnsupportedEncodingException e) {\n            return content;\n        }\n    }\n\n    \/**\n     * @return true for multi-wiki\/false for mono-wiki\n     * @deprecated replaced by {@link XWiki#isVirtualMode()} since 1.4M1.\n     *\/\n    @Deprecated\n    public boolean XWiki.isVirtual()\n    {\n        return isVirtualMode();\n    }\n\n    \/**\n     * @deprecated Virtual mode is on by default, starting with XWiki 5.0M2. Use\n     *             {@link #getVirtualWikisDatabaseNames(XWikiContext)} to get the list of wikis if needed.\n     * @return true for multi-wiki\/false for mono-wiki\n     *\/\n    @Deprecated\n    public boolean XWiki.isVirtualMode()\n    {\n        return true;\n    }\n\n    \/**\n     * @deprecated Removed since it isn't used; since 1.5M1.\n     *\/\n    @Deprecated\n    public static Map XWiki.getThreadMap()\n    {\n        return XWiki.threadMap;\n    }\n\n    \/**\n     * @deprecated Removed since it isn't used; since 1.5M1.\n     *\/\n    @Deprecated\n    public static void XWiki.setThreadMap(Map threadMap)\n    {\n        XWiki.threadMap = threadMap;\n    }\n\n    \/**\n     * @return the cache service.\n     * @deprecated replaced by {@link XWiki#getCacheFactory(XWikiContext)} or\n     *             {@link XWiki#getLocalCacheFactory(XWikiContext)} since 1.5M2.\n     *\/\n    @Deprecated\n    public XWikiCacheService XWiki.getCacheService()\n    {\n        return new XWikiCacheServiceStub(getCacheFactory(), getLocalCacheFactory());\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getVirtualWikiCache(XWikiContext)} since 1.5M2.\n     *\/\n    @Deprecated\n    public XWikiCache XWiki.getVirtualWikiMap()\n    {\n        return new XWikiCacheStub(this.virtualWikiMap);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpaceCopyright(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebCopyright(XWikiContext context)\n    {\n        return this.getSpaceCopyright(context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, String defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, String, String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, String space, String defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, space, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsLong(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public long XWiki.getWebPreferenceAsLong(String preference, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsLong(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsLong(String, long, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public long XWiki.getWebPreferenceAsLong(String preference, long defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsLong(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsInt(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.getWebPreferenceAsInt(String preference, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsInt(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsInt(String, int, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.getWebPreferenceAsInt(String preference, int defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsInt(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#copySpaceBetweenWikis(String, String, String, String, XWikiContext)} since\n     *             2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.copyWikiWeb(String space, String sourceWiki, String targetWiki, String language, XWikiContext context)\n        throws XWikiException\n    {\n        return this.copySpaceBetweenWikis(space, sourceWiki, targetWiki, language, context);\n    }\n\n    \/**\n     * @deprecated replaced by\n     *             {@link XWiki#copySpaceBetweenWikis(String, String, String, String, boolean, XWikiContext)} since\n     *             2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.copyWikiWeb(String space, String sourceWiki, String targetWiki, String language, boolean clean,\n        XWikiContext context) throws XWikiException\n    {\n        return this.copySpaceBetweenWikis(space, sourceWiki, targetWiki, language, clean, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getDefaultSpace(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getDefaultWeb(XWikiContext context)\n    {\n        return this.getDefaultSpace(context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#skipDefaultSpaceInURLs(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public boolean XWiki.useDefaultWeb(XWikiContext context)\n    {\n        return this.skipDefaultSpaceInURLs(context);\n    }\n\n    \/**\n     * @deprecated use {@link XWikiMessageTool#get(String, List)} instead. You can access message tool using\n     *             {@link XWikiContext#getMessageTool()}.\n     *\/\n    @Deprecated\n    public String XWiki.getMessage(String item, XWikiContext context)\n    {\n        XWikiMessageTool msg = context.getMessageTool();\n        if (msg == null) {\n            return item;\n        } else {\n            return msg.get(item);\n        }\n    }\n\n    \/**\n     * @deprecated Removed since it isn't used; since 3.1M2.\n     *\/\n    @Deprecated\n    public String XWiki.getHTMLArea(String content, XWikiContext context)\n    {\n        StringBuilder result = new StringBuilder();\n\n        String scontent = XMLUtils.escape(content);\n        scontent = scontent.replaceAll(\"\\r?+\\n\", \"<br class=\\\"htmlarea\\\"\/>\");\n\n        result.append(\"<textarea name=\\\"content\\\" id=\\\"content\\\" rows=\\\"25\\\" cols=\\\"80\\\">\");\n        result.append(scontent);\n        result.append(\"<\/textarea>\");\n\n        return result.toString();\n    }\n\n    @Deprecated\n    public XWikiNotificationManager XWiki.getNotificationManager()\n    {\n        if (this.notificationManager == null) {\n          this.notificationManager = new XWikiNotificationManager();\n        }\n\n        return this.notificationManager;\n    }\n\n    @Deprecated\n    public void XWiki.setNotificationManager(XWikiNotificationManager notificationManager)\n    {\n        this.notificationManager = notificationManager;\n    }\n    \n    @Deprecated\n    public String XWiki.displaySearch(String fieldname, String className, XWikiCriteria criteria, XWikiContext context)\n        throws XWikiException\n    {\n        return displaySearch(fieldname, className, \"\", criteria, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearch(String fieldname, String className, XWikiContext context) throws XWikiException\n    {\n        return displaySearch(fieldname, className, \"\", new XWikiCriteria(), context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearch(String fieldname, String className, String prefix, XWikiCriteria criteria,\n        XWikiContext context) throws XWikiException\n    {\n        BaseClass bclass = getDocument(className, context).getXClass();\n        PropertyClass pclass = (PropertyClass) bclass.get(fieldname);\n        if (criteria == null) {\n            criteria = new XWikiCriteria();\n        }\n\n        if (pclass == null) {\n            return \"\";\n        } else {\n            return pclass.displaySearch(fieldname, prefix + className + \"_\", criteria, context);\n        }\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchColumns(String className, XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        return displaySearchColumns(className, \"\", query, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchColumns(String className, String prefix, XWikiQuery query, XWikiContext context)\n        throws XWikiException\n    {\n        BaseClass bclass = getDocument(className, context).getXClass();\n\n        if (query == null) {\n            query = new XWikiQuery();\n        }\n\n        return bclass.displaySearchColumns(className + \"_\" + prefix, query, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchOrder(String className, XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        return displaySearchOrder(className, \"\", query, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchOrder(String className, String prefix, XWikiQuery query, XWikiContext context)\n        throws XWikiException\n    {\n        BaseClass bclass = getDocument(className, context).getXClass();\n\n        if (query == null) {\n            query = new XWikiQuery();\n        }\n\n        return bclass.displaySearchOrder(className + \"_\" + prefix, query, context);\n    }\n\n    @Deprecated\n    public <T> List<T> XWiki.search(XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        QueryPlugin qp = (QueryPlugin) getPlugin(\"query\", context);\n        if (qp == null) {\n            return null;\n        }\n\n        return qp.search(query);\n    }\n\n    @Deprecated\n    public XWikiQuery XWiki.createQueryFromRequest(String className, XWikiContext context) throws XWikiException\n    {\n        return new XWikiQuery(context.getRequest(), className, context);\n    }\n\n    @Deprecated\n    public String XWiki.searchAsTable(XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        QueryPlugin qp = (QueryPlugin) getPlugin(\"query\", context);\n        if (qp == null) {\n            return null;\n        }\n\n        List<String> list = qp.search(query);\n        String result = \"{table}\\r\\n\";\n        List<String> headerColumns = new ArrayList<String>();\n        List<String> displayProperties = query.getDisplayProperties();\n        for (String propname : displayProperties) {\n            PropertyClass pclass = getPropertyClassFromName(propname, context);\n            if (pclass != null) {\n                headerColumns.add(pclass.getPrettyName());\n            } else {\n                if (propname.startsWith(\"doc.\")) {\n                    propname = propname.substring(4);\n                    headerColumns.add(XWikiDocument.getInternalPropertyName(propname, context));\n                } else {\n                    headerColumns.add(propname);\n                }\n\n            }\n        }\n\n        result += StringUtils.join(headerColumns.toArray(), \" | \") + \"\\r\\n\";\n        for (String docname : list) {\n            List<String> rowColumns = new ArrayList<String>();\n            XWikiDocument doc = getDocument(docname, context);\n            for (String propname : displayProperties) {\n                PropertyClass pclass = getPropertyClassFromName(propname, context);\n                if (pclass == null) {\n                    if (propname.startsWith(\"doc.\")) {\n                        propname = propname.substring(4);\n                    }\n                    String value = doc.getInternalProperty(propname);\n                    rowColumns.add((value == null) ? \" \" : value);\n                } else {\n                    BaseObject bobj = doc.getObject(pclass.getObject().getName());\n                    rowColumns.add(doc.display(pclass.getName(), \"view\", bobj, context));\n                }\n            }\n            result += StringUtils.join(rowColumns.toArray(), \" | \") + \"\\r\\n\";\n        }\n\n        result += \"{table}\\r\\n\";\n\n        return result;\n    }\n\n    @Deprecated\n    public String XWiki.getDocLanguagePreference(XWikiContext context)\n    {\n        return getLanguagePreference(context);\n    }\n\n    @Deprecated\n    public void XWiki.flushCache()\n    {\n        Execution execution = Utils.getComponent(Execution.class);\n\n        ExecutionContext ec = execution.getContext();\n\n        flushCache(ec != null ? (XWikiContext) ec.getProperty(\"xwikicontext\") : null);\n    }\n\n    \/**\n     * @deprecated use WikiManager plugin instead\n     *\/\n    @Deprecated\n    public int XWiki.createNewWiki(String wikiName, String wikiUrl, String wikiAdmin, String baseWikiName,\n        String description, String wikilanguage, boolean failOnExist, XWikiContext context) throws XWikiException\n    {\n        String database = context.getDatabase();\n        wikiName = wikiName.toLowerCase();\n\n        try {\n            XWikiDocument userdoc = getDocument(wikiAdmin, context);\n\n            \/\/ User does not exist\n            if (userdoc.isNew()) {\n                if (LOGGER.isErrorEnabled()) {\n                    LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"user does not exist\");\n                }\n                return -2;\n            }\n\n            \/\/ User is not active\n            if (!(userdoc.getIntValue(\"XWiki.XWikiUsers\", \"active\") == 1)) {\n                if (LOGGER.isErrorEnabled()) {\n                    LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"user is not active\");\n                }\n                return -3;\n            }\n\n            String wikiForbiddenList = Param(\"xwiki.virtual.reserved_wikis\");\n            if (Util.contains(wikiName, wikiForbiddenList, \", \")) {\n                if (LOGGER.isErrorEnabled()) {\n                    LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"wiki name is forbidden\");\n                }\n                return -4;\n            }\n\n            String wikiServerPage = \"XWikiServer\" + wikiName.substring(0, 1).toUpperCase() + wikiName.substring(1);\n            \/\/ Verify is server page already exist\n            XWikiDocument serverdoc = getDocument(SYSTEM_SPACE, wikiServerPage, context);\n            if (serverdoc.isNew()) {\n                \/\/ clear entry in virtual wiki cache\n                this.virtualWikiMap.remove(wikiUrl);\n\n                \/\/ Create Wiki Server page\n                serverdoc.setStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"server\", wikiUrl);\n                serverdoc.setStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"owner\", wikiAdmin);\n                if (description != null) {\n                    serverdoc.setLargeStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"description\", description);\n                }\n                if (wikilanguage != null) {\n                    serverdoc.setStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"language\", wikilanguage);\n                }\n                if (!getDefaultDocumentSyntax().equals(Syntax.XWIKI_1_0.toIdString())) {\n                    serverdoc.setContent(\"{{include document=\\\"XWiki.XWikiServerForm\\\"\/}}\\n\");\n                    serverdoc.setSyntax(Syntax.XWIKI_2_0);\n                } else {\n                    serverdoc.setContent(\"#includeForm(\\\"XWiki.XWikiServerForm\\\")\\n\");\n                    serverdoc.setSyntax(Syntax.XWIKI_1_0);\n                }\n                serverdoc.setParentReference(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE);\n                saveDocument(serverdoc, context);\n            } else {\n                \/\/ If we are not allowed to continue if server page already exists\n                if (failOnExist) {\n                    if (LOGGER.isErrorEnabled()) {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki server page already exists\");\n                    }\n                    return -5;\n                } else if (LOGGER.isWarnEnabled()) {\n                    LOGGER.warn(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"wiki server page already exists\");\n                }\n            }\n\n            \/\/ Create wiki database\n            try {\n                context.setDatabase(getDatabase());\n                getStore().createWiki(wikiName, context);\n            } catch (XWikiException e) {\n                if (LOGGER.isErrorEnabled()) {\n                    if (e.getCode() == 10010) {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki database already exists\");\n                    } else if (e.getCode() == 10011) {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki database creation failed\");\n                    } else {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki database creation threw exception\", e);\n                    }\n                }\n            } catch (Exception e) {\n                LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                    + \"wiki database creation threw exception\", e);\n            }\n\n            try {\n                updateDatabase(wikiName, true, false, context);\n            } catch (Exception e) {\n                LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                    + \"wiki database shema update threw exception\", e);\n                return -6;\n            }\n\n            \/\/ Copy base wiki\n            int nb = copyWiki(baseWikiName, wikiName, wikilanguage, context);\n            \/\/ Save the number of docs copied in the context\n            context.put(\"nbdocs\", Integer.valueOf(nb));\n\n            \/\/ Create user page in his wiki\n            \/\/ Let's not create it anymore.. this makes the creator loose\n            \/\/ super admin rights on his wiki\n            \/\/ copyDocument(wikiAdmin, getDatabase(), wikiName, wikilanguage, context);\n\n            \/\/ Modify rights in user wiki\n            context.setDatabase(wikiName);\n            \/*\n             * XWikiDocument wikiprefdoc = getDocument(\"XWiki.XWikiPreferences\", context);\n             * wikiprefdoc.setStringValue(\"XWiki.XWikiGlobalRights\", \"users\", wikiAdmin);\n             * wikiprefdoc.setStringValue(\"XWiki.XWikiGlobalRights\", \"levels\", \"admin, edit\");\n             * wikiprefdoc.setIntValue(\"XWiki.XWikiGlobalRights\", \"allow\", 1); saveDocument(wikiprefdoc, context);\n             *\/\n            return 1;\n        } catch (Exception e) {\n            LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                + \"wiki creation threw exception\", e);\n            return -10;\n        } finally {\n            context.setDatabase(database);\n        }\n    }\n\n    \/**\n     * Get the XWiki temporary filesystem directory (cleaned up automatically by XWiki).\n     *\n     * @param context\n     * @return temporary directory\n     * @since 1.1 Milestone 4\n     * @deprecated starting with 4.2M1 use {@link org.xwiki.environment.Environment#getTemporaryDirectory()}\n     *\/\n    @Deprecated\n    public File XWiki.getTempDirectory(XWikiContext context)\n    {\n        return this.environment.getTemporaryDirectory();\n    }\n\n    \/**\n     * Get a new directory in the xwiki work directory\n     *\n     * @param subdir desired directory name\n     * @param context\n     * @return work subdirectory\n     * @since 1.1 Milestone 4\n     * @deprecated starting with 4.2M1 use {@link org.xwiki.environment.Environment#getPermanentDirectory()}\n     *\/\n    @Deprecated\n    public File XWiki.getWorkSubdirectory(String subdir, XWikiContext context)\n    {\n        File fdir = new File(this.environment.getPermanentDirectory().getAbsolutePath(), subdir);\n        if (!fdir.exists()) {\n            fdir.mkdir();\n        }\n\n        return fdir;\n    }\n\n    \/**\n     * Get the XWiki work directory\n     *\n     * @param context\n     * @return work directory\n     * @since 1.1 Milestone 4\n     * @deprecated starting with 4.2M1 use {@link org.xwiki.environment.Environment#getPermanentDirectory()}\n     *\/\n    @Deprecated\n    public File XWiki.getWorkDirectory(XWikiContext context)\n    {\n        return this.environment.getPermanentDirectory();\n    }\n\n    \/**\n     * @deprecated starting with 5.1M1 use {@code org.xwiki.url.XWikiURLFactory} instead and starting with 5.3M1 use\n     *             {@link ResourceFactory} and since 6.1M2 use {@link org.xwiki.resource.ResourceReferenceResolver}\n     *\/\n    @Deprecated\n    public XWikiDocument XWiki.getDocumentFromPath(String path, XWikiContext context) throws XWikiException\n    {\n        return getDocument(getDocumentReferenceFromPath(path, context), context);\n    }\n\n    \/**\n     * @since 2.3M1\n     * @deprecated starting with 5.1M1 use {@code org.xwiki.url.XWikiURLFactory} instead and starting with 5.3M1 use\n     *             {@link ResourceFactory} and since 6.1M2 use {@link org.xwiki.resource.ResourceReferenceResolver}\n     *\/\n    @Deprecated\n    public DocumentReference XWiki.getDocumentReferenceFromPath(String path, XWikiContext context)\n    {\n        \/\/ TODO: Remove this and use XWikiURLFactory instead in XWikiAction and all entry points.\n        List<String> segments = new ArrayList<String>();\n        for (String segment : path.split(\"\/\", -1)) {\n            segments.add(Util.decodeURI(segment, context));\n        }\n        \/\/ Remove the first segment if it's empty to cater for cases when the path starts with \"\/\"\n        if (segments.size() > 0 && segments.get(0).length() == 0) {\n            segments.remove(0);\n        }\n\n        XWikiEntityURL entityURL = buildEntityURLFromPathSegments(new WikiReference(context.getDatabase()), segments);\n\n        return new DocumentReference(entityURL.getEntityReference().extractReference(EntityType.DOCUMENT));\n    }\n\n    \/**\n     * @deprecated since 2.3M1 use {@link #getDocumentReferenceFromPath(String, XWikiContext)} instead\n     *\/\n    @Deprecated\n    public String XWiki.getDocumentNameFromPath(String path, XWikiContext context)\n    {\n        return this.localStringEntityReferenceSerializer.serialize(getDocumentReferenceFromPath(path, context));\n    }\n\n    \/**\n     * @deprecated since 2.3M1 use {@link #getDocumentReferenceFromPath(String, XWikiContext)} instead\n     *\/\n    @Deprecated\n    public String XWiki.getDocumentName(XWikiRequest request, XWikiContext context)\n    {\n        return this.localStringEntityReferenceSerializer.serialize(getDocumentReference(request, context));\n    }\n\n    \/**\n     * @deprecated starting with 5.1M1 use {@code org.xwiki.url.XWikiURLFactory} instead and starting with 5.3M1 use\n     *             {@link ResourceFactory} and since 6.1M2 use {@link org.xwiki.resource.ResourceReferenceResolver}\n     *\/\n    @Deprecated\n    private XWikiEntityURL XWiki.buildEntityURLFromPathSegments(WikiReference wikiReference, List<String> pathSegments)\n    {\n        XWikiEntityURL entityURL;\n\n        \/\/ Rules based on counting the url segments:\n        \/\/ - 0 segments (e.g. \"\"): default document reference, \"view\" action\n        \/\/ - 1 segment (e.g. \"\/\", \"\/Document\"): default space, specified document (and default if empty), \"view\" action\n        \/\/ - 2 segments (e.g. \"\/Space\/\", \"\/Space\/Document\"): specified space, document (and default doc if empty),\n        \/\/   \"view\" action\n        \/\/ - 3 segments (e.g. \"\/action\/Space\/Document\"): specified space, document (and default doc if empty),\n        \/\/   specified action\n        \/\/ - 4 segments (e.g. \"\/download\/Space\/Document\/attachment\"): specified space, document and attachment (and\n        \/\/   default doc if empty), \"download\" action\n        \/\/ - 4 segments or more (e.g. \"\/action\/Space\/Document\/whatever\/else\"): specified space, document (and default\n        \/\/     doc if empty), specified \"action\" (if action != \"download\"), trailing segments ignored\n\n        String spaceName = null;\n        String pageName = null;\n        String attachmentName = null;\n        String action = \"view\";\n\n        if (pathSegments.size() == 1) {\n            pageName = pathSegments.get(0);\n        } else if (pathSegments.size() == 2) {\n            spaceName = pathSegments.get(0);\n            pageName = pathSegments.get(1);\n        } else if (pathSegments.size() >= 3) {\n            action = pathSegments.get(0);\n            spaceName = pathSegments.get(1);\n            pageName = pathSegments.get(2);\n            if (action.equals(\"download\") && pathSegments.size() >= 4) {\n                attachmentName = pathSegments.get(3);\n            }\n        }\n\n        \/\/ Normalize the extracted space\/page to resolve empty\/null values and replace them with default values.\n        EntityReference reference = wikiReference;\n        EntityType entityType = EntityType.DOCUMENT;\n        if (!StringUtils.isEmpty(spaceName)) {\n            reference = new EntityReference(spaceName, EntityType.SPACE, reference);\n        }\n        if (!StringUtils.isEmpty(pageName)) {\n            reference = new EntityReference(pageName, EntityType.DOCUMENT, reference);\n        }\n        if (!StringUtils.isEmpty(attachmentName)) {\n            reference = new EntityReference(attachmentName, EntityType.ATTACHMENT, reference);\n            entityType = EntityType.ATTACHMENT;\n        }\n        reference = this.defaultReferenceEntityReferenceResolver.resolve(reference, entityType);\n\n        entityURL = new XWikiEntityURL(reference);\n        entityURL.setAction(action);\n\n        return entityURL;\n    }\n\n    \/**\n     * Extracts the name of the wiki from a context's request. In some cases, including autowww, the main wiki may be\n     * returned instead of what was requested, as a result of some assumptions. Even so, the resulting wiki name is not\n     * guaranteed to exist, it is just what XWiki understood from the request.\n     *\n     * @param context the context which contains the request\n     * @return the name of the wiki that was requested\n     * @throws XWikiException if problems occur\n     * @deprecated starting with 5.2M1 use  use {@link ResourceFactory} instead and since 6.1M2 use\n     *             {@link org.xwiki.resource.ResourceReferenceResolver} instead\n     *\/\n    @Deprecated\n    public String XWiki.getRequestWikiName(XWikiContext context) throws XWikiException\n    {\n        \/\/ Host is full.host.name in DNS-based multiwiki, and wikiname in path-based multiwiki.\n        String host = \"\";\n        \/\/ Canonical name of the wiki (database).\n        String wikiName = \"\";\n        \/\/ wikiDefinition should be the document holding the definition of the virtual wiki, a document in the main\n        \/\/ wiki with a XWiki.XWikiServerClass object attached to it\n        DocumentReference wikiDefinition;\n\n        XWikiRequest request = context.getRequest();\n        try {\n            URL requestURL = context.getURL();\n            host = requestURL.getHost();\n        } catch (Exception e) {\n        }\n\n        \/\/ In path-based multi-wiki, the wiki name is an element of the request path.\n        \/\/ The url is in the form \/xwiki (app name)\/wiki (servlet name)\/wikiname\/\n        if (\"1\".equals(this.Param(\"xwiki.virtual.usepath\", \"1\"))) {\n            String uri = request.getRequestURI();\n            if (LOGGER.isDebugEnabled()) {\n                LOGGER.debug(\"Request uri is: \" + uri);\n            }\n            \/\/ Remove the (eventual) context path from the URI, usually \/xwiki\n            uri = stripSegmentFromPath(uri, request.getContextPath());\n            \/\/ Remove the (eventual) servlet path from the URI, usually \/wiki\n            String servletPath = request.getServletPath();\n            uri = stripSegmentFromPath(uri, servletPath);\n\n            if (servletPath.equals(\"\/\" + this.Param(\"xwiki.virtual.usepath.servletpath\", \"wiki\"))) {\n                \/\/ Requested path corresponds to a path-based wiki, now the wiki name is between the first and\n                \/\/ second \"\/\"\n                host = StringUtils.substringBefore(StringUtils.removeStart(uri, \"\/\"), \"\/\");\n            }\n        }\n\n        if (StringUtils.isEmpty(host) || host.equals(context.getMainXWiki())) {\n            \/\/ Can't find any wiki name, return the main wiki\n            return context.getMainXWiki();\n        }\n\n        \/\/ Try to use the full domain name\/path wiki name and see if it corresponds to any existing wiki descriptors\n        wikiDefinition = this.findWikiServer(host, context);\n\n        if (wikiDefinition == null) {\n            \/\/ No definition found based on the full domain name\/path wiki name, try to use the first part of the domain\n            \/\/ name as the wiki name\n            String servername = StringUtils.substringBefore(host, \".\");\n\n            \/\/ Note: Starting 5.0M2, the autowww behavior is default and the ability to disable it is now removed.\n            if (\"0\".equals(this.Param(\"xwiki.virtual.autowww\"))) {\n                LOGGER.warn(String.format(\"%s %s\", \"'xwiki.virtual.autowww' is no longer supported.\",\n                    \"Please update your configuration and\/or see XWIKI-8877 for more details.\"));\n            }\n\n            \/\/ As a convenience, we do not require the creation of an xwiki:XWiki.XWikiServerXwiki page for the main\n            \/\/ wiki and automatically go to the main wiki in certain cases:\n            \/\/ - \"www.<anyDomain>.<domainExtension>\" - if it starts with www, we first check if a subwiki with that\n            \/\/ name exists; if yes, the go to the \"www\" subwiki, if not, go to the main wiki\n            \/\/ - \"localhost\"\n            \/\/ - IP address\n            if (\"www\".equals(servername)) {\n                \/\/ Check that \"www\" is not actually the name of an existing subwiki.\n                wikiDefinition = this.findWikiServer(servername, context);\n                if (wikiDefinition == null) {\n                    \/\/ Not the case, use the main wiki.\n                    return context.getMainXWiki();\n                }\n            } else if (\"localhost\".equals(host) || host.matches(\"[0-9]{1,3}(?:\\\\.[0-9]{1,3}){3}\")) {\n                \/\/ Direct access to the main wiki.\n                return context.getMainXWiki();\n            }\n\n            \/\/ Use the name from the subdomain\n            wikiName = servername;\n\n            if (!context.isMainWiki(wikiName)\n                && !\"1\".equals(context.getWiki().Param(\"xwiki.virtual.failOnWikiDoesNotExist\", \"0\"))) {\n                \/\/ Check if the wiki really exists\n                if (!exists(getServerWikiPage(wikiName), context)) {\n                    \/\/ Fallback on main wiki\n                    wikiName = context.getMainXWiki();\n                }\n            }\n        } else {\n            \/\/ Use the name from the located wiki descriptor\n            wikiName = StringUtils.removeStart(wikiDefinition.getName(), \"XWikiServer\").toLowerCase();\n        }\n\n        return wikiName;\n    }\n\n    \/**\n     * Searches for the document containing the definition of the virtual wiki corresponding to the specified hostname.\n     *\n     * @param host the hostname, as specified in the request (for example: {@code forge.xwiki.org})\n     * @param context the current context\n     * @return the name of the document containing the wiki definition, or {@code null} if no wiki corresponds to the\n     *         hostname\n     * @throws XWikiException if a problem occurs while searching the storage\n     *\/\n    private DocumentReference XWiki.findWikiServer(String host, XWikiContext context) throws XWikiException\n    {\n        ensureVirtualWikiMapExists();\n        DocumentReference wikiName = this.virtualWikiMap.get(host);\n\n        if (wikiName == null) {\n            \/\/ Not loaded yet, search for it in the main wiki\n            String hql =\n                \", BaseObject as obj, StringProperty as prop WHERE obj.name=doc.fullName\"\n                    + \" AND doc.space='XWiki' AND doc.name LIKE 'XWikiServer%'\"\n                    + \" AND obj.className='XWiki.XWikiServerClass' AND prop.id.id = obj.id\"\n                    + \" AND prop.id.name = 'server' AND prop.value=?\";\n            List<String> parameters = new ArrayList<String>(1);\n            parameters.add(host);\n            try {\n                List<DocumentReference> list =\n                    context.getWiki().getStore().searchDocumentReferences(hql, parameters, context);\n                if ((list != null) && (list.size() > 0)) {\n                    wikiName = list.get(0);\n                }\n\n                this.virtualWikiMap.set(host, wikiName);\n            } catch (XWikiException e) {\n                LOGGER.warn(\"Error when searching for wiki name from URL host [\" + host + \"]\", e);\n            }\n        }\n\n        return wikiName;\n    }\n\n    private void XWiki.ensureVirtualWikiMapExists() throws XWikiException\n    {\n        synchronized (this) {\n            if (this.virtualWikiMap == null) {\n                int iCapacity = 1000;\n                try {\n                    String capacity = Param(\"xwiki.virtual.cache.capacity\");\n                    if (capacity != null) {\n                        iCapacity = Integer.parseInt(capacity);\n                    }\n                } catch (Exception e) {\n                }\n                try {\n                    CacheConfiguration configuration = new CacheConfiguration();\n                    configuration.setConfigurationId(\"xwiki.virtualwikimap\");\n                    LRUEvictionConfiguration lru = new LRUEvictionConfiguration();\n                    lru.setMaxEntries(iCapacity);\n                    configuration.put(LRUEvictionConfiguration.CONFIGURATIONID, lru);\n\n                    this.virtualWikiMap = getCacheFactory().newCache(configuration);\n                } catch (CacheException e) {\n                    throw new XWikiException(XWikiException.MODULE_XWIKI_CACHE,\n                        XWikiException.ERROR_CACHE_INITIALIZING, \"Failed to create new cache\", e);\n                }\n            }\n        }\n    }\n\n    \/**\n     * @deprecated replaced by {@link #setUserDefaultGroup(String fullwikiname, XWikiContext context)}\n     * @param context\n     * @param fullwikiname\n     * @throws XWikiException\n     *\/\n    @Deprecated\n    public void XWiki.SetUserDefaultGroup(XWikiContext context, String fullwikiname) throws XWikiException\n    {\n        this.setUserDefaultGroup(fullwikiname, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link #protectUserPage(String,String,XWikiDocument,XWikiContext)}\n     * @param context\n     * @param fullwikiname\n     * @param userRights\n     * @param doc\n     * @throws XWikiException\n     *\/\n    @Deprecated\n    public void XWiki.ProtectUserPage(XWikiContext context, String fullwikiname, String userRights, XWikiDocument doc)\n        throws XWikiException\n    {\n        this.protectUserPage(fullwikiname, userRights, doc, context);\n    }\n\n    \/**\n     * @return the cache factory.\n     * @since 1.5M2.\n     * @deprecated Since 1.7M1, use {@link CacheManager} component instead using {@link Utils#getComponent(Class)}\n     *\/\n    @Deprecated\n    public CacheFactory XWiki.getCacheFactory()\n    {\n        CacheFactory cacheFactory;\n\n        String cacheHint = Param(\"xwiki.cache.cachefactory.hint\", null);\n\n        if (StringUtils.isEmpty(cacheHint) || Utils.getComponent(CacheFactory.class, cacheHint) == null) {\n            CacheManager cacheManager = Utils.getComponent(CacheManager.class);\n            try {\n                cacheFactory = cacheManager.getCacheFactory();\n            } catch (ComponentLookupException e) {\n                throw new RuntimeException(\"Failed to get cache factory component\", e);\n            }\n        } else {\n            cacheFactory = Utils.getComponent(CacheFactory.class, cacheHint);\n        }\n\n        return cacheFactory;\n    }\n\n    \/**\n     * @return the cache factory creating local caches.\n     * @since 1.5M2.\n     * @deprecated Since 1.7M1, use {@link CacheManager} component instead using {@link Utils#getComponent(Class)}\n     *\/\n    @Deprecated\n    public CacheFactory XWiki.getLocalCacheFactory()\n    {\n        CacheFactory localCacheFactory;\n\n        String localCacheHint = Param(\"xwiki.cache.cachefactory.local.hint\", null);\n\n        if (StringUtils.isEmpty(localCacheHint) || Utils.getComponent(CacheFactory.class, localCacheHint) == null) {\n            CacheManager cacheManager = Utils.getComponent(CacheManager.class);\n            try {\n                localCacheFactory = cacheManager.getLocalCacheFactory();\n            } catch (ComponentLookupException e) {\n                throw new RuntimeException(\"Failed to get local cache factory component\", e);\n            }\n        } else {\n            localCacheFactory = Utils.getComponent(CacheFactory.class, localCacheHint);\n        }\n\n        return localCacheFactory;\n    }\n\n    \/**\n     * @deprecated since 2.3M1 use {@link #hasVersioning(XWikiContext)} instead\n     *\/\n    @Deprecated\n    public boolean XWiki.hasVersioning(String fullName, XWikiContext context)\n    {\n        return hasVersioning(context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link #include(String topic, boolean isForm, XWikiContext context)}\n     * @param topic\n     * @param context\n     * @param isForm\n     * @return\n     * @throws XWikiException\n     *\/\n    @Deprecated\n    public String XWiki.include(String topic, XWikiContext context, boolean isForm) throws XWikiException\n    {\n        return include(topic, isForm, context);\n    }\n    \n    \/**\n     * Checks if the wiki is running in test mode.\n     * \n     * @return {@code true} if the wiki is running Cactus tests, {@code false} otherwise\n     * @deprecated No longer used.\n     *\/\n    @Deprecated\n    public boolean XWiki.isTest()\n    {\n        return this.test;\n    }\n\n    \/**\n     * Marks that the wiki is running in test mode.\n     * \n     * @param test whether tests are being executed\n     * @deprecated No longer used.\n     *\/\n    @Deprecated\n    public void XWiki.setTest(boolean test)\n    {\n        this.test = test;\n    }\n\n    \/**\n     * @deprecated use {@link org.xwiki.localization.LocalizationManager} instead. From velocity you can access it using\n     *             the {@code $services.localization} binding, see {@code LocalizationScriptService}\n     *\/\n    @Deprecated\n    public String XWiki.parseMessage(XWikiContext context)\n    {\n        String message = (String) context.get(\"message\");\n        if (message == null) {\n            return null;\n        }\n\n        return parseMessage(message, context);\n    }\n\n    \/**\n     * @deprecated use {@link org.xwiki.localization.LocalizationManager} instead. From velocity you can access it using\n     *             the {@code $services.localization} binding, see {@code LocalizationScriptService}\n     *\/\n    @Deprecated\n    public String XWiki.parseMessage(String id, XWikiContext context)\n    {\n        XWikiMessageTool msg = context.getMessageTool();\n\n        List<?> parameters = (List<?>) context.get(\"messageParameters\");\n\n        String translatedMessage;\n        if (parameters != null) {\n            translatedMessage = msg.get(id, parameters);\n        } else {\n            translatedMessage = msg.get(id);\n        }\n\n        return parseContent(translatedMessage, context);\n    }\n}\n","old_contents":"\/*\n * See the NOTICE file distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This is free software; you can redistribute it and\/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF site: http:\/\/www.fsf.org.\n *\/\npackage com.xpn.xwiki;\n\nimport java.io.UnsupportedEncodingException;\nimport java.io.File;\nimport java.lang.reflect.Type;\nimport java.net.URL;\nimport java.net.URLEncoder;\nimport java.util.ArrayList;\nimport java.util.HashMap;\nimport java.util.List;\nimport java.util.Map;\n\nimport org.apache.commons.lang3.StringUtils;\nimport org.xwiki.cache.CacheException;\nimport org.xwiki.cache.CacheFactory;\nimport org.xwiki.cache.CacheManager;\nimport org.xwiki.cache.config.CacheConfiguration;\nimport org.xwiki.cache.eviction.LRUEvictionConfiguration;\nimport org.xwiki.component.manager.ComponentLookupException;\nimport org.xwiki.context.Execution;\nimport org.xwiki.context.ExecutionContext;\nimport org.xwiki.environment.Environment;\nimport org.xwiki.rendering.syntax.Syntax;\nimport org.xwiki.xml.XMLUtils;\nimport org.xwiki.model.reference.EntityReference;\nimport org.xwiki.model.reference.EntityReferenceResolver;\nimport org.xwiki.model.reference.DocumentReference;\nimport org.xwiki.model.reference.EntityReferenceSerializer;\nimport org.xwiki.model.reference.WikiReference;\nimport org.xwiki.model.EntityType;\nimport org.xwiki.url.XWikiEntityURL;\n\nimport com.xpn.xwiki.cache.api.XWikiCache;\nimport com.xpn.xwiki.cache.api.XWikiCacheService;\nimport com.xpn.xwiki.cache.api.internal.XWikiCacheServiceStub;\nimport com.xpn.xwiki.cache.api.internal.XWikiCacheStub;\nimport com.xpn.xwiki.doc.XWikiDocument;\nimport com.xpn.xwiki.notify.XWikiNotificationManager;\nimport com.xpn.xwiki.objects.BaseObject;\nimport com.xpn.xwiki.objects.classes.BaseClass;\nimport com.xpn.xwiki.objects.classes.PropertyClass;\nimport com.xpn.xwiki.plugin.query.QueryPlugin;\nimport com.xpn.xwiki.plugin.query.XWikiCriteria;\nimport com.xpn.xwiki.plugin.query.XWikiQuery;\nimport com.xpn.xwiki.util.Util;\nimport com.xpn.xwiki.web.Utils;\nimport com.xpn.xwiki.web.XWikiMessageTool;\nimport com.xpn.xwiki.web.XWikiRequest;\n\n\/**\n * Add a backward compatibility layer to the {@link com.xpn.xwiki.XWiki} class.\n * \n * @version $Id$\n *\/\npublic privileged aspect XWikiCompatibilityAspect\n{\n    private static Map XWiki.threadMap = new HashMap();\n\n    private XWikiNotificationManager XWiki.notificationManager;\n\n    private EntityReferenceResolver<EntityReference> XWiki.defaultReferenceEntityReferenceResolver = Utils.getComponent(\n        EntityReferenceResolver.TYPE_REFERENCE);\n\n    private EntityReferenceSerializer<String> XWiki.localStringEntityReferenceSerializer = Utils.getComponent(\n        EntityReferenceSerializer.TYPE_STRING, \"local\");\n\n    \/**\n     * Used to get the temporary and permanent directory.\n     *\/\n    private Environment XWiki.environment = Utils.getComponent((Type) Environment.class);\n\n    \/**\n     * Transform a text in a URL compatible text\n     *\n     * @param content text to transform\n     * @return encoded result\n     * @deprecated replaced by Util#encodeURI since 1.3M2\n     *\/\n    @Deprecated\n    public String XWiki.getURLEncoded(String content)\n    {\n        try {\n            return URLEncoder.encode(content, this.getEncoding());\n        } catch (UnsupportedEncodingException e) {\n            return content;\n        }\n    }\n\n    \/**\n     * @return true for multi-wiki\/false for mono-wiki\n     * @deprecated replaced by {@link XWiki#isVirtualMode()} since 1.4M1.\n     *\/\n    @Deprecated\n    public boolean XWiki.isVirtual()\n    {\n        return isVirtualMode();\n    }\n\n    \/**\n     * @deprecated Virtual mode is on by default, starting with XWiki 5.0M2. Use\n     *             {@link #getVirtualWikisDatabaseNames(XWikiContext)} to get the list of wikis if needed.\n     * @return true for multi-wiki\/false for mono-wiki\n     *\/\n    @Deprecated\n    public boolean XWiki.isVirtualMode()\n    {\n        return true;\n    }\n\n    \/**\n     * @deprecated Removed since it isn't used; since 1.5M1.\n     *\/\n    @Deprecated\n    public static Map XWiki.getThreadMap()\n    {\n        return XWiki.threadMap;\n    }\n\n    \/**\n     * @deprecated Removed since it isn't used; since 1.5M1.\n     *\/\n    @Deprecated\n    public static void XWiki.setThreadMap(Map threadMap)\n    {\n        XWiki.threadMap = threadMap;\n    }\n\n    \/**\n     * @return the cache service.\n     * @deprecated replaced by {@link XWiki#getCacheFactory(XWikiContext)} or\n     *             {@link XWiki#getLocalCacheFactory(XWikiContext)} since 1.5M2.\n     *\/\n    @Deprecated\n    public XWikiCacheService XWiki.getCacheService()\n    {\n        return new XWikiCacheServiceStub(getCacheFactory(), getLocalCacheFactory());\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getVirtualWikiCache(XWikiContext)} since 1.5M2.\n     *\/\n    @Deprecated\n    public XWikiCache XWiki.getVirtualWikiMap()\n    {\n        return new XWikiCacheStub(this.virtualWikiMap);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpaceCopyright(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebCopyright(XWikiContext context)\n    {\n        return this.getSpaceCopyright(context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, String defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, String, String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, String space, String defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, space, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsLong(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public long XWiki.getWebPreferenceAsLong(String preference, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsLong(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsLong(String, long, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public long XWiki.getWebPreferenceAsLong(String preference, long defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsLong(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsInt(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.getWebPreferenceAsInt(String preference, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsInt(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsInt(String, int, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.getWebPreferenceAsInt(String preference, int defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsInt(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#copySpaceBetweenWikis(String, String, String, String, XWikiContext)} since\n     *             2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.copyWikiWeb(String space, String sourceWiki, String targetWiki, String language, XWikiContext context)\n        throws XWikiException\n    {\n        return this.copySpaceBetweenWikis(space, sourceWiki, targetWiki, language, context);\n    }\n\n    \/**\n     * @deprecated replaced by\n     *             {@link XWiki#copySpaceBetweenWikis(String, String, String, String, boolean, XWikiContext)} since\n     *             2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.copyWikiWeb(String space, String sourceWiki, String targetWiki, String language, boolean clean,\n        XWikiContext context) throws XWikiException\n    {\n        return this.copySpaceBetweenWikis(space, sourceWiki, targetWiki, language, clean, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getDefaultSpace(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getDefaultWeb(XWikiContext context)\n    {\n        return this.getDefaultSpace(context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#skipDefaultSpaceInURLs(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public boolean XWiki.useDefaultWeb(XWikiContext context)\n    {\n        return this.skipDefaultSpaceInURLs(context);\n    }\n\n    \/**\n     * @deprecated use {@link XWikiMessageTool#get(String, List)} instead. You can access message tool using\n     *             {@link XWikiContext#getMessageTool()}.\n     *\/\n    @Deprecated\n    public String XWiki.getMessage(String item, XWikiContext context)\n    {\n        XWikiMessageTool msg = context.getMessageTool();\n        if (msg == null) {\n            return item;\n        } else {\n            return msg.get(item);\n        }\n    }\n\n    \/**\n     * @deprecated Removed since it isn't used; since 3.1M2.\n     *\/\n    @Deprecated\n    public String XWiki.getHTMLArea(String content, XWikiContext context)\n    {\n        StringBuilder result = new StringBuilder();\n\n        String scontent = XMLUtils.escape(content);\n        scontent = scontent.replaceAll(\"\\r?+\\n\", \"<br class=\\\"htmlarea\\\"\/>\");\n\n        result.append(\"<textarea name=\\\"content\\\" id=\\\"content\\\" rows=\\\"25\\\" cols=\\\"80\\\">\");\n        result.append(scontent);\n        result.append(\"<\/textarea>\");\n\n        return result.toString();\n    }\n\n    @Deprecated\n    public XWikiNotificationManager XWiki.getNotificationManager()\n    {\n        if (this.notificationManager == null) {\n          this.notificationManager = new XWikiNotificationManager();\n        }\n\n        return this.notificationManager;\n    }\n\n    @Deprecated\n    public void XWiki.setNotificationManager(XWikiNotificationManager notificationManager)\n    {\n        this.notificationManager = notificationManager;\n    }\n    \n    @Deprecated\n    public String XWiki.displaySearch(String fieldname, String className, XWikiCriteria criteria, XWikiContext context)\n        throws XWikiException\n    {\n        return displaySearch(fieldname, className, \"\", criteria, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearch(String fieldname, String className, XWikiContext context) throws XWikiException\n    {\n        return displaySearch(fieldname, className, \"\", new XWikiCriteria(), context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearch(String fieldname, String className, String prefix, XWikiCriteria criteria,\n        XWikiContext context) throws XWikiException\n    {\n        BaseClass bclass = getDocument(className, context).getXClass();\n        PropertyClass pclass = (PropertyClass) bclass.get(fieldname);\n        if (criteria == null) {\n            criteria = new XWikiCriteria();\n        }\n\n        if (pclass == null) {\n            return \"\";\n        } else {\n            return pclass.displaySearch(fieldname, prefix + className + \"_\", criteria, context);\n        }\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchColumns(String className, XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        return displaySearchColumns(className, \"\", query, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchColumns(String className, String prefix, XWikiQuery query, XWikiContext context)\n        throws XWikiException\n    {\n        BaseClass bclass = getDocument(className, context).getXClass();\n\n        if (query == null) {\n            query = new XWikiQuery();\n        }\n\n        return bclass.displaySearchColumns(className + \"_\" + prefix, query, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchOrder(String className, XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        return displaySearchOrder(className, \"\", query, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchOrder(String className, String prefix, XWikiQuery query, XWikiContext context)\n        throws XWikiException\n    {\n        BaseClass bclass = getDocument(className, context).getXClass();\n\n        if (query == null) {\n            query = new XWikiQuery();\n        }\n\n        return bclass.displaySearchOrder(className + \"_\" + prefix, query, context);\n    }\n\n    @Deprecated\n    public <T> List<T> XWiki.search(XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        QueryPlugin qp = (QueryPlugin) getPlugin(\"query\", context);\n        if (qp == null) {\n            return null;\n        }\n\n        return qp.search(query);\n    }\n\n    @Deprecated\n    public XWikiQuery XWiki.createQueryFromRequest(String className, XWikiContext context) throws XWikiException\n    {\n        return new XWikiQuery(context.getRequest(), className, context);\n    }\n\n    @Deprecated\n    public String XWiki.searchAsTable(XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        QueryPlugin qp = (QueryPlugin) getPlugin(\"query\", context);\n        if (qp == null) {\n            return null;\n        }\n\n        List<String> list = qp.search(query);\n        String result = \"{table}\\r\\n\";\n        List<String> headerColumns = new ArrayList<String>();\n        List<String> displayProperties = query.getDisplayProperties();\n        for (String propname : displayProperties) {\n            PropertyClass pclass = getPropertyClassFromName(propname, context);\n            if (pclass != null) {\n                headerColumns.add(pclass.getPrettyName());\n            } else {\n                if (propname.startsWith(\"doc.\")) {\n                    propname = propname.substring(4);\n                    headerColumns.add(XWikiDocument.getInternalPropertyName(propname, context));\n                } else {\n                    headerColumns.add(propname);\n                }\n\n            }\n        }\n\n        result += StringUtils.join(headerColumns.toArray(), \" | \") + \"\\r\\n\";\n        for (String docname : list) {\n            List<String> rowColumns = new ArrayList<String>();\n            XWikiDocument doc = getDocument(docname, context);\n            for (String propname : displayProperties) {\n                PropertyClass pclass = getPropertyClassFromName(propname, context);\n                if (pclass == null) {\n                    if (propname.startsWith(\"doc.\")) {\n                        propname = propname.substring(4);\n                    }\n                    String value = doc.getInternalProperty(propname);\n                    rowColumns.add((value == null) ? \" \" : value);\n                } else {\n                    BaseObject bobj = doc.getObject(pclass.getObject().getName());\n                    rowColumns.add(doc.display(pclass.getName(), \"view\", bobj, context));\n                }\n            }\n            result += StringUtils.join(rowColumns.toArray(), \" | \") + \"\\r\\n\";\n        }\n\n        result += \"{table}\\r\\n\";\n\n        return result;\n    }\n\n    @Deprecated\n    public String XWiki.getDocLanguagePreference(XWikiContext context)\n    {\n        return getLanguagePreference(context);\n    }\n\n    @Deprecated\n    public void XWiki.flushCache()\n    {\n        Execution execution = Utils.getComponent(Execution.class);\n\n        ExecutionContext ec = execution.getContext();\n\n        flushCache(ec != null ? (XWikiContext) ec.getProperty(\"xwikicontext\") : null);\n    }\n\n    \/**\n     * @deprecated use WikiManager plugin instead\n     *\/\n    @Deprecated\n    public int XWiki.createNewWiki(String wikiName, String wikiUrl, String wikiAdmin, String baseWikiName,\n        String description, String wikilanguage, boolean failOnExist, XWikiContext context) throws XWikiException\n    {\n        String database = context.getDatabase();\n        wikiName = wikiName.toLowerCase();\n\n        try {\n            XWikiDocument userdoc = getDocument(wikiAdmin, context);\n\n            \/\/ User does not exist\n            if (userdoc.isNew()) {\n                if (LOGGER.isErrorEnabled()) {\n                    LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"user does not exist\");\n                }\n                return -2;\n            }\n\n            \/\/ User is not active\n            if (!(userdoc.getIntValue(\"XWiki.XWikiUsers\", \"active\") == 1)) {\n                if (LOGGER.isErrorEnabled()) {\n                    LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"user is not active\");\n                }\n                return -3;\n            }\n\n            String wikiForbiddenList = Param(\"xwiki.virtual.reserved_wikis\");\n            if (Util.contains(wikiName, wikiForbiddenList, \", \")) {\n                if (LOGGER.isErrorEnabled()) {\n                    LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"wiki name is forbidden\");\n                }\n                return -4;\n            }\n\n            String wikiServerPage = \"XWikiServer\" + wikiName.substring(0, 1).toUpperCase() + wikiName.substring(1);\n            \/\/ Verify is server page already exist\n            XWikiDocument serverdoc = getDocument(SYSTEM_SPACE, wikiServerPage, context);\n            if (serverdoc.isNew()) {\n                \/\/ clear entry in virtual wiki cache\n                this.virtualWikiMap.remove(wikiUrl);\n\n                \/\/ Create Wiki Server page\n                serverdoc.setStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"server\", wikiUrl);\n                serverdoc.setStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"owner\", wikiAdmin);\n                if (description != null) {\n                    serverdoc.setLargeStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"description\", description);\n                }\n                if (wikilanguage != null) {\n                    serverdoc.setStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"language\", wikilanguage);\n                }\n                if (!getDefaultDocumentSyntax().equals(Syntax.XWIKI_1_0.toIdString())) {\n                    serverdoc.setContent(\"{{include document=\\\"XWiki.XWikiServerForm\\\"\/}}\\n\");\n                    serverdoc.setSyntax(Syntax.XWIKI_2_0);\n                } else {\n                    serverdoc.setContent(\"#includeForm(\\\"XWiki.XWikiServerForm\\\")\\n\");\n                    serverdoc.setSyntax(Syntax.XWIKI_1_0);\n                }\n                serverdoc.setParentReference(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE);\n                saveDocument(serverdoc, context);\n            } else {\n                \/\/ If we are not allowed to continue if server page already exists\n                if (failOnExist) {\n                    if (LOGGER.isErrorEnabled()) {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki server page already exists\");\n                    }\n                    return -5;\n                } else if (LOGGER.isWarnEnabled()) {\n                    LOGGER.warn(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"wiki server page already exists\");\n                }\n            }\n\n            \/\/ Create wiki database\n            try {\n                context.setDatabase(getDatabase());\n                getStore().createWiki(wikiName, context);\n            } catch (XWikiException e) {\n                if (LOGGER.isErrorEnabled()) {\n                    if (e.getCode() == 10010) {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki database already exists\");\n                    } else if (e.getCode() == 10011) {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki database creation failed\");\n                    } else {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki database creation threw exception\", e);\n                    }\n                }\n            } catch (Exception e) {\n                LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                    + \"wiki database creation threw exception\", e);\n            }\n\n            try {\n                updateDatabase(wikiName, true, false, context);\n            } catch (Exception e) {\n                LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                    + \"wiki database shema update threw exception\", e);\n                return -6;\n            }\n\n            \/\/ Copy base wiki\n            int nb = copyWiki(baseWikiName, wikiName, wikilanguage, context);\n            \/\/ Save the number of docs copied in the context\n            context.put(\"nbdocs\", Integer.valueOf(nb));\n\n            \/\/ Create user page in his wiki\n            \/\/ Let's not create it anymore.. this makes the creator loose\n            \/\/ super admin rights on his wiki\n            \/\/ copyDocument(wikiAdmin, getDatabase(), wikiName, wikilanguage, context);\n\n            \/\/ Modify rights in user wiki\n            context.setDatabase(wikiName);\n            \/*\n             * XWikiDocument wikiprefdoc = getDocument(\"XWiki.XWikiPreferences\", context);\n             * wikiprefdoc.setStringValue(\"XWiki.XWikiGlobalRights\", \"users\", wikiAdmin);\n             * wikiprefdoc.setStringValue(\"XWiki.XWikiGlobalRights\", \"levels\", \"admin, edit\");\n             * wikiprefdoc.setIntValue(\"XWiki.XWikiGlobalRights\", \"allow\", 1); saveDocument(wikiprefdoc, context);\n             *\/\n            return 1;\n        } catch (Exception e) {\n            LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                + \"wiki creation threw exception\", e);\n            return -10;\n        } finally {\n            context.setDatabase(database);\n        }\n    }\n\n    \/**\n     * Get the XWiki temporary filesystem directory (cleaned up automatically by XWiki).\n     *\n     * @param context\n     * @return temporary directory\n     * @since 1.1 Milestone 4\n     * @deprecated starting with 4.2M1 use {@link org.xwiki.environment.Environment#getTemporaryDirectory()}\n     *\/\n    @Deprecated\n    public File XWiki.getTempDirectory(XWikiContext context)\n    {\n        return this.environment.getTemporaryDirectory();\n    }\n\n    \/**\n     * Get a new directory in the xwiki work directory\n     *\n     * @param subdir desired directory name\n     * @param context\n     * @return work subdirectory\n     * @since 1.1 Milestone 4\n     * @deprecated starting with 4.2M1 use {@link org.xwiki.environment.Environment#getPermanentDirectory()}\n     *\/\n    @Deprecated\n    public File XWiki.getWorkSubdirectory(String subdir, XWikiContext context)\n    {\n        File fdir = new File(this.environment.getPermanentDirectory().getAbsolutePath(), subdir);\n        if (!fdir.exists()) {\n            fdir.mkdir();\n        }\n\n        return fdir;\n    }\n\n    \/**\n     * Get the XWiki work directory\n     *\n     * @param context\n     * @return work directory\n     * @since 1.1 Milestone 4\n     * @deprecated starting with 4.2M1 use {@link org.xwiki.environment.Environment#getPermanentDirectory()}\n     *\/\n    @Deprecated\n    public File XWiki.getWorkDirectory(XWikiContext context)\n    {\n        return this.environment.getPermanentDirectory();\n    }\n\n    \/**\n     * @deprecated starting with 5.1M1 use {@code org.xwiki.url.XWikiURLFactory} instead and starting with 5.3M1 use\n     *             {@link ResourceFactory} and since 6.1M2 use {@link org.xwiki.resource.ResourceReferenceResolver}\n     *\/\n    @Deprecated\n    public XWikiDocument XWiki.getDocumentFromPath(String path, XWikiContext context) throws XWikiException\n    {\n        return getDocument(getDocumentReferenceFromPath(path, context), context);\n    }\n\n    \/**\n     * @since 2.3M1\n     * @deprecated starting with 5.1M1 use {@code org.xwiki.url.XWikiURLFactory} instead and starting with 5.3M1 use\n     *             {@link ResourceFactory} and since 6.1M2 use {@link org.xwiki.resource.ResourceReferenceResolver}\n     *\/\n    @Deprecated\n    public DocumentReference XWiki.getDocumentReferenceFromPath(String path, XWikiContext context)\n    {\n        \/\/ TODO: Remove this and use XWikiURLFactory instead in XWikiAction and all entry points.\n        List<String> segments = new ArrayList<String>();\n        for (String segment : path.split(\"\/\", -1)) {\n            segments.add(Util.decodeURI(segment, context));\n        }\n        \/\/ Remove the first segment if it's empty to cater for cases when the path starts with \"\/\"\n        if (segments.size() > 0 && segments.get(0).length() == 0) {\n            segments.remove(0);\n        }\n\n        XWikiEntityURL entityURL = buildEntityURLFromPathSegments(new WikiReference(context.getDatabase()), segments);\n\n        return new DocumentReference(entityURL.getEntityReference().extractReference(EntityType.DOCUMENT));\n    }\n\n    \/**\n     * @deprecated since 2.3M1 use {@link #getDocumentReferenceFromPath(String, XWikiContext)} instead\n     *\/\n    @Deprecated\n    public String XWiki.getDocumentNameFromPath(String path, XWikiContext context)\n    {\n        return this.localStringEntityReferenceSerializer.serialize(getDocumentReferenceFromPath(path, context));\n    }\n\n    \/**\n     * @deprecated since 2.3M1 use {@link #getDocumentReferenceFromPath(String, XWikiContext)} instead\n     *\/\n    @Deprecated\n    public String XWiki.getDocumentName(XWikiRequest request, XWikiContext context)\n    {\n        return this.localStringEntityReferenceSerializer.serialize(getDocumentReference(request, context));\n    }\n\n    \/**\n     * @deprecated starting with 5.1M1 use {@code org.xwiki.url.XWikiURLFactory} instead and starting with 5.3M1 use\n     *             {@link ResourceFactory} and since 6.1M2 use {@link org.xwiki.resource.ResourceReferenceResolver}\n     *\/\n    @Deprecated\n    private XWikiEntityURL XWiki.buildEntityURLFromPathSegments(WikiReference wikiReference, List<String> pathSegments)\n    {\n        XWikiEntityURL entityURL;\n\n        \/\/ Rules based on counting the url segments:\n        \/\/ - 0 segments (e.g. \"\"): default document reference, \"view\" action\n        \/\/ - 1 segment (e.g. \"\/\", \"\/Document\"): default space, specified document (and default if empty), \"view\" action\n        \/\/ - 2 segments (e.g. \"\/Space\/\", \"\/Space\/Document\"): specified space, document (and default doc if empty),\n        \/\/   \"view\" action\n        \/\/ - 3 segments (e.g. \"\/action\/Space\/Document\"): specified space, document (and default doc if empty),\n        \/\/   specified action\n        \/\/ - 4 segments (e.g. \"\/download\/Space\/Document\/attachment\"): specified space, document and attachment (and\n        \/\/   default doc if empty), \"download\" action\n        \/\/ - 4 segments or more (e.g. \"\/action\/Space\/Document\/whatever\/else\"): specified space, document (and default\n        \/\/     doc if empty), specified \"action\" (if action != \"download\"), trailing segments ignored\n\n        String spaceName = null;\n        String pageName = null;\n        String attachmentName = null;\n        String action = \"view\";\n\n        if (pathSegments.size() == 1) {\n            pageName = pathSegments.get(0);\n        } else if (pathSegments.size() == 2) {\n            spaceName = pathSegments.get(0);\n            pageName = pathSegments.get(1);\n        } else if (pathSegments.size() >= 3) {\n            action = pathSegments.get(0);\n            spaceName = pathSegments.get(1);\n            pageName = pathSegments.get(2);\n            if (action.equals(\"download\") && pathSegments.size() >= 4) {\n                attachmentName = pathSegments.get(3);\n            }\n        }\n\n        \/\/ Normalize the extracted space\/page to resolve empty\/null values and replace them with default values.\n        EntityReference reference = wikiReference;\n        EntityType entityType = EntityType.DOCUMENT;\n        if (!StringUtils.isEmpty(spaceName)) {\n            reference = new EntityReference(spaceName, EntityType.SPACE, reference);\n        }\n        if (!StringUtils.isEmpty(pageName)) {\n            reference = new EntityReference(pageName, EntityType.DOCUMENT, reference);\n        }\n        if (!StringUtils.isEmpty(attachmentName)) {\n            reference = new EntityReference(attachmentName, EntityType.ATTACHMENT, reference);\n            entityType = EntityType.ATTACHMENT;\n        }\n        reference = this.defaultReferenceEntityReferenceResolver.resolve(reference, entityType);\n\n        entityURL = new XWikiEntityURL(reference);\n        entityURL.setAction(action);\n\n        return entityURL;\n    }\n\n    \/**\n     * Extracts the name of the wiki from a context's request. In some cases, including autowww, the main wiki may be\n     * returned instead of what was requested, as a result of some assumptions. Even so, the resulting wiki name is not\n     * guaranteed to exist, it is just what XWiki understood from the request.\n     *\n     * @param context the context which contains the request\n     * @return the name of the wiki that was requested\n     * @throws XWikiException if problems occur\n     * @deprecated starting with 5.2M1 use  use {@link ResourceFactory} instead and since 6.1M2 use\n     *             {@link org.xwiki.resource.ResourceReferenceResolver} instead\n     *\/\n    @Deprecated\n    public String XWiki.getRequestWikiName(XWikiContext context) throws XWikiException\n    {\n        \/\/ Host is full.host.name in DNS-based multiwiki, and wikiname in path-based multiwiki.\n        String host = \"\";\n        \/\/ Canonical name of the wiki (database).\n        String wikiName = \"\";\n        \/\/ wikiDefinition should be the document holding the definition of the virtual wiki, a document in the main\n        \/\/ wiki with a XWiki.XWikiServerClass object attached to it\n        DocumentReference wikiDefinition;\n\n        XWikiRequest request = context.getRequest();\n        try {\n            URL requestURL = context.getURL();\n            host = requestURL.getHost();\n        } catch (Exception e) {\n        }\n\n        \/\/ In path-based multi-wiki, the wiki name is an element of the request path.\n        \/\/ The url is in the form \/xwiki (app name)\/wiki (servlet name)\/wikiname\/\n        if (\"1\".equals(this.Param(\"xwiki.virtual.usepath\", \"1\"))) {\n            String uri = request.getRequestURI();\n            if (LOGGER.isDebugEnabled()) {\n                LOGGER.debug(\"Request uri is: \" + uri);\n            }\n            \/\/ Remove the (eventual) context path from the URI, usually \/xwiki\n            uri = stripSegmentFromPath(uri, request.getContextPath());\n            \/\/ Remove the (eventual) servlet path from the URI, usually \/wiki\n            String servletPath = request.getServletPath();\n            uri = stripSegmentFromPath(uri, servletPath);\n\n            if (servletPath.equals(\"\/\" + this.Param(\"xwiki.virtual.usepath.servletpath\", \"wiki\"))) {\n                \/\/ Requested path corresponds to a path-based wiki, now the wiki name is between the first and\n                \/\/ second \"\/\"\n                host = StringUtils.substringBefore(StringUtils.removeStart(uri, \"\/\"), \"\/\");\n            }\n        }\n\n        if (StringUtils.isEmpty(host) || host.equals(context.getMainXWiki())) {\n            \/\/ Can't find any wiki name, return the main wiki\n            return context.getMainXWiki();\n        }\n\n        \/\/ Try to use the full domain name\/path wiki name and see if it corresponds to any existing wiki descriptors\n        wikiDefinition = this.findWikiServer(host, context);\n\n        if (wikiDefinition == null) {\n            \/\/ No definition found based on the full domain name\/path wiki name, try to use the first part of the domain\n            \/\/ name as the wiki name\n            String servername = StringUtils.substringBefore(host, \".\");\n\n            \/\/ Note: Starting 5.0M2, the autowww behavior is default and the ability to disable it is now removed.\n            if (\"0\".equals(this.Param(\"xwiki.virtual.autowww\"))) {\n                LOGGER.warn(String.format(\"%s %s\", \"'xwiki.virtual.autowww' is no longer supported.\",\n                    \"Please update your configuration and\/or see XWIKI-8877 for more details.\"));\n            }\n\n            \/\/ As a convenience, we do not require the creation of an xwiki:XWiki.XWikiServerXwiki page for the main\n            \/\/ wiki and automatically go to the main wiki in certain cases:\n            \/\/ - \"www.<anyDomain>.<domainExtension>\" - if it starts with www, we first check if a subwiki with that\n            \/\/ name exists; if yes, the go to the \"www\" subwiki, if not, go to the main wiki\n            \/\/ - \"localhost\"\n            \/\/ - IP address\n            if (\"www\".equals(servername)) {\n                \/\/ Check that \"www\" is not actually the name of an existing subwiki.\n                wikiDefinition = this.findWikiServer(servername, context);\n                if (wikiDefinition == null) {\n                    \/\/ Not the case, use the main wiki.\n                    return context.getMainXWiki();\n                }\n            } else if (\"localhost\".equals(host) || host.matches(\"[0-9]{1,3}(?:\\\\.[0-9]{1,3}){3}\")) {\n                \/\/ Direct access to the main wiki.\n                return context.getMainXWiki();\n            }\n\n            \/\/ Use the name from the subdomain\n            wikiName = servername;\n\n            if (!context.isMainWiki(wikiName)\n                && !\"1\".equals(context.getWiki().Param(\"xwiki.virtual.failOnWikiDoesNotExist\", \"0\"))) {\n                \/\/ Check if the wiki really exists\n                if (!exists(getServerWikiPage(wikiName), context)) {\n                    \/\/ Fallback on main wiki\n                    wikiName = context.getMainXWiki();\n                }\n            }\n        } else {\n            \/\/ Use the name from the located wiki descriptor\n            wikiName = StringUtils.removeStart(wikiDefinition.getName(), \"XWikiServer\").toLowerCase();\n        }\n\n        return wikiName;\n    }\n\n    \/**\n     * Searches for the document containing the definition of the virtual wiki corresponding to the specified hostname.\n     *\n     * @param host the hostname, as specified in the request (for example: {@code forge.xwiki.org})\n     * @param context the current context\n     * @return the name of the document containing the wiki definition, or {@code null} if no wiki corresponds to the\n     *         hostname\n     * @throws XWikiException if a problem occurs while searching the storage\n     *\/\n    private DocumentReference XWiki.findWikiServer(String host, XWikiContext context) throws XWikiException\n    {\n        ensureVirtualWikiMapExists();\n        DocumentReference wikiName = this.virtualWikiMap.get(host);\n\n        if (wikiName == null) {\n            \/\/ Not loaded yet, search for it in the main wiki\n            String hql =\n                \", BaseObject as obj, StringProperty as prop WHERE obj.name=doc.fullName\"\n                    + \" AND doc.space='XWiki' AND doc.name LIKE 'XWikiServer%'\"\n                    + \" AND obj.className='XWiki.XWikiServerClass' AND prop.id.id = obj.id\"\n                    + \" AND prop.id.name = 'server' AND prop.value=?\";\n            List<String> parameters = new ArrayList<String>(1);\n            parameters.add(host);\n            try {\n                List<DocumentReference> list =\n                    context.getWiki().getStore().searchDocumentReferences(hql, parameters, context);\n                if ((list != null) && (list.size() > 0)) {\n                    wikiName = list.get(0);\n                }\n\n                this.virtualWikiMap.set(host, wikiName);\n            } catch (XWikiException e) {\n                LOGGER.warn(\"Error when searching for wiki name from URL host [\" + host + \"]\", e);\n            }\n        }\n\n        return wikiName;\n    }\n\n    private void XWiki.ensureVirtualWikiMapExists() throws XWikiException\n    {\n        synchronized (this) {\n            if (this.virtualWikiMap == null) {\n                int iCapacity = 1000;\n                try {\n                    String capacity = Param(\"xwiki.virtual.cache.capacity\");\n                    if (capacity != null) {\n                        iCapacity = Integer.parseInt(capacity);\n                    }\n                } catch (Exception e) {\n                }\n                try {\n                    CacheConfiguration configuration = new CacheConfiguration();\n                    configuration.setConfigurationId(\"xwiki.virtualwikimap\");\n                    LRUEvictionConfiguration lru = new LRUEvictionConfiguration();\n                    lru.setMaxEntries(iCapacity);\n                    configuration.put(LRUEvictionConfiguration.CONFIGURATIONID, lru);\n\n                    this.virtualWikiMap = getCacheFactory().newCache(configuration);\n                } catch (CacheException e) {\n                    throw new XWikiException(XWikiException.MODULE_XWIKI_CACHE,\n                        XWikiException.ERROR_CACHE_INITIALIZING, \"Failed to create new cache\", e);\n                }\n            }\n        }\n    }\n\n    \/**\n     * @deprecated replaced by {@link #setUserDefaultGroup(String fullwikiname, XWikiContext context)}\n     * @param context\n     * @param fullwikiname\n     * @throws XWikiException\n     *\/\n    @Deprecated\n    public void XWiki.SetUserDefaultGroup(XWikiContext context, String fullwikiname) throws XWikiException\n    {\n        this.setUserDefaultGroup(fullwikiname, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link #protectUserPage(String,String,XWikiDocument,XWikiContext)}\n     * @param context\n     * @param fullwikiname\n     * @param userRights\n     * @param doc\n     * @throws XWikiException\n     *\/\n    @Deprecated\n    public void XWiki.ProtectUserPage(XWikiContext context, String fullwikiname, String userRights, XWikiDocument doc)\n        throws XWikiException\n    {\n        this.protectUserPage(fullwikiname, userRights, doc, context);\n    }\n\n    \/**\n     * @return the cache factory.\n     * @since 1.5M2.\n     * @deprecated Since 1.7M1, use {@link CacheManager} component instead using {@link Utils#getComponent(Class)}\n     *\/\n    @Deprecated\n    public CacheFactory XWiki.getCacheFactory()\n    {\n        CacheFactory cacheFactory;\n\n        String cacheHint = Param(\"xwiki.cache.cachefactory.hint\", null);\n\n        if (StringUtils.isEmpty(cacheHint) || Utils.getComponent(CacheFactory.class, cacheHint) == null) {\n            CacheManager cacheManager = Utils.getComponent(CacheManager.class);\n            try {\n                cacheFactory = cacheManager.getCacheFactory();\n            } catch (ComponentLookupException e) {\n                throw new RuntimeException(\"Failed to get cache factory component\", e);\n            }\n        } else {\n            cacheFactory = Utils.getComponent(CacheFactory.class, cacheHint);\n        }\n\n        return cacheFactory;\n    }\n\n    \/**\n     * @return the cache factory creating local caches.\n     * @since 1.5M2.\n     * @deprecated Since 1.7M1, use {@link CacheManager} component instead using {@link Utils#getComponent(Class)}\n     *\/\n    @Deprecated\n    public CacheFactory XWiki.getLocalCacheFactory()\n    {\n        CacheFactory localCacheFactory;\n\n        String localCacheHint = Param(\"xwiki.cache.cachefactory.local.hint\", null);\n\n        if (StringUtils.isEmpty(localCacheHint) || Utils.getComponent(CacheFactory.class, localCacheHint) == null) {\n            CacheManager cacheManager = Utils.getComponent(CacheManager.class);\n            try {\n                localCacheFactory = cacheManager.getLocalCacheFactory();\n            } catch (ComponentLookupException e) {\n                throw new RuntimeException(\"Failed to get local cache factory component\", e);\n            }\n        } else {\n            localCacheFactory = Utils.getComponent(CacheFactory.class, localCacheHint);\n        }\n\n        return localCacheFactory;\n    }\n\n    \/**\n     * @deprecated since 2.3M1 use {@link #hasVersioning(XWikiContext)} instead\n     *\/\n    @Deprecated\n    public boolean XWiki.hasVersioning(String fullName, XWikiContext context)\n    {\n        return hasVersioning(context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link #include(String topic, boolean isForm, XWikiContext context)}\n     * @param topic\n     * @param context\n     * @param isForm\n     * @return\n     * @throws XWikiException\n     *\/\n    @Deprecated\n    public String XWiki.include(String topic, XWikiContext context, boolean isForm) throws XWikiException\n    {\n        return include(topic, isForm, context);\n    }\n    \n    \/**\n     * Checks if the wiki is running in test mode.\n     * \n     * @return {@code true} if the wiki is running Cactus tests, {@code false} otherwise\n     * @deprecated No longer used.\n     *\/\n    @Deprecated\n    public boolean XWiki.isTest()\n    {\n        return this.test;\n    }\n\n    \/**\n     * Marks that the wiki is running in test mode.\n     * \n     * @param test whether tests are being executed\n     * @deprecated No longer used.\n     *\/\n    @Deprecated\n    public void XWiki.setTest(boolean test)\n    {\n        this.test = test;\n    }\n\n    \/**\n     * @deprecated use {@link org.xwiki.localization.LocalizationManager} instead. From velocity you can access it using\n     *             the {@code $services.localization} binding, see {@code LocalizationScriptService}\n     *\/\n    @Deprecated\n    public String XWiki.parseMessage(XWikiContext context)\n    {\n        String message = (String) context.get(\"message\");\n        if (message == null) {\n            return null;\n        }\n\n        return parseMessage(message, context);\n    }\n\n    \/**\n     * @deprecated use {@link org.xwiki.localization.LocalizationManager} instead. From velocity you can access it using\n     *             the {@code $services.localization} binding, see {@code LocalizationScriptService}\n     *\/\n    @Deprecated\n    public String XWiki.parseMessage(String id, XWikiContext context)\n    {\n        XWikiMessageTool msg = context.getMessageTool();\n\n        List<?> parameters = (List<?>) context.get(\"messageParameters\");\n\n        String translatedMessage;\n        if (parameters != null) {\n            translatedMessage = msg.get(id, parameters);\n        } else {\n            translatedMessage = msg.get(id);\n        }\n\n        return parseContent(translatedMessage, context);\n    }\n}\n","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"a8d26f6c00359c930bc6adb7b840ed7551da9732","subject":"refactor of event generation -- compatible with Cugat events","message":"refactor of event generation -- compatible with Cugat events\n","repos":"Aloja\/AOP4Hadoop","old_file":"src\/1.0.3\/Aspectj.aj","new_file":"src\/1.0.3\/Aspectj.aj","new_contents":"import java.io.*;\nimport java.util.*;\nimport java.lang.management.ManagementFactory;\nimport java.sql.Timestamp;\nimport java.text.SimpleDateFormat;\nimport java.net.InetAddress;\nimport java.lang.ClassLoader;\nimport org.apache.hadoop.io.DataInputBuffer;\nimport org.apache.hadoop.mapred.TaskStatus;\nimport org.apache.hadoop.fs.permission.FsPermission;\nimport org.apache.hadoop.util.Progressable;\nimport org.apache.hadoop.hdfs.protocol.DatanodeInfo;\nimport org.apache.hadoop.util.DataChecksum;\nimport java.net.Socket;\n\n\nimport org.apache.hadoop.security.token.Token;\nimport org.apache.hadoop.security.token.TokenIdentifier;\nimport org.apache.hadoop.hdfs.security.token.block.BlockTokenIdentifier;\n\n\nimport org.apache.hadoop.fs.FSDataInputStream;\nimport org.apache.hadoop.hdfs.DFSClient;\n\nimport org.apache.hadoop.mapred.TaskTrackerStatus;\n\nimport org.apache.commons.logging.Log;\nimport org.apache.commons.logging.LogFactory;\n\n\nimport org.apache.hadoop.conf.Configuration;\n\n\n\n\n\n\n\/**\n *\n * @author Alejandro\n *\/\n\naspect AlojaAspect {\t\t\n\n\tprivate static final Log LOG = LogFactory.getLog(AlojaAspect.class);\n\n\t\/*\n\tTYPES\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\n    public static class Events {\n\n        public static final int JobTracker = 11111;\n        public static final int TaskTracker = 11112;\n        public static final int NameNode = 11113;\n        public static final int SecondaryNameNode = 11114;\n        public static final int DataNode = 11115;\n        public static final int Task = 11116;\n\/\/        public static final int MapTask = 11117;\n\/\/        public static final int ReduceTask = 11118;\n        public static final int MapOutputBuffer = 33333;\n        public static final int MapTaskOutputSize = 44444;\n    }\n\n    public static class Values {\n\n       \t\/\/ Generic\n\t\tpublic static final int End = 0;        \n        public static final int Start = 1;\n        \n        \/\/ Events.TaskTracker \n\t\tpublic static final int RunMapper = 8;\n        public static final int RunReducer = 9;\n        public static final int Combine = 4;\n        public static final int ReducerCopyPhase = 10;\n        public static final int ReducerSortPhase = 11;\n        public static final int ReducerReducePhase = 12;\n\n\t\t\/\/ Events.JobTracker\n\t\tpublic static final int HeartBeat = 13;\n\n\n\n        public static final int Flush = 1;\n        public static final int SortAndSpill = 2;\n        public static final int Sort = 3;        \n        public static final int CreateSpillIndexFile = 5;\n        public static final int TotalIndexCacheMemory = 6;\n        public static final int SpillRecordDumped = 7;\n    }    \n\n\n\t\/*\n\tFUNCTIONS\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\t\n\tprivate static long getPID() {\n\t\tString name = java.lang.management.ManagementFactory.getRuntimeMXBean().getName();\n\t\treturn Long.parseLong(name.split(\"@\")[0]);\n\t}\n\n\tprivate void generateEvent(Integer key, Integer value) {\n\t\t\/\/2:cpu:app:task:thread:time:type:value\n\t\ttry{\n\t\t\tString hostname = InetAddress.getLocalHost().getHostName();\n\t\t\tlong pid = getPID();\n\t\t\tLOG.info(hostname+\",\"+pid+\",2:\"+hostname+\":2:\"+pid+\":1:\"+System.currentTimeMillis()+\":\"+key+\":\"+value);\n\t\t}\n\t\tcatch (Exception e) {\n\t\t\tLOG.error(e, e);\n\n\t\t}\n\t}\n\n\n\tprivate void generateEvent(Integer key, String value) {\n\t\t\/\/2:cpu:app:task:thread:time:type:value\n\t\ttry{\n\t\t\tString hostname = InetAddress.getLocalHost().getHostName();\n\t\t\tlong pid = getPID();\n\t\t\tLOG.info(hostname+\",\"+pid+\",2:\"+hostname+\":2:\"+pid+\":1:\"+System.currentTimeMillis()+\":\"+key+\":\"+value);\n\t\t}\n\t\tcatch (Exception e) {\n\t\t\tLOG.error(e, e);\n\n\t\t}\n\t}\n\n\n\t\/*private void generateEVent(Integer key[], Integer value) {\n\n\t\tStringBuffer output = new StringBuffer();\n\n\n\t\toutput.append()\n\n\t}*\/\n\n\tprivate void instrumentation(String event, String when) {\n\n\t\tinstrumentation(event, when, \"\");\n\n\t}\n\tprivate void instrumentation(String event, String when, String additional) {\n\t\ttry {\n\t\t\t\/\/Add hostname\n\t\t\tString log = InetAddress.getLocalHost().getHostName();\n\t\t\t\/\/Add PID \n\t\t\tlog += \",\" + getPID();\n\t\t\t\/\/Specify event\n\t\t\tlog += \",\" + when + \",\" + event;\n\t\t\t\/\/Specify event\n\t\t\tlog += additional;\n\t\t\t\/\/LOG.info(log);\n\t\t\t\/\/writeLog(logFile,log);\n\n\n\t\t}\n\t\tcatch (IOException e) {\n\t\t\te.printStackTrace();\n\t\t}\n\t}\n\n\n\t\/*\n\tPOINTCUTS\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\n\t\/\/RegisterDataNode Pointcut\n\n\tpointcut startDataNode(): execution(* org.apache.hadoop.hdfs.server.datanode.DataNode.startDataNode(..));\n\n\t\/\/RegisterNameNode Pointcut\n\n\tpointcut initializeNameNode():  execution(* org.apache.hadoop.hdfs.server.namenode.NameNode.initialize(..));\n\n\t\/\/RegisterSecondaryNamenode Pointcut\n\n\tpointcut initializeSecondaryNameNode(): execution(* org.apache.hadoop.hdfs.server.namenode.SecondaryNameNode.initialize(..));\n\n\t\/\/RegisterTask - CHILD\n\n\t\/\/pointcut initializeChild(): call(* org.apache.hadoop.mapred.Child.initMetrics(..)) && withincode(* org.apache.hadoop.mapred.Child.main(..)); \n\n\tpointcut initializeChild(): execution(* org.apache.hadoop.mapred.Child.main(..)); \n\n\t\/\/Register JobTracker Pointcut\n\n\tpointcut registerJobTracker(): execution(* org.apache.hadoop.mapred.JobTracker.startTracker(..));\n\n\t\/\/HEARTBEAT\n\n\tpointcut heartbeat(TaskTrackerStatus status,boolean restarted,boolean initialContact,boolean acceptNewTasks,short responseId): execution(* org.apache.hadoop.mapred.JobTracker.heartbeat(..)) && args(status, restarted, initialContact, acceptNewTasks,responseId);\n\n\t\/*\n\t\t###########################################################################\n\t\t############################Task###########################################\n\t\t###########################################################################\n\t*\/\n\n\n\tpointcut outputSize(): call (* *.getLen(..)) && withincode(* org.apache.hadoop.mapred.Task.calculateOutputSize());\n\n\t\/*\n\t\t###########################################################################\n\t\t############################MAPPER#########################################\n\t\t###########################################################################\n\t*\/\n\n\t\/\/pointcut maptask(): execution(* org.apache.hadoop.mapred.MapTask.run(..));\n\tpointcut mapper(): call(* org.apache.hadoop.mapred.MapTask.runNewMapper(..)) && withincode(* org.apache.hadoop.mapred.MapTask.run(..));\n\tpointcut flush(): execution(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.flush());\n\n\n\t\/\/  ############################SORT AND SPILL#################################\n\n\t\/\/Start-End\n\tpointcut taskSortAndSpill(): execution(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Spill File Size\n\tpointcut sortAndSpillSpillFile(int numSpills, long size) : call (* *.getSpillFileForWrite(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(numSpills, size);\n\n\t\/\/SpillIndex File Size\n\tpointcut sortAndSpillSpillIndexFile(int numSpills, long partitions) : call (* *.getSpillIndexFileForWrite(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(numSpills, partitions);\n\n\t\/\/Sort \n\tpointcut sortAndSpillSort(int kvstart, int endPosition, Object reporter): call(* *.sort(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(..,kvstart,endPosition,reporter);\n\n\t\/\/Init Writer\n\tpointcut sortAndSpillInitWriter() : call (org.apache.hadoop.mapred.IFile.Writer.new(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Close Writer\n\tpointcut sortAndSpillCloseWriter() : call (void org.apache.hadoop.mapred.IFile.Writer.close(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Write key-value\n\n\t\/\/pointcut sortAndSpillWrite(DataInputBuffer key, DataInputBuffer value): call (* *.append(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(key,value) && !within(Aspect);\n\t\n\t\/\/Combiner\n\tpointcut sortAndSpillCombiner(): call(* *.combine(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Spill Index File\n\tpointcut sortAndSpillSpillIndexWrite(): call(* *.writeToFile(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/*\n\t\t###########################################################################\n\t\t############################REDUCER########################################\n\t\t###########################################################################\n\t*\/\n\n\t\/\/REDUCETASK RUN\n\tpointcut reducer(): execution(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\tpointcut initCodec(): call(* *.initCodec(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\tpointcut setPhase(TaskStatus.Phase phase): call(* *.setPhase(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..)) && args(phase);\n\n\t\n\t\/\/pointcut endCopy(): call(* *.setPhase(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\t\/\/pointcut endSort(): call(* *.getMapOutputKeyClass(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\t\n\n\t\/*\n\t\t###########################################################################\n\t\t############################NETWORK########################################\n\t\t###########################################################################\n\t*\/\n\n\tpointcut defaultBlockSize(): call(* org.apache.hadoop.hdfs.DFSClient.getDefaultBlockSize());\n\t\/\/pointcut blockSize(): call(* org.apache.hadoop.hdfs.DFSClient.getBlockSize(..));\n\tpointcut createDFSFile(String src,FsPermission permission,boolean overwrite,boolean createParent,short replication,long blockSize,Progressable progress, int buffersize): execution (* org.apache.hadoop.hdfs.DFSClient.create(..)) && args(src,permission,overwrite,createParent,replication,blockSize,progress,buffersize);\n\tpointcut runDataStreamer(): execution (* org.apache.hadoop.hdfs.DFSClient.DFSOutputStream.DataStreamer.run());\n\t\/\/pointcut readEntireBufferFromDataNode(byte buf[],int off,int len): execution(* org.apache.hadoop.hdfs.DFSClient.DFSInputStream.read(..)) && args(buf[],off,len);\n\t\/\/pointcut readFromDataNode(): call (* org.apache.hadoop.hdfs.DFSClient.DFSInputStream.blockSeekTo(..)) && withincode(* org.apache.hadoop.hdfs.DFSClient.DFSInputStream.read(..));\n\tpointcut newBlockReader(Socket sock, String file, long blockId, Token<BlockTokenIdentifier> accessToken, long genStamp, long startOffset, long len, int bufferSize, boolean verifyChecksum, String clientName): execution (* org.apache.hadoop.hdfs.DFSClient.BlockReader.newBlockReader(..)) && args(sock,file,blockId,accessToken,genStamp,startOffset,len,bufferSize,verifyChecksum,clientName);\n\n\t\/*\n\tAdvices\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\n\t\/\/ RegiterJobTracker\n\n\tafter() : registerJobTracker(){\n\t\tgenerateEvent(Events.JobTracker, Values.Start);\n\n\t}\n\n\t\/\/RegisterTaskTracker ?\n\n\n\t\/\/RegisterNameNode\n\n\tafter() : initializeNameNode(){\n\t\tgenerateEvent(Events.NameNode, Values.Start);\n\t}\n\n\t\/\/RegisterDataNode \n\n\tafter() : startDataNode(){\n\t\tgenerateEvent(Events.DataNode, Values.Start);\n\t}\n\n\n\t\/\/RegisterSecondaryNamenode\n\n\tafter() : initializeSecondaryNameNode(){\n\t\tgenerateEvent(Events.SecondaryNameNode, Values.Start);\n\t}\n\n\n\t\/\/HEARTBEAT \n\tafter(TaskTrackerStatus status,boolean restarted,boolean initialContact,boolean acceptNewTasks,short responseId) : heartbeat(status, restarted, initialContact, acceptNewTasks,responseId){\n\t\tgenerateEvent(Events.JobTracker, status.getTrackerName());\n\t}\n\n\n\t\/*\n\t\t###########################################################################\n\t\t############################Task###########################################\n\t\t###########################################################################\n\t*\/\n\n\t\/\/RegisterTask CHILD \n\tafter() : initializeChild() { \/\/We need the  PID of this task to be registered\n\t\tgenerateEvent(Events.Task, Values.Start);\n\t}\n\n\n\/*\tafter() returning(long size) : outputSize() {\n\t\tString s = \"Task-outputSize\";\n\t\tinstrumentation(s,\"after\",\", size: \" + Long.toString(size));\n\t}\n\n\t\/*\n\t\t###########################################################################\n\t\t############################Mapper#########################################\n\t\t###########################################################################\n\t*\/\n\n\n\t\/*before() : maptask(){\n\t\tgenerateEvent(Events.MapTask, Values.Start);\n\t}*\/\n\n\tbefore() : mapper(){\n\t\tgenerateEvent(Events.TaskTracker, Values.RunMapper);\n\t}\n\n\tafter() : mapper(){\n\t\tgenerateEvent(Events.TaskTracker, Values.End);\n\t}\n\n\n\t\/\/flush\n\n\tbefore() : flush(){\n\t\tString s = \"Flush\";\n\t\tinstrumentation(s,\"before\");\n\t}\n\n\n\tafter() : flush(){\n\t\tString s = \"Flush\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\t\/\/  ############################SORT AND SPILL#################################\n\n\tbefore() : taskSortAndSpill(){\n\t\tString s = \"sortAndSpill\";\n\t\tinstrumentation(s,\"before\");\n\t}\n\n\tafter() : taskSortAndSpill(){\n\t\tString s = \"sortAndSpill\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\t\/\/ Spill File Size\n\n\tafter(int numSpills, long size) returning : sortAndSpillSpillFile(numSpills, size){\n\t\tString s = \"sortAndSpillSpillFile\";\n\t\tinstrumentation(s,\"after\",\", numSpills: \" +Integer.toString(numSpills) + \";size: \" + Long.toString((size*numSpills) + size));\n\t}\n\n\t\/\/ SpillIndex File Size\n\n\tafter(int numSpills, long partitions) returning : sortAndSpillSpillIndexFile(numSpills, partitions){\n\t\tString s = \"sortAndSpillSpillIndexFile\";\n\t\tinstrumentation(s,\"after\",\",\" + Long.toString(numSpills * partitions));\n\t}\n\n\/*\n\tbefore(int length) : kvbufferState(length){\n\n\t\tString s = \"kvbufferState\";\n\t\tFile logFile = getFile();\n\t\tinstrumentation(logFile,s,\"before\");\n\t\twriteLog(logFile,Integer.toString(length));\n\t}\n\n*\/\n\n\tbefore(int kvstart, int endPosition, Object reporter) : sortAndSpillSort(kvstart,endPosition,reporter){\n\t\tString s = \"sortAndSpillSort\";\n\t\tinstrumentation(s,\"before\",\",\" + Integer.toString(endPosition - kvstart));\n\t}\n\tafter(int kvstart, int endPosition, Object reporter) returning : sortAndSpillSort(kvstart,endPosition,reporter){\n\t\tString s = \"sortAndSpillSort\";\n\t\tinstrumentation(s,\"after\",\",\" + Integer.toString(endPosition - kvstart));\n\t}\n\n\t\/\/ Init writer\n\tafter() returning : sortAndSpillInitWriter(){\n\t\tString s = \"sortAndSpillInitWriter\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\t\/\/ Close writer\n\tafter() returning : sortAndSpillCloseWriter(){\n\t\tString s = \"sortAndSpillCloseWriter\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\/*\n\tafter(DataInputBuffer key, DataInputBuffer value) returning : sortAndSpillWrite(key,value){\n\t\tString s = \"sortAndSpillWrite\";\n\t\tFile logFile = getFile();\n\t\tinstrumentation(logFile,s,\"after\");\n\t\tString log = \",\" + key.getData(); \/\/ + \",\" + value.getData();\n\t\twriteLog(logFile,log);\n\t}\n*\/\n\tbefore() : sortAndSpillCombiner(){\n\t\tString s = \"sortAndSpillCombiner\";\n\t\tinstrumentation(s,\"before\");\n\t}\n\n\tafter() returning : sortAndSpillCombiner(){\n\t\tString s = \"sortAndSpillCombiner\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\tbefore() : sortAndSpillSpillIndexWrite(){\n\t\tString s = \"sortAndSpillSpillIndexWrite\";\n\t\tinstrumentation(s,\"before\");\n\t}\n\n\tafter() returning : sortAndSpillSpillIndexWrite(){\n\t\tString s = \"sortAndSpillSpillIndexWrite\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\t\/*\n\t\t###########################################################################\n\t\t############################REDUCER########################################\n\t\t###########################################################################\n\t*\/\n\n\/*\tbefore() : reducer(){\n\t\tString s = \"Reducer\";\n\t\tinstrumentation(s,\"before\");\n\t}\n*\/\n\n\tbefore() : initCodec() {\n\t\tgenerateEvent(Events.TaskTracker, Values.RunReducer);\n\t}\n\n\n\tafter() returning : initCodec() {\n\t\tgenerateEvent(Events.TaskTracker, Values.ReducerCopyPhase);\n\t}\n\n\tbefore(TaskStatus.Phase phase) : setPhase(phase) { \/\/END OF A PHASE (SORT OR COPY)\n\t\t\tgenerateEvent(Events.TaskTracker, Values.End);\n\t}\n\n\tafter(TaskStatus.Phase phase) returning: setPhase(phase) { \n\t\tif (phase == TaskStatus.Phase.SORT) {\n\t\t\tgenerateEvent(Events.TaskTracker, Values.ReducerSortPhase);\n\t\t}\n\t\telse if (phase == TaskStatus.Phase.REDUCE) {\n\t\t\tgenerateEvent(Events.TaskTracker, Values.ReducerReducePhase);\n\t\t}\n\t}\n\n\tafter() : reducer(){ \/\/END OF REDUCE PHASE\n\t\t\tgenerateEvent(Events.TaskTracker, Values.End);\t}\n\n\t\/*\n\t\t###########################################################################\n\t\t############################NETWORK########################################\n\t\t###########################################################################\n\t*\/\n\n\tafter() returning(long blockSize) : defaultBlockSize() {\n\t\tString s = \"Network-defaultBlockSize\";\n\t\tinstrumentation(s,\"after\",\", size: \" + Long.toString(blockSize));\n\t}\n\t\/\/ after() returning(long blockSize) : blockSize() {\n\t\/\/ \tString s = \"Network-blockSize\";\n\t\/\/ \tFile logFile = getFile();\n\t\/\/ \tinstrumentation(logFile,s,\"after\");\n\t\/\/ \tString log = \", size: \" + Long.toString(blockSize);\n\t\/\/ \twriteLog(logFile,log);\n\t\/\/ }\n\n\tafter(String src,FsPermission permission,boolean overwrite, boolean createParent,short replication,long blockSize,Progressable progress, int buffersize): createDFSFile(src,permission,overwrite,createParent,replication,blockSize,progress,buffersize) {\n\t\tString s = \"Network-CreateDFSFile\";\n\n\t\t\/\/MODIFIED!!!!!!-----!!!!!!!!!!!\n\t\tinstrumentation(s,\"after\",\", path: \" + src + \";permission: \" + permission.toString() + \";overwrite: \" + String.valueOf(overwrite) + \";createParent: \" + String.valueOf(createParent) + \";replication: \" + Short.toString(replication) + \";blockSize: \" + Long.toString(blockSize) + \";buffersize: \" + Integer.toString(buffersize));\n\t}\n\tbefore(): runDataStreamer() {\n\t\tString s = \"DataStreamer\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\t\/\/ before(byte buf[],int off, int len) : readEntireBufferFromDataNode(buf[],off,len){\n\t\/\/ \tString s = \"Network-ReadEntireBuffer\";\n\t\/\/ \tinstrumentation(s,\"after\",\", bufferLength: \" + Integer.toString(len));\n\t\/\/ }\n\n\t\/\/ after() returning(DatanodeInfo datanode) : readFromDataNode(){\n\t\/\/ \tString s = \"Network-fromDataNode\";\n\t\/\/ \tinstrumentation(s,\"after\", \", from : \" + datanode.getHostName());\n\t\/\/ }\n\n\tafter(Socket sock, String file, long blockId, Token<BlockTokenIdentifier> accessToken, long genStamp, long startOffset, long len, int bufferSize, boolean verifyChecksum, String clientName) : newBlockReader(sock,file,blockId,accessToken,genStamp,startOffset,len,bufferSize,verifyChecksum,clientName) {\n\t\tString s = \"Network-NewBlockReader\";\n\t\tString extra = \", DataNode: \" + sock.getInetAddress().getCanonicalHostName();\n\t\textra += \";file: \" + file;\n\t\t\/\/extra += \", length: \" + Long.toString(len) + \"B\";\n\t\textra += \";\" + Long.toString(len);\n\t\textra += \";blockId: \" + Long.toString(blockId);\n\t\textra += \";startOffset: \" + Long.toString(startOffset);\t\t\n\t\tinstrumentation(s,\"after\",extra);\n\t}\n}\n\n\n\n\n","old_contents":"import java.io.*;\nimport java.util.*;\nimport java.lang.management.ManagementFactory;\nimport java.sql.Timestamp;\nimport java.text.SimpleDateFormat;\nimport java.net.InetAddress;\nimport java.lang.ClassLoader;\nimport org.apache.hadoop.io.DataInputBuffer;\nimport org.apache.hadoop.mapred.TaskStatus;\nimport org.apache.hadoop.fs.permission.FsPermission;\nimport org.apache.hadoop.util.Progressable;\nimport org.apache.hadoop.hdfs.protocol.DatanodeInfo;\nimport org.apache.hadoop.util.DataChecksum;\nimport java.net.Socket;\n\n\nimport org.apache.hadoop.security.token.Token;\nimport org.apache.hadoop.security.token.TokenIdentifier;\nimport org.apache.hadoop.hdfs.security.token.block.BlockTokenIdentifier;\n\n\nimport org.apache.hadoop.fs.FSDataInputStream;\nimport org.apache.hadoop.hdfs.DFSClient;\n\n\nimport org.apache.commons.logging.Log;\nimport org.apache.commons.logging.LogFactory;\n\n\nimport org.apache.hadoop.conf.Configuration;\n\n\n\n\n\n\n\/**\n *\n * @author Alejandro\n *\/\n\naspect AlojaAspect {\t\t\n\n\tprivate static final Log LOG = LogFactory.getLog(AlojaAspect.class);\n\n\t\/*\n\tFUNCTIONS\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\t\n\tprivate static long getPID() {\n\t\tString name = java.lang.management.ManagementFactory.getRuntimeMXBean().getName();\n\t\treturn Long.parseLong(name.split(\"@\")[0]);\n\t}\n\n\tprivate void generateEvent(Integer key, Integer value) {\n\t\t\/\/2:cpu:app:task:thread:time:type:value\n\t\ttry{\n\t\t\tString hostname = InetAddress.getLocalHost().getHostName();\n\t\t\tlong pid = getPID();\n\t\t\tLOG.info(hostname+\",\"+pid+\",2:\"+hostname+\":2:\"+pid+\":1:\"+System.currentTimeMillis()+\":\"+key+\":\"+value);\n\t\t}\n\t\tcatch (Exception e) {\n\t\t\tLOG.error(e, e);\n\n\t\t}\n\t}\n\n\n\n\t\/*private void generateEVent(Integer key[], Integer value) {\n\n\t\tStringBuffer output = new StringBuffer();\n\n\n\t\toutput.append()\n\n\t}*\/\n\n\tprivate void instrumentation(String event, String when) {\n\n\t\tinstrumentation(event, when, \"\");\n\n\t}\n\tprivate void instrumentation(String event, String when, String additional) {\n\t\ttry {\n\t\t\t\/\/Add hostname\n\t\t\tString log = InetAddress.getLocalHost().getHostName();\n\t\t\t\/\/Add PID \n\t\t\tlog += \",\" + getPID();\n\t\t\t\/\/Specify event\n\t\t\tlog += \",\" + when + \",\" + event;\n\t\t\t\/\/Specify event\n\t\t\tlog += additional;\n\t\t\tLOG.info(log);\n\t\t\t\/\/writeLog(logFile,log);\n\n\n\t\t}\n\t\tcatch (IOException e) {\n\t\t\te.printStackTrace();\n\t\t}\n\t}\n\n\n\t\/*\n\tPOINTCUTS\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\n\t\/\/RegisterDataNode Pointcut\n\n\tpointcut startDataNode(): execution(* org.apache.hadoop.hdfs.server.datanode.DataNode.startDataNode(..));\n\n\t\/\/RegisterNameNode Pointcut\n\n\tpointcut initializeNameNode():  execution(* org.apache.hadoop.hdfs.server.namenode.NameNode.initialize(..));\n\n\t\/\/RegisterSecondaryNamenode Pointcut\n\n\tpointcut initializeSecondaryNameNode(): execution(* org.apache.hadoop.hdfs.server.namenode.SecondaryNameNode.initialize(..));\n\n\t\/\/RegisterTask - CHILD\n\n\t\/\/pointcut initializeChild(): call(* org.apache.hadoop.mapred.Child.initMetrics(..)) && withincode(* org.apache.hadoop.mapred.Child.main(..)); \n\n\tpointcut initializeChild(): execution(* org.apache.hadoop.mapred.Child.main(..)); \n\n\t\/\/Register JobTracker Pointcut\n\n\tpointcut registerJobTracker(): execution(* org.apache.hadoop.mapred.JobTracker.startTracker(..));\n\n\t\/\/HEARTBEAT\n\n\tpointcut heartbeat(): execution(* org.apache.hadoop.mapred.JobTracker.heartbeat(..));\n\n\t\/*\n\t\t###########################################################################\n\t\t############################Task###########################################\n\t\t###########################################################################\n\t*\/\n\n\n\tpointcut outputSize(): call (* *.getLen(..)) && withincode(* org.apache.hadoop.mapred.Task.calculateOutputSize());\n\n\t\/*\n\t\t###########################################################################\n\t\t############################MAPPER#########################################\n\t\t###########################################################################\n\t*\/\n\n\tpointcut maptask(): execution(* org.apache.hadoop.mapred.MapTask.run(..));\n\tpointcut mapper(): call(* org.apache.hadoop.mapred.MapTask.runNewMapper(..)) && withincode(* org.apache.hadoop.mapred.MapTask.run(..));\n\tpointcut flush(): execution(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.flush());\n\n\n\t\/\/  ############################SORT AND SPILL#################################\n\n\t\/\/Start-End\n\tpointcut taskSortAndSpill(): execution(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Spill File Size\n\tpointcut sortAndSpillSpillFile(int numSpills, long size) : call (* *.getSpillFileForWrite(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(numSpills, size);\n\n\t\/\/SpillIndex File Size\n\tpointcut sortAndSpillSpillIndexFile(int numSpills, long partitions) : call (* *.getSpillIndexFileForWrite(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(numSpills, partitions);\n\n\t\/\/Sort \n\tpointcut sortAndSpillSort(int kvstart, int endPosition, Object reporter): call(* *.sort(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(..,kvstart,endPosition,reporter);\n\n\t\/\/Init Writer\n\tpointcut sortAndSpillInitWriter() : call (org.apache.hadoop.mapred.IFile.Writer.new(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Close Writer\n\tpointcut sortAndSpillCloseWriter() : call (void org.apache.hadoop.mapred.IFile.Writer.close(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Write key-value\n\n\t\/\/pointcut sortAndSpillWrite(DataInputBuffer key, DataInputBuffer value): call (* *.append(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(key,value) && !within(Aspect);\n\t\n\t\/\/Combiner\n\tpointcut sortAndSpillCombiner(): call(* *.combine(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Spill Index File\n\tpointcut sortAndSpillSpillIndexWrite(): call(* *.writeToFile(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/*\n\t\t###########################################################################\n\t\t############################REDUCER########################################\n\t\t###########################################################################\n\t*\/\n\n\t\/\/REDUCETASK RUN\n\n\tpointcut reducer(): execution(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\tpointcut initCopy(): call(* *.initCodec(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\tpointcut endPhase(TaskStatus.Phase phase): call(* *.setPhase(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..)) && args(phase);\n\n\t\/\/pointcut endCopy(): call(* *.setPhase(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\t\/\/pointcut endSort(): call(* *.getMapOutputKeyClass(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\t\n\n\t\/*\n\t\t###########################################################################\n\t\t############################NETWORK########################################\n\t\t###########################################################################\n\t*\/\n\n\tpointcut defaultBlockSize(): call(* org.apache.hadoop.hdfs.DFSClient.getDefaultBlockSize());\n\t\/\/pointcut blockSize(): call(* org.apache.hadoop.hdfs.DFSClient.getBlockSize(..));\n\tpointcut createDFSFile(String src,FsPermission permission,boolean overwrite,boolean createParent,short replication,long blockSize,Progressable progress, int buffersize): execution (* org.apache.hadoop.hdfs.DFSClient.create(..)) && args(src,permission,overwrite,createParent,replication,blockSize,progress,buffersize);\n\tpointcut runDataStreamer(): execution (* org.apache.hadoop.hdfs.DFSClient.DFSOutputStream.DataStreamer.run());\n\t\/\/pointcut readEntireBufferFromDataNode(byte buf[],int off,int len): execution(* org.apache.hadoop.hdfs.DFSClient.DFSInputStream.read(..)) && args(buf[],off,len);\n\t\/\/pointcut readFromDataNode(): call (* org.apache.hadoop.hdfs.DFSClient.DFSInputStream.blockSeekTo(..)) && withincode(* org.apache.hadoop.hdfs.DFSClient.DFSInputStream.read(..));\n\tpointcut newBlockReader(Socket sock, String file, long blockId, Token<BlockTokenIdentifier> accessToken, long genStamp, long startOffset, long len, int bufferSize, boolean verifyChecksum, String clientName): execution (* org.apache.hadoop.hdfs.DFSClient.BlockReader.newBlockReader(..)) && args(sock,file,blockId,accessToken,genStamp,startOffset,len,bufferSize,verifyChecksum,clientName);\n\n\t\/*\n\tAdvices\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\n\t\/\/RegisterDataNode \n\n\tafter() : startDataNode(){\n\t\tgenerateEvent(11115, 1);\n\t}\n\n\t\/\/RegisterNameNode\n\n\tafter() : initializeNameNode(){\n\t\tgenerateEvent(11113, 1);\n\t}\n\n\n\t\/\/RegisterSecondaryNamenode\n\n\tafter() : initializeSecondaryNameNode(){\n\t\tgenerateEvent(11114, 1);\n\t}\n\n\n\t\/\/RegisterTask CHILD\n \n\tafter() : initializeChild() {\n\t\tgenerateEvent(11116, 1);\n\t}\n\t\n\t\/\/ RegiterJobTracker\n\n\tafter() : registerJobTracker(){\n\t\tgenerateEvent(11111, 1);\n\n\t}\n\n\t\/\/HEARTBEAT \n\tafter() : heartbeat(){\n\t\tgenerateEvent(11119, 1);\n\t}\n\n\n\t\/*\n\t\t###########################################################################\n\t\t############################Task###########################################\n\t\t###########################################################################\n\t*\/\n\n\tafter() returning(long size) : outputSize() {\n\t\tString s = \"Task-outputSize\";\n\t\tinstrumentation(s,\"after\",\", size: \" + Long.toString(size));\n\t}\n\n\t\/*\n\t\t###########################################################################\n\t\t############################Mapper#########################################\n\t\t###########################################################################\n\t*\/\n\n\n\tbefore() : maptask(){\n\t\tgenerateEvent(11116, 1);\n\t}\n\n\tbefore() : mapper(){\n\t\tgenerateEvent(11117, 1);\n\t}\n\n\tafter() : mapper(){\n\t\tgenerateEvent(11117, 0);\n\t}\n\n\n\t\/\/flush\n\n\tbefore() : flush(){\n\t\tString s = \"Flush\";\n\t\tinstrumentation(s,\"before\");\n\t}\n\n\n\tafter() : flush(){\n\t\tString s = \"Flush\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\t\/\/  ############################SORT AND SPILL#################################\n\n\tbefore() : taskSortAndSpill(){\n\t\tString s = \"sortAndSpill\";\n\t\tinstrumentation(s,\"before\");\n\t}\n\n\tafter() : taskSortAndSpill(){\n\t\tString s = \"sortAndSpill\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\t\/\/ Spill File Size\n\n\tafter(int numSpills, long size) returning : sortAndSpillSpillFile(numSpills, size){\n\t\tString s = \"sortAndSpillSpillFile\";\n\t\tinstrumentation(s,\"after\",\", numSpills: \" +Integer.toString(numSpills) + \";size: \" + Long.toString((size*numSpills) + size));\n\t}\n\n\t\/\/ SpillIndex File Size\n\n\tafter(int numSpills, long partitions) returning : sortAndSpillSpillIndexFile(numSpills, partitions){\n\t\tString s = \"sortAndSpillSpillIndexFile\";\n\t\tinstrumentation(s,\"after\",\",\" + Long.toString(numSpills * partitions));\n\t}\n\n\/*\n\tbefore(int length) : kvbufferState(length){\n\n\t\tString s = \"kvbufferState\";\n\t\tFile logFile = getFile();\n\t\tinstrumentation(logFile,s,\"before\");\n\t\twriteLog(logFile,Integer.toString(length));\n\t}\n\n*\/\n\n\tbefore(int kvstart, int endPosition, Object reporter) : sortAndSpillSort(kvstart,endPosition,reporter){\n\t\tString s = \"sortAndSpillSort\";\n\t\tinstrumentation(s,\"before\",\",\" + Integer.toString(endPosition - kvstart));\n\t}\n\tafter(int kvstart, int endPosition, Object reporter) returning : sortAndSpillSort(kvstart,endPosition,reporter){\n\t\tString s = \"sortAndSpillSort\";\n\t\tinstrumentation(s,\"after\",\",\" + Integer.toString(endPosition - kvstart));\n\t}\n\n\t\/\/ Init writer\n\tafter() returning : sortAndSpillInitWriter(){\n\t\tString s = \"sortAndSpillInitWriter\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\t\/\/ Close writer\n\tafter() returning : sortAndSpillCloseWriter(){\n\t\tString s = \"sortAndSpillCloseWriter\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\/*\n\tafter(DataInputBuffer key, DataInputBuffer value) returning : sortAndSpillWrite(key,value){\n\t\tString s = \"sortAndSpillWrite\";\n\t\tFile logFile = getFile();\n\t\tinstrumentation(logFile,s,\"after\");\n\t\tString log = \",\" + key.getData(); \/\/ + \",\" + value.getData();\n\t\twriteLog(logFile,log);\n\t}\n*\/\n\tbefore() : sortAndSpillCombiner(){\n\t\tString s = \"sortAndSpillCombiner\";\n\t\tinstrumentation(s,\"before\");\n\t}\n\n\tafter() returning : sortAndSpillCombiner(){\n\t\tString s = \"sortAndSpillCombiner\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\tbefore() : sortAndSpillSpillIndexWrite(){\n\t\tString s = \"sortAndSpillSpillIndexWrite\";\n\t\tinstrumentation(s,\"before\");\n\t}\n\n\tafter() returning : sortAndSpillSpillIndexWrite(){\n\t\tString s = \"sortAndSpillSpillIndexWrite\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\t\/*\n\t\t###########################################################################\n\t\t############################REDUCER########################################\n\t\t###########################################################################\n\t*\/\n\n\tbefore() : reducer(){\n\t\tString s = \"Reducer\";\n\t\tinstrumentation(s,\"before\");\n\t}\n\n\tafter() returning : initCopy() {\n\t\tString s = \"Reducer-copy-phase\";\n\t\tinstrumentation(s,\"before\");\n\t}\n\n\tbefore(TaskStatus.Phase phase) : endPhase(phase) {\n\t\tif (phase == TaskStatus.Phase.SORT){\n\t\t\tString s = \"Reducer-copy-phase\";\n\t\t\tinstrumentation(s,\"after\"); \n\t\t}\n\t\telse if (phase == TaskStatus.Phase.REDUCE) {\n\t\t\tString s = \"Reducer-sort-phase\";\n\t\t\tinstrumentation(s,\"after\");\n\t\t}\n\t}\n\n\tafter(TaskStatus.Phase phase) returning: endPhase(phase) { \n\t\tif (phase == TaskStatus.Phase.SORT) {\n\t\t\tString s = \"Reducer-sort-phase\";\n\t\t\tinstrumentation(s,\"before\");\n\t\t}\n\t\telse if (phase == TaskStatus.Phase.REDUCE) {\n\t\t\tString s = \"Reducer-reduce-phase\";\n\t\t\tinstrumentation(s,\"before\");\n\t\t}\n\t}\n\n\tafter() : reducer(){\n\t\tString s = \"Reducer-reduce-phase\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\t\/*\n\t\t###########################################################################\n\t\t############################NETWORK########################################\n\t\t###########################################################################\n\t*\/\n\n\tafter() returning(long blockSize) : defaultBlockSize() {\n\t\tString s = \"Network-defaultBlockSize\";\n\t\tinstrumentation(s,\"after\",\", size: \" + Long.toString(blockSize));\n\t}\n\t\/\/ after() returning(long blockSize) : blockSize() {\n\t\/\/ \tString s = \"Network-blockSize\";\n\t\/\/ \tFile logFile = getFile();\n\t\/\/ \tinstrumentation(logFile,s,\"after\");\n\t\/\/ \tString log = \", size: \" + Long.toString(blockSize);\n\t\/\/ \twriteLog(logFile,log);\n\t\/\/ }\n\n\tafter(String src,FsPermission permission,boolean overwrite, boolean createParent,short replication,long blockSize,Progressable progress, int buffersize): createDFSFile(src,permission,overwrite,createParent,replication,blockSize,progress,buffersize) {\n\t\tString s = \"Network-CreateDFSFile\";\n\n\t\t\/\/MODIFIED!!!!!!-----!!!!!!!!!!!\n\t\tinstrumentation(s,\"after\",\", path: \" + src + \";permission: \" + permission.toString() + \";overwrite: \" + String.valueOf(overwrite) + \";createParent: \" + String.valueOf(createParent) + \";replication: \" + Short.toString(replication) + \";blockSize: \" + Long.toString(blockSize) + \";buffersize: \" + Integer.toString(buffersize));\n\t}\n\tbefore(): runDataStreamer() {\n\t\tString s = \"DataStreamer\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\t\/\/ before(byte buf[],int off, int len) : readEntireBufferFromDataNode(buf[],off,len){\n\t\/\/ \tString s = \"Network-ReadEntireBuffer\";\n\t\/\/ \tinstrumentation(s,\"after\",\", bufferLength: \" + Integer.toString(len));\n\t\/\/ }\n\n\t\/\/ after() returning(DatanodeInfo datanode) : readFromDataNode(){\n\t\/\/ \tString s = \"Network-fromDataNode\";\n\t\/\/ \tinstrumentation(s,\"after\", \", from : \" + datanode.getHostName());\n\t\/\/ }\n\n\tafter(Socket sock, String file, long blockId, Token<BlockTokenIdentifier> accessToken, long genStamp, long startOffset, long len, int bufferSize, boolean verifyChecksum, String clientName) : newBlockReader(sock,file,blockId,accessToken,genStamp,startOffset,len,bufferSize,verifyChecksum,clientName) {\n\t\tString s = \"Network-NewBlockReader\";\n\t\tString extra = \", DataNode: \" + sock.getInetAddress().getCanonicalHostName();\n\t\textra += \";file: \" + file;\n\t\t\/\/extra += \", length: \" + Long.toString(len) + \"B\";\n\t\textra += \";\" + Long.toString(len);\n\t\textra += \";blockId: \" + Long.toString(blockId);\n\t\textra += \";startOffset: \" + Long.toString(startOffset);\t\t\n\t\tinstrumentation(s,\"after\",extra);\n\t}\n}\n\n\n\n\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"1b1585a62ee87672452bc460b0c268c18a09a31c","subject":"Handle AsyncLatch with AspectJ","message":"Handle AsyncLatch with AspectJ\n\nfor https:\/\/github.com\/zxwing\/premium\/issues\/1498\n\nSigned-off-by: David Lee <15c338f3b79a63a0d5423e9c6562cd312918fe74@gmail.com>\n","repos":"mingjian2049\/zstack,liningone\/zstack,camilesing\/zstack,winger007\/zstack,AlanJager\/zstack,zxwing\/zstack-1,liningone\/zstack,HeathHose\/zstack,hhjuliet\/zstack,zxwing\/zstack-1,Alvin-Lau\/zstack,WangXijue\/zstack,camilesing\/zstack,MatheMatrix\/zstack,AlanJinTS\/zstack,zstackorg\/zstack,Alvin-Lau\/zstack,zstackorg\/zstack,camilesing\/zstack,HeathHose\/zstack,winger007\/zstack,AlanJinTS\/zstack,mingjian2049\/zstack,AlanJager\/zstack,zxwing\/zstack-1,zsyzsyhao\/zstack,zstackio\/zstack,MaJin1996\/zstack,zstackio\/zstack,WangXijue\/zstack,HeathHose\/zstack,zsyzsyhao\/zstack,MatheMatrix\/zstack,hhjuliet\/zstack,zstackio\/zstack,MatheMatrix\/zstack,AlanJager\/zstack,Alvin-Lau\/zstack,MaJin1996\/zstack,AlanJinTS\/zstack,liningone\/zstack,mingjian2049\/zstack,WangXijue\/zstack","old_file":"core\/src\/main\/java\/org\/zstack\/core\/aspect\/AsyncBackupAspect.aj","new_file":"core\/src\/main\/java\/org\/zstack\/core\/aspect\/AsyncBackupAspect.aj","new_contents":"package org.zstack.core.aspect;\r\n\r\nimport org.springframework.beans.factory.annotation.Autowired;\r\nimport org.zstack.core.cloudbus.CloudBus;\r\nimport org.zstack.core.errorcode.ErrorFacade;\r\nimport org.zstack.header.core.workflow.FlowRollback;\r\nimport org.zstack.header.errorcode.OperationFailureException;\r\nimport org.zstack.core.thread.SyncTaskChain;\r\nimport org.zstack.header.core.workflow.FlowTrigger;\r\nimport org.zstack.header.core.*;\r\nimport org.zstack.header.errorcode.ErrorCode;\r\nimport org.zstack.header.exception.CloudRuntimeException;\r\nimport org.zstack.header.message.Message;\r\nimport org.zstack.utils.DebugUtils;\r\nimport org.zstack.utils.Utils;\r\nimport org.zstack.utils.logging.CLogger;\r\n\r\nimport java.util.List;\r\n\r\npublic aspect AsyncBackupAspect {\r\n    private final CLogger logger = Utils.getLogger(AsyncBackupAspect.class);\r\n\r\n    @Autowired\r\n    private CloudBus bus;\r\n    @Autowired\r\n    private ErrorFacade errf;\r\n\r\n    private boolean isAsyncBackup(Object backup) {\r\n        return backup instanceof Message || backup instanceof Completion || backup instanceof ReturnValueCompletion\r\n                || backup instanceof AsyncLatch\r\n                || backup instanceof FlowTrigger || backup instanceof SyncTaskChain\r\n                || backup instanceof NoErrorCompletion || backup instanceof FlowRollback;\r\n    }\r\n\r\n\r\n    private void backup(List<AsyncBackup> ancestors, Throwable t, boolean flipThrowable) {\r\n        if (ancestors == null || ancestors.isEmpty()) {\r\n            \/\/ throw original exception out if no backup specified\r\n            if (t instanceof RuntimeException) {\r\n                throw (RuntimeException)t;\r\n            } else if (t instanceof Error) {\r\n                throw (Error)t;\r\n            } else {\r\n                throw new CloudRuntimeException(t);\r\n            }\r\n        }\r\n\r\n        for (AsyncBackup ancestor : ancestors) {\r\n            if (!isAsyncBackup(ancestor)) {\r\n                String info = String.format(\"%s is not a known AsyncBackup. Someone added this type but forgot changing AsyncBackupAspect, please file bug\", ancestor.getClass().getName());\r\n                DebugUtils.dumpStackTrace(info);\r\n                return;\r\n            }\r\n\r\n            ErrorCode err = t instanceof OperationFailureException ? ((OperationFailureException) t).getErrorCode() : errf.throwableToInternalError(t);\r\n            if (ancestor instanceof Completion) {\r\n                ((Completion)ancestor).fail(err);\r\n            } else if (ancestor instanceof ReturnValueCompletion) {\r\n                ((ReturnValueCompletion)ancestor).fail(err);\r\n            } else if (ancestor instanceof AsyncLatch) {\r\n                ((AsyncLatch) ancestor).ack();\r\n            } else if (ancestor instanceof FlowTrigger) {\r\n                ((FlowTrigger) ancestor).fail(err);\r\n            } else if (ancestor instanceof FlowRollback) {\r\n                ((FlowRollback) ancestor).rollback();\r\n            } else if (ancestor instanceof  SyncTaskChain) {\r\n                ((SyncTaskChain) ancestor).next();\r\n            } else if (ancestor instanceof NoErrorCompletion) {\r\n                ((NoErrorCompletion) ancestor).done();\r\n            } else if (ancestor instanceof Message) {\r\n                bus.logExceptionWithMessageDump((Message) ancestor, t);\r\n                bus.replyErrorByMessageType((Message) ancestor, err);\r\n            } else {\r\n                throw new CloudRuntimeException(\"should not be here\");\r\n            }\r\n        }\r\n\r\n        if (flipThrowable && t instanceof RuntimeException) {\r\n            throw (RuntimeException)t;\r\n        } else {\r\n            logger.warn(\"unhandled exception happened\", t);\r\n        }\r\n    }\r\n\r\n    private void backup(List<AsyncBackup> ancestors, Throwable t) {\r\n        backup(ancestors, t, false);\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.core.Completion+.success()) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.core.Completion+.fail(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.core.ReturnValueCompletion+.success(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.core.ReturnValueCompletion+.fail(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.core.NoErrorCompletion+.done()) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.core.NopeCompletion+.success()) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.core.NopeCompletion+.fail(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.core.cloudbus.CloudBusCallBack+.run(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.core.cloudbus.CloudBusListCallBack+.run(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.core.thread.ChainTask+.run(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t, true);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.rest.AsyncRESTCallback+.timeout(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.rest.AsyncRESTCallback+.success(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.rest.AsyncRESTCallback+.fail(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.core.workflow.FlowDoneHandler+.handle(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.core.workflow.FlowErrorHandler+.handle(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n}\r\n","old_contents":"package org.zstack.core.aspect;\r\n\r\nimport org.springframework.beans.factory.annotation.Autowired;\r\nimport org.zstack.core.cloudbus.CloudBus;\r\nimport org.zstack.core.errorcode.ErrorFacade;\r\nimport org.zstack.header.core.workflow.FlowRollback;\r\nimport org.zstack.header.errorcode.OperationFailureException;\r\nimport org.zstack.core.thread.SyncTaskChain;\r\nimport org.zstack.header.core.workflow.FlowTrigger;\r\nimport org.zstack.header.core.*;\r\nimport org.zstack.header.errorcode.ErrorCode;\r\nimport org.zstack.header.exception.CloudRuntimeException;\r\nimport org.zstack.header.message.Message;\r\nimport org.zstack.utils.DebugUtils;\r\nimport org.zstack.utils.Utils;\r\nimport org.zstack.utils.logging.CLogger;\r\n\r\nimport java.util.List;\r\n\r\npublic aspect AsyncBackupAspect {\r\n    private final CLogger logger = Utils.getLogger(AsyncBackupAspect.class);\r\n\r\n    @Autowired\r\n    private CloudBus bus;\r\n    @Autowired\r\n    private ErrorFacade errf;\r\n\r\n    private boolean isAsyncBackup(Object backup) {\r\n        return backup instanceof Message || backup instanceof Completion || backup instanceof ReturnValueCompletion\r\n                || backup instanceof FlowTrigger || backup instanceof SyncTaskChain\r\n                || backup instanceof NoErrorCompletion || backup instanceof FlowRollback;\r\n    }\r\n\r\n\r\n    private void backup(List<AsyncBackup> ancestors, Throwable t, boolean flipThrowable) {\r\n        if (ancestors == null || ancestors.isEmpty()) {\r\n            \/\/ throw original exception out if no backup specified\r\n            if (t instanceof RuntimeException) {\r\n                throw (RuntimeException)t;\r\n            } else if (t instanceof Error) {\r\n                throw (Error)t;\r\n            } else {\r\n                throw new CloudRuntimeException(t);\r\n            }\r\n        }\r\n\r\n        for (AsyncBackup ancestor : ancestors) {\r\n            if (!isAsyncBackup(ancestor)) {\r\n                String info = String.format(\"%s is not a known AsyncBackup. Someone added this type but forgot changing AsyncBackupAspect, please file bug\", ancestor.getClass().getName());\r\n                DebugUtils.dumpStackTrace(info);\r\n                return;\r\n            }\r\n\r\n            ErrorCode err = t instanceof OperationFailureException ? ((OperationFailureException) t).getErrorCode() : errf.throwableToInternalError(t);\r\n            if (ancestor instanceof Completion) {\r\n                ((Completion)ancestor).fail(err);\r\n            } else if (ancestor instanceof ReturnValueCompletion) {\r\n                ((ReturnValueCompletion)ancestor).fail(err);\r\n            } else if (ancestor instanceof FlowTrigger) {\r\n                ((FlowTrigger) ancestor).fail(err);\r\n            } else if (ancestor instanceof FlowRollback) {\r\n                ((FlowRollback) ancestor).rollback();\r\n            } else if (ancestor instanceof  SyncTaskChain) {\r\n                ((SyncTaskChain) ancestor).next();\r\n            } else if (ancestor instanceof NoErrorCompletion) {\r\n                ((NoErrorCompletion) ancestor).done();\r\n            } else if (ancestor instanceof Message) {\r\n                bus.logExceptionWithMessageDump((Message) ancestor, t);\r\n                bus.replyErrorByMessageType((Message) ancestor, err);\r\n            } else {\r\n                throw new CloudRuntimeException(\"should not be here\");\r\n            }\r\n        }\r\n\r\n        if (flipThrowable && t instanceof RuntimeException) {\r\n            throw (RuntimeException)t;\r\n        } else {\r\n            logger.warn(\"unhandled exception happened\", t);\r\n        }\r\n    }\r\n\r\n    private void backup(List<AsyncBackup> ancestors, Throwable t) {\r\n        backup(ancestors, t, false);\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.core.Completion+.success()) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.core.Completion+.fail(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.core.ReturnValueCompletion+.success(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.core.ReturnValueCompletion+.fail(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.core.NoErrorCompletion+.done()) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.core.NopeCompletion+.success()) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.core.NopeCompletion+.fail(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.core.cloudbus.CloudBusCallBack+.run(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.core.cloudbus.CloudBusListCallBack+.run(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.core.thread.ChainTask+.run(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t, true);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.rest.AsyncRESTCallback+.timeout(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.rest.AsyncRESTCallback+.success(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.rest.AsyncRESTCallback+.fail(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.core.workflow.FlowDoneHandler+.handle(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.core.workflow.FlowErrorHandler+.handle(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n}\r\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"825ba1cc968d92807cb9c1fc362e78869f32738f","subject":"Removed legacy roo file","message":"Removed legacy roo file\n","repos":"searchbox\/framework,eSCT\/oppfin,searchbox\/framework,eSCT\/oppfin,searchbox\/framework","old_file":"src\/main\/java\/com\/searchbox\/core\/dm\/Field_Roo_JavaBean.aj","new_file":"src\/main\/java\/com\/searchbox\/core\/dm\/Field_Roo_JavaBean.aj","new_contents":"","old_contents":"","returncode":0,"stderr":"unknown","license":"apache-2.0","lang":"AspectJ"}
{"commit":"82655dbfe91c1b6965277ac74a9e37399d6f0618","subject":"completed rename (pointcuts don't get updated during refactoring!)","message":"completed rename (pointcuts don't get updated during refactoring!)","repos":"raffaeleguidi\/DirectMemory,raffaeleguidi\/DirectMemory","old_file":"DirectMemory-Cache\/src\/main\/aspect\/org\/directmemory\/profiling\/Profiling.aj","new_file":"DirectMemory-Cache\/src\/main\/aspect\/org\/directmemory\/profiling\/Profiling.aj","new_contents":"package org.directmemory.profiling;\r\n\r\nimport java.text.DecimalFormat;\r\n\r\nimport org.directmemory.CacheEntry;\r\nimport org.javasimon.SimonManager;\r\nimport org.javasimon.Split;\r\nimport org.javasimon.Stopwatch;\r\nimport org.slf4j.Logger;\r\nimport org.slf4j.LoggerFactory;\r\n\r\n\r\npublic aspect Profiling {\r\n\tprivate static Logger logger=LoggerFactory.getLogger(Profiling.class);\r\n\t\r\n\tpointcut putPointcut(String key, Object object) : \r\n\t\texecution(CacheEntry org.directmemory.CacheManager.put(String, Object)) && \r\n\t\targs(key, object);\r\n\t\r\n\tpointcut getPointcut(String key) : \r\n\t\texecution(Object org.directmemory.CacheManager.get(String)) && \r\n\t\targs(key);\r\n\t\r\n\tpointcut removePointcut(String key) : \r\n\t\texecution(CacheEntry org.directmemory.CacheManager.remove(String)) && \r\n\t\targs(key);\r\n\r\n\tpointcut disposeExpiredPointcut() : \r\n\t\texecution(void org.directmemory.CacheManager.disposeExpired());\r\n\t\r\n\tpointcut moveOffHeapPointcut(CacheEntry entry) : \r\n\t\texecution(boolean org.directmemory.storage.OffHeapStorage.moveIn(CacheEntry)) && \r\n\t\targs(entry);\r\n\r\n\tpointcut moveToDiskPointcut(CacheEntry entry) : \r\n\t\texecution(boolean org.directmemory.storage.FileStorage.moveIn(CacheEntry)) && \r\n\t\targs(entry);\r\n\r\n\tpointcut fromOffHeapPointcut(CacheEntry entry) : \r\n\t\texecution(boolean org.directmemory.storage.OffHeapStorage.moveToHeap(CacheEntry)) && \r\n\t\targs(entry);\r\n\r\n\tpointcut fromDiskPointcut(CacheEntry entry) : \r\n\t\texecution(boolean org.directmemory.storage.FileStorage.moveToHeap(CacheEntry)) && \r\n\t\targs(entry);\r\n\r\n\tpointcut disposeOffHeapOverflowPointcut() : \r\n\t\texecution(void org.directmemory.CacheManager.disposeOffHeapOverflow());\r\n\r\n\tpointcut moveInHeapPointcut(CacheEntry entry) : \r\n\t\texecution(boolean org.directmemory.CacheManager.moveInHeap(CacheEntry)) && args(entry);\r\n\r\n\tpointcut displayTimingsPointcut() : \r\n\t\texecution(void org.directmemory.CacheManager.displayTimings());\r\n\t\r\n\tObject around(String key) : getPointcut(key) {\r\n\t\tlogger.debug(\"check: \" + thisJoinPoint.toShortString());\r\n        Stopwatch stopWatch = SimonManager.getStopwatch(\"cache.get\");\r\n\t\tSplit split = stopWatch.start();\r\n\t\tObject object = proceed(key);\r\n\t\tsplit.stop();\r\n\t\treturn object;\r\n\t}\r\n\t\r\n\tCacheEntry around(String key, Object object): putPointcut(key, object) {\r\n\t\tlogger.debug(\"check: \" + thisJoinPoint.toShortString());\r\n        Stopwatch stopWatch = SimonManager.getStopwatch(\"cache.put\");\r\n\t\tSplit split = stopWatch.start();\r\n\t\tCacheEntry entry = proceed(key, object);\r\n\t\tsplit.stop();\r\n\t\treturn entry;\r\n    }\r\n\t\r\n\tObject around(String key) : removePointcut(key) {\r\n\t\tlogger.debug(\"check: \" + thisJoinPoint.toShortString());\r\n        Stopwatch stopWatch = SimonManager.getStopwatch(\"cache.remove\");\r\n\t\tSplit split = stopWatch.start();\r\n\t\tObject object = proceed(key);\r\n\t\tsplit.stop();\r\n\t\treturn object;\r\n\t}\r\n\r\n\tObject around() : disposeExpiredPointcut() {\r\n\t\tlogger.debug(\"check: \" + thisJoinPoint.toShortString());\r\n        Stopwatch stopWatch = SimonManager.getStopwatch(\"cache.detail.disposeExpired\");\r\n\t\tSplit split = stopWatch.start();\r\n\t\tObject object = proceed();\r\n\t\tsplit.stop();\r\n\t\treturn object;\r\n\t}\r\n\r\n\tboolean around(CacheEntry entry) : moveOffHeapPointcut(entry) {\r\n\t\tlogger.debug(\"check: \" + thisJoinPoint.toShortString());\r\n        Stopwatch stopWatch = SimonManager.getStopwatch(\"cache.detail.moveOffHeap\");\r\n\t\tSplit split = stopWatch.start();\r\n\t\tboolean retVal = proceed(entry);\r\n\t\tsplit.stop();\r\n\t\treturn retVal;\r\n\t}\r\n\r\n\tboolean around(CacheEntry entry) : moveToDiskPointcut(entry) {\r\n\t\tlogger.debug(\"check: \" + thisJoinPoint.toShortString());\r\n        Stopwatch stopWatch = SimonManager.getStopwatch(\"cache.detail.moveToDisk\");\r\n\t\tSplit split = stopWatch.start();\r\n\t\tboolean retVal = proceed(entry);\r\n\t\tsplit.stop();\r\n\t\treturn retVal;\r\n\t}\r\n\t\r\n\tboolean around(CacheEntry entry) : fromDiskPointcut(entry) {\r\n\t\tlogger.debug(\"check: \" + thisJoinPoint.toShortString());\r\n        Stopwatch stopWatch = SimonManager.getStopwatch(\"cache.detail.moveInHeapfromDisk\");\r\n\t\tSplit split = stopWatch.start();\r\n\t\tboolean retVal = proceed(entry);\r\n\t\tsplit.stop();\r\n\t\treturn retVal;\r\n\t}\r\n\t\r\n\tboolean around(CacheEntry entry) : fromOffHeapPointcut(entry) {\r\n\t\tlogger.debug(\"check: \" + thisJoinPoint.toShortString());\r\n        Stopwatch stopWatch = SimonManager.getStopwatch(\"cache.detail.moveInHeapfromOffHeap\");\r\n\t\tSplit split = stopWatch.start();\r\n\t\tboolean retVal = proceed(entry);\r\n\t\tsplit.stop();\r\n\t\treturn retVal;\r\n\t}\r\n\t\r\n\tprivate static String getTiming(Stopwatch sw) {\r\n\t\tDouble average = ((double)sw.getTotal() \/ (double)sw.getCounter() \/1000000);\r\n\t\tDecimalFormat df = new DecimalFormat(\"#.##\");\r\n\t\treturn \r\n\t\t\t(sw.getName() + \" \" + sw.getCounter() + \" hits - average \" + df.format(average) + \" - max active:\" + sw.getMaxActive() + \" total time \" + (sw.getTotal()\/1000000))\r\n\t\t\t+ \" - \" + sw.toString();\r\n\t}\r\n\t\r\n\tvoid around() : displayTimingsPointcut() {\r\n\t\tlogger.debug(\"check: \" + thisJoinPoint.toShortString());\r\n\t\tStringBuffer sb = new StringBuffer();\r\n\t\tsb.append(\"{\");\r\n\t\tsb.append(\"\\r\\n   \");\r\n\t\tsb.append(getTiming(SimonManager.getStopwatch(\"cache.put\")));\r\n\t\tsb.append(\"\\r\\n   \");\r\n\t\tsb.append(getTiming(SimonManager.getStopwatch(\"cache.get\")));\r\n\t\tsb.append(\"\\r\\n   \");\r\n\t\tsb.append(getTiming(SimonManager.getStopwatch(\"cache.remove\")));\r\n\t\tsb.append(\"\\r\\n   \");\r\n\t\tsb.append(getTiming(SimonManager.getStopwatch(\"cache.detail.disposeExpired\")));\r\n\t\tsb.append(\"\\r\\n   \");\r\n\t\tsb.append(getTiming(SimonManager.getStopwatch(\"cache.detail.moveOffHeap\")));\r\n\t\tsb.append(\"\\r\\n   \");\r\n\t\tsb.append(getTiming(SimonManager.getStopwatch(\"cache.detail.moveToDisk\")));\r\n\t\tsb.append(\"\\r\\n   \");\r\n\t\tsb.append(getTiming(SimonManager.getStopwatch(\"cache.detail.moveInHeapfromOffHeap\")));\r\n\t\tsb.append(\"\\r\\n   \");\r\n\t\tsb.append(getTiming(SimonManager.getStopwatch(\"cache.detail.moveInHeapfromDisk\")));\r\n\t\tsb.append(\"\\r\\n}\");\r\n\t\tlogger.info(sb.toString());\r\n\t}\r\n}\r\n","old_contents":"package org.directmemory.profiling;\n\nimport java.text.DecimalFormat;\n\nimport org.directmemory.CacheEntry;\nimport org.javasimon.SimonManager;\nimport org.javasimon.Split;\nimport org.javasimon.Stopwatch;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\n\npublic aspect Profiling {\n\tprivate static Logger logger=LoggerFactory.getLogger(Profiling.class);\n\t\n\tpointcut putPointcut(String key, Object object) : \n\t\texecution(CacheEntry org.directmemory.CacheStore.put(String, Object)) && \n\t\targs(key, object);\n\t\n\tpointcut getPointcut(String key) : \n\t\texecution(Object org.directmemory.CacheStore.get(String)) && \n\t\targs(key);\n\t\n\tpointcut removePointcut(String key) : \n\t\texecution(CacheEntry org.directmemory.CacheStore.remove(String)) && \n\t\targs(key);\n\n\tpointcut disposeExpiredPointcut() : \n\t\texecution(void org.directmemory.CacheStore.disposeExpired());\n\t\n\tpointcut moveOffHeapPointcut(CacheEntry entry) : \n\t\texecution(boolean org.directmemory.storage.OffHeapStorage.moveIn(CacheEntry)) && \n\t\targs(entry);\n\n\tpointcut moveToDiskPointcut(CacheEntry entry) : \n\t\texecution(boolean org.directmemory.storage.FileStorage.moveIn(CacheEntry)) && \n\t\targs(entry);\n\n\tpointcut fromOffHeapPointcut(CacheEntry entry) : \n\t\texecution(boolean org.directmemory.storage.OffHeapStorage.moveToHeap(CacheEntry)) && \n\t\targs(entry);\n\n\tpointcut fromDiskPointcut(CacheEntry entry) : \n\t\texecution(boolean org.directmemory.storage.FileStorage.moveToHeap(CacheEntry)) && \n\t\targs(entry);\n\n\tpointcut disposeOffHeapOverflowPointcut() : \n\t\texecution(void org.directmemory.CacheStore.disposeOffHeapOverflow());\n\n\tpointcut moveInHeapPointcut(CacheEntry entry) : \n\t\texecution(boolean org.directmemory.CacheStore.moveInHeap(CacheEntry)) && args(entry);\n\n\tpointcut displayTimingsPointcut() : \n\t\texecution(void org.directmemory.CacheStore.displayTimings());\n\t\n\tObject around(String key) : getPointcut(key) {\n\t\tlogger.debug(\"check: \" + thisJoinPoint.toShortString());\n        Stopwatch stopWatch = SimonManager.getStopwatch(\"cache.get\");\n\t\tSplit split = stopWatch.start();\n\t\tObject object = proceed(key);\n\t\tsplit.stop();\n\t\treturn object;\n\t}\n\t\n\tCacheEntry around(String key, Object object): putPointcut(key, object) {\n\t\tlogger.debug(\"check: \" + thisJoinPoint.toShortString());\n        Stopwatch stopWatch = SimonManager.getStopwatch(\"cache.put\");\n\t\tSplit split = stopWatch.start();\n\t\tCacheEntry entry = proceed(key, object);\n\t\tsplit.stop();\n\t\treturn entry;\n    }\n\t\n\tObject around(String key) : removePointcut(key) {\n\t\tlogger.debug(\"check: \" + thisJoinPoint.toShortString());\n        Stopwatch stopWatch = SimonManager.getStopwatch(\"cache.remove\");\n\t\tSplit split = stopWatch.start();\n\t\tObject object = proceed(key);\n\t\tsplit.stop();\n\t\treturn object;\n\t}\n\n\tObject around() : disposeExpiredPointcut() {\n\t\tlogger.debug(\"check: \" + thisJoinPoint.toShortString());\n        Stopwatch stopWatch = SimonManager.getStopwatch(\"cache.detail.disposeExpired\");\n\t\tSplit split = stopWatch.start();\n\t\tObject object = proceed();\n\t\tsplit.stop();\n\t\treturn object;\n\t}\n\n\tboolean around(CacheEntry entry) : moveOffHeapPointcut(entry) {\n\t\tlogger.debug(\"check: \" + thisJoinPoint.toShortString());\n        Stopwatch stopWatch = SimonManager.getStopwatch(\"cache.detail.moveOffHeap\");\n\t\tSplit split = stopWatch.start();\n\t\tboolean retVal = proceed(entry);\n\t\tsplit.stop();\n\t\treturn retVal;\n\t}\n\n\tboolean around(CacheEntry entry) : moveToDiskPointcut(entry) {\n\t\tlogger.debug(\"check: \" + thisJoinPoint.toShortString());\n        Stopwatch stopWatch = SimonManager.getStopwatch(\"cache.detail.moveToDisk\");\n\t\tSplit split = stopWatch.start();\n\t\tboolean retVal = proceed(entry);\n\t\tsplit.stop();\n\t\treturn retVal;\n\t}\n\t\n\tboolean around(CacheEntry entry) : fromDiskPointcut(entry) {\n\t\tlogger.debug(\"check: \" + thisJoinPoint.toShortString());\n        Stopwatch stopWatch = SimonManager.getStopwatch(\"cache.detail.moveInHeapfromDisk\");\n\t\tSplit split = stopWatch.start();\n\t\tboolean retVal = proceed(entry);\n\t\tsplit.stop();\n\t\treturn retVal;\n\t}\n\t\n\tboolean around(CacheEntry entry) : fromOffHeapPointcut(entry) {\n\t\tlogger.debug(\"check: \" + thisJoinPoint.toShortString());\n        Stopwatch stopWatch = SimonManager.getStopwatch(\"cache.detail.moveInHeapfromOffHeap\");\n\t\tSplit split = stopWatch.start();\n\t\tboolean retVal = proceed(entry);\n\t\tsplit.stop();\n\t\treturn retVal;\n\t}\n\t\n\tprivate static String getTiming(Stopwatch sw) {\n\t\tDouble average = ((double)sw.getTotal() \/ (double)sw.getCounter() \/1000000);\n\t\tDecimalFormat df = new DecimalFormat(\"#.##\");\n\t\treturn \n\t\t\t(sw.getName() + \" \" + sw.getCounter() + \" hits - average \" + df.format(average) + \" - max active:\" + sw.getMaxActive() + \" total time \" + (sw.getTotal()\/1000000))\n\t\t\t+ \" - \" + sw.toString();\n\t}\n\t\n\tvoid around() : displayTimingsPointcut() {\n\t\tlogger.debug(\"check: \" + thisJoinPoint.toShortString());\n\t\tStringBuffer sb = new StringBuffer();\n\t\tsb.append(\"{\");\n\t\tsb.append(\"\\r\\n   \");\n\t\tsb.append(getTiming(SimonManager.getStopwatch(\"cache.put\")));\n\t\tsb.append(\"\\r\\n   \");\n\t\tsb.append(getTiming(SimonManager.getStopwatch(\"cache.get\")));\n\t\tsb.append(\"\\r\\n   \");\n\t\tsb.append(getTiming(SimonManager.getStopwatch(\"cache.remove\")));\n\t\tsb.append(\"\\r\\n   \");\n\t\tsb.append(getTiming(SimonManager.getStopwatch(\"cache.detail.disposeExpired\")));\n\t\tsb.append(\"\\r\\n   \");\n\t\tsb.append(getTiming(SimonManager.getStopwatch(\"cache.detail.moveOffHeap\")));\n\t\tsb.append(\"\\r\\n   \");\n\t\tsb.append(getTiming(SimonManager.getStopwatch(\"cache.detail.moveToDisk\")));\n\t\tsb.append(\"\\r\\n   \");\n\t\tsb.append(getTiming(SimonManager.getStopwatch(\"cache.detail.moveInHeapfromOffHeap\")));\n\t\tsb.append(\"\\r\\n   \");\n\t\tsb.append(getTiming(SimonManager.getStopwatch(\"cache.detail.moveInHeapfromDisk\")));\n\t\tsb.append(\"\\r\\n}\");\n\t\tlogger.info(sb.toString());\n\t}\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"2c7b76d061f7d486e606f49bae29deb204b62e55","subject":"Add ActorContext interposition","message":"Add ActorContext interposition\n","repos":"NetSys\/demi-applications,NetSys\/demi-applications,NetSys\/demi,NetSys\/demi-applications","old_file":"src\/main\/aspectj\/WeaveActor.aj","new_file":"src\/main\/aspectj\/WeaveActor.aj","new_contents":"package sample;\n\nimport static java.lang.Thread.sleep;\n\nimport akka.dispatch.verification.Instrumenter;\n\nimport akka.actor.ActorRef;\nimport akka.actor.Actor;\nimport akka.actor.Props;\nimport akka.actor.ActorCell;\nimport akka.actor.ActorSystem;\nimport akka.actor.ActorContext;\n\nimport akka.pattern.AskSupport;\n\nimport akka.dispatch.Envelope;\nimport akka.dispatch.MessageQueue;\nimport akka.dispatch.MessageDispatcher;\n\nimport scala.concurrent.impl.CallbackRunnable;\n\n\n\nprivileged public aspect WeaveActor {\n\n  Instrumenter inst = Instrumenter.apply();\n    \n  pointcut enqueueOperation(MessageQueue me, ActorRef receiver, Envelope handle): \n  execution(public * akka.dispatch.MessageQueue.enqueue(ActorRef, Envelope)) &&\n  args(receiver, handle) && this(me);\n  \n  Object around(MessageQueue me, ActorRef receiver, Envelope handle):\n  enqueueOperation(me, receiver, handle) {\n\treturn proceed(me, receiver, handle);\n  }\n  \n  \n  \n  before(ActorCell me, Object msg):\n  execution(* akka.actor.ActorCell.receiveMessage(Object)) &&\n  args(msg, ..) && this(me) {\n\tinst.beforeMessageReceive(me);\n  }\n  \n  after(ActorCell me, Object msg):\n  execution(* akka.actor.ActorCell.receiveMessage(Object)) &&\n  args(msg, ..) && this(me) {\n\tinst.afterMessageReceive(me);\n  }\n\n\n\n  pointcut dispatchOperation(MessageDispatcher me, ActorCell receiver, Envelope handle): \n  execution(* akka.dispatch.MessageDispatcher.dispatch(..)) &&\n  args(receiver, handle, ..) && this(me);\n\n  Object around(MessageDispatcher me, ActorCell receiver, Envelope handle):\n  dispatchOperation(me, receiver, handle) {\n  \tif (inst.aroundDispatch(me, receiver, handle))\n   \t\treturn proceed(me, receiver, handle);\n   \telse\n   \t\treturn null;\n  }\n  \n  \n  after(ActorSystem me, Props props) returning(ActorRef actor):\n  execution(ActorRef akka.actor.ActorSystem.actorOf(Props)) &&\n  args(props) && this(me) {\n  \tinst.new_actor(me, props, actor);\n  }\n  \n  \n  after(ActorSystem me, Props props, String name) returning(ActorRef actor):\n  execution(ActorRef akka.actor.ActorSystem.actorOf(Props, String)) &&\n  args(props, name) && this(me) {\n  \tinst.new_actor(me, props, name, actor);\n  }\n\n  \n  after(ActorContext me, Props props) returning(ActorRef actor):\n  execution(ActorRef akka.actor.ActorContext.actorOf(Props)) &&\n  args(props) && this(me) {\n  \tinst.new_actor(me.system(), props, actor);\n  }\n  \n  \n  after(ActorContext me, Props props, String name) returning(ActorRef actor):\n  execution(ActorRef akka.actor.ActorContext.actorOf(Props, String)) &&\n  args(props, name) && this(me) {\n  \tinst.new_actor(me.system(), props, name, actor);\n  }\n\n\n}\n","old_contents":"package sample;\n\nimport static java.lang.Thread.sleep;\n\nimport akka.dispatch.verification.Instrumenter;\n\nimport akka.actor.ActorRef;\nimport akka.actor.Actor;\nimport akka.actor.Props;\nimport akka.actor.ActorCell;\nimport akka.actor.ActorSystem;\nimport akka.actor.ActorContext;\n\nimport akka.pattern.AskSupport;\n\nimport akka.dispatch.Envelope;\nimport akka.dispatch.MessageQueue;\nimport akka.dispatch.MessageDispatcher;\n\nimport scala.concurrent.impl.CallbackRunnable;\n\n\n\nprivileged public aspect WeaveActor {\n\n  Instrumenter inst = Instrumenter.apply();\n    \n  pointcut enqueueOperation(MessageQueue me, ActorRef receiver, Envelope handle): \n  execution(public * akka.dispatch.MessageQueue.enqueue(ActorRef, Envelope)) &&\n  args(receiver, handle) && this(me);\n  \n  Object around(MessageQueue me, ActorRef receiver, Envelope handle):\n  enqueueOperation(me, receiver, handle) {\n\treturn proceed(me, receiver, handle);\n  }\n  \n  \n  \n  before(ActorCell me, Object msg):\n  execution(* akka.actor.ActorCell.receiveMessage(Object)) &&\n  args(msg, ..) && this(me) {\n\tinst.beforeMessageReceive(me);\n  }\n  \n  after(ActorCell me, Object msg):\n  execution(* akka.actor.ActorCell.receiveMessage(Object)) &&\n  args(msg, ..) && this(me) {\n\tinst.afterMessageReceive(me);\n  }\n\n\n\n  pointcut dispatchOperation(MessageDispatcher me, ActorCell receiver, Envelope handle): \n  execution(* akka.dispatch.MessageDispatcher.dispatch(..)) &&\n  args(receiver, handle, ..) && this(me);\n\n  Object around(MessageDispatcher me, ActorCell receiver, Envelope handle):\n  dispatchOperation(me, receiver, handle) {\n  \tif (inst.aroundDispatch(me, receiver, handle))\n   \t\treturn proceed(me, receiver, handle);\n   \telse\n   \t\treturn null;\n  }\n  \n  \n  after(ActorSystem me, Props props) returning(ActorRef actor):\n  execution(ActorRef akka.actor.ActorSystem.actorOf(Props)) &&\n  args(props) && this(me) {\n  \tinst.new_actor(me, props, actor);\n  }\n  \n  \n  after(ActorSystem me, Props props, String name) returning(ActorRef actor):\n  execution(ActorRef akka.actor.ActorSystem.actorOf(Props, String)) &&\n  args(props, name) && this(me) {\n  \tinst.new_actor(me, props, name, actor);\n  }\n\n  \n  after(ActorContext me, Props props) returning(ActorRef actor):\n  execution(ActorRef akka.actor.ActorSystem.actorOf(Props)) &&\n  args(props) && this(me) {\n  \tinst.new_actor(me.system(), props, actor);\n  }\n  \n  \n  after(ActorContext me, Props props, String name) returning(ActorRef actor):\n  execution(ActorRef akka.actor.ActorSystem.actorOf(Props, String)) &&\n  args(props, name) && this(me) {\n  \tinst.new_actor(me.system(), props, name, actor);\n  }\n\n\n}\n","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"AspectJ"}
{"commit":"e164dc5c5553508bb900dcaee10ea14556d980a0","subject":"validation: style fix","message":"validation: style fix\n\nSigned-off-by: Ketoth Xupack <2ff7bd69a79a23dbf64ebd5846a612566f93fbf7@gmail.com>\n","repos":"no-hope\/java-toolkit,no-hope\/java-toolkit,no-hope\/java-toolkit,no-hope\/java-toolkit","old_file":"projects\/validation\/src\/main\/java\/org\/nohope\/validation\/ValidatingAspect.aj","new_file":"projects\/validation\/src\/main\/java\/org\/nohope\/validation\/ValidatingAspect.aj","new_contents":"package org.nohope.validation;\n\nimport org.aspectj.lang.Signature;\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.aspectj.lang.reflect.ConstructorSignature;\nimport org.aspectj.lang.reflect.MethodSignature;\n\nimport java.lang.reflect.Constructor;\nimport java.lang.reflect.InvocationTargetException;\nimport java.lang.reflect.Method;\n\nimport static org.nohope.reflection.IntrospectionUtils.instanceOf;\nimport static org.nohope.reflection.IntrospectionUtils.newInstance;\nimport static org.nohope.validation.MethodsCache.CachedMethod;\n\n\/**\n * @author <a href=\"mailto:ketoth.xupack@gmail.com\">ketoth xupack<\/a>\n * @since 9\/26\/13 11:51 AM\n *\/\npublic privileged aspect ValidatingAspect {\n    private static final MethodsCache methodsCache = new MethodsCache();\n\n    pointcut thisAdvice(): adviceexecution() && within(ValidatingAspect);\n\n    \/**\n     * matches all constructors with at last one parameter\n     * marked with @Nonnull annotation\n     *\/\n    pointcut constructorParameters():\n            execution(new(.., @org.nohope.validation.Validate (*), ..))\n            && !cflow(thisAdvice())\n            ;\n\n    \/**\n     * searches for all methods have at last one parameter\n     * annotated with @Nonnull\n     *\/\n    pointcut methodParameters():\n            execution(* *.*(.., @org.nohope.validation.Validate (*), ..))\n            && !cflow(thisAdvice())\n            ;\n\n    \/**\n     * searches for all methods which returns any reference type and\n     * annotated with @Nonnull\n     *\/\n    static pointcut returnValue():\n            execution(@org.nohope.validation.Validate (Object+) *.*(..))\n            && !cflow(thisAdvice())\n            ;\n\n    private ValidatingAspect() {\n    }\n\n    @SuppressWarnings(\"unchecked\")\n    private static void validate(final Class<? extends IValidator<?>> clazz,\n                                 final Object target) throws ValidatingTypeMismatch,\n                                                             ValidatorInitializationException,\n                                                             ValidationException {\n        if (clazz != null) {\n            try {\n                final IValidator<?> validator = newInstance(clazz);\n                final Class<?> type = validator.getType();\n                if (target != null && !instanceOf(target, type)) {\n                    throw new ValidatingTypeMismatch();\n                }\n\n                \/\/ now we are sure that types are compatible\n                ((IValidator<Object>) validator).validate(target);\n            } catch (NoSuchMethodException\n                    | InvocationTargetException\n                    | IllegalAccessException\n                    | InstantiationException e) {\n                throw new ValidatorInitializationException(e);\n            }\n        }\n    }\n\n    @SuppressAjWarnings\n    after() returning(final Object ret): returnValue() {\n        final MethodSignature sig = (MethodSignature) thisJoinPoint.getStaticPart().getSignature();\n        final Method method = sig.getMethod();\n        final Validate annotation = method.getAnnotation(Validate.class);\n        final CachedMethod cache = methodsCache.get(method);\n\n        final Class<? extends IValidator<?>> clazz = annotation.value();\n        try {\n            validate(clazz, ret);\n        } catch (ValidatingTypeMismatch e) {\n            throw new IllegalArgumentException(\n                    \"Return value of method @Validate(\"\n                    + clazz.getCanonicalName()\n                    + \") \"\n                    + cache\n                    + \" cannot be applied to \"\n                    + ret.getClass().getCanonicalName());\n        } catch (ValidationException e) {\n            throw new IllegalArgumentException(\n                    \"Validation failed for return value of method @Validate(\"\n                    + clazz.getCanonicalName()\n                    + \") \"\n                    + cache, e);\n        } catch (ValidatorInitializationException e) {\n            throw new IllegalStateException(\"Unable to validate return value of @Validate(\"\n                                            + clazz.getCanonicalName()\n                                            + \")\", e);\n        }\n    }\n\n    @SuppressAjWarnings\n    before(): methodParameters() || constructorParameters() {\n        final Signature signature = thisJoinPoint.getStaticPart().getSignature();\n        final CachedMethod cache;\n\n        if (signature instanceof MethodSignature) {\n            final MethodSignature sig = (MethodSignature) thisJoinPoint.getStaticPart().getSignature();\n            final Method method = sig.getMethod();\n            cache = methodsCache.get(method);\n        } else if (signature instanceof ConstructorSignature) {\n            final ConstructorSignature sig = (ConstructorSignature) signature;\n            final Constructor method = sig.getConstructor();\n            cache = methodsCache.get(method);\n        } else {\n            throw new IllegalStateException(\"Illegal advice for \" + signature.getClass());\n        }\n\n        cache.observeParameters(thisJoinPoint.getArgs(), Validate.class, new MethodsCache.IObserver<Validate>() {\n            @Override\n            public void observe(final Validate annotation, final Object arg, final int index) {\n                final Class<? extends IValidator<?>> clazz = annotation.value();\n                try {\n                    validate(clazz, arg);\n                } catch (ValidatingTypeMismatch e) {\n                    throw new IllegalArgumentException(\n                            \"Argument \"\n                            + index\n                            + \" for @Validate(\"\n                            + clazz.getCanonicalName()\n                            + \") parameter of \"\n                            + cache\n                            + \" cannot be applied to \"\n                            + arg.getClass().getCanonicalName(), e);\n                } catch (ValidatorInitializationException e) {\n                    throw new IllegalStateException(\n                            \"Unable to validate argument \"\n                            + index\n                            + \" for @Validate(\"\n                            + clazz.getCanonicalName()\n                            + \") parameter of \"\n                            + cache, e);\n                } catch (ValidationException e) {\n                    throw new IllegalArgumentException(\n                            \"Validation failed for argument \"\n                            + index\n                            + \" of @Validate(\"\n                            + clazz.getCanonicalName()\n                            + \") \"\n                            + cache, e);\n                }\n            }\n        });\n    }\n}\n","old_contents":"package org.nohope.validation;\n\nimport org.aspectj.lang.Signature;\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.aspectj.lang.reflect.ConstructorSignature;\nimport org.aspectj.lang.reflect.MethodSignature;\n\nimport java.lang.reflect.Constructor;\nimport java.lang.reflect.InvocationTargetException;\nimport java.lang.reflect.Method;\n\nimport static org.nohope.reflection.IntrospectionUtils.instanceOf;\nimport static org.nohope.reflection.IntrospectionUtils.newInstance;\nimport static org.nohope.validation.MethodsCache.CachedMethod;\n\n\/**\n * @author <a href=\"mailto:ketoth.xupack@gmail.com\">ketoth xupack<\/a>\n * @since 9\/26\/13 11:51 AM\n *\/\npublic privileged aspect ValidatingAspect {\n    private static final MethodsCache methodsCache = new MethodsCache();\n\n    pointcut thisAdvice(): adviceexecution() && within(ValidatingAspect);\n\n    \/**\n     * matches all constructors with at last one parameter\n     * marked with @Nonnull annotation\n     *\/\n    pointcut constructorParameters():\n            execution(new(.., @org.nohope.validation.Validate (*), ..))\n            && !cflow(thisAdvice())\n            ;\n\n    \/**\n     * searches for all methods have at last one parameter\n     * annotated with @Nonnull\n     *\/\n    pointcut methodParameters():\n            execution(* *.*(.., @org.nohope.validation.Validate (*), ..))\n            && !cflow(thisAdvice())\n            ;\n\n    \/**\n     * searches for all methods which returns any reference type and\n     * annotated with @Nonnull\n     *\/\n    static pointcut returnValue():\n            execution(@org.nohope.validation.Validate (Object+) *.*(..))\n            && !cflow(thisAdvice())\n            ;\n\n    private ValidatingAspect() {\n    }\n\n    private static void validate(final Class<? extends IValidator<?>> clazz,\n                                 final Object target) throws ValidatingTypeMismatch,\n                                                             ValidatorInitializationException,\n                                                             ValidationException {\n        if (clazz != null) {\n            try {\n                final IValidator<?> validator = newInstance(clazz);\n                final Class<?> type = validator.getType();\n                if (target != null && !instanceOf(target, type)) {\n                    throw new ValidatingTypeMismatch();\n                }\n\n                \/\/ now we are sure that types are compatible\n                \/\/noinspection unchecked\n                ((IValidator<Object>) validator).validate(target);\n            } catch (NoSuchMethodException\n                    | InvocationTargetException\n                    | IllegalAccessException\n                    | InstantiationException e) {\n                throw new ValidatorInitializationException(e);\n            }\n        }\n    }\n\n    @SuppressAjWarnings\n    after() returning(final Object ret): returnValue() {\n        final MethodSignature sig = (MethodSignature) thisJoinPoint.getStaticPart().getSignature();\n        final Method method = sig.getMethod();\n        final Validate annotation = method.getAnnotation(Validate.class);\n        final CachedMethod cache = methodsCache.get(method);\n\n        final Class<? extends IValidator<?>> clazz = annotation.value();\n        try {\n            validate(clazz, ret);\n        } catch (ValidatingTypeMismatch e) {\n            throw new IllegalArgumentException(\n                    \"Return value of method @Validate(\"\n                    + clazz.getCanonicalName()\n                    + \") \"\n                    + cache\n                    + \" cannot be applied to \"\n                    + ret.getClass().getCanonicalName());\n        } catch (ValidationException e) {\n            throw new IllegalArgumentException(\n                    \"Validation failed for return value of method @Validate(\"\n                    + clazz.getCanonicalName()\n                    + \") \"\n                    + cache, e);\n        } catch (ValidatorInitializationException e) {\n            throw new IllegalStateException(\"Unable to validate return value of @Validate(\"\n                                            + clazz.getCanonicalName()\n                                            + \")\", e);\n        }\n    }\n\n    @SuppressAjWarnings\n    before(): methodParameters() || constructorParameters() {\n        final Signature signature = thisJoinPoint.getStaticPart().getSignature();\n        final CachedMethod cache;\n\n        if (signature instanceof MethodSignature) {\n            final MethodSignature sig = (MethodSignature) thisJoinPoint.getStaticPart().getSignature();\n            final Method method = sig.getMethod();\n            cache = methodsCache.get(method);\n        } else if (signature instanceof ConstructorSignature) {\n            final ConstructorSignature sig = (ConstructorSignature) signature;\n            final Constructor method = sig.getConstructor();\n            cache = methodsCache.get(method);\n        } else {\n            throw new IllegalStateException(\"Illegal advice for \" + signature.getClass());\n        }\n\n        cache.observeParameters(thisJoinPoint.getArgs(), Validate.class, new MethodsCache.IObserver<Validate>() {\n            @Override\n            public void observe(final Validate annotation, final Object arg, final int index) {\n                final Class<? extends IValidator<?>> clazz = annotation.value();\n                try {\n                    validate(clazz, arg);\n                } catch (ValidatingTypeMismatch e) {\n                    throw new IllegalArgumentException(\n                            \"Argument \"\n                            + index\n                            + \" for @Validate(\"\n                            + clazz.getCanonicalName()\n                            + \") parameter of \"\n                            + cache\n                            + \" cannot be applied to \"\n                            + arg.getClass().getCanonicalName(), e);\n                } catch (ValidatorInitializationException e) {\n                    throw new IllegalStateException(\n                            \"Unable to validate argument \"\n                            + index\n                            + \" for @Validate(\"\n                            + clazz.getCanonicalName()\n                            + \") parameter of \"\n                            + cache, e);\n                } catch (ValidationException e) {\n                    throw new IllegalArgumentException(\n                            \"Validation failed for argument \"\n                            + index\n                            + \" of @Validate(\"\n                            + clazz.getCanonicalName()\n                            + \") \"\n                            + cache, e);\n                }\n            }\n        });\n    }\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"536f854fa838a01d14a23bae570b62dce6a207a3","subject":"Added additional checks for non-existing state-accessors in the case of broken graph-backed entities that are created before the initial spring lifecycle has been completed.","message":"Added additional checks for non-existing state-accessors in the case of broken graph-backed entities that are created before the initial spring lifecycle has been completed.\n","repos":"spring-projects\/spring-data-graph","old_file":"spring-data-neo4j\/src\/main\/java\/org\/springframework\/data\/graph\/neo4j\/support\/node\/Neo4jNodeBacking.aj","new_file":"spring-data-neo4j\/src\/main\/java\/org\/springframework\/data\/graph\/neo4j\/support\/node\/Neo4jNodeBacking.aj","new_contents":"\/*\n * Copyright 2010 the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.springframework.data.graph.neo4j.support.node;\n\nimport org.apache.commons.logging.Log;\nimport org.apache.commons.logging.LogFactory;\nimport org.aspectj.lang.JoinPoint;\nimport org.aspectj.lang.reflect.FieldSignature;\nimport org.neo4j.graphdb.DynamicRelationshipType;\nimport org.neo4j.graphdb.Node;\nimport org.neo4j.graphdb.Relationship;\nimport org.neo4j.graphdb.RelationshipType;\nimport org.neo4j.graphdb.traversal.TraversalDescription;\nimport org.neo4j.graphdb.traversal.Traverser;\nimport org.springframework.beans.factory.annotation.Configurable;\nimport org.springframework.data.graph.annotation.NodeEntity;\nimport org.springframework.data.graph.core.NodeBacked;\nimport org.springframework.data.graph.core.RelationshipBacked;\nimport org.springframework.data.graph.neo4j.fieldaccess.*;\nimport org.springframework.data.graph.neo4j.support.GraphDatabaseContext;\nimport org.springframework.persistence.support.AbstractTypeAnnotatingMixinFields;\n\nimport java.lang.reflect.Field;\n\nimport static org.springframework.data.graph.neo4j.fieldaccess.DoReturn.unwrap;\n\nimport org.springframework.persistence.support.StateProvider;\n\n\/**\n * Aspect for handling node entity creation and field access (read & write)\n * puts the underlying state (Node) into and delegates field access to an {@link EntityStateAccessors} instance,\n * created by a configured {@link NodeEntityStateAccessorsFactory}.\n *\n * Handles constructor invocation and partial entities as well.\n *\/\npublic aspect Neo4jNodeBacking { \/\/ extends AbstractTypeAnnotatingMixinFields<NodeEntity, NodeBacked> {\n\n    protected final Log log = LogFactory.getLog(getClass());\n\n    declare parents : (@NodeEntity *) implements NodeBacked;\n    declare @type: NodeBacked+: @Configurable;\n\n\n    protected pointcut entityFieldGet(NodeBacked entity) :\n            get(* NodeBacked+.*) &&\n            this(entity) &&\n            !get(* NodeBacked.*);\n\n\n    protected pointcut entityFieldSet(NodeBacked entity, Object newVal) :\n            set(* NodeBacked+.*) &&\n            this(entity) &&\n            args(newVal) &&\n            !set(* NodeBacked.*);\n\n\n    private GraphDatabaseContext graphDatabaseContext;\n    private NodeEntityStateAccessorsFactory entityStateAccessorsFactory;\n\n    public void setGraphDatabaseContext(GraphDatabaseContext graphDatabaseContext) {\n        this.graphDatabaseContext = graphDatabaseContext;\n    }\n    public void setNodeEntityStateAccessorsFactory(NodeEntityStateAccessorsFactory entityStateAccessorsFactory) {\n        this.entityStateAccessorsFactory = entityStateAccessorsFactory;\n    }\n    \/**\n     * pointcut for constructors not taking a node to be handled by the aspect and the {@link EntityStateAccessors}\n     *\/\n\tpointcut arbitraryUserConstructorOfNodeBackedObject(NodeBacked entity) :\n\t\texecution((@NodeEntity *).new(..)) &&\n\t\t!execution((@NodeEntity *).new(Node)) &&\n\t\tthis(entity) && !cflowbelow(call(* fromStateInternal(..)));\n\n\n    \/**\n     * Handle outside entity instantiation by either creating an appropriate backing node in the graph or in the case\n     * of a reinstantiated partial entity by assigning the original node to the entity, the concrete behaviour is delegated\n     * to the {@link EntityStateAccessors}. Also handles the java type representation in the graph.\n     * When running outside of a transaction, no node is created, this is handled later when the entity is accessed within\n     * a transaction again.\n     *\/\n    before(NodeBacked entity): arbitraryUserConstructorOfNodeBackedObject(entity) {\n        if (entityStateAccessorsFactory == null) {\n            log.error(\"entityStateAccessorsFactory not set, not creating accessors for \" + entity.getClass());\n        } else {\n            if (entity.stateAccessors != null) return;\n            EntityStateAccessors<NodeBacked, Node> stateAccessors = entityStateAccessorsFactory.getEntityStateAccessors(entity);\n            entity.stateAccessors = stateAccessors;\n            stateAccessors.attach(true);\n        }\n    }\n\n    public NodeBacked NodeBacked.attach() {\n        return this.stateAccessors.attach(false);\n    }\n    \/**\n     * State accessors that encapsulate the underlying state and the behaviour related to it (field access, creation)\n     *\/\n    private transient EntityStateAccessors<NodeBacked,Node> NodeBacked.stateAccessors;\n\n    \/**\n     * sets the underlying state to the given node, creates an {@link EntityStateAccessors} instance on demand for delegating\n     * the behaviour, otherwise just updates the backing state\n     * @param n the node to be the backing state of the entity\n     *\/\n\tpublic void NodeBacked.setUnderlyingState(Node n) {\n        if (this.stateAccessors == null) {\n            this.stateAccessors = Neo4jNodeBacking.aspectOf().entityStateAccessorsFactory.getEntityStateAccessors(this);\n        }\n        this.stateAccessors.setUnderlyingState(n);\n\t}\n\n\tpublic Node NodeBacked.getUnderlyingState() {\n\t\treturn this.stateAccessors.getUnderlyingState();\n\t}\n\t\n    public EntityStateAccessors NodeBacked.getStateAccessors() {\n        return stateAccessors;\n    }\n\n    public boolean NodeBacked.hasUnderlyingNode() {\n        return this.stateAccessors!=null && this.stateAccessors.hasUnderlyingState();\n    }\n\n    public <T extends NodeBacked> T NodeBacked.projectTo(Class<T> targetType) {\n        return (T)Neo4jNodeBacking.aspectOf().graphDatabaseContext.projectTo( this, targetType);\n    }\n\n    \/**\n     * creates a relationship to the target node entity with the given relationship type\n     * @param target entity\n     * @param type neo4j relationship type for the underlying relationship\n     * @return the newly created relationship to the target node\n     *\/\n\tpublic Relationship NodeBacked.relateTo(NodeBacked target, RelationshipType type) {\n\t\treturn this.getUnderlyingState().createRelationshipTo(target.getUnderlyingState(), type);\n\t}\n\n    \/**\n     * @return node id or null if there is no underlying state\n     *\/\n\tpublic Long NodeBacked.getNodeId() {\n        if (!hasUnderlyingNode()) return null;\n\t\treturn getUnderlyingState().getId();\n\t}\n\n    \/**\n     * handles traversal from the current node with the given traversal description, the entities returned must be instances of the\n     * provided target type\n     * @param targetType node entity java types of the traversal results\n     * @param traversalDescription\n     * @return lazy Iterable over the traversal results, converted to the expected node entity instances\n     *\/\n    public  <T extends NodeBacked> Iterable<T> NodeBacked.findAllByTraversal(final Class<T> targetType, TraversalDescription traversalDescription) {\n        if (!hasUnderlyingNode()) throw new IllegalStateException(\"No node attached to \" + this);\n        final Traverser traverser = traversalDescription.traverse(this.getUnderlyingState());\n        return new NodeBackedNodeIterableWrapper<T>(traverser, targetType, Neo4jNodeBacking.aspectOf().graphDatabaseContext);\n    }\n\n\n\/\/    public Iterable<? extends NodeBacked> NodeBacked.traverse(TraversalDescription traversalDescription) {\n\/\/        final Class<? extends NodeBacked> target = this.getClass();\n\/\/        return this.traverse(target,traversalDescription);\n\/\/    }\n\n\n    \/**\n     * Creates a relationship to the target node  with the given relationship type.\n     * @param target node\n     * @param relationshipClass  expected relationship class of the resulting relationship entity\n     * @param relationshipType\n     * @return relationship entity, instance of the provided relationshipClass\n     *\/\n    public <R extends RelationshipBacked, N extends NodeBacked> R NodeBacked.relateTo(N target, Class<R> relationshipClass, String relationshipType) {\n        Relationship rel = this.getUnderlyingState().createRelationshipTo( target.getUnderlyingState(), DynamicRelationshipType.withName(relationshipType));\n        return (R)Neo4jNodeBacking.aspectOf().graphDatabaseContext.createEntityFromState(rel, relationshipClass);\n    }\n\n    \/**\n     * removes the entity using @{link GraphDatabaseContext.removeNodeEntity}\n     * the entity and relationship are still accessible after removal but before transaction commit\n     * but all modifications will throw an exception\n     *\/\n    public void NodeBacked.remove() {\n        Neo4jNodeBacking.aspectOf().graphDatabaseContext.removeNodeEntity(this);\n    }\n    \/**\n     * removes the relationship to the target node entity with the given relationship type\n     * @param target node entity\n     * @param relationshipType\n     *\/\n    public void NodeBacked.removeRelationshipTo(NodeBacked target, String relationshipType) {\n        Node myNode=this.getUnderlyingState();\n        Node otherNode=target.getUnderlyingState();\n        for (Relationship rel : this.getUnderlyingState().getRelationships(DynamicRelationshipType.withName(relationshipType))) {\n            if (rel.getOtherNode(myNode).equals(otherNode)) {\n                rel.delete();\n                return;\n            }\n        }\n    }\n\n    \/**\n     * introduced method for accessing and Relationship Entity instance for the given start node and relationship type.\n     * @param node start node\n     * @param relationshipClass class of the relationship entity\n     * @param type type of the graph relationship\n     * @return and instance of the requested relationshipClass if the relationship was found, null otherwise\n     *\/\n    public <R extends RelationshipBacked> R NodeBacked.getRelationshipTo( NodeBacked node, Class<R> relationshipClass, String type) {\n        Node myNode=this.getUnderlyingState();\n        Node otherNode=node.getUnderlyingState();\n        for (Relationship rel : this.getUnderlyingState().getRelationships(DynamicRelationshipType.withName(type))) {\n            if (rel.getOtherNode(myNode).equals(otherNode)) return (R)Neo4jNodeBacking.aspectOf().graphDatabaseContext.createEntityFromState(rel, relationshipClass);\n        }\n        return null;\n    }\n\n    \/**\n     * @param obj\n     * @return result of equals operation fo the underlying node, false if there is none\n     *\/\n\tpublic final boolean NodeBacked.equals(Object obj) {\n        if (obj == this) return true;\n        if (!hasUnderlyingNode()) return false;\n\t\tif (obj instanceof NodeBacked) {\n\t\t\treturn this.getUnderlyingState().equals(((NodeBacked) obj).getUnderlyingState());\n\t\t}\n\t\treturn false;\n\t}\n\n    \/**\n     * @return result of the hashCode of the underlying node (if any, otherwise identityHashCode)\n     *\/\n\tpublic final int NodeBacked.hashCode() {\n        if (!hasUnderlyingNode()) return System.identityHashCode(this);\n\t\treturn getUnderlyingState().hashCode();\n\t}\n\n    \/**\n     * delegates field reads to the state accessors instance\n     *\/\n    Object around(NodeBacked entity): entityFieldGet(entity) {\n        if (entity.stateAccessors==null) return proceed(entity);\n        Object result=entity.stateAccessors.getValue(field(thisJoinPoint));\n        if (result instanceof DoReturn) return unwrap(result);\n        return proceed(entity);\n    }\n\n    \/**\n     * delegates field writes to the state accessors instance\n     *\/\n    Object around(NodeBacked entity, Object newVal) : entityFieldSet(entity, newVal) {\n        if (entity.stateAccessors==null) return proceed(entity,newVal);\n        Object result=entity.stateAccessors.setValue(field(thisJoinPoint),newVal);\n        if (result instanceof DoReturn) return unwrap(result);\n        return proceed(entity,result);\n\t}\n\n    Field field(JoinPoint joinPoint) {\n        FieldSignature fieldSignature = (FieldSignature)joinPoint.getSignature();\n        return fieldSignature.getField();\n    }\n}\n","old_contents":"\/*\n * Copyright 2010 the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.springframework.data.graph.neo4j.support.node;\n\nimport org.apache.commons.logging.Log;\nimport org.apache.commons.logging.LogFactory;\nimport org.aspectj.lang.JoinPoint;\nimport org.aspectj.lang.reflect.FieldSignature;\nimport org.neo4j.graphdb.DynamicRelationshipType;\nimport org.neo4j.graphdb.Node;\nimport org.neo4j.graphdb.Relationship;\nimport org.neo4j.graphdb.RelationshipType;\nimport org.neo4j.graphdb.traversal.TraversalDescription;\nimport org.neo4j.graphdb.traversal.Traverser;\nimport org.springframework.beans.factory.annotation.Configurable;\nimport org.springframework.data.graph.annotation.NodeEntity;\nimport org.springframework.data.graph.core.NodeBacked;\nimport org.springframework.data.graph.core.RelationshipBacked;\nimport org.springframework.data.graph.neo4j.fieldaccess.*;\nimport org.springframework.data.graph.neo4j.support.GraphDatabaseContext;\nimport org.springframework.persistence.support.AbstractTypeAnnotatingMixinFields;\n\nimport java.lang.reflect.Field;\n\nimport static org.springframework.data.graph.neo4j.fieldaccess.DoReturn.unwrap;\n\nimport org.springframework.persistence.support.StateProvider;\n\n\/**\n * Aspect for handling node entity creation and field access (read & write)\n * puts the underlying state (Node) into and delegates field access to an {@link EntityStateAccessors} instance,\n * created by a configured {@link NodeEntityStateAccessorsFactory}.\n *\n * Handles constructor invocation and partial entities as well.\n *\/\npublic aspect Neo4jNodeBacking { \/\/ extends AbstractTypeAnnotatingMixinFields<NodeEntity, NodeBacked> {\n\n    protected final Log log = LogFactory.getLog(getClass());\n\n    declare parents : (@NodeEntity *) implements NodeBacked;\n    declare @type: NodeBacked+: @Configurable;\n\n\n    protected pointcut entityFieldGet(NodeBacked entity) :\n            get(* NodeBacked+.*) &&\n            this(entity) &&\n            !get(* NodeBacked.*);\n\n\n    protected pointcut entityFieldSet(NodeBacked entity, Object newVal) :\n            set(* NodeBacked+.*) &&\n            this(entity) &&\n            args(newVal) &&\n            !set(* NodeBacked.*);\n\n\n    private GraphDatabaseContext graphDatabaseContext;\n    private NodeEntityStateAccessorsFactory entityStateAccessorsFactory;\n\n    public void setGraphDatabaseContext(GraphDatabaseContext graphDatabaseContext) {\n        this.graphDatabaseContext = graphDatabaseContext;\n    }\n    public void setNodeEntityStateAccessorsFactory(NodeEntityStateAccessorsFactory entityStateAccessorsFactory) {\n        this.entityStateAccessorsFactory = entityStateAccessorsFactory;\n    }\n    \/**\n     * pointcut for constructors not taking a node to be handled by the aspect and the {@link EntityStateAccessors}\n     *\/\n\tpointcut arbitraryUserConstructorOfNodeBackedObject(NodeBacked entity) :\n\t\texecution((@NodeEntity *).new(..)) &&\n\t\t!execution((@NodeEntity *).new(Node)) &&\n\t\tthis(entity) && !cflowbelow(call(* fromStateInternal(..)));\n\n\n    \/**\n     * Handle outside entity instantiation by either creating an appropriate backing node in the graph or in the case\n     * of a reinstantiated partial entity by assigning the original node to the entity, the concrete behaviour is delegated\n     * to the {@link EntityStateAccessors}. Also handles the java type representation in the graph.\n     * When running outside of a transaction, no node is created, this is handled later when the entity is accessed within\n     * a transaction again.\n     *\/\n    before(NodeBacked entity): arbitraryUserConstructorOfNodeBackedObject(entity) {\n        if (entityStateAccessorsFactory == null) {\n            log.error(\"entityStateAccessorsFactory not set, not creating accessors for \" + entity.getClass());\n        } else {\n            if (entity.stateAccessors != null) return;\n            EntityStateAccessors<NodeBacked, Node> stateAccessors = entityStateAccessorsFactory.getEntityStateAccessors(entity);\n            entity.stateAccessors = stateAccessors;\n            stateAccessors.attach(true);\n        }\n    }\n\n    public NodeBacked NodeBacked.attach() {\n        return this.stateAccessors.attach(false);\n    }\n    \/**\n     * State accessors that encapsulate the underlying state and the behaviour related to it (field access, creation)\n     *\/\n    private transient EntityStateAccessors<NodeBacked,Node> NodeBacked.stateAccessors;\n\n    \/**\n     * sets the underlying state to the given node, creates an {@link EntityStateAccessors} instance on demand for delegating\n     * the behaviour, otherwise just updates the backing state\n     * @param n the node to be the backing state of the entity\n     *\/\n\tpublic void NodeBacked.setUnderlyingState(Node n) {\n        if (this.stateAccessors == null) {\n            this.stateAccessors = Neo4jNodeBacking.aspectOf().entityStateAccessorsFactory.getEntityStateAccessors(this);\n        }\n        this.stateAccessors.setUnderlyingState(n);\n\t}\n\n\tpublic Node NodeBacked.getUnderlyingState() {\n\t\treturn this.stateAccessors.getUnderlyingState();\n\t}\n\t\n    public EntityStateAccessors NodeBacked.getStateAccessors() {\n        return stateAccessors;\n    }\n\n    public boolean NodeBacked.hasUnderlyingNode() {\n        return this.stateAccessors.hasUnderlyingState();\n    }\n\n    public <T extends NodeBacked> T NodeBacked.projectTo(Class<T> targetType) {\n        return (T)Neo4jNodeBacking.aspectOf().graphDatabaseContext.projectTo( this, targetType);\n    }\n\n    \/**\n     * creates a relationship to the target node entity with the given relationship type\n     * @param target entity\n     * @param type neo4j relationship type for the underlying relationship\n     * @return the newly created relationship to the target node\n     *\/\n\tpublic Relationship NodeBacked.relateTo(NodeBacked target, RelationshipType type) {\n\t\treturn this.getUnderlyingState().createRelationshipTo(target.getUnderlyingState(), type);\n\t}\n\n    \/**\n     * @return node id or null if there is no underlying state\n     *\/\n\tpublic Long NodeBacked.getNodeId() {\n        if (!hasUnderlyingNode()) return null;\n\t\treturn getUnderlyingState().getId();\n\t}\n\n    \/**\n     * handles traversal from the current node with the given traversal description, the entities returned must be instances of the\n     * provided target type\n     * @param targetType node entity java types of the traversal results\n     * @param traversalDescription\n     * @return lazy Iterable over the traversal results, converted to the expected node entity instances\n     *\/\n    public  <T extends NodeBacked> Iterable<T> NodeBacked.findAllByTraversal(final Class<T> targetType, TraversalDescription traversalDescription) {\n        if (!hasUnderlyingNode()) throw new IllegalStateException(\"No node attached to \" + this);\n        final Traverser traverser = traversalDescription.traverse(this.getUnderlyingState());\n        return new NodeBackedNodeIterableWrapper<T>(traverser, targetType, Neo4jNodeBacking.aspectOf().graphDatabaseContext);\n    }\n\n\n\/\/    public Iterable<? extends NodeBacked> NodeBacked.traverse(TraversalDescription traversalDescription) {\n\/\/        final Class<? extends NodeBacked> target = this.getClass();\n\/\/        return this.traverse(target,traversalDescription);\n\/\/    }\n\n\n    \/**\n     * Creates a relationship to the target node  with the given relationship type.\n     * @param target node\n     * @param relationshipClass  expected relationship class of the resulting relationship entity\n     * @param relationshipType\n     * @return relationship entity, instance of the provided relationshipClass\n     *\/\n    public <R extends RelationshipBacked, N extends NodeBacked> R NodeBacked.relateTo(N target, Class<R> relationshipClass, String relationshipType) {\n        Relationship rel = this.getUnderlyingState().createRelationshipTo( target.getUnderlyingState(), DynamicRelationshipType.withName(relationshipType));\n        return (R)Neo4jNodeBacking.aspectOf().graphDatabaseContext.createEntityFromState(rel, relationshipClass);\n    }\n\n    \/**\n     * removes the entity using @{link GraphDatabaseContext.removeNodeEntity}\n     * the entity and relationship are still accessible after removal but before transaction commit\n     * but all modifications will throw an exception\n     *\/\n    public void NodeBacked.remove() {\n        Neo4jNodeBacking.aspectOf().graphDatabaseContext.removeNodeEntity(this);\n    }\n    \/**\n     * removes the relationship to the target node entity with the given relationship type\n     * @param target node entity\n     * @param relationshipType\n     *\/\n    public void NodeBacked.removeRelationshipTo(NodeBacked target, String relationshipType) {\n        Node myNode=this.getUnderlyingState();\n        Node otherNode=target.getUnderlyingState();\n        for (Relationship rel : this.getUnderlyingState().getRelationships(DynamicRelationshipType.withName(relationshipType))) {\n            if (rel.getOtherNode(myNode).equals(otherNode)) {\n                rel.delete();\n                return;\n            }\n        }\n    }\n\n    \/**\n     * introduced method for accessing and Relationship Entity instance for the given start node and relationship type.\n     * @param node start node\n     * @param relationshipClass class of the relationship entity\n     * @param type type of the graph relationship\n     * @return and instance of the requested relationshipClass if the relationship was found, null otherwise\n     *\/\n    public <R extends RelationshipBacked> R NodeBacked.getRelationshipTo( NodeBacked node, Class<R> relationshipClass, String type) {\n        Node myNode=this.getUnderlyingState();\n        Node otherNode=node.getUnderlyingState();\n        for (Relationship rel : this.getUnderlyingState().getRelationships(DynamicRelationshipType.withName(type))) {\n            if (rel.getOtherNode(myNode).equals(otherNode)) return (R)Neo4jNodeBacking.aspectOf().graphDatabaseContext.createEntityFromState(rel, relationshipClass);\n        }\n        return null;\n    }\n\n    \/**\n     * @param obj\n     * @return result of equals operation fo the underlying node, false if there is none\n     *\/\n\tpublic final boolean NodeBacked.equals(Object obj) {\n        if (obj == this) return true;\n        if (!hasUnderlyingNode()) return false;\n\t\tif (obj instanceof NodeBacked) {\n\t\t\treturn this.getUnderlyingState().equals(((NodeBacked) obj).getUnderlyingState());\n\t\t}\n\t\treturn false;\n\t}\n\n    \/**\n     * @return result of the hashCode of the underlying node (if any, otherwise identityHashCode)\n     *\/\n\tpublic final int NodeBacked.hashCode() {\n        if (!hasUnderlyingNode()) return System.identityHashCode(this);\n\t\treturn getUnderlyingState().hashCode();\n\t}\n\n    \/**\n     * delegates field reads to the state accessors instance\n     *\/\n    Object around(NodeBacked entity): entityFieldGet(entity) {\n\t\tif (field(thisJoinPoint).getDeclaringClass().equals(\"Named\")) log.warn(\"entityFieldGet \"+field(thisJoinPoint));\n        Object result=entity.stateAccessors.getValue(field(thisJoinPoint));\n        if (result instanceof DoReturn) return unwrap(result);\n        return proceed(entity);\n    }\n\n    \/**\n     * delegates field writes to the state accessors instance\n     *\/\n    Object around(NodeBacked entity, Object newVal) : entityFieldSet(entity, newVal) {\n        Object result=entity.stateAccessors.setValue(field(thisJoinPoint),newVal);\n        if (result instanceof DoReturn) return unwrap(result);\n        return proceed(entity,result);\n\t}\n\n    Field field(JoinPoint joinPoint) {\n        FieldSignature fieldSignature = (FieldSignature)joinPoint.getSignature();\n        return fieldSignature.getField();\n    }\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"0cb2a4c77d87ee03c76a2bdb112e0e41dec18ea9","subject":"make autowiring less confusing for spring by informing it to use mongoEntityRepository","message":"make autowiring less confusing for spring by informing it to use mongoEntityRepository\n","repos":"inbloom\/secure-data-service,inbloom\/secure-data-service,inbloom\/secure-data-service,inbloom\/secure-data-service,inbloom\/secure-data-service","old_file":"sli\/simple-idp\/src\/main\/java\/org\/slc\/sli\/sandbox\/idp\/aspect\/LoggerCarrierAspect.aj","new_file":"sli\/simple-idp\/src\/main\/java\/org\/slc\/sli\/sandbox\/idp\/aspect\/LoggerCarrierAspect.aj","new_contents":"package org.slc.sli.sandbox.idp.aspect;\n\nimport java.lang.management.ManagementFactory;\n\nimport org.slc.sli.common.util.datetime.DateTimeUtil;\nimport org.slc.sli.common.util.logging.LoggerCarrier;\nimport org.slc.sli.common.util.logging.SecurityEvent;\nimport org.slc.sli.domain.Entity;\nimport org.slc.sli.domain.Repository;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\nimport org.springframework.beans.factory.annotation.Autowired;\n\npublic aspect LoggerCarrierAspect {\n    \n    private static final Logger LOG = LoggerFactory.getLogger(\"SecurityMonitor\");\n\n    private static final String SIMPLEIDP_APPLICATION_ID = \"SimpleIDP\";\n        \n    declare parents : org.slc.sli.sandbox.idp.controller.Login implements LoggerCarrier;\n      \n    @Autowired\n    private Repository<Entity> mongoEntityRepository;\n    \n    public void LoggerCarrier.audit(SecurityEvent event) {\n        event.setAppId(SIMPLEIDP_APPLICATION_ID);\n        event.setClassName(this.getClass().getName());\n        event.setTimeStamp(DateTimeUtil.getNowInUTC());\n        event.setProcessNameOrId(ManagementFactory.getRuntimeMXBean().getName());\n        \n        LoggerCarrierAspect.aspectOf().getRepo().create(\"securityEvent\", event.getProperties());\n        switch (event.getLogLevel()) {\n        case TYPE_DEBUG:\n            LOG.debug(event.toString());\n            break;\n        \n        case TYPE_WARN:\n            LOG.warn(event.toString());\n            break;\n        \n        case TYPE_INFO:\n            LOG.info(event.toString());\n            break;\n        \n        case TYPE_ERROR:\n            LOG.error(event.toString());\n            break;\n        \n        case TYPE_TRACE:\n            LOG.trace(event.toString());\n            break;\n        \n        default:\n            LOG.info(event.toString());\n            break;\n        }\n    }\n\n    public Repository<Entity> getRepo() {\n        return mongoEntityRepository;\n    }\n\n    public void setRepo(Repository<Entity> repo) {\n        this.mongoEntityRepository = repo;\n    }\n\n}\n","old_contents":"package org.slc.sli.sandbox.idp.aspect;\n\nimport java.lang.management.ManagementFactory;\n\nimport org.slc.sli.common.util.datetime.DateTimeUtil;\nimport org.slc.sli.common.util.logging.LoggerCarrier;\nimport org.slc.sli.common.util.logging.SecurityEvent;\nimport org.slc.sli.domain.Entity;\nimport org.slc.sli.domain.Repository;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\nimport org.springframework.beans.factory.annotation.Autowired;\n\npublic aspect LoggerCarrierAspect {\n    \n    private static final Logger LOG = LoggerFactory.getLogger(\"SecurityMonitor\");\n\n    private static final String SIMPLEIDP_APPLICATION_ID = \"SimpleIDP\";\n        \n    declare parents : org.slc.sli.sandbox.idp.controller.Login implements LoggerCarrier;\n      \n    @Autowired\n    private Repository<Entity> repo;\n    \n    public void LoggerCarrier.audit(SecurityEvent event) {\n        event.setAppId(SIMPLEIDP_APPLICATION_ID);\n        event.setClassName(this.getClass().getName());\n        event.setTimeStamp(DateTimeUtil.getNowInUTC());\n        event.setProcessNameOrId(ManagementFactory.getRuntimeMXBean().getName());\n        \n        LoggerCarrierAspect.aspectOf().getRepo().create(\"securityEvent\", event.getProperties());\n        switch (event.getLogLevel()) {\n        case TYPE_DEBUG:\n            LOG.debug(event.toString());\n            break;\n        \n        case TYPE_WARN:\n            LOG.warn(event.toString());\n            break;\n        \n        case TYPE_INFO:\n            LOG.info(event.toString());\n            break;\n        \n        case TYPE_ERROR:\n            LOG.error(event.toString());\n            break;\n        \n        case TYPE_TRACE:\n            LOG.trace(event.toString());\n            break;\n        \n        default:\n            LOG.info(event.toString());\n            break;\n        }\n    }\n\n    public Repository<Entity> getRepo() {\n        return repo;\n    }\n\n    public void setRepo(Repository<Entity> repo) {\n        this.repo = repo;\n    }\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"884e55eee6646b0d0dda7fb3706650d45017374a","subject":"add try blocks","message":"add try blocks","repos":"agentlab\/ru.agentlab.maia","old_file":"aspects\/ru.agentlab.maia.container.events\/aj-src\/ru\/agentlab\/maia\/container\/events\/AContextEvents.aj","new_file":"aspects\/ru.agentlab.maia.container.events\/aj-src\/ru\/agentlab\/maia\/container\/events\/AContextEvents.aj","new_contents":"package ru.agentlab.maia.container.events;\n\nimport ru.agentlab.maia.container.events.MaiaContextChangeObjectEvent;\nimport ru.agentlab.maia.container.events.MaiaContextRemoveObjectEvent;\nimport ru.agentlab.maia.container.events.MaiaContextSetObjectEvent;\nimport ru.agentlab.maia.event.IMaiaEventBroker;\nimport ru.agentlab.maia.exception.ServiceNotFound;\nimport ru.agentlab.maia.IContainer;\nimport ru.agentlab.maia.container.aspect.AContext;\n\npublic aspect AContextEvents extends AContext {\n\n\tvoid around(IContainer context, String id): onRemoveByString(context, id) {\n\t\tIMaiaEventBroker broker = null;\n\t\tObject old = null;\n\t\ttry {\n\t\t\tbroker = context.get(IMaiaEventBroker.class);\n\t\t\told = context.getLocal(id);\n\t\t} catch (ServiceNotFound e){\n\t\t}\n\n\t\tproceed(context, id);\n\n\t\tif (broker != null) {\n\t\t\tif (old != null) {\n\t\t\t\tbroker.post(new MaiaContextRemoveObjectEvent(old));\n\t\t\t}\n\t\t}\n\t}\n\n\tvoid around(IContainer context, Class<?> id): onRemoveByClass(context, id) {\n\t\tIMaiaEventBroker broker = null;\n\t\tObject old = null;\n\t\ttry {\n\t\t\tbroker = context.get(IMaiaEventBroker.class);\n\t\t\told = context.getLocal(id);\n\t\t} catch (ServiceNotFound e){\n\t\t}\n\n\t\tproceed(context, id);\n\n\t\tif (broker != null) {\n\t\t\tif (old != null) {\n\t\t\t\tbroker.post(new MaiaContextRemoveObjectEvent(old));\n\t\t\t}\n\t\t}\n\t}\n\n\tvoid around(IContainer context, String id, Object value): onSetByString(context, id, value) {\n\t\tIMaiaEventBroker broker = null;\n\t\tObject old = null;\n\t\ttry {\n\t\t\tbroker = context.get(IMaiaEventBroker.class);\n\t\t\told = context.getLocal(id);\n\t\t} catch (ServiceNotFound e){\n\t\t}\n\n\t\tproceed(context, id, value);\n\n\t\tif (broker != null) {\n\t\t\tif (old == null) {\n\t\t\t\tbroker.post(new MaiaContextSetObjectEvent(context, value));\n\t\t\t} else {\n\t\t\t\tbroker.post(new MaiaContextChangeObjectEvent(context, value));\n\t\t\t}\n\t\t}\n\t}\n\n\tvoid around(IContainer context, Class<?> id, Object value): onSetByClass(context, id, value) {\n\t\tIMaiaEventBroker broker = null;\n\t\tObject old = null;\n\t\ttry {\n\t\t\tbroker = context.get(IMaiaEventBroker.class);\n\t\t\told = context.getLocal(id);\n\t\t} catch (ServiceNotFound e){\n\t\t}\n\n\t\tproceed(context, id, value);\n\n\t\tif (broker != null) {\n\t\t\tif (old == null) {\n\t\t\t\tbroker.post(new MaiaContextSetObjectEvent(context, value));\n\t\t\t} else {\n\t\t\t\tbroker.post(new MaiaContextChangeObjectEvent(context, value));\n\t\t\t}\n\t\t}\n\t}\n}","old_contents":"package ru.agentlab.maia.container.events;\n\nimport ru.agentlab.maia.container.events.MaiaContextChangeObjectEvent;\nimport ru.agentlab.maia.container.events.MaiaContextRemoveObjectEvent;\nimport ru.agentlab.maia.container.events.MaiaContextSetObjectEvent;\nimport ru.agentlab.maia.event.IMaiaEventBroker;\nimport ru.agentlab.maia.IContainer;\nimport ru.agentlab.maia.container.aspect.AContext;\n\npublic aspect AContextEvents extends AContext {\n\n\tvoid around(IContainer context, String id): onRemoveByString(context, id) {\n\t\tIMaiaEventBroker broker = null;\n\t\tObject old = null;\n\t\tbroker = context.get(IMaiaEventBroker.class);\n\t\told = context.getLocal(id);\n\n\t\tproceed(context, id);\n\n\t\tif (broker != null) {\n\t\t\tif (old != null) {\n\t\t\t\tbroker.post(new MaiaContextRemoveObjectEvent(old));\n\t\t\t}\n\t\t}\n\t}\n\n\tvoid around(IContainer context, Class<?> id): onRemoveByClass(context, id) {\n\t\tIMaiaEventBroker broker = null;\n\t\tObject old = null;\n\t\tbroker = context.get(IMaiaEventBroker.class);\n\t\told = context.getLocal(id);\n\n\t\tproceed(context, id);\n\n\t\tif (broker != null) {\n\t\t\tif (old != null) {\n\t\t\t\tbroker.post(new MaiaContextRemoveObjectEvent(old));\n\t\t\t}\n\t\t}\n\t}\n\n\tvoid around(IContainer context, String id, Object value): onSetByString(context, id, value) {\n\t\tIMaiaEventBroker broker = null;\n\t\tObject old = null;\n\t\tbroker = context.get(IMaiaEventBroker.class);\n\t\told = context.getLocal(id);\n\n\t\tproceed(context, id, value);\n\n\t\tif (broker != null) {\n\t\t\tif (old == null) {\n\t\t\t\tbroker.post(new MaiaContextSetObjectEvent(context, value));\n\t\t\t} else {\n\t\t\t\tbroker.post(new MaiaContextChangeObjectEvent(context, value));\n\t\t\t}\n\t\t}\n\t}\n\n\tvoid around(IContainer context, Class<?> id, Object value): onSetByClass(context, id, value) {\n\t\tIMaiaEventBroker broker = null;\n\t\tObject old = null;\n\t\tbroker = context.get(IMaiaEventBroker.class);\n\t\told = context.getLocal(id);\n\n\t\tproceed(context, id, value);\n\n\t\tif (broker != null) {\n\t\t\tif (old == null) {\n\t\t\t\tbroker.post(new MaiaContextSetObjectEvent(context, value));\n\t\t\t} else {\n\t\t\t\tbroker.post(new MaiaContextChangeObjectEvent(context, value));\n\t\t\t}\n\t\t}\n\t}\n}","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"5a60e3d5ad83a8a4e35baf45c34e186c7c077d41","subject":"Missed file for previous commit.","message":"Missed file for previous commit.\n","repos":"cderoove\/damp.ekeko.aspectj","old_file":"damp.ekeko.aspectj.plugin.test\/resources\/TestCases\/AJ-LMP-Annotations\/src\/damp\/ekeko\/aspectj\/annasstests\/PrevFix.aj","new_file":"damp.ekeko.aspectj.plugin.test\/resources\/TestCases\/AJ-LMP-Annotations\/src\/damp\/ekeko\/aspectj\/annasstests\/PrevFix.aj","new_contents":"package damp.ekeko.aspectj.annasstests;\n\nimport damp.ekeko.aspectj.annotations.ExcludesPrevious;\nimport damp.ekeko.aspectj.annotations.Label;\nimport damp.ekeko.aspectj.annotations.RequiresPrevious;\n\n\/\/fixture for requires \/ excludes previous tests\npublic aspect PrevFix {\n\n\t\/\/succeeds\n\t@RequiresPrevious(\"thinking\")\n\t@ExcludesPrevious(\"cleaning\")\n\t@Label(\"beforecompute\")\n\tbefore() : call(int *.compute(String))\n\t{\n\t\tthis.prepareCompute();\n\t}\n\t\n\t@Label(\"preparing\")\n\tprivate void prepareCompute(){}\n\t\n\t\/\/fails, never happens\n\t@RequiresPrevious(\"executing\")\n\t\/\/fails, always happens\n\t@ExcludesPrevious(\"thinking\")\n\tafter() : call(void *.simulate())\n\t{\t}\n\t\n\t\/\/fails, only sometimes happens\n\t@RequiresPrevious(\"executing\")\n\t@ExcludesPrevious(\"simulating\")\n\tvoid around() : execution(void *.cleanup())\n\t{\n\t\tproceed();\n\t}\n}\n","old_contents":"package damp.ekeko.aspectj.annasstests;\n\nimport damp.ekeko.aspectj.annotations.ExcludesPrevious;\nimport damp.ekeko.aspectj.annotations.RequiresPrevious;\n\n\/\/fixture for requires \/ excludes previous tests\npublic aspect PrevFix {\n\n\t\/\/succeeds\n\t@RequiresPrevious(\"thinking\")\n\t@ExcludesPrevious(\"cleaning\")\n\tbefore() : call(int *.compute(String))\n\t{\t}\n\t\n\t\/\/fails, never happens\n\t@RequiresPrevious(\"executing\")\n\t\/\/fails, always happens\n\t@ExcludesPrevious(\"thinking\")\n\tafter() : call(void *.simulate())\n\t{\t}\n\t\n\t\/\/fails, only sometimes happens\n\t@RequiresPrevious(\"executing\")\n\t@ExcludesPrevious(\"simulating\")\n\tvoid around() : execution(void *.cleanup())\n\t{\n\t\tproceed();\n\t}\n}\n","returncode":0,"stderr":"","license":"epl-1.0","lang":"AspectJ"}
{"commit":"afc8ba5872fd11034328376966e099b05a186962","subject":"*around pointcuts added for lock and unlock","message":"*around pointcuts added for lock and unlock","repos":"selig\/qea","old_file":"code\/qea\/src\/benchmark\/competition\/java\/jUnitRV_MMT\/monitoring\/JUnitRV_MMTThreeAspect.aj","new_file":"code\/qea\/src\/benchmark\/competition\/java\/jUnitRV_MMT\/monitoring\/JUnitRV_MMTThreeAspect.aj","new_contents":"package benchmark.competition.java.jUnitRV_MMT.monitoring;\r\n\r\nimport java.util.concurrent.locks.Lock;\r\n\r\nimport monitoring.impl.MonitorFactory;\r\nimport monitoring.intf.Monitor;\r\nimport properties.Property;\r\nimport properties.competition.JavaRV_mmt;\r\nimport structure.impl.other.Verdict;\r\nimport structure.intf.QEA;\r\nimport benchmark.competition.java.jUnitRV_MMT.ExampleLocking;\r\n\r\npublic aspect JUnitRV_MMTThreeAspect {\r\n\r\n\tprivate final Monitor monitor;\r\n\r\n\tprivate final int RUN = 1;\r\n\tprivate final int LOCK_TRUE = 2;\r\n\tprivate final int UNLOCK = 3;\r\n\tprivate final int ACTION = 4;\r\n\r\n\tpublic JUnitRV_MMTThreeAspect() {\r\n\t\tQEA qea = new JavaRV_mmt().make(Property.JAVARV_MMT_THREE);\r\n\t\tmonitor = MonitorFactory.create(qea);\r\n\t}\r\n\r\n\tpointcut run(ExampleLocking thread) : execution(void ExampleLocking.run())\r\n\t\t&& target(thread);\r\n\r\n\tpointcut action(ExampleLocking thread) : call(void ExampleLocking.action())\r\n\t\t&& target(thread);\r\n\r\n\tbefore(ExampleLocking thread) : run(thread) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(RUN, thread);\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [thread=\"\r\n\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n\tboolean around(Lock lockObj, ExampleLocking thread) :\r\n\t\t\tcall(boolean Lock.tryLock())\r\n\t\t\t&& cflow(call(boolean ExampleLocking.lock())) && target(lockObj)\r\n\t\t\t&& this(thread) {\r\n\r\n\t\tboolean result = false;\r\n\t\tsynchronized (lockObj) {\r\n\t\t\tresult = proceed(lockObj, thread); \/\/ TODO Not sure if this is right\r\n\t\t}\r\n\t\tif (result) {\r\n\t\t\tVerdict verdict = null;\r\n\t\t\tsynchronized (monitor) {\r\n\t\t\t\tverdict = monitor.step(LOCK_TRUE, thread);\r\n\t\t\t}\r\n\t\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\t\tSystem.err\r\n\t\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [thread=\"\r\n\t\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t\t}\r\n\r\n\t\t}\r\n\t\treturn result;\r\n\t};\r\n\r\n\tvoid around(Lock lockObj, ExampleLocking thread) :\r\n\t\tcall(void Lock.unlock()) && cflow(call(void ExampleLocking.unlock()))\r\n\t\t&& target(lockObj) && this(thread) {\r\n\r\n\t\tsynchronized (lockObj) {\r\n\t\t\tproceed(lockObj, thread); \/\/ TODO Not sure if this is right\r\n\t\t}\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(LOCK_TRUE, thread);\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [thread=\"\r\n\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n\tbefore(ExampleLocking thread) : action(thread) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(ACTION, thread);\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [id=\"\r\n\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n}\r\n","old_contents":"package benchmark.competition.java.jUnitRV_MMT.monitoring;\r\n\r\nimport monitoring.impl.MonitorFactory;\r\nimport monitoring.intf.Monitor;\r\nimport properties.Property;\r\nimport properties.competition.JavaRV_mmt;\r\nimport structure.impl.other.Verdict;\r\nimport structure.intf.QEA;\r\nimport benchmark.competition.java.jUnitRV_MMT.ExampleLocking;\r\n\r\npublic aspect JUnitRV_MMTThreeAspect {\r\n\r\n\tprivate final Monitor monitor;\r\n\r\n\tprivate final int RUN = 1;\r\n\tprivate final int LOCK_TRUE = 2;\r\n\tprivate final int UNLOCK = 3;\r\n\tprivate final int ACTION = 4;\r\n\r\n\tpublic JUnitRV_MMTThreeAspect() {\r\n\t\tQEA qea = new JavaRV_mmt().make(Property.JAVARV_MMT_THREE);\r\n\t\tmonitor = MonitorFactory.create(qea);\r\n\t}\r\n\r\n\tpointcut run(ExampleLocking t) : execution(void ExampleLocking.run())\r\n\t\t&& target(t);\r\n\r\n\tpointcut lockEvent(ExampleLocking t) : call(boolean ExampleLocking.lock())\r\n\t\t&& target(t);\r\n\r\n\tpointcut unlockEvent(ExampleLocking t) :\r\n\t\tcall(void ExampleLocking.unlock()) && target(t);\r\n\r\n\tpointcut action(ExampleLocking t) : call(void ExampleLocking.action())\r\n\t\t&& target(t);\r\n\r\n\tbefore(ExampleLocking t) : run(t) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(RUN, t.getId());\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [id=\"\r\n\t\t\t\t\t\t\t+ t.getId()\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n\tafter(ExampleLocking t) returning(boolean result) : lockEvent(t) {\r\n\t\tif (result) {\r\n\t\t\tVerdict verdict = null;\r\n\t\t\tsynchronized (monitor) {\r\n\t\t\t\tverdict = monitor.step(LOCK_TRUE, t.getId());\r\n\t\t\t}\r\n\t\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\t\tSystem.err\r\n\t\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [id=\"\r\n\t\t\t\t\t\t\t\t+ t.getId()\r\n\t\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t\t}\r\n\t\t}\r\n\t};\r\n\r\n\tbefore(ExampleLocking t) : unlockEvent(t) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(UNLOCK, t.getId());\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [id=\"\r\n\t\t\t\t\t\t\t+ t.getId()\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n\tbefore(ExampleLocking t) : action(t) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(ACTION, t.getId());\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [id=\"\r\n\t\t\t\t\t\t\t+ t.getId()\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n}\r\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"8717a38716cef518d6c12c9cc7c9e3236bd0b5f5","subject":"Simplify the aspect using intermediate classes added in the parallelj kernel (KProcessor, CallableProcedure, RunnableProcedure and SubProcessProcedure)","message":"Simplify the aspect using intermediate classes added in the parallelj kernel (KProcessor, CallableProcedure, RunnableProcedure and SubProcessProcedure)\n","repos":"awltech\/org.parallelj,christophe-w\/parallelj.runtime","old_file":"parallelj-launching\/src\/main\/java\/org\/parallelj\/launching\/quartz\/ProgramJobsAdapter.aj","new_file":"parallelj-launching\/src\/main\/java\/org\/parallelj\/launching\/quartz\/ProgramJobsAdapter.aj","new_contents":"\/*\n *     ParallelJ, framework for parallel computing\n *\n *     Copyright (C) 2010, 2011, 2012 Atos Worldline or third-party contributors as\n *     indicated by the @author tags or express copyright attribution\n *     statements applied by the authors.\n *\n *     This library is free software; you can redistribute it and\/or\n *     modify it under the terms of the GNU Lesser General Public\n *     License as published by the Free Software Foundation; either\n *     version 2.1 of the License.\n *\n *     This library is distributed in the hope that it will be useful,\n *     but WITHOUT ANY WARRANTY; without even the implied warranty of\n *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n *     Lesser General Public License for more details.\n *\n *     You should have received a copy of the GNU Lesser General Public\n *     License along with this library; if not, write to the Free Software\n *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n *\/\npackage org.parallelj.launching.quartz;\n\nimport java.util.HashMap;\nimport java.util.HashSet;\nimport java.util.Map;\nimport java.util.Set;\nimport java.util.concurrent.ExecutorService;\nimport java.util.concurrent.Executors;\n\nimport org.parallelj.Programs;\nimport org.parallelj.Programs.ProcessHelper;\nimport org.parallelj.internal.kernel.KProcess;\nimport org.parallelj.internal.kernel.KProcessor;\nimport org.parallelj.internal.kernel.KProgram;\nimport org.parallelj.internal.kernel.procedure.CallableProcedure;\nimport org.parallelj.internal.kernel.procedure.RunnableProcedure;\nimport org.parallelj.internal.reflect.ProgramAdapter.Adapter;\nimport org.parallelj.launching.LaunchingMessageKind;\nimport org.parallelj.launching.ReturnCodes;\nimport org.parallelj.mirror.ProgramType;\nimport org.quartz.Job;\nimport org.quartz.JobDataMap;\nimport org.quartz.JobExecutionContext;\nimport org.quartz.JobExecutionException;\n\n\/**\n * Implements the Job.execute(..) method\n * \n * \n *\/\nprivileged public aspect ProgramJobsAdapter {\n\n\t\/*\n\t * The Aspect JobsAdapter must be passed before this.\n\t *\/\n\tdeclare precedence :\n\t\torg.parallelj.internal.kernel.Identifiers,\n\t\torg.parallelj.internal.reflect.ProgramAdapter,\n\t\torg.parallelj.internal.util.sm.impl.KStateMachines,\n\t\torg.parallelj.internal.util.sm.impl.KStateMachines.PerMachine,\n\t\torg.parallelj.Executables$PerExecutable,\n\t\torg.parallelj.internal.reflect.ProgramAdapter.PerProgram,\n\t\torg.parallelj.internal.log.Logs,\n\t\torg.parallelj.launching.quartz.JobsAdapter;\n\n\t\/*\n\t * Add the interface IProceduresInError to the KProcessor\n\t*\/\n\tprivate interface IProceduresInError {\n\t\tpublic void addProcedureInError(String name, Exception exception);\n\t}\n\tpublic Map<String, Set<String>> IProceduresInError.proceduresInError=new HashMap<String, Set<String>>();\n\t\n\tpublic synchronized void IProceduresInError.addProcedureInError(String name, Exception exception) {\n\t\tSet<String> exceptions = ((IProceduresInError)this).proceduresInError.get(name);\n\t\tif (exceptions==null) {\n\t\t\t\/\/ This is the first \"name\" Procedure in error\n\t\t\texceptions = new HashSet<String>();\n\t\t}\n\t\tif (!exceptions.contains(exception.getClass().getCanonicalName())) {\n\t\t\texceptions.add(exception.getClass().getCanonicalName());\n\t\t}\n\t\t((IProceduresInError)this).proceduresInError.put(name, exceptions);\n\t}\n\t\n\tdeclare parents: org.parallelj.internal.kernel.KProcessor implements IProceduresInError;\n\n\t\/**\n\t * Launch a Program and initialize the Result as a JobDataMap.\n\t * \n\t * @param self\n\t * @param context\n\t * @throws JobExecutionException\n\t *\/\n\tvoid around(Job self, JobExecutionContext context)\n\t\t\tthrows JobExecutionException : \n\t\texecution( public void  Job+.execute(..) throws JobExecutionException) \n\t\t\t&& (within(@org.parallelj.Program *) || within(JobsAdapter)) \n\t\t\t\t&& args(context) && this(self) {\n\t\tJobDataMap jobDataMap = new JobDataMap();\n\t\tcontext.setResult(jobDataMap);\n\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.SUCCESS);\n\n\t\tproceed(self, context);\n\n\t\ttry {\n\t\t\t\/\/ Initialize an ExecutorService with the Capacity of the Program\n\t\t\tProcessHelper<?> processHelper = Programs.as((Adapter) self);\n\t\t\tif (processHelper == null) {\n\t\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.NOTSTARTED);\n\t\t\t\tthrow new JobExecutionException(LaunchingMessageKind.ELAUNCH0003.getFormatedMessage(self));\n\t\t\t}\n\t\t\tProgramType programType = processHelper.getProcess().getProgram();\n\t\t\tExecutorService service = null;\n\t\t\t\/\/ If an executorService was specified, we use it\n\n\t\t\tif (context.getJobDetail().getJobDataMap().get(Launch.DEFAULT_EXECUTOR_KEY) != null) {\n\t\t\t\tservice = (ExecutorService)context.getJobDetail().getJobDataMap().get(Launch.DEFAULT_EXECUTOR_KEY);\n\t\t\t} else \n\t\t\tif (programType instanceof KProgram) {\n\t\t\t\tshort programCapacity = ((KProgram) programType)\n\t\t\t\t\t\t.getCapacity();\n\t\t\t\tservice = (programCapacity == Short.MAX_VALUE) ? Executors\n\t\t\t\t\t\t.newCachedThreadPool() : Executors\n\t\t\t\t\t\t.newFixedThreadPool(programCapacity);\n\t\t\t} else {\n\t\t\t\tservice = Executors\n\t\t\t\t\t\t.newCachedThreadPool();\n\t\t\t}\n\n\t\t\t\/\/ Launch the program with the initialized ExecutorService\n\t\t\tprocessHelper.execute(service).join();\n\t\t\t\n\t\t\tKProcessor rootProcessor = ((KProcessor)processHelper.getProcess().getProcessor());\n\t\t\tIProceduresInError procedures = (IProceduresInError)rootProcessor;\n\t\t\tif(procedures.proceduresInError.size()>0) {\n\t\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.FAILURE);\n\t\t\t}\n\t\t\n\t\t\tProgramFieldsBinder.getProgramOutputFields(this, context);\n\t\t\tservice.shutdown();\n\t\t\t\n\t\t\tif (procedures.proceduresInError.size()>0){\n\t\t\t\tjobDataMap.put(QuartzUtils.PROCEDURES_IN_ERROR, procedures.proceduresInError);\n\t\t\t\tthrow new JobExecutionException();\n\t\t\t}\n\t\t} catch (IllegalAccessException e) {\n\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.FAILURE);\n\t\t\tthrow new JobExecutionException(e);\n\t\t} catch (NoSuchFieldException e) {\n\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.FAILURE);\n\t\t\tthrow new JobExecutionException(e);\n\t\t}\n\t}\n\t\n\t\/\/ Interception around Runnable execution      \n\tvoid around(Object self): call(void complete())\n\t\t&& target(org.parallelj.internal.kernel.procedure.RunnableProcedure.RunnableCall)\n\t\t&& this(self)  {\n\t\t \n\t\tRunnableProcedure.RunnableCall runnable = (RunnableProcedure.RunnableCall)thisJoinPoint.getTarget();\n\t\tRunnableProcedure procedure = (RunnableProcedure)runnable.getProcedure();\n\t\tif (procedure.getHandler() == null\n\t\t\t\t&& runnable.getException() != null) {\n\t\t\t\/\/ There is an error !!!\n\t\t\tKProcess process = runnable.getProcess();\n\t\t\tKProcessor rootProcessor = process.getProcessor();\/\/.getRootProcessor();\n\t\t\t((IProceduresInError)rootProcessor).addProcedureInError(procedure.getType(), runnable.getException());\n\t\t}\n\t\tproceed(self);\n\t}\n\n\t\/\/ Interception around Callable execution      \n\tvoid around(Object self): call(void complete())\n\t\t&& target(org.parallelj.internal.kernel.procedure.CallableProcedure.CallableCall)\n\t\t&& this(self)  {\n\n\t\tCallableProcedure.CallableCall callable = (CallableProcedure.CallableCall)thisJoinPoint.getTarget();\n\t\tCallableProcedure procedure = (CallableProcedure)callable.getProcedure(); \n\t\t\t\n\t\tif (\n\t\t\t\tprocedure.getHandler() == null\n\t\t\t\t&& callable.getException() != null\n\t\t\t\t) {\n\t\t\t\/\/ There is an error !!!\n\t\t\tKProcess process = callable.getProcess();\n\t\t\tKProcessor rootProcessor = process.getProcessor();\/\/.getRootProcessor();\n\t\t\t((IProceduresInError)rootProcessor).addProcedureInError(procedure.getType(), callable.getException());\n\t\t}\n\t\tproceed(self);\n\t}\n\t \n\t\/*\n\t * Allow to get the procedures in error of a Process (the root Process !!!)\n\t *\/\n\tpublic static synchronized Map<String, Set<String>> getProceduresInErrors(\n\t\t\torg.parallelj.mirror.Process process) {\n\t\tKProcessor rootProcessor = ((KProcessor) process.getProcessor());\n\t\tIProceduresInError procedures = (IProceduresInError) rootProcessor;\n\t\treturn procedures.proceduresInError;\n\t}\n}\n","old_contents":"\/*\n *     ParallelJ, framework for parallel computing\n *\n *     Copyright (C) 2010, 2011, 2012 Atos Worldline or third-party contributors as\n *     indicated by the @author tags or express copyright attribution\n *     statements applied by the authors.\n *\n *     This library is free software; you can redistribute it and\/or\n *     modify it under the terms of the GNU Lesser General Public\n *     License as published by the Free Software Foundation; either\n *     version 2.1 of the License.\n *\n *     This library is distributed in the hope that it will be useful,\n *     but WITHOUT ANY WARRANTY; without even the implied warranty of\n *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n *     Lesser General Public License for more details.\n *\n *     You should have received a copy of the GNU Lesser General Public\n *     License along with this library; if not, write to the Free Software\n *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n *\/\npackage org.parallelj.launching.quartz;\n\nimport java.util.HashMap;\nimport java.util.HashSet;\nimport java.util.Map;\nimport java.util.Set;\nimport java.util.concurrent.ExecutorService;\nimport java.util.concurrent.Executors;\n\nimport org.parallelj.Programs;\nimport org.parallelj.Programs.ProcessHelper;\nimport org.parallelj.internal.kernel.KProcess;\nimport org.parallelj.internal.kernel.KProcessor;\nimport org.parallelj.internal.kernel.KProgram;\nimport org.parallelj.internal.kernel.procedure.CallableProcedure;\nimport org.parallelj.internal.kernel.procedure.RunnableProcedure;\nimport org.parallelj.internal.reflect.ProgramAdapter.Adapter;\nimport org.parallelj.launching.LaunchingMessageKind;\nimport org.parallelj.launching.ReturnCodes;\nimport org.parallelj.mirror.ProgramType;\nimport org.quartz.Job;\nimport org.quartz.JobDataMap;\nimport org.quartz.JobExecutionContext;\nimport org.quartz.JobExecutionException;\n\n\/**\n * Implements the Job.execute(..) method\n * \n * \n *\/\nprivileged public aspect ProgramJobsAdapter {\n\n\t\/*\n\t * The Aspect JobsAdapter must be passed before this.\n\t *\/\n\tdeclare precedence :\n\t\torg.parallelj.internal.kernel.Identifiers,\n\t\torg.parallelj.internal.reflect.ProgramAdapter,\n\t\torg.parallelj.internal.util.sm.impl.KStateMachines,\n\t\torg.parallelj.internal.util.sm.impl.KStateMachines.PerMachine,\n\t\torg.parallelj.Executables$PerExecutable,\n\t\torg.parallelj.internal.reflect.ProgramAdapter.PerProgram,\n\t\torg.parallelj.internal.log.Logs,\n\t\torg.parallelj.launching.quartz.JobsAdapter;\n\n\t\/*\n\t * Add the interface IProceduresInError to the KProcessor\n\t*\/\n\tprivate interface IProceduresInError {\n\t\tpublic void addProcedureInError(String name, Exception exception);\n\t}\n\tpublic Map<String, Set<String>> IProceduresInError.proceduresInError=new HashMap<String, Set<String>>();\n\t\n\tpublic synchronized void IProceduresInError.addProcedureInError(String name, Exception exception) {\n\t\tSet<String> exceptions = ((IProceduresInError)this).proceduresInError.get(name);\n\t\tif (exceptions==null) {\n\t\t\t\/\/ This is the first \"name\" Procedure in error\n\t\t\texceptions = new HashSet<String>();\n\t\t}\n\t\tif (!exceptions.contains(exception.getClass().getCanonicalName())) {\n\t\t\texceptions.add(exception.getClass().getCanonicalName());\n\t\t}\n\t\t((IProceduresInError)this).proceduresInError.put(name, exceptions);\n\t}\n\t\n\tdeclare parents: org.parallelj.internal.kernel.KProcessor implements IProceduresInError;\n\n\t\/**\n\t * Launch a Program and initialize the Result as a JobDataMap.\n\t * \n\t * @param self\n\t * @param context\n\t * @throws JobExecutionException\n\t *\/\n\tvoid around(Job self, JobExecutionContext context)\n\t\t\tthrows JobExecutionException : \n\t\texecution( public void  Job+.execute(..) throws JobExecutionException) \n\t\t\t&& (within(@org.parallelj.Program *) || within(JobsAdapter)) \n\t\t\t\t&& args(context) && this(self) {\n\t\tJobDataMap jobDataMap = new JobDataMap();\n\t\tcontext.setResult(jobDataMap);\n\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.SUCCESS);\n\n\t\tproceed(self, context);\n\n\t\ttry {\n\t\t\t\/\/ Initialize an ExecutorService with the Capacity of the Program\n\t\t\tProcessHelper<?> processHelper = Programs.as((Adapter) self);\n\t\t\tif (processHelper == null) {\n\t\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.NOTSTARTED);\n\t\t\t\tthrow new JobExecutionException(LaunchingMessageKind.ELAUNCH0003.getFormatedMessage(self));\n\t\t\t}\n\t\t\tProgramType programType = processHelper.getProcess().getProgram();\n\t\t\tExecutorService service = null;\n\t\t\t\/\/ If an executorService was specified, we use it\n\n\t\t\tif (context.getJobDetail().getJobDataMap().get(Launch.DEFAULT_EXECUTOR_KEY) != null) {\n\t\t\t\tservice = (ExecutorService)context.getJobDetail().getJobDataMap().get(Launch.DEFAULT_EXECUTOR_KEY);\n\t\t\t} else \n\t\t\tif (programType instanceof KProgram) {\n\t\t\t\tshort programCapacity = ((KProgram) programType)\n\t\t\t\t\t\t.getCapacity();\n\t\t\t\tservice = (programCapacity == Short.MAX_VALUE) ? Executors\n\t\t\t\t\t\t.newCachedThreadPool() : Executors\n\t\t\t\t\t\t.newFixedThreadPool(programCapacity);\n\t\t\t} else {\n\t\t\t\tservice = Executors\n\t\t\t\t\t\t.newCachedThreadPool();\n\t\t\t}\n\n\t\t\t\/\/ Launch the program with the initialized ExecutorService\n\t\t\tprocessHelper.execute(service).join();\n\t\t\t\n\t\t\tKProcessor rootProcessor = ((KProcessor)processHelper.getProcess().getProcessor());\n\t\t\tIProceduresInError procedures = (IProceduresInError)rootProcessor;\n\t\t\tif(procedures.proceduresInError.size()>0) {\n\t\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.FAILURE);\n\t\t\t}\n\t\t\n\t\t\tProgramFieldsBinder.getProgramOutputFields(this, context);\n\t\t\tservice.shutdown();\n\t\t\t\n\t\t\tif (procedures.proceduresInError.size()>0){\n\t\t\t\tjobDataMap.put(QuartzUtils.PROCEDURES_IN_ERROR, procedures.proceduresInError);\n\t\t\t\tthrow new JobExecutionException();\n\t\t\t}\n\t\t} catch (IllegalAccessException e) {\n\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.FAILURE);\n\t\t\tthrow new JobExecutionException(e);\n\t\t} catch (NoSuchFieldException e) {\n\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.FAILURE);\n\t\t\tthrow new JobExecutionException(e);\n\t\t}\n\t}\n\t\n\t\/*\n\t * Add the interface IExceptionTracking to all Runnable and Callable\n\t *\/\n    public interface IExceptionTracking {};\n  \tprivate Object IExceptionTracking.context = null;\n\t\n    declare parents:           \n    \t(java.lang.Runnable+ ) implements IExceptionTracking;\n    declare parents:           \n    \t(java.util.concurrent.Callable+ ) implements IExceptionTracking;    \n  \t\n\t\/\/ Interception around Runnable execution      \n  \tafter(Object self) returning (Runnable ret): \n  \t\texecution(* org.parallelj.internal.kernel.procedure.RunnableProcedure.RunnableCall.toRunnable())\n      && this(self)  {\n   \t  ((IExceptionTracking)ret).context = ((org.parallelj.internal.kernel.KCall)self);\n    }\n\n\t\/\/ Interception around Callable execution      \n  \tafter(Object self) returning (Runnable ret): \n  \t\texecution(* org.parallelj.internal.kernel.procedure.CallableProcedure.CallableCall.toRunnable())\n      && this(self)  {\n   \t  ((IExceptionTracking)ret).context = ((org.parallelj.internal.kernel.KCall)self);\n    }\n\n\t\/\/ Interception around Runnable execution      \n\t void around(Object self): call(void complete())\n\t&& within(org.parallelj.internal.kernel.procedure.RunnableProcedure.RunnableCall)  \n\t\t&& this(self)  {\n\t \n\t\t\tRunnableProcedure.RunnableCall runnable = (RunnableProcedure.RunnableCall)((IExceptionTracking)self).context;\n\t\t\tRunnableProcedure procedure = (RunnableProcedure)runnable.getProcedure();\n\t\t\tif (procedure.getHandler() == null\n\t\t\t\t\t&& runnable.getException() != null) {\n\t\t\t\t\/\/ There is an error !!!\n\t\t\t\tKProcess process = ((RunnableProcedure.RunnableCall)((IExceptionTracking)self).context).getProcess();\n\t\t\t\tKProcessor rootProcessor = process.getProcessor();\/\/.getRootProcessor();\n\t\t\t\t((IProceduresInError)rootProcessor).addProcedureInError(procedure.getType(), runnable.getException());\n\t\t\t}\n\t\tproceed(self);\n\t}\n\n\t\/\/ Interception around Callable execution      \n\t void around(Object self): call(void complete())\n\t\t && within(org.parallelj.internal.kernel.procedure.CallableProcedure.CallableCall)  \n\t\t&& this(self)  {\n\t \n\t\t\tCallableProcedure.CallableCall callable = (CallableProcedure.CallableCall)((IExceptionTracking)self).context;\n\t\t\tCallableProcedure procedure = (CallableProcedure)callable.getProcedure(); \n\t\t\t\n\t\t\tif (\n\t\t\t\t\tprocedure.getHandler() == null\n\t\t\t\t\t&& callable.getException() != null\n\t\t\t\t\t) {\n\t\t\t\t\/\/ There is an error !!!\n\t\t\t\tKProcess process = ((CallableProcedure.CallableCall)((IExceptionTracking)self).context).getProcess();\n\t\t\t\tKProcessor rootProcessor = process.getProcessor();\/\/.getRootProcessor();\n\t\t\t\t((IProceduresInError)rootProcessor).addProcedureInError(procedure.getType(), callable.getException());\n\t\t\t}\n\t\tproceed(self);\n\t}\n\t \n\t\/*\n\t * Allow to get the procedures in error of a Process (the root Process !!!)\n\t *\/\n\tpublic static synchronized Map<String, Set<String>> getProceduresInErrors(\n\t\t\torg.parallelj.mirror.Process process) {\n\t\tKProcessor rootProcessor = ((KProcessor) process.getProcessor());\n\t\tIProceduresInError procedures = (IProceduresInError) rootProcessor;\n\t\treturn procedures.proceduresInError;\n\t}\n}\n","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"4a6ca00acfd009dc4c0293e95c31cccc2e5880a1","subject":"corriger les import dans myfirstaspectj.aj","message":"corriger les import dans myfirstaspectj.aj\n","repos":"sherlocknoir\/TAGL_TP","old_file":"cron4j-mvn\/mvnTP\/src\/main\/java\/MyFirstAspecj.aj","new_file":"cron4j-mvn\/mvnTP\/src\/main\/java\/MyFirstAspecj.aj","new_contents":"package it.sauronsoftware;\nimport it.sauronsoftware.cron4j.Task;\nimport it.sauronsoftware.cron4j.TaskExecutionContext;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport java.util.HashMap;\nimport java.util.Map;\nimport java.util.concurrent.atomic.AtomicLong;\n\npublic aspect MyFirstAspecj{\n    public static final Logger LOGGER = LoggerFactory.getLogger(MyAspectTrace.class);\n\n\n    private Map<Task, AtomicLong> counters = new HashMap<Task, AtomicLong>();\n    private ThreadLocal<AtomicLong> local = new ThreadLocal<AtomicLong>();\n\n    pointcut run(TaskExecutionContext context) : execution(it.sauronsoftware.cron4j.RunnableTask.execute             (TaskExecutionContext context));\n\n    before(TaskExecutionContext context) : run() && args(context){\n           Task task = context.getTaskExecutor().getTask();\n\n        \/\/ Code using the global map\n        AtomicLong count = counters.get(task);\n        if (count == null) {\n            count = new AtomicLong(0);\n            counters.put(task, count);\n        }\n        long n1 = count.incrementAndGet();\n\n        \/\/ Code using the thread local\n        count = local.get();\n        if (count == null) {\n            count = new AtomicLong(0);\n            local.set(count);\n        }\n        long n2 = count.incrementAndGet();\n        LOGGER.info(\"Calling {} - execution #{},{} - thread[{}]\", task, n1, n2, Thread.currentThread().getId());\n    }\n\n    after(TaskExecutionContext context) : run() && args(context){\n        Task task = context.getTaskExecutor().getTask();\n        \/\/ Cannot be null, it was necessarily set in `before`.\n        long n1 = counters.get(task).get();\n        long n2 = local.get().get();\n        LOGGER.info(\"End of {}#{},{}\", task, n1, n2);\n    }\n}\n","old_contents":"public aspect MyFirstAspecj{\n    public static final Logger LOGGER = LoggerFactory.getLogger(MyAspectTrace.class);\n\n\n    private Map<Task, AtomicLong> counters = new HashMap<Task, AtomicLong>();\n    private ThreadLocal<AtomicLong> local = new ThreadLocal<AtomicLong>();\n\n    pointcut run(TaskExecutionContext context) : execution(it.sauronsoftware.cron4j.RunnableTask.execute             (TaskExecutionContext context));\n\n    before(TaskExecutionContext context) : run() && args(context){\n           Task task = context.getTaskExecutor().getTask();\n\n        \/\/ Code using the global map\n        AtomicLong count = counters.get(task);\n        if (count == null) {\n            count = new AtomicLong(0);\n            counters.put(task, count);\n        }\n        long n1 = count.incrementAndGet();\n\n        \/\/ Code using the thread local\n        count = local.get();\n        if (count == null) {\n            count = new AtomicLong(0);\n            local.set(count);\n        }\n        long n2 = count.incrementAndGet();\n        LOGGER.info(\"Calling {} - execution #{},{} - thread[{}]\", task, n1, n2, Thread.currentThread().getId());\n    }\n\n    after(TaskExecutionContext context) : run() && args(context){\n        Task task = context.getTaskExecutor().getTask();\n        \/\/ Cannot be null, it was necessarily set in `before`.\n        long n1 = counters.get(task).get();\n        long n2 = local.get().get();\n        LOGGER.info(\"End of {}#{},{}\", task, n1, n2);\n    }\n}\n","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"eb095b3b613e7435ab36361377c49a26fddecf4e","subject":"Fix syntax error due to missing semicolon","message":"Fix syntax error due to missing semicolon","repos":"lemmy\/tlaplus,tlaplus\/tlaplus,tlaplus\/tlaplus,tlaplus\/tlaplus,lemmy\/tlaplus,lemmy\/tlaplus,tlaplus\/tlaplus,lemmy\/tlaplus","old_file":"tlatools\/src-aj\/tlc2\/tool\/distributed\/RMIMethodMonitorAspect.aj","new_file":"tlatools\/src-aj\/tlc2\/tool\/distributed\/RMIMethodMonitorAspect.aj","new_contents":"package tlc2.tool.distributed;\n\npublic aspect RMIMethodMonitorAspect {\n\t\n\t\/\/ catch all method calls to RMI methods\n\tpointcut callToRemoteMethod() : \n\t\t   execution(* tlc2.tool.distributed.InternRMI.*(..))\n\t\t|| execution(* tlc2.tool.distributed.TLCServerRMI.*(..))\n\t\t|| execution(* tlc2.tool.distributed.TLCWorkerRMI.*(..))\n\t\t|| execution(* tlc2.tool.distributed.fp.FPSetRMI.*(..));\n\t\n\tbefore(): (callToRemoteMethod()) {\n\t\tRMIMethodMonitor.entering(thisJoinPoint);\n\t}\n}\n","old_contents":"package tlc2.tool.distributed;\n\npublic aspect RMIMethodMonitorAspect {\n\t\n\t\/\/ catch all method calls to RMI methods\n\tpointcut callToRemoteMethod() : \n\t\t   execution(* tlc2.tool.distributed.InternRMI.*(..))\n\t\t|| execution(* tlc2.tool.distributed.TLCServerRMI.*(..))\n\t\t|| execution(* tlc2.tool.distributed.TLCWorkerRMI.*(..))\n\t\t|| execution(* tlc2.tool.distributed.fp.FPSetRMI.*(..))\n\t\n\tbefore(): (callToRemoteMethod()) {\n\t\tRMIMethodMonitor.entering(thisJoinPoint);\n\t}\n}\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"c18b450951fba1646ac7d9aaf3e39103d37534a9","subject":"added ui update","message":"added ui update\n","repos":"stieglma\/Schafkopfauswerter","old_file":"src\/Import.aj","new_file":"src\/Import.aj","new_contents":"import java.awt.Component;\r\nimport java.io.BufferedReader;\r\nimport java.io.FileInputStream;\r\nimport java.io.IOException;\r\nimport java.io.InputStreamReader;\r\n\r\nimport javax.swing.JFileChooser;\r\nimport javax.swing.JMenu;\r\nimport javax.swing.JMenuBar;\r\nimport javax.swing.JMenuItem;\r\nimport javax.swing.JOptionPane;\r\n\r\nimport model.SystemValues;\r\nimport model.db.DataObject;\r\nimport model.db.GameData;\r\nimport view.GUI;\r\nimport view.SchafkopfTableModel;\r\n\r\nprivileged aspect Import {\r\n\r\n    private GUI gui;\r\n\r\n    \/**\r\n     * catch constructor call, so that we have the correct gui, to refer to everywhere\r\n     *\/\r\n    after() returning(GUI gui): call(GUI.new(*)) {\r\n        this.gui = gui;\r\n    }\r\n\r\n    private void importFromHtmlTable(BufferedReader in) throws IOException {\r\n        GameData newData = new GameData();\r\n        String line;\r\n\r\n        while((line=in.readLine()) != null) {\r\n            if (line.startsWith(\"<tr>\")) {\r\n                line = line.replaceAll(\"<tr>\", \"\");\r\n                line = line.replaceAll(\"<\/tr>\", \"\");\r\n                if (line.startsWith(\"<th>\")) {\r\n                    line = line.replaceAll(\"<\/th>\", \"\");\r\n                    line = line.replaceFirst(\"<th>\", \"\");\r\n                    String[] tmp = line.split(\"<th>\");\r\n                    SystemValues.Players.PLAYER_1.setName(tmp[4]);\r\n                    SystemValues.Players.PLAYER_2.setName(tmp[5]);\r\n                    SystemValues.Players.PLAYER_3.setName(tmp[6]);\r\n                    SystemValues.Players.PLAYER_4.setName(tmp[7]);\r\n                    continue;\r\n                } else if (!line.startsWith(\"<td>\")) {\r\n                    continue;\r\n                }\r\n                line = line.replaceAll(\"<\/td>\", \"\");\r\n                line = line.replaceFirst(\"<td>\", \"\");\r\n                String[] tmp = line.split(\"<td>\");\r\n                \/\/ first line is ignored\r\n                if (tmp[0].equals(\"0\")) {\r\n                    continue;\r\n                }\r\n                newData.addData(new DataObject(tmp));\r\n            }\r\n        }\r\n        gui.model.gameDB = newData;\r\n        gui.table.setModel(new SchafkopfTableModel(gui.model.getGameData()));\r\n        gui.updateValues();\r\n    }\r\n\r\n    after() returning(JMenuBar bar): call(JMenuBar GUI.createMenu()) {\r\n        JMenuItem itemLoad = new JMenuItem(\"Spielstand laden\");\r\n        itemLoad.addActionListener(new LoadFileListener());\r\n\r\n        Component[] menus = bar.getComponents();\r\n        if (menus.length != 0 && menus[0] instanceof JMenu) {\r\n            ((JMenu)bar.getComponents()[0]).add(itemLoad);\r\n        } else {\r\n            throw new AssertionError(\"There should be a menu entry!\");\r\n        }\r\n    }\r\n\r\n    after() : execution(* LoadFileListener.actionPerformed(*)) {\r\n        JFileChooser chooser = new JFileChooser();\r\n        if (chooser.showOpenDialog(gui) == JFileChooser.APPROVE_OPTION) {\r\n            try {\r\n                BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(chooser.getSelectedFile())));\r\n                if (!LoadFileListener.setSystemValues(in.readLine(), in.readLine())) {\r\n                    JOptionPane.showConfirmDialog(gui, \"Laden fehlgeschlagen\\n(Ung\u00fcltiges Dateiformat)\");\r\n                    in.close();\r\n                }\r\n                importFromHtmlTable(in);\r\n                gui.tabbedPane.setEnabledAt(1, true);\r\n                gui.repaint();\r\n            } catch (IOException e1) {\r\n                JOptionPane.showConfirmDialog(gui, \"Laden fehlgeschlagen\\n\"+e1.getMessage());\r\n            }\r\n        }\r\n    }\r\n}\r\n","old_contents":"import java.awt.Component;\r\nimport java.io.BufferedReader;\r\nimport java.io.FileInputStream;\r\nimport java.io.IOException;\r\nimport java.io.InputStreamReader;\r\n\r\nimport javax.swing.JFileChooser;\r\nimport javax.swing.JMenu;\r\nimport javax.swing.JMenuBar;\r\nimport javax.swing.JMenuItem;\r\nimport javax.swing.JOptionPane;\r\n\r\nimport model.SystemValues;\r\nimport model.db.DataObject;\r\nimport model.db.GameData;\r\nimport view.GUI;\r\nimport view.SchafkopfTableModel;\r\n\r\nprivileged aspect Import {\r\n\r\n    private GUI gui;\r\n\r\n    \/**\r\n     * catch constructor call, so that we have the correct gui, to refer to everywhere\r\n     *\/\r\n    after() returning(GUI gui): call(GUI.new(*)) {\r\n        this.gui = gui;\r\n    }\r\n\r\n    private void importFromHtmlTable(BufferedReader in) throws IOException {\r\n        GameData newData = new GameData();\r\n        String line;\r\n\r\n        while((line=in.readLine()) != null) {\r\n            if (line.startsWith(\"<tr>\")) {\r\n                line = line.replaceAll(\"<tr>\", \"\");\r\n                line = line.replaceAll(\"<\/tr>\", \"\");\r\n                if (line.startsWith(\"<th>\")) {\r\n                    line = line.replaceAll(\"<\/th>\", \"\");\r\n                    line = line.replaceFirst(\"<th>\", \"\");\r\n                    String[] tmp = line.split(\"<th>\");\r\n                    SystemValues.Players.PLAYER_1.setName(tmp[4]);\r\n                    SystemValues.Players.PLAYER_2.setName(tmp[5]);\r\n                    SystemValues.Players.PLAYER_3.setName(tmp[6]);\r\n                    SystemValues.Players.PLAYER_4.setName(tmp[7]);\r\n                    continue;\r\n                } else if (!line.startsWith(\"<td>\")) {\r\n                    continue;\r\n                }\r\n                line = line.replaceAll(\"<\/td>\", \"\");\r\n                line = line.replaceFirst(\"<td>\", \"\");\r\n                String[] tmp = line.split(\"<td>\");\r\n                \/\/ first line is ignored\r\n                if (tmp[0].equals(\"0\")) {\r\n                    continue;\r\n                }\r\n                newData.addData(new DataObject(tmp));\r\n            }\r\n        }\r\n        gui.model.gameDB = newData;\r\n        gui.table.setModel(new SchafkopfTableModel(gui.model.getGameData()));\r\n    }\r\n\r\n    after() returning(JMenuBar bar): call(JMenuBar GUI.createMenu()) {\r\n        JMenuItem itemLoad = new JMenuItem(\"Spielstand laden\");\r\n        itemLoad.addActionListener(new LoadFileListener());\r\n\r\n        Component[] menus = bar.getComponents();\r\n        if (menus.length != 0 && menus[0] instanceof JMenu) {\r\n            ((JMenu)bar.getComponents()[0]).add(itemLoad);\r\n        } else {\r\n            throw new AssertionError(\"There should be a menu entry!\");\r\n        }\r\n    }\r\n\r\n    after() : execution(* LoadFileListener.actionPerformed(*)) {\r\n        JFileChooser chooser = new JFileChooser();\r\n        if (chooser.showOpenDialog(gui) == JFileChooser.APPROVE_OPTION) {\r\n            try {\r\n                BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(chooser.getSelectedFile())));\r\n                if (!LoadFileListener.setSystemValues(in.readLine(), in.readLine())) {\r\n                    JOptionPane.showConfirmDialog(gui, \"Laden fehlgeschlagen\\n(Ung\u00fcltiges Dateiformat)\");\r\n                    in.close();\r\n                }\r\n                importFromHtmlTable(in);\r\n                gui.tabbedPane.setEnabledAt(1, true);\r\n                gui.repaint();\r\n            } catch (IOException e1) {\r\n                JOptionPane.showConfirmDialog(gui, \"Laden fehlgeschlagen\\n\"+e1.getMessage());\r\n            }\r\n        }\r\n    }\r\n}\r\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"02043797e7d97b79dc6b47607dd7f3eac7030b3d","subject":"changes made by roo","message":"changes made by roo\n","repos":"datacite\/mds,datacite\/mds,datacite\/mds,datacite\/mds,datacite\/mds,ulbricht\/mds,ulbricht\/mds,ulbricht\/mds,ulbricht\/mds","old_file":"src\/main\/java\/org\/datacite\/mds\/web\/DatasetController_Roo_Controller.aj","new_file":"src\/main\/java\/org\/datacite\/mds\/web\/DatasetController_Roo_Controller.aj","new_contents":"\/\/ WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.\n\/\/ You may push code into the target .java compilation unit if you wish to edit any member(s).\n\npackage org.datacite.mds.web;\n\nimport java.io.UnsupportedEncodingException;\nimport java.lang.Long;\nimport java.lang.String;\nimport java.util.ArrayList;\nimport java.util.List;\nimport javax.servlet.http.HttpServletRequest;\nimport org.datacite.mds.domain.Datacentre;\nimport org.datacite.mds.domain.Dataset;\nimport org.springframework.beans.factory.annotation.Autowired;\nimport org.springframework.core.convert.support.GenericConversionService;\nimport org.springframework.ui.Model;\nimport org.springframework.web.bind.annotation.PathVariable;\nimport org.springframework.web.bind.annotation.RequestMapping;\nimport org.springframework.web.bind.annotation.RequestMethod;\nimport org.springframework.web.bind.annotation.RequestParam;\nimport org.springframework.web.util.UriUtils;\nimport org.springframework.web.util.WebUtils;\n\nprivileged aspect DatasetController_Roo_Controller {\n    \n    @Autowired\n    private GenericConversionService DatasetController.conversionService;\n    \n    @RequestMapping(params = \"form\", method = RequestMethod.GET)\n    public String DatasetController.createForm(Model model) {\n        model.addAttribute(\"dataset\", new Dataset());\n        List dependencies = new ArrayList();\n        if (Datacentre.countDatacentres() == 0) {\n            dependencies.add(new String[]{\"datacentre\", \"datacentres\"});\n        }\n        model.addAttribute(\"dependencies\", dependencies);\n        return \"datasets\/create\";\n    }\n    \n    @RequestMapping(value = \"\/{id}\", params = \"form\", method = RequestMethod.GET)\n    public String DatasetController.updateForm(@PathVariable(\"id\") Long id, Model model) {\n        model.addAttribute(\"dataset\", Dataset.findDataset(id));\n        return \"datasets\/update\";\n    }\n    \n    @RequestMapping(params = { \"find=ByDoiEquals\", \"form\" }, method = RequestMethod.GET)\n    public String DatasetController.findDatasetsByDoiEqualsForm(Model model) {\n        return \"datasets\/findDatasetsByDoiEquals\";\n    }\n    \n    @RequestMapping(params = \"find=ByDoiEquals\", method = RequestMethod.GET)\n    public String DatasetController.findDatasetsByDoiEquals(@RequestParam(\"doi\") String doi, Model model) {\n        model.addAttribute(\"datasets\", Dataset.findDatasetsByDoiEquals(doi).getResultList());\n        return \"datasets\/list\";\n    }\n    \n    private String DatasetController.encodeUrlPathSegment(String pathSegment, HttpServletRequest request) {\n        String enc = request.getCharacterEncoding();\n        if (enc == null) {\n            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;\n        }\n        try {\n            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);\n        }\n        catch (UnsupportedEncodingException uee) {}\n        return pathSegment;\n    }\n    \n}\n","old_contents":"\/\/ WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.\n\/\/ You may push code into the target .java compilation unit if you wish to edit any member(s).\n\npackage org.datacite.mds.web;\n\nimport java.io.UnsupportedEncodingException;\nimport java.lang.Long;\nimport java.lang.String;\nimport java.util.ArrayList;\nimport java.util.List;\nimport javax.servlet.http.HttpServletRequest;\nimport javax.validation.Valid;\nimport org.datacite.mds.domain.Datacentre;\nimport org.datacite.mds.domain.Dataset;\nimport org.springframework.beans.factory.annotation.Autowired;\nimport org.springframework.core.convert.support.GenericConversionService;\nimport org.springframework.ui.Model;\nimport org.springframework.validation.BindingResult;\nimport org.springframework.web.bind.annotation.PathVariable;\nimport org.springframework.web.bind.annotation.RequestMapping;\nimport org.springframework.web.bind.annotation.RequestMethod;\nimport org.springframework.web.bind.annotation.RequestParam;\nimport org.springframework.web.util.UriUtils;\nimport org.springframework.web.util.WebUtils;\n\nprivileged aspect DatasetController_Roo_Controller {\n    \n    @Autowired\n    private GenericConversionService DatasetController.conversionService;\n    \n        \n    @RequestMapping(params = \"form\", method = RequestMethod.GET)\n    public String DatasetController.createForm(Model model) {\n        model.addAttribute(\"dataset\", new Dataset());\n        List dependencies = new ArrayList();\n        if (Datacentre.countDatacentres() == 0) {\n            dependencies.add(new String[]{\"datacentre\", \"datacentres\"});\n        }\n        model.addAttribute(\"dependencies\", dependencies);\n        return \"datasets\/create\";\n    }\n    \n        \n    @RequestMapping(value = \"\/{id}\", params = \"form\", method = RequestMethod.GET)\n    public String DatasetController.updateForm(@PathVariable(\"id\") Long id, Model model) {\n        model.addAttribute(\"dataset\", Dataset.findDataset(id));\n        return \"datasets\/update\";\n    }\n    \n    @RequestMapping(params = { \"find=ByDoiEquals\", \"form\" }, method = RequestMethod.GET)\n    public String DatasetController.findDatasetsByDoiEqualsForm(Model model) {\n        return \"datasets\/findDatasetsByDoiEquals\";\n    }\n    \n    @RequestMapping(params = \"find=ByDoiEquals\", method = RequestMethod.GET)\n    public String DatasetController.findDatasetsByDoiEquals(@RequestParam(\"doi\") String doi, Model model) {\n        model.addAttribute(\"datasets\", Dataset.findDatasetsByDoiEquals(doi).getResultList());\n        return \"datasets\/list\";\n    }\n    \n    private String DatasetController.encodeUrlPathSegment(String pathSegment, HttpServletRequest request) {\n        String enc = request.getCharacterEncoding();\n        if (enc == null) {\n            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;\n        }\n        try {\n            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);\n        }\n        catch (UnsupportedEncodingException uee) {}\n        return pathSegment;\n    }\n    \n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"adaf5319ffdfef4a29e21176a9139c7c032a52d8","subject":"the map won't be null now","message":"the map won't be null now\n","repos":"mebigfatguy\/hashshmash","old_file":"aj\/com\/mebigfatguy\/hashshmash\/HashCollector.aj","new_file":"aj\/com\/mebigfatguy\/hashshmash\/HashCollector.aj","new_contents":"package com.mebigfatguy.hashshmash;\n\nimport java.io.BufferedWriter;\nimport java.io.File;\nimport java.io.FileOutputStream;\nimport java.io.OutputStreamWriter;\nimport java.io.PrintWriter;\nimport java.lang.reflect.Field;\nimport java.util.Date;\nimport java.util.HashMap;\nimport java.util.Map;\nimport java.util.Map.Entry;\nimport java.util.concurrent.ConcurrentHashMap;\n\nimport org.aspectj.lang.Signature;\n\npublic aspect HashCollector {\n    \n    private static final Journaller journaller = new Journaller();\n\n    after() returning (Map m): call(HashMap.new(..)) {\n        Signature sig = thisJoinPointStaticPart.getSignature();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashMapDetails details = new HashMapDetails(m, System.currentTimeMillis(), sig + \":\" + line);\n        journaller.add(details);\n    }\n}\n\nfinal class Journaller implements Runnable {\n    \n    private static final int SLEEP_TIME = 10 * 1000;\n    \n    private Field tableField;\n    private ConcurrentHashMap<HashMapDetails, HashMapDetails> hmDetails = new ConcurrentHashMap<HashMapDetails, HashMapDetails>();\n    private PrintWriter writer;\n\n    public Journaller() {\n        try {\n            tableField = HashMap.class.getDeclaredField(\"table\");\n            tableField.setAccessible(true);\n                        \n            File dir = new File(System.getProperty(\"user.home\"), \".hashshmash\");\n            dir.mkdirs();\n            \n            writer = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(new File(dir, new Date().toString() + \".txt\")))));\n            \n            Thread t = new Thread(this);\n            t.setDaemon(true);\n            t.start();\n        } catch (Exception e) {\n        }\n    }\n    \n    public void add(HashMapDetails details) {\n        hmDetails.put(details,  details);\n    }\n    \n    public void run() {\n        try {\n            while (!Thread.interrupted()) {\n                Thread.sleep(SLEEP_TIME);\n                \n                for (HashMapDetails details : hmDetails.keySet()) {\n                    try {\n                        int newSize = details.map.size();\n                        if (newSize == details.size) {\n                            Entry<?, ?>[] table = (Entry<?, ?>[])tableField.get(details.map);\n                            details.totalSlots = table.length;\n                            for (Entry<?, ?> e : table) {\n                                if (e != null) {\n                                    details.usedSlots++;\n                                }\n                            }\n                            writer.println(details.allocTime + \"\\t\" + details.caller + \"\\t\" + details.map.size() + \"\\t\" + details.totalSlots + \"\\t\" + details.usedSlots);\n                            hmDetails.remove(details);\n                        }\n                    } catch (Exception e) {\n                        \/\/might get ConcurrentModificationException or such, just ignore\n                    }\n                }\n                writer.flush();\n            }\n        } catch (InterruptedException ie) {    \n        }\n    }\n}\n\nclass HashMapDetails {\n    public Map<?, ?> map;\n    public long allocTime;\n    public String caller;\n    public int size;\n    public int usedSlots;\n    public int totalSlots;\n\n    public HashMapDetails(Map<?, ?> m, long t, String c) {\n        map = m;\n        allocTime = t;\n        caller = c;\n        size = map.size();\n    }\n}\n","old_contents":"package com.mebigfatguy.hashshmash;\n\nimport java.io.BufferedWriter;\nimport java.io.File;\nimport java.io.FileOutputStream;\nimport java.io.OutputStreamWriter;\nimport java.io.PrintWriter;\nimport java.lang.reflect.Field;\nimport java.util.Date;\nimport java.util.HashMap;\nimport java.util.Map;\nimport java.util.Map.Entry;\nimport java.util.concurrent.ConcurrentHashMap;\n\nimport org.aspectj.lang.Signature;\n\npublic aspect HashCollector {\n    \n    private static final Journaller journaller = new Journaller();\n\n    after() returning (Map m): call(HashMap.new(..)) {\n        Signature sig = thisJoinPointStaticPart.getSignature();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashMapDetails details = new HashMapDetails(m, System.currentTimeMillis(), sig + \":\" + line);\n        journaller.add(details);\n    }\n}\n\nfinal class Journaller implements Runnable {\n    \n    private static final int SLEEP_TIME = 10 * 1000;\n    \n    private Field tableField;\n    private ConcurrentHashMap<HashMapDetails, HashMapDetails> hmDetails = new ConcurrentHashMap<HashMapDetails, HashMapDetails>();\n    private PrintWriter writer;\n\n    public Journaller() {\n        try {\n            tableField = HashMap.class.getDeclaredField(\"table\");\n            tableField.setAccessible(true);\n                        \n            File dir = new File(System.getProperty(\"user.home\"), \".hashshmash\");\n            dir.mkdirs();\n            \n            writer = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(new File(dir, new Date().toString() + \".txt\")))));\n            \n            Thread t = new Thread(this);\n            t.setDaemon(true);\n            t.start();\n        } catch (Exception e) {\n        }\n    }\n    \n    public void add(HashMapDetails details) {\n        hmDetails.put(details,  details);\n    }\n    \n    public void run() {\n        try {\n            while (!Thread.interrupted()) {\n                Thread.sleep(SLEEP_TIME);\n                \n                for (HashMapDetails details : hmDetails.keySet()) {\n                    try {\n                        if (details.map != null) {\n                            int newSize = details.map.size();\n                            if (newSize == details.size) {\n                                Entry<?, ?>[] table = (Entry<?, ?>[])tableField.get(details.map);\n                                details.totalSlots = table.length;\n                                for (Entry<?, ?> e : table) {\n                                    if (e != null) {\n                                        details.usedSlots++;\n                                    }\n                                }\n                                writer.println(details.allocTime + \"\\t\" + details.caller + \"\\t\" + details.map.size() + \"\\t\" + details.totalSlots + \"\\t\" + details.usedSlots);\n                                hmDetails.remove(details);\n                            }\n                        }\n                    } catch (Exception e) {\n                        \/\/might get ConcurrentModificationException or such, just ignore\n                    }\n                }\n                writer.flush();\n            }\n        } catch (InterruptedException ie) {    \n        }\n    }\n}\n\nclass HashMapDetails {\n    public Map<?, ?> map;\n    public long allocTime;\n    public String caller;\n    public int size;\n    public int usedSlots;\n    public int totalSlots;\n\n    public HashMapDetails(Map<?, ?> m, long t, String c) {\n        map = m;\n        allocTime = t;\n        caller = c;\n        size = map.size();\n    }\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"a518b8b9900ea0dfc4af081cbe0fc860f63c495e","subject":"- Remove pointcut to deleted interface - Reflect new .fp package in pointcut","message":"- Remove pointcut to deleted interface\n- Reflect new .fp package in pointcut\n\ngit-svn-id: 7acc490bd371dbc82047a939b87dc892fdc31f59@28619 76a6fc44-f60b-0410-a9a8-e67b0e8fc65c\n","repos":"lemmy\/tlaplus,tlaplus\/tlaplus,lemmy\/tlaplus,tlaplus\/tlaplus,lemmy\/tlaplus,lemmy\/tlaplus,tlaplus\/tlaplus,tlaplus\/tlaplus","old_file":"tlatools\/src-aj\/tlc2\/tool\/distributed\/RMIMethodMonitorAspect.aj","new_file":"tlatools\/src-aj\/tlc2\/tool\/distributed\/RMIMethodMonitorAspect.aj","new_contents":"package tlc2.tool.distributed;\n\npublic aspect RMIMethodMonitorAspect {\n\t\n\t\/\/ catch all method calls to RMI methods\n\tpointcut callToRemoteMethod() : \n\t\t   execution(* tlc2.tool.distributed.InternRMI.*(..))\n\t\t|| execution(* tlc2.tool.distributed.TLCServerRMI.*(..))\n\t\t|| execution(* tlc2.tool.distributed.TLCWorkerRMI.*(..))\n\t\t|| execution(* tlc2.tool.distributed.fp.FPSetRMI.*(..))\n\t\n\tbefore(): (callToRemoteMethod()) {\n\t\tRMIMethodMonitor.entering(thisJoinPoint);\n\t}\n}\n","old_contents":"package tlc2.tool.distributed;\n\npublic aspect RMIMethodMonitorAspect {\n\t\n\t\/\/ catch all method calls to RMI methods\n\tpointcut callToRemoteMethod() : \n\t\t   execution(* tlc2.tool.distributed.InternRMI.*(..))\n\t\t|| execution(* tlc2.tool.distributed.TLCServerRMI.*(..))\n\t\t|| execution(* tlc2.tool.distributed.TLCWorkerRMI.*(..))\n\t\t|| execution(* tlc2.tool.distributed.FPSetRMI.*(..))\n\t\t|| execution(* tlc2.tool.distributed.FPIntSetRMI.*(..));\n\t\n\tbefore(): (callToRemoteMethod()) {\n\t\tRMIMethodMonitor.entering(thisJoinPoint);\n\t}\n}\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"98cee5aa553821990576d04576fc539bb97a7280","subject":"Formatting","message":"Formatting\n","repos":"DataDog\/monitor,DataDog\/monitor,eigengo\/monitor,eigengo\/monitor","old_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/ActorCellMonitoringAspect.aj","new_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/ActorCellMonitoringAspect.aj","new_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.actor.*;\nimport org.eigengo.monitor.agent.AgentConfiguration;\nimport org.eigengo.monitor.output.CounterInterface;\nimport scala.Option;\n\nimport java.util.ArrayList;\nimport java.util.List;\nimport java.util.concurrent.atomic.AtomicInteger;\nimport java.util.concurrent.atomic.AtomicLong;\nimport java.util.concurrent.ConcurrentHashMap;\n\n\/**\n * Contains advices for monitoring behaviour of an actor; typically imprisoned in an {@code ActorCell}.\n *\/\npublic aspect ActorCellMonitoringAspect extends AbstractMonitoringAspect issingleton() {\n    private AkkaAgentConfiguration agentConfiguration;\n    private final CounterInterface counterInterface;\n    private final Option<String> noActorClazz = Option.empty();\n    private final ConcurrentHashMap<Option<String>, AtomicLong> samplingCounters  = new ConcurrentHashMap<Option<String>, AtomicLong>();\n    private final ConcurrentHashMap<Option<String>, AtomicInteger> numberOfActors = new ConcurrentHashMap<Option<String>, AtomicInteger>();\n\n\n    \/**\n     * Constructs this aspect\n     *\/\n    public ActorCellMonitoringAspect() {\n        AgentConfiguration<AkkaAgentConfiguration> configuration = getAgentConfiguration(\"akka\", AkkaAgentConfigurationJapi.apply());\n        this.agentConfiguration = configuration.agent();\n        this.counterInterface = createCounterInterface(configuration.common());\n    }\n\n    \/**\n     * Injects the new {@code AkkaAgentConfiguration} instance.\n     *\n     * @param agentConfiguration the new configuration\n     *\/\n    synchronized final void setAgentConfiguration(AkkaAgentConfiguration agentConfiguration) {\n        this.agentConfiguration = agentConfiguration;\n    }\n\n    \/**\n     * decide whether to include this ActorCell in our measurements\n     * *\/\n    private boolean includeActorPath(final PathAndClass pathAndClass) {\n        \/\/ do not monitor our own output code\n        if (pathAndClass.actorClassName().isDefined()) {\n            if (pathAndClass.actorClassName().get().startsWith(\"org.eigengo.monitor.output\")) return false;\n        }\n\n        \/\/ skip if not included\n        if (!this.agentConfiguration.included().accept(pathAndClass)) return false;\n        \/\/ skip if excluded\n        if (this.agentConfiguration.excluded().accept(pathAndClass)) return false;\n\n        \/\/ skip system actor checks if we wish to monitor them\n        if (this.agentConfiguration.includeSystemAgents()) return true;\n\n        String userOrSystem = pathAndClass.actorPath().getElements().iterator().next();\n        return \"user\".equals(userOrSystem);\n    }\n\n    \/**\n     * get the sample rate for an actor\n     * *\/\n    private int getSampleRate(final PathAndClass pathAndClass) {\n        return this.agentConfiguration.sampling().getRate(pathAndClass);\n    }\n\n    \/**\n     * decide whether to sample an actor on a particular occasion\n     *\n     * @param pathAndClass\n     * @return true if we should sample this actor, otherwise false.\n     *\/\n    private final boolean sampleMessage(final PathAndClass pathAndClass) {\n        int sampleRate = getSampleRate(pathAndClass);\n        if (sampleRate == 1) return true;\n\n        this.samplingCounters.putIfAbsent(pathAndClass.actorClassName(), new AtomicLong(0));\n        long timesSeenSoFar = this.samplingCounters.get(pathAndClass.actorClassName()).incrementAndGet();\n        return (timesSeenSoFar % sampleRate == 1); \/\/ == 1 to log first value (incrementAndGet returns updated value)\n    }\n\n    \/**\n     * get the tags for the cell\n     * *\/\n    private String[] getTags(final ActorPath actorPath, final Actor actor) {\n        List<String> tags = new ArrayList<String>();\n\n        \/\/ TODO: Improve detection of routed actors. This relies only on the naming :(.\n        String lastPathElement = actorPath.elements().last();\n        if (lastPathElement.startsWith(\"$\")) {\n            \/\/ this is routed actor.\n            tags.add(actorPath.parent().toString());\n            if (this.agentConfiguration.includeRoutees()) tags.add(actorPath.toString());\n        } else {\n            \/\/ there is no supervisor\n            tags.add(actorPath.toString());\n        }\n        if (actor != null) {\n            tags.add(String.format(\"akka:%s.%s\", actor.context().system().name(), actor.getClass().getCanonicalName()));\n        }\n\n        return tags.toArray(new String[tags.size()]);\n    }\n\n    \/**\n     * returns the canonical name of the actor type associated with an ActorCell\n     * *\/\n    private String uncheckedActorNameFrom(final ActorCell actorCell) {\n        return uncheckedActorNameFrom(actorCell.props());\n    }\n\n    \/**\n     * returns the canonical name of the actor type associated with a Props instance\n     * *\/\n    private String uncheckedActorNameFrom(final Props props) {\n        return props.actorClass().getCanonicalName();\n    }\n\n    \/**\n     * Advises the {@code ActorCell.receiveMessage(message: Object): Unit}\n     * We proceed with the pointcut if the actor is to be included in the monitoring *and* this is\n     * the 'multiple-of-n'th time we've seen a message for an actor with a sample rate of n.\n     *\n     * Currently, we sample queue size, the fact that the message is delivered, the simple name of the class of the\n     * message, and the time taken to complete the actor's reactive action.\n     *\n     * @param actorCell the ActorCell where the actor that receives the message \"lives\"\n     * @param msg the incoming message\n     *\/\n    Object around(ActorCell actorCell, Object msg) : Pointcuts.actorCellReceiveMessage(actorCell, msg) {\n\n        final ActorPath actorPath = actorCell.self().path();\n        final PathAndClass pathAndClass = new PathAndClass(actorPath, Option.apply(uncheckedActorNameFrom(actorCell)));\n        if (!includeActorPath(pathAndClass) || !sampleMessage(pathAndClass)) return proceed(actorCell, msg);\n\n        int samplingRate = getSampleRate(pathAndClass);\n\n        \/\/ we tag by actor name\n        final String[] tags = getTags(actorPath, actorCell.actor());\n\n        \/\/ record the queue size\n        this.counterInterface.recordGaugeValue(\"akka.queue.size\", actorCell.numberOfMessages(), tags);\n        \/\/ record the message, general and specific\n        this.counterInterface.incrementCounter(\"akka.actor.delivered\", samplingRate, tags);\n        this.counterInterface.incrementCounter(\"akka.actor.delivered.\" + msg.getClass().getSimpleName(), samplingRate, tags);\n\n        \/\/ measure the time. we're using the ``nanoTime`` call to access the high-precision timer.\n        \/\/ since we're not really interested in wall time, but just some increasing measure of\n        \/\/ elapsed time\n        Object result = null;\n        final long start = System.nanoTime();\n        \/\/ result will always be ``null``, because target returns ``Unit``\n        result = proceed(actorCell, msg);\n        \/\/ ns or \u00b5s is too fine. ms will do for now.\n        final long duration = (System.nanoTime() - start) \/ 1000000;\n\n        \/\/ record the actor duration\n        this.counterInterface.recordExecutionTime(\"akka.actor.duration\", (int)duration, tags);\n\n        \/\/ return null would do the trick, but we want to be _proper_.\n        return result;\n    }\n\n    \/**\n     * Advises the {@code ActorCell.handleInvokeFailure(_, failure: Throwable): Unit}\n     *\n     * @param actorCell the ActorCell where the error spreads from\n     * @param failure the exception that escaped from the {@code receive} method\n     *\/\n    before(ActorCell actorCell, Throwable failure) : Pointcuts.actorCellHandleInvokeFailure(actorCell, failure) {\n        \/\/ record the error, general and specific\n        String[] tags = getTags(actorCell.self().path(), actorCell.actor());\n        this.counterInterface.incrementCounter(\"akka.actor.error\", tags);\n        this.counterInterface.incrementCounter(String.format(\"akka.actor.error.%s\", failure.getMessage()), tags);\n    }\n\n    \/**\n     * Advises the {@code EventStream.publish(event: Any): Unit}\n     *\n     * @param event the received event\n     *\/\n    before(Object event) : Pointcuts.eventStreamPublish(event) {\n        if (event instanceof UnhandledMessage) {\n            UnhandledMessage unhandledMessage = (UnhandledMessage)event;\n            String[] tags = getTags(unhandledMessage.recipient().path(), null);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered\", tags);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered.\" + unhandledMessage.getMessage().getClass().getSimpleName(), tags);\n        }\n    }\n\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorRefFactory} implementations\n     *\n     * @param props the {@code Props} instance used in the call\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after(Props props) returning (ActorRef actor) : Pointcuts.anyActorOf(props) {\n        if (!includeActorPath(new PathAndClass(actor.path(), this.noActorClazz))) return;\n        final String uncheckedClassName = uncheckedActorNameFrom(props);\n        final Option<String> className = Option.apply(uncheckedClassName);\n\n        this.numberOfActors.putIfAbsent(className, new AtomicInteger(0));\n        \/\/ increment and get the current number of actors of this type (if the value was 0, then this returns 1 -- which is correct)\n        final int currentNumberOfActors = this.numberOfActors.get(className).incrementAndGet();\n\n        \/\/ record the current number of actors of this type\n        this.counterInterface.recordGaugeValue(\"akka.actor.count\", currentNumberOfActors, uncheckedClassName);\n    }\n\n    \/**\n     * Advises the {@code LocalActorRef.stop} method\n     *\n     * @param actorCell the {@code ActorCell} of the actor being stopped\n     *\/\n    after(ActorCell actorCell) : Pointcuts.actorCellInternalStop(actorCell) {\n        if (!includeActorPath(new PathAndClass(actorCell.self().path(), this.noActorClazz))) return;\n        final String uncheckedClassName = uncheckedActorNameFrom(actorCell);\n        final Option<String> className = Option.apply(uncheckedClassName);\n\n        this.numberOfActors.putIfAbsent(className, new AtomicInteger(0));\n        \/\/ decrement and get the current number of actors of this type (if the value was 1, then this returns 0 -- which is correct)\n        final int currentNumberOfActors = this.numberOfActors.get(className).decrementAndGet();\n\n        this.counterInterface.recordGaugeValue(\"akka.actor.count\", currentNumberOfActors, uncheckedClassName);\n    }\n\n}","old_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.actor.*;\nimport org.eigengo.monitor.agent.AgentConfiguration;\nimport org.eigengo.monitor.output.CounterInterface;\nimport scala.Option;\n\nimport java.util.ArrayList;\nimport java.util.List;\nimport java.util.concurrent.atomic.AtomicInteger;\nimport java.util.concurrent.atomic.AtomicLong;\nimport java.util.concurrent.ConcurrentHashMap;\n\n\/**\n * Contains advices for monitoring behaviour of an actor; typically imprisoned in an {@code ActorCell}.\n *\/\npublic aspect ActorCellMonitoringAspect extends AbstractMonitoringAspect issingleton() {\n    private AkkaAgentConfiguration agentConfiguration;\n    private final CounterInterface counterInterface;\n    private final Option<String> noActorClazz = Option.empty();\n    private final ConcurrentHashMap<Option<String>, AtomicLong> samplingCounters  = new ConcurrentHashMap<Option<String>, AtomicLong>();\n    private final ConcurrentHashMap<Option<String>, AtomicInteger> numberOfActors = new ConcurrentHashMap<Option<String>, AtomicInteger>();\n\n\n    \/**\n     * Constructs this aspect\n     *\/\n    public ActorCellMonitoringAspect() {\n        AgentConfiguration<AkkaAgentConfiguration> configuration = getAgentConfiguration(\"akka\", AkkaAgentConfigurationJapi.apply());\n        this.agentConfiguration = configuration.agent();\n        this.counterInterface = createCounterInterface(configuration.common());\n    }\n\n    \/**\n     * Injects the new {@code AkkaAgentConfiguration} instance.\n     *\n     * @param agentConfiguration the new configuration\n     *\/\n    synchronized final void setAgentConfiguration(AkkaAgentConfiguration agentConfiguration) {\n        this.agentConfiguration = agentConfiguration;\n    }\n\n    \/**\n     * decide whether to include this ActorCell in our measurements\n     * *\/\n    private boolean includeActorPath(final PathAndClass pathAndClass) {\n        \/\/ do not monitor our own output code\n        if (pathAndClass.actorClassName().isDefined()) {\n            if (pathAndClass.actorClassName().get().startsWith(\"org.eigengo.monitor.output\")) return false;\n        }\n\n        \/\/ skip if not included\n        if (!this.agentConfiguration.included().accept(pathAndClass)) return false;\n        \/\/ skip if excluded\n        if (this.agentConfiguration.excluded().accept(pathAndClass)) return false;\n\n        \/\/ skip system actor checks if we wish to monitor them\n        if (this.agentConfiguration.includeSystemAgents()) return true;\n\n        String userOrSystem = pathAndClass.actorPath().getElements().iterator().next();\n        return \"user\".equals(userOrSystem);\n    }\n\n    \/**\n     * get the sample rate for an actor\n     * *\/\n    private int getSampleRate(final PathAndClass pathAndClass) {\n        return this.agentConfiguration.sampling().getRate(pathAndClass);\n    }\n\n    \/**\n     * decide whether to sample an actor on a particular occasion\n     *\n     * @param pathAndClass\n     * @return true if we should sample this actor, otherwise false.\n     *\/\n    private final boolean sampleMessage(final PathAndClass pathAndClass) {\n        int sampleRate = getSampleRate(pathAndClass);\n        if (sampleRate == 1) return true;\n\n        this.samplingCounters.putIfAbsent(pathAndClass.actorClassName(), new AtomicLong(0));\n        long timesSeenSoFar = this.samplingCounters.get(pathAndClass.actorClassName()).incrementAndGet();\n        return (timesSeenSoFar % sampleRate == 1); \/\/ == 1 to log first value (incrementAndGet returns updated value)\n    }\n\n    \/**\n     * get the tags for the cell\n     * *\/\n    private String[] getTags(final ActorPath actorPath, final Actor actor) {\n        List<String> tags = new ArrayList<String>();\n\n        \/\/ TODO: Improve detection of routed actors. This relies only on the naming :(.\n        String lastPathElement = actorPath.elements().last();\n        if (lastPathElement.startsWith(\"$\")) {\n            \/\/ this is routed actor.\n            tags.add(actorPath.parent().toString());\n            if (this.agentConfiguration.includeRoutees()) tags.add(actorPath.toString());\n        } else {\n            \/\/ there is no supervisor\n            tags.add(actorPath.toString());\n        }\n        if (actor != null) {\n            tags.add(String.format(\"akka:%s.%s\", actor.context().system().name(), actor.getClass().getCanonicalName()));\n        }\n\n        return tags.toArray(new String[tags.size()]);\n    }\n\n    \/**\n     * returns the canonical name of the actor type associated with an ActorCell\n     * *\/\n    private String uncheckedActorNameFrom(final ActorCell actorCell) {\n        return uncheckedActorNameFrom(actorCell.props());\n    }\n\n    \/**\n     * returns the canonical name of the actor type associated with a Props instance\n     * *\/\n    private String uncheckedActorNameFrom(final Props props) {\n        return props.actorClass().getCanonicalName();\n    }\n\n    \/**\n     * Advises the {@code ActorCell.receiveMessage(message: Object): Unit}\n     * We proceed with the pointcut if the actor is to be included in the monitoring *and* this is\n     * the 'multiple-of-n'th time we've seen a message for an actor with a sample rate of n.\n     *\n     * Currently, we sample queue size, the fact that the message is delivered, the simple name of the class of the\n     * message, and the time taken to complete the actor's reactive action.\n     *\n     * @param actorCell the ActorCell where the actor that receives the message \"lives\"\n     * @param msg the incoming message\n     *\/\n    Object around(ActorCell actorCell, Object msg) : Pointcuts.actorCellReceiveMessage(actorCell, msg) {\n\n        final ActorPath actorPath = actorCell.self().path();\n        final PathAndClass pathAndClass = new PathAndClass(actorPath, Option.apply(uncheckedActorNameFrom(actorCell)));\n        if (!includeActorPath(pathAndClass) || !sampleMessage(pathAndClass)) return proceed(actorCell, msg);\n\n        int samplingRate = getSampleRate(pathAndClass);\n\n        \/\/ we tag by actor name\n        final String[] tags = getTags(actorPath, actorCell.actor());\n\n        \/\/ record the queue size\n        this.counterInterface.recordGaugeValue(\"akka.queue.size\", actorCell.numberOfMessages(), tags);\n        \/\/ record the message, general and specific\n        this.counterInterface.incrementCounter(\"akka.actor.delivered\", samplingRate, tags);\n        this.counterInterface.incrementCounter(\"akka.actor.delivered.\" + msg.getClass().getSimpleName(), samplingRate, tags);\n\n        \/\/ measure the time. we're using the ``nanoTime`` call to access the high-precision timer.\n        \/\/ since we're not really interested in wall time, but just some increasing measure of\n        \/\/ elapsed time\n        Object result = null;\n        final long start = System.nanoTime();\n        \/\/ result will always be ``null``, because target returns ``Unit``\n        result = proceed(actorCell, msg);\n        \/\/ ns or \u00b5s is too fine. ms will do for now.\n        final long duration = (System.nanoTime() - start) \/ 1000000;\n\n        \/\/ record the actor duration\n        this.counterInterface.recordExecutionTime(\"akka.actor.duration\", (int)duration, tags);\n\n        \/\/ return null would do the trick, but we want to be _proper_.\n        return result;\n    }\n\n    \/**\n     * Advises the {@code ActorCell.handleInvokeFailure(_, failure: Throwable): Unit}\n     *\n     * @param actorCell the ActorCell where the error spreads from\n     * @param failure the exception that escaped from the {@code receive} method\n     *\/\n    before(ActorCell actorCell, Throwable failure) : Pointcuts.actorCellHandleInvokeFailure(actorCell, failure) {\n        \/\/ record the error, general and specific\n        String[] tags = getTags(actorCell.self().path(), actorCell.actor());\n        this.counterInterface.incrementCounter(\"akka.actor.error\", tags);\n        this.counterInterface.incrementCounter(String.format(\"akka.actor.error.%s\", failure.getMessage()), tags);\n    }\n\n    \/**\n     * Advises the {@code EventStream.publish(event: Any): Unit}\n     *\n     * @param event the received event\n     *\/\n    before(Object event) : Pointcuts.eventStreamPublish(event) {\n        if (event instanceof UnhandledMessage) {\n            UnhandledMessage unhandledMessage = (UnhandledMessage)event;\n            String[] tags = getTags(unhandledMessage.recipient().path(), null);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered\", tags);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered.\" + unhandledMessage.getMessage().getClass().getSimpleName(), tags);\n        }\n    }\n\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorRefFactory} implementations\n     *\n     * @param props the {@code Props} instance used in the call\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after(Props props) returning (ActorRef actor): Pointcuts.anyActorOf(props) {\n        recordActorCreation(props, actor);\n    }\n\n    \/**\n     * method containing the recording logic for advising actor creation\n     * *\/\n    private void recordActorCreation(Props props, ActorRef actor) {\n        if (!includeActorPath(new PathAndClass(actor.path(), this.noActorClazz))) return;\n        final String uncheckedClassName = uncheckedActorNameFrom(props);\n        final Option<String> className = Option.apply(uncheckedClassName);\n\n        this.numberOfActors.putIfAbsent(className, new AtomicInteger(0));\n        \/\/ increment and get the current number of actors of this type (if the value was 0, then this returns 1 -- which is correct)\n        final int currentNumberOfActors = this.numberOfActors.get(className).incrementAndGet();\n\n        \/\/ record the current number of actors of this type\n        this.counterInterface.recordGaugeValue(\"akka.actor.count\", currentNumberOfActors, uncheckedClassName);\n    }\n\n    \/**\n     * Advises the {@code LocalActorRef.stop} method\n     *\n     * @param actorCell the {@code ActorCell} of the actor being stopped\n     *\/\n    after(ActorCell actorCell) : Pointcuts.actorCellInternalStop(actorCell) {\n        if (!includeActorPath(new PathAndClass(actorCell.self().path(), this.noActorClazz))) return;\n        final String uncheckedClassName = uncheckedActorNameFrom(actorCell);\n        final Option<String> className = Option.apply(uncheckedClassName);\n\n        this.numberOfActors.putIfAbsent(className, new AtomicInteger(0));\n        \/\/ decrement and get the current number of actors of this type (if the value was 1, then this returns 0 -- which is correct)\n        final int currentNumberOfActors = this.numberOfActors.get(className).decrementAndGet();\n\n        this.counterInterface.recordGaugeValue(\"akka.actor.count\", currentNumberOfActors, uncheckedClassName);\n    }\n\n}","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"24b889da5c5744229f1e5eaf2f17c1d667eb6e15","subject":"organized imports","message":"organized imports\n","repos":"palava\/palava-security-aspectj","old_file":"src\/main\/java\/de\/cosmocode\/palava\/security\/aspectj\/AbstractSecurityAspect.aj","new_file":"src\/main\/java\/de\/cosmocode\/palava\/security\/aspectj\/AbstractSecurityAspect.aj","new_contents":"package de.cosmocode.palava.security.aspectj;\n\nimport org.apache.shiro.subject.Subject;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Guice;\nimport com.google.inject.Inject;\nimport com.google.inject.Injector;\nimport com.google.inject.Provider;\n\nabstract aspect AbstractSecurityAspect {\n\n    private static final Logger LOG = LoggerFactory.getLogger(AbstractSecurityAspect.class);\n\n    private Provider<Subject> provider;\n\n    @Inject\n    void setProvider(Provider<Subject> provider) {\n        this.provider = Preconditions.checkNotNull(provider, \"Provider\");\n    }\n    \n    protected Subject getCurrentUser() {\n        return provider.get();\n    }\n\n    pointcut createInjector(): call(Injector Guice.createInjector(..));\n    \n    after() returning (Injector injector): createInjector() {\n        LOG.trace(\"Injecting members on {}\", this);\n        if (provider == null) {\n            injector.injectMembers(this);\n        } else {\n            throw new IllegalStateException(\"An injector has already been created\");\n        }\n    }\n    \n}\n","old_contents":"package de.cosmocode.palava.security.aspectj;\n\nimport org.apache.shiro.subject.Subject;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Injector;\nimport com.google.inject.Guice;\nimport com.google.inject.Provider;\n\nabstract aspect AbstractSecurityAspect {\n\n    private static final Logger LOG = LoggerFactory.getLogger(AbstractSecurityAspect.class);\n\n    private Provider<Subject> provider;\n\n    @Inject\n    void setProvider(Provider<Subject> provider) {\n        this.provider = Preconditions.checkNotNull(provider, \"Provider\");\n    }\n    \n    protected Subject getCurrentUser() {\n        return provider.get();\n    }\n\n    pointcut createInjector(): call(Injector Guice.createInjector(..));\n    \n    after() returning (Injector injector): createInjector() {\n        LOG.trace(\"Injecting members on {}\", this);\n        if (provider == null) {\n            injector.injectMembers(this);\n        } else {\n            throw new IllegalStateException(\"An injector has already been created\");\n        }\n    }\n    \n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"401885bb722924524eff397d20c78ad741e82b70","subject":"comment formatting","message":"comment formatting\n","repos":"DataDog\/monitor,DataDog\/monitor,eigengo\/monitor,eigengo\/monitor","old_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/ActorCellMonitoringAspect.aj","new_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/ActorCellMonitoringAspect.aj","new_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.actor.*;\nimport org.eigengo.monitor.agent.AgentConfiguration;\nimport org.eigengo.monitor.output.CounterInterface;\nimport scala.Option;\n\nimport java.util.ArrayList;\nimport java.util.List;\nimport java.util.concurrent.atomic.AtomicInteger;\nimport java.util.concurrent.atomic.AtomicLong;\nimport java.util.concurrent.ConcurrentHashMap;\n\n\/**\n * Contains advices for monitoring behaviour of an actor; typically imprisoned in an {@code ActorCell}.\n *\/\npublic aspect ActorCellMonitoringAspect extends AbstractMonitoringAspect issingleton() {\n    private AkkaAgentConfiguration agentConfiguration;\n    private final CounterInterface counterInterface;\n    private final Option<String> noActorClazz = Option.empty();\n    private final ConcurrentHashMap<Option<String>, AtomicLong> samplingCounters  = new ConcurrentHashMap<Option<String>, AtomicLong>();\n    private final ConcurrentHashMap<Option<String>, AtomicInteger> numberOfActors = new ConcurrentHashMap<Option<String>, AtomicInteger>();\n\n\n    \/**\n     * Constructs this aspect\n     *\/\n    public ActorCellMonitoringAspect() {\n        AgentConfiguration<AkkaAgentConfiguration> configuration = getAgentConfiguration(\"akka\", AkkaAgentConfigurationJapi.apply());\n        this.agentConfiguration = configuration.agent();\n        this.counterInterface = createCounterInterface(configuration.common());\n    }\n\n    \/**\n     * Injects the new {@code AkkaAgentConfiguration} instance.\n     *\n     * @param agentConfiguration the new configuration\n     *\/\n    synchronized final void setAgentConfiguration(AkkaAgentConfiguration agentConfiguration) {\n        this.agentConfiguration = agentConfiguration;\n    }\n\n    \/**\n     * decide whether to include this ActorCell in our measurements\n     * *\/\n    private boolean includeActorPath(final PathAndClass pathAndClass) {\n        if (!this.agentConfiguration.incuded().accept(pathAndClass)) return false;\n        if (this.agentConfiguration.excluded().accept(pathAndClass)) return false;\n\n        if (this.agentConfiguration.includeSystemAgents()) return true;\n\n        String userOrSystem = pathAndClass.actorPath().getElements().iterator().next();\n        return \"user\".equals(userOrSystem);\n    }\n\n    \/**\n     * get the sample rate for an actor\n     * *\/\n    private int getSampleRate(final PathAndClass pathAndClass) {\n        return this.agentConfiguration.sampling().getRate(pathAndClass);\n    }\n\n    \/**\n     * decide whether to sample an actor on a particular occasion\n     *\n     * @param pathAndClass\n     * @return true if we should sample this actor, otherwise false.\n     *\/\n    private final boolean sampleMessage(final PathAndClass pathAndClass) {\n        int sampleRate = getSampleRate(pathAndClass);\n        if (sampleRate == 1) return true;\n\n        this.samplingCounters.putIfAbsent(pathAndClass.actorClassName(), new AtomicLong(0));\n        long timesSeenSoFar = this.samplingCounters.get(pathAndClass.actorClassName()).incrementAndGet();\n        return (timesSeenSoFar % sampleRate == 1); \/\/ == 1 to log first value (incrementAndGet returns updated value)\n    }\n\n    \/**\n     * get the tags for the cell\n     * *\/\n    private String[] getTags(final ActorPath actorPath, final Actor actor) {\n        List<String> tags = new ArrayList<String>();\n\n        \/\/ TODO: Improve detection of routed actors. This relies only on the naming :(.\n        String lastPathElement = actorPath.elements().last();\n        if (lastPathElement.startsWith(\"$\")) {\n            \/\/ this is routed actor.\n            tags.add(actorPath.parent().toString());\n            if (this.agentConfiguration.includeRoutees()) tags.add(actorPath.toString());\n        } else {\n            \/\/ there is no supervisor\n            tags.add(actorPath.toString());\n        }\n        if (actor != null) {\n            tags.add(String.format(\"akka:%s.%s\", actor.context().system().name(), actor.getClass().getCanonicalName()));\n        }\n\n        return tags.toArray(new String[tags.size()]);\n    }\n\n    \/**\n     * returns the canonical name of the actor type associated with an ActorCell\n     * *\/\n    private String uncheckedActorNameFrom(final ActorCell actorCell) {\n        return uncheckedActorNameFrom(actorCell.props());\n    }\n\n    \/**\n     * returns the canonical name of the actor type associated with a Props instance\n     * *\/\n    private String uncheckedActorNameFrom(final Props props) {\n        return props.actorClass().getCanonicalName();\n    }\n\n    \/**\n     * Advises the {@code ActorCell.receiveMessage(message: Object): Unit}\n     * We proceed with the pointcut if the actor is to be included in the monitoring *and* this is\n     * the 'multiple-of-n'th time we've seen a message for an actor with a sample rate of n.\n     *\n     * Currently, we sample queue size, the fact that the message is delivered, the simple name of the class of the\n     * message, and the time taken to complete the actor's reactive action.\n     *\n     * @param actorCell the ActorCell where the actor that receives the message \"lives\"\n     * @param msg the incoming message\n     *\/\n    Object around(ActorCell actorCell, Object msg) : Pointcuts.actorCellReceiveMessage(actorCell, msg) {\n        final ActorPath actorPath = actorCell.self().path();\n        final PathAndClass pathAndClass = new PathAndClass(actorPath, Option.apply(uncheckedActorNameFrom(actorCell)));\n        if (!includeActorPath(pathAndClass) || !sampleMessage(pathAndClass)) return proceed(actorCell, msg);\n\n        int samplingRate = getSampleRate(pathAndClass);\n\n        \/\/ we tag by actor name\n        final String[] tags = getTags(actorPath, actorCell.actor());\n\n        \/\/ record the queue size\n        this.counterInterface.recordGaugeValue(\"akka.queue.size\", actorCell.numberOfMessages(), tags);\n        \/\/ record the message, general and specific\n        this.counterInterface.incrementCounter(\"akka.actor.delivered\", samplingRate, tags);\n        this.counterInterface.incrementCounter(\"akka.actor.delivered.\" + msg.getClass().getSimpleName(), samplingRate, tags);\n\n        \/\/ measure the time. we're using the ``nanoTime`` call to access the high-precision timer.\n        \/\/ since we're not really interested in wall time, but just some increasing measure of\n        \/\/ elapsed time\n        Object result = null;\n        final long start = System.nanoTime();\n        \/\/ result will always be ``null``, because target returns ``Unit``\n        result = proceed(actorCell, msg);\n        \/\/ ns or \u00b5s is too fine. ms will do for now.\n        final long duration = (System.nanoTime() - start) \/ 1000000;\n\n        \/\/ record the actor duration\n        this.counterInterface.recordExecutionTime(\"akka.actor.duration\", (int)duration, tags);\n\n        \/\/ return null would do the trick, but we want to be _proper_.\n        return result;\n    }\n\n    \/**\n     * Advises the {@code ActorCell.handleInvokeFailure(_, failure: Throwable): Unit}\n     *\n     * @param actorCell the ActorCell where the error spreads from\n     * @param failure the exception that escaped from the {@code receive} method\n     *\/\n    before(ActorCell actorCell, Throwable failure) : Pointcuts.actorCellHandleInvokeFailure(actorCell, failure) {\n        \/\/ record the error, general and specific\n        String[] tags = getTags(actorCell.self().path(), actorCell.actor());\n        this.counterInterface.incrementCounter(\"akka.actor.error\", tags);\n        this.counterInterface.incrementCounter(String.format(\"akka.actor.error.%s\", failure.getMessage()), tags);\n    }\n\n    \/**\n     * Advises the {@code EventStream.publish(event: Any): Unit}\n     *\n     * @param event the received event\n     *\/\n    before(Object event) : Pointcuts.eventStreamPublish(event) {\n        if (event instanceof UnhandledMessage) {\n            UnhandledMessage unhandledMessage = (UnhandledMessage)event;\n            String[] tags = getTags(unhandledMessage.recipient().path(), null);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered\", tags);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered.\" + unhandledMessage.getMessage().getClass().getSimpleName(), tags);\n        }\n    }\n\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorCell} and {@code ActorSystem}\n     *\n     * @param props the {@code Props} instance used in the call\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after(Props props) returning (ActorRef actor): Pointcuts.anyActorOf(props) {\n        recordActorCreation(props, actor);\n    }\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorCell} and {@code ActorSystem} when actor is named in construction\n     *\n     * @param props the {@code Props} instance used in the call\n     * @param actorName the {@code String} used to name the actor at creation site\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after(Props props, String actorName) returning (ActorRef actor): Pointcuts.namedActorOf(props, actorName) {\n        recordActorCreation(props, actor);\n    }\n\n    \/**\n     * method containing the recording logic for advising actor creation\n     * *\/\n    private void recordActorCreation(Props props, ActorRef actor) {\n        if (!includeActorPath(new PathAndClass(actor.path(), this.noActorClazz))) return;\n        final String uncheckedClassName = uncheckedActorNameFrom(props);\n        final Option<String> className = Option.apply(uncheckedClassName);\n\n        this.numberOfActors.putIfAbsent(className, new AtomicInteger(0));\n        \/\/ increment and get the current number of actors of this type (if the value was 0, then this returns 1 -- which is correct)\n        final int currentNumberOfActors = this.numberOfActors.get(className).incrementAndGet();\n\n        \/\/ record the current number of actors of this type\n        this.counterInterface.recordGaugeValue(\"akka.actor.count\", currentNumberOfActors, uncheckedClassName);\n    }\n\n    \/**\n     * Advises the {@code LocalActorRef.stop} method\n     *\n     * @param actorCell the {@code ActorCell} of the actor being stopped\n     *\/\n    after(ActorCell actorCell) : Pointcuts.actorCellInternalStop(actorCell) {\n        if (!includeActorPath(new PathAndClass(actorCell.self().path(), this.noActorClazz))) return;\n        final String uncheckedClassName = uncheckedActorNameFrom(actorCell);\n        final Option<String> className = Option.apply(uncheckedClassName);\n\n        this.numberOfActors.putIfAbsent(className, new AtomicInteger(0));\n        \/\/ decrement and get the current number of actors of this type (if the value was 1, then this returns 0 -- which is correct)\n        final int currentNumberOfActors = this.numberOfActors.get(className).decrementAndGet();\n\n        this.counterInterface.recordGaugeValue(\"akka.actor.count\", currentNumberOfActors, uncheckedClassName);\n    }\n\n}","old_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.actor.*;\nimport org.eigengo.monitor.agent.AgentConfiguration;\nimport org.eigengo.monitor.output.CounterInterface;\nimport scala.Option;\n\nimport java.util.ArrayList;\nimport java.util.List;\nimport java.util.concurrent.atomic.AtomicInteger;\nimport java.util.concurrent.atomic.AtomicLong;\nimport java.util.concurrent.ConcurrentHashMap;\n\n\/**\n * Contains advices for monitoring behaviour of an actor; typically imprisoned in an {@code ActorCell}.\n *\/\npublic aspect ActorCellMonitoringAspect extends AbstractMonitoringAspect issingleton() {\n    private AkkaAgentConfiguration agentConfiguration;\n    private final CounterInterface counterInterface;\n    private final Option<String> noActorClazz = Option.empty();\n    private final ConcurrentHashMap<Option<String>, AtomicLong> samplingCounters  = new ConcurrentHashMap<Option<String>, AtomicLong>();\n    private final ConcurrentHashMap<Option<String>, AtomicInteger> numberOfActors = new ConcurrentHashMap<Option<String>, AtomicInteger>();\n\n\n    \/**\n     * Constructs this aspect\n     *\/\n    public ActorCellMonitoringAspect() {\n        AgentConfiguration<AkkaAgentConfiguration> configuration = getAgentConfiguration(\"akka\", AkkaAgentConfigurationJapi.apply());\n        this.agentConfiguration = configuration.agent();\n        this.counterInterface = createCounterInterface(configuration.common());\n    }\n\n    \/**\n     * Injects the new {@code AkkaAgentConfiguration} instance.\n     *\n     * @param agentConfiguration the new configuration\n     *\/\n    synchronized final void setAgentConfiguration(AkkaAgentConfiguration agentConfiguration) {\n        this.agentConfiguration = agentConfiguration;\n    }\n\n    \/\/ decide whether to include this ActorCell in our measurements\n    private boolean includeActorPath(final PathAndClass pathAndClass) {\n        if (!this.agentConfiguration.incuded().accept(pathAndClass)) return false;\n        if (this.agentConfiguration.excluded().accept(pathAndClass)) return false;\n\n        if (this.agentConfiguration.includeSystemAgents()) return true;\n\n        String userOrSystem = pathAndClass.actorPath().getElements().iterator().next();\n        return \"user\".equals(userOrSystem);\n    }\n\n    \/\/ get the sample rate for an actor\n    private int getSampleRate(final PathAndClass pathAndClass) {\n        return this.agentConfiguration.sampling().getRate(pathAndClass);\n    }\n\n    \/\/ decide whether to sample an actor on a particular occasion\n    private final boolean sampleMessage(final PathAndClass pathAndClass) {\n        int sampleRate = getSampleRate(pathAndClass);\n        if (sampleRate == 1) return true;\n\n        this.samplingCounters.putIfAbsent(pathAndClass.actorClassName(), new AtomicLong(0));\n        long timesSeenSoFar = this.samplingCounters.get(pathAndClass.actorClassName()).incrementAndGet();\n        return (timesSeenSoFar % sampleRate == 1); \/\/ == 1 to log first value (incrementAndGet returns updated value)\n    }\n\n    \/\/ get the tags for the cell\n    private String[] getTags(final ActorPath actorPath, final Actor actor) {\n        List<String> tags = new ArrayList<String>();\n\n        \/\/ TODO: Improve detection of routed actors. This relies only on the naming :(.\n        String lastPathElement = actorPath.elements().last();\n        if (lastPathElement.startsWith(\"$\")) {\n            \/\/ this is routed actor.\n            tags.add(actorPath.parent().toString());\n            if (this.agentConfiguration.includeRoutees()) tags.add(actorPath.toString());\n        } else {\n            \/\/ there is no supervisor\n            tags.add(actorPath.toString());\n        }\n        if (actor != null) {\n            tags.add(String.format(\"akka:%s.%s\", actor.context().system().name(), actor.getClass().getCanonicalName()));\n        }\n\n        return tags.toArray(new String[tags.size()]);\n    }\n\n    \/\/ returns the canonical name of the actor type associated with an ActorCell\n    private String uncheckedActorNameFrom(final ActorCell actorCell) {\n        return uncheckedActorNameFrom(actorCell.props());\n    }\n\n    \/\/ returns the canonical name of the actor type associated with a Props instance\n    private String uncheckedActorNameFrom(final Props props) {\n        return props.actorClass().getCanonicalName();\n    }\n\n    \/**\n     * Advises the {@code ActorCell.receiveMessage(message: Object): Unit}\n     * We proceed with the pointcut if the actor is to be included in the monitoring *and* this is\n     * the 'multiple-of-n'th time we've seen a message for an actor with a sample rate of n.\n     *\n     * Currently, we sample queue size, the fact that the message is delivered, the simple name of the class of the\n     * message, and the time taken to complete the actor's reactive action.\n     *\n     * @param actorCell the ActorCell where the actor that receives the message \"lives\"\n     * @param msg the incoming message\n     *\/\n    Object around(ActorCell actorCell, Object msg) : Pointcuts.actorCellReceiveMessage(actorCell, msg) {\n        final ActorPath actorPath = actorCell.self().path();\n        final PathAndClass pathAndClass = new PathAndClass(actorPath, Option.apply(uncheckedActorNameFrom(actorCell)));\n        if (!includeActorPath(pathAndClass) || !sampleMessage(pathAndClass)) return proceed(actorCell, msg);\n\n        int samplingRate = getSampleRate(pathAndClass);\n\n        \/\/ we tag by actor name\n        final String[] tags = getTags(actorPath, actorCell.actor());\n\n        \/\/ record the queue size\n        this.counterInterface.recordGaugeValue(\"akka.queue.size\", actorCell.numberOfMessages(), tags);\n        \/\/ record the message, general and specific\n        this.counterInterface.incrementCounter(\"akka.actor.delivered\", samplingRate, tags);\n        this.counterInterface.incrementCounter(\"akka.actor.delivered.\" + msg.getClass().getSimpleName(), samplingRate, tags);\n\n        \/\/ measure the time. we're using the ``nanoTime`` call to access the high-precision timer.\n        \/\/ since we're not really interested in wall time, but just some increasing measure of\n        \/\/ elapsed time\n        Object result = null;\n        final long start = System.nanoTime();\n        \/\/ result will always be ``null``, because target returns ``Unit``\n        result = proceed(actorCell, msg);\n        \/\/ ns or \u00b5s is too fine. ms will do for now.\n        final long duration = (System.nanoTime() - start) \/ 1000000;\n\n        \/\/ record the actor duration\n        this.counterInterface.recordExecutionTime(\"akka.actor.duration\", (int)duration, tags);\n\n        \/\/ return null would do the trick, but we want to be _proper_.\n        return result;\n    }\n\n    \/**\n     * Advises the {@code ActorCell.handleInvokeFailure(_, failure: Throwable): Unit}\n     *\n     * @param actorCell the ActorCell where the error spreads from\n     * @param failure the exception that escaped from the {@code receive} method\n     *\/\n    before(ActorCell actorCell, Throwable failure) : Pointcuts.actorCellHandleInvokeFailure(actorCell, failure) {\n        \/\/ record the error, general and specific\n        String[] tags = getTags(actorCell.self().path(), actorCell.actor());\n        this.counterInterface.incrementCounter(\"akka.actor.error\", tags);\n        this.counterInterface.incrementCounter(String.format(\"akka.actor.error.%s\", failure.getMessage()), tags);\n    }\n\n    \/**\n     * Advises the {@code EventStream.publish(event: Any): Unit}\n     *\n     * @param event the received event\n     *\/\n    before(Object event) : Pointcuts.eventStreamPublish(event) {\n        if (event instanceof UnhandledMessage) {\n            UnhandledMessage unhandledMessage = (UnhandledMessage)event;\n            String[] tags = getTags(unhandledMessage.recipient().path(), null);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered\", tags);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered.\" + unhandledMessage.getMessage().getClass().getSimpleName(), tags);\n        }\n    }\n\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorCell} and {@code ActorSystem}\n     *\n     * @param props the {@code Props} instance used in the call\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after(Props props) returning (ActorRef actor): Pointcuts.anyActorOf(props) {\n        recordActorCreation(props, actor);\n    }\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorCell} and {@code ActorSystem} when actor is named in construction\n     *\n     * @param props the {@code Props} instance used in the call\n     * @param actorName the {@code String} used to name the actor at creation site\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after(Props props, String actorName) returning (ActorRef actor): Pointcuts.namedActorOf(props, actorName) {\n        recordActorCreation(props, actor);\n    }\n\n    \/\/ method containing the recording logic for advising actor creation\n    private void recordActorCreation(Props props, ActorRef actor) {\n        if (!includeActorPath(new PathAndClass(actor.path(), this.noActorClazz))) return;\n        final String uncheckedClassName = uncheckedActorNameFrom(props);\n        final Option<String> className = Option.apply(uncheckedClassName);\n\n        this.numberOfActors.putIfAbsent(className, new AtomicInteger(0));\n        \/\/ increment and get the current number of actors of this type (if the value was 0, then this returns 1 -- which is correct)\n        final int currentNumberOfActors = this.numberOfActors.get(className).incrementAndGet();\n\n        \/\/ record the current number of actors of this type\n        this.counterInterface.recordGaugeValue(\"akka.actor.count\", currentNumberOfActors, uncheckedClassName);\n    }\n\n    \/**\n     * Advises the {@code LocalActorRef.stop} method\n     *\n     *\n     * @param actorCell the {@code ActorCell} of the actor being stopped\n     *\/\n    after(ActorCell actorCell) : Pointcuts.actorCellInternalStop(actorCell) {\n        if (!includeActorPath(new PathAndClass(actorCell.self().path(), this.noActorClazz))) return;\n        final String uncheckedClassName = uncheckedActorNameFrom(actorCell);\n        final Option<String> className = Option.apply(uncheckedClassName);\n\n        this.numberOfActors.putIfAbsent(className, new AtomicInteger(0));\n        \/\/ decrement and get the current number of actors of this type (if the value was 1, then this returns 0 -- which is correct)\n        final int currentNumberOfActors = this.numberOfActors.get(className).decrementAndGet();\n\n        this.counterInterface.recordGaugeValue(\"akka.actor.count\", currentNumberOfActors, uncheckedClassName);\n    }\n\n}","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"7c5d09659915d63f573b8f22e502fd380985f3d2","subject":"perform precheck about injection","message":"perform precheck about injection\n","repos":"palava\/palava-jta","old_file":"src\/main\/java\/de\/cosmocode\/palava\/jta\/AbstractUserTransactionAspect.aj","new_file":"src\/main\/java\/de\/cosmocode\/palava\/jta\/AbstractUserTransactionAspect.aj","new_contents":"\/**\n * Copyright 2010 CosmoCode GmbH\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage de.cosmocode.palava.jta;\n\nimport javax.transaction.NotSupportedException;\nimport javax.transaction.Status;\nimport javax.transaction.SystemException;\nimport javax.transaction.UserTransaction;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\n\npublic abstract aspect AbstractUserTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(AbstractUserTransactionAspect.class);\n\n    private Provider<UserTransaction> provider;\n    \n    @Inject\n    void setProvider(Provider<UserTransaction> provider) {\n        this.provider = Preconditions.checkNotNull(provider, \"Provider\");\n    }\n    \n    protected abstract pointcut transactional();\n    \n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        Preconditions.checkNotNull(provider, \"Provider not injected yet\");\n        final UserTransaction tx = provider.get();\n        LOG.trace(\"Using transaction {}\", tx);\n\n        try {\n            LOG.trace(\"Status of transaction: {}\", tx.getStatus());\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n        \n        final boolean local;\n        \n        try {\n            local = tx.getStatus() == Status.STATUS_NO_TRANSACTION;\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        if (local) {\n            LOG.debug(\"Beginning automatic transaction {}\", tx);\n            try {\n                tx.begin();\n            } catch (NotSupportedException e) {\n                throw new IllegalStateException(e);\n            } catch (SystemException e) {\n                throw new IllegalStateException(e);\n            }\n        } else {\n            LOG.trace(\"Transaction {} already active\", tx);\n        }\n\n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (Exception e) {\n            try {\n                if (local && \n                    (tx.getStatus() == Status.STATUS_ACTIVE || tx.getStatus() == Status.STATUS_MARKED_ROLLBACK)) {\n                    LOG.info(\"Rolling back local\/active transaction {}\", tx);\n                    tx.rollback();\n                } else if (tx.getStatus() != Status.STATUS_ROLLEDBACK || tx.getStatus() != Status.STATUS_ROLLING_BACK) {\n                    LOG.debug(\"Setting transaction {} as rollback only\", tx);\n                    tx.setRollbackOnly();\n                }\n            } catch (Exception inner) {\n                LOG.error(\"Rollback failed\", inner);\n            }\n            throw new IllegalStateException(e);\n        }\n        \n        final int status;\n        \n        try {\n            status = tx.getStatus();\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n        \n        if (local) {\n            if (status == Status.STATUS_MARKED_ROLLBACK) {\n                try {\n                    LOG.debug(\"Rolling back marked transaction {}\", tx);\n                    tx.rollback();\n                } catch (SystemException e) {\n                    throw new IllegalStateException(e);\n                }\n            } else {\n                try {\n                    tx.commit();\n                    LOG.debug(\"Committed automatic transaction {}\", tx);\n                } catch (Exception e) {\n                    try {\n                        LOG.info(\"Rolling back transaction {}\", tx);\n                        tx.rollback();\n                    } catch (Exception inner) {\n                        LOG.error(\"Rollback failed\", inner);\n                    }\n                    throw new IllegalStateException(e);\n                }\n            }\n        }\n        \n        return returnValue;\n    }\n    \n}\n","old_contents":"\/**\n * Copyright 2010 CosmoCode GmbH\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage de.cosmocode.palava.jta;\n\nimport javax.transaction.NotSupportedException;\nimport javax.transaction.Status;\nimport javax.transaction.SystemException;\nimport javax.transaction.UserTransaction;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\n\npublic abstract aspect AbstractUserTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(AbstractUserTransactionAspect.class);\n\n    private Provider<UserTransaction> provider;\n    \n    @Inject\n    void setProvider(Provider<UserTransaction> provider) {\n        this.provider = Preconditions.checkNotNull(provider, \"Provider\");\n    }\n    \n    protected abstract pointcut transactional();\n    \n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        final UserTransaction tx = provider.get();\n        LOG.trace(\"Using transaction {}\", tx);\n\n        try {\n            LOG.trace(\"Status of transaction: {}\", tx.getStatus());\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n        \n        final boolean local;\n        \n        try {\n            local = tx.getStatus() == Status.STATUS_NO_TRANSACTION;\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        if (local) {\n            LOG.debug(\"Beginning automatic transaction {}\", tx);\n            try {\n                tx.begin();\n            } catch (NotSupportedException e) {\n                throw new IllegalStateException(e);\n            } catch (SystemException e) {\n                throw new IllegalStateException(e);\n            }\n        } else {\n            LOG.trace(\"Transaction {} already active\", tx);\n        }\n\n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (Exception e) {\n            try {\n                if (local && \n                    (tx.getStatus() == Status.STATUS_ACTIVE || tx.getStatus() == Status.STATUS_MARKED_ROLLBACK)) {\n                    LOG.info(\"Rolling back local\/active transaction {}\", tx);\n                    tx.rollback();\n                } else if (tx.getStatus() != Status.STATUS_ROLLEDBACK || tx.getStatus() != Status.STATUS_ROLLING_BACK) {\n                    LOG.debug(\"Setting transaction {} as rollback only\", tx);\n                    tx.setRollbackOnly();\n                }\n            } catch (Exception inner) {\n                LOG.error(\"Rollback failed\", inner);\n            }\n            throw new IllegalStateException(e);\n        }\n        \n        final int status;\n        \n        try {\n            status = tx.getStatus();\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n        \n        if (local) {\n            if (status == Status.STATUS_MARKED_ROLLBACK) {\n                try {\n                    LOG.debug(\"Rolling back marked transaction {}\", tx);\n                    tx.rollback();\n                } catch (SystemException e) {\n                    throw new IllegalStateException(e);\n                }\n            } else {\n                try {\n                    tx.commit();\n                    LOG.debug(\"Committed automatic transaction {}\", tx);\n                } catch (Exception e) {\n                    try {\n                        LOG.info(\"Rolling back transaction {}\", tx);\n                        tx.rollback();\n                    } catch (Exception inner) {\n                        LOG.error(\"Rollback failed\", inner);\n                    }\n                    throw new IllegalStateException(e);\n                }\n            }\n        }\n        \n        return returnValue;\n    }\n    \n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"3407e7aa45ff207a270db9275919fa216b4b9b09","subject":"do not log error, someone else is responsible for this","message":"do not log error, someone else is responsible for this\n\n","repos":"palava\/palava-jpa-aspectj","old_file":"src\/main\/java\/de\/cosmocode\/palava\/jpa\/aspectj\/EntityTransactionAspect.aj","new_file":"src\/main\/java\/de\/cosmocode\/palava\/jpa\/aspectj\/EntityTransactionAspect.aj","new_contents":"\/**\n * Copyright 2010 CosmoCode GmbH\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage de.cosmocode.palava.jpa.aspectj;\n\nimport javax.persistence.EntityManager;\nimport javax.persistence.EntityTransaction;\nimport javax.persistence.PersistenceException;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\nimport de.cosmocode.palava.jpa.Transactional;\n\npublic final aspect EntityTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(EntityTransactionAspect.class);\n\n    private Provider<EntityManager> currentManager;\n    \n    @Inject\n    public void setProvider(Provider<EntityManager> manager) {\n        this.currentManager = Preconditions.checkNotNull(manager, \"Manager\");\n    }\n    \n    pointcut transactional(): execution(@Transactional * *.*(..));\n\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        final EntityManager manager = currentManager.get();\n        LOG.trace(\"Retrieved entitymanager {}\", manager);\n        final EntityTransaction tx = manager.getTransaction();\n        LOG.trace(\"Using transaction {}\", tx);\n        final boolean localTx = !tx.isActive();\n        \n        if (localTx) {\n            LOG.trace(\"Beginning automatic transaction\");\n            tx.begin();\n        } else {\n            LOG.trace(\"Transaction already active\");\n        }\n        \n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (RuntimeException e) {\n            LOG.debug(\"Exception inside automatic transaction context; rolling back\", e);\n            tx.rollback();\n            throw e;\n        }\n        \n        if (localTx && tx.isActive()) {\n            if (tx.getRollbackOnly()) {\n                LOG.debug(\"Transaction was marked as rollback only. Rolling back...\");\n                tx.rollback();\n            } else {\n                try {\n                    tx.commit();\n                    LOG.trace(\"Committed automatic transaction\");\n                } catch (PersistenceException e) {\n                    LOG.debug(\"Commit in automatic transaction context failed\", e);\n                    if (tx.isActive()) {\n                        LOG.debug(\"Rolling back {}\", tx);\n                        tx.rollback();\n                    } else {\n                        LOG.debug(\"Can't roll back inactive transaction {}\", tx);\n                    }\n                    throw e;\n                }\n            }\n        }\n        \n        return returnValue;\n    }\n    \n}\n","old_contents":"\/**\n * Copyright 2010 CosmoCode GmbH\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage de.cosmocode.palava.jpa.aspectj;\n\nimport javax.persistence.EntityManager;\nimport javax.persistence.EntityTransaction;\nimport javax.persistence.PersistenceException;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\nimport de.cosmocode.palava.jpa.Transactional;\n\npublic final aspect EntityTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(EntityTransactionAspect.class);\n\n    private Provider<EntityManager> currentManager;\n    \n    @Inject\n    public void setProvider(Provider<EntityManager> manager) {\n        this.currentManager = Preconditions.checkNotNull(manager, \"Manager\");\n    }\n    \n    pointcut transactional(): execution(@Transactional * *.*(..));\n\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        final EntityManager manager = currentManager.get();\n        LOG.trace(\"Retrieved entitymanager {}\", manager);\n        final EntityTransaction tx = manager.getTransaction();\n        LOG.trace(\"Using transaction {}\", tx);\n        final boolean localTx = !tx.isActive();\n        \n        if (localTx) {\n            LOG.trace(\"Beginning automatic transaction\");\n            tx.begin();\n        } else {\n            LOG.trace(\"Transaction already active\");\n        }\n        \n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (RuntimeException e) {\n            LOG.debug(\"Exception inside automatic transaction context; rolling back\", e);\n            tx.rollback();\n            throw e;\n        }\n        \n        if (localTx && tx.isActive()) {\n            if (tx.getRollbackOnly()) {\n                LOG.debug(\"Transaction was marked as rollback only. Rolling back...\");\n                tx.rollback();\n            } else {\n                try {\n                    tx.commit();\n                    LOG.trace(\"Committed automatic transaction\");\n                } catch (PersistenceException e) {\n                    LOG.error(\"Commit in automatic transaction context failed\", e);\n                    if (tx.isActive()) {\n                        LOG.debug(\"Rolling back {}\", tx);\n                        tx.rollback();\n                    } else {\n                        LOG.debug(\"Can't roll back inactive transaction {}\", tx);\n                    }\n                    throw e;\n                }\n            }\n        }\n        \n        return returnValue;\n    }\n    \n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"5c2896e18f4b93c6776f5097bdb688f9e3d4c6d1","subject":"Corrected pointcut and factored out recursive call.","message":"Corrected pointcut and factored out recursive call.\n\ngit-svn-id: f4ecfe233223879a4a16cd7937f11b5152963d8e@18953 5e8d7ff9-d8ef-0310-90f0-a4852d11357a\n","repos":"dragos\/scala-ide,wpopielarski\/scala-ide,Kwestor\/scala-ide,romanowski\/scala-ide,stephenh\/scala-ide,scala-ide\/scala-ide,dragos\/scala-ide,sschaef\/scala-ide,dragos\/scala-ide,Duhemm\/scala-ide,aleksi-lukkarinen\/scala-ide,mlangc\/scala-ide,sschaef\/scala-ide,Kwestor\/scala-ide,romanowski\/scala-ide,aleksi-lukkarinen\/scala-ide,wpopielarski\/scala-ide,Kwestor\/scala-ide,aleksi-lukkarinen\/scala-ide,stephenh\/scala-ide,pilipolio\/scala-ide,romanowski\/scala-ide,romanowski\/scala-ide,scala-ide\/scala-ide,pilipolio\/scala-ide,dragos\/scala-ide,Duhemm\/scala-ide,stephenh\/scala-ide,aleksi-lukkarinen\/scala-ide,mlangc\/scala-ide,sschaef\/scala-ide,wpopielarski\/scala-ide,Duhemm\/scala-ide,sschaef\/scala-ide,andrey-ilinykh\/scala-ide,Duhemm\/scala-ide,wpopielarski\/scala-ide,stephenh\/scala-ide,scala-ide\/scala-ide,Kwestor\/scala-ide,mlangc\/scala-ide,andrey-ilinykh\/scala-ide,pilipolio\/scala-ide,andrey-ilinykh\/scala-ide,scala-ide\/scala-ide,mlangc\/scala-ide,andrey-ilinykh\/scala-ide,pilipolio\/scala-ide","old_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/hierarchy\/HierarchyAspect.aj","new_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/hierarchy\/HierarchyAspect.aj","new_contents":"\/*\n * Copyright 2005-2009 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.hierarchy;\n\nimport java.util.ArrayList;\n\nimport org.eclipse.jdt.core.ICompilationUnit;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IMember;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.internal.core.hierarchy.ChangeCollector;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaElement;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect HierarchyAspect {\n  \n  pointcut getAllTypesFromElement(ChangeCollector cc, IJavaElement element, ArrayList allTypes) :\n    execution(void ChangeCollector.getAllTypesFromElement(IJavaElement, ArrayList)) &&\n    args(element, allTypes) &&\n    target(cc);\n  \n  void around(ChangeCollector cc, IJavaElement element, ArrayList allTypes) throws JavaModelException :\n    getAllTypesFromElement(cc, element, allTypes) {\n    getAllTypesFromElement0(cc, element, allTypes);\n  }\n\n  public void getAllTypesFromElement0(ChangeCollector cc, IJavaElement element, ArrayList allTypes) throws JavaModelException {\n    switch (element.getElementType()) {\n      case IJavaElement.COMPILATION_UNIT:\n        IType[] types = ((ICompilationUnit)element).getTypes();\n        for (int i = 0, length = types.length; i < length; i++) {\n          IType type = types[i];\n          allTypes.add(type);\n          getAllTypesFromElement0(cc, type, allTypes);\n        }\n        break;\n      case IJavaElement.TYPE:\n        types = ((IType)element).getTypes();\n        for (int i = 0, length = types.length; i < length; i++) {\n          IType type = types[i];\n          allTypes.add(type);\n          getAllTypesFromElement0(cc, type, allTypes);\n        }\n        break;\n      case IJavaElement.INITIALIZER:\n      case IJavaElement.FIELD:\n      case IJavaElement.METHOD:\n        IJavaElement[] children = ((IMember)element).getChildren();\n        for (int i = 0, length = children.length; i < length; i++) {\n          IJavaElement child = children[i];\n          if (child instanceof IType) {\n            IType type = (IType)child;\n            allTypes.add(type);\n            getAllTypesFromElement0(cc, type, allTypes);\n          } else if(child instanceof IScalaElement) {\n            getAllTypesFromElement0(cc, child, allTypes);\n          }\n        }\n        break;\n    }\n  }\n}\n","old_contents":"\/*\n * Copyright 2005-2009 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.hierarchy;\n\nimport java.util.ArrayList;\n\nimport org.eclipse.jdt.core.ICompilationUnit;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IMember;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.internal.core.JavaElement;\nimport org.eclipse.jdt.internal.core.hierarchy.ChangeCollector;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaElement;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect HierarchyAspect {\n  \n  pointcut getAllTypesFromElement(ChangeCollector cc, JavaElement element, ArrayList allTypes) :\n    execution(void ChangeCollector.getAllTypesFromElement(JavaElement, ArrayList)) &&\n    args(element, allTypes) &&\n    target(cc);\n  \n  void around(ChangeCollector cc, JavaElement element, ArrayList allTypes) throws JavaModelException :\n    getAllTypesFromElement(cc, element, allTypes) {\n    switch (element.getElementType()) {\n      case IJavaElement.COMPILATION_UNIT:\n        IType[] types = ((ICompilationUnit)element).getTypes();\n        for (int i = 0, length = types.length; i < length; i++) {\n          IType type = types[i];\n          allTypes.add(type);\n          cc.getAllTypesFromElement(type, allTypes);\n        }\n        break;\n      case IJavaElement.TYPE:\n        types = ((IType)element).getTypes();\n        for (int i = 0, length = types.length; i < length; i++) {\n          IType type = types[i];\n          allTypes.add(type);\n          cc.getAllTypesFromElement(type, allTypes);\n        }\n        break;\n      case IJavaElement.INITIALIZER:\n      case IJavaElement.FIELD:\n      case IJavaElement.METHOD:\n        IJavaElement[] children = ((IMember)element).getChildren();\n        for (int i = 0, length = children.length; i < length; i++) {\n          IJavaElement child = children[i];\n          if (child instanceof IType) {\n            IType type = (IType)child;\n            allTypes.add(type);\n            cc.getAllTypesFromElement(type, allTypes);\n          } else if(child instanceof IScalaElement) {\n            cc.getAllTypesFromElement(child, allTypes);\n          }\n        }\n        break;\n    }\n  }\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"7456f82f6dfb537a9f784f533339f2d98697bd3f","subject":"full ovirt-sync aspect for MigrateVm and AddDisk as well","message":"full ovirt-sync aspect for MigrateVm and AddDisk as well\n","repos":"OpenUniversity\/ovirt-engine,OpenUniversity\/ovirt-engine,OpenUniversity\/ovirt-engine,OpenUniversity\/ovirt-engine,OpenUniversity\/ovirt-engine","old_file":"backend\/manager\/modules\/bll\/src\/main\/java\/org\/ovirt\/engine\/core\/bll\/Locks.aj","new_file":"backend\/manager\/modules\/bll\/src\/main\/java\/org\/ovirt\/engine\/core\/bll\/Locks.aj","new_contents":"\tpackage org.ovirt.engine.core.bll;\n\n\timport java.util.*;\n\t\n\timport org.ovirt.engine.core.common.action.LockProperties;\n\timport org.ovirt.engine.core.common.action.LockProperties.Scope;\n\timport org.ovirt.engine.core.common.locks.LockingGroup;\n\timport org.ovirt.engine.core.bll.CommandBase;\n\timport org.ovirt.engine.core.utils.lock.EngineLock;\n\timport org.ovirt.engine.core.common.utils.Pair;\n\timport org.ovirt.engine.core.common.action.VdcReturnValueBase;\n\timport org.ovirt.engine.core.common.businessentities.IVdsAsyncCommand;\n\timport org.ovirt.engine.core.common.errors.EngineMessage;\n\n\tpublic privileged aspect Locks {\n\n\t\tvoid around(CommandBase command): execution(* endActionInTransactionScope()) && this(command) {\n\t\t\ttry {\n\t          proceed(command);\n\t        }\n\t        finally {\n\t          command.freeLockEndAction();\n\t        }\n\t    }\n\t\n\t   boolean around(CommandBase command): execution(* internalCanDoAction()) && this(command) {\n\t        boolean result = false;\n\t        try {\n\t          result = proceed(command);\n\t        }\n\t        finally {\n\t          if (!result) {\n\t            command.freeLock();\n\t          }\n\t        }\n\t        return result;\n\t   }\n\n\t   void around(CommandBase command): execution(* freeLock()) && this(command) {\n            if (command.context.getLock() != null) {\n                command.getLockManager().releaseLock(command.context.getLock());\n                command.log.info(\"Lock freed to object '{}'\", command.context.getLock());\n                command.context.withLock(null);\n                \/\/ free other locks here to guarantee they will be freed only once\n                command.freeCustomLocks();\n            }\n        }\n\n\n\t    VdcReturnValueBase around(CommandBase command): execution(* executeAction()) && this(command) {\n\t        try {\n\t          return proceed(command);\n\t        }\n\t        finally {\n\t          command.freeLockExecute();\n\t        }\n\t    }\n\t\n\t    boolean around(CommandBase commandBase): execution(* CommandBase.acquireLock()) && this(commandBase) {\n\t        LockProperties lockProperties = commandBase.getLockProperties();\n\t        boolean returnValue = true;\n\t        if (!Scope.None.equals(lockProperties.getScope())) {\n\t            commandBase.releaseLocksAtEndOfExecute = Scope.Execution.equals(lockProperties.getScope());\n\t            if (!lockProperties.isWait()) {\n\t                returnValue = commandBase.acquireLockInternal();\n\t            } else {\n\t                commandBase.acquireLockAndWait();\n\t            }\n\t        }\n\t        return returnValue;\n\t    }\n\n\t\tboolean around(CommandBase command): execution(* acquireLockInternal()) && this(command) {\n\t        \/\/ if commandLock is null then we acquire new lock, otherwise probably we got lock from caller command.\n\t        if (command.context.getLock() == null) {\n\t            EngineLock lock = command.buildLock();\n\t            if (lock != null) {\n\t                Pair<Boolean, Set<String>> lockAcquireResult = command.getLockManager().acquireLock(lock);\n\t                if (lockAcquireResult.getFirst()) {\n\t                    command.log.info(\"Lock Acquired to object '{}'\", lock);\n\t                    command.context.withLock(lock);\n\t                } else {\n\t                    command.log.info(\"Failed to Acquire Lock to object '{}'\", lock);\n\t                    command.getReturnValue().getCanDoActionMessages()\n\t                    .addAll(command.extractVariableDeclarations(lockAcquireResult.getSecond()));\n\t                    return false;\n\t                }\n\t            }\n\t        }\n\t        return true;\n\t   }\n\n\t   void around(CommandBase command): execution(* acquireLockAndWait()) && this(command) {\n\t        \/\/ if commandLock is null then we acquire new lock, otherwise probably we got lock from caller command.\n\t         if (command.context.getLock() == null) {\n\t            Map<String, Pair<String, String>> exclusiveLocks = command.getExclusiveLocks();\n\t             if (exclusiveLocks != null) {\n\t                 EngineLock lock = new EngineLock(exclusiveLocks, null);\n\t                 command.getLockManager().acquireLockWait(lock);\n\t                 command.context.withLock(lock);\n\t            }\n\t         }\n\t    }\n\n\t\tVdcReturnValueBase around(CommandBase commandBase): execution(* endAction()) && this(commandBase) {\n\t        VdcReturnValueBase result = null;\n\t        try {\n\t            commandBase.initiateLockEndAction();\n\t            result = proceed(commandBase);\n\t        } finally {\n\t            commandBase.freeLockEndAction();\n\t        }\n\t        return result;\n\t    }\n\t\n\t    private void CommandBase.freeLockExecute() {\n\t        if (releaseLocksAtEndOfExecute || !getSucceeded() ||\n\t                (noAsyncOperations() && !(this instanceof IVdsAsyncCommand))) {\n\t            freeLock();\n\t        }\n\t    }\n\n\t\t\/**\n\t     * If the command has more than one task handler, we can reach the end action\n\t     * phase and in that phase execute the next task handler. In that case, we\n\t     * don't want to release the locks, so we ask whether we're not in execute state.\n\t     *\/\n\t    private void CommandBase.freeLockEndAction() {\n\t        if (getActionState() != CommandActionState.EXECUTE) {\n\t            freeLock();\n\t        }\n\t    }\n\n\t\t\/**\n\t     * The following method should initiate a lock , in order to release it at endAction()\n\t     *\/\n\t    private void CommandBase.initiateLockEndAction() {\n\t        if (context.getLock() == null) {\n\t            LockProperties lockProperties = getLockProperties();\n\t            if (Scope.Command.equals(lockProperties.getScope())) {\n\t                context.withLock(buildLock());\n\t            }\n\t\n\t        }\n\t    }\n\t\n\t    private EngineLock CommandBase.buildLock() {\n\t        EngineLock lock = null;\n\t        Map<String, Pair<String, String>> exclusiveLocks = getExclusiveLocks();\n\t        Map<String, Pair<String, String>> sharedLocks = getSharedLocks();\n\t        if (exclusiveLocks != null || sharedLocks != null) {\n\t            lock = new EngineLock(exclusiveLocks, sharedLocks);\n\t        }\n\t        return lock;\n\t    }\n\n\t\t\n\n\t\tLockProperties around(LockProperties lockProperties, org.ovirt.engine.core.bll.ExportVmTemplateCommand command): execution(* applyLockProperties(..)) && args(lockProperties) && target(command) {\n\t\t\treturn lockProperties.withScope(Scope.Execution);\n\t\t}\n\t\t\n\t\tMap<String, Pair<String, String>> around(org.ovirt.engine.core.bll.ExportVmTemplateCommand command): execution(* getExclusiveLocks()) && target(command) {\n\t\t\tMap<String, Pair<String, String>> locks = new HashMap<String, Pair<String, String>>();\n\t\t\n\t\t\tlocks.put(command.getVmTemplateId().toString(),\n\t\t\t\tLockMessagesMatchUtil.makeLockingPair(LockingGroup.REMOTE_TEMPLATE, EngineMessage.ACTION_TYPE_FAILED_OBJECT_LOCKED));\n\t\t\n\t\t\treturn locks;\n\t\t}\n\t\t\n\t\tMap<String, Pair<String, String>> around(org.ovirt.engine.core.bll.ExportVmTemplateCommand command): execution(* getSharedLocks()) && target(command) {\n\t\t\tMap<String, Pair<String, String>> locks = new HashMap<String, Pair<String, String>>();\n\t\t\n\t\t\tlocks.put(command.getVmTemplateId().toString(),\n\t\t\t\tLockMessagesMatchUtil.makeLockingPair(LockingGroup.TEMPLATE, EngineMessage.ACTION_TYPE_FAILED_OBJECT_LOCKED));\n\t\t\n\t\t\treturn locks;\n\t\t}\n\t\t\n\t\tLockProperties around(LockProperties lockProperties, org.ovirt.engine.core.bll.MigrateVmCommand command): execution(* applyLockProperties(..)) && args(lockProperties) && target(command) {\n\t\t\treturn lockProperties.withScope(Scope.Command);\n\t\t}\n\t\t\n\t\tMap<String, Pair<String, String>> around(org.ovirt.engine.core.bll.MigrateVmCommand command): execution(* getExclusiveLocks()) && target(command) {\n\t\t\tMap<String, Pair<String, String>> locks = new HashMap<String, Pair<String, String>>();\n\t\t\n\t\t\tlocks.put(command.getVmId().toString(),\n\t\t\t\tLockMessagesMatchUtil.makeLockingPair(LockingGroup.VM, EngineMessage.ACTION_TYPE_FAILED_OBJECT_LOCKED));\n\t\t\n\t\t\treturn locks;\n\t\t}\n\t\t\n\t\t\n\t\tLockProperties around(LockProperties lockProperties, org.ovirt.engine.core.bll.AddDiskCommand command): execution(* applyLockProperties(..)) && args(lockProperties) && target(command) {\n\t\t\treturn lockProperties.withScope(Scope.Execution);\n\t\t}\n\t\t\n\t\tMap<String, Pair<String, String>> around(org.ovirt.engine.core.bll.AddDiskCommand command): execution(* getExclusiveLocks()) && target(command) {\n\t\t\tMap<String, Pair<String, String>> locks = new HashMap<String, Pair<String, String>>();\n\t\t\n\t\t\tlocks.put(command.getVmId().toString(),\n\t\t\t\tLockMessagesMatchUtil.makeLockingPair(LockingGroup.VM_DISK_BOOT, EngineMessage.ACTION_TYPE_FAILED_OBJECT_LOCKED));\n\t\t\n\t\t\treturn locks;\n\t\t}\n\t\t\n\t\tMap<String, Pair<String, String>> around(org.ovirt.engine.core.bll.AddDiskCommand command): execution(* getSharedLocks()) && target(command) {\n\t\t\tMap<String, Pair<String, String>> locks = new HashMap<String, Pair<String, String>>();\n\t\t\n\t\t\tlocks.put(command.getVmId().toString(),\n\t\t\t\tLockMessagesMatchUtil.makeLockingPair(LockingGroup.VM, EngineMessage.ACTION_TYPE_FAILED_OBJECT_LOCKED));\n\t\t\n\t\t\treturn locks;\n\t\t}\n\t\t\n\t}\n","old_contents":"\tpackage org.ovirt.engine.core.bll;\n\n\timport java.util.*;\n\t\n\timport org.ovirt.engine.core.common.action.LockProperties;\n\timport org.ovirt.engine.core.common.action.LockProperties.Scope;\n\timport org.ovirt.engine.core.common.locks.LockingGroup;\n\timport org.ovirt.engine.core.bll.CommandBase;\n\timport org.ovirt.engine.core.utils.lock.EngineLock;\n\timport org.ovirt.engine.core.common.utils.Pair;\n\timport org.ovirt.engine.core.common.action.VdcReturnValueBase;\n\timport org.ovirt.engine.core.common.businessentities.IVdsAsyncCommand;\n\timport org.ovirt.engine.core.common.errors.EngineMessage;\n\n\tpublic privileged aspect Locks {\n\n\t\tvoid around(CommandBase command): execution(* endActionInTransactionScope()) && this(command) {\n\t\t\ttry {\n\t          proceed(command);\n\t        }\n\t        finally {\n\t          command.freeLockEndAction();\n\t        }\n\t    }\n\t\n\t   boolean around(CommandBase command): execution(* internalCanDoAction()) && this(command) {\n\t        boolean result = false;\n\t        try {\n\t          result = proceed(command);\n\t        }\n\t        finally {\n\t          if (!result) {\n\t            command.freeLock();\n\t          }\n\t        }\n\t        return result;\n\t   }\n\n\t   void around(CommandBase command): execution(* freeLock()) && this(command) {\n            if (command.context.getLock() != null) {\n                command.getLockManager().releaseLock(command.context.getLock());\n                command.log.info(\"Lock freed to object '{}'\", command.context.getLock());\n                command.context.withLock(null);\n                \/\/ free other locks here to guarantee they will be freed only once\n                command.freeCustomLocks();\n            }\n        }\n\n\n\t    VdcReturnValueBase around(CommandBase command): execution(* executeAction()) && this(command) {\n\t        try {\n\t          return proceed(command);\n\t        }\n\t        finally {\n\t          command.freeLockExecute();\n\t        }\n\t    }\n\t\n\t    boolean around(CommandBase commandBase): execution(* CommandBase.acquireLock()) && this(commandBase) {\n\t        LockProperties lockProperties = commandBase.getLockProperties();\n\t        boolean returnValue = true;\n\t        if (!Scope.None.equals(lockProperties.getScope())) {\n\t            commandBase.releaseLocksAtEndOfExecute = Scope.Execution.equals(lockProperties.getScope());\n\t            if (!lockProperties.isWait()) {\n\t                returnValue = commandBase.acquireLockInternal();\n\t            } else {\n\t                commandBase.acquireLockAndWait();\n\t            }\n\t        }\n\t        return returnValue;\n\t    }\n\n\t\tboolean around(CommandBase command): execution(* acquireLockInternal()) && this(command) {\n\t        \/\/ if commandLock is null then we acquire new lock, otherwise probably we got lock from caller command.\n\t        if (command.context.getLock() == null) {\n\t            EngineLock lock = command.buildLock();\n\t            if (lock != null) {\n\t                Pair<Boolean, Set<String>> lockAcquireResult = command.getLockManager().acquireLock(lock);\n\t                if (lockAcquireResult.getFirst()) {\n\t                    command.log.info(\"Lock Acquired to object '{}'\", lock);\n\t                    command.context.withLock(lock);\n\t                } else {\n\t                    command.log.info(\"Failed to Acquire Lock to object '{}'\", lock);\n\t                    command.getReturnValue().getCanDoActionMessages()\n\t                    .addAll(command.extractVariableDeclarations(lockAcquireResult.getSecond()));\n\t                    return false;\n\t                }\n\t            }\n\t        }\n\t        return true;\n\t   }\n\n\t   void around(CommandBase command): execution(* acquireLockAndWait()) && this(command) {\n\t        \/\/ if commandLock is null then we acquire new lock, otherwise probably we got lock from caller command.\n\t         if (command.context.getLock() == null) {\n\t            Map<String, Pair<String, String>> exclusiveLocks = command.getExclusiveLocks();\n\t             if (exclusiveLocks != null) {\n\t                 EngineLock lock = new EngineLock(exclusiveLocks, null);\n\t                 command.getLockManager().acquireLockWait(lock);\n\t                 command.context.withLock(lock);\n\t            }\n\t         }\n\t    }\n\n\t\tVdcReturnValueBase around(CommandBase commandBase): execution(* endAction()) && this(commandBase) {\n\t        VdcReturnValueBase result = null;\n\t        try {\n\t            commandBase.initiateLockEndAction();\n\t            result = proceed(commandBase);\n\t        } finally {\n\t            commandBase.freeLockEndAction();\n\t        }\n\t                return result;\n\t        }\n\t\n\t   private void CommandBase.freeLockExecute() {\n\t        if (releaseLocksAtEndOfExecute || !getSucceeded() ||\n\t                (noAsyncOperations() && !(this instanceof IVdsAsyncCommand))) {\n\t            freeLock();\n\t        }\n\t    }\n\n\t\t\/**\n\t     * If the command has more than one task handler, we can reach the end action\n\t     * phase and in that phase execute the next task handler. In that case, we\n\t     * don't want to release the locks, so we ask whether we're not in execute state.\n\t     *\/\n\t    private void CommandBase.freeLockEndAction() {\n\t        if (getActionState() != CommandActionState.EXECUTE) {\n\t            freeLock();\n\t        }\n\t    }\n\n\t\t\/**\n\t     * The following method should initiate a lock , in order to release it at endAction()\n\t     *\/\n\t    private void CommandBase.initiateLockEndAction() {\n\t        if (context.getLock() == null) {\n\t            LockProperties lockProperties = getLockProperties();\n\t            if (Scope.Command.equals(lockProperties.getScope())) {\n\t                context.withLock(buildLock());\n\t            }\n\t\n\t        }\n\t    }\n\t\n\t    private EngineLock CommandBase.buildLock() {\n\t        EngineLock lock = null;\n\t        Map<String, Pair<String, String>> exclusiveLocks = getExclusiveLocks();\n\t        Map<String, Pair<String, String>> sharedLocks = getSharedLocks();\n\t        if (exclusiveLocks != null || sharedLocks != null) {\n\t            lock = new EngineLock(exclusiveLocks, sharedLocks);\n\t        }\n\t        return lock;\n\t    }\n\n\t\t\n\n\t\t\tLockProperties around(LockProperties lockProperties, org.ovirt.engine.core.bll.ExportVmTemplateCommand command): execution(* applyLockProperties(..)) && args(lockProperties) && target(command) {\n\t\t\t\treturn lockProperties.withScope(Scope.Execution);\n\t\t\t}\n\t\t\n\t\t\tMap<String, Pair<String, String>> around(org.ovirt.engine.core.bll.ExportVmTemplateCommand command): execution(* getExclusiveLocks()) && target(command) {\n\t\t\t        Map<String, Pair<String, String>> locks = new HashMap<String, Pair<String, String>>();\n\t\t\n\t\tlocks.put(command.getVmTemplateId().toString(),\n\t\t\tLockMessagesMatchUtil.makeLockingPair(LockingGroup.REMOTE_TEMPLATE, EngineMessage.ACTION_TYPE_FAILED_OBJECT_LOCKED));\n\t\t\n\t\t\t\treturn locks;\n\t\t\t    }\n\t\t\n\t\tMap<String, Pair<String, String>> around(org.ovirt.engine.core.bll.ExportVmTemplateCommand command): execution(* getSharedLocks()) && target(command) {\n\t\t    Map<String, Pair<String, String>> locks = new HashMap<String, Pair<String, String>>();\n\t\t\n\t\tlocks.put(command.getVmTemplateId().toString(),\n\t\t\tLockMessagesMatchUtil.makeLockingPair(LockingGroup.TEMPLATE, EngineMessage.ACTION_TYPE_FAILED_OBJECT_LOCKED));\n\t\t\n\t\t    return locks;\n\t\t}\n\t\t\n\t}\n\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"071d65926af92e8004546cf5bef485e71d20424b","subject":"Move api.context.getUtil() into compatibility aspect. -- try not using obviously broken aspectj","message":"Move api.context.getUtil() into compatibility aspect. -- try not using obviously broken aspectj\n","repos":"xwiki\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,xwiki\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform,pbondoer\/xwiki-platform","old_file":"xwiki-platform-core\/xwiki-platform-legacy\/xwiki-platform-legacy-oldcore\/src\/main\/aspect\/compatibility\/com\/xpn\/xwiki\/api\/ContextCompatibilityAspect.aj","new_file":"xwiki-platform-core\/xwiki-platform-legacy\/xwiki-platform-legacy-oldcore\/src\/main\/aspect\/compatibility\/com\/xpn\/xwiki\/api\/ContextCompatibilityAspect.aj","new_contents":"\/*\n * See the NOTICE file distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This is free software; you can redistribute it and\/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF site: http:\/\/www.fsf.org.\n *\/\npackage compatibility.com.xpn.xwiki.api;\n\nimport com.xpn.xwiki.api.Context;\nimport com.xpn.xwiki.util.Util;\n\n\/**\n * Add a backward compatibility layer to the {@link Context} class.\n * \n * @version $Id$\n *\/\npublic privileged aspect ContextCompatibilityAspect\n{\n    \/**\n     * @return true it's main wiki's context, false otherwise.\n     * @deprecated replaced by {@link Context#isMainWiki()} since 1.4M1.\n     *\/\n    @Deprecated\n    public boolean Context.isVirtual()\n    {\n        return !this.isMainWiki();\n    }\n\n    \/**\n     * Returns an instance of the {@link com.xpn.xwiki.util.Util} class.\n     * \n     * @return an instance of the {@link com.xpn.xwiki.util.Util} class\n     * @see Util\n     * @deprecated since 2.6M1 the functions provided by Util are internal, please do not use them.\n     *\/\n    @Deprecated\n    public Util Context.getUtil()\n    {\n        return this.context.getUtil();\n    }\n}\n","old_contents":"\/*\n * See the NOTICE file distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This is free software; you can redistribute it and\/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF site: http:\/\/www.fsf.org.\n *\/\npackage compatibility.com.xpn.xwiki.api;\n\nimport com.xpn.xwiki.api.Context;\n\n\/**\n * Add a backward compatibility layer to the {@link Context} class.\n * \n * @version $Id$\n *\/\npublic privileged aspect ContextCompatibilityAspect\n{\n    \/**\n     * @return true it's main wiki's context, false otherwise.\n     * @deprecated replaced by {@link Context#isMainWiki()} since 1.4M1.\n     *\/\n    @Deprecated\n    public boolean Context.isVirtual()\n    {\n        return !this.isMainWiki();\n    }\n\n    \/**\n     * Returns an instance of the {@link com.xpn.xwiki.util.Util} class.\n     * \n     * @return an instance of the {@link com.xpn.xwiki.util.Util} class\n     * @see Util\n     * @deprecated since 2.6M1 the functions provided by Util are internal, please do not use them.\n     *\/\n    @Deprecated\n    public Util getUtil()\n    {\n        return this.context.getUtil();\n    }\n}\n","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"4c508adeff4d2ec354aed704037bdcfc3498bd2f","subject":"begin to implement StatPlayerWiseGraph","message":"begin to implement StatPlayerWiseGraph\n","repos":"stieglma\/Schafkopfauswerter","old_file":"src\/StatPlayerWiseGraph.aj","new_file":"src\/StatPlayerWiseGraph.aj","new_contents":"","old_contents":"","returncode":0,"stderr":"unknown","license":"mit","lang":"AspectJ"}
{"commit":"c1ce30826f03f2ab16ebaaf15ee5b2cfd9174cf1","subject":"- Remove pointcut to deleted interface - Reflect new .fp package in pointcut","message":"- Remove pointcut to deleted interface\n- Reflect new .fp package in pointcut","repos":"tlaplus\/tlaplus,lemmy\/tlaplus,tlaplus\/tlaplus,lemmy\/tlaplus,tlaplus\/tlaplus,lemmy\/tlaplus,lemmy\/tlaplus,tlaplus\/tlaplus","old_file":"tlatools\/src-aj\/tlc2\/tool\/distributed\/RMIMethodMonitorAspect.aj","new_file":"tlatools\/src-aj\/tlc2\/tool\/distributed\/RMIMethodMonitorAspect.aj","new_contents":"package tlc2.tool.distributed;\n\npublic aspect RMIMethodMonitorAspect {\n\t\n\t\/\/ catch all method calls to RMI methods\n\tpointcut callToRemoteMethod() : \n\t\t   execution(* tlc2.tool.distributed.InternRMI.*(..))\n\t\t|| execution(* tlc2.tool.distributed.TLCServerRMI.*(..))\n\t\t|| execution(* tlc2.tool.distributed.TLCWorkerRMI.*(..))\n\t\t|| execution(* tlc2.tool.distributed.fp.FPSetRMI.*(..))\n\t\n\tbefore(): (callToRemoteMethod()) {\n\t\tRMIMethodMonitor.entering(thisJoinPoint);\n\t}\n}\n","old_contents":"package tlc2.tool.distributed;\n\npublic aspect RMIMethodMonitorAspect {\n\t\n\t\/\/ catch all method calls to RMI methods\n\tpointcut callToRemoteMethod() : \n\t\t   execution(* tlc2.tool.distributed.InternRMI.*(..))\n\t\t|| execution(* tlc2.tool.distributed.TLCServerRMI.*(..))\n\t\t|| execution(* tlc2.tool.distributed.TLCWorkerRMI.*(..))\n\t\t|| execution(* tlc2.tool.distributed.FPSetRMI.*(..))\n\t\t|| execution(* tlc2.tool.distributed.FPIntSetRMI.*(..));\n\t\n\tbefore(): (callToRemoteMethod()) {\n\t\tRMIMethodMonitor.entering(thisJoinPoint);\n\t}\n}\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"09eea188dc71a5c66b844132b39cddcc3ab3f675","subject":"Added is* getters to excluded checker methods","message":"Added is* getters to excluded checker methods","repos":"madama\/crepuscolo","old_file":"crepuscolo-core\/src\/main\/java\/net\/etalia\/crepuscolo\/check\/CheckAspect.aj","new_file":"crepuscolo-core\/src\/main\/java\/net\/etalia\/crepuscolo\/check\/CheckAspect.aj","new_contents":"package net.etalia.crepuscolo.check;\n\nimport java.lang.reflect.Method;\nimport java.util.Stack;\n\nimport javax.persistence.Entity;\nimport javax.persistence.MappedSuperclass;\n\nimport net.etalia.crepuscolo.domain.Authenticable;\nimport net.etalia.crepuscolo.services.AuthService;\nimport net.etalia.crepuscolo.services.AuthService.Verification;\n\nimport org.aspectj.lang.JoinPoint;\nimport org.aspectj.lang.reflect.MethodSignature;\nimport org.springframework.beans.factory.annotation.Autowired;\nimport org.springframework.beans.factory.annotation.Configurable;\nimport org.springframework.stereotype.Controller;\nimport org.springframework.transaction.annotation.Propagation;\nimport org.springframework.transaction.annotation.Transactional;\n\n\n@Configurable\npublic aspect CheckAspect {\n\n\tpointcut checkMethod() : \n\t\t(\n\t\texecution(@(@CheckerAnnotation *) * *.*(..))\n\t\t||\n\t\texecution(* *.*(@(@CheckerAnnotation *) (*),..))\n\t\t||\n\t\texecution(* *.*(*, @(@CheckerAnnotation *) (*),..))\n\t\t||\n\t\texecution(* *.*(*, *, @(@CheckerAnnotation *) (*),..))\n\t\t||\n\t\texecution(* *.*(*, *, *, @(@CheckerAnnotation *) (*),..))\n\t\t||\n\t\texecution(@CheckerAnnotation * *.*(..))\n\t\t)\n\t\t&& !execution(* (@(Entity || MappedSuperclass) *).get*())\n\t\t&& !execution(* (@(Entity || MappedSuperclass) *).is*());\n\n\t@Autowired(required=true)\n\tprivate AuthService authService;\n\t\n\tprivate CheckerFactory checkerFactory;\n\t\n\tpublic void setAuthService(AuthService authService) {\n\t\tthis.authService = authService;\n\t}\n\t\n\tpublic void setCheckerFactory(CheckerFactory cf) {\n\t\tthis.checkerFactory = cf;\n\t}\n\n\tprivate ThreadLocal<Boolean> probing = new ThreadLocal<Boolean>();\n\tprivate ThreadLocal<Boolean> skip = new ThreadLocal<Boolean>();\n\tprivate ThreadLocal<Boolean> nullAuth = new ThreadLocal<Boolean>();\n\tprivate ThreadLocal<Stack<String>> mode = new ThreadLocal<Stack<String>>();\n\n\tpublic class JoinPointCheckPoint implements CheckPoint {\n\t\n\t\tprivate JoinPoint jp;\n\t\t\n\t\tpublic JoinPointCheckPoint(JoinPoint jp) {\n\t\t\tthis.jp = jp;\n\t\t}\n\t\n\t\t@Override\n\t\t@Transactional(propagation=Propagation.REQUIRES_NEW)\n\t\tpublic String getAuthenticableId(Verification level) {\n\t\t\tif (nullAuth.get() == Boolean.TRUE) return null;\n\t\t\treturn authService.getPrincipalUserId(level);\n\t\t}\n\t\t\n\t\t@Override\n\t\t@Transactional(propagation=Propagation.REQUIRES_NEW)\n\t\tpublic Authenticable getAuthenticable(Verification level) {\n\t\t\tif (nullAuth.get() == Boolean.TRUE) return null;\n\t\t\treturn authService.getPrincipalUser(level);\n\t\t}\n\t\n\t\t@Override\n\t\tpublic Object getInstance() {\n\t\t\treturn jp.getThis();\n\t\t}\n\t\n\t\t@Override\n\t\tpublic Method getMethod() {\n\t\t\treturn ((MethodSignature)jp.getSignature()).getMethod();\n\t\t}\n\t\n\t\t@Override\n\t\tpublic Object[] getParameters() {\n\t\t\treturn jp.getArgs();\n\t\t}\n\n\t\t@Override\n\t\tpublic boolean isInMode(String testMode) {\n\t\t\treturn CheckAspect.this.isInMode(testMode);\n\t\t}\n\t\t\n\t}\n\n\tbefore() : \n\t\tcheckMethod() \n\t\t&& !cflowbelow(checkMethod())\n\t{\n\t\tif (checkerFactory == null) return;\n\t\tif (skip.get() == Boolean.TRUE) return;\n\t\t\n\t\tChecker checker = checkerFactory.getFor(((MethodSignature)thisJoinPointStaticPart.getSignature()).getMethod());\n\t\t\n\t\tint code = checker.check(new JoinPointCheckPoint(thisJoinPoint));\n\t\tif (code != 0) {\n\t\t\tthrow new AuthException().statusCode(code);\n\t\t}\n\t\tif (this.probing.get() == Boolean.TRUE) {\n\t\t\tthrow new AuthException().statusCode(100);\n\t\t}\n\t}\n\t\n\tpublic void probing(boolean set) {\n\t\tif (set) {\n\t\t\tthis.probing.set(true);\n\t\t} else {\n\t\t\tthis.probing.remove();\n\t\t}\n\t}\n\t\n\tpublic void nullAuth(boolean set) {\n\t\tif (set) {\n\t\t\tthis.nullAuth.set(true);\n\t\t} else {\n\t\t\tthis.nullAuth.remove();\n\t\t}\n\t}\n\t\n\tpublic void skip(boolean set) {\n\t\tif (set) {\n\t\t\tthis.skip.set(true);\n\t\t} else {\n\t\t\tthis.skip.remove();\n\t\t}\n\t}\n\t\n\tpublic boolean isSkipping() {\n\t\treturn this.skip.get() == Boolean.TRUE;\n\t}\n\tpublic boolean isProbing() {\n\t\treturn this.probing.get() == Boolean.TRUE;\n\t}\n\tpublic boolean isNullAuth() {\n\t\treturn this.nullAuth.get() == Boolean.TRUE;\n\t}\n\t\n\tpublic void enterMode(String pmode) {\n\t\tStack<String> stack = mode.get();\n\t\tif (stack == null) {\n\t\t\tstack = new Stack<String>();\n\t\t\tmode.set(stack);\n\t\t}\n\t\tstack.add(pmode);\n\t}\n\t\n\tpublic void exitMode() {\n\t\tStack<String> stack = mode.get();\n\t\tif (stack == null) return;\n\t\tstack.pop();\n\t}\n\t\n\tpublic boolean isInMode(String testMode) {\n\t\tStack<String> stack = mode.get();\n\t\tif (stack == null || stack.size() == 0) return testMode == null;\n\t\treturn stack.contains(testMode);\t\t\n\t}\n\t\n\tObject around() :\n\t\texecution (@CheckNoAuth * *.*(..))\n\t{\n\t\tboolean prenullauth = this.nullAuth.get() == Boolean.TRUE;\n\t\ttry {\n\t\t\tnullAuth(true);\n\t\t\treturn proceed();\n\t\t} finally {\n\t\t\tnullAuth(prenullauth);\n\t\t}\n\t}\n\t\n\tObject around() :\n\t\texecution (@CheckNoChecks * *.*(..))\n\t{\n\t\tboolean preskip = this.skip.get() == Boolean.TRUE;\n\t\ttry {\n\t\t\tskip(true);\n\t\t\treturn proceed();\n\t\t} finally {\n\t\t\tskip(preskip);\n\t\t}\n\t}\n\n\tbefore(String setMode) :\n\t\texecution (@CheckMode * (@Controller *).*(..))\n\t\t&& @annotation(CheckMode(setMode))\n\t{\n\t\tenterMode(setMode);\n\t}\n\t\n\tObject around(String setMode) :\n\t\texecution (@CheckMode * *.*(..))\n\t\t&& @annotation(CheckMode(setMode))\n\t{\n\t\tenterMode(setMode);\n\t\ttry {\n\t\t\treturn proceed(setMode);\n\t\t} finally {\n\t\t\texitMode();\n\t\t}\n\t}\n\t\n\tpublic void clear() {\n\t\tthis.mode.remove();\n\t\tthis.nullAuth.remove();\n\t\tthis.probing.remove();\n\t\tthis.skip.remove();\n\t}\n}\n","old_contents":"package net.etalia.crepuscolo.check;\n\nimport java.lang.reflect.Method;\nimport java.util.Stack;\n\nimport javax.persistence.Entity;\nimport javax.persistence.MappedSuperclass;\n\nimport net.etalia.crepuscolo.domain.Authenticable;\nimport net.etalia.crepuscolo.services.AuthService;\nimport net.etalia.crepuscolo.services.AuthService.Verification;\n\nimport org.aspectj.lang.JoinPoint;\nimport org.aspectj.lang.reflect.MethodSignature;\nimport org.springframework.beans.factory.annotation.Autowired;\nimport org.springframework.beans.factory.annotation.Configurable;\nimport org.springframework.stereotype.Controller;\nimport org.springframework.transaction.annotation.Propagation;\nimport org.springframework.transaction.annotation.Transactional;\n\n\n@Configurable\npublic aspect CheckAspect {\n\n\tpointcut checkMethod() : \n\t\t(\n\t\texecution(@(@CheckerAnnotation *) * *.*(..))\n\t\t||\n\t\texecution(* *.*(@(@CheckerAnnotation *) (*),..))\n\t\t||\n\t\texecution(* *.*(*, @(@CheckerAnnotation *) (*),..))\n\t\t||\n\t\texecution(* *.*(*, *, @(@CheckerAnnotation *) (*),..))\n\t\t||\n\t\texecution(* *.*(*, *, *, @(@CheckerAnnotation *) (*),..))\n\t\t||\n\t\texecution(@CheckerAnnotation * *.*(..))\n\t\t)\n\t\t&& !execution(* (@(Entity || MappedSuperclass) *).get*());\n\n\t@Autowired(required=true)\n\tprivate AuthService authService;\n\t\n\tprivate CheckerFactory checkerFactory;\n\t\n\tpublic void setAuthService(AuthService authService) {\n\t\tthis.authService = authService;\n\t}\n\t\n\tpublic void setCheckerFactory(CheckerFactory cf) {\n\t\tthis.checkerFactory = cf;\n\t}\n\n\tprivate ThreadLocal<Boolean> probing = new ThreadLocal<Boolean>();\n\tprivate ThreadLocal<Boolean> skip = new ThreadLocal<Boolean>();\n\tprivate ThreadLocal<Boolean> nullAuth = new ThreadLocal<Boolean>();\n\tprivate ThreadLocal<Stack<String>> mode = new ThreadLocal<Stack<String>>();\n\n\tpublic class JoinPointCheckPoint implements CheckPoint {\n\t\n\t\tprivate JoinPoint jp;\n\t\t\n\t\tpublic JoinPointCheckPoint(JoinPoint jp) {\n\t\t\tthis.jp = jp;\n\t\t}\n\t\n\t\t@Override\n\t\t@Transactional(propagation=Propagation.REQUIRES_NEW)\n\t\tpublic String getAuthenticableId(Verification level) {\n\t\t\tif (nullAuth.get() == Boolean.TRUE) return null;\n\t\t\treturn authService.getPrincipalUserId(level);\n\t\t}\n\t\t\n\t\t@Override\n\t\t@Transactional(propagation=Propagation.REQUIRES_NEW)\n\t\tpublic Authenticable getAuthenticable(Verification level) {\n\t\t\tif (nullAuth.get() == Boolean.TRUE) return null;\n\t\t\treturn authService.getPrincipalUser(level);\n\t\t}\n\t\n\t\t@Override\n\t\tpublic Object getInstance() {\n\t\t\treturn jp.getThis();\n\t\t}\n\t\n\t\t@Override\n\t\tpublic Method getMethod() {\n\t\t\treturn ((MethodSignature)jp.getSignature()).getMethod();\n\t\t}\n\t\n\t\t@Override\n\t\tpublic Object[] getParameters() {\n\t\t\treturn jp.getArgs();\n\t\t}\n\n\t\t@Override\n\t\tpublic boolean isInMode(String testMode) {\n\t\t\treturn CheckAspect.this.isInMode(testMode);\n\t\t}\n\t\t\n\t}\n\n\tbefore() : \n\t\tcheckMethod() \n\t\t&& !cflowbelow(checkMethod())\n\t{\n\t\tif (checkerFactory == null) return;\n\t\tif (skip.get() == Boolean.TRUE) return;\n\t\t\n\t\tChecker checker = checkerFactory.getFor(((MethodSignature)thisJoinPointStaticPart.getSignature()).getMethod());\n\t\t\n\t\tint code = checker.check(new JoinPointCheckPoint(thisJoinPoint));\n\t\tif (code != 0) {\n\t\t\tthrow new AuthException().statusCode(code);\n\t\t}\n\t\tif (this.probing.get() == Boolean.TRUE) {\n\t\t\tthrow new AuthException().statusCode(100);\n\t\t}\n\t}\n\t\n\tpublic void probing(boolean set) {\n\t\tif (set) {\n\t\t\tthis.probing.set(true);\n\t\t} else {\n\t\t\tthis.probing.remove();\n\t\t}\n\t}\n\t\n\tpublic void nullAuth(boolean set) {\n\t\tif (set) {\n\t\t\tthis.nullAuth.set(true);\n\t\t} else {\n\t\t\tthis.nullAuth.remove();\n\t\t}\n\t}\n\t\n\tpublic void skip(boolean set) {\n\t\tif (set) {\n\t\t\tthis.skip.set(true);\n\t\t} else {\n\t\t\tthis.skip.remove();\n\t\t}\n\t}\n\t\n\tpublic boolean isSkipping() {\n\t\treturn this.skip.get() == Boolean.TRUE;\n\t}\n\tpublic boolean isProbing() {\n\t\treturn this.probing.get() == Boolean.TRUE;\n\t}\n\tpublic boolean isNullAuth() {\n\t\treturn this.nullAuth.get() == Boolean.TRUE;\n\t}\n\t\n\tpublic void enterMode(String pmode) {\n\t\tStack<String> stack = mode.get();\n\t\tif (stack == null) {\n\t\t\tstack = new Stack<String>();\n\t\t\tmode.set(stack);\n\t\t}\n\t\tstack.add(pmode);\n\t}\n\t\n\tpublic void exitMode() {\n\t\tStack<String> stack = mode.get();\n\t\tif (stack == null) return;\n\t\tstack.pop();\n\t}\n\t\n\tpublic boolean isInMode(String testMode) {\n\t\tStack<String> stack = mode.get();\n\t\tif (stack == null || stack.size() == 0) return testMode == null;\n\t\treturn stack.contains(testMode);\t\t\n\t}\n\t\n\tObject around() :\n\t\texecution (@CheckNoAuth * *.*(..))\n\t{\n\t\tboolean prenullauth = this.nullAuth.get() == Boolean.TRUE;\n\t\ttry {\n\t\t\tnullAuth(true);\n\t\t\treturn proceed();\n\t\t} finally {\n\t\t\tnullAuth(prenullauth);\n\t\t}\n\t}\n\t\n\tObject around() :\n\t\texecution (@CheckNoChecks * *.*(..))\n\t{\n\t\tboolean preskip = this.skip.get() == Boolean.TRUE;\n\t\ttry {\n\t\t\tskip(true);\n\t\t\treturn proceed();\n\t\t} finally {\n\t\t\tskip(preskip);\n\t\t}\n\t}\n\n\tbefore(String setMode) :\n\t\texecution (@CheckMode * (@Controller *).*(..))\n\t\t&& @annotation(CheckMode(setMode))\n\t{\n\t\tenterMode(setMode);\n\t}\n\t\n\tObject around(String setMode) :\n\t\texecution (@CheckMode * *.*(..))\n\t\t&& @annotation(CheckMode(setMode))\n\t{\n\t\tenterMode(setMode);\n\t\ttry {\n\t\t\treturn proceed(setMode);\n\t\t} finally {\n\t\t\texitMode();\n\t\t}\n\t}\n\t\n\tpublic void clear() {\n\t\tthis.mode.remove();\n\t\tthis.nullAuth.remove();\n\t\tthis.probing.remove();\n\t\tthis.skip.remove();\n\t}\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"8bc0a5e873aa2dff1049e2dd761087fabb76ab39","subject":"commit cff4ddd772af65522337ba3380d2e75b7b5d61e0 Author: Konstantin Boudnik <cos@yahoo-inc.com> Date:   Tue May 4 18:47:13 2010 -0700","message":"commit cff4ddd772af65522337ba3380d2e75b7b5d61e0\nAuthor: Konstantin Boudnik <cos@yahoo-inc.com>\nDate:   Tue May 4 18:47:13 2010 -0700\n\n    HADOOP-6332 from https:\/\/issues.apache.org\/jira\/secure\/attachment\/12443668\/6332-phase2.fix1.patch\n      on top of https:\/\/issues.apache.org\/jira\/secure\/attachment\/12443539\/6332-phase2.patch\n      fixing the issue with FileSystem access from Herriot via RPC\n\n\ngit-svn-id: 7e7a2d564dde2945c3a26e08d1235fcc0cb7aba1@1077439 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"ShortMap\/ShortMap,aseldawy\/spatialhadoop,ShortMap\/ShortMap,aseldawy\/spatialhadoop,ShortMap\/ShortMap,aseldawy\/spatialhadoop,ShortMap\/ShortMap,aseldawy\/spatialhadoop,ShortMap\/ShortMap,aseldawy\/spatialhadoop,aseldawy\/spatialhadoop,aseldawy\/spatialhadoop,ShortMap\/ShortMap,ShortMap\/ShortMap,ShortMap\/ShortMap,ShortMap\/ShortMap,aseldawy\/spatialhadoop,aseldawy\/spatialhadoop","old_file":"src\/test\/system\/aop\/org\/apache\/hadoop\/test\/system\/DaemonProtocolAspect.aj","new_file":"src\/test\/system\/aop\/org\/apache\/hadoop\/test\/system\/DaemonProtocolAspect.aj","new_contents":"\/**\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements.  See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership.  The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * \"License\"); you may not use this file except in compliance\n * with the License.  You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.apache.hadoop.test.system;\n\nimport java.io.File;\nimport java.io.IOException;\nimport java.security.PrivilegedExceptionAction;\nimport java.util.HashMap;\nimport java.util.List;\nimport java.util.ArrayList;\nimport java.util.Map;\nimport java.util.Properties;\nimport org.apache.commons.logging.Log;\nimport org.apache.commons.logging.LogFactory;\nimport org.apache.hadoop.io.Writable;\nimport org.apache.hadoop.security.UserGroupInformation;\nimport org.apache.hadoop.util.Shell.ShellCommandExecutor;\nimport org.apache.hadoop.fs.FileStatus;\nimport org.apache.hadoop.fs.FileSystem;\nimport org.apache.hadoop.fs.Path;\nimport org.apache.hadoop.conf.Configuration;\n\n\/**\n * Default DaemonProtocolAspect which is used to provide default implementation\n * for all the common daemon methods. If a daemon requires more specialized\n * version of method, it is responsibility of the DaemonClient to introduce the\n * same in woven classes.\n * \n *\/\npublic aspect DaemonProtocolAspect {\n\n  private boolean DaemonProtocol.ready;\n  \n  @SuppressWarnings(\"unchecked\")\n  private HashMap<Object, List<ControlAction>> DaemonProtocol.actions = \n    new HashMap<Object, List<ControlAction>>();\n  private static final Log LOG = LogFactory.getLog(\n      DaemonProtocolAspect.class.getName());\n  \/**\n   * Set if the daemon process is ready or not, concrete daemon protocol should\n   * implement pointcuts to determine when the daemon is ready and use the\n   * setter to set the ready state.\n   * \n   * @param ready\n   *          true if the Daemon is ready.\n   *\/\n  public void DaemonProtocol.setReady(boolean ready) {\n    this.ready = ready;\n  }\n\n  \/**\n   * Checks if the daemon process is alive or not.\n   * \n   * @throws IOException\n   *           if daemon is not alive.\n   *\/\n  public void DaemonProtocol.ping() throws IOException {\n  }\n\n  \/**\n   * Checks if the daemon process is ready to accepting RPC connections after it\n   * finishes initialization. <br\/>\n   * \n   * @return true if ready to accept connection.\n   * \n   * @throws IOException\n   *\/\n  public boolean DaemonProtocol.isReady() throws IOException {\n    return ready;\n  }\n\n  \/**\n   * Returns the process related information regarding the daemon process. <br\/>\n   * \n   * @return process information.\n   * @throws IOException\n   *\/\n  public ProcessInfo DaemonProtocol.getProcessInfo() throws IOException {\n    int activeThreadCount = Thread.activeCount();\n    long currentTime = System.currentTimeMillis();\n    long maxmem = Runtime.getRuntime().maxMemory();\n    long freemem = Runtime.getRuntime().freeMemory();\n    long totalmem = Runtime.getRuntime().totalMemory();\n    Map<String, String> envMap = System.getenv();\n    Properties sysProps = System.getProperties();\n    Map<String, String> props = new HashMap<String, String>();\n    for (Map.Entry entry : sysProps.entrySet()) {\n      props.put((String) entry.getKey(), (String) entry.getValue());\n    }\n    ProcessInfo info = new ProcessInfoImpl(activeThreadCount, currentTime,\n        freemem, maxmem, totalmem, envMap, props);\n    return info;\n  }\n\n  public void DaemonProtocol.enable(List<Enum<?>> faults) throws IOException {\n  }\n\n  public void DaemonProtocol.disableAll() throws IOException {\n  }\n\n  public abstract Configuration DaemonProtocol.getDaemonConf()\n    throws IOException;\n\n  public FileStatus DaemonProtocol.getFileStatus(String path, boolean local) \n    throws IOException {\n    Path p = new Path(path);\n    FileSystem fs = getFS(p, local);\n    p.makeQualified(fs);\n    FileStatus fileStatus = fs.getFileStatus(p);\n    return cloneFileStatus(fileStatus);\n  }\n\n  public FileStatus[] DaemonProtocol.listStatus(String path, boolean local) \n    throws IOException {\n    Path p = new Path(path);\n    FileSystem fs = getFS(p, local);\n    FileStatus[] status = fs.listStatus(p);\n    if (status != null) {\n      FileStatus[] result = new FileStatus[status.length];\n      int i = 0;\n      for (FileStatus fileStatus : status) {\n        result[i++] = cloneFileStatus(fileStatus);\n      }\n      return result;\n    }\n    return status;\n  }\n\n  \/**\n   * FileStatus object may not be serializable. Clone it into raw FileStatus \n   * object.\n   *\/\n  private FileStatus DaemonProtocol.cloneFileStatus(FileStatus fileStatus) {\n    return new FileStatus(fileStatus.getLen(),\n        fileStatus.isDir(),\n        fileStatus.getReplication(),\n        fileStatus.getBlockSize(),\n        fileStatus.getModificationTime(),\n        fileStatus.getAccessTime(),\n        fileStatus.getPermission(),\n        fileStatus.getOwner(),\n        fileStatus.getGroup(),\n        fileStatus.getPath());\n  }\n\n  private FileSystem DaemonProtocol.getFS(final Path path, final boolean local)\n      throws IOException {\n    FileSystem ret = null;\n    try {\n      ret = UserGroupInformation.getLoginUser().doAs (\n          new PrivilegedExceptionAction<FileSystem>() {\n            public FileSystem run() throws IOException {\n              FileSystem fs = null;\n              if (local) {\n                fs = FileSystem.getLocal(getDaemonConf());\n              } else {\n                fs = path.getFileSystem(getDaemonConf());\n              }\n              return fs;\n            }\n          });\n    } catch (InterruptedException ie) {\n    }\n    return ret;\n  }\n  \n  @SuppressWarnings(\"unchecked\")\n  public ControlAction[] DaemonProtocol.getActions(Writable key) \n    throws IOException {\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(key);\n      if(actionList == null) {\n        return new ControlAction[0];\n      } else {\n        return (ControlAction[]) actionList.toArray(new ControlAction[actionList\n                                                                      .size()]);\n      }\n    }\n  }\n\n\n  @SuppressWarnings(\"unchecked\")\n  public void DaemonProtocol.sendAction(ControlAction action) \n      throws IOException {\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(action.getTarget());\n      if(actionList == null) {\n        actionList = new ArrayList<ControlAction>();\n        actions.put(action.getTarget(), actionList);\n      }\n      actionList.add(action);\n    } \n  }\n \n  @SuppressWarnings(\"unchecked\")\n  public boolean DaemonProtocol.isActionPending(ControlAction action) \n    throws IOException{\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(action.getTarget());\n      if(actionList == null) {\n        return false;\n      } else {\n        return actionList.contains(action);\n      }\n    }\n  }\n  \n  \n  @SuppressWarnings(\"unchecked\")\n  public void DaemonProtocol.removeAction(ControlAction action) \n    throws IOException {\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(action.getTarget());\n      if(actionList == null) {\n        return;\n      } else {\n        actionList.remove(action);\n      }\n    }\n  }\n  \n  public void DaemonProtocol.clearActions() throws IOException {\n    synchronized (actions) {\n      actions.clear();\n    }\n  }\n\n  public String DaemonProtocol.getFilePattern() {\n    \/\/We use the environment variable HADOOP_LOGFILE to get the\n    \/\/pattern to use in the search.\n    String logDir = System.getenv(\"HADOOP_LOG_DIR\");\n    String daemonLogPattern = System.getenv(\"HADOOP_LOGFILE\");\n    if(daemonLogPattern == null && daemonLogPattern.isEmpty()) {\n      return \"*\";\n    }\n    return  logDir+File.separator+daemonLogPattern+\"*\";\n  }\n\n  public int DaemonProtocol.getNumberOfMatchesInLogFile(String pattern,\n      String[] list) throws IOException {\n    StringBuffer filePattern = new StringBuffer(getFilePattern());    \n    if(list != null){\n      for(int i =0; i < list.length; ++i)\n      {\n        filePattern.append(\" | grep -v \" + list[i] );\n      }\n    }  \n    String[] cmd =\n        new String[] {\n            \"bash\",\n            \"-c\",\n            \"grep -c \"\n                + pattern + \" \" + filePattern\n                + \" | awk -F: '{s+=$2} END {print s}'\" };    \n    ShellCommandExecutor shexec = new ShellCommandExecutor(cmd);\n    shexec.execute();\n    String output = shexec.getOutput();\n    return Integer.parseInt(output.replaceAll(\"\\n\", \"\").trim());\n  }\n\n  private String DaemonProtocol.user = null;\n  \n  public String DaemonProtocol.getDaemonUser() {\n    return user;\n  }\n  \n  public void DaemonProtocol.setUser(String user) {\n    this.user = user;\n  }\n}\n\n","old_contents":"\/**\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements.  See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership.  The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * \"License\"); you may not use this file except in compliance\n * with the License.  You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.apache.hadoop.test.system;\n\nimport java.io.File;\nimport java.io.IOException;\nimport java.util.HashMap;\nimport java.util.List;\nimport java.util.ArrayList;\nimport java.util.Map;\nimport java.util.Properties;\nimport org.apache.commons.logging.Log;\nimport org.apache.commons.logging.LogFactory;\nimport org.apache.hadoop.io.Writable;\nimport org.apache.hadoop.util.Shell.ShellCommandExecutor;\nimport org.apache.hadoop.fs.FileStatus;\nimport org.apache.hadoop.fs.FileSystem;\nimport org.apache.hadoop.fs.Path;\nimport org.apache.hadoop.conf.Configuration;\n\n\/**\n * Default DaemonProtocolAspect which is used to provide default implementation\n * for all the common daemon methods. If a daemon requires more specialized\n * version of method, it is responsibility of the DaemonClient to introduce the\n * same in woven classes.\n * \n *\/\npublic aspect DaemonProtocolAspect {\n\n  private boolean DaemonProtocol.ready;\n  \n  @SuppressWarnings(\"unchecked\")\n  private HashMap<Object, List<ControlAction>> DaemonProtocol.actions = \n    new HashMap<Object, List<ControlAction>>();\n  private static final Log LOG = LogFactory.getLog(\n      DaemonProtocolAspect.class.getName());\n  \/**\n   * Set if the daemon process is ready or not, concrete daemon protocol should\n   * implement pointcuts to determine when the daemon is ready and use the\n   * setter to set the ready state.\n   * \n   * @param ready\n   *          true if the Daemon is ready.\n   *\/\n  public void DaemonProtocol.setReady(boolean ready) {\n    this.ready = ready;\n  }\n\n  \/**\n   * Checks if the daemon process is alive or not.\n   * \n   * @throws IOException\n   *           if daemon is not alive.\n   *\/\n  public void DaemonProtocol.ping() throws IOException {\n  }\n\n  \/**\n   * Checks if the daemon process is ready to accepting RPC connections after it\n   * finishes initialization. <br\/>\n   * \n   * @return true if ready to accept connection.\n   * \n   * @throws IOException\n   *\/\n  public boolean DaemonProtocol.isReady() throws IOException {\n    return ready;\n  }\n\n  \/**\n   * Returns the process related information regarding the daemon process. <br\/>\n   * \n   * @return process information.\n   * @throws IOException\n   *\/\n  public ProcessInfo DaemonProtocol.getProcessInfo() throws IOException {\n    int activeThreadCount = Thread.activeCount();\n    long currentTime = System.currentTimeMillis();\n    long maxmem = Runtime.getRuntime().maxMemory();\n    long freemem = Runtime.getRuntime().freeMemory();\n    long totalmem = Runtime.getRuntime().totalMemory();\n    Map<String, String> envMap = System.getenv();\n    Properties sysProps = System.getProperties();\n    Map<String, String> props = new HashMap<String, String>();\n    for (Map.Entry entry : sysProps.entrySet()) {\n      props.put((String) entry.getKey(), (String) entry.getValue());\n    }\n    ProcessInfo info = new ProcessInfoImpl(activeThreadCount, currentTime,\n        freemem, maxmem, totalmem, envMap, props);\n    return info;\n  }\n\n  public void DaemonProtocol.enable(List<Enum<?>> faults) throws IOException {\n  }\n\n  public void DaemonProtocol.disableAll() throws IOException {\n  }\n\n  public abstract Configuration DaemonProtocol.getDaemonConf()\n    throws IOException;\n\n  public FileStatus DaemonProtocol.getFileStatus(String path, boolean local) \n    throws IOException {\n    Path p = new Path(path);\n    FileSystem fs = getFS(p, local);\n    p.makeQualified(fs);\n    FileStatus fileStatus = fs.getFileStatus(p);\n    return cloneFileStatus(fileStatus);\n  }\n\n  public FileStatus[] DaemonProtocol.listStatus(String path, boolean local) \n    throws IOException {\n    Path p = new Path(path);\n    FileSystem fs = getFS(p, local);\n    FileStatus[] status = fs.listStatus(p);\n    if (status != null) {\n      FileStatus[] result = new FileStatus[status.length];\n      int i = 0;\n      for (FileStatus fileStatus : status) {\n        result[i++] = cloneFileStatus(fileStatus);\n      }\n      return result;\n    }\n    return status;\n  }\n\n  \/**\n   * FileStatus object may not be serializable. Clone it into raw FileStatus \n   * object.\n   *\/\n  private FileStatus DaemonProtocol.cloneFileStatus(FileStatus fileStatus) {\n    return new FileStatus(fileStatus.getLen(),\n        fileStatus.isDir(),\n        fileStatus.getReplication(),\n        fileStatus.getBlockSize(),\n        fileStatus.getModificationTime(),\n        fileStatus.getAccessTime(),\n        fileStatus.getPermission(),\n        fileStatus.getOwner(),\n        fileStatus.getGroup(),\n        fileStatus.getPath());\n  }\n\n  private FileSystem DaemonProtocol.getFS(Path path, boolean local) \n    throws IOException {\n    FileSystem fs = null;\n    if (local) {\n      fs = FileSystem.getLocal(getDaemonConf());\n    } else {\n      fs = path.getFileSystem(getDaemonConf());\n    }\n    return fs;\n  }\n  \n  \n  @SuppressWarnings(\"unchecked\")\n  public ControlAction[] DaemonProtocol.getActions(Writable key) \n    throws IOException {\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(key);\n      if(actionList == null) {\n        return new ControlAction[0];\n      } else {\n        return (ControlAction[]) actionList.toArray(new ControlAction[actionList\n                                                                      .size()]);\n      }\n    }\n  }\n\n\n  @SuppressWarnings(\"unchecked\")\n  public void DaemonProtocol.sendAction(ControlAction action) \n      throws IOException {\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(action.getTarget());\n      if(actionList == null) {\n        actionList = new ArrayList<ControlAction>();\n        actions.put(action.getTarget(), actionList);\n      }\n      actionList.add(action);\n    } \n  }\n \n  @SuppressWarnings(\"unchecked\")\n  public boolean DaemonProtocol.isActionPending(ControlAction action) \n    throws IOException{\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(action.getTarget());\n      if(actionList == null) {\n        return false;\n      } else {\n        return actionList.contains(action);\n      }\n    }\n  }\n  \n  \n  @SuppressWarnings(\"unchecked\")\n  public void DaemonProtocol.removeAction(ControlAction action) \n    throws IOException {\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(action.getTarget());\n      if(actionList == null) {\n        return;\n      } else {\n        actionList.remove(action);\n      }\n    }\n  }\n  \n  public void DaemonProtocol.clearActions() throws IOException {\n    synchronized (actions) {\n      actions.clear();\n    }\n  }\n\n  public String DaemonProtocol.getFilePattern() {\n    \/\/We use the environment variable HADOOP_LOGFILE to get the\n    \/\/pattern to use in the search.\n    String logDir = System.getenv(\"HADOOP_LOG_DIR\");\n    String daemonLogPattern = System.getenv(\"HADOOP_LOGFILE\");\n    if(daemonLogPattern == null && daemonLogPattern.isEmpty()) {\n      return \"*\";\n    }\n    return  logDir+File.separator+daemonLogPattern+\"*\";\n  }\n\n  public int DaemonProtocol.getNumberOfMatchesInLogFile(String pattern,\n      String[] list) throws IOException {\n    StringBuffer filePattern = new StringBuffer(getFilePattern());    \n    if(list != null){\n      for(int i =0; i < list.length; ++i)\n      {\n        filePattern.append(\" | grep -v \" + list[i] );\n      }\n    }  \n    String[] cmd =\n        new String[] {\n            \"bash\",\n            \"-c\",\n            \"grep -c \"\n                + pattern + \" \" + filePattern\n                + \" | awk -F: '{s+=$2} END {print s}'\" };    \n    ShellCommandExecutor shexec = new ShellCommandExecutor(cmd);\n    shexec.execute();\n    String output = shexec.getOutput();\n    return Integer.parseInt(output.replaceAll(\"\\n\", \"\").trim());\n  }\n\n  private String DaemonProtocol.user = null;\n  \n  public String DaemonProtocol.getDaemonUser() {\n    return user;\n  }\n  \n  public void DaemonProtocol.setUser(String user) {\n    this.user = user;\n  }\n}\n\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"6232d4d6b2d3feecb39035868588d1e462db5ea9","subject":"remove println","message":"remove println","repos":"stephenh\/scala-ide,stephenh\/scala-ide,Duhemm\/scala-ide,andrey-ilinykh\/scala-ide,Duhemm\/scala-ide,romanowski\/scala-ide,Kwestor\/scala-ide,scala-ide\/scala-ide,Kwestor\/scala-ide,mlangc\/scala-ide,romanowski\/scala-ide,mlangc\/scala-ide,wpopielarski\/scala-ide,pilipolio\/scala-ide,sschaef\/scala-ide,Duhemm\/scala-ide,scala-ide\/scala-ide,aleksi-lukkarinen\/scala-ide,dragos\/scala-ide,Kwestor\/scala-ide,scala-ide\/scala-ide,aleksi-lukkarinen\/scala-ide,pilipolio\/scala-ide,mlangc\/scala-ide,dragos\/scala-ide,wpopielarski\/scala-ide,stephenh\/scala-ide,andrey-ilinykh\/scala-ide,wpopielarski\/scala-ide,dragos\/scala-ide,stephenh\/scala-ide,scala-ide\/scala-ide,wpopielarski\/scala-ide,andrey-ilinykh\/scala-ide,aleksi-lukkarinen\/scala-ide,romanowski\/scala-ide,dragos\/scala-ide,sschaef\/scala-ide,romanowski\/scala-ide,sschaef\/scala-ide,aleksi-lukkarinen\/scala-ide,pilipolio\/scala-ide,sschaef\/scala-ide,pilipolio\/scala-ide,mlangc\/scala-ide,Duhemm\/scala-ide,andrey-ilinykh\/scala-ide,Kwestor\/scala-ide","old_file":"org.scala-ide.sdt.aspects\/src\/org\/eclipse\/jdt\/core\/dom\/ASTConverterAspect.aj","new_file":"org.scala-ide.sdt.aspects\/src\/org\/eclipse\/jdt\/core\/dom\/ASTConverterAspect.aj","new_contents":"\/**\n * \n *\/\n\/\/package scala.tools.eclipse.contribution.weaving.jdt.core;\npackage org.eclipse.jdt.core.dom;\n\n\/**\n * This class is the package org.eclipse.jdt.core.dom, because ASTConverter is not public.\n * \n * @author Matthew Farwell\n *\n *\/\n@SuppressWarnings(\"restriction\")\npublic privileged aspect ASTConverterAspect {\n\n  pointcut isPrimitiveType(ASTConverter converter, char[] name) :\n    execution(boolean ASTConverter.isPrimitiveType(char[])) &&\n    args(name) &&\n    target(converter)\n    ;\n\n  boolean around(ASTConverter converter, char[] name) :\n    isPrimitiveType(converter, name) {\n     if (name == null || name.length == 0) {\n       return false;\n     }\n     \n       switch(name[0]) {\n           case 'i' :\n               if (name.length == 3 && name[1] == 'n' && name[2] == 't') {\n                   return true;\n               }\n               return false;\n           case 'l' :\n               if (name.length == 4 && name[1] == 'o' && name[2] == 'n' && name[3] == 'g') {\n                   return true;\n               }\n               return false;\n           case 'd' :\n               if (name.length == 6\n                    && name[1] == 'o'\n                    && name[2] == 'u'\n                    && name[3] == 'b'\n                    && name[4] == 'l'\n                    && name[5] == 'e') {\n                   return true;\n               }\n               return false;\n           case 'f' :\n               if (name.length == 5\n                    && name[1] == 'l'\n                    && name[2] == 'o'\n                    && name[3] == 'a'\n                    && name[4] == 't') {\n                   return true;\n               }\n               return false;\n           case 'b' :\n               if (name.length == 4\n                    && name[1] == 'y'\n                    && name[2] == 't'\n                    && name[3] == 'e') {\n                   return true;\n               } else\n                   if (name.length == 7\n                        && name[1] == 'o'\n                        && name[2] == 'o'\n                        && name[3] == 'l'\n                        && name[4] == 'e'\n                        && name[5] == 'a'\n                        && name[6] == 'n') {\n                   return true;\n               }\n               return false;\n           case 'c' :\n               if (name.length == 4\n                    && name[1] == 'h'\n                    && name[2] == 'a'\n                    && name[3] == 'r') {\n                   return true;\n               }\n               return false;\n           case 's' :\n               if (name.length == 5\n                    && name[1] == 'h'\n                    && name[2] == 'o'\n                    && name[3] == 'r'\n                    && name[4] == 't') {\n                   return true;\n               }\n               return false;\n           case 'v' :\n               if (name.length == 4\n                    && name[1] == 'o'\n                    && name[2] == 'i'\n                    && name[3] == 'd') {\n                   return true;\n               }\n               return false;\n       }\n       return false;\n   }\n}\n","old_contents":"\/**\n * \n *\/\n\/\/package scala.tools.eclipse.contribution.weaving.jdt.core;\npackage org.eclipse.jdt.core.dom;\n\n\/**\n * This class is the package org.eclipse.jdt.core.dom, because ASTConverter is not public.\n * \n * @author Matthew Farwell\n *\n *\/\n@SuppressWarnings(\"restriction\")\npublic privileged aspect ASTConverterAspect {\n\n  pointcut isPrimitiveType(ASTConverter converter, char[] name) :\n    execution(boolean ASTConverter.isPrimitiveType(char[])) &&\n    args(name) &&\n    target(converter)\n    ;\n\n  boolean around(ASTConverter converter, char[] name) :\n    isPrimitiveType(converter, name) {\n     System.err.println(\"aspects are go! name=\" + name);\n     if (name == null || name.length == 0) {\n       return false;\n     }\n     \n       switch(name[0]) {\n           case 'i' :\n               if (name.length == 3 && name[1] == 'n' && name[2] == 't') {\n                   return true;\n               }\n               return false;\n           case 'l' :\n               if (name.length == 4 && name[1] == 'o' && name[2] == 'n' && name[3] == 'g') {\n                   return true;\n               }\n               return false;\n           case 'd' :\n               if (name.length == 6\n                    && name[1] == 'o'\n                    && name[2] == 'u'\n                    && name[3] == 'b'\n                    && name[4] == 'l'\n                    && name[5] == 'e') {\n                   return true;\n               }\n               return false;\n           case 'f' :\n               if (name.length == 5\n                    && name[1] == 'l'\n                    && name[2] == 'o'\n                    && name[3] == 'a'\n                    && name[4] == 't') {\n                   return true;\n               }\n               return false;\n           case 'b' :\n               if (name.length == 4\n                    && name[1] == 'y'\n                    && name[2] == 't'\n                    && name[3] == 'e') {\n                   return true;\n               } else\n                   if (name.length == 7\n                        && name[1] == 'o'\n                        && name[2] == 'o'\n                        && name[3] == 'l'\n                        && name[4] == 'e'\n                        && name[5] == 'a'\n                        && name[6] == 'n') {\n                   return true;\n               }\n               return false;\n           case 'c' :\n               if (name.length == 4\n                    && name[1] == 'h'\n                    && name[2] == 'a'\n                    && name[3] == 'r') {\n                   return true;\n               }\n               return false;\n           case 's' :\n               if (name.length == 5\n                    && name[1] == 'h'\n                    && name[2] == 'o'\n                    && name[3] == 'r'\n                    && name[4] == 't') {\n                   return true;\n               }\n               return false;\n           case 'v' :\n               if (name.length == 4\n                    && name[1] == 'o'\n                    && name[2] == 'i'\n                    && name[3] == 'd') {\n                   return true;\n               }\n               return false;\n       }\n       return false;\n   }\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"34da7efd82eaf47ffff78e9402fc24d219cf8401","subject":"allow dispatching any one-arg method instead of setter","message":"allow dispatching any one-arg method instead of setter\n\nSigned-off-by: Ketoth Xupack <2ff7bd69a79a23dbf64ebd5846a612566f93fbf7@gmail.com>\n","repos":"no-hope\/java-toolkit,no-hope\/java-toolkit,no-hope\/java-toolkit,no-hope\/java-toolkit","old_file":"projects\/bean-modification-listener\/src\/main\/java\/org\/nohope\/bean\/DispatcherAspect.aj","new_file":"projects\/bean-modification-listener\/src\/main\/java\/org\/nohope\/bean\/DispatcherAspect.aj","new_contents":"package org.nohope.bean;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.aspectj.lang.reflect.MethodSignature;\n\nimport java.lang.reflect.Method;\n\n\/**\n * @author <a href=\"mailto:ketoth.xupack@gmail.com\">ketoth xupack<\/a>\n * @since 12\/7\/12 7:30 PM\n *\/\n@SuppressWarnings(\"unchecked\")\npublic privileged aspect DispatcherAspect {\n\n    \/**\n     * Process all IDispatchable calls of one-arg method annotated with @Dispatch\n     * annotation.\n     *\/\n    pointcut setter(IDispatchable t, Object arg):\n          execution(@org.nohope.bean.Dispatch * *(*))\n          && args(arg)\n          && target(t);\n\n    @SuppressAjWarnings\n    after(IDispatchable t, Object arg) returning: setter(t, arg) {\n        final MethodSignature sig = (MethodSignature) thisJoinPoint.getStaticPart().getSignature();\n\n        final Method method = sig.getMethod();\n        final Dispatch annotation = method.getAnnotation(Dispatch.class);\n        final String propertyName;\n        if (\"\".equals(annotation.name())) {\n            propertyName = setterToProperty(method.getName());\n        } else {\n            propertyName = annotation.name();\n        }\n\n        t.getDispatcher().handle(t, propertyName, arg);\n    }\n\n    private static String setterToProperty(final String methodName) {\n        if (!methodName.startsWith(\"set\") || methodName.length() <= 3) {\n            return methodName;\n        }\n\n        final String without = methodName.replace(\"set\", \"\");\n        return Character.toLowerCase(without.charAt(0))\n                + without.substring(1);\n    }\n}\n","old_contents":"package org.nohope.bean;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.aspectj.lang.reflect.MethodSignature;\n\nimport java.lang.reflect.Method;\n\n\/**\n * @author <a href=\"mailto:ketoth.xupack@gmail.com\">ketoth xupack<\/a>\n * @since 12\/7\/12 7:30 PM\n *\/\n@SuppressWarnings(\"unchecked\")\npublic privileged aspect DispatcherAspect {\n\n    \/**\n     * Process all IDispatchable setter calls annotated with @Dispatch\n     * annotation.\n     *\/\n    pointcut setter(IDispatchable t, Object arg):\n          execution(@org.nohope.bean.Dispatch * set*(*))\n          && args(arg)\n          && target(t);\n\n    @SuppressAjWarnings\n    after(IDispatchable t, Object arg) returning: setter(t, arg) {\n        final MethodSignature sig = (MethodSignature) thisJoinPoint.getStaticPart().getSignature();\n\n        final Method method = sig.getMethod();\n        final Dispatch annotation = method.getAnnotation(Dispatch.class);\n        final String propertyName;\n        if (\"\".equals(annotation.name())) {\n            propertyName = setterToProperty(method.getName());\n        } else {\n            propertyName = annotation.name();\n        }\n\n        t.getDispatcher().handle(t, propertyName, arg);\n    }\n\n    private static String setterToProperty(final String methodName) {\n        if (!methodName.startsWith(\"set\") || methodName.length() <= 3) {\n            return methodName;\n        }\n\n        final String without = methodName.replace(\"set\", \"\");\n        return Character.toLowerCase(without.charAt(0))\n                + without.substring(1);\n    }\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"3f4aeee970ac3b76f5f6f36b4c635efa1c45ecdf","subject":"commit d97cbd749de78bd0c8c470142bf943a1ee2abe6d Author: Vinay Kumar Thota <vinayt@yahoo-inc.com> Date:   Fri Jun 4 08:50:52 2010 +0000","message":"commit d97cbd749de78bd0c8c470142bf943a1ee2abe6d\nAuthor: Vinay Kumar Thota <vinayt@yahoo-inc.com>\nDate:   Fri Jun 4 08:50:52 2010 +0000\n\n    HADOOP:6788 from https:\/\/issues.apache.org\/jira\/secure\/attachment\/12446102\/6788-ydist-security.patch\n\n\ngit-svn-id: 7e7a2d564dde2945c3a26e08d1235fcc0cb7aba1@1077489 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"aseldawy\/spatialhadoop,aseldawy\/spatialhadoop,ShortMap\/ShortMap,ShortMap\/ShortMap,aseldawy\/spatialhadoop,ShortMap\/ShortMap,aseldawy\/spatialhadoop,ShortMap\/ShortMap,ShortMap\/ShortMap,ShortMap\/ShortMap,aseldawy\/spatialhadoop,aseldawy\/spatialhadoop,aseldawy\/spatialhadoop,aseldawy\/spatialhadoop,ShortMap\/ShortMap,ShortMap\/ShortMap,ShortMap\/ShortMap,aseldawy\/spatialhadoop","old_file":"src\/test\/system\/aop\/org\/apache\/hadoop\/test\/system\/DaemonProtocolAspect.aj","new_file":"src\/test\/system\/aop\/org\/apache\/hadoop\/test\/system\/DaemonProtocolAspect.aj","new_contents":"\/**\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements.  See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership.  The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * \"License\"); you may not use this file except in compliance\n * with the License.  You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.apache.hadoop.test.system;\n\nimport java.io.File;\nimport java.io.IOException;\nimport java.security.PrivilegedExceptionAction;\nimport java.util.HashMap;\nimport java.util.List;\nimport java.util.ArrayList;\nimport java.util.Map;\nimport java.util.Properties;\nimport org.apache.commons.logging.Log;\nimport org.apache.commons.logging.LogFactory;\nimport org.apache.hadoop.io.Writable;\nimport org.apache.hadoop.security.UserGroupInformation;\nimport org.apache.hadoop.util.Shell.ShellCommandExecutor;\nimport org.apache.hadoop.util.Shell;\nimport org.apache.hadoop.fs.FileStatus;\nimport org.apache.hadoop.fs.FileSystem;\nimport org.apache.hadoop.fs.Path;\nimport org.apache.hadoop.conf.Configuration;\n\n\/**\n * Default DaemonProtocolAspect which is used to provide default implementation\n * for all the common daemon methods. If a daemon requires more specialized\n * version of method, it is responsibility of the DaemonClient to introduce the\n * same in woven classes.\n * \n *\/\npublic aspect DaemonProtocolAspect {\n\n  private boolean DaemonProtocol.ready;\n  \n  @SuppressWarnings(\"unchecked\")\n  private HashMap<Object, List<ControlAction>> DaemonProtocol.actions = \n    new HashMap<Object, List<ControlAction>>();\n  private static final Log LOG = LogFactory.getLog(\n      DaemonProtocolAspect.class.getName());\n  \/**\n   * Set if the daemon process is ready or not, concrete daemon protocol should\n   * implement pointcuts to determine when the daemon is ready and use the\n   * setter to set the ready state.\n   * \n   * @param ready\n   *          true if the Daemon is ready.\n   *\/\n  public void DaemonProtocol.setReady(boolean ready) {\n    this.ready = ready;\n  }\n\n  \/**\n   * Checks if the daemon process is alive or not.\n   * \n   * @throws IOException\n   *           if daemon is not alive.\n   *\/\n  public void DaemonProtocol.ping() throws IOException {\n  }\n\n  \/**\n   * Checks if the daemon process is ready to accepting RPC connections after it\n   * finishes initialization. <br\/>\n   * \n   * @return true if ready to accept connection.\n   * \n   * @throws IOException\n   *\/\n  public boolean DaemonProtocol.isReady() throws IOException {\n    return ready;\n  }\n\n  \/**\n   * Returns the process related information regarding the daemon process. <br\/>\n   * \n   * @return process information.\n   * @throws IOException\n   *\/\n  public ProcessInfo DaemonProtocol.getProcessInfo() throws IOException {\n    int activeThreadCount = Thread.activeCount();\n    long currentTime = System.currentTimeMillis();\n    long maxmem = Runtime.getRuntime().maxMemory();\n    long freemem = Runtime.getRuntime().freeMemory();\n    long totalmem = Runtime.getRuntime().totalMemory();\n    Map<String, String> envMap = System.getenv();\n    Properties sysProps = System.getProperties();\n    Map<String, String> props = new HashMap<String, String>();\n    for (Map.Entry entry : sysProps.entrySet()) {\n      props.put((String) entry.getKey(), (String) entry.getValue());\n    }\n    ProcessInfo info = new ProcessInfoImpl(activeThreadCount, currentTime,\n        freemem, maxmem, totalmem, envMap, props);\n    return info;\n  }\n\n  public void DaemonProtocol.enable(List<Enum<?>> faults) throws IOException {\n  }\n\n  public void DaemonProtocol.disableAll() throws IOException {\n  }\n\n  public abstract Configuration DaemonProtocol.getDaemonConf()\n    throws IOException;\n\n  public FileStatus DaemonProtocol.getFileStatus(String path, boolean local) \n    throws IOException {\n    Path p = new Path(path);\n    FileSystem fs = getFS(p, local);\n    p.makeQualified(fs);\n    FileStatus fileStatus = fs.getFileStatus(p);\n    return cloneFileStatus(fileStatus);\n  }\n\n  public FileStatus[] DaemonProtocol.listStatus(String path, boolean local) \n    throws IOException {\n    Path p = new Path(path);\n    FileSystem fs = getFS(p, local);\n    FileStatus[] status = fs.listStatus(p);\n    if (status != null) {\n      FileStatus[] result = new FileStatus[status.length];\n      int i = 0;\n      for (FileStatus fileStatus : status) {\n        result[i++] = cloneFileStatus(fileStatus);\n      }\n      return result;\n    }\n    return status;\n  }\n\n  \/**\n   * FileStatus object may not be serializable. Clone it into raw FileStatus \n   * object.\n   *\/\n  private FileStatus DaemonProtocol.cloneFileStatus(FileStatus fileStatus) {\n    return new FileStatus(fileStatus.getLen(),\n        fileStatus.isDir(),\n        fileStatus.getReplication(),\n        fileStatus.getBlockSize(),\n        fileStatus.getModificationTime(),\n        fileStatus.getAccessTime(),\n        fileStatus.getPermission(),\n        fileStatus.getOwner(),\n        fileStatus.getGroup(),\n        fileStatus.getPath());\n  }\n\n  private FileSystem DaemonProtocol.getFS(final Path path, final boolean local)\n      throws IOException {\n    FileSystem ret = null;\n    try {\n      ret = UserGroupInformation.getLoginUser().doAs (\n          new PrivilegedExceptionAction<FileSystem>() {\n            public FileSystem run() throws IOException {\n              FileSystem fs = null;\n              if (local) {\n                fs = FileSystem.getLocal(getDaemonConf());\n              } else {\n                fs = path.getFileSystem(getDaemonConf());\n              }\n              return fs;\n            }\n          });\n    } catch (InterruptedException ie) {\n    }\n    return ret;\n  }\n  \n  @SuppressWarnings(\"unchecked\")\n  public ControlAction[] DaemonProtocol.getActions(Writable key) \n    throws IOException {\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(key);\n      if(actionList == null) {\n        return new ControlAction[0];\n      } else {\n        return (ControlAction[]) actionList.toArray(new ControlAction[actionList\n                                                                      .size()]);\n      }\n    }\n  }\n\n\n  @SuppressWarnings(\"unchecked\")\n  public void DaemonProtocol.sendAction(ControlAction action) \n      throws IOException {\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(action.getTarget());\n      if(actionList == null) {\n        actionList = new ArrayList<ControlAction>();\n        actions.put(action.getTarget(), actionList);\n      }\n      actionList.add(action);\n    } \n  }\n \n  @SuppressWarnings(\"unchecked\")\n  public boolean DaemonProtocol.isActionPending(ControlAction action) \n    throws IOException{\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(action.getTarget());\n      if(actionList == null) {\n        return false;\n      } else {\n        return actionList.contains(action);\n      }\n    }\n  }\n  \n  \n  @SuppressWarnings(\"unchecked\")\n  public void DaemonProtocol.removeAction(ControlAction action) \n    throws IOException {\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(action.getTarget());\n      if(actionList == null) {\n        return;\n      } else {\n        actionList.remove(action);\n      }\n    }\n  }\n  \n  public void DaemonProtocol.clearActions() throws IOException {\n    synchronized (actions) {\n      actions.clear();\n    }\n  }\n\n  public String DaemonProtocol.getFilePattern() {\n    \/\/We use the environment variable HADOOP_LOGFILE to get the\n    \/\/pattern to use in the search.\n    String logDir = System.getenv(\"HADOOP_LOG_DIR\");\n    String daemonLogPattern = System.getenv(\"HADOOP_LOGFILE\");\n    if(daemonLogPattern == null && daemonLogPattern.isEmpty()) {\n      return \"*\";\n    }\n    return  logDir+File.separator+daemonLogPattern+\"*\";\n  }\n\n  public int DaemonProtocol.getNumberOfMatchesInLogFile(String pattern,\n      String[] list) throws IOException {\n    StringBuffer filePattern = new StringBuffer(getFilePattern());    \n    String[] cmd = null;\n    if (list != null) {\n      StringBuffer filterExpPattern = new StringBuffer();\n      int index=0;\n      for (String excludeExp : list) {\n        if (index++ < list.length -1) {\n           filterExpPattern.append(\"grep -v \" + excludeExp + \" | \");\n        } else {\n           filterExpPattern.append(\"grep -vc \" + excludeExp);\n        }\n      }\n      cmd = new String[] {\n                \"bash\",\n                \"-c\",\n                \"grep \"\n                + pattern + \" \" + filePattern + \" | \"\n                + filterExpPattern};\n    } else {\n      cmd = new String[] {\n                \"bash\",\n                \"-c\",\n                \"grep -c \"\n                + pattern + \" \" + filePattern\n                + \" | awk -F: '{s+=$2} END {print s}'\" };    \n    }\n    ShellCommandExecutor shexec = new ShellCommandExecutor(cmd);\n    shexec.execute();\n    String output = shexec.getOutput();\n    return Integer.parseInt(output.replaceAll(\"\\n\", \"\").trim());\n  }\n  \n  \/**\n   * This method is used for suspending the process.\n   * @param pid process id\n   * @throws IOException if an I\/O error occurs.\n   * @return true if process is suspended otherwise false.\n   *\/\n  public boolean DaemonProtocol.suspendProcess(String pid) throws IOException {\n    String suspendCmd = getDaemonConf().get(\"test.system.hdrc.suspend.cmd\",\n        \"kill -SIGSTOP\");\n    String [] command = {\"bash\", \"-c\", suspendCmd + \" \" + pid};\n    ShellCommandExecutor shexec = new ShellCommandExecutor(command);\n    try {\n      shexec.execute();\n    } catch (Shell.ExitCodeException e) {\n      LOG.warn(\"suspended process throws an exitcode \"\n          + \"exception for not being suspended the given process id.\");\n      return false;\n    }\n    LOG.info(\"The suspend process command is :\"\n        + shexec.toString()\n        + \" and the output for the command is \"\n        + shexec.getOutput());\n    return true;\n  }\n\n  \/**\n   * This method is used for resuming the process\n   * @param pid process id of suspended process.\n   * @throws IOException if an I\/O error occurs.\n   * @return true if suspeneded process is resumed otherwise false.\n   *\/\n  public boolean DaemonProtocol.resumeProcess(String pid) throws IOException {\n    String resumeCmd = getDaemonConf().get(\"test.system.hdrc.resume.cmd\",\n        \"kill -SIGCONT\");\n    String [] command = {\"bash\", \"-c\", resumeCmd + \" \" + pid};\n    ShellCommandExecutor shexec = new ShellCommandExecutor(command);\n    try {\n      shexec.execute();\n    } catch(Shell.ExitCodeException e) {\n        LOG.warn(\"Resume process throws an exitcode \"\n          + \"exception for not being resumed the given process id.\");\n      return false;\n    }\n    LOG.info(\"The resume process command is :\"\n        + shexec.toString()\n        + \" and the output for the command is \"\n        + shexec.getOutput());\n    return true;\n  }\n\n  private String DaemonProtocol.user = null;\n  \n  public String DaemonProtocol.getDaemonUser() {\n    return user;\n  }\n  \n  public void DaemonProtocol.setUser(String user) {\n    this.user = user;\n  }\n}\n","old_contents":"\/**\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements.  See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership.  The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * \"License\"); you may not use this file except in compliance\n * with the License.  You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.apache.hadoop.test.system;\n\nimport java.io.File;\nimport java.io.IOException;\nimport java.security.PrivilegedExceptionAction;\nimport java.util.HashMap;\nimport java.util.List;\nimport java.util.ArrayList;\nimport java.util.Map;\nimport java.util.Properties;\nimport org.apache.commons.logging.Log;\nimport org.apache.commons.logging.LogFactory;\nimport org.apache.hadoop.io.Writable;\nimport org.apache.hadoop.security.UserGroupInformation;\nimport org.apache.hadoop.util.Shell.ShellCommandExecutor;\nimport org.apache.hadoop.util.Shell;\nimport org.apache.hadoop.fs.FileStatus;\nimport org.apache.hadoop.fs.FileSystem;\nimport org.apache.hadoop.fs.Path;\nimport org.apache.hadoop.conf.Configuration;\n\n\/**\n * Default DaemonProtocolAspect which is used to provide default implementation\n * for all the common daemon methods. If a daemon requires more specialized\n * version of method, it is responsibility of the DaemonClient to introduce the\n * same in woven classes.\n * \n *\/\npublic aspect DaemonProtocolAspect {\n\n  private boolean DaemonProtocol.ready;\n  \n  @SuppressWarnings(\"unchecked\")\n  private HashMap<Object, List<ControlAction>> DaemonProtocol.actions = \n    new HashMap<Object, List<ControlAction>>();\n  private static final Log LOG = LogFactory.getLog(\n      DaemonProtocolAspect.class.getName());\n  \/**\n   * Set if the daemon process is ready or not, concrete daemon protocol should\n   * implement pointcuts to determine when the daemon is ready and use the\n   * setter to set the ready state.\n   * \n   * @param ready\n   *          true if the Daemon is ready.\n   *\/\n  public void DaemonProtocol.setReady(boolean ready) {\n    this.ready = ready;\n  }\n\n  \/**\n   * Checks if the daemon process is alive or not.\n   * \n   * @throws IOException\n   *           if daemon is not alive.\n   *\/\n  public void DaemonProtocol.ping() throws IOException {\n  }\n\n  \/**\n   * Checks if the daemon process is ready to accepting RPC connections after it\n   * finishes initialization. <br\/>\n   * \n   * @return true if ready to accept connection.\n   * \n   * @throws IOException\n   *\/\n  public boolean DaemonProtocol.isReady() throws IOException {\n    return ready;\n  }\n\n  \/**\n   * Returns the process related information regarding the daemon process. <br\/>\n   * \n   * @return process information.\n   * @throws IOException\n   *\/\n  public ProcessInfo DaemonProtocol.getProcessInfo() throws IOException {\n    int activeThreadCount = Thread.activeCount();\n    long currentTime = System.currentTimeMillis();\n    long maxmem = Runtime.getRuntime().maxMemory();\n    long freemem = Runtime.getRuntime().freeMemory();\n    long totalmem = Runtime.getRuntime().totalMemory();\n    Map<String, String> envMap = System.getenv();\n    Properties sysProps = System.getProperties();\n    Map<String, String> props = new HashMap<String, String>();\n    for (Map.Entry entry : sysProps.entrySet()) {\n      props.put((String) entry.getKey(), (String) entry.getValue());\n    }\n    ProcessInfo info = new ProcessInfoImpl(activeThreadCount, currentTime,\n        freemem, maxmem, totalmem, envMap, props);\n    return info;\n  }\n\n  public void DaemonProtocol.enable(List<Enum<?>> faults) throws IOException {\n  }\n\n  public void DaemonProtocol.disableAll() throws IOException {\n  }\n\n  public abstract Configuration DaemonProtocol.getDaemonConf()\n    throws IOException;\n\n  public FileStatus DaemonProtocol.getFileStatus(String path, boolean local) \n    throws IOException {\n    Path p = new Path(path);\n    FileSystem fs = getFS(p, local);\n    p.makeQualified(fs);\n    FileStatus fileStatus = fs.getFileStatus(p);\n    return cloneFileStatus(fileStatus);\n  }\n\n  public FileStatus[] DaemonProtocol.listStatus(String path, boolean local) \n    throws IOException {\n    Path p = new Path(path);\n    FileSystem fs = getFS(p, local);\n    FileStatus[] status = fs.listStatus(p);\n    if (status != null) {\n      FileStatus[] result = new FileStatus[status.length];\n      int i = 0;\n      for (FileStatus fileStatus : status) {\n        result[i++] = cloneFileStatus(fileStatus);\n      }\n      return result;\n    }\n    return status;\n  }\n\n  \/**\n   * FileStatus object may not be serializable. Clone it into raw FileStatus \n   * object.\n   *\/\n  private FileStatus DaemonProtocol.cloneFileStatus(FileStatus fileStatus) {\n    return new FileStatus(fileStatus.getLen(),\n        fileStatus.isDir(),\n        fileStatus.getReplication(),\n        fileStatus.getBlockSize(),\n        fileStatus.getModificationTime(),\n        fileStatus.getAccessTime(),\n        fileStatus.getPermission(),\n        fileStatus.getOwner(),\n        fileStatus.getGroup(),\n        fileStatus.getPath());\n  }\n\n  private FileSystem DaemonProtocol.getFS(final Path path, final boolean local)\n      throws IOException {\n    FileSystem ret = null;\n    try {\n      ret = UserGroupInformation.getLoginUser().doAs (\n          new PrivilegedExceptionAction<FileSystem>() {\n            public FileSystem run() throws IOException {\n              FileSystem fs = null;\n              if (local) {\n                fs = FileSystem.getLocal(getDaemonConf());\n              } else {\n                fs = path.getFileSystem(getDaemonConf());\n              }\n              return fs;\n            }\n          });\n    } catch (InterruptedException ie) {\n    }\n    return ret;\n  }\n  \n  @SuppressWarnings(\"unchecked\")\n  public ControlAction[] DaemonProtocol.getActions(Writable key) \n    throws IOException {\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(key);\n      if(actionList == null) {\n        return new ControlAction[0];\n      } else {\n        return (ControlAction[]) actionList.toArray(new ControlAction[actionList\n                                                                      .size()]);\n      }\n    }\n  }\n\n\n  @SuppressWarnings(\"unchecked\")\n  public void DaemonProtocol.sendAction(ControlAction action) \n      throws IOException {\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(action.getTarget());\n      if(actionList == null) {\n        actionList = new ArrayList<ControlAction>();\n        actions.put(action.getTarget(), actionList);\n      }\n      actionList.add(action);\n    } \n  }\n \n  @SuppressWarnings(\"unchecked\")\n  public boolean DaemonProtocol.isActionPending(ControlAction action) \n    throws IOException{\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(action.getTarget());\n      if(actionList == null) {\n        return false;\n      } else {\n        return actionList.contains(action);\n      }\n    }\n  }\n  \n  \n  @SuppressWarnings(\"unchecked\")\n  public void DaemonProtocol.removeAction(ControlAction action) \n    throws IOException {\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(action.getTarget());\n      if(actionList == null) {\n        return;\n      } else {\n        actionList.remove(action);\n      }\n    }\n  }\n  \n  public void DaemonProtocol.clearActions() throws IOException {\n    synchronized (actions) {\n      actions.clear();\n    }\n  }\n\n  public String DaemonProtocol.getFilePattern() {\n    \/\/We use the environment variable HADOOP_LOGFILE to get the\n    \/\/pattern to use in the search.\n    String logDir = System.getenv(\"HADOOP_LOG_DIR\");\n    String daemonLogPattern = System.getenv(\"HADOOP_LOGFILE\");\n    if(daemonLogPattern == null && daemonLogPattern.isEmpty()) {\n      return \"*\";\n    }\n    return  logDir+File.separator+daemonLogPattern+\"*\";\n  }\n\n  public int DaemonProtocol.getNumberOfMatchesInLogFile(String pattern,\n      String[] list) throws IOException {\n    StringBuffer filePattern = new StringBuffer(getFilePattern());    \n    if(list != null){\n      for(int i =0; i < list.length; ++i)\n      {\n        filePattern.append(\" | grep -v \" + list[i] );\n      }\n    }  \n    String[] cmd =\n        new String[] {\n            \"bash\",\n            \"-c\",\n            \"grep -c \"\n                + pattern + \" \" + filePattern\n                + \" | awk -F: '{s+=$2} END {print s}'\" };    \n    ShellCommandExecutor shexec = new ShellCommandExecutor(cmd);\n    shexec.execute();\n    String output = shexec.getOutput();\n    return Integer.parseInt(output.replaceAll(\"\\n\", \"\").trim());\n  }\n  \n  \/**\n   * This method is used for suspending the process.\n   * @param pid process id\n   * @throws IOException if an I\/O error occurs.\n   * @return true if process is suspended otherwise false.\n   *\/\n  public boolean DaemonProtocol.suspendProcess(String pid) throws IOException {\n    String suspendCmd = getDaemonConf().get(\"test.system.hdrc.suspend.cmd\",\n        \"kill -SIGSTOP\");\n    String [] command = {\"bash\", \"-c\", suspendCmd + \" \" + pid};\n    ShellCommandExecutor shexec = new ShellCommandExecutor(command);\n    try {\n      shexec.execute();\n    } catch (Shell.ExitCodeException e) {\n      LOG.warn(\"suspended process throws an exitcode \"\n          + \"exception for not being suspended the given process id.\");\n      return false;\n    }\n    LOG.info(\"The suspend process command is :\"\n        + shexec.toString()\n        + \" and the output for the command is \"\n        + shexec.getOutput());\n    return true;\n  }\n\n  \/**\n   * This method is used for resuming the process\n   * @param pid process id of suspended process.\n   * @throws IOException if an I\/O error occurs.\n   * @return true if suspeneded process is resumed otherwise false.\n   *\/\n  public boolean DaemonProtocol.resumeProcess(String pid) throws IOException {\n    String resumeCmd = getDaemonConf().get(\"test.system.hdrc.resume.cmd\",\n        \"kill -SIGCONT\");\n    String [] command = {\"bash\", \"-c\", resumeCmd + \" \" + pid};\n    ShellCommandExecutor shexec = new ShellCommandExecutor(command);\n    try {\n      shexec.execute();\n    } catch(Shell.ExitCodeException e) {\n        LOG.warn(\"Resume process throws an exitcode \"\n          + \"exception for not being resumed the given process id.\");\n      return false;\n    }\n    LOG.info(\"The resume process command is :\"\n        + shexec.toString()\n        + \" and the output for the command is \"\n        + shexec.getOutput());\n    return true;\n  }\n\n  private String DaemonProtocol.user = null;\n  \n  public String DaemonProtocol.getDaemonUser() {\n    return user;\n  }\n  \n  public void DaemonProtocol.setUser(String user) {\n    this.user = user;\n  }\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"2b80f6bc2338ce8ebf230fd37f0d40205d8ea536","subject":"call run replaced by execution run","message":"call run replaced by execution run\n","repos":"selig\/qea","old_file":"code\/qea\/src\/benchmark\/competition\/java\/jUnitRV_MMT\/monitoring\/JUnitRV_MMTThreeAspect.aj","new_file":"code\/qea\/src\/benchmark\/competition\/java\/jUnitRV_MMT\/monitoring\/JUnitRV_MMTThreeAspect.aj","new_contents":"package benchmark.competition.java.jUnitRV_MMT.monitoring;\r\n\r\nimport monitoring.impl.MonitorFactory;\r\nimport monitoring.intf.Monitor;\r\nimport properties.Property;\r\nimport properties.competition.JavaRV_mmt;\r\nimport structure.impl.other.Verdict;\r\nimport structure.intf.QEA;\r\nimport benchmark.competition.java.jUnitRV_MMT.ExampleLocking;\r\n\r\npublic aspect JUnitRV_MMTThreeAspect {\r\n\r\n\tprivate final Monitor monitor;\r\n\r\n\tprivate final int RUN = 1;\r\n\tprivate final int LOCK_TRUE = 2;\r\n\tprivate final int UNLOCK = 3;\r\n\tprivate final int ACTION = 4;\r\n\r\n\tpublic JUnitRV_MMTThreeAspect() {\r\n\t\tQEA qea = new JavaRV_mmt().make(Property.JAVARV_MMT_THREE);\r\n\t\tmonitor = MonitorFactory.create(qea);\r\n\t}\r\n\r\n\tpointcut run(ExampleLocking t) : execution(void ExampleLocking.run())\r\n\t\t&& target(t);\r\n\r\n\tpointcut lockEvent(ExampleLocking t) : call(boolean ExampleLocking.lock())\r\n\t\t&& target(t);\r\n\r\n\tpointcut unlockEvent(ExampleLocking t) :\r\n\t\tcall(void ExampleLocking.unlock()) && target(t);\r\n\r\n\tpointcut action(ExampleLocking t) : call(void ExampleLocking.action())\r\n\t\t&& target(t);\r\n\r\n\tbefore(ExampleLocking t) : run(t) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(RUN, t.getId());\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [id=\"\r\n\t\t\t\t\t\t\t+ t.getId()\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n\tafter(ExampleLocking t) returning(boolean result) : lockEvent(t) {\r\n\t\tif (result) {\r\n\t\t\tVerdict verdict = null;\r\n\t\t\tsynchronized (monitor) {\r\n\t\t\t\tverdict = monitor.step(LOCK_TRUE, t.getId());\r\n\t\t\t}\r\n\t\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\t\tSystem.err\r\n\t\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [id=\"\r\n\t\t\t\t\t\t\t\t+ t.getId()\r\n\t\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t\t}\r\n\t\t}\r\n\t};\r\n\r\n\tbefore(ExampleLocking t) : unlockEvent(t) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(UNLOCK, t.getId());\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [id=\"\r\n\t\t\t\t\t\t\t+ t.getId()\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n\tbefore(ExampleLocking t) : action(t) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(ACTION, t.getId());\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [id=\"\r\n\t\t\t\t\t\t\t+ t.getId()\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n}\r\n","old_contents":"package benchmark.competition.java.jUnitRV_MMT.monitoring;\r\n\r\nimport monitoring.impl.MonitorFactory;\r\nimport monitoring.intf.Monitor;\r\nimport properties.Property;\r\nimport properties.competition.JavaRV_mmt;\r\nimport structure.impl.other.Verdict;\r\nimport structure.intf.QEA;\r\nimport benchmark.competition.java.jUnitRV_MMT.ExampleLocking;\r\n\r\npublic aspect JUnitRV_MMTThreeAspect {\r\n\r\n\tprivate final Monitor monitor;\r\n\r\n\tprivate final int RUN = 1;\r\n\tprivate final int LOCK_TRUE = 2;\r\n\tprivate final int UNLOCK = 3;\r\n\tprivate final int ACTION = 4;\r\n\r\n\tpublic JUnitRV_MMTThreeAspect() {\r\n\t\tQEA qea = new JavaRV_mmt().make(Property.JAVARV_MMT_THREE);\r\n\t\tmonitor = MonitorFactory.create(qea);\r\n\t}\r\n\r\n\tpointcut run(ExampleLocking t) : call(void *.run())\r\n\t\t&& target(t);\r\n\r\n\tpointcut lockEvent(ExampleLocking t) : call(boolean ExampleLocking.lock())\r\n\t\t&& target(t);\r\n\r\n\tpointcut unlockEvent(ExampleLocking t) :\r\n\t\tcall(void ExampleLocking.unlock()) && target(t);\r\n\r\n\tpointcut action(ExampleLocking t) : call(void ExampleLocking.action())\r\n\t\t&& target(t);\r\n\r\n\tbefore(ExampleLocking t) : run(t) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(RUN, t.getId());\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [id=\"\r\n\t\t\t\t\t\t\t+ t.getId()\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n\tafter(ExampleLocking t) returning(boolean result) : lockEvent(t) {\r\n\t\tif (result) {\r\n\t\t\tVerdict verdict = null;\r\n\t\t\tsynchronized (monitor) {\r\n\t\t\t\tverdict = monitor.step(LOCK_TRUE, t.getId());\r\n\t\t\t}\r\n\t\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\t\tSystem.err\r\n\t\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [id=\"\r\n\t\t\t\t\t\t\t\t+ t.getId()\r\n\t\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t\t}\r\n\t\t}\r\n\t};\r\n\r\n\tbefore(ExampleLocking t) : unlockEvent(t) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(UNLOCK, t.getId());\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [id=\"\r\n\t\t\t\t\t\t\t+ t.getId()\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n\tbefore(ExampleLocking t) : action(t) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(ACTION, t.getId());\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [id=\"\r\n\t\t\t\t\t\t\t+ t.getId()\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n}\r\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"3ff2ebbf4601870e7773191350ec76479b2230a7","subject":"[misc] Fix package","message":"[misc] Fix package\n","repos":"xwiki\/xwiki-platform,pbondoer\/xwiki-platform,pbondoer\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,xwiki\/xwiki-platform,xwiki\/xwiki-platform","old_file":"xwiki-platform-core\/xwiki-platform-legacy\/xwiki-platform-legacy-oldcore\/src\/main\/aspect\/compatibility\/com\/xpn\/xwiki\/XWikiCompatibilityAspect.aj","new_file":"xwiki-platform-core\/xwiki-platform-legacy\/xwiki-platform-legacy-oldcore\/src\/main\/aspect\/compatibility\/com\/xpn\/xwiki\/XWikiCompatibilityAspect.aj","new_contents":"\/*\n * See the NOTICE file distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This is free software; you can redistribute it and\/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF site: http:\/\/www.fsf.org.\n *\/\npackage compatibility.com.xpn.xwiki;\n\nimport java.io.UnsupportedEncodingException;\nimport java.io.File;\nimport java.net.URL;\nimport java.net.URLEncoder;\nimport java.util.ArrayList;\nimport java.util.HashMap;\nimport java.util.List;\nimport java.util.Map;\n\nimport org.apache.commons.lang3.StringUtils;\nimport org.xwiki.cache.CacheException;\nimport org.xwiki.cache.CacheFactory;\nimport org.xwiki.cache.CacheManager;\nimport org.xwiki.cache.config.CacheConfiguration;\nimport org.xwiki.cache.eviction.LRUEvictionConfiguration;\nimport org.xwiki.component.manager.ComponentLookupException;\nimport org.xwiki.context.Execution;\nimport org.xwiki.context.ExecutionContext;\nimport org.xwiki.rendering.syntax.Syntax;\nimport org.xwiki.xml.XMLUtils;\nimport org.xwiki.model.reference.EntityReference;\nimport org.xwiki.model.reference.EntityReferenceResolver;\nimport org.xwiki.model.reference.DocumentReference;\nimport org.xwiki.model.reference.WikiReference;\nimport org.xwiki.model.EntityType;\nimport org.xwiki.url.XWikiEntityURL;\n\nimport com.xpn.xwiki.XWikiContext;\nimport com.xpn.xwiki.XWikiException;\nimport com.xpn.xwiki.XWiki;\nimport com.xpn.xwiki.cache.api.XWikiCache;\nimport com.xpn.xwiki.cache.api.XWikiCacheService;\nimport com.xpn.xwiki.cache.api.internal.XWikiCacheServiceStub;\nimport com.xpn.xwiki.cache.api.internal.XWikiCacheStub;\nimport com.xpn.xwiki.doc.XWikiDocument;\nimport com.xpn.xwiki.notify.XWikiNotificationManager;\nimport com.xpn.xwiki.objects.BaseObject;\nimport com.xpn.xwiki.objects.classes.BaseClass;\nimport com.xpn.xwiki.objects.classes.PropertyClass;\nimport com.xpn.xwiki.plugin.query.QueryPlugin;\nimport com.xpn.xwiki.plugin.query.XWikiCriteria;\nimport com.xpn.xwiki.plugin.query.XWikiQuery;\nimport com.xpn.xwiki.util.Util;\nimport com.xpn.xwiki.web.Utils;\nimport com.xpn.xwiki.web.XWikiMessageTool;\nimport com.xpn.xwiki.web.XWikiRequest;\n\n\/**\n * Add a backward compatibility layer to the {@link com.xpn.xwiki.XWiki} class.\n * \n * @version $Id$\n *\/\npublic privileged aspect XWikiCompatibilityAspect\n{\n    private static Map XWiki.threadMap = new HashMap();\n\n    private XWikiNotificationManager XWiki.notificationManager;\n\n    private EntityReferenceResolver<EntityReference> XWiki.defaultReferenceEntityReferenceResolver = Utils.getComponent(\n        EntityReferenceResolver.TYPE_REFERENCE);\n\n    \/**\n     * Transform a text in a URL compatible text\n     *\n     * @param content text to transform\n     * @return encoded result\n     * @deprecated replaced by Util#encodeURI since 1.3M2\n     *\/\n    @Deprecated\n    public String XWiki.getURLEncoded(String content)\n    {\n        try {\n            return URLEncoder.encode(content, this.getEncoding());\n        } catch (UnsupportedEncodingException e) {\n            return content;\n        }\n    }\n\n    \/**\n     * @return true for multi-wiki\/false for mono-wiki\n     * @deprecated replaced by {@link XWiki#isVirtualMode()} since 1.4M1.\n     *\/\n    @Deprecated\n    public boolean XWiki.isVirtual()\n    {\n        return isVirtualMode();\n    }\n\n    \/**\n     * @deprecated Virtual mode is on by default, starting with XWiki 5.0M2. Use\n     *             {@link #getVirtualWikisDatabaseNames(XWikiContext)} to get the list of wikis if needed.\n     * @return true for multi-wiki\/false for mono-wiki\n     *\/\n    @Deprecated\n    public boolean XWiki.isVirtualMode()\n    {\n        return true;\n    }\n\n    \/**\n     * @deprecated Removed since it isn't used; since 1.5M1.\n     *\/\n    @Deprecated\n    public static Map XWiki.getThreadMap()\n    {\n        return XWiki.threadMap;\n    }\n\n    \/**\n     * @deprecated Removed since it isn't used; since 1.5M1.\n     *\/\n    @Deprecated\n    public static void XWiki.setThreadMap(Map threadMap)\n    {\n        XWiki.threadMap = threadMap;\n    }\n\n    \/**\n     * @return the cache service.\n     * @deprecated replaced by {@link XWiki#getCacheFactory(XWikiContext)} or\n     *             {@link XWiki#getLocalCacheFactory(XWikiContext)} since 1.5M2.\n     *\/\n    @Deprecated\n    public XWikiCacheService XWiki.getCacheService()\n    {\n        return new XWikiCacheServiceStub(getCacheFactory(), getLocalCacheFactory());\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getVirtualWikiCache(XWikiContext)} since 1.5M2.\n     *\/\n    @Deprecated\n    public XWikiCache XWiki.getVirtualWikiMap()\n    {\n        return new XWikiCacheStub(this.virtualWikiMap);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpaceCopyright(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebCopyright(XWikiContext context)\n    {\n        return this.getSpaceCopyright(context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, String defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, String, String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, String space, String defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, space, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsLong(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public long XWiki.getWebPreferenceAsLong(String preference, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsLong(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsLong(String, long, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public long XWiki.getWebPreferenceAsLong(String preference, long defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsLong(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsInt(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.getWebPreferenceAsInt(String preference, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsInt(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsInt(String, int, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.getWebPreferenceAsInt(String preference, int defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsInt(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#copySpaceBetweenWikis(String, String, String, String, XWikiContext)} since\n     *             2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.copyWikiWeb(String space, String sourceWiki, String targetWiki, String language, XWikiContext context)\n        throws XWikiException\n    {\n        return this.copySpaceBetweenWikis(space, sourceWiki, targetWiki, language, context);\n    }\n\n    \/**\n     * @deprecated replaced by\n     *             {@link XWiki#copySpaceBetweenWikis(String, String, String, String, boolean, XWikiContext)} since\n     *             2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.copyWikiWeb(String space, String sourceWiki, String targetWiki, String language, boolean clean,\n        XWikiContext context) throws XWikiException\n    {\n        return this.copySpaceBetweenWikis(space, sourceWiki, targetWiki, language, clean, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getDefaultSpace(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getDefaultWeb(XWikiContext context)\n    {\n        return this.getDefaultSpace(context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#skipDefaultSpaceInURLs(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public boolean XWiki.useDefaultWeb(XWikiContext context)\n    {\n        return this.skipDefaultSpaceInURLs(context);\n    }\n\n    \/**\n     * @deprecated use {@link XWikiMessageTool#get(String, List)} instead. You can access message tool using\n     *             {@link XWikiContext#getMessageTool()}.\n     *\/\n    @Deprecated\n    public String XWiki.getMessage(String item, XWikiContext context)\n    {\n        XWikiMessageTool msg = context.getMessageTool();\n        if (msg == null) {\n            return item;\n        } else {\n            return msg.get(item);\n        }\n    }\n\n    \/**\n     * @deprecated Removed since it isn't used; since 3.1M2.\n     *\/\n    @Deprecated\n    public String XWiki.getHTMLArea(String content, XWikiContext context)\n    {\n        StringBuilder result = new StringBuilder();\n\n        String scontent = XMLUtils.escape(content);\n        scontent = scontent.replaceAll(\"\\r?+\\n\", \"<br class=\\\"htmlarea\\\"\/>\");\n\n        result.append(\"<textarea name=\\\"content\\\" id=\\\"content\\\" rows=\\\"25\\\" cols=\\\"80\\\">\");\n        result.append(scontent);\n        result.append(\"<\/textarea>\");\n\n        return result.toString();\n    }\n\n    @Deprecated\n    public XWikiNotificationManager XWiki.getNotificationManager()\n    {\n        if (this.notificationManager == null) {\n          this.notificationManager = new XWikiNotificationManager();\n        }\n\n        return this.notificationManager;\n    }\n\n    @Deprecated\n    public void XWiki.setNotificationManager(XWikiNotificationManager notificationManager)\n    {\n        this.notificationManager = notificationManager;\n    }\n    \n    @Deprecated\n    public String XWiki.displaySearch(String fieldname, String className, XWikiCriteria criteria, XWikiContext context)\n        throws XWikiException\n    {\n        return displaySearch(fieldname, className, \"\", criteria, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearch(String fieldname, String className, XWikiContext context) throws XWikiException\n    {\n        return displaySearch(fieldname, className, \"\", new XWikiCriteria(), context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearch(String fieldname, String className, String prefix, XWikiCriteria criteria,\n        XWikiContext context) throws XWikiException\n    {\n        BaseClass bclass = getDocument(className, context).getXClass();\n        PropertyClass pclass = (PropertyClass) bclass.get(fieldname);\n        if (criteria == null) {\n            criteria = new XWikiCriteria();\n        }\n\n        if (pclass == null) {\n            return \"\";\n        } else {\n            return pclass.displaySearch(fieldname, prefix + className + \"_\", criteria, context);\n        }\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchColumns(String className, XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        return displaySearchColumns(className, \"\", query, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchColumns(String className, String prefix, XWikiQuery query, XWikiContext context)\n        throws XWikiException\n    {\n        BaseClass bclass = getDocument(className, context).getXClass();\n\n        if (query == null) {\n            query = new XWikiQuery();\n        }\n\n        return bclass.displaySearchColumns(className + \"_\" + prefix, query, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchOrder(String className, XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        return displaySearchOrder(className, \"\", query, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchOrder(String className, String prefix, XWikiQuery query, XWikiContext context)\n        throws XWikiException\n    {\n        BaseClass bclass = getDocument(className, context).getXClass();\n\n        if (query == null) {\n            query = new XWikiQuery();\n        }\n\n        return bclass.displaySearchOrder(className + \"_\" + prefix, query, context);\n    }\n\n    @Deprecated\n    public <T> List<T> XWiki.search(XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        QueryPlugin qp = (QueryPlugin) getPlugin(\"query\", context);\n        if (qp == null) {\n            return null;\n        }\n\n        return qp.search(query);\n    }\n\n    @Deprecated\n    public XWikiQuery XWiki.createQueryFromRequest(String className, XWikiContext context) throws XWikiException\n    {\n        return new XWikiQuery(context.getRequest(), className, context);\n    }\n\n    @Deprecated\n    public String XWiki.searchAsTable(XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        QueryPlugin qp = (QueryPlugin) getPlugin(\"query\", context);\n        if (qp == null) {\n            return null;\n        }\n\n        List<String> list = qp.search(query);\n        String result = \"{table}\\r\\n\";\n        List<String> headerColumns = new ArrayList<String>();\n        List<String> displayProperties = query.getDisplayProperties();\n        for (String propname : displayProperties) {\n            PropertyClass pclass = getPropertyClassFromName(propname, context);\n            if (pclass != null) {\n                headerColumns.add(pclass.getPrettyName());\n            } else {\n                if (propname.startsWith(\"doc.\")) {\n                    propname = propname.substring(4);\n                    headerColumns.add(XWikiDocument.getInternalPropertyName(propname, context));\n                } else {\n                    headerColumns.add(propname);\n                }\n\n            }\n        }\n\n        result += StringUtils.join(headerColumns.toArray(), \" | \") + \"\\r\\n\";\n        for (String docname : list) {\n            List<String> rowColumns = new ArrayList<String>();\n            XWikiDocument doc = getDocument(docname, context);\n            for (String propname : displayProperties) {\n                PropertyClass pclass = getPropertyClassFromName(propname, context);\n                if (pclass == null) {\n                    if (propname.startsWith(\"doc.\")) {\n                        propname = propname.substring(4);\n                    }\n                    String value = doc.getInternalProperty(propname);\n                    rowColumns.add((value == null) ? \" \" : value);\n                } else {\n                    BaseObject bobj = doc.getObject(pclass.getObject().getName());\n                    rowColumns.add(doc.display(pclass.getName(), \"view\", bobj, context));\n                }\n            }\n            result += StringUtils.join(rowColumns.toArray(), \" | \") + \"\\r\\n\";\n        }\n\n        result += \"{table}\\r\\n\";\n\n        return result;\n    }\n\n    @Deprecated\n    public String XWiki.getDocLanguagePreference(XWikiContext context)\n    {\n        return getLanguagePreference(context);\n    }\n\n    @Deprecated\n    public void XWiki.flushCache()\n    {\n        Execution execution = Utils.getComponent(Execution.class);\n\n        ExecutionContext ec = execution.getContext();\n\n        flushCache(ec != null ? (XWikiContext) ec.getProperty(\"xwikicontext\") : null);\n    }\n\n    \/**\n     * @deprecated use WikiManager plugin instead\n     *\/\n    @Deprecated\n    public int XWiki.createNewWiki(String wikiName, String wikiUrl, String wikiAdmin, String baseWikiName,\n        String description, String wikilanguage, boolean failOnExist, XWikiContext context) throws XWikiException\n    {\n        String database = context.getDatabase();\n        wikiName = wikiName.toLowerCase();\n\n        try {\n            XWikiDocument userdoc = getDocument(wikiAdmin, context);\n\n            \/\/ User does not exist\n            if (userdoc.isNew()) {\n                if (LOGGER.isErrorEnabled()) {\n                    LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"user does not exist\");\n                }\n                return -2;\n            }\n\n            \/\/ User is not active\n            if (!(userdoc.getIntValue(\"XWiki.XWikiUsers\", \"active\") == 1)) {\n                if (LOGGER.isErrorEnabled()) {\n                    LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"user is not active\");\n                }\n                return -3;\n            }\n\n            String wikiForbiddenList = Param(\"xwiki.virtual.reserved_wikis\");\n            if (Util.contains(wikiName, wikiForbiddenList, \", \")) {\n                if (LOGGER.isErrorEnabled()) {\n                    LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"wiki name is forbidden\");\n                }\n                return -4;\n            }\n\n            String wikiServerPage = \"XWikiServer\" + wikiName.substring(0, 1).toUpperCase() + wikiName.substring(1);\n            \/\/ Verify is server page already exist\n            XWikiDocument serverdoc = getDocument(SYSTEM_SPACE, wikiServerPage, context);\n            if (serverdoc.isNew()) {\n                \/\/ clear entry in virtual wiki cache\n                this.virtualWikiMap.remove(wikiUrl);\n\n                \/\/ Create Wiki Server page\n                serverdoc.setStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"server\", wikiUrl);\n                serverdoc.setStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"owner\", wikiAdmin);\n                if (description != null) {\n                    serverdoc.setLargeStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"description\", description);\n                }\n                if (wikilanguage != null) {\n                    serverdoc.setStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"language\", wikilanguage);\n                }\n                if (!getDefaultDocumentSyntax().equals(Syntax.XWIKI_1_0.toIdString())) {\n                    serverdoc.setContent(\"{{include document=\\\"XWiki.XWikiServerForm\\\"\/}}\\n\");\n                    serverdoc.setSyntax(Syntax.XWIKI_2_0);\n                } else {\n                    serverdoc.setContent(\"#includeForm(\\\"XWiki.XWikiServerForm\\\")\\n\");\n                    serverdoc.setSyntax(Syntax.XWIKI_1_0);\n                }\n                serverdoc.setParentReference(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE);\n                saveDocument(serverdoc, context);\n            } else {\n                \/\/ If we are not allowed to continue if server page already exists\n                if (failOnExist) {\n                    if (LOGGER.isErrorEnabled()) {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki server page already exists\");\n                    }\n                    return -5;\n                } else if (LOGGER.isWarnEnabled()) {\n                    LOGGER.warn(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"wiki server page already exists\");\n                }\n            }\n\n            \/\/ Create wiki database\n            try {\n                context.setDatabase(getDatabase());\n                getStore().createWiki(wikiName, context);\n            } catch (XWikiException e) {\n                if (LOGGER.isErrorEnabled()) {\n                    if (e.getCode() == 10010) {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki database already exists\");\n                    } else if (e.getCode() == 10011) {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki database creation failed\");\n                    } else {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki database creation threw exception\", e);\n                    }\n                }\n            } catch (Exception e) {\n                LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                    + \"wiki database creation threw exception\", e);\n            }\n\n            try {\n                updateDatabase(wikiName, true, false, context);\n            } catch (Exception e) {\n                LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                    + \"wiki database shema update threw exception\", e);\n                return -6;\n            }\n\n            \/\/ Copy base wiki\n            int nb = copyWiki(baseWikiName, wikiName, wikilanguage, context);\n            \/\/ Save the number of docs copied in the context\n            context.put(\"nbdocs\", Integer.valueOf(nb));\n\n            \/\/ Create user page in his wiki\n            \/\/ Let's not create it anymore.. this makes the creator loose\n            \/\/ super admin rights on his wiki\n            \/\/ copyDocument(wikiAdmin, getDatabase(), wikiName, wikilanguage, context);\n\n            \/\/ Modify rights in user wiki\n            context.setDatabase(wikiName);\n            \/*\n             * XWikiDocument wikiprefdoc = getDocument(\"XWiki.XWikiPreferences\", context);\n             * wikiprefdoc.setStringValue(\"XWiki.XWikiGlobalRights\", \"users\", wikiAdmin);\n             * wikiprefdoc.setStringValue(\"XWiki.XWikiGlobalRights\", \"levels\", \"admin, edit\");\n             * wikiprefdoc.setIntValue(\"XWiki.XWikiGlobalRights\", \"allow\", 1); saveDocument(wikiprefdoc, context);\n             *\/\n            return 1;\n        } catch (Exception e) {\n            LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                + \"wiki creation threw exception\", e);\n            return -10;\n        } finally {\n            context.setDatabase(database);\n        }\n    }\n\n    \/**\n     * Get the XWiki temporary filesystem directory (cleaned up automatically by XWiki).\n     *\n     * @param context\n     * @return temporary directory\n     * @since 1.1 Milestone 4\n     * @deprecated starting with 4.2M1 use {@link org.xwiki.environment.Environment#getTemporaryDirectory()}\n     *\/\n    @Deprecated\n    public File XWiki.getTempDirectory(XWikiContext context)\n    {\n        return this.environment.getTemporaryDirectory();\n    }\n\n    \/**\n     * Get a new directory in the xwiki work directory\n     *\n     * @param subdir desired directory name\n     * @param context\n     * @return work subdirectory\n     * @since 1.1 Milestone 4\n     * @deprecated starting with 4.2M1 use {@link org.xwiki.environment.Environment#getPermanentDirectory()}\n     *\/\n    @Deprecated\n    public File XWiki.getWorkSubdirectory(String subdir, XWikiContext context)\n    {\n        File fdir = new File(this.environment.getPermanentDirectory().getAbsolutePath(), subdir);\n        if (!fdir.exists()) {\n            fdir.mkdir();\n        }\n\n        return fdir;\n    }\n\n    \/**\n     * Get the XWiki work directory\n     *\n     * @param context\n     * @return work directory\n     * @since 1.1 Milestone 4\n     * @deprecated starting with 4.2M1 use {@link org.xwiki.environment.Environment#getPermanentDirectory()}\n     *\/\n    @Deprecated\n    public File XWiki.getWorkDirectory(XWikiContext context)\n    {\n        return this.environment.getPermanentDirectory();\n    }\n\n    \/**\n     * @deprecated starting with 5.1M1 use {@code org.xwiki.url.XWikiURLFactory} instead and starting with 5.3M1 use\n     *             {@link ResourceFactory}\n     *\/\n    @Deprecated\n    public XWikiDocument XWiki.getDocumentFromPath(String path, XWikiContext context) throws XWikiException\n    {\n        return getDocument(getDocumentReferenceFromPath(path, context), context);\n    }\n\n    \/**\n     * @since 2.3M1\n     * @deprecated starting with 5.1M1 use {@code org.xwiki.url.XWikiURLFactory} instead and starting with 5.3M1 use\n     *             {@link ResourceFactory}\n     *\/\n    @Deprecated\n    public DocumentReference XWiki.getDocumentReferenceFromPath(String path, XWikiContext context)\n    {\n        \/\/ TODO: Remove this and use XWikiURLFactory instead in XWikiAction and all entry points.\n        List<String> segments = new ArrayList<String>();\n        for (String segment : path.split(\"\/\", -1)) {\n            segments.add(Util.decodeURI(segment, context));\n        }\n        \/\/ Remove the first segment if it's empty to cater for cases when the path starts with \"\/\"\n        if (segments.size() > 0 && segments.get(0).length() == 0) {\n            segments.remove(0);\n        }\n\n        XWikiEntityURL entityURL = buildEntityURLFromPathSegments(new WikiReference(context.getDatabase()), segments);\n\n        return new DocumentReference(entityURL.getEntityReference().extractReference(EntityType.DOCUMENT));\n    }\n\n    \/**\n     * @deprecated since 2.3M1 use {@link #getDocumentReferenceFromPath(String, XWikiContext)} instead\n     *\/\n    @Deprecated\n    public String XWiki.getDocumentNameFromPath(String path, XWikiContext context)\n    {\n        return this.localStringEntityReferenceSerializer.serialize(getDocumentReferenceFromPath(path, context));\n    }\n\n    \/**\n     * @deprecated since 2.3M1 use {@link #getDocumentReferenceFromPath(String, XWikiContext)} instead\n     *\/\n    @Deprecated\n    public String XWiki.getDocumentName(XWikiRequest request, XWikiContext context)\n    {\n        return this.localStringEntityReferenceSerializer.serialize(getDocumentReference(request, context));\n    }\n\n    \/**\n     * @deprecated starting with 5.1M1 use {@code org.xwiki.url.XWikiURLFactory} instead and starting with 5.3M1 use\n     *             {@link ResourceFactory}\n     *\/\n    @Deprecated\n    private XWikiEntityURL XWiki.buildEntityURLFromPathSegments(WikiReference wikiReference, List<String> pathSegments)\n    {\n        XWikiEntityURL entityURL;\n\n        \/\/ Rules based on counting the url segments:\n        \/\/ - 0 segments (e.g. \"\"): default document reference, \"view\" action\n        \/\/ - 1 segment (e.g. \"\/\", \"\/Document\"): default space, specified document (and default if empty), \"view\" action\n        \/\/ - 2 segments (e.g. \"\/Space\/\", \"\/Space\/Document\"): specified space, document (and default doc if empty),\n        \/\/   \"view\" action\n        \/\/ - 3 segments (e.g. \"\/action\/Space\/Document\"): specified space, document (and default doc if empty),\n        \/\/   specified action\n        \/\/ - 4 segments (e.g. \"\/download\/Space\/Document\/attachment\"): specified space, document and attachment (and\n        \/\/   default doc if empty), \"download\" action\n        \/\/ - 4 segments or more (e.g. \"\/action\/Space\/Document\/whatever\/else\"): specified space, document (and default\n        \/\/     doc if empty), specified \"action\" (if action != \"download\"), trailing segments ignored\n\n        String spaceName = null;\n        String pageName = null;\n        String attachmentName = null;\n        String action = \"view\";\n\n        if (pathSegments.size() == 1) {\n            pageName = pathSegments.get(0);\n        } else if (pathSegments.size() == 2) {\n            spaceName = pathSegments.get(0);\n            pageName = pathSegments.get(1);\n        } else if (pathSegments.size() >= 3) {\n            action = pathSegments.get(0);\n            spaceName = pathSegments.get(1);\n            pageName = pathSegments.get(2);\n            if (action.equals(\"download\") && pathSegments.size() >= 4) {\n                attachmentName = pathSegments.get(3);\n            }\n        }\n\n        \/\/ Normalize the extracted space\/page to resolve empty\/null values and replace them with default values.\n        EntityReference reference = wikiReference;\n        EntityType entityType = EntityType.DOCUMENT;\n        if (!StringUtils.isEmpty(spaceName)) {\n            reference = new EntityReference(spaceName, EntityType.SPACE, reference);\n        }\n        if (!StringUtils.isEmpty(pageName)) {\n            reference = new EntityReference(pageName, EntityType.DOCUMENT, reference);\n        }\n        if (!StringUtils.isEmpty(attachmentName)) {\n            reference = new EntityReference(attachmentName, EntityType.ATTACHMENT, reference);\n            entityType = EntityType.ATTACHMENT;\n        }\n        reference = this.defaultReferenceEntityReferenceResolver.resolve(reference, entityType);\n\n        entityURL = new XWikiEntityURL(reference);\n        entityURL.setAction(action);\n\n        return entityURL;\n    }\n\n    \/**\n     * Extracts the name of the wiki from a context's request. In some cases, including autowww, the main wiki may be\n     * returned instead of what was requested, as a result of some assumptions. Even so, the resulting wiki name is not\n     * guaranteed to exist, it is just what XWiki understood from the request.\n     *\n     * @param context the context which contains the request\n     * @return the name of the wiki that was requested\n     * @throws XWikiException if problems occur\n     * @deprecated starting with 5.2M1 use {@link ResourceFactory} instead\n     *\/\n    @Deprecated\n    public String XWiki.getRequestWikiName(XWikiContext context) throws XWikiException\n    {\n        \/\/ Host is full.host.name in DNS-based multiwiki, and wikiname in path-based multiwiki.\n        String host = \"\";\n        \/\/ Canonical name of the wiki (database).\n        String wikiName = \"\";\n        \/\/ wikiDefinition should be the document holding the definition of the virtual wiki, a document in the main\n        \/\/ wiki with a XWiki.XWikiServerClass object attached to it\n        DocumentReference wikiDefinition;\n\n        XWikiRequest request = context.getRequest();\n        try {\n            URL requestURL = context.getURL();\n            host = requestURL.getHost();\n        } catch (Exception e) {\n        }\n\n        \/\/ In path-based multi-wiki, the wiki name is an element of the request path.\n        \/\/ The url is in the form \/xwiki (app name)\/wiki (servlet name)\/wikiname\/\n        if (\"1\".equals(this.Param(\"xwiki.virtual.usepath\", \"1\"))) {\n            String uri = request.getRequestURI();\n            if (LOGGER.isDebugEnabled()) {\n                LOGGER.debug(\"Request uri is: \" + uri);\n            }\n            \/\/ Remove the (eventual) context path from the URI, usually \/xwiki\n            uri = stripSegmentFromPath(uri, request.getContextPath());\n            \/\/ Remove the (eventual) servlet path from the URI, usually \/wiki\n            String servletPath = request.getServletPath();\n            uri = stripSegmentFromPath(uri, servletPath);\n\n            if (servletPath.equals(\"\/\" + this.Param(\"xwiki.virtual.usepath.servletpath\", \"wiki\"))) {\n                \/\/ Requested path corresponds to a path-based wiki, now the wiki name is between the first and\n                \/\/ second \"\/\"\n                host = StringUtils.substringBefore(StringUtils.removeStart(uri, \"\/\"), \"\/\");\n            }\n        }\n\n        if (StringUtils.isEmpty(host) || host.equals(context.getMainXWiki())) {\n            \/\/ Can't find any wiki name, return the main wiki\n            return context.getMainXWiki();\n        }\n\n        \/\/ Try to use the full domain name\/path wiki name and see if it corresponds to any existing wiki descriptors\n        wikiDefinition = this.findWikiServer(host, context);\n\n        if (wikiDefinition == null) {\n            \/\/ No definition found based on the full domain name\/path wiki name, try to use the first part of the domain\n            \/\/ name as the wiki name\n            String servername = StringUtils.substringBefore(host, \".\");\n\n            \/\/ Note: Starting 5.0M2, the autowww behavior is default and the ability to disable it is now removed.\n            if (\"0\".equals(this.Param(\"xwiki.virtual.autowww\"))) {\n                LOGGER.warn(String.format(\"%s %s\", \"'xwiki.virtual.autowww' is no longer supported.\",\n                    \"Please update your configuration and\/or see XWIKI-8877 for more details.\"));\n            }\n\n            \/\/ As a convenience, we do not require the creation of an xwiki:XWiki.XWikiServerXwiki page for the main\n            \/\/ wiki and automatically go to the main wiki in certain cases:\n            \/\/ - \"www.<anyDomain>.<domainExtension>\" - if it starts with www, we first check if a subwiki with that\n            \/\/ name exists; if yes, the go to the \"www\" subwiki, if not, go to the main wiki\n            \/\/ - \"localhost\"\n            \/\/ - IP address\n            if (\"www\".equals(servername)) {\n                \/\/ Check that \"www\" is not actually the name of an existing subwiki.\n                wikiDefinition = this.findWikiServer(servername, context);\n                if (wikiDefinition == null) {\n                    \/\/ Not the case, use the main wiki.\n                    return context.getMainXWiki();\n                }\n            } else if (\"localhost\".equals(host) || host.matches(\"[0-9]{1,3}(?:\\\\.[0-9]{1,3}){3}\")) {\n                \/\/ Direct access to the main wiki.\n                return context.getMainXWiki();\n            }\n\n            \/\/ Use the name from the subdomain\n            wikiName = servername;\n\n            if (!context.isMainWiki(wikiName)\n                && !\"1\".equals(context.getWiki().Param(\"xwiki.virtual.failOnWikiDoesNotExist\", \"0\"))) {\n                \/\/ Check if the wiki really exists\n                if (!exists(getServerWikiPage(wikiName), context)) {\n                    \/\/ Fallback on main wiki\n                    wikiName = context.getMainXWiki();\n                }\n            }\n        } else {\n            \/\/ Use the name from the located wiki descriptor\n            wikiName = StringUtils.removeStart(wikiDefinition.getName(), \"XWikiServer\").toLowerCase();\n        }\n\n        return wikiName;\n    }\n\n    \/**\n     * Searches for the document containing the definition of the virtual wiki corresponding to the specified hostname.\n     *\n     * @param host the hostname, as specified in the request (for example: {@code forge.xwiki.org})\n     * @param context the current context\n     * @return the name of the document containing the wiki definition, or {@code null} if no wiki corresponds to the\n     *         hostname\n     * @throws XWikiException if a problem occurs while searching the storage\n     *\/\n    private DocumentReference XWiki.findWikiServer(String host, XWikiContext context) throws XWikiException\n    {\n        ensureVirtualWikiMapExists();\n        DocumentReference wikiName = this.virtualWikiMap.get(host);\n\n        if (wikiName == null) {\n            \/\/ Not loaded yet, search for it in the main wiki\n            String hql =\n                \", BaseObject as obj, StringProperty as prop WHERE obj.name=doc.fullName\"\n                    + \" AND doc.space='XWiki' AND doc.name LIKE 'XWikiServer%'\"\n                    + \" AND obj.className='XWiki.XWikiServerClass' AND prop.id.id = obj.id\"\n                    + \" AND prop.id.name = 'server' AND prop.value=?\";\n            List<String> parameters = new ArrayList<String>(1);\n            parameters.add(host);\n            try {\n                List<DocumentReference> list =\n                    context.getWiki().getStore().searchDocumentReferences(hql, parameters, context);\n                if ((list != null) && (list.size() > 0)) {\n                    wikiName = list.get(0);\n                }\n\n                this.virtualWikiMap.set(host, wikiName);\n            } catch (XWikiException e) {\n                LOGGER.warn(\"Error when searching for wiki name from URL host [\" + host + \"]\", e);\n            }\n        }\n\n        return wikiName;\n    }\n\n    private void XWiki.ensureVirtualWikiMapExists() throws XWikiException\n    {\n        synchronized (this) {\n            if (this.virtualWikiMap == null) {\n                int iCapacity = 1000;\n                try {\n                    String capacity = Param(\"xwiki.virtual.cache.capacity\");\n                    if (capacity != null) {\n                        iCapacity = Integer.parseInt(capacity);\n                    }\n                } catch (Exception e) {\n                }\n                try {\n                    CacheConfiguration configuration = new CacheConfiguration();\n                    configuration.setConfigurationId(\"xwiki.virtualwikimap\");\n                    LRUEvictionConfiguration lru = new LRUEvictionConfiguration();\n                    lru.setMaxEntries(iCapacity);\n                    configuration.put(LRUEvictionConfiguration.CONFIGURATIONID, lru);\n\n                    this.virtualWikiMap = getCacheFactory().newCache(configuration);\n                } catch (CacheException e) {\n                    throw new XWikiException(XWikiException.MODULE_XWIKI_CACHE,\n                        XWikiException.ERROR_CACHE_INITIALIZING, \"Failed to create new cache\", e);\n                }\n            }\n        }\n    }\n\n    \/**\n     * @deprecated replaced by {@link #setUserDefaultGroup(String fullwikiname, XWikiContext context)}\n     * @param context\n     * @param fullwikiname\n     * @throws XWikiException\n     *\/\n    @Deprecated\n    public void XWiki.SetUserDefaultGroup(XWikiContext context, String fullwikiname) throws XWikiException\n    {\n        this.setUserDefaultGroup(fullwikiname, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link #protectUserPage(String,String,XWikiDocument,XWikiContext)}\n     * @param context\n     * @param fullwikiname\n     * @param userRights\n     * @param doc\n     * @throws XWikiException\n     *\/\n    @Deprecated\n    public void XWiki.ProtectUserPage(XWikiContext context, String fullwikiname, String userRights, XWikiDocument doc)\n        throws XWikiException\n    {\n        this.protectUserPage(fullwikiname, userRights, doc, context);\n    }\n\n    \/**\n     * @return the cache factory.\n     * @since 1.5M2.\n     * @deprecated Since 1.7M1, use {@link CacheManager} component instead using {@link Utils#getComponent(Class)}\n     *\/\n    @Deprecated\n    public CacheFactory XWiki.getCacheFactory()\n    {\n        CacheFactory cacheFactory;\n\n        String cacheHint = Param(\"xwiki.cache.cachefactory.hint\", null);\n\n        if (StringUtils.isEmpty(cacheHint) || Utils.getComponent(CacheFactory.class, cacheHint) == null) {\n            CacheManager cacheManager = Utils.getComponent(CacheManager.class);\n            try {\n                cacheFactory = cacheManager.getCacheFactory();\n            } catch (ComponentLookupException e) {\n                throw new RuntimeException(\"Failed to get cache factory component\", e);\n            }\n        } else {\n            cacheFactory = Utils.getComponent(CacheFactory.class, cacheHint);\n        }\n\n        return cacheFactory;\n    }\n\n    \/**\n     * @return the cache factory creating local caches.\n     * @since 1.5M2.\n     * @deprecated Since 1.7M1, use {@link CacheManager} component instead using {@link Utils#getComponent(Class)}\n     *\/\n    @Deprecated\n    public CacheFactory XWiki.getLocalCacheFactory()\n    {\n        CacheFactory localCacheFactory;\n\n        String localCacheHint = Param(\"xwiki.cache.cachefactory.local.hint\", null);\n\n        if (StringUtils.isEmpty(localCacheHint) || Utils.getComponent(CacheFactory.class, localCacheHint) == null) {\n            CacheManager cacheManager = Utils.getComponent(CacheManager.class);\n            try {\n                localCacheFactory = cacheManager.getLocalCacheFactory();\n            } catch (ComponentLookupException e) {\n                throw new RuntimeException(\"Failed to get local cache factory component\", e);\n            }\n        } else {\n            localCacheFactory = Utils.getComponent(CacheFactory.class, localCacheHint);\n        }\n\n        return localCacheFactory;\n    }\n\n    \/**\n     * @deprecated since 2.3M1 use {@link #hasVersioning(XWikiContext)} instead\n     *\/\n    @Deprecated\n    public boolean XWiki.hasVersioning(String fullName, XWikiContext context)\n    {\n        return hasVersioning(context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link #include(String topic, boolean isForm, XWikiContext context)}\n     * @param topic\n     * @param context\n     * @param isForm\n     * @return\n     * @throws XWikiException\n     *\/\n    @Deprecated\n    public String XWiki.include(String topic, XWikiContext context, boolean isForm) throws XWikiException\n    {\n        return include(topic, isForm, context);\n    }\n    \n    \/**\n     * Checks if the wiki is running in test mode.\n     * \n     * @return {@code true} if the wiki is running Cactus tests, {@code false} otherwise\n     * @deprecated No longer used.\n     *\/\n    @Deprecated\n    public boolean XWiki.isTest()\n    {\n        return this.test;\n    }\n\n    \/**\n     * Marks that the wiki is running in test mode.\n     * \n     * @param test whether tests are being executed\n     * @deprecated No longer used.\n     *\/\n    @Deprecated\n    public void XWiki.setTest(boolean test)\n    {\n        this.test = test;\n    }\n\n    \/**\n     * @deprecated use {@link org.xwiki.localization.LocalizationManager} instead. From velocity you can access it using\n     *             the {@code $services.localization} binding, see {@code LocalizationScriptService}\n     *\/\n    @Deprecated\n    public String XWiki.parseMessage(XWikiContext context)\n    {\n        String message = (String) context.get(\"message\");\n        if (message == null) {\n            return null;\n        }\n\n        return parseMessage(message, context);\n    }\n\n    \/**\n     * @deprecated use {@link org.xwiki.localization.LocalizationManager} instead. From velocity you can access it using\n     *             the {@code $services.localization} binding, see {@code LocalizationScriptService}\n     *\/\n    @Deprecated\n    public String XWiki.parseMessage(String id, XWikiContext context)\n    {\n        XWikiMessageTool msg = context.getMessageTool();\n\n        List<?> parameters = (List<?>) context.get(\"messageParameters\");\n\n        String translatedMessage;\n        if (parameters != null) {\n            translatedMessage = msg.get(id, parameters);\n        } else {\n            translatedMessage = msg.get(id);\n        }\n\n        return parseContent(translatedMessage, context);\n    }\n}\n","old_contents":"\/*\n * See the NOTICE file distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This is free software; you can redistribute it and\/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF site: http:\/\/www.fsf.org.\n *\/\npackage com.xpn.xwiki;\n\nimport java.io.UnsupportedEncodingException;\nimport java.io.File;\nimport java.net.URL;\nimport java.net.URLEncoder;\nimport java.util.ArrayList;\nimport java.util.HashMap;\nimport java.util.List;\nimport java.util.Map;\n\nimport org.apache.commons.lang3.StringUtils;\nimport org.xwiki.cache.CacheException;\nimport org.xwiki.cache.CacheFactory;\nimport org.xwiki.cache.CacheManager;\nimport org.xwiki.cache.config.CacheConfiguration;\nimport org.xwiki.cache.eviction.LRUEvictionConfiguration;\nimport org.xwiki.component.manager.ComponentLookupException;\nimport org.xwiki.context.Execution;\nimport org.xwiki.context.ExecutionContext;\nimport org.xwiki.rendering.syntax.Syntax;\nimport org.xwiki.xml.XMLUtils;\nimport org.xwiki.model.reference.EntityReference;\nimport org.xwiki.model.reference.EntityReferenceResolver;\nimport org.xwiki.model.reference.DocumentReference;\nimport org.xwiki.model.reference.WikiReference;\nimport org.xwiki.model.EntityType;\nimport org.xwiki.url.XWikiEntityURL;\n\nimport com.xpn.xwiki.cache.api.XWikiCache;\nimport com.xpn.xwiki.cache.api.XWikiCacheService;\nimport com.xpn.xwiki.cache.api.internal.XWikiCacheServiceStub;\nimport com.xpn.xwiki.cache.api.internal.XWikiCacheStub;\nimport com.xpn.xwiki.doc.XWikiDocument;\nimport com.xpn.xwiki.notify.XWikiNotificationManager;\nimport com.xpn.xwiki.objects.BaseObject;\nimport com.xpn.xwiki.objects.classes.BaseClass;\nimport com.xpn.xwiki.objects.classes.PropertyClass;\nimport com.xpn.xwiki.plugin.query.QueryPlugin;\nimport com.xpn.xwiki.plugin.query.XWikiCriteria;\nimport com.xpn.xwiki.plugin.query.XWikiQuery;\nimport com.xpn.xwiki.util.Util;\nimport com.xpn.xwiki.web.Utils;\nimport com.xpn.xwiki.web.XWikiMessageTool;\nimport com.xpn.xwiki.web.XWikiRequest;\n\n\/**\n * Add a backward compatibility layer to the {@link com.xpn.xwiki.XWiki} class.\n * \n * @version $Id$\n *\/\npublic privileged aspect XWikiCompatibilityAspect\n{\n    private static Map XWiki.threadMap = new HashMap();\n\n    private XWikiNotificationManager XWiki.notificationManager;\n\n    private EntityReferenceResolver<EntityReference> XWiki.defaultReferenceEntityReferenceResolver = Utils.getComponent(\n        EntityReferenceResolver.TYPE_REFERENCE);\n\n    \/**\n     * Transform a text in a URL compatible text\n     *\n     * @param content text to transform\n     * @return encoded result\n     * @deprecated replaced by Util#encodeURI since 1.3M2\n     *\/\n    @Deprecated\n    public String XWiki.getURLEncoded(String content)\n    {\n        try {\n            return URLEncoder.encode(content, this.getEncoding());\n        } catch (UnsupportedEncodingException e) {\n            return content;\n        }\n    }\n\n    \/**\n     * @return true for multi-wiki\/false for mono-wiki\n     * @deprecated replaced by {@link XWiki#isVirtualMode()} since 1.4M1.\n     *\/\n    @Deprecated\n    public boolean XWiki.isVirtual()\n    {\n        return isVirtualMode();\n    }\n\n    \/**\n     * @deprecated Virtual mode is on by default, starting with XWiki 5.0M2. Use\n     *             {@link #getVirtualWikisDatabaseNames(XWikiContext)} to get the list of wikis if needed.\n     * @return true for multi-wiki\/false for mono-wiki\n     *\/\n    @Deprecated\n    public boolean XWiki.isVirtualMode()\n    {\n        return true;\n    }\n\n    \/**\n     * @deprecated Removed since it isn't used; since 1.5M1.\n     *\/\n    @Deprecated\n    public static Map XWiki.getThreadMap()\n    {\n        return XWiki.threadMap;\n    }\n\n    \/**\n     * @deprecated Removed since it isn't used; since 1.5M1.\n     *\/\n    @Deprecated\n    public static void XWiki.setThreadMap(Map threadMap)\n    {\n        XWiki.threadMap = threadMap;\n    }\n\n    \/**\n     * @return the cache service.\n     * @deprecated replaced by {@link XWiki#getCacheFactory(XWikiContext)} or\n     *             {@link XWiki#getLocalCacheFactory(XWikiContext)} since 1.5M2.\n     *\/\n    @Deprecated\n    public XWikiCacheService XWiki.getCacheService()\n    {\n        return new XWikiCacheServiceStub(getCacheFactory(), getLocalCacheFactory());\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getVirtualWikiCache(XWikiContext)} since 1.5M2.\n     *\/\n    @Deprecated\n    public XWikiCache XWiki.getVirtualWikiMap()\n    {\n        return new XWikiCacheStub(this.virtualWikiMap);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpaceCopyright(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebCopyright(XWikiContext context)\n    {\n        return this.getSpaceCopyright(context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, String defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, String, String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, String space, String defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, space, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsLong(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public long XWiki.getWebPreferenceAsLong(String preference, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsLong(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsLong(String, long, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public long XWiki.getWebPreferenceAsLong(String preference, long defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsLong(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsInt(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.getWebPreferenceAsInt(String preference, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsInt(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsInt(String, int, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.getWebPreferenceAsInt(String preference, int defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsInt(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#copySpaceBetweenWikis(String, String, String, String, XWikiContext)} since\n     *             2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.copyWikiWeb(String space, String sourceWiki, String targetWiki, String language, XWikiContext context)\n        throws XWikiException\n    {\n        return this.copySpaceBetweenWikis(space, sourceWiki, targetWiki, language, context);\n    }\n\n    \/**\n     * @deprecated replaced by\n     *             {@link XWiki#copySpaceBetweenWikis(String, String, String, String, boolean, XWikiContext)} since\n     *             2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.copyWikiWeb(String space, String sourceWiki, String targetWiki, String language, boolean clean,\n        XWikiContext context) throws XWikiException\n    {\n        return this.copySpaceBetweenWikis(space, sourceWiki, targetWiki, language, clean, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getDefaultSpace(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getDefaultWeb(XWikiContext context)\n    {\n        return this.getDefaultSpace(context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#skipDefaultSpaceInURLs(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public boolean XWiki.useDefaultWeb(XWikiContext context)\n    {\n        return this.skipDefaultSpaceInURLs(context);\n    }\n\n    \/**\n     * @deprecated use {@link XWikiMessageTool#get(String, List)} instead. You can access message tool using\n     *             {@link XWikiContext#getMessageTool()}.\n     *\/\n    @Deprecated\n    public String XWiki.getMessage(String item, XWikiContext context)\n    {\n        XWikiMessageTool msg = context.getMessageTool();\n        if (msg == null) {\n            return item;\n        } else {\n            return msg.get(item);\n        }\n    }\n\n    \/**\n     * @deprecated Removed since it isn't used; since 3.1M2.\n     *\/\n    @Deprecated\n    public String XWiki.getHTMLArea(String content, XWikiContext context)\n    {\n        StringBuilder result = new StringBuilder();\n\n        String scontent = XMLUtils.escape(content);\n        scontent = scontent.replaceAll(\"\\r?+\\n\", \"<br class=\\\"htmlarea\\\"\/>\");\n\n        result.append(\"<textarea name=\\\"content\\\" id=\\\"content\\\" rows=\\\"25\\\" cols=\\\"80\\\">\");\n        result.append(scontent);\n        result.append(\"<\/textarea>\");\n\n        return result.toString();\n    }\n\n    @Deprecated\n    public XWikiNotificationManager XWiki.getNotificationManager()\n    {\n        if (this.notificationManager == null) {\n          this.notificationManager = new XWikiNotificationManager();\n        }\n\n        return this.notificationManager;\n    }\n\n    @Deprecated\n    public void XWiki.setNotificationManager(XWikiNotificationManager notificationManager)\n    {\n        this.notificationManager = notificationManager;\n    }\n    \n    @Deprecated\n    public String XWiki.displaySearch(String fieldname, String className, XWikiCriteria criteria, XWikiContext context)\n        throws XWikiException\n    {\n        return displaySearch(fieldname, className, \"\", criteria, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearch(String fieldname, String className, XWikiContext context) throws XWikiException\n    {\n        return displaySearch(fieldname, className, \"\", new XWikiCriteria(), context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearch(String fieldname, String className, String prefix, XWikiCriteria criteria,\n        XWikiContext context) throws XWikiException\n    {\n        BaseClass bclass = getDocument(className, context).getXClass();\n        PropertyClass pclass = (PropertyClass) bclass.get(fieldname);\n        if (criteria == null) {\n            criteria = new XWikiCriteria();\n        }\n\n        if (pclass == null) {\n            return \"\";\n        } else {\n            return pclass.displaySearch(fieldname, prefix + className + \"_\", criteria, context);\n        }\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchColumns(String className, XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        return displaySearchColumns(className, \"\", query, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchColumns(String className, String prefix, XWikiQuery query, XWikiContext context)\n        throws XWikiException\n    {\n        BaseClass bclass = getDocument(className, context).getXClass();\n\n        if (query == null) {\n            query = new XWikiQuery();\n        }\n\n        return bclass.displaySearchColumns(className + \"_\" + prefix, query, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchOrder(String className, XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        return displaySearchOrder(className, \"\", query, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchOrder(String className, String prefix, XWikiQuery query, XWikiContext context)\n        throws XWikiException\n    {\n        BaseClass bclass = getDocument(className, context).getXClass();\n\n        if (query == null) {\n            query = new XWikiQuery();\n        }\n\n        return bclass.displaySearchOrder(className + \"_\" + prefix, query, context);\n    }\n\n    @Deprecated\n    public <T> List<T> XWiki.search(XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        QueryPlugin qp = (QueryPlugin) getPlugin(\"query\", context);\n        if (qp == null) {\n            return null;\n        }\n\n        return qp.search(query);\n    }\n\n    @Deprecated\n    public XWikiQuery XWiki.createQueryFromRequest(String className, XWikiContext context) throws XWikiException\n    {\n        return new XWikiQuery(context.getRequest(), className, context);\n    }\n\n    @Deprecated\n    public String XWiki.searchAsTable(XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        QueryPlugin qp = (QueryPlugin) getPlugin(\"query\", context);\n        if (qp == null) {\n            return null;\n        }\n\n        List<String> list = qp.search(query);\n        String result = \"{table}\\r\\n\";\n        List<String> headerColumns = new ArrayList<String>();\n        List<String> displayProperties = query.getDisplayProperties();\n        for (String propname : displayProperties) {\n            PropertyClass pclass = getPropertyClassFromName(propname, context);\n            if (pclass != null) {\n                headerColumns.add(pclass.getPrettyName());\n            } else {\n                if (propname.startsWith(\"doc.\")) {\n                    propname = propname.substring(4);\n                    headerColumns.add(XWikiDocument.getInternalPropertyName(propname, context));\n                } else {\n                    headerColumns.add(propname);\n                }\n\n            }\n        }\n\n        result += StringUtils.join(headerColumns.toArray(), \" | \") + \"\\r\\n\";\n        for (String docname : list) {\n            List<String> rowColumns = new ArrayList<String>();\n            XWikiDocument doc = getDocument(docname, context);\n            for (String propname : displayProperties) {\n                PropertyClass pclass = getPropertyClassFromName(propname, context);\n                if (pclass == null) {\n                    if (propname.startsWith(\"doc.\")) {\n                        propname = propname.substring(4);\n                    }\n                    String value = doc.getInternalProperty(propname);\n                    rowColumns.add((value == null) ? \" \" : value);\n                } else {\n                    BaseObject bobj = doc.getObject(pclass.getObject().getName());\n                    rowColumns.add(doc.display(pclass.getName(), \"view\", bobj, context));\n                }\n            }\n            result += StringUtils.join(rowColumns.toArray(), \" | \") + \"\\r\\n\";\n        }\n\n        result += \"{table}\\r\\n\";\n\n        return result;\n    }\n\n    @Deprecated\n    public String XWiki.getDocLanguagePreference(XWikiContext context)\n    {\n        return getLanguagePreference(context);\n    }\n\n    @Deprecated\n    public void XWiki.flushCache()\n    {\n        Execution execution = Utils.getComponent(Execution.class);\n\n        ExecutionContext ec = execution.getContext();\n\n        flushCache(ec != null ? (XWikiContext) ec.getProperty(\"xwikicontext\") : null);\n    }\n\n    \/**\n     * @deprecated use WikiManager plugin instead\n     *\/\n    @Deprecated\n    public int XWiki.createNewWiki(String wikiName, String wikiUrl, String wikiAdmin, String baseWikiName,\n        String description, String wikilanguage, boolean failOnExist, XWikiContext context) throws XWikiException\n    {\n        String database = context.getDatabase();\n        wikiName = wikiName.toLowerCase();\n\n        try {\n            XWikiDocument userdoc = getDocument(wikiAdmin, context);\n\n            \/\/ User does not exist\n            if (userdoc.isNew()) {\n                if (LOGGER.isErrorEnabled()) {\n                    LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"user does not exist\");\n                }\n                return -2;\n            }\n\n            \/\/ User is not active\n            if (!(userdoc.getIntValue(\"XWiki.XWikiUsers\", \"active\") == 1)) {\n                if (LOGGER.isErrorEnabled()) {\n                    LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"user is not active\");\n                }\n                return -3;\n            }\n\n            String wikiForbiddenList = Param(\"xwiki.virtual.reserved_wikis\");\n            if (Util.contains(wikiName, wikiForbiddenList, \", \")) {\n                if (LOGGER.isErrorEnabled()) {\n                    LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"wiki name is forbidden\");\n                }\n                return -4;\n            }\n\n            String wikiServerPage = \"XWikiServer\" + wikiName.substring(0, 1).toUpperCase() + wikiName.substring(1);\n            \/\/ Verify is server page already exist\n            XWikiDocument serverdoc = getDocument(SYSTEM_SPACE, wikiServerPage, context);\n            if (serverdoc.isNew()) {\n                \/\/ clear entry in virtual wiki cache\n                this.virtualWikiMap.remove(wikiUrl);\n\n                \/\/ Create Wiki Server page\n                serverdoc.setStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"server\", wikiUrl);\n                serverdoc.setStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"owner\", wikiAdmin);\n                if (description != null) {\n                    serverdoc.setLargeStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"description\", description);\n                }\n                if (wikilanguage != null) {\n                    serverdoc.setStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"language\", wikilanguage);\n                }\n                if (!getDefaultDocumentSyntax().equals(Syntax.XWIKI_1_0.toIdString())) {\n                    serverdoc.setContent(\"{{include document=\\\"XWiki.XWikiServerForm\\\"\/}}\\n\");\n                    serverdoc.setSyntax(Syntax.XWIKI_2_0);\n                } else {\n                    serverdoc.setContent(\"#includeForm(\\\"XWiki.XWikiServerForm\\\")\\n\");\n                    serverdoc.setSyntax(Syntax.XWIKI_1_0);\n                }\n                serverdoc.setParentReference(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE);\n                saveDocument(serverdoc, context);\n            } else {\n                \/\/ If we are not allowed to continue if server page already exists\n                if (failOnExist) {\n                    if (LOGGER.isErrorEnabled()) {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki server page already exists\");\n                    }\n                    return -5;\n                } else if (LOGGER.isWarnEnabled()) {\n                    LOGGER.warn(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"wiki server page already exists\");\n                }\n            }\n\n            \/\/ Create wiki database\n            try {\n                context.setDatabase(getDatabase());\n                getStore().createWiki(wikiName, context);\n            } catch (XWikiException e) {\n                if (LOGGER.isErrorEnabled()) {\n                    if (e.getCode() == 10010) {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki database already exists\");\n                    } else if (e.getCode() == 10011) {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki database creation failed\");\n                    } else {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki database creation threw exception\", e);\n                    }\n                }\n            } catch (Exception e) {\n                LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                    + \"wiki database creation threw exception\", e);\n            }\n\n            try {\n                updateDatabase(wikiName, true, false, context);\n            } catch (Exception e) {\n                LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                    + \"wiki database shema update threw exception\", e);\n                return -6;\n            }\n\n            \/\/ Copy base wiki\n            int nb = copyWiki(baseWikiName, wikiName, wikilanguage, context);\n            \/\/ Save the number of docs copied in the context\n            context.put(\"nbdocs\", Integer.valueOf(nb));\n\n            \/\/ Create user page in his wiki\n            \/\/ Let's not create it anymore.. this makes the creator loose\n            \/\/ super admin rights on his wiki\n            \/\/ copyDocument(wikiAdmin, getDatabase(), wikiName, wikilanguage, context);\n\n            \/\/ Modify rights in user wiki\n            context.setDatabase(wikiName);\n            \/*\n             * XWikiDocument wikiprefdoc = getDocument(\"XWiki.XWikiPreferences\", context);\n             * wikiprefdoc.setStringValue(\"XWiki.XWikiGlobalRights\", \"users\", wikiAdmin);\n             * wikiprefdoc.setStringValue(\"XWiki.XWikiGlobalRights\", \"levels\", \"admin, edit\");\n             * wikiprefdoc.setIntValue(\"XWiki.XWikiGlobalRights\", \"allow\", 1); saveDocument(wikiprefdoc, context);\n             *\/\n            return 1;\n        } catch (Exception e) {\n            LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                + \"wiki creation threw exception\", e);\n            return -10;\n        } finally {\n            context.setDatabase(database);\n        }\n    }\n\n    \/**\n     * Get the XWiki temporary filesystem directory (cleaned up automatically by XWiki).\n     *\n     * @param context\n     * @return temporary directory\n     * @since 1.1 Milestone 4\n     * @deprecated starting with 4.2M1 use {@link org.xwiki.environment.Environment#getTemporaryDirectory()}\n     *\/\n    @Deprecated\n    public File XWiki.getTempDirectory(XWikiContext context)\n    {\n        return this.environment.getTemporaryDirectory();\n    }\n\n    \/**\n     * Get a new directory in the xwiki work directory\n     *\n     * @param subdir desired directory name\n     * @param context\n     * @return work subdirectory\n     * @since 1.1 Milestone 4\n     * @deprecated starting with 4.2M1 use {@link org.xwiki.environment.Environment#getPermanentDirectory()}\n     *\/\n    @Deprecated\n    public File XWiki.getWorkSubdirectory(String subdir, XWikiContext context)\n    {\n        File fdir = new File(this.environment.getPermanentDirectory().getAbsolutePath(), subdir);\n        if (!fdir.exists()) {\n            fdir.mkdir();\n        }\n\n        return fdir;\n    }\n\n    \/**\n     * Get the XWiki work directory\n     *\n     * @param context\n     * @return work directory\n     * @since 1.1 Milestone 4\n     * @deprecated starting with 4.2M1 use {@link org.xwiki.environment.Environment#getPermanentDirectory()}\n     *\/\n    @Deprecated\n    public File XWiki.getWorkDirectory(XWikiContext context)\n    {\n        return this.environment.getPermanentDirectory();\n    }\n\n    \/**\n     * @deprecated starting with 5.1M1 use {@code org.xwiki.url.XWikiURLFactory} instead and starting with 5.3M1 use\n     *             {@link ResourceFactory}\n     *\/\n    @Deprecated\n    public XWikiDocument XWiki.getDocumentFromPath(String path, XWikiContext context) throws XWikiException\n    {\n        return getDocument(getDocumentReferenceFromPath(path, context), context);\n    }\n\n    \/**\n     * @since 2.3M1\n     * @deprecated starting with 5.1M1 use {@code org.xwiki.url.XWikiURLFactory} instead and starting with 5.3M1 use\n     *             {@link ResourceFactory}\n     *\/\n    @Deprecated\n    public DocumentReference XWiki.getDocumentReferenceFromPath(String path, XWikiContext context)\n    {\n        \/\/ TODO: Remove this and use XWikiURLFactory instead in XWikiAction and all entry points.\n        List<String> segments = new ArrayList<String>();\n        for (String segment : path.split(\"\/\", -1)) {\n            segments.add(Util.decodeURI(segment, context));\n        }\n        \/\/ Remove the first segment if it's empty to cater for cases when the path starts with \"\/\"\n        if (segments.size() > 0 && segments.get(0).length() == 0) {\n            segments.remove(0);\n        }\n\n        XWikiEntityURL entityURL = buildEntityURLFromPathSegments(new WikiReference(context.getDatabase()), segments);\n\n        return new DocumentReference(entityURL.getEntityReference().extractReference(EntityType.DOCUMENT));\n    }\n\n    \/**\n     * @deprecated since 2.3M1 use {@link #getDocumentReferenceFromPath(String, XWikiContext)} instead\n     *\/\n    @Deprecated\n    public String XWiki.getDocumentNameFromPath(String path, XWikiContext context)\n    {\n        return this.localStringEntityReferenceSerializer.serialize(getDocumentReferenceFromPath(path, context));\n    }\n\n    \/**\n     * @deprecated since 2.3M1 use {@link #getDocumentReferenceFromPath(String, XWikiContext)} instead\n     *\/\n    @Deprecated\n    public String XWiki.getDocumentName(XWikiRequest request, XWikiContext context)\n    {\n        return this.localStringEntityReferenceSerializer.serialize(getDocumentReference(request, context));\n    }\n\n    \/**\n     * @deprecated starting with 5.1M1 use {@code org.xwiki.url.XWikiURLFactory} instead and starting with 5.3M1 use\n     *             {@link ResourceFactory}\n     *\/\n    @Deprecated\n    private XWikiEntityURL XWiki.buildEntityURLFromPathSegments(WikiReference wikiReference, List<String> pathSegments)\n    {\n        XWikiEntityURL entityURL;\n\n        \/\/ Rules based on counting the url segments:\n        \/\/ - 0 segments (e.g. \"\"): default document reference, \"view\" action\n        \/\/ - 1 segment (e.g. \"\/\", \"\/Document\"): default space, specified document (and default if empty), \"view\" action\n        \/\/ - 2 segments (e.g. \"\/Space\/\", \"\/Space\/Document\"): specified space, document (and default doc if empty),\n        \/\/   \"view\" action\n        \/\/ - 3 segments (e.g. \"\/action\/Space\/Document\"): specified space, document (and default doc if empty),\n        \/\/   specified action\n        \/\/ - 4 segments (e.g. \"\/download\/Space\/Document\/attachment\"): specified space, document and attachment (and\n        \/\/   default doc if empty), \"download\" action\n        \/\/ - 4 segments or more (e.g. \"\/action\/Space\/Document\/whatever\/else\"): specified space, document (and default\n        \/\/     doc if empty), specified \"action\" (if action != \"download\"), trailing segments ignored\n\n        String spaceName = null;\n        String pageName = null;\n        String attachmentName = null;\n        String action = \"view\";\n\n        if (pathSegments.size() == 1) {\n            pageName = pathSegments.get(0);\n        } else if (pathSegments.size() == 2) {\n            spaceName = pathSegments.get(0);\n            pageName = pathSegments.get(1);\n        } else if (pathSegments.size() >= 3) {\n            action = pathSegments.get(0);\n            spaceName = pathSegments.get(1);\n            pageName = pathSegments.get(2);\n            if (action.equals(\"download\") && pathSegments.size() >= 4) {\n                attachmentName = pathSegments.get(3);\n            }\n        }\n\n        \/\/ Normalize the extracted space\/page to resolve empty\/null values and replace them with default values.\n        EntityReference reference = wikiReference;\n        EntityType entityType = EntityType.DOCUMENT;\n        if (!StringUtils.isEmpty(spaceName)) {\n            reference = new EntityReference(spaceName, EntityType.SPACE, reference);\n        }\n        if (!StringUtils.isEmpty(pageName)) {\n            reference = new EntityReference(pageName, EntityType.DOCUMENT, reference);\n        }\n        if (!StringUtils.isEmpty(attachmentName)) {\n            reference = new EntityReference(attachmentName, EntityType.ATTACHMENT, reference);\n            entityType = EntityType.ATTACHMENT;\n        }\n        reference = this.defaultReferenceEntityReferenceResolver.resolve(reference, entityType);\n\n        entityURL = new XWikiEntityURL(reference);\n        entityURL.setAction(action);\n\n        return entityURL;\n    }\n\n    \/**\n     * Extracts the name of the wiki from a context's request. In some cases, including autowww, the main wiki may be\n     * returned instead of what was requested, as a result of some assumptions. Even so, the resulting wiki name is not\n     * guaranteed to exist, it is just what XWiki understood from the request.\n     *\n     * @param context the context which contains the request\n     * @return the name of the wiki that was requested\n     * @throws XWikiException if problems occur\n     * @deprecated starting with 5.2M1 use {@link ResourceFactory} instead\n     *\/\n    @Deprecated\n    public String XWiki.getRequestWikiName(XWikiContext context) throws XWikiException\n    {\n        \/\/ Host is full.host.name in DNS-based multiwiki, and wikiname in path-based multiwiki.\n        String host = \"\";\n        \/\/ Canonical name of the wiki (database).\n        String wikiName = \"\";\n        \/\/ wikiDefinition should be the document holding the definition of the virtual wiki, a document in the main\n        \/\/ wiki with a XWiki.XWikiServerClass object attached to it\n        DocumentReference wikiDefinition;\n\n        XWikiRequest request = context.getRequest();\n        try {\n            URL requestURL = context.getURL();\n            host = requestURL.getHost();\n        } catch (Exception e) {\n        }\n\n        \/\/ In path-based multi-wiki, the wiki name is an element of the request path.\n        \/\/ The url is in the form \/xwiki (app name)\/wiki (servlet name)\/wikiname\/\n        if (\"1\".equals(this.Param(\"xwiki.virtual.usepath\", \"1\"))) {\n            String uri = request.getRequestURI();\n            if (LOGGER.isDebugEnabled()) {\n                LOGGER.debug(\"Request uri is: \" + uri);\n            }\n            \/\/ Remove the (eventual) context path from the URI, usually \/xwiki\n            uri = stripSegmentFromPath(uri, request.getContextPath());\n            \/\/ Remove the (eventual) servlet path from the URI, usually \/wiki\n            String servletPath = request.getServletPath();\n            uri = stripSegmentFromPath(uri, servletPath);\n\n            if (servletPath.equals(\"\/\" + this.Param(\"xwiki.virtual.usepath.servletpath\", \"wiki\"))) {\n                \/\/ Requested path corresponds to a path-based wiki, now the wiki name is between the first and\n                \/\/ second \"\/\"\n                host = StringUtils.substringBefore(StringUtils.removeStart(uri, \"\/\"), \"\/\");\n            }\n        }\n\n        if (StringUtils.isEmpty(host) || host.equals(context.getMainXWiki())) {\n            \/\/ Can't find any wiki name, return the main wiki\n            return context.getMainXWiki();\n        }\n\n        \/\/ Try to use the full domain name\/path wiki name and see if it corresponds to any existing wiki descriptors\n        wikiDefinition = this.findWikiServer(host, context);\n\n        if (wikiDefinition == null) {\n            \/\/ No definition found based on the full domain name\/path wiki name, try to use the first part of the domain\n            \/\/ name as the wiki name\n            String servername = StringUtils.substringBefore(host, \".\");\n\n            \/\/ Note: Starting 5.0M2, the autowww behavior is default and the ability to disable it is now removed.\n            if (\"0\".equals(this.Param(\"xwiki.virtual.autowww\"))) {\n                LOGGER.warn(String.format(\"%s %s\", \"'xwiki.virtual.autowww' is no longer supported.\",\n                    \"Please update your configuration and\/or see XWIKI-8877 for more details.\"));\n            }\n\n            \/\/ As a convenience, we do not require the creation of an xwiki:XWiki.XWikiServerXwiki page for the main\n            \/\/ wiki and automatically go to the main wiki in certain cases:\n            \/\/ - \"www.<anyDomain>.<domainExtension>\" - if it starts with www, we first check if a subwiki with that\n            \/\/ name exists; if yes, the go to the \"www\" subwiki, if not, go to the main wiki\n            \/\/ - \"localhost\"\n            \/\/ - IP address\n            if (\"www\".equals(servername)) {\n                \/\/ Check that \"www\" is not actually the name of an existing subwiki.\n                wikiDefinition = this.findWikiServer(servername, context);\n                if (wikiDefinition == null) {\n                    \/\/ Not the case, use the main wiki.\n                    return context.getMainXWiki();\n                }\n            } else if (\"localhost\".equals(host) || host.matches(\"[0-9]{1,3}(?:\\\\.[0-9]{1,3}){3}\")) {\n                \/\/ Direct access to the main wiki.\n                return context.getMainXWiki();\n            }\n\n            \/\/ Use the name from the subdomain\n            wikiName = servername;\n\n            if (!context.isMainWiki(wikiName)\n                && !\"1\".equals(context.getWiki().Param(\"xwiki.virtual.failOnWikiDoesNotExist\", \"0\"))) {\n                \/\/ Check if the wiki really exists\n                if (!exists(getServerWikiPage(wikiName), context)) {\n                    \/\/ Fallback on main wiki\n                    wikiName = context.getMainXWiki();\n                }\n            }\n        } else {\n            \/\/ Use the name from the located wiki descriptor\n            wikiName = StringUtils.removeStart(wikiDefinition.getName(), \"XWikiServer\").toLowerCase();\n        }\n\n        return wikiName;\n    }\n\n    \/**\n     * Searches for the document containing the definition of the virtual wiki corresponding to the specified hostname.\n     *\n     * @param host the hostname, as specified in the request (for example: {@code forge.xwiki.org})\n     * @param context the current context\n     * @return the name of the document containing the wiki definition, or {@code null} if no wiki corresponds to the\n     *         hostname\n     * @throws XWikiException if a problem occurs while searching the storage\n     *\/\n    private DocumentReference XWiki.findWikiServer(String host, XWikiContext context) throws XWikiException\n    {\n        ensureVirtualWikiMapExists();\n        DocumentReference wikiName = this.virtualWikiMap.get(host);\n\n        if (wikiName == null) {\n            \/\/ Not loaded yet, search for it in the main wiki\n            String hql =\n                \", BaseObject as obj, StringProperty as prop WHERE obj.name=doc.fullName\"\n                    + \" AND doc.space='XWiki' AND doc.name LIKE 'XWikiServer%'\"\n                    + \" AND obj.className='XWiki.XWikiServerClass' AND prop.id.id = obj.id\"\n                    + \" AND prop.id.name = 'server' AND prop.value=?\";\n            List<String> parameters = new ArrayList<String>(1);\n            parameters.add(host);\n            try {\n                List<DocumentReference> list =\n                    context.getWiki().getStore().searchDocumentReferences(hql, parameters, context);\n                if ((list != null) && (list.size() > 0)) {\n                    wikiName = list.get(0);\n                }\n\n                this.virtualWikiMap.set(host, wikiName);\n            } catch (XWikiException e) {\n                LOGGER.warn(\"Error when searching for wiki name from URL host [\" + host + \"]\", e);\n            }\n        }\n\n        return wikiName;\n    }\n\n    private void XWiki.ensureVirtualWikiMapExists() throws XWikiException\n    {\n        synchronized (this) {\n            if (this.virtualWikiMap == null) {\n                int iCapacity = 1000;\n                try {\n                    String capacity = Param(\"xwiki.virtual.cache.capacity\");\n                    if (capacity != null) {\n                        iCapacity = Integer.parseInt(capacity);\n                    }\n                } catch (Exception e) {\n                }\n                try {\n                    CacheConfiguration configuration = new CacheConfiguration();\n                    configuration.setConfigurationId(\"xwiki.virtualwikimap\");\n                    LRUEvictionConfiguration lru = new LRUEvictionConfiguration();\n                    lru.setMaxEntries(iCapacity);\n                    configuration.put(LRUEvictionConfiguration.CONFIGURATIONID, lru);\n\n                    this.virtualWikiMap = getCacheFactory().newCache(configuration);\n                } catch (CacheException e) {\n                    throw new XWikiException(XWikiException.MODULE_XWIKI_CACHE,\n                        XWikiException.ERROR_CACHE_INITIALIZING, \"Failed to create new cache\", e);\n                }\n            }\n        }\n    }\n\n    \/**\n     * @deprecated replaced by {@link #setUserDefaultGroup(String fullwikiname, XWikiContext context)}\n     * @param context\n     * @param fullwikiname\n     * @throws XWikiException\n     *\/\n    @Deprecated\n    public void XWiki.SetUserDefaultGroup(XWikiContext context, String fullwikiname) throws XWikiException\n    {\n        this.setUserDefaultGroup(fullwikiname, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link #protectUserPage(String,String,XWikiDocument,XWikiContext)}\n     * @param context\n     * @param fullwikiname\n     * @param userRights\n     * @param doc\n     * @throws XWikiException\n     *\/\n    @Deprecated\n    public void XWiki.ProtectUserPage(XWikiContext context, String fullwikiname, String userRights, XWikiDocument doc)\n        throws XWikiException\n    {\n        this.protectUserPage(fullwikiname, userRights, doc, context);\n    }\n\n    \/**\n     * @return the cache factory.\n     * @since 1.5M2.\n     * @deprecated Since 1.7M1, use {@link CacheManager} component instead using {@link Utils#getComponent(Class)}\n     *\/\n    @Deprecated\n    public CacheFactory XWiki.getCacheFactory()\n    {\n        CacheFactory cacheFactory;\n\n        String cacheHint = Param(\"xwiki.cache.cachefactory.hint\", null);\n\n        if (StringUtils.isEmpty(cacheHint) || Utils.getComponent(CacheFactory.class, cacheHint) == null) {\n            CacheManager cacheManager = Utils.getComponent(CacheManager.class);\n            try {\n                cacheFactory = cacheManager.getCacheFactory();\n            } catch (ComponentLookupException e) {\n                throw new RuntimeException(\"Failed to get cache factory component\", e);\n            }\n        } else {\n            cacheFactory = Utils.getComponent(CacheFactory.class, cacheHint);\n        }\n\n        return cacheFactory;\n    }\n\n    \/**\n     * @return the cache factory creating local caches.\n     * @since 1.5M2.\n     * @deprecated Since 1.7M1, use {@link CacheManager} component instead using {@link Utils#getComponent(Class)}\n     *\/\n    @Deprecated\n    public CacheFactory XWiki.getLocalCacheFactory()\n    {\n        CacheFactory localCacheFactory;\n\n        String localCacheHint = Param(\"xwiki.cache.cachefactory.local.hint\", null);\n\n        if (StringUtils.isEmpty(localCacheHint) || Utils.getComponent(CacheFactory.class, localCacheHint) == null) {\n            CacheManager cacheManager = Utils.getComponent(CacheManager.class);\n            try {\n                localCacheFactory = cacheManager.getLocalCacheFactory();\n            } catch (ComponentLookupException e) {\n                throw new RuntimeException(\"Failed to get local cache factory component\", e);\n            }\n        } else {\n            localCacheFactory = Utils.getComponent(CacheFactory.class, localCacheHint);\n        }\n\n        return localCacheFactory;\n    }\n\n    \/**\n     * @deprecated since 2.3M1 use {@link #hasVersioning(XWikiContext)} instead\n     *\/\n    @Deprecated\n    public boolean XWiki.hasVersioning(String fullName, XWikiContext context)\n    {\n        return hasVersioning(context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link #include(String topic, boolean isForm, XWikiContext context)}\n     * @param topic\n     * @param context\n     * @param isForm\n     * @return\n     * @throws XWikiException\n     *\/\n    @Deprecated\n    public String XWiki.include(String topic, XWikiContext context, boolean isForm) throws XWikiException\n    {\n        return include(topic, isForm, context);\n    }\n    \n    \/**\n     * Checks if the wiki is running in test mode.\n     * \n     * @return {@code true} if the wiki is running Cactus tests, {@code false} otherwise\n     * @deprecated No longer used.\n     *\/\n    @Deprecated\n    public boolean XWiki.isTest()\n    {\n        return this.test;\n    }\n\n    \/**\n     * Marks that the wiki is running in test mode.\n     * \n     * @param test whether tests are being executed\n     * @deprecated No longer used.\n     *\/\n    @Deprecated\n    public void XWiki.setTest(boolean test)\n    {\n        this.test = test;\n    }\n\n    \/**\n     * @deprecated use {@link org.xwiki.localization.LocalizationManager} instead. From velocity you can access it using\n     *             the {@code $services.localization} binding, see {@code LocalizationScriptService}\n     *\/\n    @Deprecated\n    public String XWiki.parseMessage(XWikiContext context)\n    {\n        String message = (String) context.get(\"message\");\n        if (message == null) {\n            return null;\n        }\n\n        return parseMessage(message, context);\n    }\n\n    \/**\n     * @deprecated use {@link org.xwiki.localization.LocalizationManager} instead. From velocity you can access it using\n     *             the {@code $services.localization} binding, see {@code LocalizationScriptService}\n     *\/\n    @Deprecated\n    public String XWiki.parseMessage(String id, XWikiContext context)\n    {\n        XWikiMessageTool msg = context.getMessageTool();\n\n        List<?> parameters = (List<?>) context.get(\"messageParameters\");\n\n        String translatedMessage;\n        if (parameters != null) {\n            translatedMessage = msg.get(id, parameters);\n        } else {\n            translatedMessage = msg.get(id);\n        }\n\n        return parseContent(translatedMessage, context);\n    }\n}\n","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"a347e4d3c2bdea343f8e7cb7eef399e77ed52cea","subject":"optimized AnnotationTransactionAspect pointcut to avoid runtime checks (SPR-8890)","message":"optimized AnnotationTransactionAspect pointcut to avoid runtime checks (SPR-8890)\n","repos":"spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework","old_file":"org.springframework.aspects\/src\/main\/java\/org\/springframework\/transaction\/aspectj\/AnnotationTransactionAspect.aj","new_file":"org.springframework.aspects\/src\/main\/java\/org\/springframework\/transaction\/aspectj\/AnnotationTransactionAspect.aj","new_contents":"\/*\r\n * Copyright 2002-2010 the original author or authors.\r\n *\r\n * Licensed under the Apache License, Version 2.0 (the \"License\");\r\n * you may not use this file except in compliance with the License.\r\n * You may obtain a copy of the License at\r\n *\r\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\r\n *\r\n * Unless required by applicable law or agreed to in writing, software\r\n * distributed under the License is distributed on an \"AS IS\" BASIS,\r\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n * See the License for the specific language governing permissions and\r\n * limitations under the License.\r\n *\/\r\n\r\npackage org.springframework.transaction.aspectj;\r\n\r\nimport org.springframework.transaction.annotation.AnnotationTransactionAttributeSource;\r\nimport org.springframework.transaction.annotation.Transactional;\r\n\r\n\/**\r\n * Concrete AspectJ transaction aspect using Spring's @Transactional annotation.\r\n * \r\n * <p>When using this aspect, you <i>must<\/i> annotate the implementation class\r\n * (and\/or methods within that class), <i>not<\/i> the interface (if any) that\r\n * the class implements. AspectJ follows Java's rule that annotations on \r\n * interfaces are <i>not<\/i> inherited.\r\n *\r\n * <p>An @Transactional annotation on a class specifies the default transaction\r\n * semantics for the execution of any <b>public<\/b> operation in the class.\r\n *\r\n * <p>An @Transactional annotation on a method within the class overrides the\r\n * default transaction semantics given by the class annotation (if present). \r\n * Any method may be annotated (regardless of visibility).\r\n * Annotating non-public methods directly is the only way\r\n * to get transaction demarcation for the execution of such operations.\r\n *\r\n * @author Rod Johnson\r\n * @author Ramnivas Laddad\r\n * @author Adrian Colyer\r\n * @since 2.0\r\n * @see org.springframework.transaction.annotation.Transactional\r\n *\/\r\npublic aspect AnnotationTransactionAspect extends AbstractTransactionAspect {\r\n\r\n\tpublic AnnotationTransactionAspect() {\r\n\t\tsuper(new AnnotationTransactionAttributeSource(false));\r\n\t}\r\n\r\n\t\/**\r\n\t * Matches the execution of any public method in a type with the\r\n\t * Transactional annotation, or any subtype of a type with the\r\n\t * Transactional annotation.\r\n\t *\/\r\n\tprivate pointcut executionOfAnyPublicMethodInAtTransactionalType() :\r\n\t\texecution(* *(..)) && within(@Transactional *);\r\n\r\n\t\/**\r\n\t * Matches the execution of any method with the \r\n\t * Transactional annotation.\r\n\t *\/\r\n\tprivate pointcut executionOfTransactionalMethod() :\r\n\t\texecution(@Transactional * *(..));\r\n\r\n\t\/**\r\n\t * Definition of pointcut from super aspect - matched join points\r\n\t * will have Spring transaction management applied.\r\n\t *\/\t\r\n\tprotected pointcut transactionalMethodExecution(Object txObject) :\r\n\t\t(executionOfAnyPublicMethodInAtTransactionalType()\r\n\t\t || executionOfTransactionalMethod() )\r\n\t\t && this(txObject);\r\n\r\n}\r\n","old_contents":"\/*\r\n * Copyright 2002-2010 the original author or authors.\r\n *\r\n * Licensed under the Apache License, Version 2.0 (the \"License\");\r\n * you may not use this file except in compliance with the License.\r\n * You may obtain a copy of the License at\r\n *\r\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\r\n *\r\n * Unless required by applicable law or agreed to in writing, software\r\n * distributed under the License is distributed on an \"AS IS\" BASIS,\r\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n * See the License for the specific language governing permissions and\r\n * limitations under the License.\r\n *\/\r\n\r\npackage org.springframework.transaction.aspectj;\r\n\r\nimport org.springframework.transaction.annotation.AnnotationTransactionAttributeSource;\r\nimport org.springframework.transaction.annotation.Transactional;\r\n\r\n\/**\r\n * Concrete AspectJ transaction aspect using Spring's @Transactional annotation.\r\n * \r\n * <p>When using this aspect, you <i>must<\/i> annotate the implementation class\r\n * (and\/or methods within that class), <i>not<\/i> the interface (if any) that\r\n * the class implements. AspectJ follows Java's rule that annotations on \r\n * interfaces are <i>not<\/i> inherited.\r\n *\r\n * <p>A @Transactional annotation on a class specifies the default transaction\r\n * semantics for the execution of any <b>public<\/b> operation in the class.\r\n *\r\n * <p>A @Transactional annotation on a method within the class overrides the\r\n * default transaction semantics given by the class annotation (if present). \r\n * Any method may be annotated (regardless of visibility).\r\n * Annotating non-public methods directly is the only way\r\n * to get transaction demarcation for the execution of such operations.\r\n *\r\n * @author Rod Johnson\r\n * @author Ramnivas Laddad\r\n * @author Adrian Colyer\r\n * @since 2.0\r\n * @see org.springframework.transaction.annotation.Transactional\r\n *\/\r\npublic aspect AnnotationTransactionAspect extends AbstractTransactionAspect {\r\n\r\n\tpublic AnnotationTransactionAspect() {\r\n\t\tsuper(new AnnotationTransactionAttributeSource(false));\r\n\t}\r\n\r\n\t\/**\r\n\t * Matches the execution of any public method in a type with the\r\n\t * Transactional annotation, or any subtype of a type with the\r\n\t * Transactional annotation.\r\n\t *\/\r\n\tprivate pointcut executionOfAnyPublicMethodInAtTransactionalType() :\r\n\t\texecution(public * ((@Transactional *)+).*(..)) && @this(Transactional);\r\n\r\n\t\/**\r\n\t * Matches the execution of any method with the \r\n\t * Transactional annotation.\r\n\t *\/\r\n\tprivate pointcut executionOfTransactionalMethod() :\r\n\t\texecution(* *(..)) && @annotation(Transactional);\r\n\r\n\t\/**\r\n\t * Definition of pointcut from super aspect - matched join points\r\n\t * will have Spring transaction management applied.\r\n\t *\/\t\r\n\tprotected pointcut transactionalMethodExecution(Object txObject) :\r\n\t\t(executionOfAnyPublicMethodInAtTransactionalType()\r\n\t\t || executionOfTransactionalMethod() )\r\n\t\t && this(txObject);\r\n\r\n}\r\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"810c6e3f301f144587052190acd2c3449dda9e7e","subject":"Compilation fix.","message":"Compilation fix.\n","repos":"openmole\/openmole,openmole\/openmole,openmole\/openmole,openmole\/openmole,openmole\/openmole","old_file":"commons\/org.openmole.commons.aspect.eventdispatcher\/src\/main\/java\/org\/openmole\/commons\/aspect\/eventdispatcher\/EventAspect.aj","new_file":"commons\/org.openmole.commons.aspect.eventdispatcher\/src\/main\/java\/org\/openmole\/commons\/aspect\/eventdispatcher\/EventAspect.aj","new_contents":"package org.openmole.commons.aspect.eventdispatcher;\n\nimport java.util.logging.Level;\nimport java.util.logging.Logger;\nimport org.openmole.commons.aspect.eventdispatcher.internal.Activator;\nimport org.openmole.commons.exception.InternalProcessingError;\nimport org.openmole.commons.exception.UserBadDataError;\nimport java.lang.InterruptedException;\nimport java.lang.reflect.Method;\nimport org.aspectj.lang.reflect.MethodSignature;\nimport java.lang.annotation.Annotation;\n\npublic aspect EventAspect {\n\n\tbefore() throws InternalProcessingError, UserBadDataError : execution(* *(..)) && @annotation(org.openmole.commons.aspect.eventdispatcher.BeforeObjectModified) {\n\n\t\tObject object = thisJoinPoint.getThis();\n\n                Method method = ((MethodSignature) thisJoinPointStaticPart.getSignature()).getMethod();\n                BeforeObjectModified annotation = method.getAnnotation(BeforeObjectModified.class);\n\n                String type = annotation.type();\n                Object[] args = thisJoinPoint.getArgs();\n\n                Activator.getEventDispatcher().objectChanged(object,type, args);\n\t}\n\n\n\tafter() throws InternalProcessingError, UserBadDataError : execution(* *(..)) && @annotation(org.openmole.commons.aspect.eventdispatcher.ObjectModified) {\n\t\t\n\t\tObject object = thisJoinPoint.getThis();\n\n                Method method = ((MethodSignature) thisJoinPointStaticPart.getSignature()).getMethod();\n                ObjectModified annotation = method.getAnnotation(ObjectModified.class);\n\n                Activator.getEventDispatcher().objectChanged(object,annotation.type(), thisJoinPoint.getArgs());\n\t}\n\n        after() : execution(*.new(..)) && @annotation(org.openmole.commons.aspect.eventdispatcher.ObjectConstructed) {\n\n\t\t\/\/ construct genericIdentifier\n\t\tObject object = thisJoinPoint.getThis();\n\t\t\/\/Object ret = proceed();\n\n               \/\/ Method method = ((MethodSignature) thisJoinPointStaticPart.getSignature()).getMethod();\n               \/\/ ObjectModified annotation = method.getAnnotation(ObjectModified.class);\n\n               \/\/ Logger.getLogger(Logger.GLOBAL_LOGGER_NAME).log(Level.INFO,\"ctr: \" + thisJoinPointStaticPart.getSignature().toString());\n\n                Activator.getEventDispatcher().objectConstructed(object);\n\t\t\/\/Logger.getLogger(Logger.GLOBAL_LOGGER_NAME).log(Level.INFO,object.toString() + \" \"+ method);\n\n\t\t\/\/return ret;\n\t}\n}\n","old_contents":"package org.openmole.commons.aspect.eventdispatcher;\n\nimport java.util.logging.Level;\nimport java.util.logging.Logger;\nimport org.openmole.commons.aspect.eventdispatcher.internal.Activator;\nimport org.openmole.commons.exception.InternalProcessingError;\nimport org.openmole.commons.exception.UserBadDataError;\nimport java.lang.InterruptedException;\nimport java.lang.reflect.Method;\nimport org.aspectj.lang.reflect.MethodSignature;\nimport java.lang.annotation.Annotation;\n\npublic aspect EventAspect {\n\n\tbefore() throws InternalProcessingError, UserBadDataError : execution(* *(..)) && @annotation(org.openmole.commons.aspect.eventdispatcher.BeforeObjectModified) {\n\n\t\tObject object = thisJoinPoint.getThis();\n\n                Method method = ((MethodSignature) thisJoinPointStaticPart.getSignature()).getMethod();\n                ObjectModified annotation = method.getAnnotation(BeforeObjectModified.class);\n\n                String type = annotation.type();\n                Object[] args = thisJoinPoint.getArgs();\n\n                Activator.getEventDispatcher().objectChanged(object,type, args);\n\t}\n\n\n\tafter() throws InternalProcessingError, UserBadDataError : execution(* *(..)) && @annotation(org.openmole.commons.aspect.eventdispatcher.ObjectModified) {\n\t\t\n\t\tObject object = thisJoinPoint.getThis();\n\n                Method method = ((MethodSignature) thisJoinPointStaticPart.getSignature()).getMethod();\n                ObjectModified annotation = method.getAnnotation(ObjectModified.class);\n\n                Activator.getEventDispatcher().objectChanged(object,annotation.type(), thisJoinPoint.getArgs());\n\t}\n\n        after() : execution(*.new(..)) && @annotation(org.openmole.commons.aspect.eventdispatcher.ObjectConstructed) {\n\n\t\t\/\/ construct genericIdentifier\n\t\tObject object = thisJoinPoint.getThis();\n\t\t\/\/Object ret = proceed();\n\n               \/\/ Method method = ((MethodSignature) thisJoinPointStaticPart.getSignature()).getMethod();\n               \/\/ ObjectModified annotation = method.getAnnotation(ObjectModified.class);\n\n               \/\/ Logger.getLogger(Logger.GLOBAL_LOGGER_NAME).log(Level.INFO,\"ctr: \" + thisJoinPointStaticPart.getSignature().toString());\n\n                Activator.getEventDispatcher().objectConstructed(object);\n\t\t\/\/Logger.getLogger(Logger.GLOBAL_LOGGER_NAME).log(Level.INFO,object.toString() + \" \"+ method);\n\n\t\t\/\/return ret;\n\t}\n}\n","returncode":0,"stderr":"","license":"agpl-3.0","lang":"AspectJ"}
{"commit":"af8466d7195170d031177f6977aa3d69658750b7","subject":"Fixing build failure.","message":"Fixing build failure.\n","repos":"inbloom\/secure-data-service,inbloom\/secure-data-service,inbloom\/secure-data-service,inbloom\/secure-data-service,inbloom\/secure-data-service","old_file":"sli\/ingestion\/ingestion-base\/src\/main\/java\/org\/slc\/sli\/ingestion\/logging\/IngestionLoggerAspect.aj","new_file":"sli\/ingestion\/ingestion-base\/src\/main\/java\/org\/slc\/sli\/ingestion\/logging\/IngestionLoggerAspect.aj","new_contents":"\npackage org.slc.sli.ingestion.logging;\n\nimport org.slf4j.LoggerFactory;\n\nimport org.slc.sli.ingestion.util.LogUtil;\n\npublic aspect IngestionLoggerAspect {\n\n    declare parents : (org.slc.sli.ingestion..*\n            && !org.slc.sli.ingestion.handler.AbstractIng*\n            && !org.slc.sli.ingestion.handler.Handl*\n            && !org.slc.sli.ingestion.transformation.AbstractTrans*\n            && !org.slc.sli.ingestion.validation.ErrorRep*\n            && !org.slc.sli.ingestion.validation.spring.SimpleV*\n            && !org.slc.sli.ingestion.landingzone.validation.IngestionFileVal*\n            && !java.lang.Enum+ ) implements IngestionLogger;\n\n    public void IngestionLogger.debug(String msg) {\n        LoggerFactory.getLogger(this.getClass()).debug(msg);\n    }\n\n    public void IngestionLogger.info(String msg) {\n        LoggerFactory.getLogger(this.getClass()).info(msg);\n    }\n\n    public void IngestionLogger.warn(String msg) {\n        LoggerFactory.getLogger(this.getClass()).warn(msg);\n    }\n\n    public void IngestionLogger.debug(String msg, Object... params) {\n        LoggerFactory.getLogger(this.getClass()).debug(msg, params);\n    }\n\n    public void IngestionLogger.info(String msg, Object... params) {\n        LoggerFactory.getLogger(this.getClass()).info(msg, params);\n    }\n\n    public void IngestionLogger.warn(String msg, Object... params) {\n        LoggerFactory.getLogger(this.getClass()).warn(msg, params);\n    }\n\n    public void IngestionLogger.error(String msg, Object... params) {\n        LoggerFactory.getLogger(this.getClass()).error(msg, params);\n    }\n\n    public void IngestionLogger.error(String msg, Throwable x) {\n        LoggerFactory.getLogger(this.getClass()).error(msg, x);\n    }\n\n    public void IngestionLogger.piiClearedError(String msg, Throwable x) {\n        LogUtil.error(LoggerFactory.getLogger(this.getClass()), msg, (Exception)x);\n    }\n\n}","old_contents":"\npackage org.slc.sli.ingestion.logging;\n\nimport org.slf4j.LoggerFactory;\n\nimport org.slc.sli.ingestion.util.LogUtil;\n\npublic aspect IngestionLoggerAspect {\n\n    declare parents : (org.slc.sli.ingestion..*\n            && !org.slc.sli.ingestion.handler.AbstractIng*\n            && !org.slc.sli.ingestion.handler.Handl*\n            && !org.slc.sli.ingestion.transformation.AbstractTrans*\n            && !org.slc.sli.ingestion.validation.ErrorRep*\n            && !org.slc.sli.ingestion.validation.spring.SimpleV*\n            && !java.lang.Enum+ ) implements IngestionLogger;\n\n    public void IngestionLogger.debug(String msg) {\n        LoggerFactory.getLogger(this.getClass()).debug(msg);\n    }\n\n    public void IngestionLogger.info(String msg) {\n        LoggerFactory.getLogger(this.getClass()).info(msg);\n    }\n\n    public void IngestionLogger.warn(String msg) {\n        LoggerFactory.getLogger(this.getClass()).warn(msg);\n    }\n\n    public void IngestionLogger.debug(String msg, Object... params) {\n        LoggerFactory.getLogger(this.getClass()).debug(msg, params);\n    }\n\n    public void IngestionLogger.info(String msg, Object... params) {\n        LoggerFactory.getLogger(this.getClass()).info(msg, params);\n    }\n\n    public void IngestionLogger.warn(String msg, Object... params) {\n        LoggerFactory.getLogger(this.getClass()).warn(msg, params);\n    }\n\n    public void IngestionLogger.error(String msg, Object... params) {\n        LoggerFactory.getLogger(this.getClass()).error(msg, params);\n    }\n\n    public void IngestionLogger.error(String msg, Throwable x) {\n        LoggerFactory.getLogger(this.getClass()).error(msg, x);\n    }\n\n    public void IngestionLogger.piiClearedError(String msg, Throwable x) {\n        LogUtil.error(LoggerFactory.getLogger(this.getClass()), msg, (Exception)x);\n    }\n\n}","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"338bd7ecbfec68ac5440508b7dd270b5458f4b3c","subject":"delete try catch in IniHelper","message":"delete try catch in IniHelper\n","repos":"bhecquet\/seleniumRobot,bhecquet\/seleniumRobot,bhecquet\/seleniumRobot","old_file":"src\/main\/java\/com\/seleniumtests\/webelements\/InterceptBy.aj","new_file":"src\/main\/java\/com\/seleniumtests\/webelements\/InterceptBy.aj","new_contents":"\/*\r\n * Copyright 2016 www.infotel.com\r\n * Licensed under the Apache License, Version 2.0 (the \"License\");\r\n * you may not use this file except in compliance with the License.\r\n * You may obtain a copy of the License at\r\n * http:\/\/www.apache.org\/licenses\/LICENSE-2.0\r\n * Unless required by applicable law or agreed to in writing, software\r\n * distributed under the License is distributed on an \"AS IS\" BASIS,\r\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n * See the License for the specific language governing permissions and\r\n * limitations under the License.\r\n *\/\r\n\r\npackage com.seleniumtests.webelements;\r\n\r\nimport java.util.HashMap;\r\nimport java.util.MissingFormatArgumentException;\r\n\r\nimport org.aspectj.lang.ProceedingJoinPoint;\r\nimport org.aspectj.lang.annotation.Around;\r\nimport org.aspectj.lang.annotation.Aspect;\r\n\r\nimport com.seleniumtests.core.SeleniumTestsContextManager;\r\nimport com.seleniumtests.core.config.mobile.ConfigMobileReader;\r\n\/**\r\n * Aspect to intercept calls to methods from By. It change the argument of\r\n * methods when it use the keyWord : prop\r\n * \r\n * @author Sophie\r\n *\r\n *\/\r\n@Aspect\r\npublic class InterceptBy {\r\n\tpublic static String PAGE = \"\";\r\n\t\/**\r\n\t * Change the argument of the By. when it's in the mapping files\r\n\t * @param joinPoint\r\n\t *\/\r\n\t @Around(\"call(* org.openqa.selenium.By..* (..) )\")\r\n\tpublic Object changeArg(ProceedingJoinPoint joinPoint) throws Throwable {\r\n\t\tObject[] args = joinPoint.getArgs();\r\n\t\tObject reply = null;\r\n\r\n\t\tif (args != null) {\r\n\t\t\tfor (int i = 0; i < args.length; i++) {\r\n\t\t\t\tObject argument = args[i];\r\n\t\t\t\tif (argument != null && argument instanceof String) {\r\n\t\t\t\t\t\tString[] input = ((String) argument).split(\":\");\r\n\t\t\t\t\t\tif (input[0].equals(\"prop\")) {\r\n\t\t\t\t\t\t\tString page = getCallerName(Thread.currentThread().getStackTrace());\r\n\t\t\t\t\t\t\tHashMap<String, HashMap<String, String>> config = SeleniumTestsContextManager.getThreadContext().getIdMapping();\r\n\t\t\t\t\t\t\tif (config == null) {\r\n\t\t\t\t\t\t\t\tconfig = new ConfigMobileReader().readConfig();\r\n\t\t\t\t\t\t\t\tSeleniumTestsContextManager.getThreadContext().setIdMapping(config);\r\n\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t\tif (input[1] != null) {\r\n\t\t\t\t\t\t\t\tString toPass = config.get(page).get(input[1]);\r\n\t\t\t\t\t\t\t\tif (toPass != null && !toPass.equals(\"\")) {\r\n\t\t\t\t\t\t\t\t\targs[i] = toPass;\r\n\t\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t}\r\n\t\t\t\t}\r\n\r\n\t\t\t}\r\n\t\t}\r\n\t\treply = joinPoint.proceed(args);\r\n\t\treturn reply;\r\n\t}\r\n\t \r\n\t\/**\r\n\t * get the name of the PageObject that call the By.\r\n\t * \r\n\t * @param stack : the stacktrace of the caller\r\n\t *\/\r\n\tpublic String getCallerName(StackTraceElement[] stack) {\r\n\t\tString page = getPage();\r\n\t\tClass stackClass = null;\r\n\t\t\r\n\t\t\/\/find the PageObject Loader\r\n\t\tfor(int i=0; i<stack.length;i++){\r\n\t\t\ttry{\r\n\t\t\t\t stackClass = Class.forName(stack[i].getClassName());\r\n\t\t\t}catch (ClassNotFoundException e){\r\n\t\t\t\tSystem.out.println(e);\r\n\t\t\t}\r\n\t\t\tif(PageObject.class.isAssignableFrom(stackClass)){\r\n\t\t\t\tpage=last(stack[i].getClassName().split(\"\\\\.\"));\t\r\n\t\t\t}\r\n\t\t}\r\n\t\treturn page;\r\n\t}\r\n\r\n\t\/\/return the last element of the table\r\n\tpublic static <Tab> Tab last(Tab[] array) {\r\n\t\treturn array[array.length - 1];\r\n\t}\r\n\t\r\n\t\/\/Methods for static tests with no PageObject\r\n\tpublic String getPage(){\r\n\t\treturn PAGE;\r\n\t}\r\n\tpublic static void setPage(String page){\r\n\t\tPAGE = page;\r\n\t}\r\n\t\r\n}","old_contents":"\/*\r\n * Copyright 2016 www.infotel.com\r\n * Licensed under the Apache License, Version 2.0 (the \"License\");\r\n * you may not use this file except in compliance with the License.\r\n * You may obtain a copy of the License at\r\n * http:\/\/www.apache.org\/licenses\/LICENSE-2.0\r\n * Unless required by applicable law or agreed to in writing, software\r\n * distributed under the License is distributed on an \"AS IS\" BASIS,\r\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n * See the License for the specific language governing permissions and\r\n * limitations under the License.\r\n *\/\r\n\r\npackage com.seleniumtests.webelements;\r\n\r\nimport java.util.HashMap;\r\nimport java.util.MissingFormatArgumentException;\r\n\r\nimport org.aspectj.lang.ProceedingJoinPoint;\r\nimport org.aspectj.lang.annotation.Around;\r\nimport org.aspectj.lang.annotation.Aspect;\r\n\r\nimport com.seleniumtests.core.SeleniumTestsContextManager;\r\nimport com.seleniumtests.core.config.mobile.ConfigMobileReader;\r\n\/**\r\n * Aspect to intercept calls to methods from By. It change the argument of\r\n * methods when it use the keyWord : prop\r\n * \r\n * @author Sophie\r\n *\r\n *\/\r\n@Aspect\r\npublic class InterceptBy {\r\n\tpublic static String PAGE = \"\";\r\n\t\/**\r\n\t * Change the argument of the By. when it's in the mapping files\r\n\t * @param joinPoint\r\n\t *\/\r\n\t @Around(\"call(* org.openqa.selenium.By..* (..) )\")\r\n\tpublic Object changeArg(ProceedingJoinPoint joinPoint) throws Throwable {\r\n\t\tObject[] args = joinPoint.getArgs();\r\n\t\tObject reply = null;\r\n\r\n\t\tif (args != null) {\r\n\t\t\tfor (int i = 0; i < args.length; i++) {\r\n\t\t\t\tObject argument = args[i];\r\n\t\t\t\tif (argument != null && argument instanceof String) {\r\n\t\t\t\t\ttry {\r\n\t\t\t\t\t\tString[] input = ((String) argument).split(\":\");\r\n\t\t\t\t\t\tif (input[0].equals(\"prop\")) {\r\n\t\t\t\t\t\t\tString page = getCallerName(Thread.currentThread().getStackTrace());\r\n\t\t\t\t\t\t\tHashMap<String, HashMap<String, String>> config = SeleniumTestsContextManager.getThreadContext().getIdMapping();\r\n\t\t\t\t\t\t\tif (config == null) {\r\n\t\t\t\t\t\t\t\tconfig = new ConfigMobileReader().readConfig();\r\n\t\t\t\t\t\t\t\tSeleniumTestsContextManager.getThreadContext().setIdMapping(config);\r\n\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t\tif (input[1] != null) {\r\n\t\t\t\t\t\t\t\tString toPass = config.get(page).get(input[1]);\r\n\t\t\t\t\t\t\t\tif (toPass != null && !toPass.equals(\"\")) {\r\n\t\t\t\t\t\t\t\t\targs[i] = toPass;\r\n\t\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t}\r\n\t\t\t\t\t} catch (MissingFormatArgumentException e) {\r\n\t\t\t\t\t\tthrow e;\r\n\t\t\t\t\t}\r\n\t\t\t\t}\r\n\r\n\t\t\t}\r\n\t\t}\r\n\t\treply = joinPoint.proceed(args);\r\n\t\treturn reply;\r\n\t}\r\n\t \r\n\t\/**\r\n\t * get the name of the PageObject that call the By.\r\n\t * \r\n\t * @param stack : the stacktrace of the caller\r\n\t *\/\r\n\tpublic String getCallerName(StackTraceElement[] stack) {\r\n\t\tString page = getPage();\r\n\t\tClass stackClass = null;\r\n\t\t\r\n\t\t\/\/find the PageObject Loader\r\n\t\tfor(int i=0; i<stack.length;i++){\r\n\t\t\ttry{\r\n\t\t\t\t stackClass = Class.forName(stack[i].getClassName());\r\n\t\t\t}catch (ClassNotFoundException e){\r\n\t\t\t\tSystem.out.println(e);\r\n\t\t\t}\r\n\t\t\tif(PageObject.class.isAssignableFrom(stackClass)){\r\n\t\t\t\tpage=last(stack[i].getClassName().split(\"\\\\.\"));\t\r\n\t\t\t}\r\n\t\t}\r\n\t\treturn page;\r\n\t}\r\n\r\n\t\/\/return the last element of the table\r\n\tpublic static <Tab> Tab last(Tab[] array) {\r\n\t\treturn array[array.length - 1];\r\n\t}\r\n\t\r\n\t\/\/Methods for static tests with no PageObject\r\n\tpublic String getPage(){\r\n\t\treturn PAGE;\r\n\t}\r\n\tpublic static void setPage(String page){\r\n\t\tPAGE = page;\r\n\t}\r\n\t\r\n}","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"d1b36bd6aceae17627ab9316372722a52ed5fc6f","subject":"Full set of (cugat) instrumentation events generated","message":"Full set of (cugat) instrumentation events generated\n","repos":"Aloja\/AOP4Hadoop","old_file":"src\/1.0.3\/Aspectj.aj","new_file":"src\/1.0.3\/Aspectj.aj","new_contents":"import java.io.*;\nimport java.util.*;\nimport java.lang.management.ManagementFactory;\nimport java.sql.Timestamp;\nimport java.text.SimpleDateFormat;\nimport java.net.InetAddress;\nimport java.lang.ClassLoader;\nimport org.apache.hadoop.io.DataInputBuffer;\nimport org.apache.hadoop.mapred.TaskStatus;\nimport org.apache.hadoop.fs.permission.FsPermission;\nimport org.apache.hadoop.util.Progressable;\nimport org.apache.hadoop.hdfs.protocol.DatanodeInfo;\nimport org.apache.hadoop.util.DataChecksum;\nimport java.net.Socket;\n\n\nimport org.apache.hadoop.security.token.Token;\nimport org.apache.hadoop.security.token.TokenIdentifier;\nimport org.apache.hadoop.hdfs.security.token.block.BlockTokenIdentifier;\n\n\nimport org.apache.hadoop.fs.FSDataInputStream;\nimport org.apache.hadoop.hdfs.DFSClient;\n\nimport org.apache.hadoop.mapred.TaskTrackerStatus;\n\nimport org.apache.commons.logging.Log;\nimport org.apache.commons.logging.LogFactory;\n\n\nimport org.apache.hadoop.conf.Configuration;\n\n\n\n\n\n\n\/**\n *\n * @author Alejandro\n *\/\n\naspect AlojaAspect {\t\t\n\n\tprivate static final Log LOG = LogFactory.getLog(AlojaAspect.class);\n\n\t\/*\n\tTYPES\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\n    public static class Events {\n\n        public static final int JobTracker = 11111;\n        public static final int TaskTracker = 11112;\n        public static final int NameNode = 11113;\n        public static final int SecondaryNameNode = 11114;\n        public static final int DataNode = 11115;\n        public static final int Task = 11116;\n\/\/        public static final int MapTask = 11117;\n\/\/        public static final int ReduceTask = 11118;\n        public static final int MapOutputBuffer = 33333;\n        public static final int MapTaskOutputSize = 44444;\n    }\n\n    public static class Values {\n\n       \t\/\/ Generic\n\t\tpublic static final int End = 0;        \n        public static final int Start = 1;\n        \n        \/\/ Events.TaskTracker \n\t\tpublic static final int RunMapper = 8;\n        public static final int RunReducer = 9;\n        public static final int ReducerCopyPhase = 10;\n        public static final int ReducerSortPhase = 11;\n        public static final int ReducerReducePhase = 12;\n\n\t\t\/\/ Events.JobTracker\n\t\tpublic static final int HeartBeat = 13;\n\n\n\t\t\/\/ Events.MapOutputBuffer\n        public static final int Flush = 1;\n        public static final int SortAndSpill = 2;\n        public static final int Sort = 3;        \n        public static final int CreateSpillIndexFile = 5;\n        \/\/public static final int TotalIndexCacheMemory = 6;\n        public static final int SpillRecordDumped = 7;\n        public static final int Combine = 4;\n    }    \n\n\n\t\/*\n\tFUNCTIONS\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\t\n\tprivate static long getPID() {\n\t\tString name = java.lang.management.ManagementFactory.getRuntimeMXBean().getName();\n\t\treturn Long.parseLong(name.split(\"@\")[0]);\n\t}\n\n\tprivate void generateEvent(Integer key, Integer value) {\n\t\t\/\/2:cpu:app:task:thread:time:type:value\n\t\ttry{\n\t\t\tString hostname = InetAddress.getLocalHost().getHostName();\n\t\t\tlong pid = getPID();\n\t\t\tLOG.info(hostname+\",\"+pid+\",2:\"+hostname+\":2:\"+pid+\":1:\"+System.currentTimeMillis()+\":\"+key+\":\"+value);\n\t\t}\n\t\tcatch (Exception e) {\n\t\t\tLOG.error(e, e);\n\n\t\t}\n\t}\n\n\n\tprivate void generateEvent(Integer key, String value) {\n\t\t\/\/2:cpu:app:task:thread:time:type:value\n\t\ttry{\n\t\t\tString hostname = InetAddress.getLocalHost().getHostName();\n\t\t\tlong pid = getPID();\n\t\t\tLOG.info(hostname+\",\"+pid+\",2:\"+hostname+\":2:\"+pid+\":1:\"+System.currentTimeMillis()+\":\"+key+\":\"+value);\n\t\t}\n\t\tcatch (Exception e) {\n\t\t\tLOG.error(e, e);\n\n\t\t}\n\t}\n\n\n\t\/*private void generateEVent(Integer key[], Integer value) {\n\n\t\tStringBuffer output = new StringBuffer();\n\n\n\t\toutput.append()\n\n\t}*\/\n\n\tprivate void instrumentation(String event, String when) {\n\n\t\tinstrumentation(event, when, \"\");\n\n\t}\n\tprivate void instrumentation(String event, String when, String additional) {\n\t\ttry {\n\t\t\t\/\/Add hostname\n\t\t\tString log = InetAddress.getLocalHost().getHostName();\n\t\t\t\/\/Add PID \n\t\t\tlog += \",\" + getPID();\n\t\t\t\/\/Specify event\n\t\t\tlog += \",\" + when + \",\" + event;\n\t\t\t\/\/Specify event\n\t\t\tlog += additional;\n\t\t\t\/\/LOG.info(log);\n\t\t\t\/\/writeLog(logFile,log);\n\n\n\t\t}\n\t\tcatch (IOException e) {\n\t\t\te.printStackTrace();\n\t\t}\n\t}\n\n\n\t\/*\n\tPOINTCUTS\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\n\t\/\/RegisterDataNode Pointcut\n\n\tpointcut startDataNode(): execution(* org.apache.hadoop.hdfs.server.datanode.DataNode.startDataNode(..));\n\n\t\/\/RegisterNameNode Pointcut\n\n\tpointcut initializeNameNode():  execution(* org.apache.hadoop.hdfs.server.namenode.NameNode.initialize(..));\n\n\t\/\/RegisterSecondaryNamenode Pointcut\n\n\tpointcut initializeSecondaryNameNode(): execution(* org.apache.hadoop.hdfs.server.namenode.SecondaryNameNode.initialize(..));\n\n\t\/\/RegisterTask - CHILD\n\n\t\/\/pointcut initializeChild(): call(* org.apache.hadoop.mapred.Child.initMetrics(..)) && withincode(* org.apache.hadoop.mapred.Child.main(..)); \n\n\tpointcut initializeChild(): execution(* org.apache.hadoop.mapred.Child.main(..)); \n\n\t\/\/Register JobTracker Pointcut\n\n\tpointcut registerJobTracker(): execution(* org.apache.hadoop.mapred.JobTracker.startTracker(..));\n\n\t\/\/HEARTBEAT\n\n\tpointcut heartbeat(TaskTrackerStatus status,boolean restarted,boolean initialContact,boolean acceptNewTasks,short responseId): execution(* org.apache.hadoop.mapred.JobTracker.heartbeat(..)) && args(status, restarted, initialContact, acceptNewTasks,responseId);\n\n\t\/*\n\t\t###########################################################################\n\t\t############################Task###########################################\n\t\t###########################################################################\n\t*\/\n\n\n\tpointcut outputSize(): call (* *.getLen(..)) && withincode(* org.apache.hadoop.mapred.Task.calculateOutputSize());\n\n\t\/*\n\t\t###########################################################################\n\t\t############################MAPPER#########################################\n\t\t###########################################################################\n\t*\/\n\n\t\/\/pointcut maptask(): execution(* org.apache.hadoop.mapred.MapTask.run(..));\n\tpointcut mapper(): call(* org.apache.hadoop.mapred.MapTask.runNewMapper(..)) && withincode(* org.apache.hadoop.mapred.MapTask.run(..));\n\n\n\t\/\/  ############################SORT AND SPILL#################################\n\n\t\/\/Start-End\n\tpointcut taskSortAndSpill(): execution(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\n\tpointcut flush(): execution(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.flush());\n\n\t\/\/Spill File Size\n\tpointcut sortAndSpillSpillFile(int numSpills, long size) : call (* *.getSpillFileForWrite(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(numSpills, size);\n\n\t\/\/SpillIndex File Size\n\tpointcut sortAndSpillSpillIndexFile(int numSpills, long partitions) : call (* *.getSpillIndexFileForWrite(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(numSpills, partitions);\n\n\t\/\/Sort \n\tpointcut sortAndSpillSort(int kvstart, int endPosition, Object reporter): call(* *.sort(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(..,kvstart,endPosition,reporter);\n\n\t\/\/Init Writer\n\t\/\/pointcut sortAndSpillInitWriter() : call (org.apache.hadoop.mapred.IFile.Writer.new(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Close Writer\n\t\/\/pointcut sortAndSpillCloseWriter() : call (void org.apache.hadoop.mapred.IFile.Writer.close(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Write key-value\n\tpointcut sortAndSpillWrite(DataInputBuffer key, DataInputBuffer value): call (* *.append(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(key,value);\n\t\n\t\/\/Combiner\n\tpointcut sortAndSpillCombiner(): call(* *.combine(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Spill Index File\n\tpointcut sortAndSpillSpillIndexWrite(): call(* *.writeToFile(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/*\n\t\t###########################################################################\n\t\t############################REDUCER########################################\n\t\t###########################################################################\n\t*\/\n\n\t\/\/REDUCETASK RUN\n\tpointcut reducer(): execution(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\tpointcut initCodec(): call(* *.initCodec(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\tpointcut setPhase(TaskStatus.Phase phase): call(* *.setPhase(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..)) && args(phase);\n\n\t\n\t\/\/pointcut endCopy(): call(* *.setPhase(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\t\/\/pointcut endSort(): call(* *.getMapOutputKeyClass(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\t\n\n\t\/*\n\t\t###########################################################################\n\t\t############################NETWORK########################################\n\t\t###########################################################################\n\t*\/\n\n\tpointcut defaultBlockSize(): call(* org.apache.hadoop.hdfs.DFSClient.getDefaultBlockSize());\n\t\/\/pointcut blockSize(): call(* org.apache.hadoop.hdfs.DFSClient.getBlockSize(..));\n\tpointcut createDFSFile(String src,FsPermission permission,boolean overwrite,boolean createParent,short replication,long blockSize,Progressable progress, int buffersize): execution (* org.apache.hadoop.hdfs.DFSClient.create(..)) && args(src,permission,overwrite,createParent,replication,blockSize,progress,buffersize);\n\tpointcut runDataStreamer(): execution (* org.apache.hadoop.hdfs.DFSClient.DFSOutputStream.DataStreamer.run());\n\t\/\/pointcut readEntireBufferFromDataNode(byte buf[],int off,int len): execution(* org.apache.hadoop.hdfs.DFSClient.DFSInputStream.read(..)) && args(buf[],off,len);\n\t\/\/pointcut readFromDataNode(): call (* org.apache.hadoop.hdfs.DFSClient.DFSInputStream.blockSeekTo(..)) && withincode(* org.apache.hadoop.hdfs.DFSClient.DFSInputStream.read(..));\n\tpointcut newBlockReader(Socket sock, String file, long blockId, Token<BlockTokenIdentifier> accessToken, long genStamp, long startOffset, long len, int bufferSize, boolean verifyChecksum, String clientName): execution (* org.apache.hadoop.hdfs.DFSClient.BlockReader.newBlockReader(..)) && args(sock,file,blockId,accessToken,genStamp,startOffset,len,bufferSize,verifyChecksum,clientName);\n\n\t\/*\n\tAdvices\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\n\t\/\/ RegiterJobTracker\n\n\tafter() : registerJobTracker(){\n\t\tgenerateEvent(Events.JobTracker, Values.Start);\n\n\t}\n\n\t\/\/RegisterTaskTracker ?\n\n\n\t\/\/RegisterNameNode\n\n\tafter() : initializeNameNode(){\n\t\tgenerateEvent(Events.NameNode, Values.Start);\n\t}\n\n\t\/\/RegisterDataNode \n\n\tafter() : startDataNode(){\n\t\tgenerateEvent(Events.DataNode, Values.Start);\n\t}\n\n\n\t\/\/RegisterSecondaryNamenode\n\n\tafter() : initializeSecondaryNameNode(){\n\t\tgenerateEvent(Events.SecondaryNameNode, Values.Start);\n\t}\n\n\n\t\/\/HEARTBEAT \n\tafter(TaskTrackerStatus status,boolean restarted,boolean initialContact,boolean acceptNewTasks,short responseId) : heartbeat(status, restarted, initialContact, acceptNewTasks,responseId){\n\t\tgenerateEvent(Events.JobTracker, status.getTrackerName());\n\t}\n\n\n\t\/*\n\t\t###########################################################################\n\t\t############################Task###########################################\n\t\t###########################################################################\n\t*\/\n\n\t\/\/RegisterTask CHILD \n\tafter() : initializeChild() { \/\/We need the  PID of this task to be registered\n\t\tgenerateEvent(Events.Task, Values.Start);\n\t}\n\n\n\/*\tafter() returning(long size) : outputSize() {\n\t\tString s = \"Task-outputSize\";\n\t\tinstrumentation(s,\"after\",\", size: \" + Long.toString(size));\n\t}\n\n\t\/*\n\t\t###########################################################################\n\t\t############################Mapper#########################################\n\t\t###########################################################################\n\t*\/\n\n\n\t\/*before() : maptask(){\n\t\tgenerateEvent(Events.MapTask, Values.Start);\n\t}*\/\n\n\tbefore() : mapper(){\n\t\tgenerateEvent(Events.TaskTracker, Values.RunMapper);\n\t}\n\n\tafter() : mapper(){\n\t\tgenerateEvent(Events.TaskTracker, Values.End);\n\t}\n\n\n\t\n\n\t\/\/  ############################SORT AND SPILL#################################\n\n\tbefore() : taskSortAndSpill(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.SortAndSpill);\n\t}\n\n\n\tafter() : taskSortAndSpill(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\n\t}\n\n\t\/\/flush\n\n\tbefore() : flush(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.Flush);\n\t}\n\n\tafter() : flush(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\n\t}\n\n\n\n\t\/\/ Spill File Size\n\n\tafter(int numSpills, long size) returning : sortAndSpillSpillFile(numSpills, size){\n\t\tString s = \"sortAndSpillSpillFile\";\n\t\tinstrumentation(s,\"after\",\", numSpills: \" +Integer.toString(numSpills) + \";size: \" + Long.toString((size*numSpills) + size));\n\t}\n\n\t\/\/ SpillIndex File Size\n\n\tafter(int numSpills, long partitions) returning : sortAndSpillSpillIndexFile(numSpills, partitions){\n\t\tString s = \"sortAndSpillSpillIndexFile\";\n\t\tinstrumentation(s,\"after\",\",\" + Long.toString(numSpills * partitions));\n\t}\n\n\/*\n\tbefore(int length) : kvbufferState(length){\n\n\t\tString s = \"kvbufferState\";\n\t\tFile logFile = getFile();\n\t\tinstrumentation(logFile,s,\"before\");\n\t\twriteLog(logFile,Integer.toString(length));\n\t}\n\n*\/\n\n\tbefore(int kvstart, int endPosition, Object reporter) : sortAndSpillSort(kvstart,endPosition,reporter){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.Sort);\n\t\t\/\/instrumentation(s,\"before\",\",\" + Integer.toString(endPosition - kvstart));\n\t}\n\tafter(int kvstart, int endPosition, Object reporter) returning : sortAndSpillSort(kvstart,endPosition,reporter){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\n\t\t\/\/instrumentation(s,\"after\",\",\" + Integer.toString(endPosition - kvstart));\n\t}\n\n\t\/\/ Init writer\n\/*\tafter() returning : sortAndSpillInitWriter(){\n\t\tString s = \"sortAndSpillInitWriter\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\t\/\/ Close writer\n\tafter() returning : sortAndSpillCloseWriter(){\n\t\tString s = \"sortAndSpillCloseWriter\";\n\t\tinstrumentation(s,\"after\");\n\t}\n*\/\n\n\tafter(DataInputBuffer key, DataInputBuffer value) returning : sortAndSpillWrite(key,value){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.SpillRecordDumped);\n\t}\n\n\tbefore() : sortAndSpillCombiner(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.Combine);\n\t}\n\n\tafter() returning : sortAndSpillCombiner(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\t\n\t}\n\n\tbefore() : sortAndSpillSpillIndexWrite(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.CreateSpillIndexFile);\n\t}\n\n\tafter() returning : sortAndSpillSpillIndexWrite(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\n\t}\n\n\t\/*\n\t\t###########################################################################\n\t\t############################REDUCER########################################\n\t\t###########################################################################\n\t*\/\n\n\/*\tbefore() : reducer(){\n\t\tString s = \"Reducer\";\n\t\tinstrumentation(s,\"before\");\n\t}\n*\/\n\n\tbefore() : initCodec() {\n\t\tgenerateEvent(Events.TaskTracker, Values.RunReducer);\n\t}\n\n\n\tafter() returning : initCodec() {\n\t\tgenerateEvent(Events.TaskTracker, Values.ReducerCopyPhase);\n\t}\n\n\tbefore(TaskStatus.Phase phase) : setPhase(phase) { \/\/END OF A PHASE (SORT OR COPY)\n\t\t\tgenerateEvent(Events.TaskTracker, Values.End);\n\t}\n\n\tafter(TaskStatus.Phase phase) returning: setPhase(phase) { \n\t\tif (phase == TaskStatus.Phase.SORT) {\n\t\t\tgenerateEvent(Events.TaskTracker, Values.ReducerSortPhase);\n\t\t}\n\t\telse if (phase == TaskStatus.Phase.REDUCE) {\n\t\t\tgenerateEvent(Events.TaskTracker, Values.ReducerReducePhase);\n\t\t}\n\t}\n\n\tafter() : reducer(){ \/\/END OF REDUCE PHASE\n\t\t\tgenerateEvent(Events.TaskTracker, Values.End);\t}\n\n\t\/*\n\t\t###########################################################################\n\t\t############################NETWORK########################################\n\t\t###########################################################################\n\t*\/\n\n\tafter() returning(long blockSize) : defaultBlockSize() {\n\t\tString s = \"Network-defaultBlockSize\";\n\t\tinstrumentation(s,\"after\",\", size: \" + Long.toString(blockSize));\n\t}\n\t\/\/ after() returning(long blockSize) : blockSize() {\n\t\/\/ \tString s = \"Network-blockSize\";\n\t\/\/ \tFile logFile = getFile();\n\t\/\/ \tinstrumentation(logFile,s,\"after\");\n\t\/\/ \tString log = \", size: \" + Long.toString(blockSize);\n\t\/\/ \twriteLog(logFile,log);\n\t\/\/ }\n\n\tafter(String src,FsPermission permission,boolean overwrite, boolean createParent,short replication,long blockSize,Progressable progress, int buffersize): createDFSFile(src,permission,overwrite,createParent,replication,blockSize,progress,buffersize) {\n\t\tString s = \"Network-CreateDFSFile\";\n\n\t\t\/\/MODIFIED!!!!!!-----!!!!!!!!!!!\n\t\tinstrumentation(s,\"after\",\", path: \" + src + \";permission: \" + permission.toString() + \";overwrite: \" + String.valueOf(overwrite) + \";createParent: \" + String.valueOf(createParent) + \";replication: \" + Short.toString(replication) + \";blockSize: \" + Long.toString(blockSize) + \";buffersize: \" + Integer.toString(buffersize));\n\t}\n\tbefore(): runDataStreamer() {\n\t\tString s = \"DataStreamer\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\t\/\/ before(byte buf[],int off, int len) : readEntireBufferFromDataNode(buf[],off,len){\n\t\/\/ \tString s = \"Network-ReadEntireBuffer\";\n\t\/\/ \tinstrumentation(s,\"after\",\", bufferLength: \" + Integer.toString(len));\n\t\/\/ }\n\n\t\/\/ after() returning(DatanodeInfo datanode) : readFromDataNode(){\n\t\/\/ \tString s = \"Network-fromDataNode\";\n\t\/\/ \tinstrumentation(s,\"after\", \", from : \" + datanode.getHostName());\n\t\/\/ }\n\n\tafter(Socket sock, String file, long blockId, Token<BlockTokenIdentifier> accessToken, long genStamp, long startOffset, long len, int bufferSize, boolean verifyChecksum, String clientName) : newBlockReader(sock,file,blockId,accessToken,genStamp,startOffset,len,bufferSize,verifyChecksum,clientName) {\n\t\tString s = \"Network-NewBlockReader\";\n\t\tString extra = \", DataNode: \" + sock.getInetAddress().getCanonicalHostName();\n\t\textra += \";file: \" + file;\n\t\t\/\/extra += \", length: \" + Long.toString(len) + \"B\";\n\t\textra += \";\" + Long.toString(len);\n\t\textra += \";blockId: \" + Long.toString(blockId);\n\t\textra += \";startOffset: \" + Long.toString(startOffset);\t\t\n\t\tinstrumentation(s,\"after\",extra);\n\t}\n}\n\n\n\n\n","old_contents":"import java.io.*;\nimport java.util.*;\nimport java.lang.management.ManagementFactory;\nimport java.sql.Timestamp;\nimport java.text.SimpleDateFormat;\nimport java.net.InetAddress;\nimport java.lang.ClassLoader;\nimport org.apache.hadoop.io.DataInputBuffer;\nimport org.apache.hadoop.mapred.TaskStatus;\nimport org.apache.hadoop.fs.permission.FsPermission;\nimport org.apache.hadoop.util.Progressable;\nimport org.apache.hadoop.hdfs.protocol.DatanodeInfo;\nimport org.apache.hadoop.util.DataChecksum;\nimport java.net.Socket;\n\n\nimport org.apache.hadoop.security.token.Token;\nimport org.apache.hadoop.security.token.TokenIdentifier;\nimport org.apache.hadoop.hdfs.security.token.block.BlockTokenIdentifier;\n\n\nimport org.apache.hadoop.fs.FSDataInputStream;\nimport org.apache.hadoop.hdfs.DFSClient;\n\nimport org.apache.hadoop.mapred.TaskTrackerStatus;\n\nimport org.apache.commons.logging.Log;\nimport org.apache.commons.logging.LogFactory;\n\n\nimport org.apache.hadoop.conf.Configuration;\n\n\n\n\n\n\n\/**\n *\n * @author Alejandro\n *\/\n\naspect AlojaAspect {\t\t\n\n\tprivate static final Log LOG = LogFactory.getLog(AlojaAspect.class);\n\n\t\/*\n\tTYPES\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\n    public static class Events {\n\n        public static final int JobTracker = 11111;\n        public static final int TaskTracker = 11112;\n        public static final int NameNode = 11113;\n        public static final int SecondaryNameNode = 11114;\n        public static final int DataNode = 11115;\n        public static final int Task = 11116;\n\/\/        public static final int MapTask = 11117;\n\/\/        public static final int ReduceTask = 11118;\n        public static final int MapOutputBuffer = 33333;\n        public static final int MapTaskOutputSize = 44444;\n    }\n\n    public static class Values {\n\n       \t\/\/ Generic\n\t\tpublic static final int End = 0;        \n        public static final int Start = 1;\n        \n        \/\/ Events.TaskTracker \n\t\tpublic static final int RunMapper = 8;\n        public static final int RunReducer = 9;\n        public static final int Combine = 4;\n        public static final int ReducerCopyPhase = 10;\n        public static final int ReducerSortPhase = 11;\n        public static final int ReducerReducePhase = 12;\n\n\t\t\/\/ Events.JobTracker\n\t\tpublic static final int HeartBeat = 13;\n\n\n\n        public static final int Flush = 1;\n        public static final int SortAndSpill = 2;\n        public static final int Sort = 3;        \n        public static final int CreateSpillIndexFile = 5;\n        public static final int TotalIndexCacheMemory = 6;\n        public static final int SpillRecordDumped = 7;\n    }    \n\n\n\t\/*\n\tFUNCTIONS\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\t\n\tprivate static long getPID() {\n\t\tString name = java.lang.management.ManagementFactory.getRuntimeMXBean().getName();\n\t\treturn Long.parseLong(name.split(\"@\")[0]);\n\t}\n\n\tprivate void generateEvent(Integer key, Integer value) {\n\t\t\/\/2:cpu:app:task:thread:time:type:value\n\t\ttry{\n\t\t\tString hostname = InetAddress.getLocalHost().getHostName();\n\t\t\tlong pid = getPID();\n\t\t\tLOG.info(hostname+\",\"+pid+\",2:\"+hostname+\":2:\"+pid+\":1:\"+System.currentTimeMillis()+\":\"+key+\":\"+value);\n\t\t}\n\t\tcatch (Exception e) {\n\t\t\tLOG.error(e, e);\n\n\t\t}\n\t}\n\n\n\tprivate void generateEvent(Integer key, String value) {\n\t\t\/\/2:cpu:app:task:thread:time:type:value\n\t\ttry{\n\t\t\tString hostname = InetAddress.getLocalHost().getHostName();\n\t\t\tlong pid = getPID();\n\t\t\tLOG.info(hostname+\",\"+pid+\",2:\"+hostname+\":2:\"+pid+\":1:\"+System.currentTimeMillis()+\":\"+key+\":\"+value);\n\t\t}\n\t\tcatch (Exception e) {\n\t\t\tLOG.error(e, e);\n\n\t\t}\n\t}\n\n\n\t\/*private void generateEVent(Integer key[], Integer value) {\n\n\t\tStringBuffer output = new StringBuffer();\n\n\n\t\toutput.append()\n\n\t}*\/\n\n\tprivate void instrumentation(String event, String when) {\n\n\t\tinstrumentation(event, when, \"\");\n\n\t}\n\tprivate void instrumentation(String event, String when, String additional) {\n\t\ttry {\n\t\t\t\/\/Add hostname\n\t\t\tString log = InetAddress.getLocalHost().getHostName();\n\t\t\t\/\/Add PID \n\t\t\tlog += \",\" + getPID();\n\t\t\t\/\/Specify event\n\t\t\tlog += \",\" + when + \",\" + event;\n\t\t\t\/\/Specify event\n\t\t\tlog += additional;\n\t\t\t\/\/LOG.info(log);\n\t\t\t\/\/writeLog(logFile,log);\n\n\n\t\t}\n\t\tcatch (IOException e) {\n\t\t\te.printStackTrace();\n\t\t}\n\t}\n\n\n\t\/*\n\tPOINTCUTS\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\n\t\/\/RegisterDataNode Pointcut\n\n\tpointcut startDataNode(): execution(* org.apache.hadoop.hdfs.server.datanode.DataNode.startDataNode(..));\n\n\t\/\/RegisterNameNode Pointcut\n\n\tpointcut initializeNameNode():  execution(* org.apache.hadoop.hdfs.server.namenode.NameNode.initialize(..));\n\n\t\/\/RegisterSecondaryNamenode Pointcut\n\n\tpointcut initializeSecondaryNameNode(): execution(* org.apache.hadoop.hdfs.server.namenode.SecondaryNameNode.initialize(..));\n\n\t\/\/RegisterTask - CHILD\n\n\t\/\/pointcut initializeChild(): call(* org.apache.hadoop.mapred.Child.initMetrics(..)) && withincode(* org.apache.hadoop.mapred.Child.main(..)); \n\n\tpointcut initializeChild(): execution(* org.apache.hadoop.mapred.Child.main(..)); \n\n\t\/\/Register JobTracker Pointcut\n\n\tpointcut registerJobTracker(): execution(* org.apache.hadoop.mapred.JobTracker.startTracker(..));\n\n\t\/\/HEARTBEAT\n\n\tpointcut heartbeat(TaskTrackerStatus status,boolean restarted,boolean initialContact,boolean acceptNewTasks,short responseId): execution(* org.apache.hadoop.mapred.JobTracker.heartbeat(..)) && args(status, restarted, initialContact, acceptNewTasks,responseId);\n\n\t\/*\n\t\t###########################################################################\n\t\t############################Task###########################################\n\t\t###########################################################################\n\t*\/\n\n\n\tpointcut outputSize(): call (* *.getLen(..)) && withincode(* org.apache.hadoop.mapred.Task.calculateOutputSize());\n\n\t\/*\n\t\t###########################################################################\n\t\t############################MAPPER#########################################\n\t\t###########################################################################\n\t*\/\n\n\t\/\/pointcut maptask(): execution(* org.apache.hadoop.mapred.MapTask.run(..));\n\tpointcut mapper(): call(* org.apache.hadoop.mapred.MapTask.runNewMapper(..)) && withincode(* org.apache.hadoop.mapred.MapTask.run(..));\n\tpointcut flush(): execution(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.flush());\n\n\n\t\/\/  ############################SORT AND SPILL#################################\n\n\t\/\/Start-End\n\tpointcut taskSortAndSpill(): execution(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Spill File Size\n\tpointcut sortAndSpillSpillFile(int numSpills, long size) : call (* *.getSpillFileForWrite(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(numSpills, size);\n\n\t\/\/SpillIndex File Size\n\tpointcut sortAndSpillSpillIndexFile(int numSpills, long partitions) : call (* *.getSpillIndexFileForWrite(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(numSpills, partitions);\n\n\t\/\/Sort \n\tpointcut sortAndSpillSort(int kvstart, int endPosition, Object reporter): call(* *.sort(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(..,kvstart,endPosition,reporter);\n\n\t\/\/Init Writer\n\tpointcut sortAndSpillInitWriter() : call (org.apache.hadoop.mapred.IFile.Writer.new(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Close Writer\n\tpointcut sortAndSpillCloseWriter() : call (void org.apache.hadoop.mapred.IFile.Writer.close(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Write key-value\n\n\t\/\/pointcut sortAndSpillWrite(DataInputBuffer key, DataInputBuffer value): call (* *.append(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(key,value) && !within(Aspect);\n\t\n\t\/\/Combiner\n\tpointcut sortAndSpillCombiner(): call(* *.combine(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Spill Index File\n\tpointcut sortAndSpillSpillIndexWrite(): call(* *.writeToFile(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/*\n\t\t###########################################################################\n\t\t############################REDUCER########################################\n\t\t###########################################################################\n\t*\/\n\n\t\/\/REDUCETASK RUN\n\tpointcut reducer(): execution(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\tpointcut initCodec(): call(* *.initCodec(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\tpointcut setPhase(TaskStatus.Phase phase): call(* *.setPhase(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..)) && args(phase);\n\n\t\n\t\/\/pointcut endCopy(): call(* *.setPhase(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\t\/\/pointcut endSort(): call(* *.getMapOutputKeyClass(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\t\n\n\t\/*\n\t\t###########################################################################\n\t\t############################NETWORK########################################\n\t\t###########################################################################\n\t*\/\n\n\tpointcut defaultBlockSize(): call(* org.apache.hadoop.hdfs.DFSClient.getDefaultBlockSize());\n\t\/\/pointcut blockSize(): call(* org.apache.hadoop.hdfs.DFSClient.getBlockSize(..));\n\tpointcut createDFSFile(String src,FsPermission permission,boolean overwrite,boolean createParent,short replication,long blockSize,Progressable progress, int buffersize): execution (* org.apache.hadoop.hdfs.DFSClient.create(..)) && args(src,permission,overwrite,createParent,replication,blockSize,progress,buffersize);\n\tpointcut runDataStreamer(): execution (* org.apache.hadoop.hdfs.DFSClient.DFSOutputStream.DataStreamer.run());\n\t\/\/pointcut readEntireBufferFromDataNode(byte buf[],int off,int len): execution(* org.apache.hadoop.hdfs.DFSClient.DFSInputStream.read(..)) && args(buf[],off,len);\n\t\/\/pointcut readFromDataNode(): call (* org.apache.hadoop.hdfs.DFSClient.DFSInputStream.blockSeekTo(..)) && withincode(* org.apache.hadoop.hdfs.DFSClient.DFSInputStream.read(..));\n\tpointcut newBlockReader(Socket sock, String file, long blockId, Token<BlockTokenIdentifier> accessToken, long genStamp, long startOffset, long len, int bufferSize, boolean verifyChecksum, String clientName): execution (* org.apache.hadoop.hdfs.DFSClient.BlockReader.newBlockReader(..)) && args(sock,file,blockId,accessToken,genStamp,startOffset,len,bufferSize,verifyChecksum,clientName);\n\n\t\/*\n\tAdvices\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\n\t\/\/ RegiterJobTracker\n\n\tafter() : registerJobTracker(){\n\t\tgenerateEvent(Events.JobTracker, Values.Start);\n\n\t}\n\n\t\/\/RegisterTaskTracker ?\n\n\n\t\/\/RegisterNameNode\n\n\tafter() : initializeNameNode(){\n\t\tgenerateEvent(Events.NameNode, Values.Start);\n\t}\n\n\t\/\/RegisterDataNode \n\n\tafter() : startDataNode(){\n\t\tgenerateEvent(Events.DataNode, Values.Start);\n\t}\n\n\n\t\/\/RegisterSecondaryNamenode\n\n\tafter() : initializeSecondaryNameNode(){\n\t\tgenerateEvent(Events.SecondaryNameNode, Values.Start);\n\t}\n\n\n\t\/\/HEARTBEAT \n\tafter(TaskTrackerStatus status,boolean restarted,boolean initialContact,boolean acceptNewTasks,short responseId) : heartbeat(status, restarted, initialContact, acceptNewTasks,responseId){\n\t\tgenerateEvent(Events.JobTracker, status.getTrackerName());\n\t}\n\n\n\t\/*\n\t\t###########################################################################\n\t\t############################Task###########################################\n\t\t###########################################################################\n\t*\/\n\n\t\/\/RegisterTask CHILD \n\tafter() : initializeChild() { \/\/We need the  PID of this task to be registered\n\t\tgenerateEvent(Events.Task, Values.Start);\n\t}\n\n\n\/*\tafter() returning(long size) : outputSize() {\n\t\tString s = \"Task-outputSize\";\n\t\tinstrumentation(s,\"after\",\", size: \" + Long.toString(size));\n\t}\n\n\t\/*\n\t\t###########################################################################\n\t\t############################Mapper#########################################\n\t\t###########################################################################\n\t*\/\n\n\n\t\/*before() : maptask(){\n\t\tgenerateEvent(Events.MapTask, Values.Start);\n\t}*\/\n\n\tbefore() : mapper(){\n\t\tgenerateEvent(Events.TaskTracker, Values.RunMapper);\n\t}\n\n\tafter() : mapper(){\n\t\tgenerateEvent(Events.TaskTracker, Values.End);\n\t}\n\n\n\t\/\/flush\n\n\tbefore() : flush(){\n\t\tString s = \"Flush\";\n\t\tinstrumentation(s,\"before\");\n\t}\n\n\n\tafter() : flush(){\n\t\tString s = \"Flush\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\t\/\/  ############################SORT AND SPILL#################################\n\n\tbefore() : taskSortAndSpill(){\n\t\tString s = \"sortAndSpill\";\n\t\tinstrumentation(s,\"before\");\n\t}\n\n\tafter() : taskSortAndSpill(){\n\t\tString s = \"sortAndSpill\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\t\/\/ Spill File Size\n\n\tafter(int numSpills, long size) returning : sortAndSpillSpillFile(numSpills, size){\n\t\tString s = \"sortAndSpillSpillFile\";\n\t\tinstrumentation(s,\"after\",\", numSpills: \" +Integer.toString(numSpills) + \";size: \" + Long.toString((size*numSpills) + size));\n\t}\n\n\t\/\/ SpillIndex File Size\n\n\tafter(int numSpills, long partitions) returning : sortAndSpillSpillIndexFile(numSpills, partitions){\n\t\tString s = \"sortAndSpillSpillIndexFile\";\n\t\tinstrumentation(s,\"after\",\",\" + Long.toString(numSpills * partitions));\n\t}\n\n\/*\n\tbefore(int length) : kvbufferState(length){\n\n\t\tString s = \"kvbufferState\";\n\t\tFile logFile = getFile();\n\t\tinstrumentation(logFile,s,\"before\");\n\t\twriteLog(logFile,Integer.toString(length));\n\t}\n\n*\/\n\n\tbefore(int kvstart, int endPosition, Object reporter) : sortAndSpillSort(kvstart,endPosition,reporter){\n\t\tString s = \"sortAndSpillSort\";\n\t\tinstrumentation(s,\"before\",\",\" + Integer.toString(endPosition - kvstart));\n\t}\n\tafter(int kvstart, int endPosition, Object reporter) returning : sortAndSpillSort(kvstart,endPosition,reporter){\n\t\tString s = \"sortAndSpillSort\";\n\t\tinstrumentation(s,\"after\",\",\" + Integer.toString(endPosition - kvstart));\n\t}\n\n\t\/\/ Init writer\n\tafter() returning : sortAndSpillInitWriter(){\n\t\tString s = \"sortAndSpillInitWriter\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\t\/\/ Close writer\n\tafter() returning : sortAndSpillCloseWriter(){\n\t\tString s = \"sortAndSpillCloseWriter\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\/*\n\tafter(DataInputBuffer key, DataInputBuffer value) returning : sortAndSpillWrite(key,value){\n\t\tString s = \"sortAndSpillWrite\";\n\t\tFile logFile = getFile();\n\t\tinstrumentation(logFile,s,\"after\");\n\t\tString log = \",\" + key.getData(); \/\/ + \",\" + value.getData();\n\t\twriteLog(logFile,log);\n\t}\n*\/\n\tbefore() : sortAndSpillCombiner(){\n\t\tString s = \"sortAndSpillCombiner\";\n\t\tinstrumentation(s,\"before\");\n\t}\n\n\tafter() returning : sortAndSpillCombiner(){\n\t\tString s = \"sortAndSpillCombiner\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\tbefore() : sortAndSpillSpillIndexWrite(){\n\t\tString s = \"sortAndSpillSpillIndexWrite\";\n\t\tinstrumentation(s,\"before\");\n\t}\n\n\tafter() returning : sortAndSpillSpillIndexWrite(){\n\t\tString s = \"sortAndSpillSpillIndexWrite\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\t\/*\n\t\t###########################################################################\n\t\t############################REDUCER########################################\n\t\t###########################################################################\n\t*\/\n\n\/*\tbefore() : reducer(){\n\t\tString s = \"Reducer\";\n\t\tinstrumentation(s,\"before\");\n\t}\n*\/\n\n\tbefore() : initCodec() {\n\t\tgenerateEvent(Events.TaskTracker, Values.RunReducer);\n\t}\n\n\n\tafter() returning : initCodec() {\n\t\tgenerateEvent(Events.TaskTracker, Values.ReducerCopyPhase);\n\t}\n\n\tbefore(TaskStatus.Phase phase) : setPhase(phase) { \/\/END OF A PHASE (SORT OR COPY)\n\t\t\tgenerateEvent(Events.TaskTracker, Values.End);\n\t}\n\n\tafter(TaskStatus.Phase phase) returning: setPhase(phase) { \n\t\tif (phase == TaskStatus.Phase.SORT) {\n\t\t\tgenerateEvent(Events.TaskTracker, Values.ReducerSortPhase);\n\t\t}\n\t\telse if (phase == TaskStatus.Phase.REDUCE) {\n\t\t\tgenerateEvent(Events.TaskTracker, Values.ReducerReducePhase);\n\t\t}\n\t}\n\n\tafter() : reducer(){ \/\/END OF REDUCE PHASE\n\t\t\tgenerateEvent(Events.TaskTracker, Values.End);\t}\n\n\t\/*\n\t\t###########################################################################\n\t\t############################NETWORK########################################\n\t\t###########################################################################\n\t*\/\n\n\tafter() returning(long blockSize) : defaultBlockSize() {\n\t\tString s = \"Network-defaultBlockSize\";\n\t\tinstrumentation(s,\"after\",\", size: \" + Long.toString(blockSize));\n\t}\n\t\/\/ after() returning(long blockSize) : blockSize() {\n\t\/\/ \tString s = \"Network-blockSize\";\n\t\/\/ \tFile logFile = getFile();\n\t\/\/ \tinstrumentation(logFile,s,\"after\");\n\t\/\/ \tString log = \", size: \" + Long.toString(blockSize);\n\t\/\/ \twriteLog(logFile,log);\n\t\/\/ }\n\n\tafter(String src,FsPermission permission,boolean overwrite, boolean createParent,short replication,long blockSize,Progressable progress, int buffersize): createDFSFile(src,permission,overwrite,createParent,replication,blockSize,progress,buffersize) {\n\t\tString s = \"Network-CreateDFSFile\";\n\n\t\t\/\/MODIFIED!!!!!!-----!!!!!!!!!!!\n\t\tinstrumentation(s,\"after\",\", path: \" + src + \";permission: \" + permission.toString() + \";overwrite: \" + String.valueOf(overwrite) + \";createParent: \" + String.valueOf(createParent) + \";replication: \" + Short.toString(replication) + \";blockSize: \" + Long.toString(blockSize) + \";buffersize: \" + Integer.toString(buffersize));\n\t}\n\tbefore(): runDataStreamer() {\n\t\tString s = \"DataStreamer\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\t\/\/ before(byte buf[],int off, int len) : readEntireBufferFromDataNode(buf[],off,len){\n\t\/\/ \tString s = \"Network-ReadEntireBuffer\";\n\t\/\/ \tinstrumentation(s,\"after\",\", bufferLength: \" + Integer.toString(len));\n\t\/\/ }\n\n\t\/\/ after() returning(DatanodeInfo datanode) : readFromDataNode(){\n\t\/\/ \tString s = \"Network-fromDataNode\";\n\t\/\/ \tinstrumentation(s,\"after\", \", from : \" + datanode.getHostName());\n\t\/\/ }\n\n\tafter(Socket sock, String file, long blockId, Token<BlockTokenIdentifier> accessToken, long genStamp, long startOffset, long len, int bufferSize, boolean verifyChecksum, String clientName) : newBlockReader(sock,file,blockId,accessToken,genStamp,startOffset,len,bufferSize,verifyChecksum,clientName) {\n\t\tString s = \"Network-NewBlockReader\";\n\t\tString extra = \", DataNode: \" + sock.getInetAddress().getCanonicalHostName();\n\t\textra += \";file: \" + file;\n\t\t\/\/extra += \", length: \" + Long.toString(len) + \"B\";\n\t\textra += \";\" + Long.toString(len);\n\t\textra += \";blockId: \" + Long.toString(blockId);\n\t\textra += \";startOffset: \" + Long.toString(startOffset);\t\t\n\t\tinstrumentation(s,\"after\",extra);\n\t}\n}\n\n\n\n\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"23c804b5fc50371436900c58be90526021e6287d","subject":"Lazy creation of low power criteria for location updates","message":"Lazy creation of low power criteria for location updates","repos":"treejames\/ignition,Applied-Duality\/ignition,hongnguyenpro\/ignition,mttkay\/ignition,beni55\/ignition","old_file":"ignition-location\/ignition-location-lib\/src\/com\/github\/ignition\/location\/IgnitedLocationManager.aj","new_file":"ignition-location\/ignition-location-lib\/src\/com\/github\/ignition\/location\/IgnitedLocationManager.aj","new_contents":"\/*\n * Copyright 2011 Google Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * This code has been modified by Stefano Dacchille.\n *\/\n\npackage com.github.ignition.location;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\n\nimport android.app.Activity;\nimport android.app.PendingIntent;\nimport android.content.BroadcastReceiver;\nimport android.content.Context;\nimport android.content.Intent;\nimport android.content.IntentFilter;\nimport android.content.SharedPreferences;\nimport android.content.SharedPreferences.Editor;\nimport android.location.Criteria;\nimport android.location.Location;\nimport android.location.LocationListener;\nimport android.location.LocationManager;\nimport android.os.AsyncTask;\nimport android.os.BatteryManager;\nimport android.os.Bundle;\nimport android.os.Handler;\nimport android.util.Log;\n\nimport com.github.ignition.location.annotations.IgnitedLocation;\nimport com.github.ignition.location.annotations.IgnitedLocationActivity;\nimport com.github.ignition.location.receivers.IgnitedLocationChangedReceiver;\nimport com.github.ignition.location.receivers.IgnitedPassiveLocationChangedReceiver;\nimport com.github.ignition.location.tasks.IgnitedLastKnownLocationAsyncTask;\nimport com.github.ignition.location.templates.ILastLocationFinder;\nimport com.github.ignition.location.templates.LocationUpdateRequester;\nimport com.github.ignition.location.templates.OnIgnitedLocationChangedListener;\nimport com.github.ignition.location.utils.PlatformSpecificImplementationFactory;\nimport com.github.ignition.support.IgnitedDiagnostics;\n\n@SuppressAjWarnings\npublic aspect IgnitedLocationManager {\n    public static final String LOG_TAG = IgnitedLocationManager.class.getSimpleName();\n\n    declare parents : (@IgnitedLocationActivity *) implements OnIgnitedLocationChangedListener;\n\n    private Criteria defaultCriteria, lowPowerCriteria;\n    protected LocationUpdateRequester locationUpdateRequester;\n    protected PendingIntent locationListenerPendingIntent, locationListenerPassivePendingIntent;\n    protected LocationManager locationManager;\n    protected IgnitedLocationListener bestInactiveLocationProviderListener;\n\n    private Context context;\n    private volatile Location currentLocation;\n    private long locationUpdatesInterval, passiveLocationUpdatesInterval;\n    private int locationUpdatesDistanceDiff, passiveLocationUpdatesDistanceDiff;\n    private boolean requestLocationUpdates;\n    private boolean locationUpdatesDisabled = true;\n\n    private AsyncTask<Void, Void, Location> ignitedLastKnownLocationTask;\n    private SharedPreferences prefs;\n    private Handler handler;\n\n    \/\/ Switch to another provider if gps doesn't return a location quickly enough.\n    private Runnable removeGpsUpdates = new Runnable() {\n        @Override\n        public void run() {\n            Log.d(LOG_TAG,\n                    \"It looks like GPS isn't available at this time (i.e.: maybe you're indoors). Removing GPS location updates and requesting network updates.\");\n\n            disableLocationUpdates(false);\n            requestLocationUpdates(context);\n        }\n    };\n\n    \/**\n     * If the Location Provider we're using to receive location updates is disabled while the app is\n     * running, this Receiver will be notified, allowing us to re-register our Location Receivers\n     * using the best available Location Provider is still available.\n     *\/\n    protected BroadcastReceiver locationProviderDisabledReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            boolean providerDisabled = !intent.getBooleanExtra(\n                    LocationManager.KEY_PROVIDER_ENABLED, false);\n            \/\/ Re-register the location listeners using the best available\n            \/\/ Location Provider.\n            if (providerDisabled) {\n                disableLocationUpdates(false);\n                requestLocationUpdates(context);\n            }\n        }\n    };\n\n    \/**\n     * If the battery state is low disable the passive location update receiver.\n     *\/\n    protected BroadcastReceiver refreshLocationUpdatesReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            disableLocationUpdates(false);\n            requestLocationUpdates(context);\n        }\n    };\n\n    after(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onCreate(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n\n        \/\/ Get a reference to the Context\n        this.context = context;\n        \/\/ Set pref file\n        prefs = context.getSharedPreferences(IgnitedLocationConstants.SHARED_PREFERENCE_FILE,\n                Context.MODE_PRIVATE);\n        \/\/ Get references to the managers\n        locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);\n        handler = new Handler();\n\n        \/\/ Specify the Criteria to use when requesting location updates while\n        \/\/ the application is Active\n        if (defaultCriteria == null) {\n            defaultCriteria = new Criteria();\n        }\n        \/\/ Use gps if it's enabled and if battery level is at least 15%\n        boolean useGps = prefs.getBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS,\n                IgnitedLocationConstants.USE_GPS_DEFAULT);\n        if (useGps) {\n            defaultCriteria.setAccuracy(Criteria.ACCURACY_FINE);\n        } else {\n            defaultCriteria.setPowerRequirement(Criteria.POWER_LOW);\n        }\n\n        \/\/ Setup the location update Pending Intent\n        Intent activeIntent = new Intent(IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_ACTION);\n        locationListenerPendingIntent = PendingIntent.getBroadcast(context, 0, activeIntent,\n                PendingIntent.FLAG_UPDATE_CURRENT);\n        \/\/ Setup the passive location update Pending Intent\n        Intent passiveIntent = new Intent(context, IgnitedPassiveLocationChangedReceiver.class);\n        locationListenerPassivePendingIntent = PendingIntent.getBroadcast(context, 0,\n                passiveIntent, PendingIntent.FLAG_UPDATE_CURRENT);\n\n        \/\/ Instantiate a Location Update Requester class based on the available\n        \/\/ platform version. This will be used to request location updates.\n        locationUpdateRequester = PlatformSpecificImplementationFactory\n                .getLocationUpdateRequester(context);\n    }\n\n    private boolean isBatteryOk() {\n        IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);\n        Intent intent = context.registerReceiver(null, filter);\n        double currentLevel = 100.0;\n        if (intent != null) {\n            currentLevel = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1);\n        }\n\n        return currentLevel >= prefs.getInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                IgnitedLocationConstants.MIN_BATTERY_LEVEL_DEFAULT);\n    }\n\n    before(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onResume(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n        \/\/ Get a reference to the Context if this context is null\n        if (this.context == null) {\n            this.context = context;\n        }\n\n        saveToPreferences(context, ignitedAnnotation);\n\n        Log.d(LOG_TAG, \"Retrieving last known location...\");\n        \/\/ Get the last known location. This isn't directly affecting the UI, so put it on a\n        \/\/ worker thread.\n        ignitedLastKnownLocationTask = new IgnitedLastKnownLocationAsyncTask(\n                context, locationUpdatesDistanceDiff, locationUpdatesInterval);\n        ignitedLastKnownLocationTask.execute();\n    }\n\n    \/**\n     * Save last settings to preferences.\n     * \n     * @param context\n     * @param locationAnnotation\n     *\/\n    private void saveToPreferences(Context context, IgnitedLocationActivity locationAnnotation) {\n        requestLocationUpdates = locationAnnotation.requestLocationUpdates();\n        locationUpdatesDistanceDiff = locationAnnotation.locationUpdatesDistanceDiff();\n        locationUpdatesInterval = locationAnnotation.locationUpdatesInterval();\n        passiveLocationUpdatesDistanceDiff = locationAnnotation\n                .passiveLocationUpdatesDistanceDiff();\n        passiveLocationUpdatesInterval = locationAnnotation.passiveLocationUpdatesInterval();\n        boolean enablePassiveLocationUpdates = locationAnnotation.enablePassiveUpdates();\n        boolean useGps = locationAnnotation.useGps();\n\n        Editor editor = prefs.edit();\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_LOCATION_UPDATES,\n                requestLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                enablePassiveLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS, useGps);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_DISTANCE_DIFF,\n                locationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_INTERVAL,\n                locationUpdatesInterval);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_DISTANCE_DIFF,\n                passiveLocationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_INTERVAL,\n                passiveLocationUpdatesInterval);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_RUN_ONCE, true);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                locationAnnotation.minBatteryLevel());\n        editor.putLong(IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                locationAnnotation.waitForGpsFix());\n        editor.commit();\n\n    }\n\n    before(Activity activity, IgnitedLocationActivity ignitedAnnotation) : execution(* Activity.onPause(..)) \n        && @this(ignitedAnnotation) && this(activity)\n        && within(@IgnitedLocationActivity *) && if (ignitedAnnotation.requestLocationUpdates()) {\n\n        disableLocationUpdates(true);\n\n        handler.removeCallbacks(removeGpsUpdates);\n\n        boolean finishing = activity.isFinishing();\n        if (finishing) {\n            if (ignitedLastKnownLocationTask != null && ignitedLastKnownLocationTask.getStatus() != AsyncTask.Status.FINISHED) {\n                ignitedLastKnownLocationTask.cancel(true);\n            } else {\n                PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            }\n\n            context = null;\n        }\n    }\n\n    \/\/ after() : execution(* Activity.onDestroy(..)) && @this(IgnitedLocationActivity)\n    \/\/ && within(@IgnitedLocationActivity *) {\n    \/\/ }\n\n    Location around() : get(@IgnitedLocation Location *) {\n        return currentLocation;\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && within(IgnitedPassiveLocationChangedReceiver) && !adviceexecution() {\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, long): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude());\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && (within(IgnitedLocationChangedReceiver) || within(com.github.ignition.location.utils.*)\n                || within(IgnitedLastKnownLocationAsyncTask)) && !adviceexecution() {\n\n        if (context == null) {\n            return;\n        }\n        final Activity activity = (Activity) context;\n        if (freshLocation == null) {\n            activity.showDialog(R.id.ign_loc_dialog_wait_for_fix);\n            return;\n        }\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, long): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude());\n        boolean keepRequestingLocationUpdates = ((OnIgnitedLocationChangedListener) context)\n                .onIgnitedLocationChanged(currentLocation);\n        if (!keepRequestingLocationUpdates) {\n            disableLocationUpdates(true);\n            PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            return;\n        } else if (requestLocationUpdates\n                && !freshLocation.getExtras().getBoolean(\n                        ILastLocationFinder.LAST_LOCATION_TOO_OLD_EXTRA)) {\n            \/\/ If we requested location updates, turn them on here.\n            requestLocationUpdates(context);\n        }\n\n        \/\/ If gps is enabled location comes from gps, remove runnable that removes gps updates\n        boolean lastLocation = freshLocation.getExtras().getBoolean(\n                IgnitedLocationConstants.IGNITED_LAST_LOCATION_EXTRA);\n        if (!lastLocation && defaultCriteria.getAccuracy() == Criteria.ACCURACY_FINE\n                && currentLocation.getProvider().equals(LocationManager.GPS_PROVIDER)) {\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n    }\n\n    \/**\n     * Start listening for location updates.\n     *\/\n    protected void requestLocationUpdates(Context context) {\n        if (!locationUpdatesDisabled) {\n            return;\n        }\n        Criteria locationUpdateCriteria;\n        if (isBatteryOk()) {\n            locationUpdateCriteria = defaultCriteria;\n        } else {\n            locationUpdateCriteria = lowPowerCriteria();\n        }\n\n        Log.d(LOG_TAG, \"Disabling passive location updates\");\n        locationManager.removeUpdates(locationListenerPassivePendingIntent);\n\n        Log.d(LOG_TAG, \"Requesting location updates\");\n        \/\/ Normal updates while activity is visible.\n        locationUpdateRequester.requestLocationUpdates(locationUpdatesInterval,\n                locationUpdatesDistanceDiff, locationUpdateCriteria, locationListenerPendingIntent);\n\n        \/\/ Register a receiver that listens for when the provider I'm using has\n        \/\/ been disabled.\n        IntentFilter locationProviderDisabledIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_PROVIDER_DISABLED_ACTION);\n        context.registerReceiver(locationProviderDisabledReceiver,\n                locationProviderDisabledIntentFilter);\n\n        IntentFilter refreshLocationUpdatesIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.UPDATE_LOCATION_UPDATES_CRITERIA_ACTION);\n        context.registerReceiver(refreshLocationUpdatesReceiver, refreshLocationUpdatesIntentFilter);\n\n        \/\/ Register a receiver that listens for when a better provider than I'm\n        \/\/ using becomes available.\n        String bestProvider = locationManager.getBestProvider(locationUpdateCriteria, false);\n        String bestAvailableProvider = locationManager.getBestProvider(locationUpdateCriteria, true);\n        if (bestProvider != null && !bestProvider.equals(bestAvailableProvider)) {\n            bestInactiveLocationProviderListener = new IgnitedLocationListener(context);\n            locationManager.requestLocationUpdates(bestProvider, 0, 0,\n                    bestInactiveLocationProviderListener, context.getMainLooper());\n        }\n\n        if (bestAvailableProvider.equals(LocationManager.GPS_PROVIDER)) {\n            Log.d(LOG_TAG, \"Posting delayed remove GPS updates message\");\n            \/\/ Post a runnable that will remove gps updates if no gps location is returned after 1\n            \/\/ minute in order to avoid draining the battery.\n            handler.postDelayed(removeGpsUpdates, prefs.getLong(\n                    IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                    IgnitedLocationConstants.WAIT_FOR_GPS_FIX_INTERVAL_DEFAULT));\n        }\n\n        locationUpdatesDisabled = false;\n    }\n\n    \/**\n     * Stop listening for location updates\n     * \n     * @param enablePassiveLocationUpdates\n     *\/\n    protected void disableLocationUpdates(boolean requestPassiveLocationUpdates) {\n        if (locationUpdatesDisabled) {\n            return;\n        }\n\n        Log.d(LOG_TAG, \"Disabling location updates\");\n        context.unregisterReceiver(locationProviderDisabledReceiver);\n        context.unregisterReceiver(refreshLocationUpdatesReceiver);\n\n        locationUpdateRequester.removeLocationUpdates();\n        if (bestInactiveLocationProviderListener != null) {\n            locationManager.removeUpdates(bestInactiveLocationProviderListener);\n        }\n\n        boolean finishing = ((Activity) context).isFinishing();\n\n        if (requestPassiveLocationUpdates && !finishing) {\n            requestPassiveLocationUpdates();\n        }\n\n        locationUpdatesDisabled = true;\n    }\n\n    private void requestPassiveLocationUpdates() {\n        if (IgnitedDiagnostics.SUPPORTS_FROYO\n                && prefs.getBoolean(\n                        IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                        IgnitedLocationConstants.ENABLE_PASSIVE_LOCATION_UPDATES_DEFAULT)) {\n            Log.d(LOG_TAG, \"Requesting passive location updates\");\n            \/\/ Passive location updates from 3rd party apps when the Activity isn't\n            \/\/ visible. Only for Android 2.2+.\n            locationUpdateRequester.requestPassiveLocationUpdates(passiveLocationUpdatesInterval,\n                    passiveLocationUpdatesDistanceDiff, locationListenerPassivePendingIntent);\n        }\n    }\n\n    public boolean isLocationUpdatesDisabled() {\n        return locationUpdatesDisabled;\n    }\n\n    public Criteria lowPowerCriteria() {\n        if (lowPowerCriteria == null) {\n            lowPowerCriteria = new Criteria();\n            lowPowerCriteria.setPowerRequirement(Criteria.POWER_LOW);\n            lowPowerCriteria.setAccuracy(Criteria.NO_REQUIREMENT);\n        }\n        return lowPowerCriteria;\n    }\n\n    \/**\n     * If the best Location Provider (usually GPS) is not available when we request location\n     * updates, this listener will be notified if \/ when it becomes available. It calls\n     * requestLocationUpdates to re-register the location listeners using the better Location\n     * Provider.\n     *\/\n    private class IgnitedLocationListener implements LocationListener {\n        private Context context;\n\n        public IgnitedLocationListener(Context appContext) {\n            this.context = appContext;\n        }\n\n        @Override\n        public void onLocationChanged(Location l) {\n        }\n\n        @Override\n        public void onProviderDisabled(String provider) {\n        }\n\n        @Override\n        public void onStatusChanged(String provider, int status, Bundle extras) {\n        }\n\n        @Override\n        public void onProviderEnabled(String provider) {\n            \/\/ Re-register the location listeners using the better Location\n            \/\/ Provider.\n            disableLocationUpdates(false);\n            requestLocationUpdates(context);\n        }\n    }\n\n}\n","old_contents":"\/*\n * Copyright 2011 Google Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * This code has been modified by Stefano Dacchille.\n *\/\n\npackage com.github.ignition.location;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\n\nimport android.app.Activity;\nimport android.app.PendingIntent;\nimport android.content.BroadcastReceiver;\nimport android.content.Context;\nimport android.content.Intent;\nimport android.content.IntentFilter;\nimport android.content.SharedPreferences;\nimport android.content.SharedPreferences.Editor;\nimport android.location.Criteria;\nimport android.location.Location;\nimport android.location.LocationListener;\nimport android.location.LocationManager;\nimport android.os.AsyncTask;\nimport android.os.BatteryManager;\nimport android.os.Bundle;\nimport android.os.Handler;\nimport android.util.Log;\n\nimport com.github.ignition.location.annotations.IgnitedLocation;\nimport com.github.ignition.location.annotations.IgnitedLocationActivity;\nimport com.github.ignition.location.receivers.IgnitedLocationChangedReceiver;\nimport com.github.ignition.location.receivers.IgnitedPassiveLocationChangedReceiver;\nimport com.github.ignition.location.tasks.IgnitedLastKnownLocationAsyncTask;\nimport com.github.ignition.location.templates.ILastLocationFinder;\nimport com.github.ignition.location.templates.LocationUpdateRequester;\nimport com.github.ignition.location.templates.OnIgnitedLocationChangedListener;\nimport com.github.ignition.location.utils.PlatformSpecificImplementationFactory;\nimport com.github.ignition.support.IgnitedDiagnostics;\n\n@SuppressAjWarnings\npublic aspect IgnitedLocationManager {\n    public static final String LOG_TAG = IgnitedLocationManager.class.getSimpleName();\n\n    declare parents : (@IgnitedLocationActivity *) implements OnIgnitedLocationChangedListener;\n\n    private Criteria defaultCriteria;\n    protected LocationUpdateRequester locationUpdateRequester;\n    protected PendingIntent locationListenerPendingIntent, locationListenerPassivePendingIntent;\n    protected LocationManager locationManager;\n    protected IgnitedLocationListener bestInactiveLocationProviderListener;\n\n    private Context context;\n    private volatile Location currentLocation;\n    private long locationUpdatesInterval, passiveLocationUpdatesInterval;\n    private int locationUpdatesDistanceDiff, passiveLocationUpdatesDistanceDiff;\n    private boolean requestLocationUpdates;\n    private boolean locationUpdatesDisabled = true;\n\n    private AsyncTask<Void, Void, Location> ignitedLastKnownLocationTask;\n    private SharedPreferences prefs;\n    private Handler handler;\n\n    \/\/ Switch to another provider if gps doesn't return a location quickly enough.\n    private Runnable removeGpsUpdates = new Runnable() {\n        @Override\n        public void run() {\n            Log.d(LOG_TAG,\n                    \"It looks like GPS isn't available at this time (i.e.: maybe you're indoors). Removing GPS location updates and requesting network updates.\");\n\n            disableLocationUpdates(false);\n            requestLocationUpdates(context);\n        }\n    };\n\n    \/**\n     * If the Location Provider we're using to receive location updates is disabled while the app is\n     * running, this Receiver will be notified, allowing us to re-register our Location Receivers\n     * using the best available Location Provider is still available.\n     *\/\n    protected BroadcastReceiver locationProviderDisabledReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            boolean providerDisabled = !intent.getBooleanExtra(\n                    LocationManager.KEY_PROVIDER_ENABLED, false);\n            \/\/ Re-register the location listeners using the best available\n            \/\/ Location Provider.\n            if (providerDisabled) {\n                disableLocationUpdates(false);\n                requestLocationUpdates(context);\n            }\n        }\n    };\n\n    \/**\n     * If the battery state is low disable the passive location update receiver.\n     *\/\n    protected BroadcastReceiver refreshLocationUpdatesReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            disableLocationUpdates(false);\n            requestLocationUpdates(context);\n        }\n    };\n\n    after(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onCreate(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n\n        \/\/ Get a reference to the Context\n        this.context = context;\n        \/\/ Set pref file\n        prefs = context.getSharedPreferences(IgnitedLocationConstants.SHARED_PREFERENCE_FILE,\n                Context.MODE_PRIVATE);\n        \/\/ Get references to the managers\n        locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);\n        handler = new Handler();\n\n        \/\/ Specify the Criteria to use when requesting location updates while\n        \/\/ the application is Active\n        defaultCriteria = new Criteria();\n        \/\/ Use gps if it's enabled and if battery level is at least 15%\n        boolean useGps = prefs.getBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS,\n                IgnitedLocationConstants.USE_GPS_DEFAULT);\n        if (useGps) {\n            defaultCriteria.setAccuracy(Criteria.ACCURACY_FINE);\n        } else {\n            defaultCriteria.setPowerRequirement(Criteria.POWER_LOW);\n        }\n\n        \/\/ Setup the location update Pending Intent\n        Intent activeIntent = new Intent(IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_ACTION);\n        locationListenerPendingIntent = PendingIntent.getBroadcast(context, 0, activeIntent,\n                PendingIntent.FLAG_UPDATE_CURRENT);\n        \/\/ Setup the passive location update Pending Intent\n        Intent passiveIntent = new Intent(context, IgnitedPassiveLocationChangedReceiver.class);\n        locationListenerPassivePendingIntent = PendingIntent.getBroadcast(context, 0,\n                passiveIntent, PendingIntent.FLAG_UPDATE_CURRENT);\n\n        \/\/ Instantiate a Location Update Requester class based on the available\n        \/\/ platform version. This will be used to request location updates.\n        locationUpdateRequester = PlatformSpecificImplementationFactory\n                .getLocationUpdateRequester(context);\n    }\n\n    private boolean isBatteryOk() {\n        IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);\n        Intent intent = context.registerReceiver(null, filter);\n        double currentLevel = 100.0;\n        if (intent != null) {\n            currentLevel = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1);\n        }\n\n        return currentLevel >= prefs.getInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                IgnitedLocationConstants.MIN_BATTERY_LEVEL_DEFAULT);\n    }\n\n    before(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onResume(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n        \/\/ Get a reference to the Context if this context is null\n        if (this.context == null) {\n            this.context = context;\n        }\n\n        saveToPreferences(context, ignitedAnnotation);\n\n        Log.d(LOG_TAG, \"Retrieving last known location...\");\n        \/\/ Get the last known location. This isn't directly affecting the UI, so put it on a\n        \/\/ worker thread.\n        ignitedLastKnownLocationTask = new IgnitedLastKnownLocationAsyncTask(\n                context, locationUpdatesDistanceDiff, locationUpdatesInterval);\n        ignitedLastKnownLocationTask.execute();\n    }\n\n    \/**\n     * Save last settings to preferences.\n     * \n     * @param context\n     * @param locationAnnotation\n     *\/\n    private void saveToPreferences(Context context, IgnitedLocationActivity locationAnnotation) {\n        requestLocationUpdates = locationAnnotation.requestLocationUpdates();\n        locationUpdatesDistanceDiff = locationAnnotation.locationUpdatesDistanceDiff();\n        locationUpdatesInterval = locationAnnotation.locationUpdatesInterval();\n        passiveLocationUpdatesDistanceDiff = locationAnnotation\n                .passiveLocationUpdatesDistanceDiff();\n        passiveLocationUpdatesInterval = locationAnnotation.passiveLocationUpdatesInterval();\n        boolean enablePassiveLocationUpdates = locationAnnotation.enablePassiveUpdates();\n        boolean useGps = locationAnnotation.useGps();\n\n        Editor editor = prefs.edit();\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_LOCATION_UPDATES,\n                requestLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                enablePassiveLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS, useGps);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_DISTANCE_DIFF,\n                locationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_INTERVAL,\n                locationUpdatesInterval);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_DISTANCE_DIFF,\n                passiveLocationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_INTERVAL,\n                passiveLocationUpdatesInterval);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_RUN_ONCE, true);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                locationAnnotation.minBatteryLevel());\n        editor.putLong(IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                locationAnnotation.waitForGpsFix());\n        editor.commit();\n\n    }\n\n    before(Activity activity, IgnitedLocationActivity ignitedAnnotation) : execution(* Activity.onPause(..)) \n        && @this(ignitedAnnotation) && this(activity)\n        && within(@IgnitedLocationActivity *) && if (ignitedAnnotation.requestLocationUpdates()) {\n\n        disableLocationUpdates(true);\n\n        handler.removeCallbacks(removeGpsUpdates);\n\n        boolean finishing = activity.isFinishing();\n        if (finishing) {\n            if (ignitedLastKnownLocationTask != null && ignitedLastKnownLocationTask.getStatus() != AsyncTask.Status.FINISHED) {\n                ignitedLastKnownLocationTask.cancel(true);\n            } else {\n                PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            }\n\n            context = null;\n        }\n    }\n\n    \/\/ after() : execution(* Activity.onDestroy(..)) && @this(IgnitedLocationActivity)\n    \/\/ && within(@IgnitedLocationActivity *) {\n    \/\/ }\n\n    Location around() : get(@IgnitedLocation Location *) {\n        return currentLocation;\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && within(IgnitedPassiveLocationChangedReceiver) && !adviceexecution() {\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, long): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude());\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && (within(IgnitedLocationChangedReceiver) || within(com.github.ignition.location.utils.*)\n                || within(IgnitedLastKnownLocationAsyncTask)) && !adviceexecution() {\n\n        if (context == null) {\n            return;\n        }\n        final Activity activity = (Activity) context;\n        if (freshLocation == null) {\n            activity.showDialog(R.id.ign_loc_dialog_wait_for_fix);\n            return;\n        }\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, long): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude());\n        boolean keepRequestingLocationUpdates = ((OnIgnitedLocationChangedListener) context)\n                .onIgnitedLocationChanged(currentLocation);\n        if (!keepRequestingLocationUpdates) {\n            disableLocationUpdates(true);\n            PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            return;\n        } else if (requestLocationUpdates\n                && !freshLocation.getExtras().getBoolean(\n                        ILastLocationFinder.LAST_LOCATION_TOO_OLD_EXTRA)) {\n            \/\/ If we requested location updates, turn them on here.\n            requestLocationUpdates(context);\n        }\n\n        \/\/ If gps is enabled location comes from gps, remove runnable that removes gps updates\n        boolean lastLocation = freshLocation.getExtras().getBoolean(\n                IgnitedLocationConstants.IGNITED_LAST_LOCATION_EXTRA);\n        if (!lastLocation && defaultCriteria.getAccuracy() == Criteria.ACCURACY_FINE\n                && currentLocation.getProvider().equals(LocationManager.GPS_PROVIDER)) {\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n    }\n\n    \/**\n     * Start listening for location updates.\n     *\/\n    protected void requestLocationUpdates(Context context) {\n        if (!locationUpdatesDisabled) {\n            return;\n        }\n        Criteria locationUpdateCriteria;\n        if (isBatteryOk()) {\n            locationUpdateCriteria = defaultCriteria;\n        } else {\n            locationUpdateCriteria = lowBatteryConsumptionCriteria();\n        }\n\n        Log.d(LOG_TAG, \"Disabling passive location updates\");\n        locationManager.removeUpdates(locationListenerPassivePendingIntent);\n\n        Log.d(LOG_TAG, \"Requesting location updates\");\n        \/\/ Normal updates while activity is visible.\n        locationUpdateRequester.requestLocationUpdates(locationUpdatesInterval,\n                locationUpdatesDistanceDiff, locationUpdateCriteria, locationListenerPendingIntent);\n\n        \/\/ Register a receiver that listens for when the provider I'm using has\n        \/\/ been disabled.\n        IntentFilter locationProviderDisabledIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_PROVIDER_DISABLED_ACTION);\n        context.registerReceiver(locationProviderDisabledReceiver,\n                locationProviderDisabledIntentFilter);\n\n        IntentFilter refreshLocationUpdatesIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.UPDATE_LOCATION_UPDATES_CRITERIA_ACTION);\n        context.registerReceiver(refreshLocationUpdatesReceiver, refreshLocationUpdatesIntentFilter);\n\n        \/\/ Register a receiver that listens for when a better provider than I'm\n        \/\/ using becomes available.\n        String bestProvider = locationManager.getBestProvider(locationUpdateCriteria, false);\n        String bestAvailableProvider = locationManager.getBestProvider(locationUpdateCriteria, true);\n        if (bestProvider != null && !bestProvider.equals(bestAvailableProvider)) {\n            bestInactiveLocationProviderListener = new IgnitedLocationListener(context);\n            locationManager.requestLocationUpdates(bestProvider, 0, 0,\n                    bestInactiveLocationProviderListener, context.getMainLooper());\n        }\n\n        if (bestAvailableProvider.equals(LocationManager.GPS_PROVIDER)) {\n            Log.d(LOG_TAG, \"Posting delayed remove GPS updates message\");\n            \/\/ Post a runnable that will remove gps updates if no gps location is returned after 1\n            \/\/ minute in order to avoid draining the battery.\n            handler.postDelayed(removeGpsUpdates, prefs.getLong(\n                    IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                    IgnitedLocationConstants.WAIT_FOR_GPS_FIX_INTERVAL_DEFAULT));\n        }\n\n        locationUpdatesDisabled = false;\n    }\n\n    \/**\n     * Stop listening for location updates\n     * \n     * @param enablePassiveLocationUpdates\n     *\/\n    protected void disableLocationUpdates(boolean requestPassiveLocationUpdates) {\n        if (locationUpdatesDisabled) {\n            return;\n        }\n\n        Log.d(LOG_TAG, \"Disabling location updates\");\n        context.unregisterReceiver(locationProviderDisabledReceiver);\n        context.unregisterReceiver(refreshLocationUpdatesReceiver);\n\n        locationUpdateRequester.removeLocationUpdates();\n        if (bestInactiveLocationProviderListener != null) {\n            locationManager.removeUpdates(bestInactiveLocationProviderListener);\n        }\n\n        boolean finishing = ((Activity) context).isFinishing();\n\n        if (requestPassiveLocationUpdates && !finishing) {\n            requestPassiveLocationUpdates();\n        }\n\n        locationUpdatesDisabled = true;\n    }\n\n    private void requestPassiveLocationUpdates() {\n        if (IgnitedDiagnostics.SUPPORTS_FROYO\n                && prefs.getBoolean(\n                        IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                        IgnitedLocationConstants.ENABLE_PASSIVE_LOCATION_UPDATES_DEFAULT)) {\n            Log.d(LOG_TAG, \"Requesting passive location updates\");\n            \/\/ Passive location updates from 3rd party apps when the Activity isn't\n            \/\/ visible. Only for Android 2.2+.\n            locationUpdateRequester.requestPassiveLocationUpdates(passiveLocationUpdatesInterval,\n                    passiveLocationUpdatesDistanceDiff, locationListenerPassivePendingIntent);\n        }\n    }\n\n    public boolean isLocationUpdatesDisabled() {\n        return locationUpdatesDisabled;\n    }\n\n    public Criteria lowBatteryConsumptionCriteria() {\n        Criteria criteria = new Criteria();\n        criteria.setPowerRequirement(Criteria.POWER_LOW);\n        criteria.setAccuracy(Criteria.NO_REQUIREMENT);\n        return criteria;\n    }\n\n    \/**\n     * If the best Location Provider (usually GPS) is not available when we request location\n     * updates, this listener will be notified if \/ when it becomes available. It calls\n     * requestLocationUpdates to re-register the location listeners using the better Location\n     * Provider.\n     *\/\n    private class IgnitedLocationListener implements LocationListener {\n        private Context context;\n\n        public IgnitedLocationListener(Context appContext) {\n            this.context = appContext;\n        }\n\n        @Override\n        public void onLocationChanged(Location l) {\n        }\n\n        @Override\n        public void onProviderDisabled(String provider) {\n        }\n\n        @Override\n        public void onStatusChanged(String provider, int status, Bundle extras) {\n        }\n\n        @Override\n        public void onProviderEnabled(String provider) {\n            \/\/ Re-register the location listeners using the better Location\n            \/\/ Provider.\n            disableLocationUpdates(false);\n            requestLocationUpdates(context);\n        }\n    }\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"fb1afb08bde90b97686a20105792b002a8249402","subject":"Invariant preservation now checked for constructors","message":"Invariant preservation now checked for constructors\n","repos":"timmolderez\/adbc","old_file":"src\/be\/ac\/ua\/ansymo\/adbc\/aspects\/ClassContractEnforcer.aj","new_file":"src\/be\/ac\/ua\/ansymo\/adbc\/aspects\/ClassContractEnforcer.aj","new_contents":"\/*******************************************************************************\n * Copyright (c) 2012-2013 Tim Molderez.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the 3-Clause BSD License\n * which accompanies this distribution, and is available at\n * http:\/\/www.opensource.org\/licenses\/BSD-3-Clause\n ******************************************************************************\/\n\npackage be.ac.ua.ansymo.adbc.aspects;\n\nimport java.lang.reflect.AccessibleObject;\nimport java.lang.reflect.Method;\nimport java.util.EmptyStackException;\nimport java.util.Vector;\n\nimport javax.script.ScriptException;\n\nimport org.aspectj.lang.JoinPoint;\nimport org.aspectj.lang.reflect.CodeSignature;\nimport org.aspectj.lang.reflect.ConstructorSignature;\nimport org.aspectj.lang.reflect.MethodSignature;\n\nimport be.ac.ua.ansymo.adbc.AdbcConfig;\nimport be.ac.ua.ansymo.adbc.annotations.ensures;\nimport be.ac.ua.ansymo.adbc.annotations.invariant;\nimport be.ac.ua.ansymo.adbc.annotations.requires;\nimport be.ac.ua.ansymo.adbc.exceptions.InvariantException;\nimport be.ac.ua.ansymo.adbc.exceptions.PostConditionException;\nimport be.ac.ua.ansymo.adbc.exceptions.PreConditionException;\nimport be.ac.ua.ansymo.adbc.exceptions.SubstitutionException;\nimport be.ac.ua.ansymo.adbc.utilities.ContractInterpreter;\nimport be.ac.ua.ansymo.adbc.utilities.ContractStore;\n\n\/**\n * This aspect enforces the contracts of all application classes.\n * If a contract is broken, a ContractEnforcementException is thrown.\n * @author Tim Molderez\n *\/\npublic aspect ClassContractEnforcer extends AbstractContractEnforcer {\n\t\n\t\/**\n\t * This advice enforces contracts of regular method calls\n\t * If a contract is broken, a ContractEnforcementException is thrown.\n\t * @param dyn\tthe this object, used to determine the dynamic type\n\t *\/\n\tObject around(Object dyn): execution(* *.*(..)) && this(dyn)\n\t&& excludeContractEnforcers() {\n\t\t\/* Very sensitive pointcut!! Only use what's excluded by excludeContractEnforcers()\n\t\t * or you'll trigger an infinite recursion! *\/\n\t\t\n\t\ttry {\n\t\t\tPostData pD = preCheck(thisJoinPoint, dyn);\n\t\t\tObject result = proceed(dyn);\n\t\t\tif (AdbcConfig.checkPostconditions) {\n\t\t\t\tpostCheck(pD, thisJoinPoint, dyn, result);\n\t\t\t}\n\t\t\treturn result;\n\t\t} catch (ScriptException e) {\n\t\t\tthrow new RuntimeException(\"Failed to evaluate contract: \" + e.getMessage());\n\t\t}\n\t}\n\t\n\t\/**\n\t * This advice enforces contracts of constructors\n\t * If a contract is broken, a ContractEnforcementException is thrown.\n\t * @param dyn\tthe this object, used to determine the dynamic type\n\t *\/\n\tObject around(Object dyn): execution(*.new(..)) && excludeContractEnforcers() && this(dyn) {\n\t\t\/\/ Skip enforcement if this is the internal constructor of an aspect..\n\t\tif(aspectConstructorCheck(thisJoinPoint)) {\n\t\t\treturn proceed(dyn);\n\t\t}\n\t\t\n\t\ttry {\n\t\t\tPostData pD = preCheck(thisJoinPoint, null);\n\t\t\tObject result = proceed(dyn);\n\t\t\tif (AdbcConfig.checkPostconditions) {\n\t\t\t\tpostCheck(pD, thisJoinPoint, dyn, null);\n\t\t\t}\n\t\t\treturn result;\n\t\t} catch (ScriptException e) {\n\t\t\tthrow new RuntimeException(\"Failed to evaluate contract (in constructor): \" + e.getMessage());\n\t\t}\n\t}\n\t\n\t\/*\n\t * Check contracts before method execution (preconditions, invariants, substitution principle)\n\t * @param jp\tthisJoinPoint\n\t * @param dyn\tthe this object\n\t * @return data to be passed on to postCheck()\n\t *\/\n\tprivate PostData preCheck(JoinPoint jp, Object dyn) throws ScriptException {\n\t\t\/* ****************************************************************\n\t\t * Fetching the necessary info...\n\t\t **************************************************************** *\/\n\t\t\n\t\t\/\/ Retrieve the join point of the method call we're contract-enforcing\n\t\tJoinPoint callJp = null;\n\t\ttry {\n\t\t\tcallJp = CallStack.pop();\n\t\t} catch (EmptyStackException e) {\n\t\t\tcallJp = jp; \/\/ You might end up here in case of constructors..\n\t\t}\n\t\t\n\t\t\/\/ Reset bindings\n\t\tContractInterpreter ceval = new ContractInterpreter();\n\t\t\n\t\t\/\/ Get the contracts of the method call's static type\n\t\tCodeSignature sig = (CodeSignature)(callJp.getSignature());\n\t\tAccessibleObject body = null;\n\t\tif(sig instanceof MethodSignature) {\n\t\t\tbody = ((MethodSignature)sig).getMethod();\n\t\t} else if (sig instanceof ConstructorSignature) {\n\t\t\tbody = ((ConstructorSignature)sig).getConstructor();\n\t\t}\n\t\t\n\t\tContractStore store = ContractStore.getInstance();\n\t\tString[] pre = store.getPre(body);\n\t\tString[] post = store.getPost(body);\n\t\tString[] inv = dyn==null?new String[]{\"true\"}:store.getInvariant(callJp.getSignature().getDeclaringType());\n\t\t\/\/ Reset postconditions (used in substitution checking)\n\t\tVector<String[]> postContracts = new Vector<String[]>();\n\t\t\n\t\t\/* ****************************************************************\n\t\t * Binding contract variables\n\t\t **************************************************************** *\/\n\t\t\n\t\t\/\/ Bind parameter values\n\t\tceval.setParameterBindings(sig.getParameterNames(), callJp.getArgs());\n\t\t\n\t\t\/\/ Bind the this object\n\t\tceval.setThisBinding(dyn);\n\t\t\n\t\t\/* ****************************************************************\n\t\t * Actual contract enforcement\n\t\t **************************************************************** *\/\n\t\t\n\t\t\/\/ Test preconditions\n\t\tString brokenContract = ceval.evalContract(pre);\n\t\tif(brokenContract!=null) {\n\t\t\tthrow new PreConditionException(brokenContract, getStaticSignature(callJp), getCallerSignature());\n\t\t}\n\n\t\t\/\/ Test invariants\n\t\tbrokenContract = ceval.evalContract(inv);\n\t\tif(brokenContract!=null) {\n\t\t\tthrow new InvariantException(brokenContract, callJp.getSignature().getDeclaringTypeName(), getCallerSignature(), \"precondition\");\n\t\t}\n\t\t\n\t\t\/\/ Test precondition substitution rule (does not apply to constructors..)\n\t\tif (dyn!=null && AdbcConfig.checkSubstitutionPrinciple) {\n\t\t\tsubPreCheck(ceval, dyn.getClass(), null, sig, postContracts);\n\t\t}\n\t\t\n\t\t\/\/ Evaluate calls to the $old() function in the postcondition\n\t\t\/\/ (This should be done last; it should be safe for the developer to assume that the preconditions passed when using the $old() function.)\n\t\ttry {\n\t\t\tif (AdbcConfig.checkPostconditions) {\n\t\t\t\tpost = ceval.evalOldFunction(post);\n\t\t\t}\n\t\t} catch (ScriptException e) {\n\t\t\tthrow new RuntimeException(\"Failed to evaluate old() call: \" + e.getMessage());\n\t\t}\n\t\t\n\t\treturn new PostData(ceval, post, inv, callJp, postContracts);\n\t}\n\t\n\t\/*\n\t * Check contracts after method execution (postconditions, invariants, substitution principle)\n\t * @param pD\t\tcontainer object with various information produced during the preCheck\n\t * @param jp\t\tthisJoinPoint\n\t * @param dyn\t\tthe this object\n\t * @param result\treturn value of the method call\n\t *\/\n\tprivate void postCheck(PostData pD, JoinPoint jp, Object dyn, Object result) throws ScriptException {\n\t\t\/\/ Get information from the PostData containeer\n\t\tContractInterpreter ceval = pD.ceval;\n\t\tJoinPoint callJp = pD.callJp;\n\t\tString[] inv = pD.inv;\n\t\tString[] post = pD.post;\n\t\tVector<String[]> postContracts = pD.postContracts;\n\t\t\n\t\t\/\/ Bind the return value\n\t\tceval.setReturnValueBinding(result);\n\t\t\n\t\t\/\/ Retrieve the method signature of the join point we matched on\n\t\tCodeSignature sig = (CodeSignature)(callJp.getSignature());\n\t\tboolean isConstructor = sig instanceof ConstructorSignature;\n\t\t\t\t\n\t\t\/\/ In case of constructors, now you can fetch the invariants and bind this.. \n\t\tif (isConstructor) {\n\t\t\tContractStore store = ContractStore.getInstance();\n\t\t\tinv = store.getInvariant(dyn.getClass());\n\t\t\tceval.setThisBinding(dyn);\n\t\t}\n\n\t\t\/\/ Test postconditions\n\t\tString brokenContract = ceval.evalContract(post);\n\t\tif(brokenContract!=null) {\n\t\t\tthrow new PostConditionException(brokenContract, getStaticSignature(callJp), getDynamicSignature(dyn.getClass(), sig));\n\t\t}\n\t\t\n\t\t\/\/ Test invariants\n\t\tbrokenContract = ceval.evalContract(inv);\n\t\tif(brokenContract!=null) {\n\t\t\tthrow new InvariantException(brokenContract, callJp.getSignature().getDeclaringTypeName(), getDynamicSignature(dyn.getClass(), sig), \"postcondition\");\n\t\t}\n\t\t\n\t\t\/\/ Test postcondition substitution rule \n\t\tif (!isConstructor && AdbcConfig.checkSubstitutionPrinciple) {\n\t\t\tsubPostCheck(ceval, true, dyn.getClass(), null, sig, postContracts, 0);\n\t\t} else if (AdbcConfig.checkSubstitutionPrinciple) {\n\t\t\t\/\/ Only test invariants for constructors\n\t\t\tsubPostConstructorCheck(ceval, dyn.getClass(), null);\n\t\t}\n\t}\n\t\n\t\/*\n\t * Checks whether the current join point is the execution of an internal constructor in an aspect\n\t * @param jp\tthisJoinPoint\n\t *\/\n\tprivate boolean aspectConstructorCheck(JoinPoint jp) {\n\t\treturn jp.getThis().getClass().isAnnotationPresent(org.aspectj.lang.annotation.Aspect.class);\n\t}\n\t\n\t\/*\n\t * Check the precondition rule of behavioural subtyping\n\t * (Subtype's precondition should be equal to or weaker than the supertype's. Invariants should also be preserved.)\n\t * @param ceval\t\t\tcontract interpreter\n\t * @param dynType\t\tcheck whether this type's preconditions respect its parents\n\t * @param toBeBlamed\tblame this class if a contract is broken\n\t * @param sig\t\t\tsignature of the method to be checked\n\t * @param postContracts\twhen the method finishes, this will be filled up with the postconditions in the traversed type hierarchy, with their $old functions evaluated\n\t * @return\t\t\t\ttrue if the precondition+invariant rule holds\n\t *\/\n\tprivate boolean subPreCheck(ContractInterpreter ceval, Class<?> dynType, Class<?> toBeBlamed, CodeSignature sig, Vector<String[]> postContracts) throws ScriptException {\n\t\ttry {\n\t\t\tboolean res = true;\n\t\t\tboolean next = true;\n\t\t\tString brokenContract=null;\n\t\t\tContractStore store = ContractStore.getInstance();\n\t\t\t\n\t\t\t\/\/ Note that getMethod basically does a lookup procedure! (unlike getDeclaredMethod)\n\t\t\tMethod mBody = dynType.getMethod(sig.getName(), sig.getParameterTypes());\n\t\t\t\n\t\t\tif (mBody.isAnnotationPresent(requires.class)) {\n\t\t\t\tbrokenContract = ceval.evalContract(store.getPre(mBody));\n\t\t\t\tres = brokenContract==null;\n\t\t\t}\n\t\t\t\n\t\t\tif (mBody.getDeclaringClass().getSuperclass()!=Object.class) {\n\t\t\t\tnext = subPreCheck(ceval, mBody.getDeclaringClass().getSuperclass(), mBody.getDeclaringClass(), sig, postContracts);\n\t\t\t}\n\t\t\t\n\t\t\tif (dynType.isAnnotationPresent(invariant.class)) {\n\t\t\t\tString brokenInv = ceval.evalContract(store.getInvariant(dynType));\n\t\t\t\tif (brokenInv != null) {\n\t\t\t\t\tthrow new SubstitutionException(brokenInv,dynType.getCanonicalName(), toBeBlamed.getCanonicalName(), \"invariant not preserved\");\n\t\t\t\t}\n\t\t\t}\n\t\t\t\n\t\t\tif (mBody.isAnnotationPresent(ensures.class)) {\n\t\t\t\tpostContracts.add(ceval.evalOldFunction(store.getPost(mBody)));\n\t\t\t}\n\t\t\t\n\t\t\tif (!next || res) {\n\t\t\t\treturn res;\n\t\t\t} else {\n\t\t\t\tthrow new SubstitutionException(brokenContract,sig.toLongString() , dynType.getCanonicalName() + \".\" + mBody.toString(), \"precondition too strong\");\n\t\t\t}\n\t\t} catch (SecurityException e) {\n\t\t\te.printStackTrace();\n\t\t\treturn false;\n\t\t} catch (NoSuchMethodException e) {\n\t\t\treturn true;\n\t\t}\n\t\t\n\t}\n\t\n\t\/*\n\t * Check the postcondition rule of behavioural subtyping\n\t * (If the precondition of the supertype held in the pre-state,\n\t * the postcondition of the subtype should be equal to or stronger than the supertype's.\n\t * Invariants should also be preserved.)\n\t * @param ceval\t\tcontract interpreter\n\t * @param last\t\tresult of the caller \n\t * @param dynType\tcheck whether this type's postconditions respect its parents\n\t * @param toBeBlamed\tblame this class if a contract is broken\n\t * @param sig\t\tsignature of the method to be checked\n\t * @param i\t\t\tindex indicating which entry of postContracts to use\n\t * @return\t\t\ttrue if the postcondition+invariant rule holds\n\t *\/\n\tprivate boolean subPostCheck(ContractInterpreter ceval, boolean last, Class<?> dynType, Class<?> toBeBlamed, CodeSignature sig, Vector<String[]> postContracts, int i) throws ScriptException {\n\t\tboolean res = true;\n\t\tString brokenContract=null;\n\t\tMethod mBody=null;\n\t\tContractStore store = ContractStore.getInstance();\n\t\ttry {\n\t\t\tmBody = dynType.getMethod(sig.getName(), sig.getParameterTypes());\n\t\t\t\n\t\t\tif (mBody.isAnnotationPresent(ensures.class) && i<postContracts.size()) {\n\t\t\t\tbrokenContract = ceval.evalContract(postContracts.get(i));\n\t\t\t\tres = brokenContract==null;\n\t\t\t}\n\t\t} catch (SecurityException e) {\n\t\t\te.printStackTrace();\n\t\t\treturn false;\n\t\t} catch (NoSuchMethodException e) {\n\t\t\treturn true;\n\t\t}\n\t\t\t\n\t\tif (dynType.isAnnotationPresent(invariant.class)) {\n\t\t\tString brokenInv = ceval.evalContract(store.getInvariant(dynType));\n\t\t\tif (brokenInv != null) {\n\t\t\t\tthrow new SubstitutionException(brokenInv,dynType.getCanonicalName(), toBeBlamed.getCanonicalName(), \"invariant not preserved\");\n\t\t\t}\n\t\t}\n\t\t\n\t\tif (!last || res) {\n\t\t\treturn subPostCheck(ceval, res, dynType.getSuperclass(), dynType, sig, postContracts, i+1);\n\t\t} else {\n\t\t\tthrow new SubstitutionException(brokenContract, sig.toLongString() , dynType.getCanonicalName() + \".\" + mBody.toString(), \"postcondition too weak\");\n\t\t}\n\t}\n\t\n\t\/*\n\t * Check that invariants are preserved in the post-state of a constructor\n\t * @param ceval\t\t\tcontract interpreter\n\t * @param last\t\t\tresult of the caller \n\t * @param dynType\t\tcheck whether this type's postconditions respect its parents\n\t * @param toBeBlamed\tblame this class if a contract is broken\n\t * @return\t\t\t\ttrue if the invariant rule holds\n\t *\/\n\tprivate boolean subPostConstructorCheck(ContractInterpreter ceval,Class<?> dynType, Class<?> toBeBlamed) throws ScriptException {\n\t\tif(dynType==null) {\n\t\t\treturn true;\n\t\t}\n\n\t\tContractStore store = ContractStore.getInstance();\n\t\tString brokenInv = ceval.evalContract(store.getInvariant(dynType));\n\t\tif (brokenInv != null) {\n\t\t\tthrow new SubstitutionException(brokenInv,dynType.getCanonicalName(), toBeBlamed.getCanonicalName(), \"invariant not preserved\");\n\n\t\t}\n\t\treturn subPostConstructorCheck(ceval, dynType.getSuperclass(), dynType);\n\t}\n\t\n\t\/*\n\t * Retrieve the caller of the method\n\t * @return the caller's signature\n\t *\/\n\tprivate String getCallerSignature() {\n\t\t\/* Runtime stack at this point:\n\t\t * 0: getStackTrace()\n\t\t * 1: getCallerSignature_aroundBody()\n\t\t * 2: getCallerSignature()\n\t\t * 3: preCheck_aroundBody()\n\t\t * 4: preCheck()\n\t\t * 5: inlineAccessMethod\n\t\t * 6: contract advice\n\t\t * 7: user advice\n\t\t * 8+ The actual caller should be around here, after skipping all the internal stuff AspectJ creates.. *\/\n\t\t\n\t\tint i=8;\n\t\tStackTraceElement[] elems = Thread.currentThread().getStackTrace();\n\t\twhile (i<elems.length) {\n\t\t\tString m = elems[i].getMethodName();\n\n\t\t\t\/\/ Anything ending in proceed or run or aroundBody should be internal AspectJ stuff..\n\t\t\tif(m.matches(\".*proceed\\\\d*\") || m.endsWith(\"run\") || m.matches(\".*aroundBody\\\\d*(\\\\$advice)?\")) {\n\t\t\t\ti++;\n\t\t\t} else {\n\t\t\t\treturn elems[i].getClassName() + \".\" + elems[i].getMethodName();\n\t\t\t}\n\t\t}\n\t\treturn \"(caller not found)\";\n\t}\n\t\n\t\/*\n\t * Retrieve the signature of the method body in the method call's dynamic type\n\t * @param dynType\tdynamic type\n\t * @param sig\t\tmethod signature (its declaring type is ignored..)\n\t * @return dynamic signature\n\t *\/\n\tprivate String getDynamicSignature(Class<?> dynType, CodeSignature sig) {\n\t\tMethod mBody;\n\t\ttry {\n\t\t\tmBody = dynType.getMethod(sig.getName(), sig.getParameterTypes());\n\t\t\treturn dynType.getCanonicalName() + \".\" + mBody.toString();\n\t\t} catch (Exception e) {\n\t\t\treturn \"(method not found)\";\n\t\t}\n\t}\n\t\n\t\/*\n\t * Retrieve the signature of the method body in the method call's static type\n\t * @param jp\tcall join point\n\t * @return static signature\t\n\t *\/\n\tprivate String getStaticSignature(JoinPoint jp) {\n\t\treturn jp.getSignature().toLongString();\n\t}\n\t\n\t\/*\n\t * Container for the data to be passed from preCheck() to postCheck()\n\t *\/\n\tprivate class PostData {\n\t\tpublic PostData(ContractInterpreter ceval, String[] post, String[] inv, JoinPoint callJp, Vector<String[]> postContracts) {\n\t\t\tthis.ceval = ceval;\n\t\t\tthis.post = post;\n\t\t\tthis.inv = inv;\n\t\t\tthis.callJp = callJp;\n\t\t\tthis.postContracts = postContracts;\n\t\t}\n\t\t\n\t\tpublic ContractInterpreter ceval;\t\t\/\/ Contract interpreter\n\t\tpublic String[] post;\t\t\t\t\t\/\/ Postconditions of method call's static type\n\t\tpublic String[] inv;\t\t\t\t\t\/\/ Invariants of method call's static type\n\t\t\n\t\tpublic JoinPoint callJp;\t\t\t\t\/\/ The call join point corresponding to the execution join point captured by the contract enforcement advice\n\t\tpublic Vector<String[]> postContracts;\t\/\/ Postconditions of ancestors, with their $old() calls processed\n\t}\n}\n","old_contents":"\/*******************************************************************************\n * Copyright (c) 2012-2013 Tim Molderez.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the 3-Clause BSD License\n * which accompanies this distribution, and is available at\n * http:\/\/www.opensource.org\/licenses\/BSD-3-Clause\n ******************************************************************************\/\n\npackage be.ac.ua.ansymo.adbc.aspects;\n\nimport java.lang.reflect.AccessibleObject;\nimport java.lang.reflect.Method;\nimport java.util.EmptyStackException;\nimport java.util.Vector;\n\nimport javax.script.ScriptException;\n\nimport org.aspectj.lang.JoinPoint;\nimport org.aspectj.lang.reflect.CodeSignature;\nimport org.aspectj.lang.reflect.ConstructorSignature;\nimport org.aspectj.lang.reflect.MethodSignature;\n\nimport be.ac.ua.ansymo.adbc.AdbcConfig;\nimport be.ac.ua.ansymo.adbc.annotations.ensures;\nimport be.ac.ua.ansymo.adbc.annotations.invariant;\nimport be.ac.ua.ansymo.adbc.annotations.requires;\nimport be.ac.ua.ansymo.adbc.exceptions.InvariantException;\nimport be.ac.ua.ansymo.adbc.exceptions.PostConditionException;\nimport be.ac.ua.ansymo.adbc.exceptions.PreConditionException;\nimport be.ac.ua.ansymo.adbc.exceptions.SubstitutionException;\nimport be.ac.ua.ansymo.adbc.utilities.ContractInterpreter;\nimport be.ac.ua.ansymo.adbc.utilities.ContractStore;\n\n\/**\n * This aspect enforces the contracts of all application classes.\n * If a contract is broken, a ContractEnforcementException is thrown.\n * @author Tim Molderez\n *\/\npublic aspect ClassContractEnforcer extends AbstractContractEnforcer {\n\t\n\t\/**\n\t * This advice enforces contracts of regular method calls\n\t * If a contract is broken, a ContractEnforcementException is thrown.\n\t * @param dyn\tthe this object, used to determine the dynamic type\n\t *\/\n\tObject around(Object dyn): execution(* *.*(..)) && this(dyn)\n\t&& excludeContractEnforcers() {\n\t\t\/* Very sensitive pointcut!! Only use what's excluded by excludeContractEnforcers()\n\t\t * or you'll trigger an infinite recursion! *\/\n\t\t\n\t\ttry {\n\t\t\tPostData pD = preCheck(thisJoinPoint, dyn);\n\t\t\tObject result = proceed(dyn);\n\t\t\tif (AdbcConfig.checkPostconditions) {\n\t\t\t\tpostCheck(pD, thisJoinPoint, dyn, result);\n\t\t\t}\n\t\t\treturn result;\n\t\t} catch (ScriptException e) {\n\t\t\tthrow new RuntimeException(\"Failed to evaluate contract: \" + e.getMessage());\n\t\t}\n\t}\n\t\n\t\/**\n\t * This advice enforces contracts of constructors\n\t * If a contract is broken, a ContractEnforcementException is thrown.\n\t * @param dyn\tthe this object, used to determine the dynamic type\n\t *\/\n\tObject around(Object dyn): execution(*.new(..)) && excludeContractEnforcers() && this(dyn) {\n\t\t\/\/ Skip enforcement if this is the internal constructor of an aspect..\n\t\tif(aspectConstructorCheck(thisJoinPoint)) {\n\t\t\treturn proceed(dyn);\n\t\t}\n\t\t\n\t\t\/\/ Temporarily disable substitution checking, as it does not apply to constructors..\n\t\tboolean subst = AdbcConfig.checkSubstitutionPrinciple;\n\t\tAdbcConfig.checkSubstitutionPrinciple = false;\n\t\ttry {\n\t\t\tPostData pD = preCheck(thisJoinPoint, null);\n\t\t\tObject result = proceed(dyn);\n\t\t\tif (AdbcConfig.checkPostconditions) {\n\t\t\t\tpostCheck(pD, thisJoinPoint, dyn, null);\n\t\t\t}\n\t\t\tAdbcConfig.checkSubstitutionPrinciple=subst;\n\t\t\treturn result;\n\t\t} catch (ScriptException e) {\n\t\t\tAdbcConfig.checkSubstitutionPrinciple=subst;\n\t\t\tthrow new RuntimeException(\"Failed to evaluate contract (in constructor): \" + e.getMessage());\n\t\t}\n\t}\n\t\n\t\/*\n\t * Check contracts before method execution (preconditions, invariants, substitution principle)\n\t * @param jp\tthisJoinPoint\n\t * @param dyn\tthe this object\n\t * @return data to be passed on to postCheck()\n\t *\/\n\tprivate PostData preCheck(JoinPoint jp, Object dyn) throws ScriptException {\n\t\t\/* ****************************************************************\n\t\t * Fetching the necessary info...\n\t\t **************************************************************** *\/\n\t\t\n\t\t\/\/ Retrieve the join point of the method call we're contract-enforcing\n\t\tJoinPoint callJp = null;\n\t\ttry {\n\t\t\tcallJp = CallStack.pop();\n\t\t} catch (EmptyStackException e) {\n\t\t\tcallJp = jp; \/\/ You might end up here in case of constructors..\n\t\t}\n\t\t\n\t\t\/\/ Reset bindings\n\t\tContractInterpreter ceval = new ContractInterpreter();\n\t\t\n\t\t\/\/ Get the contracts of the method call's static type\n\t\tCodeSignature sig = (CodeSignature)(callJp.getSignature());\n\t\tAccessibleObject body = null;\n\t\tif(sig instanceof MethodSignature) {\n\t\t\tbody = ((MethodSignature)sig).getMethod();\n\t\t} else if (sig instanceof ConstructorSignature) {\n\t\t\tbody = ((ConstructorSignature)sig).getConstructor();\n\t\t}\n\t\t\n\t\tContractStore store = ContractStore.getInstance();\n\t\tString[] pre = store.getPre(body);\n\t\tString[] post = store.getPost(body);\n\t\tString[] inv = dyn==null?new String[]{\"true\"}:store.getInvariant(callJp.getSignature().getDeclaringType());\n\t\t\/\/ Reset postconditions (used in substitution checking)\n\t\tVector<String[]> postContracts = new Vector<String[]>();\n\t\t\n\t\t\/* ****************************************************************\n\t\t * Binding contract variables\n\t\t **************************************************************** *\/\n\t\t\n\t\t\/\/ Bind parameter values\n\t\tceval.setParameterBindings(sig.getParameterNames(), callJp.getArgs());\n\t\t\n\t\t\/\/ Bind the this object\n\t\tceval.setThisBinding(dyn);\n\t\t\n\t\t\/* ****************************************************************\n\t\t * Actual contract enforcement\n\t\t **************************************************************** *\/\n\t\t\n\t\t\/\/ Test preconditions\n\t\tString brokenContract = ceval.evalContract(pre);\n\t\tif(brokenContract!=null) {\n\t\t\tthrow new PreConditionException(brokenContract, getStaticSignature(callJp), getCallerSignature());\n\t\t}\n\n\t\t\/\/ Test invariants\n\t\tbrokenContract = ceval.evalContract(inv);\n\t\tif(brokenContract!=null) {\n\t\t\tthrow new InvariantException(brokenContract, callJp.getSignature().getDeclaringTypeName(), getCallerSignature(), \"precondition\");\n\t\t}\n\t\t\n\t\t\/\/ Test precondition substitution rule\n\t\tif (AdbcConfig.checkSubstitutionPrinciple) {\n\t\t\tsubPreCheck(ceval, dyn.getClass(), null, sig, postContracts);\n\t\t}\n\t\t\n\t\t\/\/ Evaluate calls to the $old() function in the postcondition\n\t\t\/\/ (This should be done last; it should be safe for the developer to assume that the preconditions passed when using the $old() function.)\n\t\ttry {\n\t\t\tif (AdbcConfig.checkPostconditions) {\n\t\t\t\tpost = ceval.evalOldFunction(post);\n\t\t\t}\n\t\t} catch (ScriptException e) {\n\t\t\tthrow new RuntimeException(\"Failed to evaluate old() call: \" + e.getMessage());\n\t\t}\n\t\t\n\t\treturn new PostData(ceval, post, inv, callJp, postContracts);\n\t}\n\t\n\t\/*\n\t * Check contracts after method execution (postconditions, invariants, substitution principle)\n\t * @param pD\t\tcontainer object with various information produced during the preCheck\n\t * @param jp\t\tthisJoinPoint\n\t * @param dyn\t\tthe this object\n\t * @param result\treturn value of the method call\n\t *\/\n\tprivate void postCheck(PostData pD, JoinPoint jp, Object dyn, Object result) throws ScriptException {\n\t\t\/\/ Get information from the PostData containeer\n\t\tContractInterpreter ceval = pD.ceval;\n\t\tJoinPoint callJp = pD.callJp;\n\t\tString[] inv = pD.inv;\n\t\tString[] post = pD.post;\n\t\tVector<String[]> postContracts = pD.postContracts;\n\t\t\n\t\t\/\/ Bind the return value\n\t\tceval.setReturnValueBinding(result);\n\t\t\n\t\t\/\/ Retrieve the method signature of the join point we matched on\n\t\tCodeSignature sig = (CodeSignature)(callJp.getSignature());\n\t\t\t\t\n\t\t\/\/ In case of constructors, now you can fetch the invariants and bind this.. \n\t\tif (sig instanceof ConstructorSignature) {\n\t\t\tContractStore store = ContractStore.getInstance();\n\t\t\tinv = store.getInvariant(dyn.getClass());\n\t\t\tceval.setThisBinding(dyn);\n\t\t}\n\n\t\t\/\/ Test postconditions\n\t\tString brokenContract = ceval.evalContract(post);\n\t\tif(brokenContract!=null) {\n\t\t\tthrow new PostConditionException(brokenContract, getStaticSignature(callJp), getDynamicSignature(dyn.getClass(), sig));\n\t\t}\n\t\t\n\t\t\/\/ Test invariants\n\t\tbrokenContract = ceval.evalContract(inv);\n\t\tif(brokenContract!=null) {\n\t\t\tthrow new InvariantException(brokenContract, callJp.getSignature().getDeclaringTypeName(), getDynamicSignature(dyn.getClass(), sig), \"postcondition\");\n\t\t}\n\t\t\n\t\t\/\/ Test postcondition substitution rule \n\t\t\/\/ (skip if the dynamic type == the static type; there are no constraints on the postcondition in this case, since there's no substituting going on...)\n\t\tif (AdbcConfig.checkSubstitutionPrinciple \n\t\t\t\t&& !dyn.getClass().getCanonicalName().equals(callJp.getSignature().getDeclaringTypeName())) {\n\t\t\tsubPostCheck(ceval, true, dyn.getClass(), null, sig, postContracts, 0);\n\t\t}\n\t}\n\t\n\t\/*\n\t * Checks whether the current join point is the execution of an internal constructor in an aspect\n\t * @param jp\tthisJoinPoint\n\t *\/\n\tprivate boolean aspectConstructorCheck(JoinPoint jp) {\n\t\treturn jp.getThis().getClass().isAnnotationPresent(org.aspectj.lang.annotation.Aspect.class);\n\t}\n\t\n\t\/*\n\t * Check the precondition rule of behavioural subtyping\n\t * (Subtype's precondition should be equal to or weaker than the supertype's.)\n\t * @param ceval\t\t\tcontract interpreter\n\t * @param dynType\t\tcheck whether this type's preconditions respect its parents\n\t * @param toBeBlamed\tif the check fails, this class is to be blamed\n\t * @param sig\t\t\tsignature of the method to be checked\n\t * @param postContracts\twhen the method finishes, this will be filled up with the postconditions in the traversed type hierarchy, with their $old functions evaluated\n\t * @return\t\t\t\ttrue if the precondition rule holds\n\t *\/\n\tprivate boolean subPreCheck(ContractInterpreter ceval, Class<?> dynType, Class<?> toBeBlamed, CodeSignature sig, Vector<String[]> postContracts) throws ScriptException {\n\t\ttry {\n\t\t\tboolean res = true;\n\t\t\tboolean next = true;\n\t\t\tString brokenContract=null;\n\t\t\tContractStore store = ContractStore.getInstance();\n\t\t\t\n\t\t\t\/\/ Note that getMethod basically does a lookup procedure! (unlike getDeclaredMethod)\n\t\t\tMethod mBody = dynType.getMethod(sig.getName(), sig.getParameterTypes());\n\t\t\t\n\t\t\tif (mBody.isAnnotationPresent(requires.class)) {\n\t\t\t\tbrokenContract = ceval.evalContract(store.getPre(mBody));\n\t\t\t\tres = brokenContract==null;\n\t\t\t}\n\t\t\t\n\t\t\tif (mBody.getDeclaringClass().getSuperclass()!=Object.class) {\n\t\t\t\tnext = subPreCheck(ceval, mBody.getDeclaringClass().getSuperclass(), mBody.getDeclaringClass(), sig, postContracts);\n\t\t\t}\n\t\t\t\n\t\t\tif (dynType.isAnnotationPresent(invariant.class)) {\n\t\t\t\tString brokenInv = ceval.evalContract(store.getInvariant(dynType));\n\t\t\t\tif (brokenInv != null) {\n\t\t\t\t\tthrow new SubstitutionException(brokenInv,dynType.getCanonicalName(), toBeBlamed.getCanonicalName(), \"invariant not preserved\");\n\t\t\t\t}\n\t\t\t}\n\t\t\t\n\t\t\tif (mBody.isAnnotationPresent(ensures.class)) {\n\t\t\t\tpostContracts.add(ceval.evalOldFunction(store.getPost(mBody)));\n\t\t\t}\n\t\t\t\n\t\t\tif (!next || res) {\n\t\t\t\treturn res;\n\t\t\t} else {\n\t\t\t\tthrow new SubstitutionException(brokenContract,sig.toLongString() , dynType.getCanonicalName() + \".\" + mBody.toString(), \"precondition too strong\");\n\t\t\t}\n\t\t} catch (SecurityException e) {\n\t\t\te.printStackTrace();\n\t\t\treturn false;\n\t\t} catch (NoSuchMethodException e) {\n\t\t\treturn true;\n\t\t}\n\t\t\n\t}\n\t\n\t\/*\n\t * Check the postcondition rule of behavioural subtyping\n\t * (If the precondition of the supertype held in the pre-state,\n\t * the postcondition of the subtype should be equal to or stronger than the supertype's.)\n\t * @param ceval\t\tcontract interpreter\n\t * @param last\t\tresult of the caller \n\t * @param dynType\tcheck whether this type's postconditions respect its parents\n\t * @param sig\t\tsignature of the method to be checked\n\t * @param i\t\t\tindex indicating which entry of postContracts to use\n\t * @return\t\t\ttrue if the postcondition rule holds\n\t *\/\n\tprivate boolean subPostCheck(ContractInterpreter ceval, boolean last, Class<?> dynType, Class<?> toBeBlamed, CodeSignature sig, Vector<String[]> postContracts, int i) throws ScriptException {\n\t\tboolean res = true;\n\t\tString brokenContract=null;\n\t\tContractStore store = ContractStore.getInstance();\n\t\t\n\t\ttry {\n\t\t\tMethod mBody = dynType.getMethod(sig.getName(), sig.getParameterTypes());\n\t\t\t\n\t\t\tif (mBody.isAnnotationPresent(ensures.class) && i<postContracts.size()) {\n\t\t\t\tbrokenContract = ceval.evalContract(postContracts.get(i));\n\t\t\t\tres = brokenContract==null;\n\t\t\t}\n\t\t\t\n\t\t\tif (dynType.isAnnotationPresent(invariant.class)) {\n\t\t\t\t\n\t\t\t\tString brokenInv = ceval.evalContract(store.getInvariant(dynType));\n\t\t\t\tif (brokenInv != null) {\n\t\t\t\t\tthrow new SubstitutionException(brokenInv,dynType.getCanonicalName(), toBeBlamed.getCanonicalName(), \"invariant not preserved\");\n\t\t\t\t}\n\t\t\t}\n\t\t\t\n\t\t\tif (!last || res) {\n\t\t\t\treturn subPostCheck(ceval, res, dynType.getSuperclass(), dynType, sig, postContracts, i+1);\n\t\t\t} else {\n\t\t\t\tthrow new SubstitutionException(brokenContract, sig.toLongString() , dynType.getCanonicalName() + \".\" + mBody.toString(), \"postcondition too weak\");\n\t\t\t}\n\t\t} catch (SecurityException e) {\n\t\t\te.printStackTrace();\n\t\t\treturn false;\n\t\t} catch (NoSuchMethodException e) {\n\t\t\treturn true;\n\t\t}\n\t}\n\t\n\t\/*\n\t * Retrieve the caller of the method\n\t * @return the caller's signature\n\t *\/\n\tprivate String getCallerSignature() {\n\t\t\/* Runtime stack at this point:\n\t\t * 0: getStackTrace()\n\t\t * 1: getCallerSignature_aroundBody()\n\t\t * 2: getCallerSignature()\n\t\t * 3: preCheck_aroundBody()\n\t\t * 4: preCheck()\n\t\t * 5: inlineAccessMethod\n\t\t * 6: contract advice\n\t\t * 7: user advice\n\t\t * 8+ The actual caller should be around here, after skipping all the internal stuff AspectJ creates.. *\/\n\t\t\n\t\tint i=8;\n\t\tStackTraceElement[] elems = Thread.currentThread().getStackTrace();\n\t\twhile (i<elems.length) {\n\t\t\tString m = elems[i].getMethodName();\n\n\t\t\t\/\/ Anything ending in proceed or run or aroundBody should be internal AspectJ stuff..\n\t\t\tif(m.matches(\".*proceed\\\\d*\") || m.endsWith(\"run\") || m.matches(\".*aroundBody\\\\d*(\\\\$advice)?\")) {\n\t\t\t\ti++;\n\t\t\t} else {\n\t\t\t\treturn elems[i].getClassName() + \".\" + elems[i].getMethodName();\n\t\t\t}\n\t\t}\n\t\treturn \"(caller not found)\";\n\t}\n\t\n\t\/*\n\t * Retrieve the signature of the method body in the method call's dynamic type\n\t * @param dynType\tdynamic type\n\t * @param sig\t\tmethod signature (its declaring type is ignored..)\n\t * @return dynamic signature\n\t *\/\n\tprivate String getDynamicSignature(Class<?> dynType, CodeSignature sig) {\n\t\tMethod mBody;\n\t\ttry {\n\t\t\tmBody = dynType.getMethod(sig.getName(), sig.getParameterTypes());\n\t\t\treturn dynType.getCanonicalName() + \".\" + mBody.toString();\n\t\t} catch (Exception e) {\n\t\t\treturn \"(method not found)\";\n\t\t}\n\t}\n\t\n\t\/*\n\t * Retrieve the signature of the method body in the method call's static type\n\t * @param jp\tcall join point\n\t * @return static signature\t\n\t *\/\n\tprivate String getStaticSignature(JoinPoint jp) {\n\t\treturn jp.getSignature().toLongString();\n\t}\n\t\n\t\/*\n\t * Container for the data to be passed from preCheck() to postCheck()\n\t *\/\n\tprivate class PostData {\n\t\tpublic PostData(ContractInterpreter ceval, String[] post, String[] inv, JoinPoint callJp, Vector<String[]> postContracts) {\n\t\t\tthis.ceval = ceval;\n\t\t\tthis.post = post;\n\t\t\tthis.inv = inv;\n\t\t\tthis.callJp = callJp;\n\t\t\tthis.postContracts = postContracts;\n\t\t}\n\t\t\n\t\tpublic ContractInterpreter ceval;\t\t\/\/ Contract interpreter\n\t\tpublic String[] post;\t\t\t\t\t\/\/ Postconditions of method call's static type\n\t\tpublic String[] inv;\t\t\t\t\t\/\/ Invariants of method call's static type\n\t\t\n\t\tpublic JoinPoint callJp;\t\t\t\t\/\/ The call join point corresponding to the execution join point captured by the contract enforcement advice\n\t\tpublic Vector<String[]> postContracts;\t\/\/ Postconditions of ancestors, with their $old() calls processed\n\t}\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"0683bd1b807f88258893bb4b2d5baa80a25e5bf2","subject":"Interpose on timers: scheduleOnce and schedule","message":"Interpose on timers: scheduleOnce and schedule\n","repos":"NetSys\/demi,NetSys\/demi-applications,NetSys\/demi-applications,NetSys\/demi-applications","old_file":"src\/main\/aspectj\/WeaveActor.aj","new_file":"src\/main\/aspectj\/WeaveActor.aj","new_contents":"package sample;\n\nimport static java.lang.Thread.sleep;\n\nimport akka.dispatch.verification.Instrumenter;\n\nimport akka.actor.ActorRef;\nimport akka.actor.ScalaActorRef;\nimport akka.actor.Actor;\nimport akka.actor.Props;\nimport akka.actor.ActorCell;\nimport akka.actor.ActorSystem;\nimport akka.actor.ActorContext;\nimport akka.actor.Scheduler;\nimport akka.actor.Cancellable;\nimport akka.actor.LightArrayRevolverScheduler;\n\nimport akka.pattern.AskSupport;\n\nimport akka.dispatch.Envelope;\nimport akka.dispatch.MessageQueue;\nimport akka.dispatch.MessageDispatcher;\n\nimport scala.concurrent.impl.CallbackRunnable;\nimport scala.concurrent.duration.FiniteDuration;\nimport scala.concurrent.ExecutionContext;\nimport java.lang.Runnable;\n\nprivileged public aspect WeaveActor {\n\n  Instrumenter inst = Instrumenter.apply();\n    \n  pointcut enqueueOperation(MessageQueue me, ActorRef receiver, Envelope handle): \n  execution(public * akka.dispatch.MessageQueue.enqueue(ActorRef, Envelope)) &&\n  args(receiver, handle) && this(me);\n  \n  Object around(MessageQueue me, ActorRef receiver, Envelope handle):\n  enqueueOperation(me, receiver, handle) {\n\treturn proceed(me, receiver, handle);\n  }\n  \n  \n  \n  before(ActorCell me, Object msg):\n  execution(* akka.actor.ActorCell.receiveMessage(Object)) &&\n  args(msg, ..) && this(me) {\n\tinst.beforeMessageReceive(me, msg);\n  }\n  \n  after(ActorCell me, Object msg):\n  execution(* akka.actor.ActorCell.receiveMessage(Object)) &&\n  args(msg, ..) && this(me) {\n\tinst.afterMessageReceive(me, msg);\n  }\n\n\n\n  pointcut dispatchOperation(MessageDispatcher me, ActorCell receiver, Envelope handle): \n  execution(* akka.dispatch.MessageDispatcher.dispatch(..)) &&\n  args(receiver, handle, ..) && this(me);\n\n  Object around(MessageDispatcher me, ActorCell receiver, Envelope handle):\n  dispatchOperation(me, receiver, handle) {\n  \tif (inst.aroundDispatch(me, receiver, handle))\n   \t\treturn proceed(me, receiver, handle);\n   \telse\n   \t\treturn null;\n  }\n  \n  \n  after(ActorSystem me, Props props) returning(ActorRef actor):\n  execution(ActorRef akka.actor.ActorSystem.actorOf(Props)) &&\n  args(props) && this(me) {\n  \tinst.new_actor(me, props, actor);\n  }\n  \n  after(ActorSystem me, Props props, String name) returning(ActorRef actor):\n  execution(ActorRef akka.actor.ActorSystem.actorOf(Props, String)) &&\n  args(props, name) && this(me) {\n  \tinst.new_actor(me, props, name, actor);\n  }\n\n\n  \n  after(ActorContext me, Props props) returning(ActorRef actor):\n  execution(ActorRef akka.actor.ActorContext.actorOf(Props)) &&\n  args(props) && this(me) {\n  \tinst.new_actor(me.system(), props, actor);\n  }\n  \n  after(ActorContext me, Props props, String name) returning(ActorRef actor):\n  execution(ActorRef akka.actor.ActorContext.actorOf(Props, String)) &&\n  args(props, name) && this(me) {\n  \tinst.new_actor(me.system(), props, name, actor);\n  }\n\n\n  before(ActorRef me, Object msg, ActorRef sender):\n  execution(* akka.actor.ScalaActorRef.$bang(Object, ActorRef)) &&\n  args(msg, sender) && this(me) {\n  \tinst.tell(me, msg, sender);\n  }\n  \n  before(ActorRef me, Object msg, ActorRef sender):\n  execution(* akka.actor.ActorRef.tell(Object, ActorRef)) &&\n  args(msg, sender, ..) && this(me) {\n  }\n\n  \/\/ Override akka.actor.Scheduler.schedulerOnce\n  pointcut scheduleOnce(LightArrayRevolverScheduler me, FiniteDuration delay, ActorRef receiver, Object msg, ExecutionContext exc, ActorRef sender):\n  execution(public * akka.actor.LightArrayRevolverScheduler.scheduleOnce(FiniteDuration,ActorRef,Object,ExecutionContext,ActorRef)) &&\n  args(delay, receiver, msg, exc, sender) && this(me);\n\n  \/\/ Never actually proceed(), just schedule our own timer, which does not use\n  \/\/ ! directly, but instead calls enqueue_message..\n  Object around(LightArrayRevolverScheduler me, FiniteDuration delay, ActorRef receiver, Object msg, ExecutionContext exc, ActorRef sender):\n  scheduleOnce(me, delay, receiver, msg, exc, sender) {\n    class MyRunnable implements java.lang.Runnable {\n      ActorRef rcv;\n      Object m;\n      Instrumenter i;\n\n      public MyRunnable(ActorRef receiver, Object msg, Instrumenter inst) {\n        rcv = receiver;\n        m = msg;\n        i = inst;\n      }\n\n      public void run() {\n        \/\/ Use essentially the same scheduleOnce implementation, but don't use !\n        \/\/ See:\n        \/\/   https:\/\/github.com\/akka\/akka\/blob\/cb05725c1ec8a09e9bfd57dd093911dd41c7b288\/akka-actor\/src\/main\/scala\/akka\/actor\/Scheduler.scala#L105\n        i.handleTick(rcv, m);\n      }\n    }\n    inst.registerCancellable(me.scheduleOnce(delay, new MyRunnable(receiver, msg, inst), exc));\n\t  return null;\n  }\n\n  \/\/ Override akka.actor.Scheduler.scheduler\n  pointcut schedule(LightArrayRevolverScheduler me, FiniteDuration delay, FiniteDuration interval, ActorRef receiver, Object msg, ExecutionContext exc, ActorRef sender):\n  execution(public * akka.actor.LightArrayRevolverScheduler.schedule(FiniteDuration,FiniteDuration,ActorRef,Object,ExecutionContext,ActorRef)) &&\n  args(delay, interval, receiver, msg, exc, sender) && this(me);\n\n  \/\/ Never actually proceed(), just schedule our own timer, which does not use\n  \/\/ ! directly, but instead calls enqueue_message..\n  Object around(LightArrayRevolverScheduler me, FiniteDuration delay, FiniteDuration interval, ActorRef receiver, Object msg, ExecutionContext exc, ActorRef sender):\n  schedule(me, delay, interval, receiver, msg, exc, sender) {\n    class MyRunnable implements java.lang.Runnable {\n      ActorRef rcv;\n      Object m;\n      Instrumenter i;\n\n      public MyRunnable(ActorRef receiver, Object msg, Instrumenter inst) {\n        rcv = receiver;\n        m = msg;\n        i = inst;\n      }\n\n      public void run() {\n        \/\/ Use essentially the same scheduleOnce implementation, but don't use !\n        \/\/ See:\n        \/\/   https:\/\/github.com\/akka\/akka\/blob\/cb05725c1ec8a09e9bfd57dd093911dd41c7b288\/akka-actor\/src\/main\/scala\/akka\/actor\/Scheduler.scala#L105\n        i.handleTick(rcv, m);\n      }\n    }\n    inst.registerCancellable(me.schedule(delay, interval, new MyRunnable(receiver, msg, inst), exc));\n\t  return null;\n  }\n}\n","old_contents":"package sample;\n\nimport static java.lang.Thread.sleep;\n\nimport akka.dispatch.verification.Instrumenter;\n\nimport akka.actor.ActorRef;\nimport akka.actor.ScalaActorRef;\nimport akka.actor.Actor;\nimport akka.actor.Props;\nimport akka.actor.ActorCell;\nimport akka.actor.ActorSystem;\nimport akka.actor.ActorContext;\nimport akka.actor.Scheduler;\n\nimport akka.pattern.AskSupport;\n\nimport akka.dispatch.Envelope;\nimport akka.dispatch.MessageQueue;\nimport akka.dispatch.MessageDispatcher;\n\nimport scala.concurrent.impl.CallbackRunnable;\nimport scala.concurrent.duration.FiniteDuration;\nimport scala.concurrent.ExecutionContext;\nimport java.lang.Runnable;\n\n\nprivileged public aspect WeaveActor {\n\n  Instrumenter inst = Instrumenter.apply();\n    \n  pointcut enqueueOperation(MessageQueue me, ActorRef receiver, Envelope handle): \n  execution(public * akka.dispatch.MessageQueue.enqueue(ActorRef, Envelope)) &&\n  args(receiver, handle) && this(me);\n  \n  Object around(MessageQueue me, ActorRef receiver, Envelope handle):\n  enqueueOperation(me, receiver, handle) {\n\treturn proceed(me, receiver, handle);\n  }\n  \n  \n  \n  before(ActorCell me, Object msg):\n  execution(* akka.actor.ActorCell.receiveMessage(Object)) &&\n  args(msg, ..) && this(me) {\n\tinst.beforeMessageReceive(me, msg);\n  }\n  \n  after(ActorCell me, Object msg):\n  execution(* akka.actor.ActorCell.receiveMessage(Object)) &&\n  args(msg, ..) && this(me) {\n\tinst.afterMessageReceive(me, msg);\n  }\n\n\n\n  pointcut dispatchOperation(MessageDispatcher me, ActorCell receiver, Envelope handle): \n  execution(* akka.dispatch.MessageDispatcher.dispatch(..)) &&\n  args(receiver, handle, ..) && this(me);\n\n  Object around(MessageDispatcher me, ActorCell receiver, Envelope handle):\n  dispatchOperation(me, receiver, handle) {\n  \tif (inst.aroundDispatch(me, receiver, handle))\n   \t\treturn proceed(me, receiver, handle);\n   \telse\n   \t\treturn null;\n  }\n  \n  \n  after(ActorSystem me, Props props) returning(ActorRef actor):\n  execution(ActorRef akka.actor.ActorSystem.actorOf(Props)) &&\n  args(props) && this(me) {\n  \tinst.new_actor(me, props, actor);\n  }\n  \n  after(ActorSystem me, Props props, String name) returning(ActorRef actor):\n  execution(ActorRef akka.actor.ActorSystem.actorOf(Props, String)) &&\n  args(props, name) && this(me) {\n  \tinst.new_actor(me, props, name, actor);\n  }\n\n\n  \n  after(ActorContext me, Props props) returning(ActorRef actor):\n  execution(ActorRef akka.actor.ActorContext.actorOf(Props)) &&\n  args(props) && this(me) {\n  \tinst.new_actor(me.system(), props, actor);\n  }\n  \n  after(ActorContext me, Props props, String name) returning(ActorRef actor):\n  execution(ActorRef akka.actor.ActorContext.actorOf(Props, String)) &&\n  args(props, name) && this(me) {\n  \tinst.new_actor(me.system(), props, name, actor);\n  }\n\n\n  before(ActorRef me, Object msg, ActorRef sender):\n  execution(* akka.actor.ScalaActorRef.$bang(Object, ActorRef)) &&\n  args(msg, sender) && this(me) {\n  \tinst.tell(me, msg, sender);\n  }\n  \n  before(ActorRef me, Object msg, ActorRef sender):\n  execution(* akka.actor.ActorRef.tell(Object, ActorRef)) &&\n  args(msg, sender, ..) && this(me) {\n  }\n\n  \/*\n  \/\/ TODO(cs): the following pointcut is not applied, for a reason I do not\n  \/\/ understand. Debug this later, since it will probably come in handy. \n  \/\/ For what it's worth, here is the decompiled byte code from\n  \/\/ akka.actor.Scheduler.scala:\n\n  $ javap Scheduler.class \n  Compiled from \"Scheduler.scala\"\n  public abstract class akka.actor.Scheduler$class extends java.lang.Object{\n      public static final akka.actor.Cancellable schedule(akka.actor.Scheduler, scala.concurrent.duration.FiniteDuration, scala.concurrent.duration.FiniteDuration, akka.actor.ActorRef, java.lang.Object, scala.concurrent.ExecutionContext, akka.actor.ActorRef);\n      public static final akka.actor.Cancellable schedule(akka.actor.Scheduler, scala.concurrent.duration.FiniteDuration, scala.concurrent.duration.FiniteDuration, scala.Function0, scala.concurrent.ExecutionContext);\n      public static final akka.actor.ActorRef schedule$default$6(akka.actor.Scheduler, scala.concurrent.duration.FiniteDuration, scala.concurrent.duration.FiniteDuration, akka.actor.ActorRef, java.lang.Object);\n      public static final akka.actor.Cancellable scheduleOnce(akka.actor.Scheduler, scala.concurrent.duration.FiniteDuration, akka.actor.ActorRef, java.lang.Object, scala.concurrent.ExecutionContext, akka.actor.ActorRef);\n      public static final akka.actor.Cancellable scheduleOnce(akka.actor.Scheduler, scala.concurrent.duration.FiniteDuration, scala.Function0, scala.concurrent.ExecutionContext);\n      public static final akka.actor.ActorRef scheduleOnce$default$5(akka.actor.Scheduler, scala.concurrent.duration.FiniteDuration, akka.actor.ActorRef, java.lang.Object);\n      public static void $init$(akka.actor.Scheduler);\n  }\n\n  \/\/ Override akka.actor.Scheduler.schedulerOnce\n  \/\/ TODO(cs): also interpose on akka.actor.Scheduler.schedule()\n  pointcut Timer(Scheduler me, FiniteDuration delay, ActorRef receiver, Object msg, ExecutionContext exc, ActorRef sender):\n  execution(* akka.actor.Scheduler.schedulerOnce(..)) &&\n  args(delay, receiver, msg, exc, sender) && this(me);\n\n  \/\/ Never actually proceed(), just schedule our own timer, which does not use\n  \/\/ ! directly, but instead calls enqueue_message.\n  Object around(Scheduler me, FiniteDuration delay, ActorRef receiver, Object msg, ExecutionContext exc, ActorRef sender):\n  Timer(me, delay, receiver, msg, exc, sender) {\n    class MyRunnable implements java.lang.Runnable {\n      ActorRef rcv;\n      Object m;\n      Instrumenter i;\n\n      public MyRunnable(ActorRef receiver, Object msg, Instrumenter inst) {\n        rcv = receiver;\n        m = msg;\n        i = inst;\n      }\n\n      public void run() {\n        \/\/ Use essentially the same scheduleOnce implementation, but don't use !\n        \/\/ See:\n        \/\/   https:\/\/github.com\/akka\/akka\/blob\/cb05725c1ec8a09e9bfd57dd093911dd41c7b288\/akka-actor\/src\/main\/scala\/akka\/actor\/Scheduler.scala#L105\n        i.handleTick(rcv, m);\n      }\n    }\n    me.scheduleOnce(delay, new MyRunnable(receiver, msg, inst), exc);\n\t  return null;\n  }\n  *\/\n}\n","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"AspectJ"}
{"commit":"5bcc6dfabbb8b9177532f5f7d7e566a0c3996cb3","subject":"do not log INFO rollback statements","message":"do not log INFO rollback statements\n","repos":"palava\/palava-jpa-aspectj","old_file":"src\/main\/java\/de\/cosmocode\/palava\/jpa\/aspectj\/EntityTransactionAspect.aj","new_file":"src\/main\/java\/de\/cosmocode\/palava\/jpa\/aspectj\/EntityTransactionAspect.aj","new_contents":"\/**\n * Copyright 2010 CosmoCode GmbH\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage de.cosmocode.palava.jpa.aspectj;\n\nimport javax.persistence.EntityManager;\nimport javax.persistence.EntityTransaction;\nimport javax.persistence.PersistenceException;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.gag.annotation.remark.Hack;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\nimport de.cosmocode.palava.jpa.Transactional;\n\npublic final aspect EntityTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(EntityTransactionAspect.class);\n\n    private Provider<EntityManager> currentManager;\n    \n    @Inject\n    public void setProvider(Provider<EntityManager> manager) {\n        this.currentManager = Preconditions.checkNotNull(manager, \"Manager\");\n    }\n    \n    pointcut transactional(): execution(@Transactional * *.*(..));\n\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        final EntityManager manager = currentManager.get();\n        LOG.trace(\"Retrieved entitymanager {}\", manager);\n        final EntityTransaction tx = manager.getTransaction();\n        LOG.trace(\"Using transaction {}\", tx);\n        \n        final boolean local = !tx.isActive();\n        \n        if (local) {\n            LOG.debug(\"Beginning automatic transaction {}\", tx);\n            tx.begin();\n        } else {\n            LOG.trace(\"Transaction {} already active\", tx);\n        }\n        \n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (Exception e) {\n            try {\n                if (local && (tx.isActive() || tx.getRollbackOnly())) {\n                    LOG.debug(\"Rolling back local\/active transaction {}\", tx);\n                    tx.rollback();\n                } else if (!tx.getRollbackOnly()) {\n                    LOG.debug(\"Setting transaction {} as rollback only\", tx);\n                    tx.setRollbackOnly();\n                }\n            } catch (PersistenceException inner) {\n                LOG.error(\"Rollback failed\", inner);\n            }\n            \n            \/\/ hack to support throwing checked exceptions\n            return sneakyThrow(e);\n        }\n        \n        if (local && tx.isActive()) {\n            if (tx.getRollbackOnly()) {\n                LOG.debug(\"Rolling back marked transaction {}\", tx);\n                tx.rollback();\n            } else {\n                try {\n                    tx.commit();\n                    LOG.trace(\"Committed automatic transaction {}\", tx);\n                } catch (PersistenceException e) {\n                    try {\n                        LOG.debug(\"Rolling back transaction {}\", tx);\n                        tx.rollback();\n                    } catch (PersistenceException inner) {\n                        LOG.error(\"Rollback failed\", inner);\n                    }\n                    throw e;\n                }\n            }\n        } else {\n            LOG.trace(\"Not committing non-local transaction {}\", tx);\n        }\n        \n        return returnValue;\n    }\n    \n    @Hack(\"Why is this possible?\")\n    private Object sneakyThrow(Throwable t) {\n        this.<RuntimeException>doSneakyThrow(t);\n        return null;\n    }\n\n    @SuppressWarnings(\"unchecked\")\n    private <T extends Throwable> T doSneakyThrow(Throwable t) throws T {\n        throw (T) t;\n    }\n    \n}\n","old_contents":"\/**\n * Copyright 2010 CosmoCode GmbH\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage de.cosmocode.palava.jpa.aspectj;\n\nimport javax.persistence.EntityManager;\nimport javax.persistence.EntityTransaction;\nimport javax.persistence.PersistenceException;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.gag.annotation.remark.Hack;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\nimport de.cosmocode.palava.jpa.Transactional;\n\npublic final aspect EntityTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(EntityTransactionAspect.class);\n\n    private Provider<EntityManager> currentManager;\n    \n    @Inject\n    public void setProvider(Provider<EntityManager> manager) {\n        this.currentManager = Preconditions.checkNotNull(manager, \"Manager\");\n    }\n    \n    pointcut transactional(): execution(@Transactional * *.*(..));\n\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        final EntityManager manager = currentManager.get();\n        LOG.trace(\"Retrieved entitymanager {}\", manager);\n        final EntityTransaction tx = manager.getTransaction();\n        LOG.trace(\"Using transaction {}\", tx);\n        \n        final boolean local = !tx.isActive();\n        \n        if (local) {\n            LOG.debug(\"Beginning automatic transaction {}\", tx);\n            tx.begin();\n        } else {\n            LOG.trace(\"Transaction {} already active\", tx);\n        }\n        \n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (Exception e) {\n            try {\n                if (local && (tx.isActive() || tx.getRollbackOnly())) {\n                    LOG.info(\"Rolling back local\/active transaction {}\", tx);\n                    tx.rollback();\n                } else if (!tx.getRollbackOnly()) {\n                    LOG.debug(\"Setting transaction {} as rollback only\", tx);\n                    tx.setRollbackOnly();\n                }\n            } catch (PersistenceException inner) {\n                LOG.error(\"Rollback failed\", inner);\n            }\n            \n            \/\/ hack to support throwing checked exceptions\n            return sneakyThrow(e);\n        }\n        \n        if (local && tx.isActive()) {\n            if (tx.getRollbackOnly()) {\n                LOG.debug(\"Rolling back marked transaction {}\", tx);\n                tx.rollback();\n            } else {\n                try {\n                    tx.commit();\n                    LOG.trace(\"Committed automatic transaction {}\", tx);\n                } catch (PersistenceException e) {\n                    try {\n                        LOG.info(\"Rolling back transaction {}\", tx);\n                        tx.rollback();\n                    } catch (PersistenceException inner) {\n                        LOG.error(\"Rollback failed\", inner);\n                    }\n                    throw e;\n                }\n            }\n        } else {\n            LOG.trace(\"Not committing non-local transaction {}\", tx);\n        }\n        \n        return returnValue;\n    }\n    \n    @Hack(\"Why is this possible?\")\n    private Object sneakyThrow(Throwable t) {\n        this.<RuntimeException>doSneakyThrow(t);\n        return null;\n    }\n\n    @SuppressWarnings(\"unchecked\")\n    private <T extends Throwable> T doSneakyThrow(Throwable t) throws T {\n        throw (T) t;\n    }\n    \n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"3e6cc9a8ade8fbc33e89dfdc715ef0185b20a90a","subject":"added null\/state check","message":"added null\/state check\n","repos":"palava\/palava-security-aspectj","old_file":"src\/main\/java\/de\/cosmocode\/palava\/security\/aspectj\/AbstractSecurityAspect.aj","new_file":"src\/main\/java\/de\/cosmocode\/palava\/security\/aspectj\/AbstractSecurityAspect.aj","new_contents":"package de.cosmocode.palava.security.aspectj;\n\nimport org.apache.shiro.subject.Subject;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Injector;\nimport com.google.inject.Guice;\nimport com.google.inject.Provider;\n\nabstract aspect AbstractSecurityAspect {\n\n    private static final Logger LOG = LoggerFactory.getLogger(AbstractSecurityAspect.class);\n\n    private Provider<Subject> provider;\n\n    @Inject\n    void setProvider(Provider<Subject> provider) {\n        this.provider = Preconditions.checkNotNull(provider, \"Provider\");\n    }\n    \n    protected Subject getCurrentUser() {\n        return provider.get();\n    }\n\n    pointcut createInjector(): call(Injector Guice.createInjector(..));\n    \n    after() returning (Injector injector): createInjector() {\n        LOG.trace(\"Injecting members on {}\", this);\n        if (provider == null) {\n            injector.injectMembers(this);\n        } else {\n            throw new IllegalStateException(\"An injector has already been created\");\n        }\n    }\n    \n}\n","old_contents":"package de.cosmocode.palava.security.aspectj;\n\nimport org.apache.shiro.subject.Subject;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Injector;\nimport com.google.inject.Guice;\nimport com.google.inject.Provider;\n\nabstract aspect AbstractSecurityAspect {\n\n    private static final Logger LOG = LoggerFactory.getLogger(AbstractSecurityAspect.class);\n\n    private Provider<Subject> provider;\n\n    @Inject\n    void setProvider(Provider<Subject> provider) {\n        this.provider = Preconditions.checkNotNull(provider, \"Provider\");\n    }\n    \n    protected Subject getCurrentUser() {\n        return provider.get();\n    }\n\n    pointcut createInjector(): call(Injector Guice.createInjector(..));\n    \n    after() returning (Injector injector): createInjector() {\n        LOG.trace(\"Injecting members on {}\", this);\n        injector.injectMembers(this);\n    }\n    \n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"e89e893595358854d329c3feaa8a91ace22fd4ae","subject":"commit 7a2264c68e31bd32443d9ed791cd9a1d16d00305 Author: Konstantin Boudnik <cos@yahoo-inc.com> Date:   Mon May 17 11:16:52 2010 -0700","message":"commit 7a2264c68e31bd32443d9ed791cd9a1d16d00305\nAuthor: Konstantin Boudnik <cos@yahoo-inc.com>\nDate:   Mon May 17 11:16:52 2010 -0700\n\n    HDFS:1157 from https:\/\/issues.apache.org\/jira\/secure\/attachment\/12444716\/hdfs-1157.patch\n    \n    +++ b\/YAHOO-CHANGES.txt\n    +    HDFS-1157. Modifications introduced by HDFS-1150 are breaking aspect's\n    +    bindings (cos)\n\n\ngit-svn-id: 7e7a2d564dde2945c3a26e08d1235fcc0cb7aba1@1077468 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"aseldawy\/spatialhadoop,ShortMap\/ShortMap,aseldawy\/spatialhadoop,ShortMap\/ShortMap,aseldawy\/spatialhadoop,aseldawy\/spatialhadoop,ShortMap\/ShortMap,ShortMap\/ShortMap,aseldawy\/spatialhadoop,aseldawy\/spatialhadoop,ShortMap\/ShortMap,ShortMap\/ShortMap,aseldawy\/spatialhadoop,ShortMap\/ShortMap,ShortMap\/ShortMap,aseldawy\/spatialhadoop,ShortMap\/ShortMap,aseldawy\/spatialhadoop","old_file":"src\/test\/system\/aop\/org\/apache\/hadoop\/hdfs\/server\/datanode\/DataNodeAspect.aj","new_file":"src\/test\/system\/aop\/org\/apache\/hadoop\/hdfs\/server\/datanode\/DataNodeAspect.aj","new_contents":"\/**\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements.  See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership.  The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * \"License\"); you may not use this file except in compliance\n * with the License.  You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.apache.hadoop.hdfs.server.datanode;\n\nimport java.io.File;\nimport java.io.IOException;\nimport java.util.AbstractList;\n\nimport org.apache.hadoop.conf.Configuration;\nimport org.apache.hadoop.hdfs.test.system.DNProtocol;\nimport org.apache.hadoop.security.UserGroupInformation;\nimport org.apache.hadoop.test.system.DaemonProtocol;\nimport org.apache.hadoop.hdfs.server.datanode.SecureDataNodeStarter.SecureResources;\n\npublic privileged aspect DataNodeAspect {\n  declare parents : DataNode implements DNProtocol;\n\n  public Configuration DataNode.getDaemonConf() {\n    return super.getConf();\n  }\n\n  pointcut dnConstructorPointcut(Configuration conf, AbstractList<File> dirs,\n      SecureResources resources) :\n    call(DataNode.new(Configuration, AbstractList<File>, SecureResources))\n    && args(conf, dirs, resources);\n\n  after(Configuration conf, AbstractList<File> dirs, SecureResources resources)\n    returning (DataNode datanode):\n    dnConstructorPointcut(conf, dirs, resources) {\n    try {\n      UserGroupInformation ugi = UserGroupInformation.getCurrentUser();\n      datanode.setUser(ugi.getShortUserName());\n    } catch (IOException e) {\n      datanode.LOG.warn(\"Unable to get the user information for the \" +\n          \"DataNode\");\n    }\n    datanode.setReady(true);\n  }\n\n  pointcut getVersionAspect(String protocol, long clientVersion) :\n    execution(public long DataNode.getProtocolVersion(String ,\n      long) throws IOException) && args(protocol, clientVersion);\n\n  long around(String protocol, long clientVersion) :\n    getVersionAspect(protocol, clientVersion) {\n    if(protocol.equals(DaemonProtocol.class.getName())) {\n      return DaemonProtocol.versionID;\n    } else if(protocol.equals(DNProtocol.class.getName())) {\n      return DNProtocol.versionID;\n    } else {\n      return proceed(protocol, clientVersion);\n    }\n  }\n}","old_contents":"\/**\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements.  See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership.  The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * \"License\"); you may not use this file except in compliance\n * with the License.  You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.apache.hadoop.hdfs.server.datanode;\n\nimport java.io.File;\nimport java.io.IOException;\nimport java.util.AbstractList;\n\nimport org.apache.hadoop.conf.Configuration;\nimport org.apache.hadoop.hdfs.test.system.DNProtocol;\nimport org.apache.hadoop.security.UserGroupInformation;\nimport org.apache.hadoop.test.system.DaemonProtocol;\n\npublic privileged aspect DataNodeAspect {\n  declare parents : DataNode implements DNProtocol;\n\n  public Configuration DataNode.getDaemonConf() {\n    return super.getConf();\n  }\n\n  pointcut dnConstructorPointcut(Configuration conf, AbstractList<File> dirs) :\n    call(DataNode.new(Configuration, AbstractList<File>))\n    && args(conf, dirs);\n\n  after(Configuration conf, AbstractList<File> dirs) returning (DataNode datanode):\n    dnConstructorPointcut(conf, dirs) {\n    try {\n      UserGroupInformation ugi = UserGroupInformation.getCurrentUser();\n      datanode.setUser(ugi.getShortUserName());\n    } catch (IOException e) {\n      datanode.LOG.warn(\"Unable to get the user information for the \" +\n          \"Jobtracker\");\n    }\n    datanode.setReady(true);\n  }\n\n  pointcut getVersionAspect(String protocol, long clientVersion) :\n    execution(public long DataNode.getProtocolVersion(String ,\n      long) throws IOException) && args(protocol, clientVersion);\n\n  long around(String protocol, long clientVersion) :\n    getVersionAspect(protocol, clientVersion) {\n    if(protocol.equals(DaemonProtocol.class.getName())) {\n      return DaemonProtocol.versionID;\n    } else if(protocol.equals(DNProtocol.class.getName())) {\n      return DNProtocol.versionID;\n    } else {\n      return proceed(protocol, clientVersion);\n    }\n  }\n}","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"9fe9e27189840b2c1b0aff9f5be2b04e2be20c96","subject":"Explain after advice behavior in static method mock aspect","message":"Explain after advice behavior in static method mock aspect\n\nThis commit makes it clear that mock verification will not occur if an\nadvised test method throws an exception.\n","repos":"spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework","old_file":"spring-aspects\/src\/main\/java\/org\/springframework\/mock\/staticmock\/AnnotationDrivenStaticEntityMockingControl.aj","new_file":"spring-aspects\/src\/main\/java\/org\/springframework\/mock\/staticmock\/AnnotationDrivenStaticEntityMockingControl.aj","new_contents":"\/*\n * Copyright 2002-2014 the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.springframework.mock.staticmock;\n\n\/**\n * Annotation-based aspect to use in test builds to enable mocking of static methods\n * on JPA-annotated {@code @Entity} classes, as used by Spring Roo for so-called\n * <em>finder methods<\/em>.\n *\n * <p>Mocking will occur within the call stack of any method in a class (typically a\n * test class) that is annotated with {@code @MockStaticEntityMethods}.\n *\n * <p>This aspect also provides static methods to simplify the programming model for\n * setting expectations and entering playback mode.\n *\n * <h3>Usage<\/h3>\n * <ol>\n * <li>Annotate a test class with {@code @MockStaticEntityMethods}.\n * <li>In each test method, the {@code AnnotationDrivenStaticEntityMockingControl}\n * will begin in <em>recording<\/em> mode.\n * <li>Invoke static methods on JPA-annotated {@code @Entity} classes, with each\n * recording-mode invocation being followed by an invocation of either\n * {@link #expectReturn(Object)} or {@link #expectThrow(Throwable)} on the\n * {@code AnnotationDrivenStaticEntityMockingControl}.\n * <li>Invoke the {@link #playback()} method.\n * <li>Call the code you wish to test that uses the static methods on the\n * JPA-annotated {@code @Entity} classes.\n * <li>Verification will occur automatically after the test method has executed\n * and returned. However, mock verification will not occur if the test method\n * throws an exception.\n * <\/ol>\n *\n * @author Rod Johnson\n * @author Ramnivas Laddad\n * @author Sam Brannen\n * @see MockStaticEntityMethods\n *\/\npublic aspect AnnotationDrivenStaticEntityMockingControl extends AbstractMethodMockingControl {\n\n\t\/**\n\t * Expect the supplied {@link Object} to be returned by the previous static\n\t * method invocation.\n\t * @see #playback()\n\t *\/\n\tpublic static void expectReturn(Object retVal) {\n\t\tAnnotationDrivenStaticEntityMockingControl.aspectOf().expectReturnInternal(retVal);\n\t}\n\n\t\/**\n\t * Expect the supplied {@link Throwable} to be thrown by the previous static\n\t * method invocation.\n\t * @see #playback()\n\t *\/\n\tpublic static void expectThrow(Throwable throwable) {\n\t\tAnnotationDrivenStaticEntityMockingControl.aspectOf().expectThrowInternal(throwable);\n\t}\n\n\t\/**\n\t * Stop recording mock expectations and enter <em>playback<\/em> mode.\n\t * @see #expectReturn(Object)\n\t * @see #expectThrow(Throwable)\n\t *\/\n\tpublic static void playback() {\n\t\tAnnotationDrivenStaticEntityMockingControl.aspectOf().playbackInternal();\n\t}\n\t\n\t\/\/ Apparently, the following pointcut was originally defined to only match\n\t\/\/ methods directly annotated with @Test (in order to allow methods in\n\t\/\/ @MockStaticEntityMethods classes to invoke each other without resetting\n\t\/\/ the mocking environment); however, this is no longer the case. The current\n\t\/\/ pointcut applies to all public methods in @MockStaticEntityMethods classes.\n\tprotected pointcut mockStaticsTestMethod() : execution(public * (@MockStaticEntityMethods *).*(..));\n\n\tprotected pointcut methodToMock() : execution(public static * (@javax.persistence.Entity *).*(..));\n\n}\n","old_contents":"\/*\n * Copyright 2002-2014 the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.springframework.mock.staticmock;\n\n\/**\n * Annotation-based aspect to use in test builds to enable mocking of static methods\n * on JPA-annotated {@code @Entity} classes, as used by Spring Roo for so-called\n * <em>finder methods<\/em>.\n *\n * <p>Mocking will occur within the call stack of any method in a class (typically a\n * test class) that is annotated with {@code @MockStaticEntityMethods}.\n *\n * <p>This aspect also provides static methods to simplify the programming model for\n * setting expectations and entering playback mode.\n *\n * <p>Usage:\n * <ol>\n * <li>Annotate a test class with {@code @MockStaticEntityMethods}.\n * <li>In each test method, {@code AnnotationDrivenStaticEntityMockingControl}\n * will begin in <em>recording<\/em> mode.\n * <li>Invoke static methods on JPA-annotated {@code @Entity} classes, with each\n * recording-mode invocation being followed by an invocation of either the static\n * {@link #expectReturn(Object)} method or the static {@link #expectThrow(Throwable)}\n * method on {@code AnnotationDrivenStaticEntityMockingControl}.\n * <li>Invoke the static {@link #playback()} method.\n * <li>Call the code you wish to test that uses the static methods.\n * <li>Verification will occur automatically.\n * <\/ol>\n *\n * @author Rod Johnson\n * @author Ramnivas Laddad\n * @author Sam Brannen\n * @see MockStaticEntityMethods\n *\/\npublic aspect AnnotationDrivenStaticEntityMockingControl extends AbstractMethodMockingControl {\n\n\t\/**\n\t * Expect the supplied {@link Object} to be returned by the previous static\n\t * method invocation.\n\t * @see #playback()\n\t *\/\n\tpublic static void expectReturn(Object retVal) {\n\t\tAnnotationDrivenStaticEntityMockingControl.aspectOf().expectReturnInternal(retVal);\n\t}\n\n\t\/**\n\t * Expect the supplied {@link Throwable} to be thrown by the previous static\n\t * method invocation.\n\t * @see #playback()\n\t *\/\n\tpublic static void expectThrow(Throwable throwable) {\n\t\tAnnotationDrivenStaticEntityMockingControl.aspectOf().expectThrowInternal(throwable);\n\t}\n\n\t\/**\n\t * Stop recording mock expectations and enter <em>playback<\/em> mode.\n\t * @see #expectReturn(Object)\n\t * @see #expectThrow(Throwable)\n\t *\/\n\tpublic static void playback() {\n\t\tAnnotationDrivenStaticEntityMockingControl.aspectOf().playbackInternal();\n\t}\n\t\n\t\/\/ Apparently, the following pointcut was originally defined to only match\n\t\/\/ methods directly annotated with @Test (in order to allow methods in\n\t\/\/ @MockStaticEntityMethods classes to invoke each other without resetting\n\t\/\/ the mocking environment); however, this is no longer the case. The current\n\t\/\/ pointcut applies to all public methods in @MockStaticEntityMethods classes.\n\tprotected pointcut mockStaticsTestMethod() : execution(public * (@MockStaticEntityMethods *).*(..));\n\n\tprotected pointcut methodToMock() : execution(public static * (@javax.persistence.Entity *).*(..));\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"6e58342226d579d8403783856b6365516bc8ff51","subject":"More work on hyperlinking; fixed issue with missing sources in Open Type; highlighting for additional basic types.","message":"More work on hyperlinking; fixed issue with missing sources in Open Type; highlighting for additional basic types.\n\ngit-svn-id: f4ecfe233223879a4a16cd7937f11b5152963d8e@19021 5e8d7ff9-d8ef-0310-90f0-a4852d11357a\n","repos":"sschaef\/scala-ide,andrey-ilinykh\/scala-ide,romanowski\/scala-ide,stephenh\/scala-ide,pilipolio\/scala-ide,aleksi-lukkarinen\/scala-ide,Duhemm\/scala-ide,mlangc\/scala-ide,sschaef\/scala-ide,andrey-ilinykh\/scala-ide,Duhemm\/scala-ide,scala-ide\/scala-ide,stephenh\/scala-ide,Kwestor\/scala-ide,pilipolio\/scala-ide,wpopielarski\/scala-ide,dragos\/scala-ide,wpopielarski\/scala-ide,scala-ide\/scala-ide,aleksi-lukkarinen\/scala-ide,romanowski\/scala-ide,mlangc\/scala-ide,dragos\/scala-ide,sschaef\/scala-ide,Duhemm\/scala-ide,mlangc\/scala-ide,pilipolio\/scala-ide,pilipolio\/scala-ide,dragos\/scala-ide,Kwestor\/scala-ide,stephenh\/scala-ide,aleksi-lukkarinen\/scala-ide,romanowski\/scala-ide,Duhemm\/scala-ide,scala-ide\/scala-ide,andrey-ilinykh\/scala-ide,wpopielarski\/scala-ide,aleksi-lukkarinen\/scala-ide,mlangc\/scala-ide,scala-ide\/scala-ide,dragos\/scala-ide,Kwestor\/scala-ide,stephenh\/scala-ide,Kwestor\/scala-ide,sschaef\/scala-ide,romanowski\/scala-ide,andrey-ilinykh\/scala-ide,wpopielarski\/scala-ide","old_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/cfprovider\/ClassFileProviderAspect.aj","new_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/cfprovider\/ClassFileProviderAspect.aj","new_contents":"\/*\n * Copyright 2005-2009 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.cfprovider;\n\nimport java.util.HashSet;\n\nimport org.eclipse.core.filebuffers.FileBuffers;\nimport org.eclipse.core.filebuffers.ITextFileBuffer;\nimport org.eclipse.core.filebuffers.ITextFileBufferManager;\nimport org.eclipse.core.filebuffers.LocationKind;\nimport org.eclipse.core.resources.IResource;\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.core.IBuffer;\nimport org.eclipse.jdt.core.IClassFile;\nimport org.eclipse.jdt.core.IImportDeclaration;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IOpenable;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.ITypeRoot;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.core.dom.CompilationUnit;\nimport org.eclipse.jdt.core.search.TypeNameMatch;\nimport org.eclipse.jdt.internal.compiler.CompilationResult;\nimport org.eclipse.jdt.internal.compiler.ast.ASTNode;\nimport org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.ImportReference;\nimport org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.TypeReference;\nimport org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;\nimport org.eclipse.jdt.internal.compiler.env.IBinaryType;\nimport org.eclipse.jdt.internal.compiler.env.ICompilationUnit;\nimport org.eclipse.jdt.internal.compiler.env.IGenericType;\nimport org.eclipse.jdt.internal.compiler.env.ISourceImport;\nimport org.eclipse.jdt.internal.compiler.env.ISourceType;\nimport org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer;\nimport org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding;\nimport org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding;\nimport org.eclipse.jdt.internal.compiler.parser.Parser;\nimport org.eclipse.jdt.internal.compiler.parser.SourceTypeConverter;\nimport org.eclipse.jdt.internal.core.BinaryType;\nimport org.eclipse.jdt.internal.core.ClassFile;\nimport org.eclipse.jdt.internal.core.CompilationUnitElementInfo;\nimport org.eclipse.jdt.internal.core.ImportDeclaration;\nimport org.eclipse.jdt.internal.core.JavaElement;\nimport org.eclipse.jdt.internal.core.NameLookup;\nimport org.eclipse.jdt.internal.core.Openable;\nimport org.eclipse.jdt.internal.core.PackageFragment;\nimport org.eclipse.jdt.internal.core.SearchableEnvironment;\nimport org.eclipse.jdt.internal.core.SourceMapper;\nimport org.eclipse.jdt.internal.core.SourceType;\nimport org.eclipse.jdt.internal.core.SourceTypeElementInfo;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyResolver;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyType;\nimport org.eclipse.jdt.internal.core.util.Util;\nimport org.eclipse.jdt.internal.corext.util.OpenTypeHistory;\nimport org.eclipse.jdt.internal.ui.filters.InnerClassFilesFilter;\nimport org.eclipse.jdt.ui.SharedASTProvider;\nimport org.eclipse.jface.viewers.Viewer;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaClassFile;\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaElement;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect ClassFileProviderAspect {\n\n  pointcut classFileCreations(PackageFragment parent, String name) : \n    call(protected ClassFile.new(PackageFragment, String)) &&\n    within(org.eclipse.jdt..*) &&\n    args(parent, name);\n  \n  pointcut mapSource() :\n    execution(IBuffer ClassFile.mapSource(SourceMapper, IBinaryType)) &&\n    target(IScalaClassFile);\n  \n  pointcut mapSource2() :\n    execution(void SourceMapper.mapSource(IType, char[], IBinaryType));\n  \n  pointcut getSourceFileName(BinaryType bt) :\n    execution(String BinaryType.getSourceFileName(IBinaryType)) &&\n    target(bt);\n  \n  pointcut select(Viewer viewer, Object parentElement, Object element) :\n    execution(boolean InnerClassFilesFilter.select(Viewer, Object, Object)) &&\n    args(viewer, parentElement, element);\n  \n  pointcut getChildren(BinaryType bt) :\n    execution(IJavaElement[] BinaryType.getChildren()) &&\n    target(bt);\n  \n  pointcut getAST(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) : \n    execution(CompilationUnit SharedASTProvider.getAST(ITypeRoot, SharedASTProvider.WAIT_FLAG, IProgressMonitor)) &&\n    args(element, waitFlag, progressMonitor);\n  \n  pointcut resolve(HierarchyResolver hr, IGenericType suppliedType) :\n    execution(void HierarchyResolver.resolve(IGenericType)) &&\n    target(hr) &&\n    args(suppliedType);\n  \n  pointcut remember(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    execution(void HierarchyResolver.remember(IType, ReferenceBinding)) &&\n    target(hr) &&\n    args(type, typeBinding);\n  \n  pointcut acceptType(IType type, int acceptFlags, boolean isSourceType) :\n    execution(boolean NameLookup.acceptType(IType, int, boolean)) &&\n    args(type, acceptFlags, isSourceType);\n  \n  pointcut find(SearchableEnvironment se, String typeName, String packageName) :\n    execution(NameEnvironmentAnswer find(String, String)) &&\n    target(se) &&\n    args(typeName, packageName);\n  \n  pointcut convert(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) :\n    execution(CompilationUnitDeclaration SourceTypeConverter.convert(ISourceType[], CompilationResult)) &&\n    target(stc) &&\n    args(sourceTypes, compilationResult);\n  \n  pointcut getAncestor(JavaElement je, int ancestorType) :\n    execution(IJavaElement JavaElement.getAncestor(int)) &&\n    target(je) &&\n    args(ancestorType);\n  \n  pointcut isContainerDirty(TypeNameMatch match) :\n    execution(boolean OpenTypeHistory.isContainerDirty(TypeNameMatch)) &&\n    args(match);\n  \n  ClassFile around(PackageFragment parent, String name) : \n    classFileCreations(parent, name) {\n\n    ClassFile javaClassFile = proceed(parent, name);\n    byte[] bytes;\n    \n    try {\n      bytes = javaClassFile.getBytes();\n    } catch(Throwable t) {\n      return javaClassFile; \n    }\n    \n    for (IClassFileProvider provider : ClassFileProviderRegistry.getInstance().getProviders()) {\n      ClassFile cf = provider.create(bytes, parent, name);\n      if (cf != null)\n        return cf;\n    }\n    \n    return javaClassFile;\n  }\n  \n  void around() :\n    mapSource2() &&\n    cflow(mapSource()) {\n    return;\n  }\n  \n  boolean around(Viewer viewer, Object parentElement, Object element) :\n    select(viewer, parentElement, element) {\n    if (element instanceof IScalaClassFile) {\n      IClassFile classFile = (IClassFile) element;\n      String name = classFile.getElementName(); \n      int dollarIndex = name.indexOf('$');\n      return dollarIndex == -1 || dollarIndex == name.length()-7; \/\/ Trailing '$' implies object rather than inner class \n    }\n    return proceed(viewer, parentElement, element);\n  }\n  \n  IJavaElement[] around(BinaryType bt) throws JavaModelException :\n    getChildren(bt) && \n    target(BinaryType) {\n    ClassFile cf = (ClassFile)bt.parent;\n    if (cf instanceof IScalaClassFile)\n      return cf.getChildren();\n    else\n      return proceed(bt);\n  }\n  \n  CompilationUnit around(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) :\n    getAST(element, waitFlag, progressMonitor) {\n      if (element instanceof IScalaElement)\n        return null;\n      else\n        return proceed(element, waitFlag, progressMonitor);\n  }\n  \n  void around(HierarchyResolver hr, IGenericType suppliedType) :\n    resolve(hr, suppliedType) {\n    if (!suppliedType.isBinaryType()) {\n      IType tpe = ((SourceTypeElementInfo)suppliedType).getHandle();\n      IClassFile cf = tpe.getClassFile();\n      if (cf instanceof IScalaClassFile) {\n        hr.resolve(new Openable[]{(Openable)cf}, new HashSet(), null);\n        return;\n      }\n    }\n      \n    proceed(hr, suppliedType);\n  }\n  \n  void around(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    remember(hr, type, typeBinding) {\n    if (((IOpenable)type.getCompilationUnit()).isOpen()) {\n      try {\n        IGenericType genericType = (IGenericType)((JavaElement)type).getElementInfo();\n        hr.remember(genericType, typeBinding);\n      } catch (JavaModelException e) {\n        \/\/ cannot happen since element is open\n        return;\n      }\n    } else {\n      if (typeBinding == null) return;\n\n      TypeDeclaration typeDeclaration = ((SourceTypeBinding)typeBinding).scope.referenceType();\n\n      \/\/ simple super class name\n      char[] superclassName = null;\n      TypeReference superclass;\n      if ((typeDeclaration.bits & ASTNode.IsAnonymousType) != 0) {\n        superclass = typeDeclaration.allocation.type;\n      } else {\n        superclass = typeDeclaration.superclass;\n      }\n      if (superclass != null) {\n        char[][] typeName = superclass.getTypeName();\n        superclassName = typeName == null ? null : typeName[typeName.length-1];\n      }\n\n      \/\/ simple super interface names\n      char[][] superInterfaceNames = null;\n      TypeReference[] superInterfaces = typeDeclaration.superInterfaces;\n      if (superInterfaces != null) {\n        int length = superInterfaces.length;\n        superInterfaceNames = new char[length][];\n        for (int i = 0; i < length; i++) {\n          TypeReference superInterface = superInterfaces[i];\n          char[][] typeName = superInterface.getTypeName();\n          superInterfaceNames[i] = typeName[typeName.length-1];\n        }\n      }\n\n      HierarchyType hierarchyType = new HierarchyType(\n        type,\n        typeDeclaration.name,\n        typeDeclaration.binding.modifiers,\n        superclassName,\n        superInterfaceNames);\n      hr.remember(hierarchyType, typeDeclaration.binding);\n    }\n  }\n  \n  String around(BinaryType bt) :\n    getSourceFileName(bt) {\n    IJavaElement parent = bt.getParent(); \n    if (parent instanceof IScalaClassFile)\n      return ((IScalaClassFile)parent).getSourceFileName();\n    else\n      return proceed(bt);\n  }\n  \n  boolean around(IType type, int acceptFlags, boolean isSourceType) :\n    acceptType(type, acceptFlags, isSourceType) {\n    if (!isSourceType && (type instanceof SourceType)) {\n      IJavaElement parent = type.getParent(); \n      if (parent instanceof IScalaClassFile)\n        return proceed(type, acceptFlags, true);\n    }\n    \n    return proceed(type, acceptFlags, isSourceType);\n  }\n  \n  CompilationUnitDeclaration around(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) throws JavaModelException :\n    convert(stc, sourceTypes, compilationResult) {\n    stc.unit = new CompilationUnitDeclaration(stc.problemReporter, compilationResult, 0);\n    \/\/ not filled at this point\n\n    if (sourceTypes.length == 0) return stc.unit;\n    SourceTypeElementInfo topLevelTypeInfo = (SourceTypeElementInfo) sourceTypes[0];\n    org.eclipse.jdt.core.ICompilationUnit cuHandle = topLevelTypeInfo.getHandle().getCompilationUnit();\n    stc.cu = (ICompilationUnit) cuHandle;\n\n    CompilationUnitElementInfo cuei = null;\n    Object info = ((JavaElement)stc.cu).getElementInfo();\n    if (info instanceof CompilationUnitElementInfo)\n      cuei = (CompilationUnitElementInfo)info;\n    \n    \n    if (stc.has1_5Compliance && cuei != null && cuei.annotationNumber > 10) { \/\/ experimental value\n      \/\/ if more than 10 annotations, diet parse as this is faster\n      return new Parser(stc.problemReporter, true).dietParse(stc.cu, compilationResult);\n    }\n\n    \/* only positions available *\/\n    int start = topLevelTypeInfo.getNameSourceStart();\n    int end = topLevelTypeInfo.getNameSourceEnd();\n\n    \/* convert package and imports *\/\n    String[] packageName = ((PackageFragment) cuHandle.getParent()).names;\n    if (packageName.length > 0)\n      \/\/ if its null then it is defined in the default package\n      stc.unit.currentPackage =\n        stc.createImportReference(packageName, start, end, false, ClassFileConstants.AccDefault);\n    IImportDeclaration[] importDeclarations = topLevelTypeInfo.getHandle().getCompilationUnit().getImports();\n    int importCount = importDeclarations.length;\n    stc.unit.imports = new ImportReference[importCount];\n    for (int i = 0; i < importCount; i++) {\n      ImportDeclaration importDeclaration = (ImportDeclaration) importDeclarations[i];\n      ISourceImport sourceImport = (ISourceImport) importDeclaration.getElementInfo();\n      String nameWithoutStar = importDeclaration.getNameWithoutStar();\n      stc.unit.imports[i] = stc.createImportReference(\n        Util.splitOn('.', nameWithoutStar, 0, nameWithoutStar.length()),\n        sourceImport.getDeclarationSourceStart(),\n        sourceImport.getDeclarationSourceEnd(),\n        importDeclaration.isOnDemand(),\n        sourceImport.getModifiers());\n    }\n    \/* convert type(s) *\/\n    try {\n      int typeCount = sourceTypes.length;\n      final TypeDeclaration[] types = new TypeDeclaration[typeCount];\n      \/*\n       * We used a temporary types collection to prevent this.unit.types from being null during a call to\n       * convert(...) when the source is syntactically incorrect and the parser is flushing the unit's types.\n       * See https:\/\/bugs.eclipse.org\/bugs\/show_bug.cgi?id=97466\n       *\/\n      for (int i = 0; i < typeCount; i++) {\n        SourceTypeElementInfo typeInfo = (SourceTypeElementInfo) sourceTypes[i];\n        types[i] = stc.convert((SourceType) typeInfo.getHandle(), compilationResult);\n      }\n      stc.unit.types = types;\n      return stc.unit;\n    } catch (SourceTypeConverter.AnonymousMemberFound e) {\n      return new Parser(stc.problemReporter, true).parse(stc.cu, compilationResult);\n    }\n  }\n  \n  IJavaElement around(JavaElement je, int ancestorType) :\n    getAncestor(je, ancestorType) {\n    IJavaElement element = je;\n    while (element != null) {\n      if (element.getElementType() == ancestorType)\n        return element;\n      else if (element instanceof IScalaClassFile && ancestorType == IJavaElement.COMPILATION_UNIT)\n        return ((JavaElement)element).getCompilationUnit();\n      element= element.getParent();\n    }\n    return null;\n  }\n\n  boolean around(TypeNameMatch match) :\n    isContainerDirty(match) {\n    org.eclipse.jdt.core.ICompilationUnit cu = match.getType().getCompilationUnit();\n    if (cu == null) {\n      return false;\n    }\n    IResource resource= cu.getResource();\n    if (resource == null)\n      return false;\n    \n    ITextFileBufferManager manager= FileBuffers.getTextFileBufferManager();\n    ITextFileBuffer textFileBuffer= manager.getTextFileBuffer(resource.getFullPath(), LocationKind.IFILE);\n    if (textFileBuffer != null) {\n      return textFileBuffer.isDirty();\n    }\n    return false;\n  }\n}\n","old_contents":"\/*\n * Copyright 2005-2009 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.cfprovider;\n\nimport org.eclipse.jdt.core.IJavaElement;\n\nimport java.util.HashSet;\n\nimport org.eclipse.jdt.internal.compiler.CompilationResult;\nimport org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;\nimport org.eclipse.jdt.internal.compiler.env.ISourceType;\n\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.core.IBuffer;\nimport org.eclipse.jdt.core.IClassFile;\nimport org.eclipse.jdt.core.IImportDeclaration;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IOpenable;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.ITypeRoot;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.core.dom.CompilationUnit;\nimport org.eclipse.jdt.internal.compiler.ast.ASTNode;\nimport org.eclipse.jdt.internal.compiler.ast.ImportReference;\nimport org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.TypeReference;\nimport org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;\nimport org.eclipse.jdt.internal.compiler.env.IBinaryType;\nimport org.eclipse.jdt.internal.compiler.env.ICompilationUnit;\nimport org.eclipse.jdt.internal.compiler.env.IGenericType;\nimport org.eclipse.jdt.internal.compiler.env.ISourceImport;\nimport org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer;\nimport org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding;\nimport org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding;\nimport org.eclipse.jdt.internal.compiler.parser.Parser;\nimport org.eclipse.jdt.internal.compiler.parser.SourceTypeConverter;\nimport org.eclipse.jdt.internal.core.BinaryType;\nimport org.eclipse.jdt.internal.core.ClassFile;\nimport org.eclipse.jdt.internal.core.CompilationUnitElementInfo;\nimport org.eclipse.jdt.internal.core.ImportDeclaration;\nimport org.eclipse.jdt.internal.core.JavaElement;\nimport org.eclipse.jdt.internal.core.Openable;\nimport org.eclipse.jdt.internal.core.NameLookup;\nimport org.eclipse.jdt.internal.core.PackageFragment;\nimport org.eclipse.jdt.internal.core.SearchableEnvironment;\nimport org.eclipse.jdt.internal.core.SourceMapper;\nimport org.eclipse.jdt.internal.core.SourceType;\nimport org.eclipse.jdt.internal.core.SourceTypeElementInfo;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyResolver;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyType;\nimport org.eclipse.jdt.internal.core.util.Util;\nimport org.eclipse.jdt.internal.ui.filters.InnerClassFilesFilter;\nimport org.eclipse.jdt.ui.SharedASTProvider;\nimport org.eclipse.jface.viewers.Viewer;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaElement;\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaClassFile;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect ClassFileProviderAspect {\n\n  pointcut classFileCreations(PackageFragment parent, String name) : \n    call(protected ClassFile.new(PackageFragment, String)) &&\n    within(org.eclipse.jdt..*) &&\n    args(parent, name);\n  \n  pointcut mapSource() :\n    execution(IBuffer ClassFile.mapSource(SourceMapper, IBinaryType)) &&\n    target(IScalaClassFile);\n  \n  pointcut mapSource2() :\n    execution(void SourceMapper.mapSource(IType, char[], IBinaryType));\n  \n  pointcut getSourceFileName(BinaryType bt) :\n    execution(String BinaryType.getSourceFileName(IBinaryType)) &&\n    target(bt);\n  \n  pointcut select(Viewer viewer, Object parentElement, Object element) :\n    execution(boolean InnerClassFilesFilter.select(Viewer, Object, Object)) &&\n    args(viewer, parentElement, element);\n  \n  pointcut getChildren(BinaryType bt) :\n    execution(IJavaElement[] BinaryType.getChildren()) &&\n    target(bt);\n  \n  pointcut getAST(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) : \n    execution(CompilationUnit SharedASTProvider.getAST(ITypeRoot, SharedASTProvider.WAIT_FLAG, IProgressMonitor)) &&\n    args(element, waitFlag, progressMonitor);\n  \n  pointcut resolve(HierarchyResolver hr, IGenericType suppliedType) :\n    execution(void HierarchyResolver.resolve(IGenericType)) &&\n    target(hr) &&\n    args(suppliedType);\n  \n  pointcut remember(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    execution(void HierarchyResolver.remember(IType, ReferenceBinding)) &&\n    target(hr) &&\n    args(type, typeBinding);\n  \n  pointcut acceptType(IType type, int acceptFlags, boolean isSourceType) :\n    execution(boolean NameLookup.acceptType(IType, int, boolean)) &&\n    args(type, acceptFlags, isSourceType);\n  \n  pointcut find(SearchableEnvironment se, String typeName, String packageName) :\n    execution(NameEnvironmentAnswer find(String, String)) &&\n    target(se) &&\n    args(typeName, packageName);\n  \n  pointcut convert(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) :\n    execution(CompilationUnitDeclaration SourceTypeConverter.convert(ISourceType[], CompilationResult)) &&\n    target(stc) &&\n    args(sourceTypes, compilationResult);\n  \n  pointcut getAncestor(JavaElement je, int ancestorType) :\n    execution(IJavaElement JavaElement.getAncestor(int)) &&\n    target(je) &&\n    args(ancestorType);\n  \n  ClassFile around(PackageFragment parent, String name) : \n    classFileCreations(parent, name) {\n\n    ClassFile javaClassFile = proceed(parent, name);\n    byte[] bytes;\n    \n    try {\n      bytes = javaClassFile.getBytes();\n    } catch(Throwable t) {\n      return javaClassFile; \n    }\n    \n    for (IClassFileProvider provider : ClassFileProviderRegistry.getInstance().getProviders()) {\n      ClassFile cf = provider.create(bytes, parent, name);\n      if (cf != null)\n        return cf;\n    }\n    \n    return javaClassFile;\n  }\n  \n  void around() :\n    mapSource2() &&\n    cflow(mapSource()) {\n    return;\n  }\n  \n  boolean around(Viewer viewer, Object parentElement, Object element) :\n    select(viewer, parentElement, element) {\n    if (element instanceof IScalaClassFile) {\n      IClassFile classFile = (IClassFile) element;\n      String name = classFile.getElementName(); \n      int dollarIndex = name.indexOf('$');\n      return dollarIndex == -1 || dollarIndex == name.length()-7; \/\/ Trailing '$' implies object rather than inner class \n    }\n    return proceed(viewer, parentElement, element);\n  }\n  \n  IJavaElement[] around(BinaryType bt) throws JavaModelException :\n    getChildren(bt) && \n    target(BinaryType) {\n    ClassFile cf = (ClassFile)bt.parent;\n    if (cf instanceof IScalaClassFile)\n      return cf.getChildren();\n    else\n      return proceed(bt);\n  }\n  \n  CompilationUnit around(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) :\n    getAST(element, waitFlag, progressMonitor) {\n      if (element instanceof IScalaElement)\n        return null;\n      else\n        return proceed(element, waitFlag, progressMonitor);\n  }\n  \n  void around(HierarchyResolver hr, IGenericType suppliedType) :\n    resolve(hr, suppliedType) {\n    if (!suppliedType.isBinaryType()) {\n      IType tpe = ((SourceTypeElementInfo)suppliedType).getHandle();\n      IClassFile cf = tpe.getClassFile();\n      if (cf instanceof IScalaClassFile) {\n        hr.resolve(new Openable[]{(Openable)cf}, new HashSet(), null);\n        return;\n      }\n    }\n      \n    proceed(hr, suppliedType);\n  }\n  \n  void around(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    remember(hr, type, typeBinding) {\n    if (((IOpenable)type.getCompilationUnit()).isOpen()) {\n      try {\n        IGenericType genericType = (IGenericType)((JavaElement)type).getElementInfo();\n        hr.remember(genericType, typeBinding);\n      } catch (JavaModelException e) {\n        \/\/ cannot happen since element is open\n        return;\n      }\n    } else {\n      if (typeBinding == null) return;\n\n      TypeDeclaration typeDeclaration = ((SourceTypeBinding)typeBinding).scope.referenceType();\n\n      \/\/ simple super class name\n      char[] superclassName = null;\n      TypeReference superclass;\n      if ((typeDeclaration.bits & ASTNode.IsAnonymousType) != 0) {\n        superclass = typeDeclaration.allocation.type;\n      } else {\n        superclass = typeDeclaration.superclass;\n      }\n      if (superclass != null) {\n        char[][] typeName = superclass.getTypeName();\n        superclassName = typeName == null ? null : typeName[typeName.length-1];\n      }\n\n      \/\/ simple super interface names\n      char[][] superInterfaceNames = null;\n      TypeReference[] superInterfaces = typeDeclaration.superInterfaces;\n      if (superInterfaces != null) {\n        int length = superInterfaces.length;\n        superInterfaceNames = new char[length][];\n        for (int i = 0; i < length; i++) {\n          TypeReference superInterface = superInterfaces[i];\n          char[][] typeName = superInterface.getTypeName();\n          superInterfaceNames[i] = typeName[typeName.length-1];\n        }\n      }\n\n      HierarchyType hierarchyType = new HierarchyType(\n        type,\n        typeDeclaration.name,\n        typeDeclaration.binding.modifiers,\n        superclassName,\n        superInterfaceNames);\n      hr.remember(hierarchyType, typeDeclaration.binding);\n    }\n  }\n  \n  String around(BinaryType bt) :\n    getSourceFileName(bt) {\n    IJavaElement parent = bt.getParent(); \n    if (parent instanceof IScalaClassFile)\n      return ((IScalaClassFile)parent).getSourceFileName();\n    else\n      return proceed(bt);\n  }\n  \n  boolean around(IType type, int acceptFlags, boolean isSourceType) :\n    acceptType(type, acceptFlags, isSourceType) {\n    if (!isSourceType && (type instanceof SourceType)) {\n      IJavaElement parent = type.getParent(); \n      if (parent instanceof IScalaClassFile)\n        return proceed(type, acceptFlags, true);\n    }\n    \n    return proceed(type, acceptFlags, isSourceType);\n  }\n  \n  CompilationUnitDeclaration around(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) throws JavaModelException :\n    convert(stc, sourceTypes, compilationResult) {\n    stc.unit = new CompilationUnitDeclaration(stc.problemReporter, compilationResult, 0);\n    \/\/ not filled at this point\n\n    if (sourceTypes.length == 0) return stc.unit;\n    SourceTypeElementInfo topLevelTypeInfo = (SourceTypeElementInfo) sourceTypes[0];\n    org.eclipse.jdt.core.ICompilationUnit cuHandle = topLevelTypeInfo.getHandle().getCompilationUnit();\n    stc.cu = (ICompilationUnit) cuHandle;\n\n    CompilationUnitElementInfo cuei = null;\n    Object info = ((JavaElement)stc.cu).getElementInfo();\n    if (info instanceof CompilationUnitElementInfo)\n      cuei = (CompilationUnitElementInfo)info;\n    \n    \n    if (stc.has1_5Compliance && cuei != null && cuei.annotationNumber > 10) { \/\/ experimental value\n      \/\/ if more than 10 annotations, diet parse as this is faster\n      return new Parser(stc.problemReporter, true).dietParse(stc.cu, compilationResult);\n    }\n\n    \/* only positions available *\/\n    int start = topLevelTypeInfo.getNameSourceStart();\n    int end = topLevelTypeInfo.getNameSourceEnd();\n\n    \/* convert package and imports *\/\n    String[] packageName = ((PackageFragment) cuHandle.getParent()).names;\n    if (packageName.length > 0)\n      \/\/ if its null then it is defined in the default package\n      stc.unit.currentPackage =\n        stc.createImportReference(packageName, start, end, false, ClassFileConstants.AccDefault);\n    IImportDeclaration[] importDeclarations = topLevelTypeInfo.getHandle().getCompilationUnit().getImports();\n    int importCount = importDeclarations.length;\n    stc.unit.imports = new ImportReference[importCount];\n    for (int i = 0; i < importCount; i++) {\n      ImportDeclaration importDeclaration = (ImportDeclaration) importDeclarations[i];\n      ISourceImport sourceImport = (ISourceImport) importDeclaration.getElementInfo();\n      String nameWithoutStar = importDeclaration.getNameWithoutStar();\n      stc.unit.imports[i] = stc.createImportReference(\n        Util.splitOn('.', nameWithoutStar, 0, nameWithoutStar.length()),\n        sourceImport.getDeclarationSourceStart(),\n        sourceImport.getDeclarationSourceEnd(),\n        importDeclaration.isOnDemand(),\n        sourceImport.getModifiers());\n    }\n    \/* convert type(s) *\/\n    try {\n      int typeCount = sourceTypes.length;\n      final TypeDeclaration[] types = new TypeDeclaration[typeCount];\n      \/*\n       * We used a temporary types collection to prevent this.unit.types from being null during a call to\n       * convert(...) when the source is syntactically incorrect and the parser is flushing the unit's types.\n       * See https:\/\/bugs.eclipse.org\/bugs\/show_bug.cgi?id=97466\n       *\/\n      for (int i = 0; i < typeCount; i++) {\n        SourceTypeElementInfo typeInfo = (SourceTypeElementInfo) sourceTypes[i];\n        types[i] = stc.convert((SourceType) typeInfo.getHandle(), compilationResult);\n      }\n      stc.unit.types = types;\n      return stc.unit;\n    } catch (SourceTypeConverter.AnonymousMemberFound e) {\n      return new Parser(stc.problemReporter, true).parse(stc.cu, compilationResult);\n    }\n  }\n  \n  IJavaElement around(JavaElement je, int ancestorType) :\n    getAncestor(je, ancestorType) {\n    IJavaElement element = je;\n    while (element != null) {\n      if (element.getElementType() == ancestorType)\n        return element;\n      else if (element instanceof IScalaClassFile && ancestorType == IJavaElement.COMPILATION_UNIT)\n        return ((JavaElement)element).getCompilationUnit();\n      element= element.getParent();\n    }\n    return null;\n  }\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"78c71773cb870dc79ab585ffee6a393325e632aa","subject":"Fixed #1741.","message":"Fixed #1741.\n\ngit-svn-id: f4ecfe233223879a4a16cd7937f11b5152963d8e@17176 5e8d7ff9-d8ef-0310-90f0-a4852d11357a\n","repos":"aleksi-lukkarinen\/scala-ide,pilipolio\/scala-ide,mlangc\/scala-ide,Kwestor\/scala-ide,scala-ide\/scala-ide,wpopielarski\/scala-ide,pilipolio\/scala-ide,andrey-ilinykh\/scala-ide,stephenh\/scala-ide,sschaef\/scala-ide,romanowski\/scala-ide,andrey-ilinykh\/scala-ide,Duhemm\/scala-ide,Kwestor\/scala-ide,Kwestor\/scala-ide,aleksi-lukkarinen\/scala-ide,stephenh\/scala-ide,aleksi-lukkarinen\/scala-ide,sschaef\/scala-ide,dragos\/scala-ide,stephenh\/scala-ide,dragos\/scala-ide,sschaef\/scala-ide,romanowski\/scala-ide,Duhemm\/scala-ide,andrey-ilinykh\/scala-ide,dragos\/scala-ide,romanowski\/scala-ide,dragos\/scala-ide,Kwestor\/scala-ide,sschaef\/scala-ide,Duhemm\/scala-ide,mlangc\/scala-ide,mlangc\/scala-ide,aleksi-lukkarinen\/scala-ide,andrey-ilinykh\/scala-ide,wpopielarski\/scala-ide,scala-ide\/scala-ide,romanowski\/scala-ide,wpopielarski\/scala-ide,scala-ide\/scala-ide,wpopielarski\/scala-ide,Duhemm\/scala-ide,pilipolio\/scala-ide,pilipolio\/scala-ide,stephenh\/scala-ide,scala-ide\/scala-ide,mlangc\/scala-ide","old_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/builderoptions\/ScalaJavaBuilderAspect.aj","new_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/builderoptions\/ScalaJavaBuilderAspect.aj","new_contents":"\/*\n * Copyright 2005-2009 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.builderoptions;\n\nimport java.util.Map;\n\nimport org.eclipse.core.resources.IProject;\nimport org.eclipse.core.runtime.CoreException;\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.internal.core.builder.BatchImageBuilder;\n\/\/import org.eclipse.jdt.internal.core.builder.ClasspathMultiDirectory;\nimport org.eclipse.jdt.internal.core.util.Util;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect ScalaJavaBuilderAspect {\n  pointcut build() : execution(IProject[] ScalaJavaBuilder.build(int, Map, IProgressMonitor) throws CoreException);\n  pointcut cleanOutputFolders(boolean copyBack) : args(copyBack) && execution(void BatchImageBuilder.cleanOutputFolders(boolean) throws CoreException);\n  pointcut isJavaLikeFileName(String fileName) : args(fileName) && execution(boolean Util.isJavaLikeFileName(String));  \n  \n  void around(BatchImageBuilder builder, boolean copyBack) throws CoreException : target(builder) && cleanOutputFolders(copyBack) && cflow(build()) {\n    \/\/ Suppress the cleaning behaviour but do the extra resource copying if requested\n    if (copyBack)\n      for (int i = 0, l = builder.sourceLocations.length; i < l; i++) {\n        org.eclipse.jdt.internal.core.builder.ClasspathMultiDirectory sourceLocation = builder.sourceLocations[i];\n        if (sourceLocation.hasIndependentOutputFolder)\n          builder.copyExtraResourcesBack(sourceLocation, false);\n      }\n  }\n  \n  boolean around(String fileName) : isJavaLikeFileName(fileName) && cflow(build()) && !cflow(cleanOutputFolders(*)) {\n    if (fileName != null && fileName.endsWith(\"scala\"))\n      return false;\n    else\n      return proceed(fileName);\n  }\n}\n","old_contents":"\/*\n * Copyright 2005-2009 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.builderoptions;\n\nimport java.util.Map;\n\nimport org.eclipse.core.resources.IProject;\nimport org.eclipse.core.runtime.CoreException;\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.internal.core.builder.BatchImageBuilder;\nimport org.eclipse.jdt.internal.core.util.Util;\n\n@SuppressWarnings(\"restriction\")\npublic aspect ScalaJavaBuilderAspect {\n  pointcut build() : execution(IProject[] ScalaJavaBuilder.build(int, Map, IProgressMonitor) throws CoreException);\n  pointcut clean() : execution(void ScalaJavaBuilder.clean(IProgressMonitor) throws CoreException);\n  pointcut cleanOutputFolders() : execution(void BatchImageBuilder.cleanOutputFolders(boolean) throws CoreException);\n  pointcut isJavaLikeFileName(String fileName) : args(fileName) && execution(boolean Util.isJavaLikeFileName(String));  \n  \n  void around() : cleanOutputFolders() && cflow(build()) {\n    \/\/ Just suppress the behaviour\n  }\n  \n  boolean around(String fileName) : isJavaLikeFileName(fileName) && (cflow(build()) || cflow(clean())) {\n    if (fileName != null && fileName.endsWith(\"scala\"))\n      return false;\n    else\n      return proceed(fileName);\n  }\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"11902e35b99d592353b096fea66eb9f2e97e480d","subject":"commit 46c49b79ea575837e15bae84b034d54682cd158b Author: Iyappan Srinivasan <iyappans@yahoo-inc.com> Date:   Fri Jul 23 05:52:01 2010 +0000","message":"commit 46c49b79ea575837e15bae84b034d54682cd158b\nAuthor: Iyappan Srinivasan <iyappans@yahoo-inc.com>\nDate:   Fri Jul 23 05:52:01 2010 +0000\n\n    MAPREDUCE-1955 https:\/\/issues.apache.org\/jira\/secure\/attachment\/12450264\/1955-ydist-security-patch.txt\n\n\ngit-svn-id: 7e7a2d564dde2945c3a26e08d1235fcc0cb7aba1@1077581 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"awylie\/hadoop,awylie\/hadoop,awylie\/hadoop,awylie\/hadoop,awylie\/hadoop,awylie\/hadoop,awylie\/hadoop,awylie\/hadoop,awylie\/hadoop,awylie\/hadoop","old_file":"src\/test\/system\/aop\/org\/apache\/hadoop\/mapred\/JobInProgressAspect.aj","new_file":"src\/test\/system\/aop\/org\/apache\/hadoop\/mapred\/JobInProgressAspect.aj","new_contents":"\/**\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements.  See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership.  The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * \"License\"); you may not use this file except in compliance\n * with the License.  You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.apache.hadoop.mapred;\n\nimport java.io.IOException;\nimport org.apache.hadoop.mapreduce.test.system.JobInfo;\n\n\/**\n * Aspect to add a utility method in the JobInProgress for easing up the\n * construction of the JobInfo object.\n *\/\nprivileged aspect JobInProgressAspect {\n\n  \/**\n   * Returns a read only view of the JobInProgress object which is used by the\n   * client.\n   * \n   * @return JobInfo of the current JobInProgress object\n   *\/\n  public JobInfo JobInProgress.getJobInfo() {\n    String historyLoc = getHistoryPath();\n    JobInfoImpl jobInfoImpl;\n    if (tasksInited) {\n      jobInfoImpl = new JobInfoImpl(\n          this.getJobID(), this.isSetupLaunched(), this.isSetupFinished(), this\n              .isCleanupLaunched(), this.runningMaps(), this.runningReduces(),\n          this.pendingMaps(), this.pendingReduces(), this.finishedMaps(), this\n              .finishedReduces(), this.getStatus(), historyLoc, this\n              .getBlackListedTrackers(), false, this.numMapTasks,\n          this.numReduceTasks, this.isHistoryFileCopied());\n    } else {\n      jobInfoImpl = new JobInfoImpl(\n          this.getJobID(), false, false, false, 0, 0, this.pendingMaps(), this\n              .pendingReduces(), this.finishedMaps(), this.finishedReduces(),\n          this.getStatus(), historyLoc, this.getBlackListedTrackers(), this\n              .isComplete(), this.numMapTasks, this.numReduceTasks, \n              this.isHistoryFileCopied());\n    }\n    jobInfoImpl.setFinishTime(getJobFinishTime());\n    jobInfoImpl.setLaunchTime(getJobLaunchTime());\n    jobInfoImpl.setNumSlotsPerReduce(getJobNumSlotsPerReduce());\n    jobInfoImpl.setNumSlotsPerMap(getJobNumSlotsPerMap());\n    return jobInfoImpl;\n  }\n  \n  private long JobInProgress.getJobFinishTime() {\n    long finishTime = 0;\n    if (this.isComplete()) {\n      finishTime = this.getFinishTime();\n    }\n    return finishTime;\n  }\n\n  private long JobInProgress.getJobLaunchTime() {\n    long LaunchTime = 0;\n    if (this.isComplete()) {\n      LaunchTime = this.getLaunchTime();\n    }\n    return LaunchTime;\n  }\n\n  private int JobInProgress.getJobNumSlotsPerReduce() {\n    int numSlotsPerReduce = 0;\n    if (this.isComplete()) {\n      numSlotsPerReduce = this.getNumSlotsPerReduce();\n    }\n    return numSlotsPerReduce;\n  }\n\n  private int JobInProgress.getJobNumSlotsPerMap() {\n    int numSlotsPerMap = 0;\n    if (this.isComplete()) {\n      numSlotsPerMap = this.getNumSlotsPerMap();\n    }\n    return numSlotsPerMap;\n }\n\n\n  private String JobInProgress.getHistoryPath() {\n    String historyLoc = \"\";\n    if(this.isComplete()) {\n      historyLoc = this.getHistoryFile();\n    } else {\n      String historyFileName = null;\n      try {\n        historyFileName  = JobHistory.JobInfo.getJobHistoryFileName(conf, \n            jobId);\n      } catch(IOException e) {\n      }\n      if(historyFileName != null) {\n        historyLoc = JobHistory.JobInfo.getJobHistoryLogLocation(\n            historyFileName).toString();\n      }\n    }\n    return historyLoc;\n  }\n\n}\n","old_contents":"\/**\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements.  See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership.  The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * \"License\"); you may not use this file except in compliance\n * with the License.  You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.apache.hadoop.mapred;\n\nimport java.io.IOException;\nimport org.apache.hadoop.mapreduce.test.system.JobInfo;\n\n\/**\n * Aspect to add a utility method in the JobInProgress for easing up the\n * construction of the JobInfo object.\n *\/\nprivileged aspect JobInProgressAspect {\n\n  \/**\n   * Returns a read only view of the JobInProgress object which is used by the\n   * client.\n   * \n   * @return JobInfo of the current JobInProgress object\n   *\/\n  public JobInfo JobInProgress.getJobInfo() {\n    String historyLoc = getHistoryPath();\n    JobInfoImpl jobInfoImpl;\n    if (tasksInited.get()) {\n      jobInfoImpl = new JobInfoImpl(\n          this.getJobID(), this.isSetupLaunched(), this.isSetupFinished(), this\n              .isCleanupLaunched(), this.runningMaps(), this.runningReduces(),\n          this.pendingMaps(), this.pendingReduces(), this.finishedMaps(), this\n              .finishedReduces(), this.getStatus(), historyLoc, this\n              .getBlackListedTrackers(), false, this.numMapTasks,\n          this.numReduceTasks, this.isHistoryFileCopied());\n    } else {\n      jobInfoImpl = new JobInfoImpl(\n          this.getJobID(), false, false, false, 0, 0, this.pendingMaps(), this\n              .pendingReduces(), this.finishedMaps(), this.finishedReduces(),\n          this.getStatus(), historyLoc, this.getBlackListedTrackers(), this\n              .isComplete(), this.numMapTasks, this.numReduceTasks, \n              this.isHistoryFileCopied());\n    }\n    jobInfoImpl.setFinishTime(getJobFinishTime());\n    jobInfoImpl.setLaunchTime(getJobLaunchTime());\n    jobInfoImpl.setNumSlotsPerReduce(getJobNumSlotsPerReduce());\n    jobInfoImpl.setNumSlotsPerMap(getJobNumSlotsPerMap());\n    return jobInfoImpl;\n  }\n  \n  private long JobInProgress.getJobFinishTime() {\n    long finishTime = 0;\n    if (this.isComplete()) {\n      finishTime = this.getFinishTime();\n    }\n    return finishTime;\n  }\n\n  private long JobInProgress.getJobLaunchTime() {\n    long LaunchTime = 0;\n    if (this.isComplete()) {\n      LaunchTime = this.getLaunchTime();\n    }\n    return LaunchTime;\n  }\n\n  private int JobInProgress.getJobNumSlotsPerReduce() {\n    int numSlotsPerReduce = 0;\n    if (this.isComplete()) {\n      numSlotsPerReduce = this.getNumSlotsPerReduce();\n    }\n    return numSlotsPerReduce;\n  }\n\n  private int JobInProgress.getJobNumSlotsPerMap() {\n    int numSlotsPerMap = 0;\n    if (this.isComplete()) {\n      numSlotsPerMap = this.getNumSlotsPerMap();\n    }\n    return numSlotsPerMap;\n }\n\n\n  private String JobInProgress.getHistoryPath() {\n    String historyLoc = \"\";\n    if(this.isComplete()) {\n      historyLoc = this.getHistoryFile();\n    } else {\n      String historyFileName = null;\n      try {\n        historyFileName  = JobHistory.JobInfo.getJobHistoryFileName(conf, \n            jobId);\n      } catch(IOException e) {\n      }\n      if(historyFileName != null) {\n        historyLoc = JobHistory.JobInfo.getJobHistoryLogLocation(\n            historyFileName).toString();\n      }\n    }\n    return historyLoc;\n  }\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"45729dcafc29a41862f15e7da3658f123512c2d3","subject":"Improving binding for PluginParameterException report.","message":"Improving binding for PluginParameterException report.\n\ngit-svn-id: 2c527eb49caa05e19d6b2be874bf74fa9d7ea670@604642 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"skitt\/maven,ChristianSchulte\/maven,cstamas\/maven,vedmishr\/demo1,runepeter\/maven-deploy-plugin-2.8.1,keith-turner\/maven,stephenc\/maven,atanasenko\/maven,gorcz\/maven,Tibor17\/maven,mizdebsk\/maven,changbai1980\/maven,ChristianSchulte\/maven,runepeter\/maven-deploy-plugin-2.8.1,changbai1980\/maven,vedmishr\/demo1,trajano\/maven,trajano\/maven,Distrotech\/maven,likaiwalkman\/maven,xasx\/maven,xasx\/maven,josephw\/maven,dsyer\/maven,dsyer\/maven,njuneau\/maven,wangyuesong0\/maven,kidaa\/maven-1,apache\/maven,wangyuesong0\/maven,wangyuesong\/maven,skitt\/maven,olamy\/maven,Mounika-Chirukuri\/maven,mcculls\/maven,Mounika-Chirukuri\/maven,likaiwalkman\/maven,cstamas\/maven,aheritier\/maven,aheritier\/maven,Tibor17\/maven,gorcz\/maven,rogerchina\/maven,olamy\/maven,karthikjaps\/maven,changbai1980\/maven,barthel\/maven,dsyer\/maven,mizdebsk\/maven,lbndev\/maven,gorcz\/maven,wangyuesong\/maven,xasx\/maven,njuneau\/maven,karthikjaps\/maven,Mounika-Chirukuri\/maven,kidaa\/maven-1,cstamas\/maven,keith-turner\/maven,lbndev\/maven,trajano\/maven,pkozelka\/maven,kidaa\/maven-1,josephw\/maven,lbndev\/maven,ChristianSchulte\/maven,atanasenko\/maven,skitt\/maven,olamy\/maven,stephenc\/maven,mcculls\/maven,karthikjaps\/maven,barthel\/maven,apache\/maven,rogerchina\/maven,vedmishr\/demo1,njuneau\/maven,keith-turner\/maven,pkozelka\/maven,apache\/maven,wangyuesong0\/maven,josephw\/maven,likaiwalkman\/maven,rogerchina\/maven,Distrotech\/maven,aheritier\/maven,wangyuesong\/maven,pkozelka\/maven,barthel\/maven,mcculls\/maven,stephenc\/maven,mizdebsk\/maven,atanasenko\/maven","old_file":"maven-core\/src\/main\/aspect\/org\/apache\/maven\/errors\/LifecycleErrorReporterAspect.aj","new_file":"maven-core\/src\/main\/aspect\/org\/apache\/maven\/errors\/LifecycleErrorReporterAspect.aj","new_contents":"package org.apache.maven.errors;\n\nimport org.codehaus.plexus.logging.console.ConsoleLogger;\nimport org.codehaus.plexus.logging.Logger;\nimport org.apache.maven.project.path.PathTranslator;\nimport org.apache.maven.plugin.MojoExecution;\nimport org.apache.maven.artifact.Artifact;\nimport org.apache.maven.artifact.resolver.ArtifactResolver;\nimport org.apache.maven.artifact.resolver.ArtifactResolutionException;\nimport org.apache.maven.plugin.PluginConfigurationException;\nimport org.apache.maven.plugin.descriptor.Parameter;\nimport org.apache.maven.plugin.loader.PluginLoaderException;\nimport org.apache.maven.plugin.PluginExecutionException;\nimport org.apache.maven.plugin.MojoExecutionException;\nimport org.apache.maven.artifact.resolver.ArtifactNotFoundException;\nimport org.apache.maven.execution.MavenSession;\nimport org.apache.maven.lifecycle.model.MojoBinding;\nimport org.apache.maven.lifecycle.DefaultLifecycleExecutor;\nimport org.apache.maven.lifecycle.LifecycleException;\nimport org.apache.maven.lifecycle.LifecycleExecutionException;\nimport org.apache.maven.project.MavenProject;\nimport org.apache.maven.plugin.DefaultPluginManager;\nimport org.apache.maven.plugin.PluginManager;\nimport org.apache.maven.plugin.PluginParameterExpressionEvaluator;\nimport org.apache.maven.plugin.PluginParameterException;\nimport org.apache.maven.plugin.Mojo;\nimport org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;\nimport org.codehaus.plexus.component.repository.exception.ComponentLookupException;\nimport org.codehaus.plexus.configuration.PlexusConfiguration;\n\nimport java.util.List;\n\npublic privileged aspect LifecycleErrorReporterAspect\n    extends AbstractCoreReporterAspect\n{\n\n    private pointcut le_executeGoalAndHandleFailures( MojoBinding binding ):\n        execution( void DefaultLifecycleExecutor.executeGoalAndHandleFailures( MojoBinding, .. ) )\n        && args( binding, .. );\n\n    private pointcut pm_executeMojo( MavenProject project ):\n        execution( void PluginManager+.executeMojo( MavenProject, .. ) )\n        && args( project, .. );\n\n    private pointcut within_pm_executeMojo( MavenProject project ):\n        withincode( void PluginManager+.executeMojo( MavenProject, .. ) )\n        && args( project, .. );\n\n    before( MojoBinding binding, MavenProject project, LifecycleExecutionException err ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && execution( LifecycleExecutionException.new( String, MavenProject ) )\n        && args( .., project )\n        && this( err )\n    {\n        getReporter().reportMissingPluginDescriptor( binding, project, err );\n    }\n\n    before( MojoBinding binding, MavenProject project, PluginLoaderException cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && call( LifecycleExecutionException.new( String, MavenProject, PluginLoaderException ) )\n        && args( *, project, cause )\n    {\n        getReporter().reportErrorLoadingPlugin( binding, project, cause );\n    }\n\n    before( MojoBinding binding, MavenProject project, MojoExecutionException cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && handler( MojoExecutionException )\n        && args( cause )\n    {\n        getReporter().reportMojoExecutionException( binding, project, cause );\n    }\n\n    PluginExecutionException around( MojoBinding binding, MavenProject project ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && call( PluginExecutionException.new( .., String ) )\n    {\n        PluginExecutionException cause = proceed( binding, project );\n        getReporter().reportInvalidPluginExecutionEnvironment( binding, project, cause );\n\n        return cause;\n    }\n\n    before( MojoBinding binding, MavenProject project, ComponentLookupException cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && withincode( Mojo DefaultPluginManager.getConfiguredMojo( .. ) )\n        && handler( ComponentLookupException )\n        && args( cause )\n    {\n        getReporter().reportMojoLookupError( binding, project, cause );\n    }\n\n    Parameter currentParameter;\n\n    private pointcut paramGetName( Parameter parameter ):\n        call( String Parameter.getName() )\n        && target( parameter );\n\n    private pointcut pm_validatePomConfig():\n        execution( void DefaultPluginManager.validatePomConfiguration( .. ) );\n\n    private pointcut within_pm_validatePomConfig():\n        withincode( void DefaultPluginManager.validatePomConfiguration( .. ) );\n\n    private pointcut pm_checkRequiredParameters():\n        execution( void DefaultPluginManager.checkRequiredParameters( .. ) );\n\n    private pointcut within_pm_checkRequiredParameters():\n        withincode( void DefaultPluginManager.checkRequiredParameters( .. ) );\n\n    before( Parameter parameter ):\n        ( within_pm_validatePomConfig()\n          || within_pm_checkRequiredParameters() )\n        && paramGetName( parameter )\n    {\n        currentParameter = parameter;\n    }\n\n    after() returning:\n        pm_validatePomConfig() ||\n        pm_checkRequiredParameters()\n    {\n        currentParameter = null;\n    }\n\n    private pointcut pm_executeMojoWithSessionAndExec( MavenProject project, MojoExecution exec, MavenSession session, DefaultPluginManager manager ):\n        execution( void DefaultPluginManager.executeMojo( MavenProject, MojoExecution, MavenSession ) )\n        && args( project, exec, session )\n        && this( manager );\n\n    after( MojoBinding binding, MavenProject project, MojoExecution exec, MavenSession session, DefaultPluginManager manager ) throwing( PluginConfigurationException cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojoWithSessionAndExec( project, exec, session, manager ) )\n        && pm_validatePomConfig()\n    {\n        PathTranslator translator = manager.pathTranslator;\n        Logger logger = new ConsoleLogger( Logger.LEVEL_INFO, \"error reporting\" );\n        getReporter().reportAttemptToOverrideUneditableMojoParameter( currentParameter, binding, project, session, exec, translator, logger, cause );\n    }\n\n    PluginParameterException around( MojoBinding binding, MavenProject project, List invalidParameters ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && cflow( pm_checkRequiredParameters() )\n        && call( PluginParameterException.new( .., List ) )\n        && args( .., invalidParameters )\n    {\n        PluginParameterException err = proceed( binding, project, invalidParameters );\n\n        getReporter().reportMissingRequiredMojoParameter( binding, project, invalidParameters, err );\n\n        return err;\n    }\n\n    private pointcut ppee_evaluate( String expression ):\n        execution( Object PluginParameterExpressionEvaluator.evaluate( String ) )\n        && args( expression );\n\n    private pointcut within_ppee_evaluate( String expression ):\n        withincode( Object PluginParameterExpressionEvaluator.evaluate( String ) )\n        && args( expression );\n\n    before( MojoBinding binding, MavenProject project, String expression, ExpressionEvaluationException err ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && cflow( pm_checkRequiredParameters() )\n        && cflow( ppee_evaluate( expression ) )\n        && execution( ExpressionEvaluationException.new( String ) )\n        && this( err )\n    {\n        getReporter().reportUseOfBannedMojoParameter( currentParameter,\n                                                      binding,\n                                                      project,\n                                                      expression,\n                                                      (String) PluginParameterExpressionEvaluator.BANNED_EXPRESSIONS.get( expression ),\n                                                      err );\n    }\n\n    before( MojoBinding binding, MavenProject project, String expression, Exception cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && cflow( pm_checkRequiredParameters() )\n        && cflow( ppee_evaluate( expression ) )\n        && within( PluginParameterExpressionEvaluator )\n        && handler( Exception )\n        && args( cause )\n    {\n        getReporter().reportReflectionErrorWhileEvaluatingMojoParameter( currentParameter,\n                                                      binding,\n                                                      project,\n                                                      expression,\n                                                      cause );\n    }\n\n    after( MojoBinding binding, MavenProject project, PlexusConfiguration config ) throwing( PluginConfigurationException cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && execution( void DefaultPluginManager.populatePluginFields( *, *, PlexusConfiguration, .. ) )\n        && args( *, *, config, .. )\n    {\n        getReporter().reportErrorApplyingMojoConfiguration( binding, project, config, cause );\n    }\n\n    private pointcut pm_resolveTransitiveDependencies( MavenProject project, String scope ):\n        execution( void DefaultPluginManager.resolveTransitiveDependencies( *, *, String, *, MavenProject ) )\n        && args( *, *, scope, *, project );\n\n    after( MavenProject project, String scope ) throwing( ArtifactNotFoundException cause ):\n        pm_resolveTransitiveDependencies( project, scope )\n    {\n        getReporter().reportProjectDependenciesNotFound( project, scope, cause );\n    }\n\n    after( MavenProject project, String scope ) throwing( ArtifactResolutionException cause ):\n        pm_resolveTransitiveDependencies( project, scope )\n    {\n        getReporter().reportProjectDependenciesUnresolvable( project, scope, cause );\n    }\n\n    private pointcut within_pm_downloadDependencies( MavenProject project ):\n        withincode( void DefaultPluginManager.downloadDependencies( MavenProject, .. ) )\n        && args( project, .. );\n\n    private pointcut ar_resolve( Artifact artifact ):\n        call( * ArtifactResolver+.resolve( Artifact, ..) )\n        && args( artifact, .. );\n\n    after( MavenProject project, Artifact artifact ) throwing( ArtifactNotFoundException cause ):\n        within_pm_downloadDependencies( project )\n        && ar_resolve( artifact )\n    {\n        getReporter().reportProjectDependencyArtifactNotFound( project, artifact, cause );\n    }\n\n    after( MavenProject project, Artifact artifact ) throwing( ArtifactResolutionException cause ):\n        within_pm_downloadDependencies( project )\n        && ar_resolve( artifact )\n    {\n        getReporter().reportProjectDependencyArtifactUnresolvable( project, artifact, cause );\n    }\n\n    private pointcut le_getLifecycleBindings( List tasks, MavenProject configuringProject, String targetDescription ):\n        execution( List DefaultLifecycleExecutor.getLifecycleBindings( List, MavenProject, *, String ) )\n        && args( tasks, configuringProject, *, targetDescription );\n\n    before( List tasks, MavenProject configuringProject, String targetDescription, LifecycleException cause ):\n        cflow( le_getLifecycleBindings( tasks, configuringProject, targetDescription ) )\n        && call( LifecycleExecutionException.new( .., LifecycleException ) )\n        && args( .., cause )\n    {\n        getReporter().reportErrorFormulatingBuildPlan( tasks, configuringProject, targetDescription, cause );\n    }\n\n}\n","old_contents":"package org.apache.maven.errors;\n\nimport org.codehaus.plexus.logging.console.ConsoleLogger;\nimport org.codehaus.plexus.logging.Logger;\nimport org.apache.maven.project.path.PathTranslator;\nimport org.apache.maven.plugin.MojoExecution;\nimport org.apache.maven.artifact.Artifact;\nimport org.apache.maven.artifact.resolver.ArtifactResolver;\nimport org.apache.maven.artifact.resolver.ArtifactResolutionException;\nimport org.apache.maven.plugin.PluginConfigurationException;\nimport org.apache.maven.plugin.descriptor.Parameter;\nimport org.apache.maven.plugin.loader.PluginLoaderException;\nimport org.apache.maven.plugin.PluginExecutionException;\nimport org.apache.maven.plugin.MojoExecutionException;\nimport org.apache.maven.artifact.resolver.ArtifactNotFoundException;\nimport org.apache.maven.execution.MavenSession;\nimport org.apache.maven.lifecycle.model.MojoBinding;\nimport org.apache.maven.lifecycle.DefaultLifecycleExecutor;\nimport org.apache.maven.lifecycle.LifecycleException;\nimport org.apache.maven.lifecycle.LifecycleExecutionException;\nimport org.apache.maven.project.MavenProject;\nimport org.apache.maven.plugin.DefaultPluginManager;\nimport org.apache.maven.plugin.PluginManager;\nimport org.apache.maven.plugin.PluginParameterExpressionEvaluator;\nimport org.apache.maven.plugin.PluginParameterException;\nimport org.apache.maven.plugin.Mojo;\nimport org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;\nimport org.codehaus.plexus.component.repository.exception.ComponentLookupException;\nimport org.codehaus.plexus.configuration.PlexusConfiguration;\n\nimport java.util.List;\n\npublic privileged aspect LifecycleErrorReporterAspect\n    extends AbstractCoreReporterAspect\n{\n\n    private pointcut le_executeGoalAndHandleFailures( MojoBinding binding ):\n        execution( void DefaultLifecycleExecutor.executeGoalAndHandleFailures( MojoBinding, .. ) )\n        && args( binding, .. );\n\n    private pointcut pm_executeMojo( MavenProject project ):\n        execution( void PluginManager+.executeMojo( MavenProject, .. ) )\n        && args( project, .. );\n\n    private pointcut within_pm_executeMojo( MavenProject project ):\n        withincode( void PluginManager+.executeMojo( MavenProject, .. ) )\n        && args( project, .. );\n\n    before( MojoBinding binding, MavenProject project, LifecycleExecutionException err ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && execution( LifecycleExecutionException.new( String, MavenProject ) )\n        && args( .., project )\n        && this( err )\n    {\n        getReporter().reportMissingPluginDescriptor( binding, project, err );\n    }\n\n    before( MojoBinding binding, MavenProject project, PluginLoaderException cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && call( LifecycleExecutionException.new( String, MavenProject, PluginLoaderException ) )\n        && args( *, project, cause )\n    {\n        getReporter().reportErrorLoadingPlugin( binding, project, cause );\n    }\n\n    before( MojoBinding binding, MavenProject project, MojoExecutionException cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && handler( MojoExecutionException )\n        && args( cause )\n    {\n        getReporter().reportMojoExecutionException( binding, project, cause );\n    }\n\n    PluginExecutionException around( MojoBinding binding, MavenProject project ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && call( PluginExecutionException.new( .., String ) )\n    {\n        PluginExecutionException cause = proceed( binding, project );\n        getReporter().reportInvalidPluginExecutionEnvironment( binding, project, cause );\n\n        return cause;\n    }\n\n    before( MojoBinding binding, MavenProject project, ComponentLookupException cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && withincode( Mojo DefaultPluginManager.getConfiguredMojo( .. ) )\n        && handler( ComponentLookupException )\n        && args( cause )\n    {\n        getReporter().reportMojoLookupError( binding, project, cause );\n    }\n\n    Parameter currentParameter;\n\n    private pointcut paramGetName( Parameter parameter ):\n        call( String Parameter.getName() )\n        && target( parameter );\n\n    private pointcut pm_validatePomConfig():\n        execution( void DefaultPluginManager.validatePomConfiguration( .. ) );\n\n    private pointcut within_pm_validatePomConfig():\n        withincode( void DefaultPluginManager.validatePomConfiguration( .. ) );\n\n    private pointcut pm_checkRequiredParameters():\n        execution( void DefaultPluginManager.checkRequiredParameters( .. ) );\n\n    private pointcut within_pm_checkRequiredParameters():\n        withincode( void DefaultPluginManager.checkRequiredParameters( .. ) );\n\n    before( Parameter parameter ):\n        ( within_pm_validatePomConfig()\n          || within_pm_checkRequiredParameters() )\n        && paramGetName( parameter )\n    {\n        currentParameter = parameter;\n    }\n\n    after() returning:\n        pm_validatePomConfig() ||\n        pm_checkRequiredParameters()\n    {\n        currentParameter = null;\n    }\n\n    private pointcut pm_executeMojoWithSessionAndExec( MavenProject project, MojoExecution exec, MavenSession session, DefaultPluginManager manager ):\n        execution( void DefaultPluginManager.executeMojo( MavenProject, MojoExecution, MavenSession ) )\n        && args( project, exec, session )\n        && this( manager );\n\n    after( MojoBinding binding, MavenProject project, MojoExecution exec, MavenSession session, DefaultPluginManager manager ) throwing( PluginConfigurationException cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojoWithSessionAndExec( project, exec, session, manager ) )\n        && pm_validatePomConfig()\n    {\n        PathTranslator translator = manager.pathTranslator;\n        Logger logger = new ConsoleLogger( Logger.LEVEL_INFO, \"error reporting\" );\n        getReporter().reportAttemptToOverrideUneditableMojoParameter( currentParameter, binding, project, session, exec, translator, logger, cause );\n    }\n\n    before( MojoBinding binding, MavenProject project, List invalidParameters, PluginParameterException err ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && cflow( pm_checkRequiredParameters() )\n        && execution( PluginParameterException.new( .., List ) )\n        && args( .., invalidParameters )\n        && this( err )\n    {\n        getReporter().reportMissingRequiredMojoParameter( binding, project, invalidParameters, err );\n    }\n\n    private pointcut ppee_evaluate( String expression ):\n        execution( Object PluginParameterExpressionEvaluator.evaluate( String ) )\n        && args( expression );\n\n    private pointcut within_ppee_evaluate( String expression ):\n        withincode( Object PluginParameterExpressionEvaluator.evaluate( String ) )\n        && args( expression );\n\n    before( MojoBinding binding, MavenProject project, String expression, ExpressionEvaluationException err ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && cflow( pm_checkRequiredParameters() )\n        && cflow( ppee_evaluate( expression ) )\n        && execution( ExpressionEvaluationException.new( String ) )\n        && this( err )\n    {\n        getReporter().reportUseOfBannedMojoParameter( currentParameter,\n                                                      binding,\n                                                      project,\n                                                      expression,\n                                                      (String) PluginParameterExpressionEvaluator.BANNED_EXPRESSIONS.get( expression ),\n                                                      err );\n    }\n\n    before( MojoBinding binding, MavenProject project, String expression, Exception cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && cflow( pm_checkRequiredParameters() )\n        && cflow( ppee_evaluate( expression ) )\n        && within( PluginParameterExpressionEvaluator )\n        && handler( Exception )\n        && args( cause )\n    {\n        getReporter().reportReflectionErrorWhileEvaluatingMojoParameter( currentParameter,\n                                                      binding,\n                                                      project,\n                                                      expression,\n                                                      cause );\n    }\n\n    after( MojoBinding binding, MavenProject project, PlexusConfiguration config ) throwing( PluginConfigurationException cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && execution( void DefaultPluginManager.populatePluginFields( *, *, PlexusConfiguration, .. ) )\n        && args( *, *, config, .. )\n    {\n        getReporter().reportErrorApplyingMojoConfiguration( binding, project, config, cause );\n    }\n\n    private pointcut pm_resolveTransitiveDependencies( MavenProject project, String scope ):\n        execution( void DefaultPluginManager.resolveTransitiveDependencies( *, *, String, *, MavenProject ) )\n        && args( *, *, scope, *, project );\n\n    after( MavenProject project, String scope ) throwing( ArtifactNotFoundException cause ):\n        pm_resolveTransitiveDependencies( project, scope )\n    {\n        getReporter().reportProjectDependenciesNotFound( project, scope, cause );\n    }\n\n    after( MavenProject project, String scope ) throwing( ArtifactResolutionException cause ):\n        pm_resolveTransitiveDependencies( project, scope )\n    {\n        getReporter().reportProjectDependenciesUnresolvable( project, scope, cause );\n    }\n\n    private pointcut within_pm_downloadDependencies( MavenProject project ):\n        withincode( void DefaultPluginManager.downloadDependencies( MavenProject, .. ) )\n        && args( project, .. );\n\n    private pointcut ar_resolve( Artifact artifact ):\n        call( * ArtifactResolver+.resolve( Artifact, ..) )\n        && args( artifact, .. );\n\n    after( MavenProject project, Artifact artifact ) throwing( ArtifactNotFoundException cause ):\n        within_pm_downloadDependencies( project )\n        && ar_resolve( artifact )\n    {\n        getReporter().reportProjectDependencyArtifactNotFound( project, artifact, cause );\n    }\n\n    after( MavenProject project, Artifact artifact ) throwing( ArtifactResolutionException cause ):\n        within_pm_downloadDependencies( project )\n        && ar_resolve( artifact )\n    {\n        getReporter().reportProjectDependencyArtifactUnresolvable( project, artifact, cause );\n    }\n\n    private pointcut le_getLifecycleBindings( List tasks, MavenProject configuringProject, String targetDescription ):\n        execution( List DefaultLifecycleExecutor.getLifecycleBindings( List, MavenProject, *, String ) )\n        && args( tasks, configuringProject, *, targetDescription );\n\n    before( List tasks, MavenProject configuringProject, String targetDescription, LifecycleException cause ):\n        cflow( le_getLifecycleBindings( tasks, configuringProject, targetDescription ) )\n        && call( LifecycleExecutionException.new( .., LifecycleException ) )\n        && args( .., cause )\n    {\n        getReporter().reportErrorFormulatingBuildPlan( tasks, configuringProject, targetDescription, cause );\n    }\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"a8dbf845de9efc946c2bdcebb82120519683f9f4","subject":"AbstractUserTransactionAspect now logs exceptions during rollback handling and rethrows the original one","message":"AbstractUserTransactionAspect now logs exceptions during rollback handling and rethrows the original one\n","repos":"palava\/palava-jta","old_file":"src\/main\/java\/de\/cosmocode\/palava\/jta\/AbstractUserTransactionAspect.aj","new_file":"src\/main\/java\/de\/cosmocode\/palava\/jta\/AbstractUserTransactionAspect.aj","new_contents":"\/**\n * palava - a java-php-bridge\n * Copyright (C) 2007-2010  CosmoCode GmbH\n *\n * This program is free software; you can redistribute it and\/or\n * modify it under the terms of the GNU General Public License\n * as published by the Free Software Foundation; either version 2\n * of the License, or (at your option) any later version.\n *\n * This program is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n * along with this program; if not, write to the Free Software\n * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n * MA  02110-1301, USA.\n *\/\n\npackage de.cosmocode.palava.jta;\n\nimport javax.transaction.NotSupportedException;\nimport javax.transaction.Status;\nimport javax.transaction.SystemException;\nimport javax.transaction.UserTransaction;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\n\npublic abstract aspect AbstractUserTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(AbstractUserTransactionAspect.class);\n\n    private Provider<UserTransaction> provider;\n    \n    @Inject\n    void setProvider(Provider<UserTransaction> provider) {\n        this.provider = Preconditions.checkNotNull(provider, \"Provider\");\n    }\n    \n    protected abstract pointcut transactional();\n    \n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        final UserTransaction tx = provider.get();\n        LOG.trace(\"Using transaction {}\", tx);\n        \n        final boolean local;\n        \n        try {\n            local = tx.getStatus() == Status.STATUS_NO_TRANSACTION;\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        if (local) {\n            LOG.trace(\"Beginning automatic transaction {}\", tx);\n            try {\n                tx.begin();\n            } catch (NotSupportedException e) {\n                throw new IllegalStateException(e);\n            } catch (SystemException e) {\n                throw new IllegalStateException(e);\n            }\n        } else {\n            LOG.trace(\"Transaction {} already active\", tx);\n        }\n\n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (Exception e) {\n            try {\n                if (local && \n                    (tx.getStatus() == Status.STATUS_ACTIVE || tx.getStatus() == Status.STATUS_MARKED_ROLLBACK)) {\n                    LOG.info(\"Rolling back local\/active transaction {}\", tx);\n                    tx.rollback();\n                } else if (tx.getStatus() != Status.STATUS_ROLLEDBACK || tx.getStatus() != Status.STATUS_ROLLING_BACK) {\n                    LOG.debug(\"Setting transaction {} as rollback only\", tx);\n                    tx.setRollbackOnly();\n                }\n            } catch (Exception inner) {\n                LOG.error(\"Rollback failed\", inner);\n            }\n            throw new IllegalStateException(e);\n        }\n        \n        final int status;\n        \n        try {\n            status = tx.getStatus();\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n        \n        if (local) {\n            if (status == Status.STATUS_MARKED_ROLLBACK) {\n                try {\n                    LOG.trace(\"Rolling back marked transaction {}\", tx);\n                    tx.rollback();\n                } catch (SystemException e) {\n                    throw new IllegalStateException(e);\n                }\n            } else {\n                try {\n                    tx.commit();\n                    LOG.trace(\"Committed automatic transaction {}\", tx);\n                } catch (Exception e) {\n                    try {\n                        LOG.info(\"Rolling back transaction {}\", tx);\n                        tx.rollback();\n                    } catch (Exception inner) {\n                        LOG.error(\"Rollback failed\", inner);\n                    }\n                    throw new IllegalStateException(e);\n                }\n            }\n        }\n        \n        return returnValue;\n    }\n    \n}\n","old_contents":"\/**\n * palava - a java-php-bridge\n * Copyright (C) 2007-2010  CosmoCode GmbH\n *\n * This program is free software; you can redistribute it and\/or\n * modify it under the terms of the GNU General Public License\n * as published by the Free Software Foundation; either version 2\n * of the License, or (at your option) any later version.\n *\n * This program is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n * along with this program; if not, write to the Free Software\n * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n * MA  02110-1301, USA.\n *\/\n\npackage de.cosmocode.palava.jta;\n\nimport javax.transaction.NotSupportedException;\nimport javax.transaction.Status;\nimport javax.transaction.SystemException;\nimport javax.transaction.UserTransaction;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\n\npublic abstract aspect AbstractUserTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(AbstractUserTransactionAspect.class);\n\n    private Provider<UserTransaction> provider;\n    \n    @Inject\n    void setProvider(Provider<UserTransaction> provider) {\n        this.provider = Preconditions.checkNotNull(provider, \"Provider\");\n    }\n    \n    protected abstract pointcut transactional();\n    \n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        final UserTransaction tx = provider.get();\n        LOG.trace(\"Using transaction {}\", tx);\n        \n        final boolean local;\n        \n        try {\n            local = tx.getStatus() == Status.STATUS_NO_TRANSACTION;\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        if (local) {\n            LOG.trace(\"Beginning automatic transaction {}\", tx);\n            try {\n                tx.begin();\n            } catch (NotSupportedException e) {\n                throw new IllegalStateException(e);\n            } catch (SystemException e) {\n                throw new IllegalStateException(e);\n            }\n        } else {\n            LOG.trace(\"Transaction {} already active\", tx);\n        }\n\n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (Exception e) {\n            LOG.error(\"Exception inside automatic transaction context\", e);\n            try {\n                if (local && \n                    (tx.getStatus() == Status.STATUS_ACTIVE || tx.getStatus() == Status.STATUS_MARKED_ROLLBACK)) {\n                    LOG.info(\"Rolling back local\/active transaction {}\", tx);\n                    tx.rollback();\n                } else if (tx.getStatus() != Status.STATUS_ROLLEDBACK || tx.getStatus() != Status.STATUS_ROLLING_BACK) {\n                    LOG.debug(\"Setting transaction {} as rollback only\", tx);\n                    tx.setRollbackOnly();\n                }\n            } catch (SystemException inner) {\n                throw new IllegalStateException(inner);\n            }\n            throw new IllegalStateException(e);\n        }\n        \n        final int status;\n        \n        try {\n            status = tx.getStatus();\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n        \n        if (local) {\n            if (status == Status.STATUS_MARKED_ROLLBACK) {\n                try {\n                    LOG.trace(\"Rolling back marked transaction {}\", tx);\n                    tx.rollback();\n                } catch (SystemException e) {\n                    throw new IllegalStateException(e);\n                }\n            } else {\n                try {\n                    tx.commit();\n                    LOG.trace(\"Committed automatic transaction {}\", tx);\n                } catch (Exception e) {\n                    LOG.error(\"Commit in automatic transaction context failed\", e);\n                    try {\n                        LOG.info(\"Rolling back transaction {}\", tx);\n                        tx.rollback();\n                    } catch (SystemException inner) {\n                        throw new IllegalStateException(inner);\n                    }\n                    throw new IllegalStateException(e);\n                }\n            }\n        }\n        \n        return returnValue;\n    }\n    \n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"561126c0612dcedaef4c80fa4645f5fe245c44e1","subject":"XWIKI-8559: Use SLF4J to log test messages and use the Logback binding * Fix log usage.","message":"XWIKI-8559: Use SLF4J to log test messages and use the Logback binding\n* Fix log usage.\n","repos":"pbondoer\/xwiki-platform,xwiki\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform","old_file":"xwiki-platform-core\/xwiki-platform-skin\/xwiki-platform-skin-skinx\/src\/main\/aspect\/compatibility\/com\/xpn\/xwiki\/plugin\/skinx\/SkinFileExtensionPluginApiCompatibilityAspect.aj","new_file":"xwiki-platform-core\/xwiki-platform-skin\/xwiki-platform-skin-skinx\/src\/main\/aspect\/compatibility\/com\/xpn\/xwiki\/plugin\/skinx\/SkinFileExtensionPluginApiCompatibilityAspect.aj","new_contents":"\/*\n * See the NOTICE file distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This is free software; you can redistribute it and\/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF site: http:\/\/www.fsf.org.\n *\/\npackage com.xpn.xwiki.plugin.skinx;\n\nimport java.text.MessageFormat;\nimport java.util.HashMap;\nimport java.util.Map;\n\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\n\/**\n * Add a backward compatibility layer to the {@link com.xpn.xwiki.plugin.skinx.SkinFileExtensionPluginApi} class.\n * \n * @version $Id$\n *\/\npublic aspect SkinFileExtensionPluginApiCompatibilityAspect\n{\n    \/**\n     * Compatibility mapping that associates a deprecated resource file to its new relative path\n     *\/\n    private static Map<String, String> compatibilityMap = new HashMap<String, String>();\n\n    static {\n        \/\/ fullScreen script has been moved and renamed in XWiki 2.6RC2 \/ 2.7M1 See XWIKI-5659\n        compatibilityMap.put(\"js\/xwiki\/editors\/fullScreenEdit.js\", \"uicomponents\/widgets\/fullScreen.js\");\n        compatibilityMap.put(\"js\/xwiki\/editors\/fullScreenEdit.css\", \"uicomponents\/widgets\/fullScreen.css\");\n        \/\/ suggest script has been moved and renamed in XWiki 3.1M3 See XWIKI-6043\n        compatibilityMap.put(\"js\/xwiki\/suggest\/ajaxSuggest.js\", \"uicomponents\/suggest\/suggest.js\");\n        compatibilityMap.put(\"js\/xwiki\/suggest\/ajaxSuggest.css\", \"uicomponents\/suggest\/suggest.css\");\n    }\n\n    \/**\n     * Pointcut that catches all skin file extensions \"use\" join points.\n     *\/\n    private pointcut sfxUse(String path) : execution(void SkinFileExtensionPluginApi.use(..)) && args(path, ..);\n\n    \/**\n     * Advice around skin file extensions \"use\" join points, that checks if the requested file is declared in the map of\n     * deprecated extensions paths. If it is, it logs a warning message in the console, and calls the skin extension\n     * plugin with the new path, declared in the map.\n     *\/\n    void around(String path): sfxUse(path)\n    {\n        if (compatibilityMap.containsKey(path)) {\n\n            Logger logger = LoggerFactory.getLogger(thisJoinPoint.getSignature().getDeclaringType());\n            logger.warn(\"Skin file extension with path [{}] is deprecated. Please use [{}] instead.\", path,\n                compatibilityMap.get(path));\n\n            proceed(compatibilityMap.get(path));\n        }\n\n        proceed(path);\n    }\n}\n","old_contents":"\/*\n * See the NOTICE file distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This is free software; you can redistribute it and\/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF site: http:\/\/www.fsf.org.\n *\/\npackage com.xpn.xwiki.plugin.skinx;\n\nimport java.text.MessageFormat;\nimport java.util.HashMap;\nimport java.util.Map;\n\nimport org.apache.log4j.Logger;\n\n\/**\n * Add a backward compatibility layer to the {@link com.xpn.xwiki.plugin.skinx.SkinFileExtensionPluginApi} class.\n * \n * @version $Id$\n *\/\npublic aspect SkinFileExtensionPluginApiCompatibilityAspect\n{\n    \/**\n     * Compatibility mapping that associates a deprecated resource file to its new relative path\n     *\/\n    private static Map<String, String> compatibilityMap = new HashMap<String, String>();\n\n    static {\n        \/\/ fullScreen script has been moved and renamed in XWiki 2.6RC2 \/ 2.7M1 See XWIKI-5659\n        compatibilityMap.put(\"js\/xwiki\/editors\/fullScreenEdit.js\", \"uicomponents\/widgets\/fullScreen.js\");\n        compatibilityMap.put(\"js\/xwiki\/editors\/fullScreenEdit.css\", \"uicomponents\/widgets\/fullScreen.css\");\n        \/\/ suggest script has been moved and renamed in XWiki 3.1M3 See XWIKI-6043\n        compatibilityMap.put(\"js\/xwiki\/suggest\/ajaxSuggest.js\", \"uicomponents\/suggest\/suggest.js\");\n        compatibilityMap.put(\"js\/xwiki\/suggest\/ajaxSuggest.css\", \"uicomponents\/suggest\/suggest.css\");\n    }\n\n    \/**\n     * Pointcut that catches all skin file extensions \"use\" join points.\n     *\/\n    private pointcut sfxUse(String path) : execution(void SkinFileExtensionPluginApi.use(..)) && args(path, ..);\n\n    \/**\n     * Advice around skin file extensions \"use\" join points, that checks if the requested file is declared in the map of\n     * deprecated extensions paths. If it is, it logs a warning message in the console, and calls the skin extension\n     * plugin with the new path, declared in the map.\n     *\/\n    void around(String path): sfxUse(path)\n    {\n        if (compatibilityMap.containsKey(path)) {\n\n            Logger logger = Logger.getLogger(thisJoinPoint.getSignature().getDeclaringType());\n            logger.warn(MessageFormat.format(\n                \"Skin file extension with path [{0}] is deprecated. Please use [{1}] instead.\", new Object[] {path,\n                    compatibilityMap.get(path)}));\n\n            proceed(compatibilityMap.get(path));\n        }\n\n        proceed(path);\n    }\n}\n","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"e458d85616e44400ab14319d585f85525bfd609b","subject":"Disable the pluginRepository deprecation message until the first release of 2.1 is imminent, to avoid confusion when using IDEs that use 2.1 snapshots (where the CLI still uses 2.0.x).","message":"Disable the pluginRepository deprecation message until the first release of 2.1 is imminent, to avoid confusion when using IDEs that use 2.1 snapshots (where the CLI still uses 2.0.x).\n\ngit-svn-id: 2c527eb49caa05e19d6b2be874bf74fa9d7ea670@659236 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"xasx\/maven,cstamas\/maven,stephenc\/maven,kidaa\/maven-1,ChristianSchulte\/maven,rogerchina\/maven,lbndev\/maven,ChristianSchulte\/maven,dsyer\/maven,mcculls\/maven,vedmishr\/demo1,aheritier\/maven,changbai1980\/maven,wangyuesong\/maven,gorcz\/maven,rogerchina\/maven,xasx\/maven,likaiwalkman\/maven,likaiwalkman\/maven,mizdebsk\/maven,Distrotech\/maven,cstamas\/maven,njuneau\/maven,vedmishr\/demo1,apache\/maven,Mounika-Chirukuri\/maven,barthel\/maven,josephw\/maven,njuneau\/maven,xasx\/maven,skitt\/maven,aheritier\/maven,barthel\/maven,josephw\/maven,lbndev\/maven,olamy\/maven,josephw\/maven,Distrotech\/maven,trajano\/maven,stephenc\/maven,atanasenko\/maven,mizdebsk\/maven,apache\/maven,karthikjaps\/maven,barthel\/maven,stephenc\/maven,pkozelka\/maven,trajano\/maven,wangyuesong0\/maven,runepeter\/maven-deploy-plugin-2.8.1,atanasenko\/maven,wangyuesong\/maven,keith-turner\/maven,kidaa\/maven-1,Tibor17\/maven,aheritier\/maven,dsyer\/maven,lbndev\/maven,rogerchina\/maven,Mounika-Chirukuri\/maven,keith-turner\/maven,ChristianSchulte\/maven,mcculls\/maven,keith-turner\/maven,karthikjaps\/maven,changbai1980\/maven,trajano\/maven,skitt\/maven,wangyuesong0\/maven,runepeter\/maven-deploy-plugin-2.8.1,mizdebsk\/maven,olamy\/maven,njuneau\/maven,pkozelka\/maven,changbai1980\/maven,Tibor17\/maven,gorcz\/maven,skitt\/maven,wangyuesong\/maven,wangyuesong0\/maven,mcculls\/maven,karthikjaps\/maven,vedmishr\/demo1,dsyer\/maven,pkozelka\/maven,olamy\/maven,atanasenko\/maven,kidaa\/maven-1,gorcz\/maven,Mounika-Chirukuri\/maven,apache\/maven,cstamas\/maven,likaiwalkman\/maven","old_file":"maven-project\/src\/main\/aspect\/org\/apache\/maven\/project\/aspect\/compat\/Maven20xProjectCompatAspect.aj","new_file":"maven-project\/src\/main\/aspect\/org\/apache\/maven\/project\/aspect\/compat\/Maven20xProjectCompatAspect.aj","new_contents":"package org.apache.maven.project.aspect.compat;\n\nimport org.apache.maven.model.Model;\nimport org.apache.maven.project.build.model.ModelLineage;\nimport org.apache.maven.project.build.model.ModelLineageIterator;\nimport org.apache.maven.project.build.model.ModelLineageBuilder;\nimport org.apache.maven.project.DefaultMavenProjectBuilder;\nimport org.apache.maven.project.artifact.MavenMetadataSource;\nimport org.apache.maven.profiles.build.DefaultProfileAdvisor;\nimport org.apache.maven.model.Profile;\nimport org.apache.maven.profiles.ProfileManager;\n\nimport java.util.Iterator;\nimport java.util.List;\nimport java.util.HashSet;\nimport java.util.Set;\nimport java.util.Map;\n\npublic privileged aspect Maven20xProjectCompatAspect\n{\n\n    \/\/ FIXME: Re-enable this when we're closer to a 2.1 release.\n\/\/    private pointcut reactorProjectBuilds():\n\/\/        cflow( execution( * DefaultMavenProjectBuilder.buildFromSourceFileInternal( .. ) ) )\n\/\/        && !cflow( execution( * MavenMetadataSource.*( .. ) ) );\n\/\/\n\/\/    private pointcut lineageBuildResumed( DefaultMavenProjectBuilder projectBuilder, ModelLineage lineage ):\n\/\/        call( * ModelLineageBuilder.resumeBuildingModelLineage( ModelLineage, .. ) )\n\/\/        && this( projectBuilder )\n\/\/        && args( lineage, .. );\n\/\/\n\/\/    after( DefaultMavenProjectBuilder projectBuilder, ModelLineage lineage ):\n\/\/        reactorProjectBuilds()\n\/\/        && lineageBuildResumed( projectBuilder, lineage )\n\/\/    {\n\/\/        for ( ModelLineageIterator it = lineage.lineageIterator(); it.hasNext(); )\n\/\/        {\n\/\/            Model model = (Model) it.next();\n\/\/            List pluginRepos = model.getPluginRepositories();\n\/\/\n\/\/            if ( pluginRepos != null && !pluginRepos.isEmpty() )\n\/\/            {\n\/\/                StringBuffer message = new StringBuffer();\n\/\/                message.append( \"The <pluginRepositories\/> section of the POM has been deprecated. Please update your POM (\" );\n\/\/                message.append( model.getId() );\n\/\/                message.append( \").\" );\n\/\/\n\/\/                projectBuilder.logger.warn( message.toString() );\n\/\/            }\n\/\/        }\n\/\/    }\n\/\/\n\/\/    private pointcut externalProfilesApplied( DefaultProfileAdvisor advisor, ProfileManager profileManager ):\n\/\/        execution( * DefaultProfileAdvisor.applyActivatedExternalProfiles( .., ProfileManager+ ) )\n\/\/        && this( advisor )\n\/\/        && args( .., profileManager );\n\/\/\n\/\/\n\/\/    private boolean settingsProfilesChecked = false;\n\/\/\n\/\/    before( DefaultProfileAdvisor advisor, ProfileManager profileManager ):\n\/\/        reactorProjectBuilds()\n\/\/        && externalProfilesApplied( advisor, profileManager )\n\/\/    {\n\/\/        if ( profileManager == null )\n\/\/        {\n\/\/            return;\n\/\/        }\n\/\/\n\/\/        Map profilesById = profileManager.getProfilesById();\n\/\/        Set invalidProfiles = new HashSet();\n\/\/\n\/\/        boolean settingsProfilesEncountered = false;\n\/\/        for ( Iterator it = profilesById.values().iterator(); it.hasNext(); )\n\/\/        {\n\/\/            Profile profile = (Profile) it.next();\n\/\/\n\/\/            if ( \"settings.xml\".equals( profile.getSource() ) )\n\/\/            {\n\/\/                settingsProfilesEncountered = true;\n\/\/\n\/\/                if ( settingsProfilesChecked )\n\/\/                {\n\/\/                    continue;\n\/\/                }\n\/\/            }\n\/\/\n\/\/            List pluginRepos = profile.getPluginRepositories();\n\/\/            if ( pluginRepos != null && !pluginRepos.isEmpty() )\n\/\/            {\n\/\/                invalidProfiles.add( profile );\n\/\/            }\n\/\/        }\n\/\/\n\/\/        if ( !invalidProfiles.isEmpty() )\n\/\/        {\n\/\/            StringBuffer message = new StringBuffer();\n\/\/            message.append( \"The <pluginRepositories\/> section of the POM has been deprecated. Please update the following profiles:\\n\" );\n\/\/\n\/\/            for ( Iterator it = invalidProfiles.iterator(); it.hasNext(); )\n\/\/            {\n\/\/                Profile profile = (Profile) it.next();\n\/\/                message.append( \"\\n- \" ).append( profile.getId() ).append( \" (source: \" ).append( profile.getSource() ).append( \")\" );\n\/\/            }\n\/\/\n\/\/            message.append( \"\\n\" );\n\/\/\n\/\/            advisor.logger.warn( message.toString() );\n\/\/        }\n\/\/\n\/\/        settingsProfilesChecked = settingsProfilesChecked || settingsProfilesEncountered;\n\/\/    }\n\n}\n","old_contents":"package org.apache.maven.project.aspect.compat;\n\nimport org.apache.maven.model.Model;\nimport org.apache.maven.project.build.model.ModelLineage;\nimport org.apache.maven.project.build.model.ModelLineageIterator;\nimport org.apache.maven.project.build.model.ModelLineageBuilder;\nimport org.apache.maven.project.DefaultMavenProjectBuilder;\nimport org.apache.maven.project.artifact.MavenMetadataSource;\nimport org.apache.maven.profiles.build.DefaultProfileAdvisor;\nimport org.apache.maven.model.Profile;\nimport org.apache.maven.profiles.ProfileManager;\n\nimport java.util.Iterator;\nimport java.util.List;\nimport java.util.HashSet;\nimport java.util.Set;\nimport java.util.Map;\n\npublic privileged aspect Maven20xProjectCompatAspect\n{\n\n    private pointcut reactorProjectBuilds():\n        cflow( execution( * DefaultMavenProjectBuilder.buildFromSourceFileInternal( .. ) ) )\n        && !cflow( execution( * MavenMetadataSource.*( .. ) ) );\n\n    private pointcut lineageBuildResumed( DefaultMavenProjectBuilder projectBuilder, ModelLineage lineage ):\n        call( * ModelLineageBuilder.resumeBuildingModelLineage( ModelLineage, .. ) )\n        && this( projectBuilder )\n        && args( lineage, .. );\n\n    after( DefaultMavenProjectBuilder projectBuilder, ModelLineage lineage ):\n        reactorProjectBuilds()\n        && lineageBuildResumed( projectBuilder, lineage )\n    {\n        for ( ModelLineageIterator it = lineage.lineageIterator(); it.hasNext(); )\n        {\n            Model model = (Model) it.next();\n            List pluginRepos = model.getPluginRepositories();\n\n            if ( pluginRepos != null && !pluginRepos.isEmpty() )\n            {\n                StringBuffer message = new StringBuffer();\n                message.append( \"The <pluginRepositories\/> section of the POM has been deprecated. Please update your POM (\" );\n                message.append( model.getId() );\n                message.append( \").\" );\n\n                projectBuilder.logger.warn( message.toString() );\n            }\n        }\n    }\n\n    private pointcut externalProfilesApplied( DefaultProfileAdvisor advisor, ProfileManager profileManager ):\n        execution( * DefaultProfileAdvisor.applyActivatedExternalProfiles( .., ProfileManager+ ) )\n        && this( advisor )\n        && args( .., profileManager );\n\n\n    private boolean settingsProfilesChecked = false;\n\n    before( DefaultProfileAdvisor advisor, ProfileManager profileManager ):\n        reactorProjectBuilds()\n        && externalProfilesApplied( advisor, profileManager )\n    {\n        if ( profileManager == null )\n        {\n            return;\n        }\n\n        Map profilesById = profileManager.getProfilesById();\n        Set invalidProfiles = new HashSet();\n\n        boolean settingsProfilesEncountered = false;\n        for ( Iterator it = profilesById.values().iterator(); it.hasNext(); )\n        {\n            Profile profile = (Profile) it.next();\n\n            if ( \"settings.xml\".equals( profile.getSource() ) )\n            {\n                settingsProfilesEncountered = true;\n\n                if ( settingsProfilesChecked )\n                {\n                    continue;\n                }\n            }\n\n            List pluginRepos = profile.getPluginRepositories();\n            if ( pluginRepos != null && !pluginRepos.isEmpty() )\n            {\n                invalidProfiles.add( profile );\n            }\n        }\n\n        if ( !invalidProfiles.isEmpty() )\n        {\n            StringBuffer message = new StringBuffer();\n            message.append( \"The <pluginRepositories\/> section of the POM has been deprecated. Please update the following profiles:\\n\" );\n\n            for ( Iterator it = invalidProfiles.iterator(); it.hasNext(); )\n            {\n                Profile profile = (Profile) it.next();\n                message.append( \"\\n- \" ).append( profile.getId() ).append( \" (source: \" ).append( profile.getSource() ).append( \")\" );\n            }\n\n            message.append( \"\\n\" );\n\n            advisor.logger.warn( message.toString() );\n        }\n\n        settingsProfilesChecked = settingsProfilesChecked || settingsProfilesEncountered;\n    }\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"a16480aee8644d4af65572ec68258d1fcc34b8c4","subject":"Fixed #2621.","message":"Fixed #2621.\n\ngit-svn-id: f4ecfe233223879a4a16cd7937f11b5152963d8e@19648 5e8d7ff9-d8ef-0310-90f0-a4852d11357a\n","repos":"dragos\/scala-ide,aleksi-lukkarinen\/scala-ide,wpopielarski\/scala-ide,dragos\/scala-ide,stephenh\/scala-ide,wpopielarski\/scala-ide,scala-ide\/scala-ide,stephenh\/scala-ide,sschaef\/scala-ide,stephenh\/scala-ide,pilipolio\/scala-ide,Kwestor\/scala-ide,andrey-ilinykh\/scala-ide,Duhemm\/scala-ide,pilipolio\/scala-ide,sschaef\/scala-ide,scala-ide\/scala-ide,mlangc\/scala-ide,romanowski\/scala-ide,andrey-ilinykh\/scala-ide,Duhemm\/scala-ide,Duhemm\/scala-ide,wpopielarski\/scala-ide,aleksi-lukkarinen\/scala-ide,pilipolio\/scala-ide,Duhemm\/scala-ide,scala-ide\/scala-ide,Kwestor\/scala-ide,romanowski\/scala-ide,andrey-ilinykh\/scala-ide,stephenh\/scala-ide,mlangc\/scala-ide,scala-ide\/scala-ide,romanowski\/scala-ide,Kwestor\/scala-ide,romanowski\/scala-ide,Kwestor\/scala-ide,mlangc\/scala-ide,dragos\/scala-ide,sschaef\/scala-ide,aleksi-lukkarinen\/scala-ide,dragos\/scala-ide,pilipolio\/scala-ide,andrey-ilinykh\/scala-ide,aleksi-lukkarinen\/scala-ide,mlangc\/scala-ide,wpopielarski\/scala-ide,sschaef\/scala-ide","old_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/core\/DOMAspect.aj","new_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/core\/DOMAspect.aj","new_contents":"\/*\n * Copyright 2005-2009 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.core;\n\nimport java.util.Locale;\nimport java.util.Map;\n\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.core.ICompilationUnit;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.core.compiler.CharOperation;\nimport org.eclipse.jdt.core.dom.AST;\nimport org.eclipse.jdt.core.dom.ASTNode;\nimport org.eclipse.jdt.core.dom.ASTParser;\nimport org.eclipse.jdt.internal.compiler.CompilationResult;\nimport org.eclipse.jdt.internal.compiler.DefaultErrorHandlingPolicies;\nimport org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.AbstractVariableDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.AnnotationMethodDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.Argument;\nimport org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.ConstructorDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.Expression;\nimport org.eclipse.jdt.internal.compiler.ast.MethodDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.QualifiedAllocationExpression;\nimport org.eclipse.jdt.internal.compiler.ast.Statement;\nimport org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.TypeParameter;\nimport org.eclipse.jdt.internal.compiler.ast.TypeReference;\nimport org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;\nimport org.eclipse.jdt.internal.compiler.env.AccessRestriction;\nimport org.eclipse.jdt.internal.compiler.env.IBinaryType;\nimport org.eclipse.jdt.internal.compiler.env.INameEnvironment;\nimport org.eclipse.jdt.internal.compiler.env.ISourceType;\nimport org.eclipse.jdt.internal.compiler.impl.CompilerOptions;\nimport org.eclipse.jdt.internal.compiler.impl.ITypeRequestor;\nimport org.eclipse.jdt.internal.compiler.lookup.LookupEnvironment;\nimport org.eclipse.jdt.internal.compiler.lookup.PackageBinding;\nimport org.eclipse.jdt.internal.compiler.parser.SourceTypeConverter;\nimport org.eclipse.jdt.internal.compiler.problem.DefaultProblemFactory;\nimport org.eclipse.jdt.internal.compiler.problem.ProblemReporter;\nimport org.eclipse.jdt.internal.core.DefaultWorkingCopyOwner;\nimport org.eclipse.jdt.internal.core.JavaProject;\nimport org.eclipse.jdt.internal.core.SourceAnnotationMethodInfo;\nimport org.eclipse.jdt.internal.core.SourceMethod;\nimport org.eclipse.jdt.internal.core.SourceMethodElementInfo;\nimport org.eclipse.jdt.internal.core.SourceType;\nimport org.eclipse.jdt.internal.core.SourceTypeElementInfo;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaCompilationUnit;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect DOMAspect {\n  pointcut internalCreateAST(ASTParser parser, IProgressMonitor monitor) :\n    execution(ASTNode ASTParser.internalCreateAST(IProgressMonitor)) &&\n    args(monitor) &&\n    target(parser);\n  \n  pointcut convert(SourceTypeConverter stc, SourceMethod methodHandle, SourceMethodElementInfo methodInfo, CompilationResult compilationResult) :\n    execution(AbstractMethodDeclaration SourceTypeConverter.convert(SourceMethod, SourceMethodElementInfo, CompilationResult)) &&\n    args(methodHandle, methodInfo, compilationResult) &&\n    target(stc);\n  \n  ASTNode around(ASTParser parser, IProgressMonitor monitor) :\n    internalCreateAST(parser, monitor) {\n    try {\n      if (!(parser.typeRoot instanceof IScalaCompilationUnit))\n        return proceed(parser, monitor);\n      \n      ICompilationUnit cu = (ICompilationUnit)parser.typeRoot;\n      org.eclipse.jdt.internal.compiler.env.ICompilationUnit sourceUnit = (org.eclipse.jdt.internal.compiler.env.ICompilationUnit)cu;\n      \n      IType[] topLevelTypes = cu.getTypes();\n      int length = topLevelTypes.length;\n      if (length == 0)\n        throw new IllegalStateException();\n      \n      SourceTypeElementInfo[] topLevelInfos = new SourceTypeElementInfo[length];\n      for (int i = 0; i < length; i++) {\n        topLevelInfos[i] = (SourceTypeElementInfo) ((SourceType)topLevelTypes[i]).getElementInfo();\n      }\n      char[] fileName = ((ISourceType)topLevelInfos[0]).getFileName();\n      \n      CompilationResult result = new CompilationResult(fileName, 1, 1, 100);\n\n      JavaProject javaProject = (JavaProject)cu.getJavaProject(); \n      Map compilerOptions0 = javaProject.getOptions(true);\n      CompilerOptions compilerOptions = new CompilerOptions(compilerOptions0);\n      compilerOptions.storeAnnotations = true;\n      \n      ProblemReporter problemReporter =\n        new ProblemReporter(\n          DefaultErrorHandlingPolicies.proceedWithAllProblems(),\n          compilerOptions,\n          new DefaultProblemFactory(Locale.getDefault()));\n      \n      int flags = SourceTypeConverter.FIELD_AND_METHOD | SourceTypeConverter.MEMBER_TYPE;\n      \n      CompilationUnitDeclaration unit =\n        SourceTypeConverter.buildCompilationUnit(topLevelInfos, flags, problemReporter, result);\n      \n      INameEnvironment ne = javaProject.newSearchableNameEnvironment(DefaultWorkingCopyOwner.PRIMARY);\n      final LookupEnvironment le = new LookupEnvironment(null, compilerOptions, problemReporter, ne);\n      ITypeRequestor typeRequestor = new ITypeRequestor() {\n        public void accept(IBinaryType binaryType, PackageBinding packageBinding, AccessRestriction accessRestriction) {\n          le.createBinaryTypeFrom(binaryType, packageBinding, accessRestriction);\n        }\n        public void accept(org.eclipse.jdt.internal.compiler.env.ICompilationUnit unit, AccessRestriction accessRestriction) {}\n        public void accept(ISourceType[] sourceType, PackageBinding packageBinding, AccessRestriction accessRestriction) {}\n      };\n      le.typeRequestor = typeRequestor;\n      \n      le.buildTypeBindings(unit, null);\n      le.completeTypeBindings();\n      fixTypes(unit.types);\n      \n      AST ast = AST.newAST(AST.JLS3);\n      ast.setFlag(AST.RESOLVED_BINDINGS);\n      ast.setDefaultNodeFlag(ASTNode.ORIGINAL);\n\n      org.eclipse.jdt.core.dom.ASTConverter converter =\n        new org.eclipse.jdt.core.dom.ASTConverter(compilerOptions0, true, monitor);\n      \n      org.eclipse.jdt.core.dom.BindingResolver resolver =\n        new org.eclipse.jdt.core.dom.DefaultBindingResolver(\n          unit.scope,\n          DefaultWorkingCopyOwner.PRIMARY,\n          new org.eclipse.jdt.core.dom.DefaultBindingResolver.BindingTables(),\n          true);\n      ast.setBindingResolver(resolver);\n      converter.setAST(ast);\n      \n      ASTNode node = converter.convert(unit, sourceUnit.getContents());\n      return node;\n    } catch (JavaModelException ex) {\n      throw new IllegalArgumentException(ex);\n    }\n  }\n  \n  private void fixTypes(TypeDeclaration[] types) {\n    for(int i = 0, iLimit = types.length; i < iLimit ; ++i) {\n      TypeDeclaration tpe = types[i];\n      tpe.binding.getAnnotationTagBits();\n      tpe.scope.buildFields();\n      tpe.scope.buildMethods();\n      fixFields(tpe.fields);\n      fixMethods(tpe.methods);\n      fixTypes(tpe.memberTypes);\n    }\n  }\n  \n  private void fixMethods(AbstractMethodDeclaration[] methods) {\n    if (methods == null)\n      return;\n    \n    for(int i = 0, iLimit = methods.length; i < iLimit; ++i) {\n      AbstractMethodDeclaration m = methods[i];\n      m.bodyStart = m.declarationSourceStart;\n      m.bodyEnd = m.declarationSourceEnd;\n      m.binding.getAnnotationTagBits();\n    }\n  }\n  \n  private void fixFields(AbstractVariableDeclaration[] fields) {\n    if (fields == null)\n      return;\n    \n    for(int i = 0, iLimit = fields.length; i < iLimit; ++i) {\n      AbstractVariableDeclaration f = fields[i];\n      f.declarationEnd = f.declarationSourceEnd;\n    }\n  }\n\n  AbstractMethodDeclaration around(SourceTypeConverter stc, SourceMethod methodHandle, SourceMethodElementInfo methodInfo, CompilationResult compilationResult) throws JavaModelException :\n    convert(stc, methodHandle, methodInfo, compilationResult) {\n    AbstractMethodDeclaration method;\n\n    \/* only source positions available *\/\n    int start = methodInfo.getNameSourceStart();\n    int end = methodInfo.getNameSourceEnd();\n\n    \/\/ convert 1.5 specific constructs only if compliance is 1.5 or above\n    TypeParameter[] typeParams = null;\n    if (stc.has1_5Compliance) {\n      \/* convert type parameters *\/\n      char[][] typeParameterNames = methodInfo.getTypeParameterNames();\n      if (typeParameterNames != null) {\n        int parameterCount = typeParameterNames.length;\n        if (parameterCount > 0) { \/\/ method's type parameters must be null if no type parameter\n          char[][][] typeParameterBounds = methodInfo.getTypeParameterBounds();\n          typeParams = new TypeParameter[parameterCount];\n          for (int i = 0; i < parameterCount; i++) {\n            typeParams[i] = stc.createTypeParameter(typeParameterNames[i], typeParameterBounds[i], start, end);\n          }\n        }\n      }\n    }\n\n    int modifiers = methodInfo.getModifiers();\n    if (methodInfo.isConstructor()) {\n      ConstructorDeclaration decl = new ConstructorDeclaration(compilationResult);\n      decl.bits &= ~org.eclipse.jdt.internal.compiler.ast.ASTNode.IsDefaultConstructor;\n      method = decl;\n      decl.typeParameters = typeParams;\n    } else {\n      MethodDeclaration decl;\n      if (methodInfo.isAnnotationMethod()) {\n        AnnotationMethodDeclaration annotationMethodDeclaration = new AnnotationMethodDeclaration(compilationResult);\n\n        \/* conversion of default value *\/\n        SourceAnnotationMethodInfo annotationMethodInfo = (SourceAnnotationMethodInfo) methodInfo;\n        boolean hasDefaultValue = annotationMethodInfo.defaultValueStart != -1 || annotationMethodInfo.defaultValueEnd != -1;\n        if ((stc.flags & SourceTypeConverter.FIELD_INITIALIZATION) != 0) {\n          if (hasDefaultValue) {\n            char[] defaultValueSource = CharOperation.subarray(stc.getSource(), annotationMethodInfo.defaultValueStart, annotationMethodInfo.defaultValueEnd+1);\n            if (defaultValueSource != null) {\n                Expression expression =  stc.parseMemberValue(defaultValueSource);\n                if (expression != null) {\n                  annotationMethodDeclaration.defaultValue = expression;\n                }\n            } else {\n              \/\/ could not retrieve the default value\n              hasDefaultValue = false;\n            }\n          }\n        }\n        if (hasDefaultValue)\n          modifiers |= ClassFileConstants.AccAnnotationDefault;\n        decl = annotationMethodDeclaration;\n      } else {\n        decl = new MethodDeclaration(compilationResult);\n      }\n\n      \/\/ convert return type\n      decl.returnType = stc.createTypeReference(methodInfo.getReturnTypeName(), start, end);\n\n      \/\/ type parameters\n      decl.typeParameters = typeParams;\n\n      method = decl;\n    }\n    method.selector = methodHandle.getElementName().toCharArray();\n    boolean isVarargs = (modifiers & ClassFileConstants.AccVarargs) != 0;\n    method.modifiers = modifiers & ~ClassFileConstants.AccVarargs;\n    method.sourceStart = start;\n    method.sourceEnd = end;\n    method.declarationSourceStart = methodInfo.getDeclarationSourceStart();\n    method.declarationSourceEnd = methodInfo.getDeclarationSourceEnd();\n\n    \/\/ convert 1.5 specific constructs only if compliance is 1.5 or above\n    if (stc.has1_5Compliance) {\n      \/* convert annotations *\/\n      method.annotations = stc.convertAnnotations(methodHandle);\n    }\n\n    \/* convert arguments *\/\n    String[] argumentTypeSignatures = methodHandle.getParameterTypes();\n    char[][] argumentNames = methodInfo.getArgumentNames();\n    int argumentCount = argumentTypeSignatures == null ? 0 : argumentTypeSignatures.length;\n    if (argumentCount > 0) {\n      long position = ((long) start << 32) + end;\n      method.arguments = new Argument[argumentCount];\n      for (int i = 0; i < argumentCount; i++) {\n        TypeReference typeReference = stc.createTypeReference(argumentTypeSignatures[i], start, end);\n        if (isVarargs && i == argumentCount-1) {\n          typeReference.bits |= org.eclipse.jdt.internal.compiler.ast.ASTNode.IsVarArgs;\n        }\n        method.arguments[i] =\n          new Argument(\n            argumentNames[i],\n            position,\n            typeReference,\n            ClassFileConstants.AccDefault);\n        \/\/ do not care whether was final or not\n      }\n    }\n\n    \/* convert thrown exceptions *\/\n    char[][] exceptionTypeNames = methodInfo.getExceptionTypeNames();\n    int exceptionCount = exceptionTypeNames == null ? 0 : exceptionTypeNames.length;\n    if (exceptionCount > 0) {\n      method.thrownExceptions = new TypeReference[exceptionCount];\n      for (int i = 0; i < exceptionCount; i++) {\n        method.thrownExceptions[i] =\n          stc.createTypeReference(exceptionTypeNames[i], start, end);\n      }\n    }\n\n    \/* convert local and anonymous types *\/\n    if ((stc.flags & SourceTypeConverter.LOCAL_TYPE) != 0) {\n      IJavaElement[] children = methodInfo.getChildren();\n      int typesLength = 0;\n      int childrenLength = children.length;\n      for (int i = 0; i < childrenLength; ++i)\n        if (children[i] instanceof SourceType)\n          ++typesLength;\n      \n      if (typesLength != 0) {\n        Statement[] statements = new Statement[typesLength];\n        int typeIndex = 0;\n        for (int i = 0; i < childrenLength; i++) {\n          if (children[i] instanceof SourceType) {\n            SourceType type = (SourceType) children[i];\n            TypeDeclaration localType = stc.convert(type, compilationResult);\n            if ((localType.bits & org.eclipse.jdt.internal.compiler.ast.ASTNode.IsAnonymousType) != 0) {\n              QualifiedAllocationExpression expression = new QualifiedAllocationExpression(localType);\n              expression.type = localType.superclass;\n              localType.superclass = null;\n              localType.superInterfaces = null;\n              localType.allocation = expression;\n              statements[typeIndex] = expression;\n            } else {\n              statements[typeIndex] = localType;\n            }\n            ++typeIndex;\n          }\n        }\n        method.statements = statements;\n      }\n    }\n\n    return method;\n  }\n}\n","old_contents":"\/*\n * Copyright 2005-2009 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.core;\n\nimport java.util.Locale;\nimport java.util.Map;\n\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.core.ICompilationUnit;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.core.dom.AST;\nimport org.eclipse.jdt.core.dom.ASTNode;\nimport org.eclipse.jdt.core.dom.ASTParser;\nimport org.eclipse.jdt.internal.compiler.CompilationResult;\nimport org.eclipse.jdt.internal.compiler.DefaultErrorHandlingPolicies;\nimport org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.AbstractVariableDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;\nimport org.eclipse.jdt.internal.compiler.env.AccessRestriction;\nimport org.eclipse.jdt.internal.compiler.env.IBinaryType;\nimport org.eclipse.jdt.internal.compiler.env.INameEnvironment;\nimport org.eclipse.jdt.internal.compiler.env.ISourceType;\nimport org.eclipse.jdt.internal.compiler.impl.CompilerOptions;\nimport org.eclipse.jdt.internal.compiler.impl.ITypeRequestor;\nimport org.eclipse.jdt.internal.compiler.lookup.LookupEnvironment;\nimport org.eclipse.jdt.internal.compiler.lookup.PackageBinding;\nimport org.eclipse.jdt.internal.compiler.parser.SourceTypeConverter;\nimport org.eclipse.jdt.internal.compiler.problem.DefaultProblemFactory;\nimport org.eclipse.jdt.internal.compiler.problem.ProblemReporter;\nimport org.eclipse.jdt.internal.core.DefaultWorkingCopyOwner;\nimport org.eclipse.jdt.internal.core.JavaProject;\nimport org.eclipse.jdt.internal.core.SourceType;\nimport org.eclipse.jdt.internal.core.SourceTypeElementInfo;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaCompilationUnit;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect DOMAspect {\n  pointcut internalCreateAST(ASTParser parser, IProgressMonitor monitor) :\n    execution(ASTNode ASTParser.internalCreateAST(IProgressMonitor)) &&\n    args(monitor) &&\n    target(parser);\n  \n  ASTNode around(ASTParser parser, IProgressMonitor monitor) :\n    internalCreateAST(parser, monitor) {\n    try {\n      if (!(parser.typeRoot instanceof IScalaCompilationUnit))\n        return proceed(parser, monitor);\n      \n      ICompilationUnit cu = (ICompilationUnit)parser.typeRoot;\n      org.eclipse.jdt.internal.compiler.env.ICompilationUnit sourceUnit = (org.eclipse.jdt.internal.compiler.env.ICompilationUnit)cu;\n      \n      IType[] topLevelTypes = cu.getTypes();\n      int length = topLevelTypes.length;\n      if (length == 0)\n        throw new IllegalStateException();\n      \n      SourceTypeElementInfo[] topLevelInfos = new SourceTypeElementInfo[length];\n      for (int i = 0; i < length; i++) {\n        topLevelInfos[i] = (SourceTypeElementInfo) ((SourceType)topLevelTypes[i]).getElementInfo();\n      }\n      char[] fileName = ((ISourceType)topLevelInfos[0]).getFileName();\n      \n      CompilationResult result = new CompilationResult(fileName, 1, 1, 100);\n\n      JavaProject javaProject = (JavaProject)cu.getJavaProject(); \n      Map compilerOptions0 = javaProject.getOptions(true);\n      CompilerOptions compilerOptions = new CompilerOptions(compilerOptions0);\n      compilerOptions.storeAnnotations = true;\n      \n      ProblemReporter problemReporter =\n        new ProblemReporter(\n          DefaultErrorHandlingPolicies.proceedWithAllProblems(),\n          compilerOptions,\n          new DefaultProblemFactory(Locale.getDefault()));\n      \n      int flags = SourceTypeConverter.FIELD_AND_METHOD | SourceTypeConverter.MEMBER_TYPE;\n      \n      CompilationUnitDeclaration unit =\n        SourceTypeConverter.buildCompilationUnit(topLevelInfos, flags, problemReporter, result);\n      \n      INameEnvironment ne = javaProject.newSearchableNameEnvironment(DefaultWorkingCopyOwner.PRIMARY);\n      final LookupEnvironment le = new LookupEnvironment(null, compilerOptions, problemReporter, ne);\n      ITypeRequestor typeRequestor = new ITypeRequestor() {\n        public void accept(IBinaryType binaryType, PackageBinding packageBinding, AccessRestriction accessRestriction) {\n          le.createBinaryTypeFrom(binaryType, packageBinding, accessRestriction);\n        }\n        public void accept(org.eclipse.jdt.internal.compiler.env.ICompilationUnit unit, AccessRestriction accessRestriction) {}\n        public void accept(ISourceType[] sourceType, PackageBinding packageBinding, AccessRestriction accessRestriction) {}\n      };\n      le.typeRequestor = typeRequestor;\n      \n      le.buildTypeBindings(unit, null);\n      le.completeTypeBindings();\n      fixTypes(unit.types);\n      \n      AST ast = AST.newAST(AST.JLS3);\n      ast.setFlag(AST.RESOLVED_BINDINGS);\n      ast.setDefaultNodeFlag(ASTNode.ORIGINAL);\n\n      org.eclipse.jdt.core.dom.ASTConverter converter =\n        new org.eclipse.jdt.core.dom.ASTConverter(compilerOptions0, true, monitor);\n      \n      org.eclipse.jdt.core.dom.BindingResolver resolver =\n        new org.eclipse.jdt.core.dom.DefaultBindingResolver(\n          unit.scope,\n          DefaultWorkingCopyOwner.PRIMARY,\n          new org.eclipse.jdt.core.dom.DefaultBindingResolver.BindingTables(),\n          true);\n      ast.setBindingResolver(resolver);\n      converter.setAST(ast);\n      \n      ASTNode node = converter.convert(unit, sourceUnit.getContents());\n      return node;\n    } catch (JavaModelException ex) {\n      throw new IllegalArgumentException(ex);\n    }\n  }\n  \n  private void fixTypes(TypeDeclaration[] types) {\n    for(int i = 0, iLimit = types.length; i < iLimit ; ++i) {\n      TypeDeclaration tpe = types[i];\n      tpe.binding.getAnnotationTagBits();\n      tpe.scope.buildFields();\n      tpe.scope.buildMethods();\n      fixFields(tpe.fields);\n      fixMethods(tpe.methods);\n      fixTypes(tpe.memberTypes);\n    }\n  }\n  \n  private void fixMethods(AbstractMethodDeclaration[] methods) {\n    if (methods == null)\n      return;\n    \n    for(int i = 0, iLimit = methods.length; i < iLimit; ++i) {\n      AbstractMethodDeclaration m = methods[i];\n      m.bodyStart = m.declarationSourceStart;\n      m.bodyEnd = m.declarationSourceEnd;\n      m.binding.getAnnotationTagBits();\n    }\n  }\n  \n  private void fixFields(AbstractVariableDeclaration[] fields) {\n    if (fields == null)\n      return;\n    \n    for(int i = 0, iLimit = fields.length; i < iLimit; ++i) {\n      AbstractVariableDeclaration f = fields[i];\n      f.declarationEnd = f.declarationSourceEnd;\n    }\n  }\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"92bc44b8de4530821d4fb7dac2ec4402897c0011","subject":"fix percentage calculation bug in textual statistics feature","message":"fix percentage calculation bug in textual statistics feature\n","repos":"stieglma\/Schafkopfauswerter","old_file":"src\/StatOverallTxt.aj","new_file":"src\/StatOverallTxt.aj","new_contents":"import java.awt.GridLayout;\n\nimport javax.swing.JPanel;\nimport javax.swing.JTabbedPane;\nimport javax.swing.JTextArea;\n\nimport view.GUI;\nimport view.UIUpdater;\nimport model.db.GameData;\nimport model.SystemValues.WIN;\nimport model.db.DataObject;\n\npublic privileged aspect StatOverallTxt {\n\t\n\tprivate static GUI gui;\n\tprivate static JPanel panel = new JPanel();\n\tprivate static JTextArea statText = new JTextArea();\n\t\n    after() returning(GUI gui): call(GUI.new(*)) {\n\t\tStatOverallTxt.gui = gui;\n    }\n\t\n\tafter(JTabbedPane tabbedPane): \n\t\t\texecution(public static void StatisticsHelper.StatisticsPaneCreated(JTabbedPane))\n\t\t\t&& args(tabbedPane) {\n\t\tstatText.setEditable(false);\n        panel.setLayout(new GridLayout(0, 1));\n\t\tpanel.add(statText);\n\t\t((JTabbedPane) tabbedPane).addTab(\"OverallText\", panel);\n\t}\n\t\n    after() : execution(* UIUpdater.run()) {\n        statText.setText(gui.model.getGameData().getOverallStatisticsString());\n    }\n    \n    public String GameData.getOverallStatisticsString() {\n        int anzahlSpieleGesamt = 0;\n        int anzahlSpieleGesamtGewonnen = 0;\n        int teuerstesRufspiel = 0;\n        int teuerstesSolo = 0;\n        int teuerstesSoloTout = 0;\n        int teuerstesSoloSie = 0;\n        int anzahlRufspiele = 0;\n        int anzahlSolo = 0;\n        int anzahlSoloTout = 0;\n        int anzahlSoloSie = 0;\n        int anzahlGewonneneRufspiele = 0;\n        int anzahlGewonneneSoli = 0;\n        int anzahlGewonneneSoliTout = 0;\n        int anzahlWeiter = 0;\n        \n\t\tfor (DataObject obj : data) {\n\t\t\tswitch (obj.getGameKind()) {\n\t\t\tcase \"Rufspiel\":\n\t\t\t\tanzahlRufspiele++;\n\t\t\t\tanzahlSpieleGesamt++;\n\t\t\t\tif (obj.getGameWon() == WIN.PLAYER) {\n\t\t\t\t\tanzahlGewonneneRufspiele++;\n\t\t\t\t\tanzahlSpieleGesamtGewonnen++;\n\t\t\t\t}\n\t\t\t\tif (obj.getGameValue() > teuerstesRufspiel) {\n\t\t\t\t\tteuerstesRufspiel = obj.getGameValue();\n\t\t\t\t}\n\t\t\t\tbreak;\n\t\t\tcase \"Solo\":\n\t\t\t\tanzahlSolo++;\n\t\t\t\tanzahlSpieleGesamt++;\n\t\t\t\tif (obj.getGameWon() == WIN.PLAYER) {\n\t\t\t\t\tanzahlGewonneneSoli++;\n\t\t\t\t\tanzahlSpieleGesamtGewonnen++;\n\t\t\t\t}\n\t\t\t\tif (obj.getGameValue() > teuerstesSolo) {\n\t\t\t\t\tteuerstesSolo = obj.getGameValue();\n\t\t\t\t}\n\t\t\t\tbreak;\n\t\t\tcase \"Solo Tout\":\n\t\t\t\tanzahlSpieleGesamt++;\n\t\t\t\tif (obj.getGameWon() == WIN.PLAYER) {\n\t\t\t\t\tanzahlGewonneneSoliTout++;\n\t\t\t\t\tanzahlSpieleGesamtGewonnen++;\n\t\t\t\t}\n\t\t\t\tif (obj.getGameValue() > teuerstesSoloTout) {\n\t\t\t\t\tteuerstesSoloTout = obj.getGameValue();\n\t\t\t\t}\n\t\t\t\tanzahlSoloTout++;\n\t\t\t\tbreak;\n\t\t\tcase \"Solo Sie\":\n\t\t\t\tanzahlSpieleGesamt++;\n\t\t\t\tanzahlSpieleGesamtGewonnen++;\n\t\t\t\tanzahlSoloSie++;\n\t\t\t\tif (obj.getGameValue() > teuerstesSoloSie) {\n\t\t\t\t\tteuerstesSoloSie = obj.getGameValue();\n\t\t\t\t}\n\t\t\t\tbreak;\n\t\t\tcase \"weiter\":\n\t\t\t\tanzahlWeiter++;\n\t\t\t\tbreak;\n\t\t\t}\n\t\t}\n\n\t\tdouble sologesamtwin = (anzahlSolo + anzahlSoloSie + anzahlSoloTout) > 0 ? ((anzahlGewonneneSoli\n\t\t\t\t+ anzahlGewonneneSoliTout + anzahlSoloSie) \/ 1.0 \/ (anzahlSolo\n\t\t\t\t+ anzahlSoloSie + anzahlSoloTout))\n\t\t\t\t: 0;\n       \n\t\treturn \"#Spiele (ohne weiter): \" + anzahlSpieleGesamt + \" (gewonnen: \"\n\t\t\t\t+ (anzahlSpieleGesamt > 0 ? anzahlSpieleGesamtGewonnen\n\t\t\t\t\t\t\/ ((double) anzahlSpieleGesamt) : 0) * 100 + \"%)\\n\"\n\t\t\t\t+ \"#Rufspiele: \" + anzahlRufspiele + \" (gewonnen: \"\n\t\t\t\t+ (anzahlRufspiele > 0 ? anzahlGewonneneRufspiele\n\t\t\t\t\t\t\/ ((double) anzahlRufspiele) : 0) * 100 + \"%)\\n\"\n\t\t\t\t+ \"          -> teurstes Rufspiel: \" + teuerstesRufspiel + \"\\n\"\n\t\t\t\t+ \"#Soli gesamt: \" + (anzahlSolo + anzahlSoloTout + anzahlSoloSie)\n\t\t\t\t+ \" (gewonnen: \" + sologesamtwin * 100 + \"%)\\n\"\n\t\t\t\t+ \"#Soli normal: \" + anzahlSolo\t+ \" (gewonnen: \"\n\t\t\t\t+ (anzahlSolo > 0 ? anzahlGewonneneSoli \/ ((double) anzahlSolo)\t: 0) * 100 + \"%)\\n\"\n\t\t\t\t+ \"            -> teurstes Solo: \" + teuerstesSolo + \"\\n\"\n\t\t\t\t+ \"#Solo Tout: \" + anzahlSoloTout + \" (gewonnen: \"\n\t\t\t\t+ (anzahlSoloTout > 0 ? anzahlGewonneneSoliTout\n\t\t\t\t\t\t\/ ((double) anzahlSoloTout) : 0) * 100 + \"%)\\n\"\n\t\t\t\t+ \"          -> teurstes Solo Tout: \" + teuerstesSoloTout + \"\\n\"\n\t\t\t\t+ \"#Solo Sie: \" + anzahlSoloSie + \"\\n\"\n\t\t\t\t+ \"         -> teurstes Solo Sie: \" + teuerstesSoloSie + \"\\n\"\n\t\t\t\t+ \"#Weiter: \" + anzahlWeiter;\n    }\n}\n","old_contents":"import java.awt.GridLayout;\n\nimport javax.swing.JPanel;\nimport javax.swing.JTabbedPane;\nimport javax.swing.JTextArea;\n\nimport view.GUI;\nimport view.UIUpdater;\nimport model.db.GameData;\nimport model.SystemValues.WIN;\nimport model.db.DataObject;\n\npublic privileged aspect StatOverallTxt {\n\t\n\tprivate static GUI gui;\n\tprivate static JPanel panel = new JPanel();\n\tprivate static JTextArea statText = new JTextArea();\n\t\n    after() returning(GUI gui): call(GUI.new(*)) {\n\t\tStatOverallTxt.gui = gui;\n    }\n\t\n\tafter(JTabbedPane tabbedPane): \n\t\t\texecution(public static void StatisticsHelper.StatisticsPaneCreated(JTabbedPane))\n\t\t\t&& args(tabbedPane) {\n\t\tstatText.setEditable(false);\n        panel.setLayout(new GridLayout(0, 1));\n\t\tpanel.add(statText);\n\t\t((JTabbedPane) tabbedPane).addTab(\"OverallText\", panel);\n\t}\n\t\n    after() : execution(* UIUpdater.run()) {\n        statText.setText(gui.model.getGameData().getOverallStatisticsString());\n    }\n    \n    public String GameData.getOverallStatisticsString() {\n        int anzahlSpieleGesamt = 0;\n        int anzahlSpieleGesamtGewonnen = 0;\n        int teuerstesRufspiel = 0;\n        int teuerstesSolo = 0;\n        int teuerstesSoloTout = 0;\n        int teuerstesSoloSie = 0;\n        int anzahlRufspiele = 0;\n        int anzahlSolo = 0;\n        int anzahlSoloTout = 0;\n        int anzahlSoloSie = 0;\n        int anzahlGewonneneRufspiele = 0;\n        int anzahlGewonneneSoli = 0;\n        int anzahlGewonneneSoliTout = 0;\n        int anzahlWeiter = 0;\n        \n\t\tfor (DataObject obj : data) {\n\t\t\tswitch (obj.getGameKind()) {\n\t\t\tcase \"Rufspiel\":\n\t\t\t\tanzahlRufspiele++;\n\t\t\t\tanzahlSpieleGesamt++;\n\t\t\t\tif (obj.getGameWon() == WIN.PLAYER) {\n\t\t\t\t\tanzahlGewonneneRufspiele++;\n\t\t\t\t\tanzahlSpieleGesamtGewonnen++;\n\t\t\t\t}\n\t\t\t\tif (obj.getGameValue() > teuerstesRufspiel) {\n\t\t\t\t\tteuerstesRufspiel = obj.getGameValue();\n\t\t\t\t}\n\t\t\t\tbreak;\n\t\t\tcase \"Solo\":\n\t\t\t\tanzahlSolo++;\n\t\t\t\tanzahlSpieleGesamt++;\n\t\t\t\tif (obj.getGameWon() == WIN.PLAYER) {\n\t\t\t\t\tanzahlGewonneneSoli++;\n\t\t\t\t\tanzahlSpieleGesamtGewonnen++;\n\t\t\t\t}\n\t\t\t\tif (obj.getGameValue() > teuerstesSolo) {\n\t\t\t\t\tteuerstesSolo = obj.getGameValue();\n\t\t\t\t}\n\t\t\t\tbreak;\n\t\t\tcase \"Solo Tout\":\n\t\t\t\tanzahlSpieleGesamt++;\n\t\t\t\tif (obj.getGameWon() == WIN.PLAYER) {\n\t\t\t\t\tanzahlGewonneneSoliTout++;\n\t\t\t\t\tanzahlSpieleGesamtGewonnen++;\n\t\t\t\t}\n\t\t\t\tif (obj.getGameValue() > teuerstesSoloTout) {\n\t\t\t\t\tteuerstesSoloTout = obj.getGameValue();\n\t\t\t\t}\n\t\t\t\tanzahlSoloTout++;\n\t\t\t\tbreak;\n\t\t\tcase \"Solo Sie\":\n\t\t\t\tanzahlSpieleGesamt++;\n\t\t\t\tanzahlSpieleGesamtGewonnen++;\n\t\t\t\tanzahlSoloSie++;\n\t\t\t\tif (obj.getGameValue() > teuerstesSoloSie) {\n\t\t\t\t\tteuerstesSoloSie = obj.getGameValue();\n\t\t\t\t}\n\t\t\t\tbreak;\n\t\t\tcase \"weiter\":\n\t\t\t\tanzahlWeiter++;\n\t\t\t\tbreak;\n\t\t\t}\n\t\t}\n\n\t\tdouble sologesamtwin = (anzahlSolo + anzahlSoloSie + anzahlSoloTout) > 0 ? ((anzahlGewonneneSoli\n\t\t\t\t+ anzahlGewonneneSoliTout + anzahlSoloSie) \/ 1.0 \/ (anzahlSolo\n\t\t\t\t+ anzahlSoloSie + anzahlSoloTout))\n\t\t\t\t: 0;\n       \n\t\treturn \"#Spiele (ohne weiter): \" + anzahlSpieleGesamt + \" (gewonnen: \"\n\t\t\t\t+ (anzahlSpieleGesamt > 0 ? anzahlSpieleGesamtGewonnen\n\t\t\t\t\t\t\/ ((double) anzahlSpieleGesamt) : 0) + \"%)\\n\"\n\t\t\t\t+ \"#Rufspiele: \" + anzahlRufspiele + \" (gewonnen: \"\n\t\t\t\t+ (anzahlRufspiele > 0 ? anzahlGewonneneRufspiele\n\t\t\t\t\t\t\/ ((double) anzahlRufspiele) : 0) + \"%)\\n\"\n\t\t\t\t+ \"          -> teurstes Rufspiel: \" + teuerstesRufspiel + \"\\n\"\n\t\t\t\t+ \"#Soli gesamt: \" + (anzahlSolo + anzahlSoloTout + anzahlSoloSie)\n\t\t\t\t+ \" (gewonnen: \" + sologesamtwin + \"%)\\n\"\n\t\t\t\t+ \"#Soli normal: \" + anzahlSolo\t+ \" (gewonnen: \"\n\t\t\t\t+ (anzahlSolo > 0 ? anzahlGewonneneSoli \/ ((double) anzahlSolo)\t: 0) + \"%)\\n\"\n\t\t\t\t+ \"            -> teurstes Solo: \" + teuerstesSolo + \"\\n\"\n\t\t\t\t+ \"#Solo Tout: \" + anzahlSoloTout + \" (gewonnen: \"\n\t\t\t\t+ (anzahlSoloTout > 0 ? anzahlGewonneneSoliTout\n\t\t\t\t\t\t\/ ((double) anzahlSoloTout) : 0) + \"%)\\n\"\n\t\t\t\t+ \"          -> teurstes Solo Tout: \" + teuerstesSoloTout + \"\\n\"\n\t\t\t\t+ \"#Solo Sie: \" + anzahlSoloSie + \"\\n\"\n\t\t\t\t+ \"         -> teurstes Solo Sie: \" + teuerstesSoloSie + \"\\n\"\n\t\t\t\t+ \"#Weiter: \" + anzahlWeiter;\n    }\n}\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"577755d5801a33f5cd4def52f7e81fc9b1e76240","subject":"polishing","message":"polishing\n","repos":"spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework","old_file":"org.springframework.aspects\/src\/main\/java\/org\/springframework\/mock\/staticmock\/AnnotationDrivenStaticEntityMockingControl.aj","new_file":"org.springframework.aspects\/src\/main\/java\/org\/springframework\/mock\/staticmock\/AnnotationDrivenStaticEntityMockingControl.aj","new_contents":"\/*\r\n * Copyright 2002-2010 the original author or authors.\r\n *\r\n * Licensed under the Apache License, Version 2.0 (the \"License\");\r\n * you may not use this file except in compliance with the License.\r\n * You may obtain a copy of the License at\r\n *\r\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\r\n *\r\n * Unless required by applicable law or agreed to in writing, software\r\n * distributed under the License is distributed on an \"AS IS\" BASIS,\r\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n * See the License for the specific language governing permissions and\r\n * limitations under the License.\r\n *\/\r\n\r\npackage org.springframework.mock.staticmock;\r\n\r\n\/**\r\n * Annotation-based aspect to use in test build to enable mocking static methods\r\n * on JPA-annotated <code>@Entity<\/code> classes, as used by Roo for finders.\r\n *\r\n * <p>Mocking will occur in the call stack of any method in a class (typically a test class) \r\n * that is annotated with the @MockStaticEntityMethods annotation. \r\n *\r\n * <p>Also provides static methods to simplify the programming model for\r\n * entering playback mode and setting expected return values.\r\n *\r\n * <p>Usage:\r\n * <ol> \r\n * <li>Annotate a test class with @MockStaticEntityMethods.\r\n * <li>In each test method, AnnotationDrivenStaticEntityMockingControl will begin in recording mode.\r\n * Invoke static methods on Entity classes, with each recording-mode invocation\r\n * being followed by an invocation to the static expectReturn() or expectThrow()\r\n * method on AnnotationDrivenStaticEntityMockingControl.\r\n * <li>Invoke the static AnnotationDrivenStaticEntityMockingControl() method.\r\n * <li>Call the code you wish to test that uses the static methods. Verification will\r\n * occur automatically.\r\n * <\/ol>\r\n * \r\n * @author Rod Johnson\r\n * @author Ramnivas Laddad\r\n * @see MockStaticEntityMethods\r\n *\/\r\npublic aspect AnnotationDrivenStaticEntityMockingControl extends AbstractMethodMockingControl {\r\n\t\r\n\t\/**\r\n\t * Stop recording mock calls and enter playback state\r\n\t *\/\r\n\tpublic static void playback() {\r\n\t\tAnnotationDrivenStaticEntityMockingControl.aspectOf().playbackInternal();\r\n\t}\r\n\t\r\n\tpublic static void expectReturn(Object retVal) {\r\n\t\tAnnotationDrivenStaticEntityMockingControl.aspectOf().expectReturnInternal(retVal);\r\n\t}\r\n\r\n\tpublic static void expectThrow(Throwable throwable) {\r\n\t\tAnnotationDrivenStaticEntityMockingControl.aspectOf().expectThrowInternal(throwable);\r\n\t}\r\n\r\n\t\/\/ Only matches directly annotated @Test methods, to allow methods in\r\n\t\/\/ @MockStatics classes to invoke each other without resetting the mocking environment\r\n\tprotected pointcut mockStaticsTestMethod() : execution(public * (@MockStaticEntityMethods *).*(..));\r\n\r\n\tprotected pointcut methodToMock() : execution(public static * (@javax.persistence.Entity *).*(..));\r\n\r\n}\r\n","old_contents":"\/*\r\n * Copyright 2002-2010 the original author or authors.\r\n *\r\n * Licensed under the Apache License, Version 2.0 (the \"License\");\r\n * you may not use this file except in compliance with the License.\r\n * You may obtain a copy of the License at\r\n *\r\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\r\n *\r\n * Unless required by applicable law or agreed to in writing, software\r\n * distributed under the License is distributed on an \"AS IS\" BASIS,\r\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n * See the License for the specific language governing permissions and\r\n * limitations under the License.\r\n *\/\r\n\r\npackage org.springframework.mock.staticmock;\r\n\r\n\/**\r\n * Annotation-based aspect to use in test build to enable mocking static methods\r\n * on Entity classes, as used by Roo for finders.\r\n * <br>\r\n * Mocking will occur in the call stack of any method in a class (typically a test class) \r\n * that is annotated with the @MockStaticEntityMethods annotation. \r\n * <br>\r\n * Also provides static methods to simplify the programming model for\r\n * entering playback mode and setting expected return values.\r\n * <br>\r\n * Usage:<ol> \r\n * <li>Annotate a test class with @MockStaticEntityMethods.\r\n * <li>In each test method, AnnotationDrivenStaticEntityMockingControl will begin in recording mode.\r\n * Invoke static methods on Entity classes, with each recording-mode invocation\r\n * being followed by an invocation to the static expectReturn() or expectThrow()\r\n * method on AnnotationDrivenStaticEntityMockingControl.\r\n * <li>Invoke the static AnnotationDrivenStaticEntityMockingControl() method.\r\n * <li>Call the code you wish to test that uses the static methods. Verification will\r\n * occur automatically.\r\n * <\/ol>\r\n * \r\n * @author Rod Johnson\r\n * @author Ramnivas Laddad\r\n * @see MockStaticEntityMethods\r\n *\/\r\npublic aspect AnnotationDrivenStaticEntityMockingControl extends AbstractMethodMockingControl {\r\n\t\r\n\t\/**\r\n\t * Stop recording mock calls and enter playback state\r\n\t *\/\r\n\tpublic static void playback() {\r\n\t\tAnnotationDrivenStaticEntityMockingControl.aspectOf().playbackInternal();\r\n\t}\r\n\t\r\n\tpublic static void expectReturn(Object retVal) {\r\n\t\tAnnotationDrivenStaticEntityMockingControl.aspectOf().expectReturnInternal(retVal);\r\n\t}\r\n\r\n\tpublic static void expectThrow(Throwable throwable) {\r\n\t\tAnnotationDrivenStaticEntityMockingControl.aspectOf().expectThrowInternal(throwable);\r\n\t}\r\n\r\n\t\/\/ Only matches directly annotated @Test methods, to allow methods in\r\n\t\/\/ @MockStatics classes to invoke each other without resetting the mocking environment\r\n\tprotected pointcut mockStaticsTestMethod() : execution(public * (@MockStaticEntityMethods *).*(..));\r\n\r\n\tprotected pointcut methodToMock() : execution(public static * (@javax.persistence.Entity *).*(..));\r\n\r\n}\r\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"2166f6fa22badc3250f09932a803e9372bcf2c04","subject":"Static tracing aspect","message":"Static tracing aspect\n","repos":"ties\/winstone","old_file":"winstone\/src\/main\/aspectj\/TraceRequestFlow.aj","new_file":"winstone\/src\/main\/aspectj\/TraceRequestFlow.aj","new_contents":"import org.aspectj.lang.JoinPoint;\n\n\/**\n * Created with IntelliJ IDEA.\n * User: kockt\n * Date: 13-01-13\n * Time: 17:09\n * To change this template use File | Settings | File Templates.\n *\/\npublic aspect TraceRequestFlow {\n    pointcut inWinstone(): within(net.winstone.*) || within(net.winstone..*);\n\n    pointcut internalCall(Object o): target(o) && call(* *(..)) && !within(TraceRequestFlow);\n\n\n    before(Object o): internalCall(o) && inWinstone() {\n        System.out.println(String.format(\"%s:%s:%s,%s:%s\", thisEnclosingJoinPointStaticPart.getSourceLocation().getFileName(), thisEnclosingJoinPointStaticPart.getSignature().getName(), thisEnclosingJoinPointStaticPart.getSourceLocation().getLine(), thisJoinPoint.getSourceLocation().getFileName(), thisJoinPoint.getSignature().getName(), thisJoinPoint.getSourceLocation().getLine()));\n    }\n}\n","old_contents":"\/**\n * Created with IntelliJ IDEA.\n * User: kockt\n * Date: 13-01-13\n * Time: 17:09\n * To change this template use File | Settings | File Templates.\n *\/\npublic aspect TraceRequestFlow {\n\n    pointcut was_called(Object o):\n            target(o) && call(* *(..)) && within(net.winstone);\n\n    before() calling: was_called(o) {\n        System.out.println(o);\n    }\n\n}\n","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"17fdee71c7adc7596936ecab8aaf38fc8f22f413","subject":"comments for stock","message":"comments for stock\n","repos":"stieglma\/Schafkopfauswerter","old_file":"src\/Stock.aj","new_file":"src\/Stock.aj","new_contents":"\nimport java.awt.BorderLayout;\nimport java.awt.FlowLayout;\nimport java.util.Arrays;\n\nimport javax.swing.JCheckBox;\nimport javax.swing.JPanel;\n\nimport model.Schafkopfmodel;\nimport model.SystemValues.Games;\nimport model.SystemValues.Players;\nimport model.SystemValues.WIN;\nimport static model.SystemValues.rufspiel;\nimport model.db.DataObject;\nimport view.ConfigPopup;\nimport view.GUI;\nimport view.SchafkopfTableModel;\nimport view.ConfigSaveListener;\n\npublic privileged aspect Stock {\n\n    private static GUI gui;\n    private boolean useStock = false;\n\n    \/**\n     * catch constructor call, so that we have the correct gui, to refer to everywhere\n     *\/\n    after() returning(GUI gui): call(GUI.new(*)) {\n        Stock.gui = gui;\n    }\n\n\n    \/** add stock variable to DataObject *\/\n    private int DataObject.stock;\n\n    \/** catch constructor call and set stock to appropriate value *\/\n    DataObject around(String[] values) : call ( DataObject.new(String[])) && args(values){\n        DataObject obj = proceed(values);\n        obj.stock = Integer.parseInt(values[9]);\n        return obj;\n    }\n \n    \/** add method to retrieve value of stock *\/\n    public int DataObject.getStock() {\n        return stock;\n    }\n\n    \/** when a new dataobject is created, set to value of last dataobject or 0 *\/\n    DataObject around(String player, String game, int gameVal, int valP1, int valP2, int valP3, int valP4, WIN winner)\n            : call (DataObject.new(String, String, int, int, int, int, int, WIN))\n            && args (player, game, gameVal, valP1, valP2, valP3, valP4, winner) {\n        DataObject obj = proceed(player, game, gameVal, valP1, valP2, valP3, valP4, winner);\n        if (gui != null) {\n            obj.stock = gui.model.gameDB.getLast().getStock();\n        } else {\n            obj.stock = 0;\n        }\n        return obj;\n    }\n\n    \/** add stock object to asTextArray method of DataObject *\/\n    String[] around(int index) : call (* DataObject.asTextArray(int)) && args(index) && target(DataObject){\n        String[] obj = proceed(index);\n        String[] retStr = Arrays.copyOf(obj, obj.length+1);\n        retStr[obj.length] = Integer.toString(((DataObject)thisJoinPoint.getTarget()).stock);\n        return retStr;\n    }\n\n    \/** addWeiter has to be changed if stock is used, such that the stock is increased then *\/\n    void around() : call (* Schafkopfmodel.addWeiter()) {\n        DataObject obj = gui.model.gameDB.getLast().copyOf();\n        obj.player = \"\/\";\n        obj.game = Games.WEITER;\n        obj.won = WIN.NOONE;\n        obj.gameVal = 0;\n\n        if (useStock) {\n            obj.valP1 = obj.valP1 - rufspiel;\n            obj.valP2 = obj.valP2 - rufspiel;\n            obj.valP3 = obj.valP3 - rufspiel;\n            obj.valP4 = obj.valP4 - rufspiel;\n            obj.stock = gui.model.gameDB.getLast().getStock() + rufspiel*4;\n            obj.gameVal = rufspiel;\n        }\n\n        gui.model.gameDB.addData(obj);\n\n    }\n\n    \/** For Rufspiele we have to adjust the stock (if won, add stock to players,\n     *  if lost double up stock *\/\n    void around(int price, Players one, Players two, boolean won)\n            : call (* Schafkopfmodel.addRufspielHelp(int, Players, Players, boolean))\n            && args(price, one, two, won) {\n        DataObject obj = gui.model.gameDB.getLast();\n        int[] playerVals = {obj.getValP1(), obj.getValP2(), obj.getValP3(), obj.getValP4()};\n        int stock = obj.getStock();\n\n        if (!won) {\n            price *= -1;\n            if (useStock) {\n                stock *= -1;\n            }\n        }\n\n        for (int i = 0; i < playerVals.length; i++) {\n            if (i == one.getNumber() || i == two.getNumber()) {\n                playerVals[i] += price + (useStock ? (stock \/ 2) : 0);\n            } else {\n                playerVals[i] -= price;\n            }\n        }\n        \n        if (!won && useStock) {\n            stock *= -2;\n        } else if (useStock){\n            stock = 0;\n        }\n\n        WIN win = won ? WIN.PLAYER : WIN.ENEMY;\n\n        DataObject newObj = new DataObject(one.toString(), Games.RUFSPIEL, price,\n                playerVals[0], playerVals[1], playerVals[2], playerVals[3], win);\n        newObj.stock = stock;\n        gui.model.gameDB.addData(newObj);\n    }\n\n    \/** with stock we have one more columnn *\/\n    int around() : execution (* SchafkopfTableModel.getColumnCount()) {\n        return proceed() + 1;\n    }\n\n    \/** retrieve stock value when needed *\/\n    Object around(int rowIndex, int columnIndex)\n    : execution (* SchafkopfTableModel.getValueAt(int, int))\n    && args(rowIndex, columnIndex) {\n        if (columnIndex < 9) {\n            return proceed(rowIndex, columnIndex);\n        } else {\n            return gui.model.gameDB.data.get(gui.model.gameDB.size() - rowIndex - 1).getStock();\n        }\n    }\n\n    \/** Table header for stock *\/\n    Object around(int index)\n    : execution (* SchafkopfTableModel.getColumnName(int))\n    && args(index) {\n        if (index < 9) {\n            return proceed(index);\n        } else {\n            return \"Stock\";\n        }\n    }\n\n    private JCheckBox checkboxStock;\n\n    \/** Add stock checkbox to config screen*\/\n    after() returning(JPanel pane): execution (* ConfigPopup.createOptionsPane()) {\n        JPanel panelStock = new JPanel();\n        panelStock.setLayout(new FlowLayout(FlowLayout.CENTER, 5, 5));\n\n        checkboxStock = new JCheckBox(\"Stock\");\n        panelStock.add(checkboxStock);\n\n        pane.add(panelStock, BorderLayout.NORTH);\n    }\n\n    after() : execution(* ConfigSaveListener.actionPerformed(*)) {\n        useStock = checkboxStock.isSelected();\n    }\n\n    \/** create html header with stock *\/\n    String around() : execution(* ExportActionListener.createHeader()) {\n        return proceed() + \"<p>Stock: \" + (useStock ? \"ja\" : \"nein\") + \"<\/p>\";\n    }\n\n    \/** read stock value for Import *\/\n    boolean around(String firstLine, String secondLine)\n      : execution(* LoadFileListener.setSystemValues(String, String))\n      && args(firstLine, secondLine) {\n\n        if (proceed(firstLine, secondLine)) {\n            if (secondLine.contains(\"Stock\")) {\n                useStock = secondLine.replaceAll(\"<\/p>\", \"\").split(\"<p>\")[3].replaceFirst(\"Stock: \", \"\").equals(\"ja\");\n                return true;\n            }\n        } \n        return false;\n    }\n}\n","old_contents":"\nimport java.awt.BorderLayout;\nimport java.awt.FlowLayout;\nimport java.util.Arrays;\n\nimport javax.swing.JCheckBox;\nimport javax.swing.JPanel;\n\nimport model.Schafkopfmodel;\nimport model.SystemValues.Games;\nimport model.SystemValues.Players;\nimport model.SystemValues.WIN;\nimport static model.SystemValues.rufspiel;\nimport model.db.DataObject;\nimport view.ConfigPopup;\nimport view.GUI;\nimport view.SchafkopfTableModel;\nimport view.ConfigSaveListener;\n\npublic privileged aspect Stock {\n\n    private static GUI gui;\n    private boolean useStock = false;\n\n    \/**\n     * catch constructor call, so that we have the correct gui, to refer to everywhere\n     *\/\n    after() returning(GUI gui): call(GUI.new(*)) {\n        Stock.gui = gui;\n    }\n\n\n    private int DataObject.stock;\n\n    DataObject around(String[] values) : call ( DataObject.new(String[])) && args(values){\n        DataObject obj = proceed(values);\n        obj.stock = Integer.parseInt(values[9]);\n        return obj;\n    }\n \n    public int DataObject.getStock() {\n        return stock;\n    }\n\n    DataObject around(String player, String game, int gameVal, int valP1, int valP2, int valP3, int valP4, WIN winner)\n            : call (DataObject.new(String, String, int, int, int, int, int, WIN))\n            && args (player, game, gameVal, valP1, valP2, valP3, valP4, winner) {\n        DataObject obj = proceed(player, game, gameVal, valP1, valP2, valP3, valP4, winner);\n        if (gui != null) {\n            obj.stock = gui.model.gameDB.getLast().getStock();\n        } else {\n            obj.stock = 0;\n        }\n        return obj;\n    }\n\n    String[] around(int index) : call (* DataObject.asTextArray(int)) && args(index) && target(DataObject){\n        String[] obj = proceed(index);\n        String[] retStr = Arrays.copyOf(obj, obj.length+1);\n        retStr[obj.length] = Integer.toString(((DataObject)thisJoinPoint.getTarget()).stock);\n        return retStr;\n    }\n\n    void around() : call (* Schafkopfmodel.addWeiter()) {\n        DataObject obj = gui.model.gameDB.getLast().copyOf();\n        obj.player = \"\/\";\n        obj.game = Games.WEITER;\n        obj.won = WIN.NOONE;\n        obj.gameVal = 0;\n\n        if (useStock) {\n            obj.valP1 = obj.valP1 - rufspiel;\n            obj.valP2 = obj.valP2 - rufspiel;\n            obj.valP3 = obj.valP3 - rufspiel;\n            obj.valP4 = obj.valP4 - rufspiel;\n            obj.stock = gui.model.gameDB.getLast().getStock() + rufspiel*4;\n            obj.gameVal = rufspiel;\n        }\n\n        gui.model.gameDB.addData(obj);\n\n    }\n\n    void around(int price, Players one, Players two, boolean won)\n            : call (* Schafkopfmodel.addRufspielHelp(int, Players, Players, boolean))\n            && args(price, one, two, won) {\n        DataObject obj = gui.model.gameDB.getLast();\n        int[] playerVals = {obj.getValP1(), obj.getValP2(), obj.getValP3(), obj.getValP4()};\n        int stock = obj.getStock();\n\n        if (!won) {\n            price *= -1;\n            if (useStock) {\n                stock *= -1;\n            }\n        }\n\n        for (int i = 0; i < playerVals.length; i++) {\n            if (i == one.getNumber() || i == two.getNumber()) {\n                playerVals[i] += price + (useStock ? (stock \/ 2) : 0);\n            } else {\n                playerVals[i] -= price;\n            }\n        }\n        \n        if (!won && useStock) {\n            stock *= -2;\n        } else if (useStock){\n            stock = 0;\n        }\n\n        WIN win = won ? WIN.PLAYER : WIN.ENEMY;\n\n        DataObject newObj = new DataObject(one.toString(), Games.RUFSPIEL, price,\n                playerVals[0], playerVals[1], playerVals[2], playerVals[3], win);\n        newObj.stock = stock;\n        gui.model.gameDB.addData(newObj);\n    }\n\n    int around() : execution (* SchafkopfTableModel.getColumnCount()) {\n        return proceed() + 1;\n    }\n\n    Object around(int rowIndex, int columnIndex)\n    : execution (* SchafkopfTableModel.getValueAt(int, int))\n    && args(rowIndex, columnIndex) {\n        if (columnIndex < 9) {\n            return proceed(rowIndex, columnIndex);\n        } else {\n            return gui.model.gameDB.data.get(gui.model.gameDB.size() - rowIndex - 1).getStock();\n        }\n    }\n\n    Object around(int index)\n    : execution (* SchafkopfTableModel.getColumnName(int))\n    && args(index) {\n        if (index < 9) {\n            return proceed(index);\n        } else {\n            return \"Stock\";\n        }\n    }\n\n    private JCheckBox checkboxStock;\n\n    after() returning(JPanel pane): execution (* ConfigPopup.createOptionsPane()) {\n        JPanel panelStock = new JPanel();\n        panelStock.setLayout(new FlowLayout(FlowLayout.CENTER, 5, 5));\n\n        checkboxStock = new JCheckBox(\"Stock\");\n        panelStock.add(checkboxStock);\n\n        pane.add(panelStock, BorderLayout.NORTH);\n    }\n\n    after() : execution(* ConfigSaveListener.actionPerformed(*)) {\n        useStock = checkboxStock.isSelected();\n    }\n\n    String around() : execution(* ExportActionListener.createHeader()) {\n        return proceed() + \"<p>Stock: \" + (useStock ? \"ja\" : \"nein\") + \"<\/p>\";\n    }\n\n    boolean around(String firstLine, String secondLine)\n      : execution(* LoadFileListener.setSystemValues(String, String))\n      && args(firstLine, secondLine) {\n\n        if (proceed(firstLine, secondLine)) {\n            if (secondLine.contains(\"Stock\")) {\n                useStock = secondLine.replaceAll(\"<\/p>\", \"\").split(\"<p>\")[3].replaceFirst(\"Stock: \", \"\").equals(\"ja\");\n                return true;\n            }\n        } \n        return false;\n    }\n}\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"1a62f480bfefb5a1930c679133e863d0207f7d1d","subject":"\u91cd\u6784  \u91c7\u7528\u63a5\u53e3\u7684\u5f62\u5f0f \u4e0d\u4f9d\u8d56\u4e0a\u5c42api","message":"\u91cd\u6784  \u91c7\u7528\u63a5\u53e3\u7684\u5f62\u5f0f \u4e0d\u4f9d\u8d56\u4e0a\u5c42api\n","repos":"galaxybruce\/aop-statistics","old_file":"aopstatistics\/src\/main\/java\/statistics\/Statistics.aj","new_file":"aopstatistics\/src\/main\/java\/statistics\/Statistics.aj","new_contents":"package com.kidswant.aop.statistics;\n\nimport org.aspectj.lang.ProceedingJoinPoint;\nimport org.aspectj.lang.JoinPoint;\nimport org.aspectj.lang.Signature;\nimport org.aspectj.lang.reflect.CodeSignature;\nimport org.aspectj.lang.annotation.Around;\nimport org.aspectj.lang.annotation.Aspect;\nimport java.lang.reflect.Method;\n\npublic aspect Statistics {\n\n    \/* \u70b9\u51fb\u4e8b\u4ef6\u6216\u8005\u6d41\u7a0b\u4e8b\u4ef6\uff0c\u53c2\u6570\u901a\u8fc7CodeSignature\u53cd\u5c04\u83b7\u53d6*\/\n    pointcut doAllListener() : call(* *.*KisListener(..));\n\n    \/* Activity \u9875\u9762\u4e8b\u4ef6   within\u9650\u5236\u5177\u4f53\u7c7b\u578b\uff0c\u4e0d\u7136\u91cd\u8f7d\u65b9\u6cd5\u4f1a\u591a\u6b21\u8c03\u7528\n    pointcut doOnOpen() : execution(protected * *..BaseActivity.onResume()) && within(BaseActivity);\n    pointcut doOnClose() : execution(protected * *..BaseActivity.onPause()) && within(BaseActivity);*\/\n\n    \/* \u9875\u9762\u4e8b\u4ef6 *\/\n    pointcut doOnPage(boolean open) : execution(private void reportPagePoint(boolean)) && args(open);\n\n\n    after() : doAllListener() {\n        String methodName = getMethodPathName(thisJoinPoint);\n\n        CodeSignature codeSignature = (CodeSignature) thisJoinPoint.getSignature();\n        String[] parameterNames = codeSignature.getParameterNames();\n        Object[] parameterValues = thisJoinPoint.getArgs();\n\n        String param = null;\n        for (int i = 0; i < parameterNames.length; i++) {\n            String name = parameterNames[i];\n            if(\"param\".equals(name))\n            {\n                param = parameterValues[i] != null ? parameterValues[i].toString() : null;\n                break;\n            }\n        }\n\n        reportEvent(methodName, param);\n    }\n\n    \/*  void around() : doOnOpen() {\n        proceed();\n\n        reportPage(thisJoinPoint, true);\n     }\n\n    void around() : doOnClose() {\n        proceed();\n\n        reportPage(thisJoinPoint, false);\n    }*\/\n\n    before(boolean open) : doOnPage(open) {\n        reportPage(thisJoinPoint, open);\n    }\n\n    \/** \u4e0a\u62a5\u70b9\u51fb\u4e8b\u4ef6\u6216\u8005\u6d41\u7a0b\u4e8b\u4ef6 **\/\n    private void reportEvent(String name, String param)\n    {\n        \/** android.util.Log.i(\"aaaaaaaaaaaa\", \"reportEvent.name: \" + name+ \"-\"+ param); **\/\n\n        String value = com.kidswant.aop.statistics.ReportDataUtil.getPropertyValue(name);\n        if(value == null || \"\".equals(value)) return;\n\n        String[] values = value.split(\":\");\n        if(values.length < 3) return;\n\n        com.kidswant.aop.statistics.AopStatistics.reportEvent(values[0], values[2], param);\n    }\n\n    \/** \u4e0a\u62a5\u9875\u9762\u4e8b\u4ef6 **\/\n    private void reportPage(JoinPoint joinPoint, boolean open)\n    {\n        Signature signature = joinPoint.getSignature();\n        Object target = joinPoint.getTarget();\n        String typeName = target.getClass().getName();\/*signature.getDeclaringTypeName() \u662f\u5339\u914d\u65b9\u6cd5\u58f0\u660e\u7684\u7c7b\uff0c\u662f\u57fa\u7c7b\u91cc\u9762\u7684*\/;\n        Object param = getPropertyValue(target, \"getReportParam\");\n        Object flag = getPropertyValue(target, \"getReportFlag\");\n        if(flag != null && !\"\".equals(flag))\n        {\n            typeName = typeName + \"&\" + flag;\n        }\n\n       \/** android.util.Log.i(\"aaaaaaaaaaaa\", \"reportPage.name: \" + typeName+ \"-\"+ param + \"-\" + open); **\/\n\n        String value = com.kidswant.aop.statistics.ReportDataUtil.getPropertyValue(typeName);\n        if(value == null || \"\".equals(value)) return;\n        String[] values = value.split(\":\");\n        if(values.length < 3) return;\n\n        if(open)\n        {\n            com.kidswant.aop.statistics.AopStatistics.reportPageOnResume(values[0], values[1], values[2], (String)param);\n        }\n        else\n        {\n            com.kidswant.aop.statistics.AopStatistics.reportPageOnPause(values[0], values[1], values[2], (String)param);\n        }\n    }\n\n    \/** \u83b7\u53d6\u65b9\u6cd5\u540d\u5168\u8def\u5f84 **\/\n    private String getMethodPathName(JoinPoint joinPoint)\n    {\n        Signature signature = joinPoint.getSignature();\n        String typeName = signature.getDeclaringTypeName();\n        String methodName = signature.getName();\n        String methodPathName = typeName + \".\" + methodName;\n        return methodPathName;\n    }\n\n    \/** \u53cd\u5c04\u83b7\u53d6\u53c2\u6570\u503c **\/\n    private Object getPropertyValue(Object o, String methodName){\n       Object value = null;\n       try {\n           Method m = o.getClass().getMethod(methodName, null);\n           value = m.invoke(o, null);\n       } catch (Exception e) {\n           e.printStackTrace();\n       }\n\n       return value;\n    }\n}\n","old_contents":"package com.kidswant.aop.statistics;\n\nimport org.aspectj.lang.ProceedingJoinPoint;\nimport org.aspectj.lang.JoinPoint;\nimport org.aspectj.lang.Signature;\nimport org.aspectj.lang.reflect.CodeSignature;\nimport org.aspectj.lang.annotation.Around;\nimport org.aspectj.lang.annotation.Aspect;\nimport java.lang.reflect.Method;\n\npublic aspect Statistics {\n\n    \/* \u70b9\u51fb\u4e8b\u4ef6\u6216\u8005\u6d41\u7a0b\u4e8b\u4ef6\uff0c\u53c2\u6570\u901a\u8fc7CodeSignature\u53cd\u5c04\u83b7\u53d6*\/\n    pointcut doAllListener() : call(* *.*KisListener(..));\n\n    \/* Activity \u9875\u9762\u4e8b\u4ef6   within\u9650\u5236\u5177\u4f53\u7c7b\u578b\uff0c\u4e0d\u7136\u91cd\u8f7d\u65b9\u6cd5\u4f1a\u591a\u6b21\u8c03\u7528\n    pointcut doOnOpen() : execution(protected * *..BaseActivity.onResume()) && within(BaseActivity);\n    pointcut doOnClose() : execution(protected * *..BaseActivity.onPause()) && within(BaseActivity);*\/\n\n    \/* fragment\u9875\u9762\u4e8b\u4ef6 *\/\n    pointcut doOnPage(boolean open) : execution(private void reportPagePoint(boolean)) && args(open);\n\n\n    after() : doAllListener() {\n        String methodName = getMethodPathName(thisJoinPoint);\n\n        CodeSignature codeSignature = (CodeSignature) thisJoinPoint.getSignature();\n        String[] parameterNames = codeSignature.getParameterNames();\n        Object[] parameterValues = thisJoinPoint.getArgs();\n\n        String param = null;\n        for (int i = 0; i < parameterNames.length; i++) {\n            String name = parameterNames[i];\n            if(\"param\".equals(name))\n            {\n                param = parameterValues[i] != null ? parameterValues[i].toString() : null;\n                break;\n            }\n        }\n\n        reportEvent(methodName, param);\n    }\n\n    \/*  void around() : doOnOpen() {\n        proceed();\n\n        reportPage(thisJoinPoint, true);\n     }\n\n    void around() : doOnClose() {\n        proceed();\n\n        reportPage(thisJoinPoint, false);\n    }*\/\n\n    before(boolean open) : doOnPage(open) {\n        reportPage(thisJoinPoint, open);\n    }\n\n    \/** \u4e0a\u62a5\u70b9\u51fb\u4e8b\u4ef6\u6216\u8005\u6d41\u7a0b\u4e8b\u4ef6 **\/\n    private void reportEvent(String name, String param)\n    {\n        \/** android.util.Log.i(\"aaaaaaaaaaaa\", \"reportEvent.name: \" + name+ \"-\"+ param); **\/\n\n        String value = com.kidswant.aop.statistics.ReportDataUtil.getPropertyValue(name);\n        if(value == null || \"\".equals(value)) return;\n\n        String[] values = value.split(\":\");\n        if(values.length < 3) return;\n\n        com.kidswant.aop.statistics.AopStatistics.reportEvent(values[0], values[2], param);\n    }\n\n    \/** \u4e0a\u62a5\u9875\u9762\u4e8b\u4ef6 **\/\n    private void reportPage(JoinPoint joinPoint, boolean open)\n    {\n        Signature signature = joinPoint.getSignature();\n        Object target = joinPoint.getTarget();\n        String typeName = target.getClass().getName();\/*signature.getDeclaringTypeName() \u662f\u5339\u914d\u65b9\u6cd5\u58f0\u660e\u7684\u7c7b\uff0c\u662f\u57fa\u7c7b\u91cc\u9762\u7684*\/;\n        Object param = getPropertyValue(target, \"getReportParam\");\n        Object flag = getPropertyValue(target, \"getReportFlag\");\n        if(flag != null && !\"\".equals(flag))\n        {\n            typeName = typeName + \"&\" + flag;\n        }\n\n       \/** android.util.Log.i(\"aaaaaaaaaaaa\", \"reportPage.name: \" + typeName+ \"-\"+ param + \"-\" + open); **\/\n\n        String value = com.kidswant.aop.statistics.ReportDataUtil.getPropertyValue(typeName);\n        if(value == null || \"\".equals(value)) return;\n        String[] values = value.split(\":\");\n        if(values.length < 3) return;\n\n        if(open)\n        {\n            com.kidswant.aop.statistics.AopStatistics.reportPageOnResume(values[0], values[1], values[2], (String)param);\n        }\n        else\n        {\n            com.kidswant.aop.statistics.AopStatistics.reportPageOnPause(values[0], values[1], values[2], (String)param);\n        }\n    }\n\n    \/** \u83b7\u53d6\u65b9\u6cd5\u540d\u5168\u8def\u5f84 **\/\n    private String getMethodPathName(JoinPoint joinPoint)\n    {\n        Signature signature = joinPoint.getSignature();\n        String typeName = signature.getDeclaringTypeName();\n        String methodName = signature.getName();\n        String methodPathName = typeName + \".\" + methodName;\n        return methodPathName;\n    }\n\n    \/** \u53cd\u5c04\u83b7\u53d6\u53c2\u6570\u503c **\/\n    private Object getPropertyValue(Object o, String methodName){\n       Object value = null;\n       try {\n           Method m = o.getClass().getMethod(methodName, null);\n           value = m.invoke(o, null);\n       } catch (Exception e) {\n           e.printStackTrace();\n       }\n\n       return value;\n    }\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"53a110f31cbf07355e8da00f88a10ec47b16d36f","subject":"improved HtmlElement toString with parent","message":"improved HtmlElement toString with parent","repos":"bhecquet\/seleniumRobot,bhecquet\/seleniumRobot,bhecquet\/seleniumRobot","old_file":"core\/src\/main\/java\/com\/seleniumtests\/core\/aspects\/LogAction.aj","new_file":"core\/src\/main\/java\/com\/seleniumtests\/core\/aspects\/LogAction.aj","new_contents":"\/**\r\n * Orignal work: Copyright 2015 www.seleniumtests.com\r\n * Modified work: Copyright 2016 www.infotel.com\r\n *\r\n * Licensed under the Apache License, Version 2.0 (the \"License\");\r\n * you may not use this file except in compliance with the License.\r\n * You may obtain a copy of the License at\r\n *\r\n * \thttp:\/\/www.apache.org\/licenses\/LICENSE-2.0\r\n *\r\n * Unless required by applicable law or agreed to in writing, software\r\n * distributed under the License is distributed on an \"AS IS\" BASIS,\r\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n * See the License for the specific language governing permissions and\r\n * limitations under the License.\r\n *\/\r\npackage com.seleniumtests.core.aspects;\r\n\r\nimport java.lang.annotation.Annotation;\r\nimport java.lang.reflect.Method;\r\nimport java.util.ArrayList;\r\nimport java.util.Date;\r\nimport java.util.List;\r\n\r\nimport org.aspectj.lang.JoinPoint;\r\nimport org.aspectj.lang.ProceedingJoinPoint;\r\nimport org.aspectj.lang.annotation.Around;\r\nimport org.aspectj.lang.annotation.Aspect;\r\nimport org.aspectj.lang.annotation.Pointcut;\r\n\r\nimport com.seleniumtests.core.runner.SeleniumRobotRunner;\r\nimport com.seleniumtests.reporter.TestAction;\r\nimport com.seleniumtests.reporter.TestLogging;\r\nimport com.seleniumtests.reporter.TestStep;\r\nimport com.seleniumtests.uipage.PageObject;\r\nimport com.seleniumtests.uipage.htmlelements.HtmlElement;\r\n\r\n\/**\r\n * Aspect to intercept calls to methods of HtmlElement. It allows to retry discovery and action \r\n * when something goes wrong with the driver\r\n * \r\n * @author behe\r\n *\r\n *\/\r\n@Aspect\r\npublic class LogAction {\r\n\r\n\tprivate Date testStepStart = null;\r\n\r\n\t\/**\r\n\t * Intercept actions done through browser\r\n\t * @param joinPoint\r\n\t * @throws Throwable \r\n\t *\/\r\n\t@Around(\"(execution(public * com.seleniumtests.uipage.htmlelements..*Element..* (..)) \"\r\n    \t\t+ \"|| execution(public * com.seleniumtests.uipage.htmlelements.SelectList..* (..)) \"\r\n    \t\t+ \"|| execution(public * com.seleniumtests.uipage.htmlelements.Table..* (..))) \"\r\n    \t\t+ \"&& !execution(* com.seleniumtests.uipage.htmlelements.HtmlElement.toString (..))\"\r\n    \t\t+ \"&& !execution(* com.seleniumtests.uipage.htmlelements.PictureElement.toString (..))\"\r\n    \t\t+ \"&& !execution(* com.seleniumtests.uipage.htmlelements.HtmlElement.get* (..))\"\r\n    \t\t+ \"&& !execution(* com.seleniumtests.uipage.htmlelements.PictureElement.get* (..))\"\r\n    \t\t+ \"&& !execution(* com.seleniumtests.uipage.htmlelements.HtmlElement.set* (..))\"\r\n    \t\t+ \"&& !execution(* com.seleniumtests.uipage.htmlelements.PictureElement.set* (..))\"\r\n    \t\t+ \"&& !execution(* com.seleniumtests.uipage.htmlelements.PictureElement.is* (..))\"\r\n    \t\t+ \"&& !execution(* com.seleniumtests.uipage.htmlelements.HtmlElement.find* (..))\"\r\n    \t\t+ \"&& !execution(* com.seleniumtests.uipage.htmlelements.HtmlElement.wait* (..))\"\r\n    \t\t+ \"&& !execution(* com.seleniumtests.uipage.htmlelements.HtmlElement.toHTML (..))\"\r\n    \t\t+ \"&& !execution(* com.seleniumtests.uipage.htmlelements.Table.find* (..))\"\r\n    \t\t)\r\n\tpublic Object logAction(ProceedingJoinPoint joinPoint) throws Throwable {\r\n\t\tString targetName;\r\n\t\t\r\n\t\ttry {\r\n\t\t\tHtmlElement element = (HtmlElement)joinPoint.getTarget();\r\n\t\t\ttargetName = element.toString();\r\n\t\t} catch (ClassCastException e) {\r\n\t\t\ttargetName = joinPoint.getTarget().toString();\r\n\t\t}\r\n\t\t\r\n\t\tObject reply = null;\r\n\t\tboolean actionFailed = false;\r\n\t\t\r\n\t\ttry {\r\n\t\t\treply = joinPoint.proceed(joinPoint.getArgs());\r\n\t\t} catch (Throwable e) {\r\n\t\t\tactionFailed = true;\r\n\t\t\tthrow e;\r\n\t\t} finally {\r\n\t\t\tif (isHtmlElementDirectlyCalled(Thread.currentThread().getStackTrace()) && TestLogging.getParentTestStep() != null) {\r\n\t\t\t\tString actionName = String.format(\"%s on %s %s\", joinPoint.getSignature().getName(), targetName, buildArgString(joinPoint));\r\n\t\t\t\tTestLogging.getParentTestStep().addAction(new TestAction(actionName, actionFailed));\r\n\t\t\t}\t\t\r\n\t\t}\r\n\t\treturn reply;\r\n\t}\r\n\t\r\n\t\/**\r\n\t * Intercept actions\r\n\t * @param joinPoint\r\n\t * @throws Throwable \r\n\t *\/\r\n\t@Around(\"execution(public * com.seleniumtests.uipage.PageObject..* (..)) \"\r\n    \t\t+ \"&& !execution(* com.seleniumtests.uipage.PageObject.get* (..))\"\r\n    \t\t+ \"&& !execution(* com.seleniumtests.uipage.PageObject.close* (..))\"\r\n    \t\t+ \"&& !execution(* com.seleniumtests.uipage.PageObject.param (..))\"\r\n    \t\t+ \"&& !execution(* com.seleniumtests.uipage.PageObject.assert* (..))\"\r\n    \t\t+ \"&& !execution(* com.seleniumtests.uipage.PageObject.capture*Snapshot (..))\"\r\n    \t\t)\r\n\tpublic Object logPageObjectAction(ProceedingJoinPoint joinPoint) throws Throwable {\r\n\t\tPageObject page = (PageObject)joinPoint.getTarget();\r\n\t\tString pageName = page == null ? \"\": \"on page \" + page.getClass().getSimpleName();\r\n\t\tString actionName = String.format(\"%s %s %s\", joinPoint.getSignature().getName(), pageName, buildArgString(joinPoint));\r\n\t\tObject reply = null;\r\n\t\tboolean actionFailed = false;\r\n\t\t\r\n\t\ttry {\r\n\t\t\treply = joinPoint.proceed(joinPoint.getArgs());\r\n\t\t} catch (Throwable e) {\r\n\t\t\tactionFailed = true;\r\n\t\t\tthrow e;\r\n\t\t} finally {\r\n\t\t\tif (TestLogging.getParentTestStep() != null) {\r\n\t\t\t\tTestLogging.getParentTestStep().addAction(new TestAction(actionName, actionFailed));\r\n\t\t\t}\r\n\t\t}\r\n\t\treturn reply;\r\n\t}\r\n\t\r\n\t\/**\r\n\t * Log any call to test steps (page object calls inside a PageObject subclass)\r\n\t * @param joinPoint\r\n\t * @throws Throwable \r\n\t *\/\r\n\t@Around(\"this(com.seleniumtests.uipage.PageObject) && \" +\t\t\t\t\t\/\/ caller is a PageObject\r\n\t\t\t\"(call(public * com.seleniumtests.uipage.PageObject+.* (..))\"\r\n\t\t\t+ \"&& !call(public * com.seleniumtests.uipage.PageObject.* (..)))\"\t\t\t\r\n\t\t\t)\r\n\tpublic Object logSubTestStep(ProceedingJoinPoint joinPoint) throws Throwable {\r\n\t\tObject reply = null;\r\n\t\t\r\n\t\tString stepName = String.format(\"%s %s\", joinPoint.getSignature().getName(), buildArgString(joinPoint));\r\n\t\tTestStep currentStep = new TestStep(stepName);\r\n\t\tTestStep previousParent = TestLogging.getParentTestStep();\r\n\t\tif (TestLogging.getParentTestStep() != null) {\r\n\t\t\tTestLogging.getParentTestStep().addStep(currentStep);\r\n\t\t\tTestLogging.setParentTestStep(currentStep);\r\n\t\t}\r\n\t\t\r\n\t\ttry {\r\n\t\t\treply = joinPoint.proceed(joinPoint.getArgs());\r\n\t\t} catch (Throwable e) {\r\n\t\t\tcurrentStep.setFailed(true);\r\n\t\t\tcurrentStep.setActionException(e);\r\n\t\t\tthrow e;\r\n\t\t} finally {\r\n\t\t\tif (TestLogging.getParentTestStep() != null && previousParent != null) {\r\n\t\t\t\tTestLogging.setParentTestStep(previousParent);\r\n\t\t\t}\t\t\t\t\r\n\t\t}\r\n\t\treturn reply;\r\n\t}\r\n\t\r\n\t\/**\r\n\t * Log calls to cucumber annotated methods\r\n\t * In case we are not inside a cucumber test, this method won't intercept anything because action will already be performed\r\n\t * by logNonCucumberTestStep\r\n\t * @param joinPoint\r\n\t * @return\r\n\t * @throws Throwable\r\n\t *\/\r\n\t@Pointcut(\"(execution(@cucumber.api.java.en.When public * * (..)) || execution(@cucumber.api.java.en.Given public * * (..))) && if()\")\r\n\tpublic static boolean isCucumberTest(ProceedingJoinPoint joinPoint) {\r\n\t\treturn SeleniumRobotRunner.isCucumberTest();\r\n\t}\r\n\t\r\n\t@Around(\"isCucumberTest(joinPoint)\")\r\n\tpublic Object logCucumberTestStep(ProceedingJoinPoint joinPoint) throws Throwable {\r\n\t\treturn logTestStep(joinPoint);\r\n\t}\t\r\n\t\r\n\t\/**\r\n\t * Log any call to test steps (page object calls inside a SeleniumTestPlan subclass)\r\n\t * @param joinPoint\r\n\t * @throws Throwable \r\n\t *\/\r\n\t@Around(\r\n\t\t\t\"(!this(com.seleniumtests.uipage.PageObject) && \" +\t\t\t\t\t\t\t\/\/ caller is not a PageObject\r\n\t\t\t\"(call(public * com.seleniumtests.uipage.PageObject+.* (..))\"\t\t\t\t\/\/ calls to methods in subclasses of PageObject class\r\n\t\t\t+ \"&& !call(public * com.seleniumtests.uipage.PageObject.* (..)))\"\t\t\t\/\/ not calls to methods inside PageObject class\r\n\t\t\t+ \"|| call(private * com.seleniumtests.uipage.PageObject.openPage (..)))\"\r\n\t\t\t)\r\n\tpublic Object logNonCucumberTestStep(ProceedingJoinPoint joinPoint) throws Throwable {\r\n\t\treturn logTestStep(joinPoint);\r\n\t}\r\n\t\r\n\tprivate Object logTestStep(ProceedingJoinPoint joinPoint)  throws Throwable {\r\n\t\tObject reply = null;\r\n\t\tboolean rootStep = false;\r\n\t\tTestStep previousParent = null;\r\n\t\tTestStep currentStep = new TestStep(buildRootStepName(joinPoint));\r\n\t\t\r\n\t\t\/\/ check if any root step is already registered\r\n\t\t\/\/ happens when using cucumber where a cucumber method can call an other method intercepted by this pointcut\r\n\t\t\/\/ ex: Given (url \"www.somesite.com\") calls \"open(url)\"\r\n\t\t\/\/ In this case, open becomes a child of Given\r\n\t\tif (TestLogging.getCurrentRootTestStep() == null) {\r\n\t\t\tTestLogging.setCurrentRootTestStep(currentStep); \/\/ will also set parent step\r\n\t\t\ttestStepStart = new Date();\r\n\t\t\trootStep = true;\r\n\t\t} else {\r\n\t\t\tTestLogging.getParentTestStep().addStep(currentStep);\r\n\t\t\tTestLogging.setParentTestStep(currentStep);\r\n\t\t\tpreviousParent = TestLogging.getParentTestStep();\r\n\t\t}\r\n\t\t\r\n\t\ttry {\r\n\t\t\treply = joinPoint.proceed(joinPoint.getArgs());\r\n\t\t} catch (Throwable e) {\r\n\t\t\tcurrentStep.setFailed(true);\r\n\t\t\tcurrentStep.setActionException(e);\r\n\t\t\tthrow e;\r\n\t\t} finally {\r\n\t\t\tif (rootStep) {\r\n\t\t\t\tTestLogging.getCurrentRootTestStep().setDuration(new Date().getTime() - testStepStart.getTime());\r\n\t\t\t\tTestLogging.logTestStep(TestLogging.getCurrentRootTestStep());\t\r\n\t\t\t} else {\r\n\t\t\t\tTestLogging.setParentTestStep(previousParent);\r\n\t\t\t}\r\n\t\t}\r\n\t\treturn reply;\r\n\t}\r\n\t\r\n\t@Around(\"execution(public * com.seleniumtests.reporter.TestLogging.logWebOutput (..))\"\r\n\t\t\t+ \" || execution(public * com.seleniumtests.reporter.TestLogging.logWebStep (..))\")\r\n\tpublic Object interceptLogging(ProceedingJoinPoint joinPoint) throws Throwable {\r\n\t\tif (TestLogging.getParentTestStep() != null) {\r\n\t\t\tBoolean actionFailed;\r\n\t\t\ttry {\r\n\t\t\t\tactionFailed = (Boolean)joinPoint.getArgs()[1];\r\n\t\t\t} catch (ClassCastException | IndexOutOfBoundsException e) {\r\n\t\t\t\tactionFailed = false;\r\n\t\t\t}\r\n\t\t\tTestLogging.getParentTestStep().addAction(new TestAction(joinPoint.getArgs()[0].toString(), actionFailed));\r\n\t\t\treturn null;\r\n\t\t} else {\r\n\t\t\treturn joinPoint.proceed(joinPoint.getArgs());\r\n\t\t}\r\n\t}\r\n\t\r\n\t\/**\r\n\t * Build argument string of the join point\r\n\t * @param joinPoint\r\n\t * @return\r\n\t *\/\r\n\tprivate String buildArgString(JoinPoint joinPoint) {\r\n\t\tString argString = \"\";\r\n\t\tif (joinPoint.getArgs().length > 0) {\r\n\t\t\targString = \"with args: (\";\r\n\t\t\tfor (Object arg: joinPoint.getArgs()) {\r\n\t\t\t\tif (arg instanceof CharSequence[]) {\r\n\t\t\t\t\targString += \"[\";\r\n\t\t\t\t\tfor (Object obj: (CharSequence[])arg) {\r\n\t\t\t\t\t\targString += obj.toString() + \",\";\r\n\t\t\t\t\t}\r\n\t\t\t\t\targString += \"]\";\r\n\t\t\t\t} else {\r\n\t\t\t\t\targString += (arg == null ? \"null\": arg.toString()) + \", \";\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t\targString += \")\";\r\n\t\t}\r\n\t\treturn argString;\r\n\t}\r\n\t\r\n\t\/**\r\n\t * Returns step name depending on step type\r\n\t * In case of cucumber step, get the annotation value. \r\n\t * \/!\\ THIS WORKS ONLY IF\r\n\t * \tparameters of the annotated method are the Object version ones. Use 'Integer' instead of 'int' for example, when declaring \r\n\t * a cucumber method which uses an integer as parameter. Else method discovery won't find it and step name will fall back to method name\r\n\t * \r\n\t * Else, get method name\r\n\t * @param joinPoint\r\n\t * @return\r\n\t *\/\r\n\tprivate String buildRootStepName(JoinPoint joinPoint) {\r\n\t\tString stepName = String.format(\"%s %s\", joinPoint.getSignature().getName(), buildArgString(joinPoint));\t\t\r\n\t\t\r\n\t\tList<Class<?>> parameters = new ArrayList<>();\r\n\t\tfor (Object arg: joinPoint.getArgs()) {\r\n\t\t\tparameters.add(arg == null ? Object.class: arg.getClass());\r\n\t\t}\r\n\t\tClass<?>[] pType  = parameters.toArray(new Class<?>[0]);\r\n\t\tMethod method;\r\n\t\ttry {\r\n\t\t\tmethod = joinPoint.getSignature().getDeclaringType().getDeclaredMethod(joinPoint.getSignature().getName(), pType);\r\n\t\t} catch (NoSuchMethodException | SecurityException e) {\r\n\t\t\treturn stepName;\r\n\t\t}\r\n\t\t\r\n\t\tfor (Annotation cucumberAnnotation: method.getAnnotations()) {\r\n\t\t\tif (cucumberAnnotation.annotationType().getCanonicalName().contains(\"cucumber.api.java.en\")) {\r\n\t\t\t\tstepName = getAnnotationValue(cucumberAnnotation);\r\n\t\t\t\tstepName += \" \" + buildArgString(joinPoint);\r\n\t\t\t\tbreak;\r\n\t\t\t}\r\n\t\t}\r\n\t\treturn stepName;\r\n\t}\r\n\t\r\n\t\/**\r\n\t * Returns the value of cucumber annotation to get corresponding text\r\n\t * @param annotation\r\n\t * @return\r\n\t *\/\r\n\tprivate String getAnnotationValue(Annotation annotation) {\r\n\t\treturn annotation.toString().replaceFirst(\"timeout=\\\\d+\", \"\")\r\n\t\t\t.replace(\"@\" + annotation.annotationType().getCanonicalName() + \"(\", \"\")\r\n\t\t\t.replaceFirst(\",?\\\\s?value=\", \"\")\r\n\t\t\t.replaceFirst(\"\\\\)$\", \"\");\r\n\t}\r\n\t\r\n\t\/**\r\n\t * Check whether this action has directly been performed on the HtmlElement (e.g: click)\r\n\t * or through an other type of element (e.g: clic on LinkElement, redirected to HtmlElement)\r\n\t * In this last case, do not log action as it has already been logged by the specific type of \r\n\t * element\r\n\t * @param stack\r\n\t * @return\r\n\t *\/\r\n\tprivate boolean isHtmlElementDirectlyCalled(StackTraceElement[] stack) {\r\n\t\tString stackClass = null;\r\n\t\tboolean specificElementFound = false;\r\n\t\tboolean htmlElementFound = false;\r\n\t\t\r\n\t\tfor(int i=0; i < stack.length; i++) {\r\n\t\t\t\r\n\t\t\t\/\/ when using aspects, class name may contain a \"$\", remove everything after that symbol\r\n\t\t\tstackClass = stack[i].getClassName().split(\"\\\\$\")[0];\r\n\t\t\tif (stackClass.equals(\"com.seleniumtests.uipage.htmlelements.HtmlElement\")) {\r\n\t\t\t\thtmlElementFound = true;\r\n\t\t\t} else if (stackClass.startsWith(\"com.seleniumtests.uipage.htmlelements.\")) {\r\n\t\t\t\tspecificElementFound = true;\r\n\t\t\t}\r\n\t\t}\r\n\t\tif (htmlElementFound && specificElementFound) {\r\n\t\t\treturn false;\r\n\t\t} else {\r\n\t\t\treturn true;\r\n\t\t}\r\n\t}\r\n}\r\n","old_contents":"\/**\r\n * Orignal work: Copyright 2015 www.seleniumtests.com\r\n * Modified work: Copyright 2016 www.infotel.com\r\n *\r\n * Licensed under the Apache License, Version 2.0 (the \"License\");\r\n * you may not use this file except in compliance with the License.\r\n * You may obtain a copy of the License at\r\n *\r\n * \thttp:\/\/www.apache.org\/licenses\/LICENSE-2.0\r\n *\r\n * Unless required by applicable law or agreed to in writing, software\r\n * distributed under the License is distributed on an \"AS IS\" BASIS,\r\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n * See the License for the specific language governing permissions and\r\n * limitations under the License.\r\n *\/\r\npackage com.seleniumtests.core.aspects;\r\n\r\nimport java.lang.annotation.Annotation;\r\nimport java.lang.reflect.Method;\r\nimport java.util.ArrayList;\r\nimport java.util.Date;\r\nimport java.util.List;\r\n\r\nimport org.aspectj.lang.JoinPoint;\r\nimport org.aspectj.lang.ProceedingJoinPoint;\r\nimport org.aspectj.lang.annotation.Around;\r\nimport org.aspectj.lang.annotation.Aspect;\r\nimport org.aspectj.lang.annotation.Pointcut;\r\n\r\nimport com.seleniumtests.core.runner.SeleniumRobotRunner;\r\nimport com.seleniumtests.reporter.TestAction;\r\nimport com.seleniumtests.reporter.TestLogging;\r\nimport com.seleniumtests.reporter.TestStep;\r\nimport com.seleniumtests.uipage.PageObject;\r\nimport com.seleniumtests.uipage.htmlelements.HtmlElement;\r\n\r\n\/**\r\n * Aspect to intercept calls to methods of HtmlElement. It allows to retry discovery and action \r\n * when something goes wrong with the driver\r\n * \r\n * @author behe\r\n *\r\n *\/\r\n@Aspect\r\npublic class LogAction {\r\n\r\n\tprivate Date testStepStart = null;\r\n\r\n\t\/**\r\n\t * Intercept actions done through browser\r\n\t * @param joinPoint\r\n\t * @throws Throwable \r\n\t *\/\r\n\t@Around(\"(execution(public * com.seleniumtests.uipage.htmlelements..*Element..* (..)) \"\r\n    \t\t+ \"|| execution(public * com.seleniumtests.uipage.htmlelements.SelectList..* (..)) \"\r\n    \t\t+ \"|| execution(public * com.seleniumtests.uipage.htmlelements.Table..* (..))) \"\r\n    \t\t+ \"&& !execution(* com.seleniumtests.uipage.htmlelements.HtmlElement.toString (..))\"\r\n    \t\t+ \"&& !execution(* com.seleniumtests.uipage.htmlelements.PictureElement.toString (..))\"\r\n    \t\t+ \"&& !execution(* com.seleniumtests.uipage.htmlelements.HtmlElement.get* (..))\"\r\n    \t\t+ \"&& !execution(* com.seleniumtests.uipage.htmlelements.PictureElement.get* (..))\"\r\n    \t\t+ \"&& !execution(* com.seleniumtests.uipage.htmlelements.HtmlElement.set* (..))\"\r\n    \t\t+ \"&& !execution(* com.seleniumtests.uipage.htmlelements.PictureElement.set* (..))\"\r\n    \t\t+ \"&& !execution(* com.seleniumtests.uipage.htmlelements.PictureElement.is* (..))\"\r\n    \t\t+ \"&& !execution(* com.seleniumtests.uipage.htmlelements.HtmlElement.find* (..))\"\r\n    \t\t+ \"&& !execution(* com.seleniumtests.uipage.htmlelements.HtmlElement.wait* (..))\"\r\n    \t\t+ \"&& !execution(* com.seleniumtests.uipage.htmlelements.HtmlElement.toHTML (..))\"\r\n    \t\t+ \"&& !execution(* com.seleniumtests.uipage.htmlelements.Table.find* (..))\"\r\n    \t\t)\r\n\tpublic Object logAction(ProceedingJoinPoint joinPoint) throws Throwable {\r\n\t\tString targetName;\r\n\t\t\r\n\t\ttry {\r\n\t\t\tHtmlElement element = (HtmlElement)joinPoint.getTarget();\r\n\t\t\ttargetName = element.toString();\r\n\t\t} catch (ClassCastException e) {\r\n\t\t\ttargetName = joinPoint.getTarget().toString();\r\n\t\t}\r\n\t\t\r\n\t\tObject reply = null;\r\n\t\tboolean actionFailed = false;\r\n\t\t\r\n\t\ttry {\r\n\t\t\treply = joinPoint.proceed(joinPoint.getArgs());\r\n\t\t} catch (Throwable e) {\r\n\t\t\tactionFailed = true;\r\n\t\t\tthrow e;\r\n\t\t} finally {\r\n\t\t\tif (isHtmlElementDirectlyCalled(Thread.currentThread().getStackTrace()) && TestLogging.getParentTestStep() != null) {\r\n\t\t\t\tString actionName = String.format(\"%s on %s %s\", joinPoint.getSignature().getName(), targetName, buildArgString(joinPoint));\r\n\t\t\t\tTestLogging.getParentTestStep().addAction(new TestAction(actionName, actionFailed));\r\n\t\t\t}\t\t\r\n\t\t}\r\n\t\treturn reply;\r\n\t}\r\n\t\r\n\t\/**\r\n\t * Intercept actions\r\n\t * @param joinPoint\r\n\t * @throws Throwable \r\n\t *\/\r\n\t@Around(\"execution(public * com.seleniumtests.uipage.PageObject..* (..)) \"\r\n    \t\t+ \"&& !execution(* com.seleniumtests.uipage.PageObject.get* (..))\"\r\n    \t\t+ \"&& !execution(* com.seleniumtests.uipage.PageObject.close* (..))\"\r\n    \t\t+ \"&& !execution(* com.seleniumtests.uipage.PageObject.param (..))\"\r\n    \t\t+ \"&& !execution(* com.seleniumtests.uipage.PageObject.assert* (..))\"\r\n    \t\t+ \"&& !execution(* com.seleniumtests.uipage.PageObject.capture*Snapshot (..))\"\r\n    \t\t)\r\n\tpublic Object logPageObjectAction(ProceedingJoinPoint joinPoint) throws Throwable {\r\n\t\tPageObject page = (PageObject)joinPoint.getTarget();\r\n\t\tString pageName = page == null ? \"\": \"on page \" + page.getClass().getSimpleName();\r\n\t\tString actionName = String.format(\"%s %s %s\", joinPoint.getSignature().getName(), pageName, buildArgString(joinPoint));\r\n\t\tObject reply = null;\r\n\t\tboolean actionFailed = false;\r\n\t\t\r\n\t\ttry {\r\n\t\t\treply = joinPoint.proceed(joinPoint.getArgs());\r\n\t\t} catch (Throwable e) {\r\n\t\t\tactionFailed = true;\r\n\t\t\tthrow e;\r\n\t\t} finally {\r\n\t\t\tif (TestLogging.getParentTestStep() != null) {\r\n\t\t\t\tTestLogging.getParentTestStep().addAction(new TestAction(actionName, actionFailed));\r\n\t\t\t}\r\n\t\t}\r\n\t\treturn reply;\r\n\t}\r\n\t\r\n\t\/**\r\n\t * Log any call to test steps (page object calls inside a PageObject subclass)\r\n\t * @param joinPoint\r\n\t * @throws Throwable \r\n\t *\/\r\n\t@Around(\"this(com.seleniumtests.uipage.PageObject) && \" +\t\t\t\t\t\/\/ caller is a PageObject\r\n\t\t\t\"(call(public * com.seleniumtests.uipage.PageObject+.* (..))\"\r\n\t\t\t+ \"&& !call(public * com.seleniumtests.uipage.PageObject.* (..)))\"\t\t\t\r\n\t\t\t)\r\n\tpublic Object logSubTestStep(ProceedingJoinPoint joinPoint) throws Throwable {\r\n\t\tObject reply = null;\r\n\t\t\r\n\t\tString stepName = String.format(\"%s %s\", joinPoint.getSignature().getName(), buildArgString(joinPoint));\r\n\t\tTestStep currentStep = new TestStep(stepName);\r\n\t\tTestStep previousParent = TestLogging.getParentTestStep();\r\n\t\tif (TestLogging.getParentTestStep() != null) {\r\n\t\t\tTestLogging.getParentTestStep().addStep(currentStep);\r\n\t\t\tTestLogging.setParentTestStep(currentStep);\r\n\t\t}\r\n\t\t\r\n\t\ttry {\r\n\t\t\treply = joinPoint.proceed(joinPoint.getArgs());\r\n\t\t} catch (Throwable e) {\r\n\t\t\tcurrentStep.setFailed(true);\r\n\t\t\tcurrentStep.setActionException(e);\r\n\t\t\tthrow e;\r\n\t\t} finally {\r\n\t\t\tif (TestLogging.getParentTestStep() != null && previousParent != null) {\r\n\t\t\t\tTestLogging.setParentTestStep(previousParent);\r\n\t\t\t}\t\t\t\t\r\n\t\t}\r\n\t\treturn reply;\r\n\t}\r\n\t\r\n\t\/**\r\n\t * Log calls to cucumber annotated methods\r\n\t * In case we are not inside a cucumber test, this method won't intercept anything because action will already be performed\r\n\t * by logNonCucumberTestStep\r\n\t * @param joinPoint\r\n\t * @return\r\n\t * @throws Throwable\r\n\t *\/\r\n\t@Pointcut(\"(execution(@cucumber.api.java.en.When public * * (..)) || execution(@cucumber.api.java.en.Given public * * (..))) && if()\")\r\n\tpublic static boolean isCucumberTest(ProceedingJoinPoint joinPoint) {\r\n\t\treturn SeleniumRobotRunner.isCucumberTest();\r\n\t}\r\n\t\r\n\t@Around(\"isCucumberTest(joinPoint)\")\r\n\tpublic Object logCucumberTestStep(ProceedingJoinPoint joinPoint) throws Throwable {\r\n\t\treturn logTestStep(joinPoint);\r\n\t}\t\r\n\t\r\n\t\/**\r\n\t * Log any call to test steps (page object calls inside a SeleniumTestPlan subclass)\r\n\t * @param joinPoint\r\n\t * @throws Throwable \r\n\t *\/\r\n\t@Around(\r\n\t\t\t\"(!this(com.seleniumtests.uipage.PageObject) && \" +\t\t\t\t\t\t\t\/\/ caller is not a PageObject\r\n\t\t\t\"(call(public * com.seleniumtests.uipage.PageObject+.* (..))\"\t\t\t\t\/\/ calls to methods in subclasses of PageObject class\r\n\t\t\t+ \"&& !call(public * com.seleniumtests.uipage.PageObject.* (..)))\"\t\t\t\/\/ not calls to methods inside PageObject class\r\n\t\t\t+ \"|| call(private * com.seleniumtests.uipage.PageObject.openPage (..)))\"\r\n\t\t\t)\r\n\tpublic Object logNonCucumberTestStep(ProceedingJoinPoint joinPoint) throws Throwable {\r\n\t\treturn logTestStep(joinPoint);\r\n\t}\r\n\t\r\n\tprivate Object logTestStep(ProceedingJoinPoint joinPoint)  throws Throwable {\r\n\t\tObject reply = null;\r\n\t\tboolean rootStep = false;\r\n\t\tTestStep previousParent = null;\r\n\t\tTestStep currentStep = new TestStep(buildRootStepName(joinPoint));\r\n\t\t\r\n\t\t\/\/ check if any root step is already registered\r\n\t\t\/\/ happens when using cucumber where a cucumber method can call an other method intercepted by this pointcut\r\n\t\t\/\/ ex: Given (url \"www.somesite.com\") calls \"open(url)\"\r\n\t\t\/\/ In this case, open becomes a child of Given\r\n\t\tif (TestLogging.getCurrentRootTestStep() == null) {\r\n\t\t\tTestLogging.setCurrentRootTestStep(currentStep); \/\/ will also set parent step\r\n\t\t\ttestStepStart = new Date();\r\n\t\t\trootStep = true;\r\n\t\t} else {\r\n\t\t\tTestLogging.getParentTestStep().addStep(currentStep);\r\n\t\t\tTestLogging.setParentTestStep(currentStep);\r\n\t\t\tpreviousParent = TestLogging.getParentTestStep();\r\n\t\t}\r\n\t\t\r\n\t\ttry {\r\n\t\t\treply = joinPoint.proceed(joinPoint.getArgs());\r\n\t\t} catch (Throwable e) {\r\n\t\t\tcurrentStep.setFailed(true);\r\n\t\t\tcurrentStep.setActionException(e);\r\n\t\t\tthrow e;\r\n\t\t} finally {\r\n\t\t\tif (rootStep) {\r\n\t\t\t\tTestLogging.getCurrentRootTestStep().setDuration(new Date().getTime() - testStepStart.getTime());\r\n\t\t\t\tTestLogging.logTestStep(TestLogging.getCurrentRootTestStep());\t\r\n\t\t\t} else {\r\n\t\t\t\tTestLogging.setParentTestStep(previousParent);\r\n\t\t\t}\r\n\t\t}\r\n\t\treturn reply;\r\n\t}\r\n\t\r\n\t@Around(\"execution(public * com.seleniumtests.reporter.TestLogging.logWebOutput (..))\"\r\n\t\t\t+ \" || execution(public * com.seleniumtests.reporter.TestLogging.logWebStep (..))\")\r\n\tpublic Object interceptLogging(ProceedingJoinPoint joinPoint) throws Throwable {\r\n\t\tif (TestLogging.getParentTestStep() != null) {\r\n\t\t\tBoolean actionFailed;\r\n\t\t\ttry {\r\n\t\t\t\tactionFailed = (Boolean)joinPoint.getArgs()[1];\r\n\t\t\t} catch (ClassCastException | IndexOutOfBoundsException e) {\r\n\t\t\t\tactionFailed = false;\r\n\t\t\t}\r\n\t\t\tTestLogging.getParentTestStep().addAction(new TestAction(joinPoint.getArgs()[0].toString(), actionFailed));\r\n\t\t\treturn null;\r\n\t\t} else {\r\n\t\t\treturn joinPoint.proceed(joinPoint.getArgs());\r\n\t\t}\r\n\t}\r\n\t\r\n\t\/**\r\n\t * Build argument string of the join point\r\n\t * @param joinPoint\r\n\t * @return\r\n\t *\/\r\n\tprivate String buildArgString(JoinPoint joinPoint) {\r\n\t\tString argString = \"\";\r\n\t\tif (joinPoint.getArgs().length > 0) {\r\n\t\t\targString = \"with args: (\";\r\n\t\t\tfor (Object arg: joinPoint.getArgs()) {\r\n\t\t\t\targString += (arg == null ? \"null\": arg.toString()) + \", \";\r\n\t\t\t}\r\n\t\t\targString += \")\";\r\n\t\t}\r\n\t\treturn argString;\r\n\t}\r\n\t\r\n\t\/**\r\n\t * Returns step name depending on step type\r\n\t * In case of cucumber step, get the annotation value. \r\n\t * \/!\\ THIS WORKS ONLY IF\r\n\t * \tparameters of the annotated method are the Object version ones. Use 'Integer' instead of 'int' for example, when declaring \r\n\t * a cucumber method which uses an integer as parameter. Else method discovery won't find it and step name will fall back to method name\r\n\t * \r\n\t * Else, get method name\r\n\t * @param joinPoint\r\n\t * @return\r\n\t *\/\r\n\tprivate String buildRootStepName(JoinPoint joinPoint) {\r\n\t\tString stepName = String.format(\"%s %s\", joinPoint.getSignature().getName(), buildArgString(joinPoint));\t\t\r\n\t\t\r\n\t\tList<Class<?>> parameters = new ArrayList<>();\r\n\t\tfor (Object arg: joinPoint.getArgs()) {\r\n\t\t\tparameters.add(arg == null ? Object.class: arg.getClass());\r\n\t\t}\r\n\t\tClass<?>[] pType  = parameters.toArray(new Class<?>[0]);\r\n\t\tMethod method;\r\n\t\ttry {\r\n\t\t\tmethod = joinPoint.getSignature().getDeclaringType().getDeclaredMethod(joinPoint.getSignature().getName(), pType);\r\n\t\t} catch (NoSuchMethodException | SecurityException e) {\r\n\t\t\treturn stepName;\r\n\t\t}\r\n\t\t\r\n\t\tfor (Annotation cucumberAnnotation: method.getAnnotations()) {\r\n\t\t\tif (cucumberAnnotation.annotationType().getCanonicalName().contains(\"cucumber.api.java.en\")) {\r\n\t\t\t\tstepName = getAnnotationValue(cucumberAnnotation);\r\n\t\t\t\tstepName += \" \" + buildArgString(joinPoint);\r\n\t\t\t\tbreak;\r\n\t\t\t}\r\n\t\t}\r\n\t\treturn stepName;\r\n\t}\r\n\t\r\n\t\/**\r\n\t * Returns the value of cucumber annotation to get corresponding text\r\n\t * @param annotation\r\n\t * @return\r\n\t *\/\r\n\tprivate String getAnnotationValue(Annotation annotation) {\r\n\t\treturn annotation.toString().replaceFirst(\"timeout=\\\\d+\", \"\")\r\n\t\t\t.replace(\"@\" + annotation.annotationType().getCanonicalName() + \"(\", \"\")\r\n\t\t\t.replaceFirst(\",?\\\\s?value=\", \"\")\r\n\t\t\t.replaceFirst(\"\\\\)$\", \"\");\r\n\t}\r\n\t\r\n\t\/**\r\n\t * Check whether this action has directly been performed on the HtmlElement (e.g: click)\r\n\t * or through an other type of element (e.g: clic on LinkElement, redirected to HtmlElement)\r\n\t * In this last case, do not log action as it has already been logged by the specific type of \r\n\t * element\r\n\t * @param stack\r\n\t * @return\r\n\t *\/\r\n\tprivate boolean isHtmlElementDirectlyCalled(StackTraceElement[] stack) {\r\n\t\tString stackClass = null;\r\n\t\tboolean specificElementFound = false;\r\n\t\tboolean htmlElementFound = false;\r\n\t\t\r\n\t\tfor(int i=0; i < stack.length; i++) {\r\n\t\t\t\r\n\t\t\t\/\/ when using aspects, class name may contain a \"$\", remove everything after that symbol\r\n\t\t\tstackClass = stack[i].getClassName().split(\"\\\\$\")[0];\r\n\t\t\tif (stackClass.equals(\"com.seleniumtests.uipage.htmlelements.HtmlElement\")) {\r\n\t\t\t\thtmlElementFound = true;\r\n\t\t\t} else if (stackClass.startsWith(\"com.seleniumtests.uipage.htmlelements.\")) {\r\n\t\t\t\tspecificElementFound = true;\r\n\t\t\t}\r\n\t\t}\r\n\t\tif (htmlElementFound && specificElementFound) {\r\n\t\t\treturn false;\r\n\t\t} else {\r\n\t\t\treturn true;\r\n\t\t}\r\n\t}\r\n}\r\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"1a531088da0b513313bda2617be3d2a7282567d9","subject":"Delete commented out code.","message":"Delete commented out code.\n","repos":"cansin\/chitterim","old_file":"src\/com\/chitter\/aspect\/Persistence.aj","new_file":"src\/com\/chitter\/aspect\/Persistence.aj","new_contents":"package com.chitter.aspect;\r\n\r\nimport java.util.ArrayList;\r\nimport java.util.Collections;\r\nimport java.util.HashSet;\r\nimport java.util.List;\r\nimport java.util.Set;\r\n\r\nimport javax.jdo.Extent;\r\nimport javax.jdo.JDOHelper;\r\nimport javax.jdo.PersistenceManager;\r\nimport javax.jdo.PersistenceManagerFactory;\r\nimport javax.jdo.Query;\r\nimport javax.jdo.Transaction;\r\nimport javax.jdo.annotations.PersistenceCapable;\r\nimport javax.servlet.http.HttpServletRequest;\r\nimport javax.servlet.http.HttpServletResponse;\r\n\r\nimport net.sf.jsr107cache.Cache;\r\nimport net.sf.jsr107cache.CacheException;\r\nimport net.sf.jsr107cache.CacheFactory;\r\nimport net.sf.jsr107cache.CacheManager;\r\n\r\nimport com.chitter.persistence.Announcement;\r\nimport com.chitter.persistence.UserAccount;\r\nimport com.chitter.persistence.UserStatistic;\r\nimport com.chitter.persistence.UserTwitterTimeline;\r\nimport com.chitter.utility.ExceptionPrinter;\r\n\r\npublic aspect Persistence {\t\r\n\tprivate static Cache cache;\r\n\tstatic\r\n\t{\r\n\t\ttry\r\n\t\t{\r\n\t\t\tCacheManager cacheManager = CacheManager.getInstance();\r\n\t\t\tCacheFactory cacheFactory = cacheManager.getCacheFactory();\r\n\t\t\tcache = cacheFactory.createCache(Collections.EMPTY_MAP);\r\n\t\t} catch (CacheException e) {\r\n\t\t\tExceptionPrinter.print(System.err, e, \"Couldn't create cache at PersistenceAspect\");\r\n\t\t}\r\n\t}\r\n\r\n\t\/** \r\n\t * captures ctors with more than one arg and\r\n\t * all setters of @PersistenceCapable objects.\r\n\t *\/\r\n\tpointcut pushObject(Object o): target(o) && (call(* (@PersistenceCapable *).set*(..)) || execution((@PersistenceCapable *).new(*,*,..)));\r\n\tpointcut pullObject(Object pk): args(pk) && call((@PersistenceCapable *).new(*));\r\n\tpointcut pullList(): call(List (@PersistenceCapable *).get*List());\r\n\tpointcut pullExtent(): call(Extent (@PersistenceCapable *).get*Extent());\r\n\r\n\tpointcut pmShouldClose() : call(* com.chitter..*Servlet.processRequest(HttpServletRequest,HttpServletResponse));\r\n\r\n\tpointcut withinEscapePersistence(): withincode(@EscapePersistence * *(..));\r\n\r\n\t@SuppressWarnings(\"all\")\r\n\tpublic static Extent UserAccount.getUserAccountExtent(){\r\n\t\treturn null;\r\n\t}\r\n\r\n\t@SuppressWarnings(\"all\")\r\n\tpublic static List UserAccount.getUserAccountList(){\r\n\t\treturn new ArrayList<UserAccount>();\r\n\t}\r\n\t\r\n\t@SuppressWarnings(\"all\")\r\n\tpublic static Set<String> UserAccount.getOnlineUserGtalkIds(){\r\n\t\tHashSet<String> onlineUserGtalkIdsSet = (HashSet<String>) cache.peek(\"onlineUserGtalkIdsSet\");\r\n\t\tif (onlineUserGtalkIdsSet == null) {\r\n\t\t\tonlineUserGtalkIdsSet = new HashSet<String>();\r\n\t\t\tcache.put(\"onlineUserGtalkIdsSet\",onlineUserGtalkIdsSet);\r\n\t\t}\r\n\t\treturn onlineUserGtalkIdsSet;\r\n\t}\r\n\t\r\n\t@SuppressWarnings(\"all\")\r\n\tpublic static List UserAccount.getTimelineActiveUsers(){\r\n\t\tPersistenceManager pm = getPM();\r\n\r\n\t\ttry {\r\n\t\t\tQuery q = pm.newQuery(UserAccount.class, \"this.isTimelineActive == true\");\r\n\t\t\treturn (List) q.execute();\r\n\t\t} catch (Exception e) {\r\n\t\t\tExceptionPrinter.print(System.err,e,\"I couldn't fetch timeline active users\");\r\n\t\t\treturn (List)(new ArrayList<Object>());\r\n\t\t} \r\n\t}\r\n\r\n\t@SuppressWarnings(\"all\")\r\n\tpublic static List UserAccount.getOnlineUsers(){\r\n\t\tPersistenceManager pm = getPM();\r\n\r\n\t\ttry {\r\n\t\t\tQuery q = pm.newQuery(UserAccount.class, \"this.isOnline == true\");\r\n\t\t\treturn (List) q.execute();\r\n\t\t} catch (Exception e) {\r\n\t\t\tExceptionPrinter.print(System.err,e,\"I couldn't fetch online users\");\r\n\t\t\treturn (List)(new ArrayList<Object>());\r\n\t\t} \r\n\t}\r\n\r\n\t@SuppressWarnings(\"all\")\r\n\tpublic static List UserStatistic.getUserStatisticList() {\r\n\t\treturn new ArrayList<UserStatistic> ();\r\n\t}\r\n\r\n\t@SuppressWarnings(\"all\")\r\n\tpublic static List UserTwitterTimeline.getUserTwitterTimelineList() {\r\n\t\treturn new ArrayList<UserTwitterTimeline> ();\r\n\t}\r\n\r\n\t@SuppressWarnings(\"all\")\r\n\tpublic static List Announcement.getAnnouncementList() {\r\n\t\treturn new ArrayList<Announcement> ();\r\n\t}\r\n\r\n\tprivate static final PersistenceManagerFactory PMF =\r\n\t\t\tJDOHelper.getPersistenceManagerFactory(\"transactions-optional\");\r\n\tprivate static final ThreadLocal<PersistenceManager> perThreadPM\r\n\t= new ThreadLocal<PersistenceManager>();\r\n\r\n\tprivate Persistence() {};\r\n\r\n\tpublic static PersistenceManager getPM() {\r\n\t\tPersistenceManager PM = perThreadPM.get();\r\n\t\tif (PM == null) {\r\n\t\t\tPM = PMF.getPersistenceManager();\r\n\t\t\tperThreadPM.set(PM);\r\n\t\t}\r\n\t\treturn PM;\r\n\t}\r\n\r\n\tafter(Object o) : pushObject(o) && !withinEscapePersistence(){\r\n\t\tPersistenceManager pm = getPM();\r\n\t\t\/**\r\n\t\t * First try to convert object to UserStatistic.\r\n\t\t * If you can, that means the persistent object was UserStatistic,\r\n\t\t * so you should flag statistics array as dirty.\r\n\t\t * (o.w. it will not persist changes to the array.)\r\n\t\t *\/\r\n\t\tif(o.getClass().equals(UserStatistic.class)) {\r\n\t\t\tUserStatistic statistic=(UserStatistic) o;\r\n\t\t\tJDOHelper.makeDirty(statistic, \"statistics\");\r\n\t\t}\r\n\t\tpm.makePersistent(o.getClass().cast(o));\r\n\t\tcache.put(o.getClass().getName() + \"_\" + pm.getObjectId(o), o);\r\n\t\tpm.flush();\r\n\t}    \r\n\r\n\t@SuppressWarnings(\"all\")\r\n\tObject around(Object pk) : pullObject(pk) && !withinEscapePersistence(){\r\n\t\tPersistenceManager pm = getPM();\r\n\t\ttry{\r\n\t\t\tObject r = cache.peek(thisJoinPointStaticPart.getSignature().getDeclaringTypeName() + \"_\" + pk);\r\n\t\t\tif (r == null) {\r\n\t\t\t\tr = pm.getObjectById(thisJoinPoint.getSignature().getDeclaringType(),pk);\r\n\t\t\t\tcache.put(thisJoinPointStaticPart.getSignature().getDeclaringTypeName() + \"_\" + pk, r);\r\n\t\t\t}\r\n\t\t\treturn r;\r\n\t\t} catch (Exception e) {\r\n\t\t\tcache.remove(thisJoinPointStaticPart.getSignature().getDeclaringTypeName() + \"_\" + pk);\r\n\t\t\tExceptionPrinter.print(System.err, e, \"I couldn't fetch persistent object for \" + \r\n\t\t\t\t\tthisJoinPointStaticPart.getSignature().getDeclaringTypeName() + \" \" + pk);\r\n\t\t\treturn null;\r\n\t\t} \r\n\t}\r\n\r\n\t@SuppressWarnings(\"all\")\r\n\tList around() : pullList() {\r\n\t\tPersistenceManager pm = getPM();\r\n\r\n\t\ttry {\r\n\t\t\tList list = (List) pm.newQuery(thisJoinPoint.getSignature().getDeclaringType()).execute();\r\n\t\t\treturn list;\r\n\t\t} catch (Exception e) {\r\n\t\t\tExceptionPrinter.print(System.err,e,\"I couldn't fetch persistent list for \"+getClass());\r\n\t\t\treturn (List)(new ArrayList<Object>());\r\n\t\t} \r\n\t}\r\n\r\n\tafter() : pmShouldClose() {\r\n\t\tPersistenceManager PM = perThreadPM.get();\r\n\t\tif (PM != null) {\r\n\t\t\tperThreadPM.remove();\r\n\t\t\tTransaction tx = PM.currentTransaction();\r\n\t\t\tif (tx.isActive()) {\r\n\t\t\t\ttx.rollback();\r\n\t\t\t}\r\n\t\t\tPM.close();\r\n\t\t}\r\n\t}\r\n\r\n}\r\n","old_contents":"package com.chitter.aspect;\r\n\r\nimport java.util.ArrayList;\r\nimport java.util.Collections;\r\nimport java.util.HashSet;\r\nimport java.util.List;\r\nimport java.util.Set;\r\n\r\nimport javax.jdo.Extent;\r\nimport javax.jdo.JDOHelper;\r\nimport javax.jdo.PersistenceManager;\r\nimport javax.jdo.PersistenceManagerFactory;\r\nimport javax.jdo.Query;\r\nimport javax.jdo.Transaction;\r\nimport javax.jdo.annotations.PersistenceCapable;\r\nimport javax.servlet.http.HttpServletRequest;\r\nimport javax.servlet.http.HttpServletResponse;\r\n\r\nimport net.sf.jsr107cache.Cache;\r\nimport net.sf.jsr107cache.CacheException;\r\nimport net.sf.jsr107cache.CacheFactory;\r\nimport net.sf.jsr107cache.CacheManager;\r\n\r\nimport com.chitter.persistence.Announcement;\r\nimport com.chitter.persistence.UserAccount;\r\nimport com.chitter.persistence.UserStatistic;\r\nimport com.chitter.persistence.UserTwitterTimeline;\r\nimport com.chitter.utility.ExceptionPrinter;\r\n\r\npublic aspect Persistence {\t\r\n\tprivate static Cache cache;\r\n\tstatic\r\n\t{\r\n\t\ttry\r\n\t\t{\r\n\t\t\tCacheManager cacheManager = CacheManager.getInstance();\r\n\t\t\tCacheFactory cacheFactory = cacheManager.getCacheFactory();\r\n\t\t\tcache = cacheFactory.createCache(Collections.EMPTY_MAP);\r\n\t\t} catch (CacheException e) {\r\n\t\t\tExceptionPrinter.print(System.err, e, \"Couldn't create cache at PersistenceAspect\");\r\n\t\t}\r\n\t}\r\n\r\n\t\/** \r\n\t * captures ctors with more than one arg and\r\n\t * all setters of @PersistenceCapable objects.\r\n\t *\/\r\n\tpointcut pushObject(Object o): target(o) && (call(* (@PersistenceCapable *).set*(..)) || execution((@PersistenceCapable *).new(*,*,..)));\r\n\tpointcut pullObject(Object pk): args(pk) && call((@PersistenceCapable *).new(*));\r\n\tpointcut pullList(): call(List (@PersistenceCapable *).get*List());\r\n\tpointcut pullExtent(): call(Extent (@PersistenceCapable *).get*Extent());\r\n\r\n\tpointcut pmShouldClose() : call(* com.chitter..*Servlet.processRequest(HttpServletRequest,HttpServletResponse));\r\n\r\n\tpointcut withinEscapePersistence(): withincode(@EscapePersistence * *(..));\r\n\r\n\t@SuppressWarnings(\"all\")\r\n\tpublic static Extent UserAccount.getUserAccountExtent(){\r\n\t\treturn null;\r\n\t}\r\n\r\n\t@SuppressWarnings(\"all\")\r\n\tpublic static List UserAccount.getUserAccountList(){\r\n\t\treturn new ArrayList<UserAccount>();\r\n\t}\r\n\t\r\n\t@SuppressWarnings(\"all\")\r\n\tpublic static Set<String> UserAccount.getOnlineUserGtalkIds(){\r\n\t\tHashSet<String> onlineUserGtalkIdsSet = (HashSet<String>) cache.peek(\"onlineUserGtalkIdsSet\");\r\n\t\tif (onlineUserGtalkIdsSet == null) {\r\n\t\t\tonlineUserGtalkIdsSet = new HashSet<String>();\r\n\t\t\tcache.put(\"onlineUserGtalkIdsSet\",onlineUserGtalkIdsSet);\r\n\t\t}\r\n\t\treturn onlineUserGtalkIdsSet;\r\n\t}\r\n\t\r\n\t@SuppressWarnings(\"all\")\r\n\tpublic static List UserAccount.getTimelineActiveUsers(){\r\n\t\tPersistenceManager pm = getPM();\r\n\r\n\t\ttry {\r\n\t\t\tQuery q = pm.newQuery(UserAccount.class, \"this.isTimelineActive == true\");\r\n\t\t\treturn (List) q.execute();\r\n\t\t} catch (Exception e) {\r\n\t\t\tExceptionPrinter.print(System.err,e,\"I couldn't fetch timeline active users\");\r\n\t\t\treturn (List)(new ArrayList<Object>());\r\n\t\t} \r\n\t}\r\n\r\n\t@SuppressWarnings(\"all\")\r\n\tpublic static List UserAccount.getOnlineUsers(){\r\n\t\tPersistenceManager pm = getPM();\r\n\r\n\t\ttry {\r\n\t\t\tQuery q = pm.newQuery(UserAccount.class, \"this.isOnline == true\");\r\n\t\t\treturn (List) q.execute();\r\n\t\t} catch (Exception e) {\r\n\t\t\tExceptionPrinter.print(System.err,e,\"I couldn't fetch online users\");\r\n\t\t\treturn (List)(new ArrayList<Object>());\r\n\t\t} \r\n\t}\r\n\r\n\t@SuppressWarnings(\"all\")\r\n\tpublic static List UserStatistic.getUserStatisticList() {\r\n\t\treturn new ArrayList<UserStatistic> ();\r\n\t}\r\n\r\n\t@SuppressWarnings(\"all\")\r\n\tpublic static List UserTwitterTimeline.getUserTwitterTimelineList() {\r\n\t\treturn new ArrayList<UserTwitterTimeline> ();\r\n\t}\r\n\r\n\t@SuppressWarnings(\"all\")\r\n\tpublic static List Announcement.getAnnouncementList() {\r\n\t\treturn new ArrayList<Announcement> ();\r\n\t}\r\n\r\n\tprivate static final PersistenceManagerFactory PMF =\r\n\t\t\tJDOHelper.getPersistenceManagerFactory(\"transactions-optional\");\r\n\tprivate static final ThreadLocal<PersistenceManager> perThreadPM\r\n\t= new ThreadLocal<PersistenceManager>();\r\n\r\n\tprivate Persistence() {};\r\n\r\n\tpublic static PersistenceManager getPM() {\r\n\t\tPersistenceManager PM = perThreadPM.get();\r\n\t\tif (PM == null) {\r\n\t\t\tPM = PMF.getPersistenceManager();\r\n\t\t\tperThreadPM.set(PM);\r\n\t\t}\r\n\t\treturn PM;\r\n\t}\r\n\r\n\tafter(Object o) : pushObject(o) && !withinEscapePersistence(){\r\n\t\tPersistenceManager pm = getPM();\r\n\t\t\/**\r\n\t\t * First try to convert object to UserStatistic.\r\n\t\t * If you can, that means the persistent object was UserStatistic,\r\n\t\t * so you should flag statistics array as dirty.\r\n\t\t * (o.w. it will not persist changes to the array.)\r\n\t\t *\/\r\n\t\tif(o.getClass().equals(UserStatistic.class)) {\r\n\t\t\tUserStatistic statistic=(UserStatistic) o;\r\n\t\t\tJDOHelper.makeDirty(statistic, \"statistics\");\r\n\t\t}\r\n\t\tpm.makePersistent(o.getClass().cast(o));\r\n\t\tcache.put(o.getClass().getName() + \"_\" + pm.getObjectId(o), o);\r\n\t\tpm.flush();\r\n\t}    \r\n\r\n\t@SuppressWarnings(\"all\")\r\n\tObject around(Object pk) : pullObject(pk) && !withinEscapePersistence(){\r\n\t\tPersistenceManager pm = getPM();\r\n\t\ttry{\r\n\t\t\tObject r = cache.peek(thisJoinPointStaticPart.getSignature().getDeclaringTypeName() + \"_\" + pk);\r\n\t\t\tif (r == null) {\r\n\t\t\t\tr = pm.getObjectById(thisJoinPoint.getSignature().getDeclaringType(),pk);\r\n\t\t\t\tcache.put(thisJoinPointStaticPart.getSignature().getDeclaringTypeName() + \"_\" + pk, r);\r\n\t\t\t}\r\n\t\t\treturn r;\r\n\t\t} catch (Exception e) {\r\n\t\t\tcache.remove(thisJoinPointStaticPart.getSignature().getDeclaringTypeName() + \"_\" + pk);\r\n\t\t\tExceptionPrinter.print(System.err, e, \"I couldn't fetch persistent object for \" + \r\n\t\t\t\t\tthisJoinPointStaticPart.getSignature().getDeclaringTypeName() + \" \" + pk);\r\n\t\t\treturn null;\r\n\t\t} \r\n\t}\r\n\r\n\t@SuppressWarnings(\"all\")\r\n\tList around() : pullList() {\r\n\t\tPersistenceManager pm = getPM();\r\n\r\n\t\ttry {\r\n\t\t\tList list = (List) pm.newQuery(thisJoinPoint.getSignature().getDeclaringType()).execute();\r\n\t\t\treturn list;\r\n\t\t} catch (Exception e) {\r\n\t\t\tExceptionPrinter.print(System.err,e,\"I couldn't fetch persistent list for \"+getClass());\r\n\t\t\treturn (List)(new ArrayList<Object>());\r\n\t\t} \r\n\t}\r\n\r\n\t@SuppressWarnings(\"all\")\r\n\t\/*Extent around() : pullExtent() {\r\n\t\tPersistenceManager pm = getPM();\r\n\r\n\t\ttry {\r\n\t\t\tExtent extent = pm.getExtent(thisJoinPoint.getSignature().getDeclaringType(), false);\r\n\t\t\treturn extent;\r\n\t\t} catch (Exception e) {\r\n\t\t\tExceptionPrinter.print(System.err, e, \"I couldn't fetch persistent extent for \"+getClass());\r\n\t\t\treturn null;\r\n\t\t} \r\n    }*\/\r\n\r\n\tafter() : pmShouldClose() {\r\n\t\tPersistenceManager PM = perThreadPM.get();\r\n\t\tif (PM != null) {\r\n\t\t\tperThreadPM.remove();\r\n\t\t\tTransaction tx = PM.currentTransaction();\r\n\t\t\tif (tx.isActive()) {\r\n\t\t\t\ttx.rollback();\r\n\t\t\t}\r\n\t\t\tPM.close();\r\n\t\t}\r\n\t}\r\n\r\n}\r\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"d60c2ebb457a1d655d40e0446d681ea92b7748b4","subject":"show millies","message":"show millies\n","repos":"mebigfatguy\/hashshmash","old_file":"aj\/com\/mebigfatguy\/hashshmash\/HashCollector.aj","new_file":"aj\/com\/mebigfatguy\/hashshmash\/HashCollector.aj","new_contents":"package com.mebigfatguy.hashshmash;\n\nimport java.io.BufferedWriter;\nimport java.io.File;\nimport java.io.FileOutputStream;\nimport java.io.OutputStreamWriter;\nimport java.io.PrintWriter;\nimport java.lang.reflect.Field;\nimport java.text.SimpleDateFormat;\nimport java.util.Date;\nimport java.util.HashMap;\nimport java.util.HashSet;\nimport java.util.Map;\nimport java.util.Map.Entry;\nimport java.util.Set;\nimport java.util.concurrent.ConcurrentHashMap;\n\npublic aspect HashCollector {\n    \n    private static final Journaller journaller = new Journaller();\n\n    after() returning (Map<?,?> m): call(HashMap.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashMapDetails details = new HashMapDetails(m, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    after() returning (Set<?> s): call(HashSet.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashSetDetails details = new HashSetDetails(s, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    before(): execution(public static void *.main(String[])) {\n        Class<?> c = HashCollector.class;\n    }\n}\n\nfinal class Journaller implements Runnable {\n    \n    private static final int SLEEP_TIME = 5 * 1000;\n    \n    private Field tableField;\n    private ConcurrentHashMap<HashDetails, HashDetails> hDetails = new ConcurrentHashMap<HashDetails, HashDetails>();\n    private PrintWriter writer;\n    private boolean operational = false;\n\n    public Journaller() {\n        try {\n            System.out.println(\"*************************\");\n            System.out.println(\"HASHSHMASH ASPECT ENABLED\");\n            System.out.println(\"*************************\");\n            \n            tableField = HashMap.class.getDeclaredField(\"table\");\n            tableField.setAccessible(true);\n              \n            File dir = new File(System.getProperty(\"user.home\"), \".hashshmash\");\n            dir.mkdirs();  \n            \n            writer = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(new File(dir, new Date().toString() + \".txt\")))));\n            \n            Thread t = new Thread(this);\n            t.setDaemon(true);\n            operational = true;\n            t.start();\n        } catch (Exception e) {\n        }\n    }\n    \n    public void add(HashDetails details) {\n        if (operational)\n            hDetails.put(details,  details);\n    }\n    \n    public void run() {\n        try {\n            while (!Thread.interrupted()) {\n                Thread.sleep(SLEEP_TIME);\n                \n                for (HashDetails details : hDetails.keySet()) {\n                    try {\n                        Map<?, ?> map = details.getMap();\n                        if (map != null) {\n                            int newSize = details.getMap().size();\n                            if (newSize == details.size) {\n                                Entry<?, ?>[] table = (Entry<?, ?>[])tableField.get(map);\n                                details.totalSlots = table.length;\n                                for (Entry<?, ?> e : table) {\n                                    if (e != null) {\n                                        details.usedSlots++;\n                                    }\n                                }\n                                writer.println(details);\n                                hDetails.remove(details);\n                            } else\n                                details.size = newSize;\n                        } else {\n                            hDetails.remove(details);\n                        }\n                    } catch (Exception e) {\n                        \/\/might get ConcurrentModificationException or such, just ignore\n                    }\n                }\n                writer.flush();\n            }\n        } catch (InterruptedException ie) {    \n        }\n    }\n}\n\nabstract class HashDetails {\n    private static SimpleDateFormat FORMATTER = new SimpleDateFormat(\"MM\/dd\/yyyy HH:mm:ss-SSS\");\n    \n    public Date allocTime;\n    public String caller;\n    public int size;\n    public int usedSlots;\n    public int totalSlots;\n    \n    public abstract Map<?,?> getMap();\n    \n    public abstract String getDetailType();\n    \n    public String toString() {\n        return getDetailType() + \"\\t\" + FORMATTER.format(allocTime) + \"\\t\" + caller + \"\\t\" + getMap().size() + \"\\t\" + totalSlots + \"\\t\" + usedSlots;\n    }\n}\n\nclass HashMapDetails extends HashDetails {\n    public Map<?, ?> map;\n\n    public HashMapDetails(Map<?, ?> m, Date d, String c) {\n        map = m;\n        allocTime = d;\n        caller = c;\n        size = map.size();\n    }\n    \n    public Map<?,?> getMap() {\n        return map;\n    }\n    \n    public String getDetailType() {\n        return map.getClass().getSimpleName();\n    }\n}\n\nclass HashSetDetails extends HashDetails {\n    private static Field MAP_FIELD;\n    static {\n        try {\n            MAP_FIELD = HashSet.class.getDeclaredField(\"map\");\n            MAP_FIELD.setAccessible(true);\n        } catch (Exception e) {\n            MAP_FIELD = null;\n        }\n    }\n    \n    public Set<?> set;\n\n    public HashSetDetails(Set<?> s, Date d, String c) {\n        set = s;\n        allocTime = d;\n        caller = c;\n        size = set.size();\n    }\n    \n    public Map<?,?> getMap() {\n        try {\n            if (MAP_FIELD == null)\n                return null;\n            \n            return (Map<?,?>) MAP_FIELD.get(set);\n        } catch (Exception e) {\n            return null;\n        }\n    }\n    \n    public String getDetailType() {\n        return set.getClass().getSimpleName();\n    }\n}\n","old_contents":"package com.mebigfatguy.hashshmash;\n\nimport java.io.BufferedWriter;\nimport java.io.File;\nimport java.io.FileOutputStream;\nimport java.io.OutputStreamWriter;\nimport java.io.PrintWriter;\nimport java.lang.reflect.Field;\nimport java.text.SimpleDateFormat;\nimport java.util.Date;\nimport java.util.HashMap;\nimport java.util.HashSet;\nimport java.util.Map;\nimport java.util.Map.Entry;\nimport java.util.Set;\nimport java.util.concurrent.ConcurrentHashMap;\n\npublic aspect HashCollector {\n    \n    private static final Journaller journaller = new Journaller();\n\n    after() returning (Map<?,?> m): call(HashMap.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashMapDetails details = new HashMapDetails(m, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    after() returning (Set<?> s): call(HashSet.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashSetDetails details = new HashSetDetails(s, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    before(): execution(public static void *.main(String[])) {\n        Class<?> c = HashCollector.class;\n    }\n}\n\nfinal class Journaller implements Runnable {\n    \n    private static final int SLEEP_TIME = 5 * 1000;\n    \n    private Field tableField;\n    private ConcurrentHashMap<HashDetails, HashDetails> hDetails = new ConcurrentHashMap<HashDetails, HashDetails>();\n    private PrintWriter writer;\n    private boolean operational = false;\n\n    public Journaller() {\n        try {\n            System.out.println(\"*************************\");\n            System.out.println(\"HASHSHMASH ASPECT ENABLED\");\n            System.out.println(\"*************************\");\n            \n            tableField = HashMap.class.getDeclaredField(\"table\");\n            tableField.setAccessible(true);\n              \n            File dir = new File(System.getProperty(\"user.home\"), \".hashshmash\");\n            dir.mkdirs();  \n            \n            writer = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(new File(dir, new Date().toString() + \".txt\")))));\n            \n            Thread t = new Thread(this);\n            t.setDaemon(true);\n            operational = true;\n            t.start();\n        } catch (Exception e) {\n        }\n    }\n    \n    public void add(HashDetails details) {\n        if (operational)\n            hDetails.put(details,  details);\n    }\n    \n    public void run() {\n        try {\n            while (!Thread.interrupted()) {\n                Thread.sleep(SLEEP_TIME);\n                \n                for (HashDetails details : hDetails.keySet()) {\n                    try {\n                        Map<?, ?> map = details.getMap();\n                        if (map != null) {\n                            int newSize = details.getMap().size();\n                            if (newSize == details.size) {\n                                Entry<?, ?>[] table = (Entry<?, ?>[])tableField.get(map);\n                                details.totalSlots = table.length;\n                                for (Entry<?, ?> e : table) {\n                                    if (e != null) {\n                                        details.usedSlots++;\n                                    }\n                                }\n                                writer.println(details);\n                                hDetails.remove(details);\n                            } else\n                                details.size = newSize;\n                        } else {\n                            hDetails.remove(details);\n                        }\n                    } catch (Exception e) {\n                        \/\/might get ConcurrentModificationException or such, just ignore\n                    }\n                }\n                writer.flush();\n            }\n        } catch (InterruptedException ie) {    \n        }\n    }\n}\n\nabstract class HashDetails {\n    private static SimpleDateFormat FORMATTER = new SimpleDateFormat(\"MM\/dd\/yyyy HH:mm:ss\");\n    \n    public Date allocTime;\n    public String caller;\n    public int size;\n    public int usedSlots;\n    public int totalSlots;\n    \n    public abstract Map<?,?> getMap();\n    \n    public abstract String getDetailType();\n    \n    public String toString() {\n        return getDetailType() + \"\\t\" + FORMATTER.format(allocTime) + \"\\t\" + caller + \"\\t\" + getMap().size() + \"\\t\" + totalSlots + \"\\t\" + usedSlots;\n    }\n}\n\nclass HashMapDetails extends HashDetails {\n    public Map<?, ?> map;\n\n    public HashMapDetails(Map<?, ?> m, Date d, String c) {\n        map = m;\n        allocTime = d;\n        caller = c;\n        size = map.size();\n    }\n    \n    public Map<?,?> getMap() {\n        return map;\n    }\n    \n    public String getDetailType() {\n        return map.getClass().getSimpleName();\n    }\n}\n\nclass HashSetDetails extends HashDetails {\n    private static Field MAP_FIELD;\n    static {\n        try {\n            MAP_FIELD = HashSet.class.getDeclaredField(\"map\");\n            MAP_FIELD.setAccessible(true);\n        } catch (Exception e) {\n            MAP_FIELD = null;\n        }\n    }\n    \n    public Set<?> set;\n\n    public HashSetDetails(Set<?> s, Date d, String c) {\n        set = s;\n        allocTime = d;\n        caller = c;\n        size = set.size();\n    }\n    \n    public Map<?,?> getMap() {\n        try {\n            if (MAP_FIELD == null)\n                return null;\n            \n            return (Map<?,?>) MAP_FIELD.get(set);\n        } catch (Exception e) {\n            return null;\n        }\n    }\n    \n    public String getDetailType() {\n        return set.getClass().getSimpleName();\n    }\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"38f2d8faa6190479f5ced817e2647acb5d931685","subject":"Renamed inter-type declared fields to avoid conflicts with possible implementing subclasses (id is a common field name)","message":"Renamed inter-type declared fields to avoid conflicts with possible implementing subclasses (id is a common field name)\n","repos":"SillyFreak\/Harmonic","old_file":"src\/main\/aspect\/at\/pria\/koza\/harmonic\/EntityConcern.aj","new_file":"src\/main\/aspect\/at\/pria\/koza\/harmonic\/EntityConcern.aj","new_contents":"\/**\n * EntityConcern.aj\n * \n * Created on 27.07.2013\n *\/\n\npackage at.pria.koza.harmonic;\n\n\n\/**\n * <p>\n * {@code EntityConcern} provides inter-type declarations and advices that ensure consistent behavior for all\n * {@linkplain Entity entities}.\n * <\/p>\n * \n * @version V1.0 27.07.2013\n * @author SillyFreak\n *\/\npublic aspect EntityConcern {\n    private Engine Entity.harmonic$engine;\n    private int    Entity.harmonic$id;\n    \n    public void Entity.setEngine(Engine engine, int id) {\n        harmonic$engine = engine;\n        harmonic$id = id;\n    }\n    \n    public Engine Entity.getEngine() {\n        return harmonic$engine;\n    }\n    \n    public int Entity.getId() {\n        return harmonic$id;\n    }\n    \n    \/**\n     * <p>\n     * Matches the initialization of an {@link Entity} class.\n     * <\/p>\n     * \n     * TODO an improvement would be to determine here if the constructor is the last one being called belonging to\n     * an {@code Entity} class.\n     * \n     * @param engine the {@link Engine} given as the first argument of the constructor\n     * @param entity the {@link Entity} being initialized\n     *\/\n    pointcut newEntity(Engine engine, Entity entity):\n        initialization(Entity+.new(Engine, ..)) && this(entity) && args(engine, ..);\n    \n    \/**\n     * <p>\n     * Advises {@link Entity} constructors to register the entity in their {@link Engine}. This happens before any\n     * other initialization of the entity class, i.e. the constructor can access engine and id via\n     * {@link Entity#getEngine() getEngine()} and {@link Entity#getId() getId()}. Specifically, it happens directly\n     * after the most specific non-entity superclass constructor was run.\n     * <\/p>\n     * \n     * TODO this is implemented by checking whether the engine was already set; the code is generated even for\n     * constructors calling a {@code this()} or {@code super()} entity constructors. Strictly speaking, this does\n     * not advise only those pointcuts where the code belongs.\n     * \n     * @param engine the {@link Engine} given as the first argument of the constructor\n     * @param entity the {@link Entity} being initialized\n     *\/\n    before(Engine engine, Entity entity): newEntity(engine, entity) {\n        if(entity.harmonic$engine == null) engine.put(entity);\n    }\n    \n    \/**\n     * <p>\n     * Declares it as an error to call {@link Entity#setEngine(Engine, int) setEngine()} by yourself. This is done\n     * by the {@link Engine#put(Entity) put()} method, and should be done nowhere else.\n     * <\/p>\n     *\/\n    declare error: !within(Engine) && call(public void Entity.setEngine(Engine, int)):\n        \"setEngine() must not be called explicitly; it is called by Engine\";\n    \n    \/**\n     * <p>\n     * Declares it as an error to call {@link Engine#put(Entity) put()} by yourself. This is done by this aspect,\n     * and should be done nowhere else.\n     * <\/p>\n     * <p>\n     * Note that projects that do not process this library's aspects have to call the method themselves; but as\n     * they don't process this aspect, they also don't get an error for doing so.\n     * <\/p>\n     *\/\n    declare error: !within(EntityConcern) && call(public void Engine.put(Entity)):\n        \"put() must not be called explicitly; it is called by an advice of Entity\";\n    \n    \/**\n     * <p>\n     * Declares it as an error to declare an entity constructor that does not use an Engine as its first parameter.\n     * This parameter is necessary for the advice above to work.\n     * <\/p>\n     * <p>\n     * Note that projects that do not process this library's aspects may do this another way; but as they don't\n     * process this aspect, they also don't get an error for doing so.\n     * <\/p>\n     *\/\n    declare error: execution(Entity+.new(..)) && !execution(Entity+.new(Engine, ..)):\n        \"Entity constructors must provide an engine as their first argument\";\n}\n","old_contents":"\/**\n * EntityConcern.aj\n * \n * Created on 27.07.2013\n *\/\n\npackage at.pria.koza.harmonic;\n\n\n\/**\n * <p>\n * {@code EntityConcern} provides inter-type declarations and advices that ensure consistent behavior for all\n * {@linkplain Entity entities}.\n * <\/p>\n * \n * @version V1.0 27.07.2013\n * @author SillyFreak\n *\/\npublic aspect EntityConcern {\n    private Engine Entity.engine;\n    private int    Entity.id;\n    \n    public void Entity.setEngine(Engine engine, int id) {\n        this.engine = engine;\n        this.id = id;\n    }\n    \n    public Engine Entity.getEngine() {\n        return engine;\n    }\n    \n    public int Entity.getId() {\n        return id;\n    }\n    \n    \/**\n     * <p>\n     * Matches the initialization of an {@link Entity} class.\n     * <\/p>\n     * \n     * TODO an improvement would be to determine here if the constructor is the last one being called belonging to\n     * an {@code Entity} class.\n     * \n     * @param engine the {@link Engine} given as the first argument of the constructor\n     * @param entity the {@link Entity} being initialized\n     *\/\n    pointcut newEntity(Engine engine, Entity entity):\n        initialization(Entity+.new(Engine, ..)) && this(entity) && args(engine, ..);\n    \n    \/**\n     * <p>\n     * Advises {@link Entity} constructors to register the entity in their {@link Engine}. This happens before any\n     * other initialization of the entity class, i.e. the constructor can access engine and id via\n     * {@link Entity#getEngine() getEngine()} and {@link Entity#getId() getId()}. Specifically, it happens directly\n     * after the most specific non-entity superclass constructor was run.\n     * <\/p>\n     * \n     * TODO this is implemented by checking whether the engine was already set; the code is generated even for\n     * constructors calling a {@code this()} or {@code super()} entity constructors. Strictly speaking, this does\n     * not advise only those pointcuts where the code belongs.\n     * \n     * @param engine the {@link Engine} given as the first argument of the constructor\n     * @param entity the {@link Entity} being initialized\n     *\/\n    before(Engine engine, Entity entity): newEntity(engine, entity) {\n        if(entity.engine == null) engine.put(entity);\n    }\n    \n    \/**\n     * <p>\n     * Declares it as an error to call {@link Entity#setEngine(Engine, int) setEngine()} by yourself. This is done\n     * by the {@link Engine#put(Entity) put()} method, and should be done nowhere else.\n     * <\/p>\n     *\/\n    declare error: !within(Engine) && call(public void Entity.setEngine(Engine, int)):\n        \"setEngine() must not be called explicitly; it is called by Engine\";\n    \n    \/**\n     * <p>\n     * Declares it as an error to call {@link Engine#put(Entity) put()} by yourself. This is done by this aspect,\n     * and should be done nowhere else.\n     * <\/p>\n     * <p>\n     * Note that projects that do not process this library's aspects have to call the method themselves; but as\n     * they don't process this aspect, they also don't get an error for doing so.\n     * <\/p>\n     *\/\n    declare error: !within(EntityConcern) && call(public void Engine.put(Entity)):\n        \"put() must not be called explicitly; it is called by an advice of Entity\";\n    \n    \/**\n     * <p>\n     * Declares it as an error to declare an entity constructor that does not use an Engine as its first parameter.\n     * This parameter is necessary for the advice above to work.\n     * <\/p>\n     * <p>\n     * Note that projects that do not process this library's aspects may do this another way; but as they don't\n     * process this aspect, they also don't get an error for doing so.\n     * <\/p>\n     *\/\n    declare error: execution(Entity+.new(..)) && !execution(Entity+.new(Engine, ..)):\n        \"Entity constructors must provide an engine as their first argument\";\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"2373f815f011d761e0ab0581f5adb37204aaedde","subject":"fixed aspect","message":"fixed aspect\n","repos":"spring-projects\/spring-data-graph","old_file":"src\/main\/java\/org\/springframework\/datastore\/graph\/neo4j\/spi\/node\/Neo4jNodeBacking.aj","new_file":"src\/main\/java\/org\/springframework\/datastore\/graph\/neo4j\/spi\/node\/Neo4jNodeBacking.aj","new_contents":"package org.springframework.datastore.graph.neo4j.spi.node;\n\nimport org.aspectj.lang.JoinPoint;\nimport org.aspectj.lang.reflect.FieldSignature;\nimport org.neo4j.graphdb.DynamicRelationshipType;\nimport org.neo4j.graphdb.Node;\nimport org.neo4j.graphdb.Relationship;\nimport org.neo4j.graphdb.RelationshipType;\nimport org.neo4j.graphdb.traversal.TraversalDescription;\nimport org.neo4j.graphdb.traversal.Traverser;\nimport org.springframework.beans.factory.annotation.Autowired;\nimport org.springframework.datastore.graph.api.GraphEntity;\nimport org.springframework.datastore.graph.api.NodeBacked;\nimport org.springframework.datastore.graph.api.RelationshipBacked;\nimport org.springframework.datastore.graph.neo4j.fieldaccess.*;\nimport org.springframework.datastore.graph.neo4j.support.GraphDatabaseContext;\nimport org.springframework.persistence.support.AbstractTypeAnnotatingMixinFields;\n\nimport java.lang.reflect.Field;\n\nimport static org.springframework.datastore.graph.neo4j.fieldaccess.DoReturn.unwrap;\nimport org.springframework.datastore.graph.neo4j.fieldaccess.DetachableEntityStateAccessorsFactory;\n\n\/**\n * Aspect to turn an object annotated with GraphEntity into a graph entity using Neo4J.\n * Delegates all field access (except for fields assumed to be transient)\n * to an underlying Neo4 graph node.\n * \n * @author Rod Johnson\n *\/\npublic aspect Neo4jNodeBacking extends AbstractTypeAnnotatingMixinFields<GraphEntity, NodeBacked> {\n    private GraphDatabaseContext graphDatabaseContext;\n    private DetachableEntityStateAccessorsFactory entityStateAccessorsFactory;\n\n    @Autowired\n\tpublic void init(GraphDatabaseContext ctx, DetachableEntityStateAccessorsFactory entityStateAccessorsFactory) {\n        this.graphDatabaseContext = ctx;\n        this.entityStateAccessorsFactory = entityStateAccessorsFactory;\n\t}\n\n\t\/\/-------------------------------------------------------------------------\n\t\/\/ Advise user-defined constructors of NodeBacked objects to create a new Neo4J backing node\n\t\/\/-------------------------------------------------------------------------\n\tpointcut arbitraryUserConstructorOfNodeBackedObject(NodeBacked entity) : \n\t\texecution((@GraphEntity *).new(..)) &&\n\t\t!execution((@GraphEntity *).new(Node)) &&\n\t\tthis(entity);  \/\/ && !cflow(execution(* fromStateInternal(..));\n\t\n\t\n\t\/\/ Create a new node in the Graph if no Node was passed in a constructor\n\tbefore(NodeBacked entity) : arbitraryUserConstructorOfNodeBackedObject(entity) {\n        entity.underlyingState = entityStateAccessorsFactory.getEntityStateAccessors(entity);\n        if (graphDatabaseContext.transactionIsRunning()) {\n            entity.underlyingState.createAndAssignNode();\n        } else {\n            log.warn(\"New Nodebacked created outside of transaction \"+ entity.getClass());\n        }\n\t}\n\n    \/\/ Introduced field\n\tprivate Node NodeBacked.underlyingNode;\n    private EntityStateAccessors<NodeBacked> NodeBacked.underlyingState;\n\n\tpublic void NodeBacked.setUnderlyingNode(Node n) {\n\t\tthis.underlyingNode = n;\n        if (this.underlyingState == null) {\n            this.underlyingState = Neo4jNodeBacking.aspectOf().entityStateAccessorsFactory.getEntityStateAccessors(this);\n        } else {\n            this.underlyingState.setNode(n);\n        }\n\t}\n\t\n\tpublic Node NodeBacked.getUnderlyingNode() {\n\t\treturn underlyingNode;\n\t}\n\t\n    public boolean NodeBacked.hasUnderlyingNode() {\n        return underlyingNode!=null;\n    }\n\n\tpublic Relationship NodeBacked.relateTo(NodeBacked nb, RelationshipType type) {\n\t\treturn this.underlyingNode.createRelationshipTo(nb.getUnderlyingNode(), type);\n\t}\n\n\tpublic Long NodeBacked.getNodeId() {\n        if (!hasUnderlyingNode()) return null;\n\t\treturn underlyingNode.getId();\n\t}\n\n    public  Iterable<? extends NodeBacked> NodeBacked.find(final Class<? extends NodeBacked> targetType, TraversalDescription traversalDescription) {\n        if (!hasUnderlyingNode()) throw new IllegalStateException(\"No node attached to \" + this);\n        final Traverser traverser = traversalDescription.traverse(this.getUnderlyingNode());\n        return new NodeBackedNodeIterableWrapper(traverser, targetType, Neo4jNodeBacking.aspectOf().graphDatabaseContext);\n    }\n    \/* todo Andy Clement\n    public Iterable<? extends NodeBacked> NodeBacked.traverse(TraversalDescription traversalDescription) {\n        final Class<? extends NodeBacked> target = this.getClass();\n        return this.traverse(target,traversalDescription);\n    }\n    *\/\n\n    \/* todo Andy Clement\n    public <R extends RelationshipBacked, N extends NodeBacked> R NodeBacked.relateTo(N node, Class<R> relationshipType, String type) {\n        Relationship rel = this.getUnderlyingNode().createRelationshipTo(node.getUnderlyingNode(), DynamicRelationshipType.withName(type));\n        Neo4jNodeBacking.aspectOf().relationshipEntityInstantiator.createEntityFromState(rel, relationshipType);\n    }\n    *\/\n    public RelationshipBacked NodeBacked.relateTo(NodeBacked node, Class<? extends RelationshipBacked> relationshipType, String type) {\n        Relationship rel = this.getUnderlyingNode().createRelationshipTo(node.getUnderlyingNode(), DynamicRelationshipType.withName(type));\n        return Neo4jNodeBacking.aspectOf().graphDatabaseContext.createEntityFromState(rel, relationshipType);\n    }\n\n    public RelationshipBacked NodeBacked.getRelationshipTo(NodeBacked node, Class<? extends RelationshipBacked> relationshipType, String type) {\n        Node myNode=this.getUnderlyingNode();\n        Node otherNode=node.getUnderlyingNode();\n        for (Relationship rel : this.getUnderlyingNode().getRelationships(DynamicRelationshipType.withName(type))) {\n            if (rel.getOtherNode(myNode).equals(otherNode)) return Neo4jNodeBacking.aspectOf().graphDatabaseContext.createEntityFromState(rel, relationshipType);\n        }\n        return null;\n    }\n\n\tpublic final boolean NodeBacked.equals(Object obj) {\n        if (obj == this) return true;\n        if (!hasUnderlyingNode()) return false;\n\t\tif (obj instanceof NodeBacked) {\n\t\t\treturn this.getUnderlyingNode().equals(((NodeBacked) obj).getUnderlyingNode());\n\t\t}\n\t\treturn false;\n\t}\n\t\n\tpublic final int NodeBacked.hashCode() {\n        if (!hasUnderlyingNode()) return System.identityHashCode(this);\n\t\treturn getUnderlyingNode().hashCode();\n\t}\n\n    Object around(NodeBacked entity): entityFieldGet(entity) {\n        Object result=entity.underlyingState.getValue(field(thisJoinPoint));\n        if (result instanceof DoReturn) return unwrap(result);\n        return proceed(entity);\n    }\n\n    Object around(NodeBacked entity, Object newVal) : entityFieldSet(entity, newVal) {\n        Object result=entity.underlyingState.setValue(field(thisJoinPoint),newVal);\n        if (result instanceof DoReturn) return unwrap(result);\n        return proceed(entity,result);\n\t}\n\n    Field field(JoinPoint joinPoint) {\n        FieldSignature fieldSignature = (FieldSignature)joinPoint.getSignature();\n        return fieldSignature.getField();\n    }\n}\n","old_contents":"package org.springframework.datastore.graph.neo4j.spi.node;\n\nimport org.aspectj.lang.JoinPoint;\nimport org.aspectj.lang.reflect.FieldSignature;\nimport org.neo4j.graphdb.DynamicRelationshipType;\nimport org.neo4j.graphdb.Node;\nimport org.neo4j.graphdb.Relationship;\nimport org.neo4j.graphdb.RelationshipType;\nimport org.neo4j.graphdb.traversal.TraversalDescription;\nimport org.neo4j.graphdb.traversal.Traverser;\nimport org.springframework.beans.factory.annotation.Autowired;\nimport org.springframework.datastore.graph.api.GraphEntity;\nimport org.springframework.datastore.graph.api.NodeBacked;\nimport org.springframework.datastore.graph.api.RelationshipBacked;\nimport org.springframework.datastore.graph.neo4j.fieldaccess.*;\nimport org.springframework.datastore.graph.neo4j.support.GraphDatabaseContext;\nimport org.springframework.persistence.support.AbstractTypeAnnotatingMixinFields;\n\nimport java.lang.reflect.Field;\n\nimport static org.springframework.datastore.graph.neo4j.fieldaccess.DoReturn.unwrap;\nimport org.springframework.datastore.graph.neo4j.fieldaccess.DetachableEntityStateAccessorsFactory;\n\n\/**\n * Aspect to turn an object annotated with GraphEntity into a graph entity using Neo4J.\n * Delegates all field access (except for fields assumed to be transient)\n * to an underlying Neo4 graph node.\n * \n * @author Rod Johnson\n *\/\npublic aspect Neo4jNodeBacking extends AbstractTypeAnnotatingMixinFields<GraphEntity, NodeBacked> {\n    private GraphDatabaseContext graphDatabaseContext;\n    private DetachableEntityStateAccessorsFactory entityStateAccessorsFactory;\n\n    @Autowired\n\tpublic void init(GraphDatabaseContext ctx, DetachableEntityStateAccessorsFactory entityStateAccessorsFactory) {\n        this.graphDatabaseContext = ctx;\n        this.entityStateAccessorsFactory = entityStateAccessorsFactory;\n\t}\n\n\t\/\/-------------------------------------------------------------------------\n\t\/\/ Advise user-defined constructors of NodeBacked objects to create a new Neo4J backing node\n\t\/\/-------------------------------------------------------------------------\n\tpointcut arbitraryUserConstructorOfNodeBackedObject(NodeBacked entity) : \n\t\texecution((@GraphEntity *).new(..)) &&\n\t\t!execution((@GraphEntity *).new(Node)) &&\n\t\tthis(entity);  \/\/ && !cflow(execution(* fromStateInternal(..));\n\t\n\t\n\t\/\/ Create a new node in the Graph if no Node was passed in a constructor\n\tbefore(NodeBacked entity) : arbitraryUserConstructorOfNodeBackedObject(entity) {\n        entity.underlyingState = entityStateAccessorsFactory.getEntityStateAccessors(entity);\n        if (graphDatabaseContext.transactionIsRunning()) {\n            entity.underlyingState.createAndAssignNode();\n        } else {\n            log.warn(\"New Nodebacked created outside of transaction \"+ entity.getClass());\n        }\n\t}\n\n    \/\/ Introduced field\n\tprivate Node NodeBacked.underlyingNode;\n    private EntityStateAccessors<NodeBacked> NodeBacked.underlyingState;\n\n\tpublic void NodeBacked.setUnderlyingNode(Node n) {\n\t\tthis.underlyingNode = n;\n        if (this.underlyingState == null) {\n            this.underlyingState = entityStateAccessorsFactory.getEntityStateAccessors(this);\n        } else {\n            this.underlyingState.setNode(n);\n        }\n\t}\n\t\n\tpublic Node NodeBacked.getUnderlyingNode() {\n\t\treturn underlyingNode;\n\t}\n\t\n    public boolean NodeBacked.hasUnderlyingNode() {\n        return underlyingNode!=null;\n    }\n\n\tpublic Relationship NodeBacked.relateTo(NodeBacked nb, RelationshipType type) {\n\t\treturn this.underlyingNode.createRelationshipTo(nb.getUnderlyingNode(), type);\n\t}\n\n\tpublic Long NodeBacked.getNodeId() {\n        if (!hasUnderlyingNode()) return null;\n\t\treturn underlyingNode.getId();\n\t}\n\n    public  Iterable<? extends NodeBacked> NodeBacked.find(final Class<? extends NodeBacked> targetType, TraversalDescription traversalDescription) {\n        if (!hasUnderlyingNode()) throw new IllegalStateException(\"No node attached to \" + this);\n        final Traverser traverser = traversalDescription.traverse(this.getUnderlyingNode());\n        return new NodeBackedNodeIterableWrapper(traverser, targetType, Neo4jNodeBacking.aspectOf().graphDatabaseContext);\n    }\n    \/* todo Andy Clement\n    public Iterable<? extends NodeBacked> NodeBacked.traverse(TraversalDescription traversalDescription) {\n        final Class<? extends NodeBacked> target = this.getClass();\n        return this.traverse(target,traversalDescription);\n    }\n    *\/\n\n    \/* todo Andy Clement\n    public <R extends RelationshipBacked, N extends NodeBacked> R NodeBacked.relateTo(N node, Class<R> relationshipType, String type) {\n        Relationship rel = this.getUnderlyingNode().createRelationshipTo(node.getUnderlyingNode(), DynamicRelationshipType.withName(type));\n        Neo4jNodeBacking.aspectOf().relationshipEntityInstantiator.createEntityFromState(rel, relationshipType);\n    }\n    *\/\n    public RelationshipBacked NodeBacked.relateTo(NodeBacked node, Class<? extends RelationshipBacked> relationshipType, String type) {\n        Relationship rel = this.getUnderlyingNode().createRelationshipTo(node.getUnderlyingNode(), DynamicRelationshipType.withName(type));\n        return Neo4jNodeBacking.aspectOf().graphDatabaseContext.createEntityFromState(rel, relationshipType);\n    }\n\n    public RelationshipBacked NodeBacked.getRelationshipTo(NodeBacked node, Class<? extends RelationshipBacked> relationshipType, String type) {\n        Node myNode=this.getUnderlyingNode();\n        Node otherNode=node.getUnderlyingNode();\n        for (Relationship rel : this.getUnderlyingNode().getRelationships(DynamicRelationshipType.withName(type))) {\n            if (rel.getOtherNode(myNode).equals(otherNode)) return Neo4jNodeBacking.aspectOf().graphDatabaseContext.createEntityFromState(rel, relationshipType);\n        }\n        return null;\n    }\n\n\tpublic final boolean NodeBacked.equals(Object obj) {\n        if (obj == this) return true;\n        if (!hasUnderlyingNode()) return false;\n\t\tif (obj instanceof NodeBacked) {\n\t\t\treturn this.getUnderlyingNode().equals(((NodeBacked) obj).getUnderlyingNode());\n\t\t}\n\t\treturn false;\n\t}\n\t\n\tpublic final int NodeBacked.hashCode() {\n        if (!hasUnderlyingNode()) return System.identityHashCode(this);\n\t\treturn getUnderlyingNode().hashCode();\n\t}\n\n    Object around(NodeBacked entity): entityFieldGet(entity) {\n        Object result=entity.underlyingState.getValue(field(thisJoinPoint));\n        if (result instanceof DoReturn) return unwrap(result);\n        return proceed(entity);\n    }\n\n    Object around(NodeBacked entity, Object newVal) : entityFieldSet(entity, newVal) {\n        Object result=entity.underlyingState.setValue(field(thisJoinPoint),newVal);\n        if (result instanceof DoReturn) return unwrap(result);\n        return proceed(entity,result);\n\t}\n\n    Field field(JoinPoint joinPoint) {\n        FieldSignature fieldSignature = (FieldSignature)joinPoint.getSignature();\n        return fieldSignature.getField();\n    }\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"98ef6c6ee72660f6887e5ce648b5b3f369043ea2","subject":"Tweak X-Trace API call logging","message":"Tweak X-Trace API call logging\n","repos":"brownsys\/tracing-framework,brownsys\/tracing-framework,brownsys\/tracing-framework,brownsys\/tracing-framework,brownsys\/tracing-framework,brownsys\/tracing-framework,brownsys\/tracing-framework","old_file":"retro\/aspects\/src\/main\/aspect\/edu\/brown\/cs\/systems\/retro\/aspects\/cpu\/XTraceAPICalls.aj","new_file":"retro\/aspects\/src\/main\/aspect\/edu\/brown\/cs\/systems\/retro\/aspects\/cpu\/XTraceAPICalls.aj","new_contents":"package edu.brown.cs.systems.retro.aspects.cpu;\n\nimport edu.brown.cs.systems.baggage.Baggage;\nimport edu.brown.cs.systems.baggage.DetachedBaggage;\nimport edu.brown.cs.systems.retro.resources.CPUTracking;\nimport edu.brown.cs.systems.retro.resources.Execution;\nimport edu.brown.cs.systems.retro.throttling.ThrottlingPoint;\n\n\/** Intercepts X-Trace API calls in user code. Don't apply these pointcuts to the X-Trace library itself!\n * \n * @author jon *\/\npublic aspect XTraceAPICalls {\n\n    before(): call(void Baggage.start(..)) || call(DetachedBaggage Baggage.swap(..)) {\n        Execution.CPU.finished(thisJoinPointStaticPart);\n    }\n    \n    after(): call(void Baggage.start(..)) || call(DetachedBaggage Baggage.swap(..)) {\n        Execution.CPU.starting(thisJoinPointStaticPart);\n    }\n\n    \/** Whenever the XTraceContext is cleared, log an event to indicate the end of CPU processing bounds *\/\n    before(): call(* Baggage.stop(..)) || call(* Baggage.discard(..)) {\n        Execution.CPU.finished(thisJoinPointStaticPart);\n    }\n\n    before(): call(void ThrottlingPoint+.throttle()) {\n        CPUTracking.finishTracking(); \/\/ finish and log current cycles\n    }\n\n    after():  call(void ThrottlingPoint+.throttle()) {\n        CPUTracking.startTracking(); \/\/ start tracking cycles\n    }\n\n}\n","old_contents":"package edu.brown.cs.systems.retro.aspects.cpu;\n\nimport edu.brown.cs.systems.baggage.Baggage;\nimport edu.brown.cs.systems.baggage.DetachedBaggage;\nimport edu.brown.cs.systems.retro.resources.CPUTracking;\nimport edu.brown.cs.systems.retro.resources.Execution;\nimport edu.brown.cs.systems.retro.throttling.ThrottlingPoint;\n\n\/** Intercepts X-Trace API calls in user code. Don't apply these pointcuts to the X-Trace library itself!\n * \n * @author jon *\/\npublic aspect XTraceAPICalls {\n\n    before(): call(void Baggage.start(..)) || call(DetachedBaggage Baggage.swap(..)) {\n        Execution.CPU.finished(thisJoinPointStaticPart);\n    }\n\n    after(): call(void Baggage.start(..)) || call(DetachedBaggage Baggage.swap(..)) || call(* Baggage.join(..)) {\n        Execution.CPU.starting(thisJoinPointStaticPart);\n    }\n\n    \/** Whenever the XTraceContext is cleared, log an event to indicate the end of CPU processing bounds *\/\n    before(): call(* Baggage.stop(..)) || call(* Baggage.discard(..)) {\n        Execution.CPU.finished(thisJoinPointStaticPart);\n    }\n\n    before(): call(void ThrottlingPoint+.throttle()) {\n        CPUTracking.finishTracking(); \/\/ finish and log current cycles\n    }\n\n    after():  call(void ThrottlingPoint+.throttle()) {\n        CPUTracking.startTracking(); \/\/ start tracking cycles\n    }\n\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"882c1d8c24a5186bf3b9ff6e6a68f81fc1af8b80","subject":"Added block-movement instrumentation","message":"Added block-movement instrumentation\n","repos":"Aloja\/AOP4Hadoop","old_file":"src\/1.0.3\/Aspectj.aj","new_file":"src\/1.0.3\/Aspectj.aj","new_contents":"import java.io.*;\nimport java.util.*;\nimport java.lang.management.ManagementFactory;\nimport java.sql.Timestamp;\nimport java.text.SimpleDateFormat;\nimport java.net.InetAddress;\nimport java.lang.ClassLoader;\nimport org.apache.hadoop.io.DataInputBuffer;\nimport org.apache.hadoop.mapred.TaskStatus;\nimport org.apache.hadoop.fs.permission.FsPermission;\nimport org.apache.hadoop.util.Progressable;\nimport org.apache.hadoop.hdfs.protocol.DatanodeInfo;\nimport org.apache.hadoop.util.DataChecksum;\nimport java.net.Socket;\n\n\nimport org.apache.hadoop.security.token.Token;\nimport org.apache.hadoop.security.token.TokenIdentifier;\nimport org.apache.hadoop.hdfs.security.token.block.BlockTokenIdentifier;\n\n\nimport org.apache.hadoop.fs.FSDataInputStream;\nimport org.apache.hadoop.hdfs.DFSClient;\n\n\nimport org.apache.commons.logging.Log;\nimport org.apache.commons.logging.LogFactory;\n\n\nimport org.apache.hadoop.conf.Configuration;\n\n\/**\n *\n * @author Alejandro\n *\/\n\naspect AlojaAspect {\t\t\n\n\tprivate static final Log LOG = LogFactory.getLog(AlojaAspect.class);\n\n\t\/*\n\tFUNCTIONS\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\t\n\tprivate static long getPID() {\n\t\tString name = java.lang.management.ManagementFactory.getRuntimeMXBean().getName();\n\t\treturn Long.parseLong(name.split(\"@\")[0]);\n\t}\n\n\tprivate void instrumentation(String event, String when) {\n\n\t\tinstrumentation(event, when, \"\");\n\n\t}\n\tprivate void instrumentation(String event, String when, String additional) {\n\t\ttry {\n\t\t\t\/\/Add hostname\n\t\t\tString log = InetAddress.getLocalHost().getHostName();\n\t\t\t\/\/Add PID \n\t\t\tlog += \",\" + getPID();\n\t\t\t\/\/Specify event\n\t\t\tlog += \",\" + when + \",\" + event;\n\t\t\t\/\/Specify event\n\t\t\tlog += additional;\n\t\t\tLOG.info(log);\n\t\t\t\/\/writeLog(logFile,log);\n\n\n\t\t}\n\t\tcatch (IOException e) {\n\t\t\te.printStackTrace();\n\t\t}\n\t}\n\n\n\t\/*\n\tPOINTCUTS\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\n\t\/\/RegisterDataNode Pointcut\n\n\tpointcut startDataNode(): execution(* org.apache.hadoop.hdfs.server.datanode.DataNode.startDataNode(..));\n\n\t\/\/RegisterNameNode Pointcut\n\n\tpointcut initializeNameNode():  execution(* org.apache.hadoop.hdfs.server.namenode.NameNode.initialize(..));\n\n\t\/\/RegisterSecondaryNamenode Pointcut\n\n\tpointcut initializeSecondaryNameNode(): execution(* org.apache.hadoop.hdfs.server.namenode.SecondaryNameNode.initialize(..));\n\n\t\/\/RegisterTask - CHILD\n\n\t\/\/pointcut initializeChild(): call(* org.apache.hadoop.mapred.Child.initMetrics(..)) && withincode(* org.apache.hadoop.mapred.Child.main(..)); \n\n\tpointcut initializeChild(): execution(* org.apache.hadoop.mapred.Child.main(..)); \n\n\t\/\/Register JobTracker Pointcut\n\n\tpointcut registerJobTracker(): execution(* org.apache.hadoop.mapred.JobTracker.startTracker(..));\n\n\t\/\/HEARTBEAT\n\n\tpointcut heartbeat(): execution(* org.apache.hadoop.mapred.JobTracker.heartbeat(..));\n\n\t\/*\n\t\t###########################################################################\n\t\t############################Task###########################################\n\t\t###########################################################################\n\t*\/\n\n\n\tpointcut outputSize(): call (* *.getLen(..)) && withincode(* org.apache.hadoop.mapred.Task.calculateOutputSize());\n\n\t\/*\n\t\t###########################################################################\n\t\t############################MAPPER#########################################\n\t\t###########################################################################\n\t*\/\n\n\tpointcut mapper(): execution(* org.apache.hadoop.mapred.MapTask.run(..));\n\tpointcut flush(): execution(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.flush());\n\n\n\t\/\/  ############################SORT AND SPILL#################################\n\n\t\/\/Start-End\n\tpointcut taskSortAndSpill(): execution(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Spill File Size\n\tpointcut sortAndSpillSpillFile(int numSpills, long size) : call (* *.getSpillFileForWrite(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(numSpills, size);\n\n\t\/\/SpillIndex File Size\n\tpointcut sortAndSpillSpillIndexFile(int numSpills, long partitions) : call (* *.getSpillIndexFileForWrite(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(numSpills, partitions);\n\n\t\/\/Sort \n\tpointcut sortAndSpillSort(int kvstart, int endPosition, Object reporter): call(* *.sort(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(..,kvstart,endPosition,reporter);\n\n\t\/\/Init Writer\n\tpointcut sortAndSpillInitWriter() : call (org.apache.hadoop.mapred.IFile.Writer.new(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Close Writer\n\tpointcut sortAndSpillCloseWriter() : call (void org.apache.hadoop.mapred.IFile.Writer.close(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Write key-value\n\n\t\/\/pointcut sortAndSpillWrite(DataInputBuffer key, DataInputBuffer value): call (* *.append(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(key,value) && !within(Aspect);\n\t\n\t\/\/Combiner\n\tpointcut sortAndSpillCombiner(): call(* *.combine(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Spill Index File\n\tpointcut sortAndSpillSpillIndexWrite(): call(* *.writeToFile(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/*\n\t\t###########################################################################\n\t\t############################REDUCER########################################\n\t\t###########################################################################\n\t*\/\n\n\t\/\/REDUCETASK RUN\n\n\tpointcut reducer(): execution(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\tpointcut initCopy(): call(* *.initCodec(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\tpointcut endPhase(TaskStatus.Phase phase): call(* *.setPhase(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..)) && args(phase);\n\n\t\/\/pointcut endCopy(): call(* *.setPhase(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\t\/\/pointcut endSort(): call(* *.getMapOutputKeyClass(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\t\n\n\t\/*\n\t\t###########################################################################\n\t\t############################NETWORK########################################\n\t\t###########################################################################\n\t*\/\n\n\tpointcut defaultBlockSize(): call(* org.apache.hadoop.hdfs.DFSClient.getDefaultBlockSize());\n\t\/\/pointcut blockSize(): call(* org.apache.hadoop.hdfs.DFSClient.getBlockSize(..));\n\tpointcut createDFSFile(String src,FsPermission permission,boolean overwrite,boolean createParent,short replication,long blockSize,Progressable progress, int buffersize): execution (* org.apache.hadoop.hdfs.DFSClient.create(..)) && args(src,permission,overwrite,createParent,replication,blockSize,progress,buffersize);\n\tpointcut runDataStreamer(): execution (* org.apache.hadoop.hdfs.DFSClient.DFSOutputStream.DataStreamer.run());\n\t\/\/pointcut readEntireBufferFromDataNode(byte buf[],int off,int len): execution(* org.apache.hadoop.hdfs.DFSClient.DFSInputStream.read(..)) && args(buf[],off,len);\n\t\/\/pointcut readFromDataNode(): call (* org.apache.hadoop.hdfs.DFSClient.DFSInputStream.blockSeekTo(..)) && withincode(* org.apache.hadoop.hdfs.DFSClient.DFSInputStream.read(..));\n\tpointcut newBlockReader(Socket sock, String file, long blockId, Token<BlockTokenIdentifier> accessToken, long genStamp, long startOffset, long len, int bufferSize, boolean verifyChecksum, String clientName): execution (* org.apache.hadoop.hdfs.DFSClient.BlockReader.newBlockReader(..)) && args(sock,file,blockId,accessToken,genStamp,startOffset,len,bufferSize,verifyChecksum,clientName);\n\n\t\/*\n\tAdvices\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\n\t\/\/RegisterDataNode \n\n\tafter() : startDataNode(){\n\t\tString s = \"RegisterDataNode\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\t\/\/RegisterNameNode\n\n\tafter() : initializeNameNode(){\n\t\tString s = \"RegisterNameNode\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\n\t\/\/RegisterSecondaryNamenode\n\n\tafter() : initializeSecondaryNameNode(){\n\t\tString s = \"RegisterSecondaryNameNode\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\n\t\/\/RegisterTask CHILD\n \n\tafter() : initializeChild() {\n\t\tString s = \"ChildCreation\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\t\n\t\/\/ RegiterJobTracker\n\n\tafter() : registerJobTracker(){\n\t\tString s = \"registerJobTracker\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\t\/\/HEARTBEAT \n\tafter() : heartbeat(){\n\t\tString s = \"Heartbeat\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\/*\n\tbefore() : heartbeat(){\n\t\tString s = \"Heartbeat\";\n\t\tinstrumentation(s,\"before\");\n\t}\n*\/\t\n\n\n\t\/*\n\t\t###########################################################################\n\t\t############################Task###########################################\n\t\t###########################################################################\n\t*\/\n\n\tafter() returning(long size) : outputSize() {\n\t\tString s = \"Task-outputSize\";\n\t\tinstrumentation(s,\"after\",\", size: \" + Long.toString(size));\n\t}\n\n\t\/*\n\t\t###########################################################################\n\t\t############################Mapper#########################################\n\t\t###########################################################################\n\t*\/\n\n\n\tbefore() : mapper(){\n\t\tString s = \"Mapper\";\n\t\tinstrumentation(s,\"before\");\n\t}\n\n\tafter() : mapper(){\n\t\tString s = \"Mapper\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\t\/\/flush\n\n\tbefore() : flush(){\n\t\tString s = \"Flush\";\n\t\tinstrumentation(s,\"before\");\n\t}\n\n\n\tafter() : flush(){\n\t\tString s = \"Flush\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\t\/\/  ############################SORT AND SPILL#################################\n\n\tbefore() : taskSortAndSpill(){\n\t\tString s = \"sortAndSpill\";\n\t\tinstrumentation(s,\"before\");\n\t}\n\n\tafter() : taskSortAndSpill(){\n\t\tString s = \"sortAndSpill\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\t\/\/ Spill File Size\n\n\tafter(int numSpills, long size) returning : sortAndSpillSpillFile(numSpills, size){\n\t\tString s = \"sortAndSpillSpillFile\";\n\t\tinstrumentation(s,\"after\",\", numSpills: \" +Integer.toString(numSpills) + \", size: \" + Long.toString((size*numSpills) + size));\n\t}\n\n\t\/\/ SpillIndex File Size\n\n\tafter(int numSpills, long partitions) returning : sortAndSpillSpillIndexFile(numSpills, partitions){\n\t\tString s = \"sortAndSpillSpillIndexFile\";\n\t\tinstrumentation(s,\"after\",\",\" + Long.toString(numSpills * partitions));\n\t}\n\n\/*\n\tbefore(int length) : kvbufferState(length){\n\n\t\tString s = \"kvbufferState\";\n\t\tFile logFile = getFile();\n\t\tinstrumentation(logFile,s,\"before\");\n\t\twriteLog(logFile,Integer.toString(length));\n\t}\n\n*\/\n\n\tbefore(int kvstart, int endPosition, Object reporter) : sortAndSpillSort(kvstart,endPosition,reporter){\n\t\tString s = \"sortAndSpillSort\";\n\t\tinstrumentation(s,\"before\",\",\" + Integer.toString(endPosition - kvstart));\n\t}\n\tafter(int kvstart, int endPosition, Object reporter) returning : sortAndSpillSort(kvstart,endPosition,reporter){\n\t\tString s = \"sortAndSpillSort\";\n\t\tinstrumentation(s,\"after\",\",\" + Integer.toString(endPosition - kvstart));\n\t}\n\n\t\/\/ Init writer\n\tafter() returning : sortAndSpillInitWriter(){\n\t\tString s = \"sortAndSpillInitWriter\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\t\/\/ Close writer\n\tafter() returning : sortAndSpillCloseWriter(){\n\t\tString s = \"sortAndSpillCloseWriter\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\/*\n\tafter(DataInputBuffer key, DataInputBuffer value) returning : sortAndSpillWrite(key,value){\n\t\tString s = \"sortAndSpillWrite\";\n\t\tFile logFile = getFile();\n\t\tinstrumentation(logFile,s,\"after\");\n\t\tString log = \",\" + key.getData(); \/\/ + \",\" + value.getData();\n\t\twriteLog(logFile,log);\n\t}\n*\/\n\tbefore() : sortAndSpillCombiner(){\n\t\tString s = \"sortAndSpillCombiner\";\n\t\tinstrumentation(s,\"before\");\n\t}\n\n\tafter() returning : sortAndSpillCombiner(){\n\t\tString s = \"sortAndSpillCombiner\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\tbefore() : sortAndSpillSpillIndexWrite(){\n\t\tString s = \"sortAndSpillSpillIndexWrite\";\n\t\tinstrumentation(s,\"before\");\n\t}\n\n\tafter() returning : sortAndSpillSpillIndexWrite(){\n\t\tString s = \"sortAndSpillSpillIndexWrite\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\t\/*\n\t\t###########################################################################\n\t\t############################REDUCER########################################\n\t\t###########################################################################\n\t*\/\n\n\tbefore() : reducer(){\n\t\tString s = \"Reducer\";\n\t\tinstrumentation(s,\"before\");\n\t}\n\n\tafter() returning : initCopy() {\n\t\tString s = \"Reducer-copy-phase\";\n\t\tinstrumentation(s,\"before\");\n\t}\n\n\tbefore(TaskStatus.Phase phase) : endPhase(phase) {\n\t\tif (phase == TaskStatus.Phase.SORT){\n\t\t\tString s = \"Reducer-copy-phase\";\n\t\t\tinstrumentation(s,\"after\"); \n\t\t}\n\t\telse if (phase == TaskStatus.Phase.REDUCE) {\n\t\t\tString s = \"Reducer-sort-phase\";\n\t\t\tinstrumentation(s,\"after\");\n\t\t}\n\t}\n\n\tafter(TaskStatus.Phase phase) returning: endPhase(phase) { \n\t\tif (phase == TaskStatus.Phase.SORT) {\n\t\t\tString s = \"Reducer-sort-phase\";\n\t\t\tinstrumentation(s,\"before\");\n\t\t}\n\t\telse if (phase == TaskStatus.Phase.REDUCE) {\n\t\t\tString s = \"Reducer-reduce-phase\";\n\t\t\tinstrumentation(s,\"before\");\n\t\t}\n\t}\n\n\tafter() : reducer(){\n\t\tString s = \"Reducer-reduce-phase\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\t\/*\n\t\t###########################################################################\n\t\t############################NETWORK########################################\n\t\t###########################################################################\n\t*\/\n\n\tafter() returning(long blockSize) : defaultBlockSize() {\n\t\tString s = \"Network-defaultBlockSize\";\n\t\tinstrumentation(s,\"after\",\", size: \" + Long.toString(blockSize));\n\t}\n\t\/\/ after() returning(long blockSize) : blockSize() {\n\t\/\/ \tString s = \"Network-blockSize\";\n\t\/\/ \tFile logFile = getFile();\n\t\/\/ \tinstrumentation(logFile,s,\"after\");\n\t\/\/ \tString log = \", size: \" + Long.toString(blockSize);\n\t\/\/ \twriteLog(logFile,log);\n\t\/\/ }\n\n\tafter(String src,FsPermission permission,boolean overwrite, boolean createParent,short replication,long blockSize,Progressable progress, int buffersize): createDFSFile(src,permission,overwrite,createParent,replication,blockSize,progress,buffersize) {\n\t\tString s = \"Network-CreateDFSFile\";\n\n\t\t\/\/MODIFIED!!!!!!-----!!!!!!!!!!!\n\t\tinstrumentation(s,\"after\",\", path: \" + src + \", permission: \" + permission.toString()); \/\/ + \", overwrite: \" + String.valueOf(overwrite) + \", createParent: \" + String.valueOf(createParent) + \", replication: \" + Short.toString(replication) + \", blockSize: \" + Long.toString(blockSize) + \", buffersize: \" + Integer.toString(buffersize));\n\t}\n\tbefore(): runDataStreamer() {\n\t\tString s = \"DataStreamer\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\t\/\/ before(byte buf[],int off, int len) : readEntireBufferFromDataNode(buf[],off,len){\n\t\/\/ \tString s = \"Network-ReadEntireBuffer\";\n\t\/\/ \tinstrumentation(s,\"after\",\", bufferLength: \" + Integer.toString(len));\n\t\/\/ }\n\n\t\/\/ after() returning(DatanodeInfo datanode) : readFromDataNode(){\n\t\/\/ \tString s = \"Network-fromDataNode\";\n\t\/\/ \tinstrumentation(s,\"after\", \", from : \" + datanode.getHostName());\n\t\/\/ }\n\n\tafter(Socket sock, String file, long blockId, Token<BlockTokenIdentifier> accessToken, long genStamp, long startOffset, long len, int bufferSize, boolean verifyChecksum, String clientName) : newBlockReader(sock,file,blockId,accessToken,genStamp,startOffset,len,bufferSize,verifyChecksum,clientName) {\n\t\tString s = \"Network-NewBlockReader\";\n\t\tString extra = \", DataNode: \" + sock.getInetAddress().getCanonicalHostName();\n\t\textra += \", file: \" + file;\n\t\t\/\/extra += \", length: \" + Long.toString(len) + \"B\";\n\t\textra += \",\" + Long.toString(len);\n\t\textra += \", blockId: \" + Long.toString(blockId);\n\t\textra += \", startOffset: \" + Long.toString(startOffset);\t\t\n\t\tinstrumentation(s,\"after\",extra);\n\t}\n}\n\n\n\n\n","old_contents":"import java.io.*;\nimport java.util.*;\nimport java.lang.management.ManagementFactory;\nimport java.sql.Timestamp;\nimport java.text.SimpleDateFormat;\nimport java.net.InetAddress;\nimport java.lang.ClassLoader;\nimport org.apache.hadoop.io.DataInputBuffer;\n\n\nimport org.apache.hadoop.conf.Configuration;\n\n\/**\n *\n * @author Alejandro\n *\/\n\naspect Aspect {\t\t\n\n\t\/*\n\tFUNCTIONS\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\t\n\tprivate static long getPID() {\n\t\tString name = java.lang.management.ManagementFactory.getRuntimeMXBean().getName();\n\t\treturn Long.parseLong(name.split(\"@\")[0]);\n\t}\n\n\tprivate File getFile() {\n\t\ttry {\n\t\t\tFile file = new File(\"\/dev\/shm\/last_execution\");\n\t\t\tBufferedReader br = new BufferedReader(new FileReader(file));\n\t\t\tString logPath = br.readLine();\n\t\t\tFile log = new File(logPath + \"\/log.csv\");\n\t\t\treturn log;\n\t\t}\n\t\tcatch (IOException e) {\n\t\t\te.printStackTrace();\n\t\t}\n\t\treturn null;\n\t}\n\n\tprivate void writeLog(File logFile, String log) {\n\n\t\ttry {\n\t\t\tFileWriter fw = new FileWriter(logFile.getAbsoluteFile(),true);\n\t\t\tBufferedWriter bw = new BufferedWriter(fw);\n\t\t\tbw.write(log);\n\t\t\tbw.close();\n\t\t}\n\t\tcatch (IOException e) {\n\t\t\te.printStackTrace();\n\t\t}\n\t}\n\n\tprivate void instrumentation(File logFile, String event, String when) {\n\t\ttry {\n\n\t\t\tString log = \"\\n\";\n\t\t\t\/\/Create TimeStamp\n\t\t\tjava.util.Date date = new java.util.Date();\n\t\t\tCalendar calendar = Calendar.getInstance();\n\t\t\tcalendar.setTime(date);\n\t\t\tlog += calendar.getTimeInMillis();\n\t\t\t\/\/Specify event\n\t\t\tlog += \",\" + when + \",\" + event;\n\t\t\t\/\/Add PID \n\t\t\tlog += \",\" + getPID();\n\t\t\t\/\/Add hostname\n\t\t\tlog += \",\" + InetAddress.getLocalHost().getHostName();\n\t\t\twriteLog(logFile,log);\n\n\t\t}\n\t\tcatch (IOException e) {\n\t\t\te.printStackTrace();\n\t\t}\n\t}\n\n\n\t\/*\n\tPOINTCUTS\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\n\t\/\/RegisterDataNode Pointcut\n\n\tpointcut startDataNode(): execution(* org.apache.hadoop.hdfs.server.datanode.DataNode.startDataNode(..));\n\n\t\/\/RegisterNameNode Pointcut\n\n\tpointcut initializeNameNode():  execution(* org.apache.hadoop.hdfs.server.namenode.NameNode.initialize(..));\n\n\t\/\/RegisterSecondaryNamenode Pointcut\n\n\tpointcut initializeSecondaryNameNode(): execution(* org.apache.hadoop.hdfs.server.namenode.SecondaryNameNode.initialize(..));\n\n\t\/\/RegisterTask - CHILD\n\n\t\/\/pointcut initializeChild(): call(* org.apache.hadoop.mapred.Child.initMetrics(..)) && withincode(* org.apache.hadoop.mapred.Child.main(..)); \n\n\tpointcut initializeChild(): execution(* org.apache.hadoop.mapred.Child.main(..)); \n\n\t\/\/Register JobTracker Pointcut\n\n\tpointcut registerJobTracker(): execution(* org.apache.hadoop.mapred.JobTracker.startTracker(..));\n\n\t\/\/HEARTBEAT\n\n\tpointcut heartbeat(): execution(* org.apache.hadoop.mapred.JobTracker.heartbeat(..));\n\n\t\/*\n\t\t###########################################################################\n\t\t############################MAPPER#########################################\n\t\t###########################################################################\n\t*\/\n\n\tpointcut mapper(): execution(* org.apache.hadoop.mapred.MapTask.run(..));\n\tpointcut flush(): execution(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.flush());\n\n\n\t\/\/  ############################SORT AND SPILL#################################\n\n\t\/\/Start-End\n\tpointcut taskSortAndSpill(): execution(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Spill File Size\n\tpointcut sortAndSpillSpillFile(int numSpills, long size) : call (* *.getSpillFileForWrite(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(numSpills, size);\n\n\t\/\/SpillIndex File Size\n\tpointcut sortAndSpillSpillIndexFile(int numSpills, long partitions) : call (* *.getSpillIndexFileForWrite(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(numSpills, partitions);\n\n\t\/\/Sort \n\tpointcut sortAndSpillSort(int kvstart, int endPosition, Object reporter): call(* *.sort(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(..,kvstart,endPosition,reporter);\n\n\t\/\/Init Writer\n\tpointcut sortAndSpillInitWriter() : call (org.apache.hadoop.mapred.IFile.Writer.new(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Close Writer\n\tpointcut sortAndSpillCloseWriter() : call (void org.apache.hadoop.mapred.IFile.Writer.close(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Write key-value\n\n\t\/\/pointcut sortAndSpillWrite(DataInputBuffer key, DataInputBuffer value): call (* *.append(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(key,value) && !within(Aspect);\n\t\n\t\/\/Combiner\n\tpointcut sortAndSpillCombiner(): call(* *.combine(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Spill Index File\n\tpointcut sortAndSpillSpillIndexWrite(): call(* *.writeToFile(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/*\n\t\t###########################################################################\n\t\t############################REDUCER########################################\n\t\t###########################################################################\n\t*\/\n\n\t\/\/REDUCETASK RUN\n\n\tpointcut reducer(): execution(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\tpointcut initCopy(): call(* *.initCodec(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\tpointcut endCopy(): call(* *.getRaw(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\tpointcut endSort(): call(* *.getMapOutputKeyClass(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\t\/*\n\tAdvices\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\n\t\/\/RegisterDataNode \n\n\tafter() : startDataNode(){\n\t\tString s = \"RegisterDataNode\";\n\t\tinstrumentation(getFile(),s,\"after\");\n\t}\n\tbefore() : startDataNode(){\n\t\tString s = \"RegisterDataNode\";\n\t\tinstrumentation(getFile(),s,\"before\");\n\t}\n\n\t\/\/RegisterNameNode\n\n\tafter() : initializeNameNode(){\n\t\tString s = \"RegisterNameNode\";\n\t\tinstrumentation(getFile(),s,\"after\");\n\t}\n\n\tbefore() : initializeNameNode(){\n\t\tString s = \"RegisterNameNode\";\n\t\tinstrumentation(getFile(),s,\"before\");\n\t}\n\n\t\/\/RegisterSecondaryNamenode\n\n\tafter() : initializeSecondaryNameNode(){\n\t\tString s = \"RegisterSecondaryNameNode\";\n\t\tinstrumentation(getFile(),s,\"after\");\n\t}\n\n\tbefore() : initializeSecondaryNameNode(){\n\t\tString s = \"RegisterSecondaryNameNode\";\n\t\tinstrumentation(getFile(),s,\"before\");\n\t}\n\n\t\/\/RegisterTask CHILD\n \n\tafter() : initializeChild() {\n\t\tString s = \"GeneralTask\";\n\t\tinstrumentation(getFile(),s,\"after\");\n\t}\n\t\n\tbefore() : initializeChild() {\n\t\tString s = \"GeneralTask\";\n\t\tinstrumentation(getFile(),s,\"before\");\n\t}\n\n\t\/\/ RegiterJobTracker\n\tbefore() : registerJobTracker(){\n\t\tString s = \"registerJobTracker\";\n\t\tinstrumentation(getFile(),s,\"before\");\n\t}\n\n\tafter() : registerJobTracker(){\n\t\tString s = \"registerJobTracker\";\n\t\tinstrumentation(getFile(),s,\"after\");\n\t}\n\n\t\/\/HEARTBEAT \n\tafter() : heartbeat(){\n\t\tString s = \"Heartbeat\";\n\t\tinstrumentation(getFile(),s,\"after\");\n\t}\n\/*\n\tbefore() : heartbeat(){\n\t\tString s = \"Heartbeat\";\n\t\tinstrumentation(getFile(),s,\"before\");\n\t}\n*\/\t\n\t\/\/TASK RUN\n\n\tbefore() : mapper(){\n\t\tString s = \"Mapper\";\n\t\tinstrumentation(getFile(),s,\"before\");\n\t}\n\n\tafter() : mapper(){\n\t\tString s = \"Mapper\";\n\t\tinstrumentation(getFile(),s,\"after\");\n\t}\n\n\t\/\/flush\n\n\tbefore() : flush(){\n\t\tString s = \"Flush\";\n\t\tinstrumentation(getFile(),s,\"before\");\n\t}\n\n\n\tafter() : flush(){\n\t\tString s = \"Flush\";\n\t\tinstrumentation(getFile(),s,\"after\");\n\t}\n\n\t\/*\n\t\t###########################################################################\n\t\t############################SORT AND SPILL#################################\n\t\t###########################################################################\n\t*\/\n\n\tbefore() : taskSortAndSpill(){\n\t\tString s = \"sortAndSpill\";\n\t\tinstrumentation(getFile(),s,\"before\");\n\t}\n\n\tafter() : taskSortAndSpill(){\n\t\tString s = \"sortAndSpill\";\n\t\tinstrumentation(getFile(),s,\"after\");\n\t}\n\n\t\/\/ Spill File Size\n\n\tafter(int numSpills, long size) returning : sortAndSpillSpillFile(numSpills, size){\n\t\tString s = \"sortAndSpillSpillFile\";\n\t\tFile logFile = getFile();\n\t\tinstrumentation(logFile,s,\"after\");\n\t\tString log = \", numSpills: \" +Integer.toString(numSpills) + \", size: \" + Long.toString(size);\n\t\twriteLog(logFile,log);\n\t}\n\n\t\/\/ SpillIndex File Size\n\n\tafter(int numSpills, long partitions) returning : sortAndSpillSpillIndexFile(numSpills, partitions){\n\t\tString s = \"sortAndSpillSpillIndexFile\";\n\t\tFile logFile = getFile();\n\t\tinstrumentation(logFile,s,\"after\");\n\t\tString log = \",\" + Long.toString(numSpills * partitions);\n\t\twriteLog(logFile,log);\n\t}\n\n\/*\n\tbefore(int length) : kvbufferState(length){\n\n\t\tString s = \"kvbufferState\";\n\t\tFile logFile = getFile();\n\t\tinstrumentation(logFile,s,\"before\");\n\t\twriteLog(logFile,Integer.toString(length));\n\t}\n\n*\/\n\n\tbefore(int kvstart, int endPosition, Object reporter) : sortAndSpillSort(kvstart,endPosition,reporter){\n\t\tString s = \"sortAndSpillSort\";\n\t\tFile logFile = getFile();\n\t\tinstrumentation(logFile,s,\"before\");\n\t\tString log = \",\" + Integer.toString(endPosition - kvstart);\n\t\twriteLog(logFile,log);\n\t}\n\tafter(int kvstart, int endPosition, Object reporter) returning : sortAndSpillSort(kvstart,endPosition,reporter){\n\t\tString s = \"sortAndSpillSort\";\n\t\tFile logFile = getFile();\n\t\tinstrumentation(logFile,s,\"after\");\n\t\tString log = \",\" + Integer.toString(endPosition - kvstart);\n\t\twriteLog(logFile,log);\n\t}\n\n\t\/\/ Init writer\n\tafter() returning : sortAndSpillInitWriter(){\n\t\tString s = \"sortAndSpillInitWriter\";\n\t\tinstrumentation(getFile(),s,\"after\");\n\t}\n\n\t\/\/ Close writer\n\tafter() returning : sortAndSpillCloseWriter(){\n\t\tString s = \"sortAndSpillCloseWriter\";\n\t\tinstrumentation(getFile(),s,\"after\");\n\t}\n\n\/*\n\tafter(DataInputBuffer key, DataInputBuffer value) returning : sortAndSpillWrite(key,value){\n\t\tString s = \"sortAndSpillWrite\";\n\t\tFile logFile = getFile();\n\t\tinstrumentation(logFile,s,\"after\");\n\t\tString log = \",\" + key.getData(); \/\/ + \",\" + value.getData();\n\t\twriteLog(logFile,log);\n\t}\n*\/\n\tbefore() : sortAndSpillCombiner(){\n\t\tString s = \"sortAndSpillCombiner\";\n\t\tinstrumentation(getFile(),s,\"before\");\n\t}\n\n\tafter() returning : sortAndSpillCombiner(){\n\t\tString s = \"sortAndSpillCombiner\";\n\t\tinstrumentation(getFile(),s,\"after\");\n\t}\n\n\tbefore() : sortAndSpillSpillIndexWrite(){\n\t\tString s = \"sortAndSpillSpillIndexWrite\";\n\t\tinstrumentation(getFile(),s,\"before\");\n\t}\n\n\tafter() returning : sortAndSpillSpillIndexWrite(){\n\t\tString s = \"sortAndSpillSpillIndexWrite\";\n\t\tinstrumentation(getFile(),s,\"after\");\n\t}\n\n\t\/*\n\t\t###########################################################################\n\t\t############################REDUCER########################################\n\t\t###########################################################################\n\t*\/\n\n\tbefore() : reducer(){\n\t\tString s = \"Reducer\";\n\t\tinstrumentation(getFile(),s,\"before\");\n\t}\n\n\tafter() : reducer(){\n\t\tString s = \"Reducer\";\n\t\tinstrumentation(getFile(),s,\"after\");\n\t}\n\n\tafter() returning : initCopy() {\n\t\tString s = \"Reducer-copy-phase\";\n\t\tinstrumentation(getFile(),s,\"before\");\n\t}\n\n\tbefore() : endCopy() {\n\t\tString s = \"Reducer-copy-phase\";\n\t\tinstrumentation(getFile(),s,\"after\");\n\t}\n\n\tafter() returning : endCopy() {\n\t\tString s = \"Reducer-sort-phase\";\n\t\tinstrumentation(getFile(),s,\"before\");\n\t}\n\n\tbefore() : endSort() {\n\t\tString s = \"Reducer-sort-phase\";\n\t\tinstrumentation(getFile(),s,\"after\");\n\t}\n}\n\n\n\n\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"4c328973e9e7203e63dc573aa555e4bf35e438e3","subject":"Add compilation instructions for mirah-parser_with_duby.jar","message":"Add compilation instructions for mirah-parser_with_duby.jar\n","repos":"mirah\/mirah,mirah\/mirah-parser,uujava\/mirah-parser,felixvf\/mirah,mirah\/mirah,mirah\/mirah-parser,felixvf\/mirah-parser,uujava\/mirah-parser,uujava\/mirah-parser,felixvf\/mirah,mirah\/mirah,felixvf\/mirah,mirah\/mirah,mirah\/mirah-parser,felixvf\/mirah,felixvf\/mirah-parser,felixvf\/mirah-parser","old_file":"src\/DubyBootstrap.aj","new_file":"src\/DubyBootstrap.aj","new_contents":"import java.util.ArrayList;\nimport java.util.List;\nimport mirah.lang.ast.Node;\nimport mirah.lang.ast.NodeScanner;\nimport mirah.lang.ast.NodeImpl;\n\n\/* To compile the new AST with duby extensions:\n * ajc -1.5 -inpath dist\/mirah-parser.jar \\\n *     -outjar dist\/mirah-parser_with_duby.jar \\\n *     -classpath ..\/mirah\/javalib\/mirah-bootstrap.jar:\/Developer\/aspectj1.6\/lib\/aspectjrt.jar \\\n *     src\/DubyBootstrap.aj\n *\/\n\nclass ChildCollector extends NodeScanner {\n  private ArrayList<Node> children = new ArrayList<Node>();\n\n  @Override\n  public boolean enterDefault(Node node, Object arg) {\n    if (node == arg) {\n      return true;\n    } else {\n      children.add(node);\n      return false;\n    }\n  }\n\n  @Override\n  public Object enterNullChild(Object arg){\n    children.add(null);\n    return null;\n  }\n\n  public ArrayList<Node> children() {\n    return children;\n  }\n}\n\naspect DubyBootsrap {\n  declare parents: Node extends duby.lang.compiler.Node;\n\n  public List<Node> NodeImpl.child_nodes() {\n    ChildCollector c = new ChildCollector();\n    c.scan(this, this);\n    return c.children();\n  }\n}","old_contents":"import java.util.ArrayList;\nimport java.util.List;\nimport mirah.lang.ast.Node;\nimport mirah.lang.ast.NodeScanner;\nimport mirah.lang.ast.NodeImpl;\n\n\nclass ChildCollector extends NodeScanner {\n  private ArrayList<Node> children = new ArrayList<Node>();\n\n  @Override\n  public boolean enterDefault(Node node, Object arg) {\n    if (node == arg) {\n      return true;\n    } else {\n      children.add(node);\n      return false;\n    }\n  }\n\n  @Override\n  public Object enterNullChild(Object arg){\n    children.add(null);\n    return null;\n  }\n\n  public ArrayList<Node> children() {\n    return children;\n  }\n}\n\naspect DubyBootsrap {\n  declare parents: Node extends duby.lang.compiler.Node;\n\n  public List<Node> NodeImpl.child_nodes() {\n    ChildCollector c = new ChildCollector();\n    c.scan(this, this);\n    return c.children();\n  }\n}","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"747fdc38fe5f567e1968c19194ae42c366855274","subject":"Remove obsolete pointcut.","message":"Remove obsolete pointcut.\n","repos":"scala-ide\/scala-ide,wpopielarski\/scala-ide,stephenh\/scala-ide,romanowski\/scala-ide,pilipolio\/scala-ide,wpopielarski\/scala-ide,aleksi-lukkarinen\/scala-ide,Kwestor\/scala-ide,romanowski\/scala-ide,aleksi-lukkarinen\/scala-ide,scala-ide\/scala-ide,mlangc\/scala-ide,Kwestor\/scala-ide,sschaef\/scala-ide,sschaef\/scala-ide,Duhemm\/scala-ide,mlangc\/scala-ide,pilipolio\/scala-ide,stephenh\/scala-ide,scala-ide\/scala-ide,pilipolio\/scala-ide,sschaef\/scala-ide,sschaef\/scala-ide,Duhemm\/scala-ide,romanowski\/scala-ide,wpopielarski\/scala-ide,wpopielarski\/scala-ide,stephenh\/scala-ide,dragos\/scala-ide,andrey-ilinykh\/scala-ide,andrey-ilinykh\/scala-ide,aleksi-lukkarinen\/scala-ide,Duhemm\/scala-ide,Kwestor\/scala-ide,dragos\/scala-ide,dragos\/scala-ide,Kwestor\/scala-ide,dragos\/scala-ide,stephenh\/scala-ide,andrey-ilinykh\/scala-ide,aleksi-lukkarinen\/scala-ide,mlangc\/scala-ide,Duhemm\/scala-ide,scala-ide\/scala-ide,pilipolio\/scala-ide,romanowski\/scala-ide,andrey-ilinykh\/scala-ide,mlangc\/scala-ide","old_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/cfprovider\/ClassFileProviderAspect.aj","new_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/cfprovider\/ClassFileProviderAspect.aj","new_contents":"\/*\n * Copyright 2005-2010 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.cfprovider;\n\nimport java.util.HashSet;\n\nimport org.eclipse.core.filebuffers.FileBuffers;\nimport org.eclipse.core.filebuffers.ITextFileBuffer;\nimport org.eclipse.core.filebuffers.ITextFileBufferManager;\nimport org.eclipse.core.filebuffers.LocationKind;\nimport org.eclipse.core.resources.IResource;\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.core.IBuffer;\nimport org.eclipse.jdt.core.IClassFile;\nimport org.eclipse.jdt.core.IImportDeclaration;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IOpenable;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.ITypeRoot;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.core.dom.CompilationUnit;\nimport org.eclipse.jdt.core.search.TypeNameMatch;\nimport org.eclipse.jdt.internal.compiler.CompilationResult;\nimport org.eclipse.jdt.internal.compiler.ast.ASTNode;\nimport org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.ImportReference;\nimport org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.TypeReference;\nimport org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;\nimport org.eclipse.jdt.internal.compiler.env.IBinaryType;\nimport org.eclipse.jdt.internal.compiler.env.ICompilationUnit;\nimport org.eclipse.jdt.internal.compiler.env.IGenericType;\nimport org.eclipse.jdt.internal.compiler.env.ISourceImport;\nimport org.eclipse.jdt.internal.compiler.env.ISourceType;\nimport org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer;\nimport org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding;\nimport org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding;\nimport org.eclipse.jdt.internal.compiler.parser.Parser;\nimport org.eclipse.jdt.internal.compiler.parser.SourceTypeConverter;\nimport org.eclipse.jdt.internal.core.BinaryType;\nimport org.eclipse.jdt.internal.core.ClassFile;\nimport org.eclipse.jdt.internal.core.CompilationUnitElementInfo;\nimport org.eclipse.jdt.internal.core.ImportDeclaration;\nimport org.eclipse.jdt.internal.core.JavaElement;\nimport org.eclipse.jdt.internal.core.BufferManager;\nimport org.eclipse.jdt.internal.core.NameLookup;\nimport org.eclipse.jdt.internal.core.Openable;\nimport org.eclipse.jdt.internal.core.PackageFragment;\nimport org.eclipse.jdt.internal.core.SearchableEnvironment;\nimport org.eclipse.jdt.internal.core.SourceMapper;\nimport org.eclipse.jdt.internal.core.SourceType;\nimport org.eclipse.jdt.internal.core.SourceTypeElementInfo;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyResolver;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyType;\nimport org.eclipse.jdt.internal.core.util.Util;\nimport org.eclipse.jdt.internal.corext.util.OpenTypeHistory;\nimport org.eclipse.jdt.internal.ui.filters.InnerClassFilesFilter;\nimport org.eclipse.jdt.ui.SharedASTProvider;\nimport org.eclipse.jface.viewers.Viewer;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaClassFile;\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaElement;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect ClassFileProviderAspect {\n\n  pointcut classFileCreations(PackageFragment parent, String name) : \n    call(protected ClassFile.new(PackageFragment, String)) &&\n    within(org.eclipse.jdt..*) &&\n    args(parent, name);\n  \n  pointcut getTypeName(ClassFile cf) :\n    execution(public String ClassFile.getTypeName()) &&\n    target(cf);\n\n  \/\/ For 3.6\n  pointcut mapSource(ClassFile cf, SourceMapper mapper, IBinaryType info, IClassFile owner) :\n    execution(IBuffer ClassFile.mapSource(SourceMapper, IBinaryType, IClassFile)) &&\n    target(cf) &&\n    target(IScalaClassFile) &&\n    args(mapper, info, owner);\n\n  \/\/ For 3.5\n  pointcut mapSource2(ClassFile cf, SourceMapper mapper, IBinaryType info) :\n    execution(IBuffer ClassFile.mapSource(SourceMapper, IBinaryType)) &&\n    target(cf) &&\n    target(IScalaClassFile) &&\n    args(mapper, info);\n\n  pointcut getSourceFileName(BinaryType bt) :\n    execution(String BinaryType.getSourceFileName(IBinaryType)) &&\n    target(bt);\n  \n  pointcut select(Viewer viewer, Object parentElement, Object element) :\n    execution(boolean InnerClassFilesFilter.select(Viewer, Object, Object)) &&\n    args(viewer, parentElement, element);\n  \n  pointcut getAST(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) : \n    execution(CompilationUnit SharedASTProvider.getAST(ITypeRoot, SharedASTProvider.WAIT_FLAG, IProgressMonitor)) &&\n    args(element, waitFlag, progressMonitor);\n  \n  pointcut resolve(HierarchyResolver hr, IGenericType suppliedType) :\n    execution(void HierarchyResolver.resolve(IGenericType)) &&\n    target(hr) &&\n    args(suppliedType);\n  \n  pointcut remember(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    execution(void HierarchyResolver.remember(IType, ReferenceBinding)) &&\n    target(hr) &&\n    args(type, typeBinding);\n  \n  pointcut acceptType(IType type, int acceptFlags, boolean isSourceType) :\n    execution(boolean NameLookup.acceptType(IType, int, boolean)) &&\n    args(type, acceptFlags, isSourceType);\n  \n  pointcut find(SearchableEnvironment se, String typeName, String packageName) :\n    execution(NameEnvironmentAnswer find(String, String)) &&\n    target(se) &&\n    args(typeName, packageName);\n  \n  pointcut convert(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) :\n    execution(CompilationUnitDeclaration SourceTypeConverter.convert(ISourceType[], CompilationResult)) &&\n    target(stc) &&\n    args(sourceTypes, compilationResult);\n  \n  pointcut getAncestor(JavaElement je, int ancestorType) :\n    execution(IJavaElement JavaElement.getAncestor(int)) &&\n    target(je) &&\n    args(ancestorType);\n  \n  pointcut isContainerDirty(TypeNameMatch match) :\n    execution(boolean OpenTypeHistory.isContainerDirty(TypeNameMatch)) &&\n    args(match);\n  \n  ClassFile around(PackageFragment parent, String name) : \n    classFileCreations(parent, name) {\n\n    ClassFile javaClassFile = proceed(parent, name);\n    byte[] bytes;\n    \n    try {\n      bytes = javaClassFile.getBytes();\n    } catch(Throwable t) {\n      return javaClassFile; \n    }\n    \n    for (IClassFileProvider provider : ClassFileProviderRegistry.getInstance().getProviders()) {\n      ClassFile cf = provider.create(bytes, parent, name);\n      if (cf != null)\n        return cf;\n    }\n    \n    return javaClassFile;\n  }\n  \n  IBuffer around(ClassFile cf, SourceMapper mapper, IBinaryType info, IClassFile owner) :\n    mapSource(cf, mapper, info, owner) {\n    return mapSourceSubst(cf, mapper, info);\n  }\n\n  IBuffer around(ClassFile cf, SourceMapper mapper, IBinaryType info) :\n    mapSource2(cf, mapper, info) {\n    return mapSourceSubst(cf, mapper, info);\n  }\n\n  IBuffer mapSourceSubst(ClassFile cf, SourceMapper mapper, IBinaryType info) {\n    char[] contents = mapper.findSource(cf.getType(), info);\n    IBuffer buffer;\n    if (contents != null) {\n      buffer = BufferManager.createBuffer(cf);\n      buffer.setContents(contents);\n    } else {\n      buffer = BufferManager.createNullBuffer(cf);\n    }\n    BufferManager bufManager = cf.getBufferManager();\n    bufManager.addBuffer(buffer);\n    buffer.addBufferChangedListener(cf);\n    return buffer;\n  }\n\n  String around(ClassFile cf) :\n    getTypeName(cf) {\n    if(cf instanceof IScalaClassFile) {\n      int lastDollar = cf.name.lastIndexOf('$');\n      return (lastDollar == -1 || lastDollar == cf.name.length()-1) ? cf.name : Util.localTypeName(cf.name, lastDollar, cf.name.length());\n    } else\n      return proceed(cf);\n  }\n  \n  boolean around(Viewer viewer, Object parentElement, Object element) :\n    select(viewer, parentElement, element) {\n    if (element instanceof IScalaClassFile) {\n      IClassFile classFile = (IClassFile) element;\n      String name = classFile.getElementName(); \n      int dollarIndex = name.indexOf('$');\n      return dollarIndex == -1 || dollarIndex == name.length()-7; \/\/ Trailing '$' implies object rather than inner class \n    }\n    return proceed(viewer, parentElement, element);\n  }\n  \n  CompilationUnit around(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) :\n    getAST(element, waitFlag, progressMonitor) {\n      if (element instanceof IScalaElement)\n        return null;\n      else\n        return proceed(element, waitFlag, progressMonitor);\n  }\n  \n  void around(HierarchyResolver hr, IGenericType suppliedType) :\n    resolve(hr, suppliedType) {\n    if (!suppliedType.isBinaryType()) {\n      IType tpe = ((SourceTypeElementInfo)suppliedType).getHandle();\n      IClassFile cf = tpe.getClassFile();\n      if (cf instanceof IScalaClassFile) {\n        hr.resolve(new Openable[]{(Openable)cf}, new HashSet(), null);\n        return;\n      }\n    }\n      \n    proceed(hr, suppliedType);\n  }\n  \n  void around(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    remember(hr, type, typeBinding) {\n    if (((IOpenable)type.getCompilationUnit()).isOpen()) {\n      try {\n        IGenericType genericType = (IGenericType)((JavaElement)type).getElementInfo();\n        hr.remember(genericType, typeBinding);\n      } catch (JavaModelException e) {\n        \/\/ cannot happen since element is open\n        return;\n      }\n    } else {\n      if (typeBinding == null) return;\n\n      TypeDeclaration typeDeclaration = ((SourceTypeBinding)typeBinding).scope.referenceType();\n\n      \/\/ simple super class name\n      char[] superclassName = null;\n      TypeReference superclass;\n      if ((typeDeclaration.bits & ASTNode.IsAnonymousType) != 0) {\n        superclass = typeDeclaration.allocation.type;\n      } else {\n        superclass = typeDeclaration.superclass;\n      }\n      if (superclass != null) {\n        char[][] typeName = superclass.getTypeName();\n        superclassName = typeName == null ? null : typeName[typeName.length-1];\n      }\n\n      \/\/ simple super interface names\n      char[][] superInterfaceNames = null;\n      TypeReference[] superInterfaces = typeDeclaration.superInterfaces;\n      if (superInterfaces != null) {\n        int length = superInterfaces.length;\n        superInterfaceNames = new char[length][];\n        for (int i = 0; i < length; i++) {\n          TypeReference superInterface = superInterfaces[i];\n          char[][] typeName = superInterface.getTypeName();\n          superInterfaceNames[i] = typeName[typeName.length-1];\n        }\n      }\n\n      HierarchyType hierarchyType = new HierarchyType(\n        type,\n        typeDeclaration.name,\n        typeDeclaration.binding.modifiers,\n        superclassName,\n        superInterfaceNames);\n      hr.remember(hierarchyType, typeDeclaration.binding);\n    }\n  }\n  \n  String around(BinaryType bt) :\n    getSourceFileName(bt) {\n    IJavaElement parent = bt.getTypeRoot(); \n    if (parent instanceof IScalaClassFile) {\n      return ((IScalaClassFile)parent).getSourceFileName();\n    }\n    else\n      return proceed(bt);\n  }\n  \n  boolean around(IType type, int acceptFlags, boolean isSourceType) :\n    acceptType(type, acceptFlags, isSourceType) {\n    if (!isSourceType && (type instanceof SourceType)) {\n      IJavaElement parent = type.getParent(); \n      if (parent instanceof IScalaClassFile)\n        return proceed(type, acceptFlags, true);\n    }\n    \n    return proceed(type, acceptFlags, isSourceType);\n  }\n  \n  CompilationUnitDeclaration around(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) throws JavaModelException :\n    convert(stc, sourceTypes, compilationResult) {\n    stc.unit = new CompilationUnitDeclaration(stc.problemReporter, compilationResult, 0);\n    \/\/ not filled at this point\n\n    if (sourceTypes.length == 0) return stc.unit;\n    SourceTypeElementInfo topLevelTypeInfo = (SourceTypeElementInfo) sourceTypes[0];\n    org.eclipse.jdt.core.ICompilationUnit cuHandle = topLevelTypeInfo.getHandle().getCompilationUnit();\n    stc.cu = (ICompilationUnit) cuHandle;\n\n    CompilationUnitElementInfo cuei = null;\n    Object info = ((JavaElement)stc.cu).getElementInfo();\n    if (info instanceof CompilationUnitElementInfo)\n      cuei = (CompilationUnitElementInfo)info;\n    \n    \n    if (stc.has1_5Compliance && cuei != null && cuei.annotationNumber > 10) { \/\/ experimental value\n      \/\/ if more than 10 annotations, diet parse as this is faster\n      return new Parser(stc.problemReporter, true).dietParse(stc.cu, compilationResult);\n    }\n\n    \/* only positions available *\/\n    int start = topLevelTypeInfo.getNameSourceStart();\n    int end = topLevelTypeInfo.getNameSourceEnd();\n\n    \/* convert package and imports *\/\n    String[] packageName = ((PackageFragment) cuHandle.getParent()).names;\n    if (packageName.length > 0)\n      \/\/ if its null then it is defined in the default package\n      stc.unit.currentPackage =\n        stc.createImportReference(packageName, start, end, false, ClassFileConstants.AccDefault);\n    IImportDeclaration[] importDeclarations = topLevelTypeInfo.getHandle().getCompilationUnit().getImports();\n    int importCount = importDeclarations.length;\n    stc.unit.imports = new ImportReference[importCount];\n    for (int i = 0; i < importCount; i++) {\n      ImportDeclaration importDeclaration = (ImportDeclaration) importDeclarations[i];\n      ISourceImport sourceImport = (ISourceImport) importDeclaration.getElementInfo();\n      String nameWithoutStar = importDeclaration.getNameWithoutStar();\n      stc.unit.imports[i] = stc.createImportReference(\n        Util.splitOn('.', nameWithoutStar, 0, nameWithoutStar.length()),\n        sourceImport.getDeclarationSourceStart(),\n        sourceImport.getDeclarationSourceEnd(),\n        importDeclaration.isOnDemand(),\n        sourceImport.getModifiers());\n    }\n    \/* convert type(s) *\/\n    try {\n      int typeCount = sourceTypes.length;\n      final TypeDeclaration[] types = new TypeDeclaration[typeCount];\n      \/*\n       * We used a temporary types collection to prevent this.unit.types from being null during a call to\n       * convert(...) when the source is syntactically incorrect and the parser is flushing the unit's types.\n       * See https:\/\/bugs.eclipse.org\/bugs\/show_bug.cgi?id=97466\n       *\/\n      for (int i = 0; i < typeCount; i++) {\n        SourceTypeElementInfo typeInfo = (SourceTypeElementInfo) sourceTypes[i];\n        types[i] = stc.convert((SourceType) typeInfo.getHandle(), compilationResult);\n      }\n      stc.unit.types = types;\n      return stc.unit;\n    } catch (SourceTypeConverter.AnonymousMemberFound e) {\n      return new Parser(stc.problemReporter, true).parse(stc.cu, compilationResult);\n    }\n  }\n  \n  IJavaElement around(JavaElement je, int ancestorType) :\n    getAncestor(je, ancestorType) {\n    IJavaElement element = je;\n    while (element != null) {\n      if (element.getElementType() == ancestorType)\n        return element;\n      else if (element instanceof IScalaClassFile && ancestorType == IJavaElement.COMPILATION_UNIT)\n        return ((JavaElement)element).getCompilationUnit();\n      element= element.getParent();\n    }\n    return null;\n  }\n\n  boolean around(TypeNameMatch match) :\n    isContainerDirty(match) {\n    org.eclipse.jdt.core.ICompilationUnit cu = match.getType().getCompilationUnit();\n    if (cu == null) {\n      return false;\n    }\n    IResource resource= cu.getResource();\n    if (resource == null)\n      return false;\n    \n    ITextFileBufferManager manager= FileBuffers.getTextFileBufferManager();\n    ITextFileBuffer textFileBuffer= manager.getTextFileBuffer(resource.getFullPath(), LocationKind.IFILE);\n    if (textFileBuffer != null) {\n      return textFileBuffer.isDirty();\n    }\n    return false;\n  }\n}\n","old_contents":"\/*\n * Copyright 2005-2010 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.cfprovider;\n\nimport java.util.HashSet;\n\nimport org.eclipse.core.filebuffers.FileBuffers;\nimport org.eclipse.core.filebuffers.ITextFileBuffer;\nimport org.eclipse.core.filebuffers.ITextFileBufferManager;\nimport org.eclipse.core.filebuffers.LocationKind;\nimport org.eclipse.core.resources.IResource;\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.core.IBuffer;\nimport org.eclipse.jdt.core.IClassFile;\nimport org.eclipse.jdt.core.IImportDeclaration;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IOpenable;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.ITypeRoot;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.core.dom.CompilationUnit;\nimport org.eclipse.jdt.core.search.TypeNameMatch;\nimport org.eclipse.jdt.internal.compiler.CompilationResult;\nimport org.eclipse.jdt.internal.compiler.ast.ASTNode;\nimport org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.ImportReference;\nimport org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.TypeReference;\nimport org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;\nimport org.eclipse.jdt.internal.compiler.env.IBinaryType;\nimport org.eclipse.jdt.internal.compiler.env.ICompilationUnit;\nimport org.eclipse.jdt.internal.compiler.env.IGenericType;\nimport org.eclipse.jdt.internal.compiler.env.ISourceImport;\nimport org.eclipse.jdt.internal.compiler.env.ISourceType;\nimport org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer;\nimport org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding;\nimport org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding;\nimport org.eclipse.jdt.internal.compiler.parser.Parser;\nimport org.eclipse.jdt.internal.compiler.parser.SourceTypeConverter;\nimport org.eclipse.jdt.internal.core.BinaryType;\nimport org.eclipse.jdt.internal.core.ClassFile;\nimport org.eclipse.jdt.internal.core.CompilationUnitElementInfo;\nimport org.eclipse.jdt.internal.core.ImportDeclaration;\nimport org.eclipse.jdt.internal.core.JavaElement;\nimport org.eclipse.jdt.internal.core.BufferManager;\nimport org.eclipse.jdt.internal.core.NameLookup;\nimport org.eclipse.jdt.internal.core.Openable;\nimport org.eclipse.jdt.internal.core.PackageFragment;\nimport org.eclipse.jdt.internal.core.SearchableEnvironment;\nimport org.eclipse.jdt.internal.core.SourceMapper;\nimport org.eclipse.jdt.internal.core.SourceType;\nimport org.eclipse.jdt.internal.core.SourceTypeElementInfo;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyResolver;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyType;\nimport org.eclipse.jdt.internal.core.util.Util;\nimport org.eclipse.jdt.internal.corext.util.OpenTypeHistory;\nimport org.eclipse.jdt.internal.ui.filters.InnerClassFilesFilter;\nimport org.eclipse.jdt.ui.SharedASTProvider;\nimport org.eclipse.jface.viewers.Viewer;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaClassFile;\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaElement;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect ClassFileProviderAspect {\n\n  pointcut classFileCreations(PackageFragment parent, String name) : \n    call(protected ClassFile.new(PackageFragment, String)) &&\n    within(org.eclipse.jdt..*) &&\n    args(parent, name);\n  \n  pointcut getTypeName(ClassFile cf) :\n    execution(public String ClassFile.getTypeName()) &&\n    target(cf);\n\n  \/\/ For 3.6\n  pointcut mapSource(ClassFile cf, SourceMapper mapper, IBinaryType info, IClassFile owner) :\n    execution(IBuffer ClassFile.mapSource(SourceMapper, IBinaryType, IClassFile)) &&\n    target(cf) &&\n    target(IScalaClassFile) &&\n    args(mapper, info, owner);\n\n  \/\/ For 3.5\n  pointcut mapSource2(ClassFile cf, SourceMapper mapper, IBinaryType info) :\n    execution(IBuffer ClassFile.mapSource(SourceMapper, IBinaryType)) &&\n    target(cf) &&\n    target(IScalaClassFile) &&\n    args(mapper, info);\n\n  pointcut getSourceFileName(BinaryType bt) :\n    execution(String BinaryType.getSourceFileName(IBinaryType)) &&\n    target(bt);\n  \n  pointcut select(Viewer viewer, Object parentElement, Object element) :\n    execution(boolean InnerClassFilesFilter.select(Viewer, Object, Object)) &&\n    args(viewer, parentElement, element);\n  \n  pointcut getChildren(BinaryType bt) :\n    execution(IJavaElement[] BinaryType.getChildren()) &&\n    target(bt);\n  \n  pointcut getAST(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) : \n    execution(CompilationUnit SharedASTProvider.getAST(ITypeRoot, SharedASTProvider.WAIT_FLAG, IProgressMonitor)) &&\n    args(element, waitFlag, progressMonitor);\n  \n  pointcut resolve(HierarchyResolver hr, IGenericType suppliedType) :\n    execution(void HierarchyResolver.resolve(IGenericType)) &&\n    target(hr) &&\n    args(suppliedType);\n  \n  pointcut remember(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    execution(void HierarchyResolver.remember(IType, ReferenceBinding)) &&\n    target(hr) &&\n    args(type, typeBinding);\n  \n  pointcut acceptType(IType type, int acceptFlags, boolean isSourceType) :\n    execution(boolean NameLookup.acceptType(IType, int, boolean)) &&\n    args(type, acceptFlags, isSourceType);\n  \n  pointcut find(SearchableEnvironment se, String typeName, String packageName) :\n    execution(NameEnvironmentAnswer find(String, String)) &&\n    target(se) &&\n    args(typeName, packageName);\n  \n  pointcut convert(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) :\n    execution(CompilationUnitDeclaration SourceTypeConverter.convert(ISourceType[], CompilationResult)) &&\n    target(stc) &&\n    args(sourceTypes, compilationResult);\n  \n  pointcut getAncestor(JavaElement je, int ancestorType) :\n    execution(IJavaElement JavaElement.getAncestor(int)) &&\n    target(je) &&\n    args(ancestorType);\n  \n  pointcut isContainerDirty(TypeNameMatch match) :\n    execution(boolean OpenTypeHistory.isContainerDirty(TypeNameMatch)) &&\n    args(match);\n  \n  ClassFile around(PackageFragment parent, String name) : \n    classFileCreations(parent, name) {\n\n    ClassFile javaClassFile = proceed(parent, name);\n    byte[] bytes;\n    \n    try {\n      bytes = javaClassFile.getBytes();\n    } catch(Throwable t) {\n      return javaClassFile; \n    }\n    \n    for (IClassFileProvider provider : ClassFileProviderRegistry.getInstance().getProviders()) {\n      ClassFile cf = provider.create(bytes, parent, name);\n      if (cf != null)\n        return cf;\n    }\n    \n    return javaClassFile;\n  }\n  \n  IBuffer around(ClassFile cf, SourceMapper mapper, IBinaryType info, IClassFile owner) :\n    mapSource(cf, mapper, info, owner) {\n    return mapSourceSubst(cf, mapper, info);\n  }\n\n  IBuffer around(ClassFile cf, SourceMapper mapper, IBinaryType info) :\n    mapSource2(cf, mapper, info) {\n    return mapSourceSubst(cf, mapper, info);\n  }\n\n  IBuffer mapSourceSubst(ClassFile cf, SourceMapper mapper, IBinaryType info) {\n    char[] contents = mapper.findSource(cf.getType(), info);\n    IBuffer buffer;\n    if (contents != null) {\n      buffer = BufferManager.createBuffer(cf);\n      buffer.setContents(contents);\n    } else {\n      buffer = BufferManager.createNullBuffer(cf);\n    }\n    BufferManager bufManager = cf.getBufferManager();\n    bufManager.addBuffer(buffer);\n    buffer.addBufferChangedListener(cf);\n    return buffer;\n  }\n\n  String around(ClassFile cf) :\n    getTypeName(cf) {\n    if(cf instanceof IScalaClassFile) {\n      int lastDollar = cf.name.lastIndexOf('$');\n      return (lastDollar == -1 || lastDollar == cf.name.length()-1) ? cf.name : Util.localTypeName(cf.name, lastDollar, cf.name.length());\n    } else\n      return proceed(cf);\n  }\n  \n  boolean around(Viewer viewer, Object parentElement, Object element) :\n    select(viewer, parentElement, element) {\n    if (element instanceof IScalaClassFile) {\n      IClassFile classFile = (IClassFile) element;\n      String name = classFile.getElementName(); \n      int dollarIndex = name.indexOf('$');\n      return dollarIndex == -1 || dollarIndex == name.length()-7; \/\/ Trailing '$' implies object rather than inner class \n    }\n    return proceed(viewer, parentElement, element);\n  }\n  \n  IJavaElement[] around(BinaryType bt) throws JavaModelException :\n    getChildren(bt) && \n    target(BinaryType) {\n    ClassFile cf = (ClassFile)bt.parent;\n    if (cf instanceof IScalaClassFile)\n      return cf.getChildren();\n    else\n      return proceed(bt);\n  }\n  \n  CompilationUnit around(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) :\n    getAST(element, waitFlag, progressMonitor) {\n      if (element instanceof IScalaElement)\n        return null;\n      else\n        return proceed(element, waitFlag, progressMonitor);\n  }\n  \n  void around(HierarchyResolver hr, IGenericType suppliedType) :\n    resolve(hr, suppliedType) {\n    if (!suppliedType.isBinaryType()) {\n      IType tpe = ((SourceTypeElementInfo)suppliedType).getHandle();\n      IClassFile cf = tpe.getClassFile();\n      if (cf instanceof IScalaClassFile) {\n        hr.resolve(new Openable[]{(Openable)cf}, new HashSet(), null);\n        return;\n      }\n    }\n      \n    proceed(hr, suppliedType);\n  }\n  \n  void around(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    remember(hr, type, typeBinding) {\n    if (((IOpenable)type.getCompilationUnit()).isOpen()) {\n      try {\n        IGenericType genericType = (IGenericType)((JavaElement)type).getElementInfo();\n        hr.remember(genericType, typeBinding);\n      } catch (JavaModelException e) {\n        \/\/ cannot happen since element is open\n        return;\n      }\n    } else {\n      if (typeBinding == null) return;\n\n      TypeDeclaration typeDeclaration = ((SourceTypeBinding)typeBinding).scope.referenceType();\n\n      \/\/ simple super class name\n      char[] superclassName = null;\n      TypeReference superclass;\n      if ((typeDeclaration.bits & ASTNode.IsAnonymousType) != 0) {\n        superclass = typeDeclaration.allocation.type;\n      } else {\n        superclass = typeDeclaration.superclass;\n      }\n      if (superclass != null) {\n        char[][] typeName = superclass.getTypeName();\n        superclassName = typeName == null ? null : typeName[typeName.length-1];\n      }\n\n      \/\/ simple super interface names\n      char[][] superInterfaceNames = null;\n      TypeReference[] superInterfaces = typeDeclaration.superInterfaces;\n      if (superInterfaces != null) {\n        int length = superInterfaces.length;\n        superInterfaceNames = new char[length][];\n        for (int i = 0; i < length; i++) {\n          TypeReference superInterface = superInterfaces[i];\n          char[][] typeName = superInterface.getTypeName();\n          superInterfaceNames[i] = typeName[typeName.length-1];\n        }\n      }\n\n      HierarchyType hierarchyType = new HierarchyType(\n        type,\n        typeDeclaration.name,\n        typeDeclaration.binding.modifiers,\n        superclassName,\n        superInterfaceNames);\n      hr.remember(hierarchyType, typeDeclaration.binding);\n    }\n  }\n  \n  String around(BinaryType bt) :\n    getSourceFileName(bt) {\n    IJavaElement parent = bt.getTypeRoot(); \n    if (parent instanceof IScalaClassFile) {\n      return ((IScalaClassFile)parent).getSourceFileName();\n    }\n    else\n      return proceed(bt);\n  }\n  \n  boolean around(IType type, int acceptFlags, boolean isSourceType) :\n    acceptType(type, acceptFlags, isSourceType) {\n    if (!isSourceType && (type instanceof SourceType)) {\n      IJavaElement parent = type.getParent(); \n      if (parent instanceof IScalaClassFile)\n        return proceed(type, acceptFlags, true);\n    }\n    \n    return proceed(type, acceptFlags, isSourceType);\n  }\n  \n  CompilationUnitDeclaration around(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) throws JavaModelException :\n    convert(stc, sourceTypes, compilationResult) {\n    stc.unit = new CompilationUnitDeclaration(stc.problemReporter, compilationResult, 0);\n    \/\/ not filled at this point\n\n    if (sourceTypes.length == 0) return stc.unit;\n    SourceTypeElementInfo topLevelTypeInfo = (SourceTypeElementInfo) sourceTypes[0];\n    org.eclipse.jdt.core.ICompilationUnit cuHandle = topLevelTypeInfo.getHandle().getCompilationUnit();\n    stc.cu = (ICompilationUnit) cuHandle;\n\n    CompilationUnitElementInfo cuei = null;\n    Object info = ((JavaElement)stc.cu).getElementInfo();\n    if (info instanceof CompilationUnitElementInfo)\n      cuei = (CompilationUnitElementInfo)info;\n    \n    \n    if (stc.has1_5Compliance && cuei != null && cuei.annotationNumber > 10) { \/\/ experimental value\n      \/\/ if more than 10 annotations, diet parse as this is faster\n      return new Parser(stc.problemReporter, true).dietParse(stc.cu, compilationResult);\n    }\n\n    \/* only positions available *\/\n    int start = topLevelTypeInfo.getNameSourceStart();\n    int end = topLevelTypeInfo.getNameSourceEnd();\n\n    \/* convert package and imports *\/\n    String[] packageName = ((PackageFragment) cuHandle.getParent()).names;\n    if (packageName.length > 0)\n      \/\/ if its null then it is defined in the default package\n      stc.unit.currentPackage =\n        stc.createImportReference(packageName, start, end, false, ClassFileConstants.AccDefault);\n    IImportDeclaration[] importDeclarations = topLevelTypeInfo.getHandle().getCompilationUnit().getImports();\n    int importCount = importDeclarations.length;\n    stc.unit.imports = new ImportReference[importCount];\n    for (int i = 0; i < importCount; i++) {\n      ImportDeclaration importDeclaration = (ImportDeclaration) importDeclarations[i];\n      ISourceImport sourceImport = (ISourceImport) importDeclaration.getElementInfo();\n      String nameWithoutStar = importDeclaration.getNameWithoutStar();\n      stc.unit.imports[i] = stc.createImportReference(\n        Util.splitOn('.', nameWithoutStar, 0, nameWithoutStar.length()),\n        sourceImport.getDeclarationSourceStart(),\n        sourceImport.getDeclarationSourceEnd(),\n        importDeclaration.isOnDemand(),\n        sourceImport.getModifiers());\n    }\n    \/* convert type(s) *\/\n    try {\n      int typeCount = sourceTypes.length;\n      final TypeDeclaration[] types = new TypeDeclaration[typeCount];\n      \/*\n       * We used a temporary types collection to prevent this.unit.types from being null during a call to\n       * convert(...) when the source is syntactically incorrect and the parser is flushing the unit's types.\n       * See https:\/\/bugs.eclipse.org\/bugs\/show_bug.cgi?id=97466\n       *\/\n      for (int i = 0; i < typeCount; i++) {\n        SourceTypeElementInfo typeInfo = (SourceTypeElementInfo) sourceTypes[i];\n        types[i] = stc.convert((SourceType) typeInfo.getHandle(), compilationResult);\n      }\n      stc.unit.types = types;\n      return stc.unit;\n    } catch (SourceTypeConverter.AnonymousMemberFound e) {\n      return new Parser(stc.problemReporter, true).parse(stc.cu, compilationResult);\n    }\n  }\n  \n  IJavaElement around(JavaElement je, int ancestorType) :\n    getAncestor(je, ancestorType) {\n    IJavaElement element = je;\n    while (element != null) {\n      if (element.getElementType() == ancestorType)\n        return element;\n      else if (element instanceof IScalaClassFile && ancestorType == IJavaElement.COMPILATION_UNIT)\n        return ((JavaElement)element).getCompilationUnit();\n      element= element.getParent();\n    }\n    return null;\n  }\n\n  boolean around(TypeNameMatch match) :\n    isContainerDirty(match) {\n    org.eclipse.jdt.core.ICompilationUnit cu = match.getType().getCompilationUnit();\n    if (cu == null) {\n      return false;\n    }\n    IResource resource= cu.getResource();\n    if (resource == null)\n      return false;\n    \n    ITextFileBufferManager manager= FileBuffers.getTextFileBufferManager();\n    ITextFileBuffer textFileBuffer= manager.getTextFileBuffer(resource.getFullPath(), LocationKind.IFILE);\n    if (textFileBuffer != null) {\n      return textFileBuffer.isDirty();\n    }\n    return false;\n  }\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"0e13c87b66b42804eb37832264d26d212e61b805","subject":"Few changes in the Logs aspect as it doesn't compile with aspectj-maven-plugin 1.4","message":"Few changes in the Logs aspect as it doesn't compile with aspectj-maven-plugin 1.4\n","repos":"christophe-w\/parallelj.runtime,awltech\/org.parallelj","old_file":"parallelj-core\/src\/main\/java\/org\/parallelj\/internal\/log\/Logs.aj","new_file":"parallelj-core\/src\/main\/java\/org\/parallelj\/internal\/log\/Logs.aj","new_contents":"\/*\n *     ParallelJ, framework for parallel computing\n *\n *     Copyright (C) 2010, 2011, 2012 Atos Worldline or third-party contributors as\n *     indicated by the @author tags or express copyright attribution\n *     statements applied by the authors.\n *\n *     This library is free software; you can redistribute it and\/or\n *     modify it under the terms of the GNU Lesser General Public\n *     License as published by the Free Software Foundation; either\n *     version 2.1 of the License.\n *\n *     This library is distributed in the hope that it will be useful,\n *     but WITHOUT ANY WARRANTY; without even the implied warranty of\n *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n *     Lesser General Public License for more details.\n *\n *     You should have received a copy of the GNU Lesser General Public\n *     License along with this library; if not, write to the Free Software\n *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n *\/\npackage org.parallelj.internal.log;\n\nimport java.net.URLEncoder;\nimport java.util.Map;\n\nimport org.apache.log4j.Logger;\nimport org.parallelj.Executables;\nimport org.parallelj.internal.kernel.KCall;\nimport org.parallelj.internal.kernel.KProcess;\nimport org.parallelj.internal.kernel.KProgram;\nimport org.parallelj.mirror.Procedure;\n\n\/**\n * This class manages the event logs of each major element of \/\/J.\n * \n * @author Atos Worldline\n * \n *\/\npublic privileged aspect Logs {\n\n\tLogger logger = Logger.getLogger(\"org.parallelj.events\");\n\n\t\/**\n\t * Flag indicating if a program has already been logged.\n\t *\/\n\/\/\tboolean KProgram.dumped = false;\n\t\n\tinterface IDumped{};\n\n\tdeclare parents: KProgram implements IDumped;\n\t\n\tboolean IDumped.dumped = false;\n\t\n\tinterface ILogEntry{};\n\t\n\tdeclare parents: KProcess implements ILogEntry;\n\tdeclare parents: KCall implements ILogEntry;\n\n\tLogEntry ILogEntry.logEntry = new LogEntry();\n\t\n\t\/**\n\t * The {@link LogEntry} of a process.\n\t *\/\n\/\/\tLogEntry KProcess.logEntry = new LogEntry();\n\n\t\/**\n\t * The {@link LogEntry} of a procedure {@link KCall call}.\n\t *\/\n\/\/\tLogEntry KCall.logEntry = new LogEntry();\n\n\tLogs() {\n\t\t\/\/ log the prolog\n\t\tlogger.info(LogEntry.prolog);\n\t\t\/\/ System.out.println(LogEntry.prolog);\n\t}\n\n\t\/**\n\t * This advice dumps the main element of a program the first time the method\n\t * newProcess(...) is called.\n\t * \n\t * @param self\n\t *\/\n\tbefore(KProgram self): execution(* KProgram.newProcess(..)) && this(self) && if(!((IDumped)self).dumped) {\n\t\tLogEntry programEntry = new LogEntry();\n\t\tprogramEntry.start(\"0.0.0.0\/\" + self.getId());\n\t\tprogramEntry.end(self.getName());\n\t\tlogger.info(programEntry);\n\n\t\tfor (Procedure procedure : self.getProcedures()) {\n\t\t\tLogEntry procedureEntry = new LogEntry();\n\t\t\tprocedureEntry.start(self.getId() + \"\/\" + procedure.getId());\n\t\t\tprocedureEntry.end(procedure.getName() + \":\" + procedure.getType());\n\t\t\tlogger.info(procedureEntry);\n\t\t}\n\t\t((IDumped)self).dumped = true;\n\t}\n\n\t\/**\n\t * This advice manages the LogEntry of a process when its state has changed.\n\t * \n\t * @param self\n\t *            the process\n\t *\/\n\tafter(KProcess self) : execution(* KProcess.doStart()) && this(self) {\n\t\t((ILogEntry)self).logEntry.start(self.getParentId() + \"\/\" + self.getId());\n\t}\n\n\tafter(KProcess self) : execution(* KProcess.done()) && this(self) {\n\t\t((ILogEntry)self).logEntry.end(self.getState().toString(),\n\t\t\t\tthis.attributes(self.getContext()));\n\t\tlogger.info(((ILogEntry)self).logEntry);\n\t}\n\n\t\/**\n\t * This advice manages the LogEntry of a call when its state has changed.\n\t * \n\t * @param self\n\t *            the procedure call\n\t *\/\n\tafter(KCall self) : execution(* KCall.onRunning()) && this(self) {\n\t\t((ILogEntry)self).logEntry.start(self.process.getId() + \"\/\" + self.getId());\n\t}\n\t\n\tafter(KCall self) : execution( * KCall.onComplete()) && this(self) {\n\t\t((ILogEntry)self).logEntry.end(self.getState().toString(),\n\t\t\t\tthis.attributes(self.getContext()));\n\t\tlogger.info(((ILogEntry)self).logEntry);\n\t\t\n\t}\n\t\tafter(KCall self) : execution(* KCall.onCanceled()) && this(self) {\n\t\t\t((ILogEntry)self).logEntry.start(self.process.getId() + \"\/\" + self.getId());\n\t\t\t((ILogEntry)self).logEntry.end(self.getState().toString(),\n\t\t\t\t\tthis.attributes(self.getContext()));\n\t\t\tlogger.info(((ILogEntry)self).logEntry);\n\t\t}\n\n\t@SuppressWarnings(\"deprecation\")\n\tString attributes(Object context) {\n\t\tStringBuilder builder = new StringBuilder();\n\t\tMap<String, String> map = Executables.attributes(context);\n\t\tfor (Map.Entry<String, String> entry : map.entrySet()) {\n\t\t\tif (builder.length() > 0) {\n\t\t\t\tbuilder.append('&');\n\t\t\t}\n\t\t\tbuilder.append(URLEncoder.encode(entry.getKey())).append('=')\n\t\t\t\t\t.append(URLEncoder.encode(entry.getValue()));\n\t\t}\n\t\treturn builder.toString();\n\t}\n}\n","old_contents":"\/*\n *     ParallelJ, framework for parallel computing\n *\n *     Copyright (C) 2010, 2011, 2012 Atos Worldline or third-party contributors as\n *     indicated by the @author tags or express copyright attribution\n *     statements applied by the authors.\n *\n *     This library is free software; you can redistribute it and\/or\n *     modify it under the terms of the GNU Lesser General Public\n *     License as published by the Free Software Foundation; either\n *     version 2.1 of the License.\n *\n *     This library is distributed in the hope that it will be useful,\n *     but WITHOUT ANY WARRANTY; without even the implied warranty of\n *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n *     Lesser General Public License for more details.\n *\n *     You should have received a copy of the GNU Lesser General Public\n *     License along with this library; if not, write to the Free Software\n *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n *\/\npackage org.parallelj.internal.log;\n\nimport java.net.URLEncoder;\nimport java.util.Map;\n\nimport org.apache.log4j.Logger;\nimport org.parallelj.Executables;\nimport org.parallelj.internal.kernel.KCall;\nimport org.parallelj.internal.kernel.KProcess;\nimport org.parallelj.internal.kernel.KProgram;\nimport org.parallelj.internal.kernel.KProcedure;\nimport org.parallelj.mirror.Procedure;\n\n\/**\n * This class manages the event logs of each major element of \/\/J.\n * \n * @author Atos Worldline\n * \n *\/\npublic privileged aspect Logs {\n\n\tLogger logger = Logger.getLogger(\"org.parallelj.events\");\n\n\t\/**\n\t * Flag indicating if a program has already been logged.\n\t *\/\n\tboolean KProgram.dumped = false;\n\n\t\/**\n\t * The {@link LogEntry} of a process.\n\t *\/\n\tLogEntry KProcess.logEntry = new LogEntry();\n\n\t\/**\n\t * The {@link LogEntry} of a procedure {@link KCall call}.\n\t *\/\n\tLogEntry KCall.logEntry = new LogEntry();\n\n\tLogs() {\n\t\t\/\/ log the prolog\n\t\tlogger.info(LogEntry.prolog);\n\t\t\/\/ System.out.println(LogEntry.prolog);\n\t}\n\n\t\/**\n\t * This advice dumps the main element of a program the first time the method\n\t * newProcess(...) is called.\n\t * \n\t * @param self\n\t *\/\n\tbefore(KProgram self): execution(* KProgram.newProcess(..)) && this(self) && if(!self.dumped) {\n\t\tLogEntry programEntry = new LogEntry();\n\t\tprogramEntry.start(\"0.0.0.0\/\" + self.getId());\n\t\tprogramEntry.end(self.getName());\n\t\tlogger.info(programEntry);\n\n\t\tfor (Procedure procedure : self.getProcedures()) {\n\t\t\tLogEntry procedureEntry = new LogEntry();\n\t\t\tprocedureEntry.start(self.getId() + \"\/\" + procedure.getId());\n\t\t\tprocedureEntry.end(procedure.getName() + \":\" + procedure.getType());\n\t\t\tlogger.info(procedureEntry);\n\t\t}\n\t\tself.dumped = true;\n\t}\n\n\t\/**\n\t * This advice manages the LogEntry of a process when its state has changed.\n\t * \n\t * @param self\n\t *            the process\n\t *\/\n\tafter(KProcess self) : execution(* KProcess.doStart()) && this(self) {\n\t\tself.logEntry.start(self.getParentId() + \"\/\" + self.getId());\n\t}\n\n\tafter(KProcess self) : execution(* KProcess.done()) && this(self) {\n\t\tself.logEntry.end(self.getState().toString(),\n\t\t\t\tthis.attributes(self.getContext()));\n\t\tlogger.info(self.logEntry);\n\t}\n\n\t\/**\n\t * This advice manages the LogEntry of a call when its state has changed.\n\t * \n\t * @param self\n\t *            the procedure call\n\t *\/\n\tafter(KCall self) : execution(* KCall.onRunning()) && this(self) {\n\t\t\tself.logEntry.start(self.process.getId() + \"\/\" + self.getId());\n\t}\n\t\n\tafter(KCall self) : execution( * KCall.onComplete()) && this(self) {\n\t\tself.logEntry.end(self.getState().toString(),\n\t\t\t\tthis.attributes(self.getContext()));\n\t\tlogger.info(self.logEntry);\n\t\t\n\t}\n\t\tafter(KCall self) : execution(* KCall.onCanceled()) && this(self) {\n\t\t\tself.logEntry.start(self.process.getId() + \"\/\" + self.getId());\n\t\t\tself.logEntry.end(self.getState().toString(),\n\t\t\t\t\tthis.attributes(self.getContext()));\n\t\t\tlogger.info(self.logEntry);\n\t\t}\n\n\t@SuppressWarnings(\"deprecation\")\n\tString attributes(Object context) {\n\t\tStringBuilder builder = new StringBuilder();\n\t\tMap<String, String> map = Executables.attributes(context);\n\t\tfor (Map.Entry<String, String> entry : map.entrySet()) {\n\t\t\tif (builder.length() > 0) {\n\t\t\t\tbuilder.append('&');\n\t\t\t}\n\t\t\tbuilder.append(URLEncoder.encode(entry.getKey())).append('=')\n\t\t\t\t\t.append(URLEncoder.encode(entry.getValue()));\n\t\t}\n\t\treturn builder.toString();\n\t}\n}\n","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"ff8cd135ed15928c2fc8a7f3b6c8fe516d899fdc","subject":"aspect injection now works with modified parameters","message":"aspect injection now works with modified parameters\n","repos":"palava\/palava-core,palava\/palava-core","old_file":"src\/main\/java\/de\/cosmocode\/palava\/core\/aop\/AbstractPalavaAspect.aj","new_file":"src\/main\/java\/de\/cosmocode\/palava\/core\/aop\/AbstractPalavaAspect.aj","new_contents":"\/**\n * palava - a java-php-bridge\n * Copyright (C) 2007-2010  CosmoCode GmbH\n *\n * This program is free software; you can redistribute it and\/or\n * modify it under the terms of the GNU General Public License\n * as published by the Free Software Foundation; either version 2\n * of the License, or (at your option) any later version.\n *\n * This program is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n * along with this program; if not, write to the Free Software\n * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.\n *\/\n\npackage de.cosmocode.palava.core.aop;\n\nimport java.util.Collections;\n\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.common.collect.Iterables;\nimport com.google.inject.Binder;\nimport com.google.inject.Guice;\nimport com.google.inject.Injector;\nimport com.google.inject.Module;\nimport com.google.inject.Stage;\n\npublic abstract aspect AbstractPalavaAspect {\n\n    private static final Logger LOG = LoggerFactory.getLogger(AbstractPalavaAspect.class);\n    \n    private final Module module = new Module() {\n        \n        @Override\n        public void configure(Binder binder) {\n            final AbstractPalavaAspect self = AbstractPalavaAspect.this;\n            LOG.trace(\"Injecting members on {}\", self);\n            Preconditions.checkState(!alreadyInjected, \"Members have been already injected on {}\", self);\n            binder.requestInjection(self);\n            alreadyInjected = true;\n        }\n        \n    };\n    \n    private boolean alreadyInjected;\n    \n    private Module[] append(Module[] modules) {\n        final Module[] array = new Module[modules.length + 1];\n        array[0] = module;\n        System.arraycopy(modules, 0, array, 1, modules.length);\n        return array;\n    }\n    \n    private Iterable<? extends Module> append(Iterable<? extends Module> modules) {\n        return Iterables.concat(Collections.singleton(module), modules);\n    }\n    \n    private pointcut notHere(): !withincode(* AbstractPalavaAspect.*(..));\n    \n    Injector around(Module[] modules): call(Injector Guice.createInjector(Module...)) && args(modules) && notHere() {\n        return proceed(append(modules));\n    }\n\n    Injector around(Iterable<? extends Module> modules): call(Injector Guice.createInjector(Iterable<? extends Module>)) && args(modules) && notHere() {\n        return proceed(append(modules));\n    }\n\n    Injector around(Stage stage, Module[] modules): call(Injector Guice.createInjector(Stage, Module...)) && args(stage, modules) && notHere() {\n        return proceed(stage, append(modules));\n    }\n    \n    Injector around(Stage stage, Iterable<? extends Module> modules): call(Injector Guice.createInjector(Stage, Iterable<? extends Module>)) && args(stage, modules) && notHere() {\n        return proceed(stage, append(modules));\n    }\n    \n    protected final void checkState() {\n        Preconditions.checkState(alreadyInjected, \"Members have not been injected on {}\", this);\n    }\n\n}\n","old_contents":"\/**\n * palava - a java-php-bridge\n * Copyright (C) 2007-2010  CosmoCode GmbH\n *\n * This program is free software; you can redistribute it and\/or\n * modify it under the terms of the GNU General Public License\n * as published by the Free Software Foundation; either version 2\n * of the License, or (at your option) any later version.\n *\n * This program is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n * along with this program; if not, write to the Free Software\n * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.\n *\/\n\npackage de.cosmocode.palava.core.aop;\n\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.common.collect.Lists;\nimport com.google.inject.Binder;\nimport com.google.inject.Guice;\nimport com.google.inject.Injector;\nimport com.google.inject.Module;\nimport com.google.inject.Stage;\n\npublic abstract aspect AbstractPalavaAspect {\n\n    private static final Logger LOG = LoggerFactory.getLogger(AbstractPalavaAspect.class);\n    \n    private boolean alreadyInjected;\n    \n    pointcut createInjector(Stage stage, Module[] modules): call(Injector Guice.createInjector(Stage, Module...)) && args(stage, modules);\n    \n    Injector around(Stage stage, Module[] modules): createInjector(Stage, Module[]) && args(stage, modules) {\n        return Guice.createInjector(stage, Lists.asList(new Module() {\n                \n                @Override\n                public void configure(Binder binder) {\n                    LOG.trace(\"Injecting members on {}\", this);\n                    Preconditions.checkState(!alreadyInjected, \"Members have been already injected on {}\", this);\n                    binder.requestInjection(AbstractPalavaAspect.this);\n                    alreadyInjected = true;\n                }\n                \n        }, modules));\n    }\n    \n    protected final void checkState() {\n        Preconditions.checkState(alreadyInjected, \"Members have not been injected on {}\", this);\n    }\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"cd979d89e677053422a1dd84faf54b25aea121e8","subject":"Update XTrace init instrumentation","message":"Update XTrace init instrumentation\n","repos":"brownsys\/tracing-framework,brownsys\/tracing-framework,brownsys\/tracing-framework,brownsys\/tracing-framework,brownsys\/tracing-framework,brownsys\/tracing-framework,brownsys\/tracing-framework","old_file":"xtrace\/aspects\/src\/main\/aspect\/edu\/brown\/cs\/systems\/xtrace\/logging\/XTraceInit.aj","new_file":"xtrace\/aspects\/src\/main\/aspect\/edu\/brown\/cs\/systems\/xtrace\/logging\/XTraceInit.aj","new_contents":"package edu.brown.cs.systems.xtrace.logging;\n\nimport edu.brown.cs.systems.tracing.Utils;\nimport edu.brown.cs.systems.xtrace.XTrace;\nimport edu.brown.cs.systems.xtrace.XTraceBaggageInterface;\nimport edu.brown.cs.systems.xtrace.XTraceSettings;\n\n\/**\n * Adds an X-Trace start event in any main method\n *\/\npublic aspect XTraceInit {\n\n    before(): execution(public static void main(String[])) {\n        if (!XTraceBaggageInterface.hasTaskID() && XTraceSettings.traceMainMethods()) {\n            XTrace.startTask(true);\n            XTrace.setLoggingLevel(XTraceSettings.mainMethodLoggingLevel());\n        }\n        XTrace.getLogger(XTraceInit.class).tag(thisJoinPointStaticPart, \"Process main method begin\", Utils.getMainClass().getSimpleName(), \"main\");\n    }\n\n}\n","old_contents":"package edu.brown.cs.systems.xtrace.logging;\n\nimport edu.brown.cs.systems.tracing.Utils;\nimport edu.brown.cs.systems.xtrace.XTrace;\nimport edu.brown.cs.systems.xtrace.XTraceSettings;\n\n\/**\n * Adds an X-Trace start event in any main method\n *\/\npublic aspect XTraceInit {\n\n    before(): execution(public static void main(String[])) {\n        if (XTraceSettings.traceMainMethods()) {\n            XTrace.startTask(true);\n            XTrace.setLoggingLevel(XTraceSettings.mainMethodLoggingLevel());\n            XTrace.getLogger(XTraceInit.class).tag(thisJoinPointStaticPart, \"Process main method begin\", Utils.getMainClass().getSimpleName(), \"main\");\n        }\n    }\n\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"37196360a96d68970d394306d6a51a487638da02","subject":"changed logging from trace to debug on actions","message":"changed logging from trace to debug on actions\n","repos":"palava\/palava-jta","old_file":"src\/main\/java\/de\/cosmocode\/palava\/jta\/AbstractUserTransactionAspect.aj","new_file":"src\/main\/java\/de\/cosmocode\/palava\/jta\/AbstractUserTransactionAspect.aj","new_contents":"\/**\n * Copyright 2010 CosmoCode GmbH\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage de.cosmocode.palava.jta;\n\nimport javax.transaction.NotSupportedException;\nimport javax.transaction.Status;\nimport javax.transaction.SystemException;\nimport javax.transaction.UserTransaction;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\n\npublic abstract aspect AbstractUserTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(AbstractUserTransactionAspect.class);\n\n    private Provider<UserTransaction> provider;\n    \n    @Inject\n    void setProvider(Provider<UserTransaction> provider) {\n        this.provider = Preconditions.checkNotNull(provider, \"Provider\");\n    }\n    \n    protected abstract pointcut transactional();\n    \n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        final UserTransaction tx = provider.get();\n        LOG.trace(\"Using transaction {}\", tx);\n\n        try {\n            LOG.trace(\"Status of transaction: {}\", tx.getStatus());\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n        \n        final boolean local;\n        \n        try {\n            local = tx.getStatus() == Status.STATUS_NO_TRANSACTION;\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        if (local) {\n            LOG.debug(\"Beginning automatic transaction {}\", tx);\n            try {\n                tx.begin();\n            } catch (NotSupportedException e) {\n                throw new IllegalStateException(e);\n            } catch (SystemException e) {\n                throw new IllegalStateException(e);\n            }\n        } else {\n            LOG.trace(\"Transaction {} already active\", tx);\n        }\n\n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (Exception e) {\n            try {\n                if (local && \n                    (tx.getStatus() == Status.STATUS_ACTIVE || tx.getStatus() == Status.STATUS_MARKED_ROLLBACK)) {\n                    LOG.info(\"Rolling back local\/active transaction {}\", tx);\n                    tx.rollback();\n                } else if (tx.getStatus() != Status.STATUS_ROLLEDBACK || tx.getStatus() != Status.STATUS_ROLLING_BACK) {\n                    LOG.debug(\"Setting transaction {} as rollback only\", tx);\n                    tx.setRollbackOnly();\n                }\n            } catch (Exception inner) {\n                LOG.error(\"Rollback failed\", inner);\n            }\n            throw new IllegalStateException(e);\n        }\n        \n        final int status;\n        \n        try {\n            status = tx.getStatus();\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n        \n        if (local) {\n            if (status == Status.STATUS_MARKED_ROLLBACK) {\n                try {\n                    LOG.debug(\"Rolling back marked transaction {}\", tx);\n                    tx.rollback();\n                } catch (SystemException e) {\n                    throw new IllegalStateException(e);\n                }\n            } else {\n                try {\n                    tx.commit();\n                    LOG.debug(\"Committed automatic transaction {}\", tx);\n                } catch (Exception e) {\n                    try {\n                        LOG.info(\"Rolling back transaction {}\", tx);\n                        tx.rollback();\n                    } catch (Exception inner) {\n                        LOG.error(\"Rollback failed\", inner);\n                    }\n                    throw new IllegalStateException(e);\n                }\n            }\n        }\n        \n        return returnValue;\n    }\n    \n}\n","old_contents":"\/**\n * Copyright 2010 CosmoCode GmbH\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage de.cosmocode.palava.jta;\n\nimport javax.transaction.NotSupportedException;\nimport javax.transaction.Status;\nimport javax.transaction.SystemException;\nimport javax.transaction.UserTransaction;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\n\npublic abstract aspect AbstractUserTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(AbstractUserTransactionAspect.class);\n\n    private Provider<UserTransaction> provider;\n    \n    @Inject\n    void setProvider(Provider<UserTransaction> provider) {\n        this.provider = Preconditions.checkNotNull(provider, \"Provider\");\n    }\n    \n    protected abstract pointcut transactional();\n    \n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        final UserTransaction tx = provider.get();\n        LOG.trace(\"Using transaction {}\", tx);\n\n        try {\n            LOG.trace(\"Status of transaction: {}\", tx.getStatus());\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n        \n        final boolean local;\n        \n        try {\n            local = tx.getStatus() == Status.STATUS_NO_TRANSACTION;\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        if (local) {\n            LOG.trace(\"Beginning automatic transaction {}\", tx);\n            try {\n                tx.begin();\n            } catch (NotSupportedException e) {\n                throw new IllegalStateException(e);\n            } catch (SystemException e) {\n                throw new IllegalStateException(e);\n            }\n        } else {\n            LOG.trace(\"Transaction {} already active\", tx);\n        }\n\n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (Exception e) {\n            try {\n                if (local && \n                    (tx.getStatus() == Status.STATUS_ACTIVE || tx.getStatus() == Status.STATUS_MARKED_ROLLBACK)) {\n                    LOG.info(\"Rolling back local\/active transaction {}\", tx);\n                    tx.rollback();\n                } else if (tx.getStatus() != Status.STATUS_ROLLEDBACK || tx.getStatus() != Status.STATUS_ROLLING_BACK) {\n                    LOG.debug(\"Setting transaction {} as rollback only\", tx);\n                    tx.setRollbackOnly();\n                }\n            } catch (Exception inner) {\n                LOG.error(\"Rollback failed\", inner);\n            }\n            throw new IllegalStateException(e);\n        }\n        \n        final int status;\n        \n        try {\n            status = tx.getStatus();\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n        \n        if (local) {\n            if (status == Status.STATUS_MARKED_ROLLBACK) {\n                try {\n                    LOG.debug(\"Rolling back marked transaction {}\", tx);\n                    tx.rollback();\n                } catch (SystemException e) {\n                    throw new IllegalStateException(e);\n                }\n            } else {\n                try {\n                    tx.commit();\n                    LOG.debug(\"Committed automatic transaction {}\", tx);\n                } catch (Exception e) {\n                    try {\n                        LOG.info(\"Rolling back transaction {}\", tx);\n                        tx.rollback();\n                    } catch (Exception inner) {\n                        LOG.error(\"Rollback failed\", inner);\n                    }\n                    throw new IllegalStateException(e);\n                }\n            }\n        }\n        \n        return returnValue;\n    }\n    \n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"1daf60ac11a785b983e42cb4b9185d493998207e","subject":"logging first message seen","message":"logging first message seen\n","repos":"DataDog\/monitor,eigengo\/monitor,eigengo\/monitor,DataDog\/monitor","old_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/ActorCellMonitoringAspect.aj","new_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/ActorCellMonitoringAspect.aj","new_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.actor.*;\nimport org.eigengo.monitor.agent.AgentConfiguration;\nimport org.eigengo.monitor.output.CounterInterface;\nimport scala.Option;\n\nimport java.util.ArrayList;\nimport java.util.List;\nimport java.util.concurrent.ConcurrentHashMap;\nimport java.util.HashMap;\nimport java.util.concurrent.atomic.AtomicLong;\n\n\/**\n * Contains advices for monitoring behaviour of an actor; typically imprisoned in an {@code ActorCell}.\n *\/\npublic aspect ActorCellMonitoringAspect extends AbstractMonitoringAspect issingleton() {\n    private AkkaAgentConfiguration agentConfiguration;\n    private final CounterInterface counterInterface;\n    private final Option<String> noActorClazz = Option.empty();\n    private final HashMap<ActorFilter, AtomicLong> concurrentCounters;\n\n    \/**\n     * Constructs this aspect\n     *\/\n    public ActorCellMonitoringAspect() {\n        AgentConfiguration<AkkaAgentConfiguration> configuration = getAgentConfiguration(\"akka\", AkkaAgentConfigurationJapi.apply());\n        this.agentConfiguration = configuration.agent();\n        this.counterInterface = createCounterInterface(configuration.common());\n    \/\/ we initialise all the keys we'll be using for our sampling here, so that we can access the HashMap once per query\n        this.concurrentCounters = getCounterKeys(configuration);\n    }\n\n    \/**\n     * Injects the new {@code AkkaAgentConfiguration} instance.\n     *\n     * @param agentConfiguration the new configuration\n     *\/\n    synchronized final void setAgentConfiguration(AkkaAgentConfiguration agentConfiguration) {\n        this.agentConfiguration = agentConfiguration;\n    }\n\n    \/\/ decide whether to include this ActorCell in our measurements\n    private boolean includeActorPath(final ActorPath actorPath, final Option<String> actorClassName) {\n        if (!this.agentConfiguration.incuded().accept(actorPath, actorClassName)) return false;\n        if (this.agentConfiguration.excluded().accept(actorPath, actorClassName)) return false;\n\n        if (this.agentConfiguration.includeSystemAgents()) return true;\n\n        String userOrSystem = actorPath.getElements().iterator().next();\n        return \"user\".equals(userOrSystem);\n    }\n\n    private int getSampleRate(final ActorPath actorPath) {\n        return agentConfiguration.sampling().getRate(actorPath);\n    }\n\n    private Option<ActorFilter> getFilterToSampleOver(final ActorPath actorPath) {\n        return agentConfiguration.sampling().getFilterFor(actorPath);\n    }\n\n    private final boolean sampleMessage(final ActorPath actorPath) {\n        int sampleRate = getSampleRate(actorPath);\n        if (sampleRate == 1) {return true;}\n\n        \/\/ We've already essentially checked that the actorFilter is not None (with `sampleRate == 1`) so this is legit\n        ActorFilter actorFilter = getFilterToSampleOver(actorPath).get();\n        \/\/ And we initialised the HashMap element with AtomicLong(0) in the constructor\n        long timesSeenSoFar = concurrentCounters.get(actorFilter).incrementAndGet();\n        return (timesSeenSoFar % sampleRate == 1); \/\/ == 1 to log first value (incrementAndGet returns updated value)\n    }\n\n    \/\/ get the tags for the cell\n    private String[] getTags(final ActorPath actorPath, final Actor actor) {\n        List<String> tags = new ArrayList<String>();\n\n        \/\/ TODO: Improve detection of routed actors. This relies only on the naming :(.\n        String lastPathElement = actorPath.elements().last();\n        if (lastPathElement.startsWith(\"$\")) {\n            \/\/ this is routed actor.\n            tags.add(actorPath.parent().toString());\n            if (this.agentConfiguration.includeRoutees()) tags.add(actorPath.toString());\n        } else {\n            \/\/ there is no supervisor\n            tags.add(actorPath.toString());\n        }\n        if (actor != null) {\n            tags.add(String.format(\"akka:%s.%s\", actor.context().system().name(), actor.getClass().getCanonicalName()));\n        }\n\n        return tags.toArray(new String[tags.size()]);\n    }\n\n    \/**\n     * Advises the {@code ActorCell.receiveMessage(message: Object): Unit}\n     *\n     * @param actorCell the ActorCell where the actor that receives the message \"lives\"\n     * @param msg the incoming message\n     *\/\n    Object around(ActorCell actorCell, Object msg) : Pointcuts.actorCellReceiveMessage(actorCell, msg) {\n        final ActorPath actorPath = actorCell.self().path();\n        if (!includeActorPath(actorPath, Option.apply(actorCell.actor().getClass().getCanonicalName())) ||\n                !sampleMessage(actorPath)) return proceed(actorCell, msg);\n\n        \/\/ we tag by actor name\n        final String[] tags = getTags(actorPath, actorCell.actor());\n\n        \/\/ record the queue size\n        this.counterInterface.recordGaugeValue(\"akka.queue.size\", actorCell.numberOfMessages(), tags);\n        \/\/ record the message, general and specific\n        this.counterInterface.incrementCounter(\"akka.actor.delivered\", tags);\n        this.counterInterface.incrementCounter(\"akka.actor.delivered.\" + msg.getClass().getSimpleName(), tags);\n\n        \/\/ measure the time. we're using the ``nanoTime`` call to access the high-precision timer.\n        \/\/ since we're not really interested in wall time, but just some increasing measure of\n        \/\/ elapsed time\n        Object result = null;\n        final long start = System.nanoTime();\n        \/\/ result will always be ``null``, because target returns ``Unit``\n        result = proceed(actorCell, msg);\n        \/\/ ns or \u00b5s is too fine. ms will do for now.\n        final long duration = (System.nanoTime() - start) \/ 1000000;\n\n        \/\/ record the actor duration\n        this.counterInterface.recordExecutionTime(\"akka.actor.duration\", (int)duration, tags);\n\n        \/\/ return null would do the trick, but we want to be _proper_.\n        return result;\n    }\n\n    \/**\n     * Advises the {@code ActorCell.handleInvokeFailure(_, failure: Throwable): Unit}\n     *\n     * @param actorCell the ActorCell where the error spreads from\n     * @param failure the exception that escaped from the {@code receive} method\n     *\/\n    before(ActorCell actorCell, Throwable failure) : Pointcuts.actorCellHandleInvokeFailure(actorCell, failure) {\n        \/\/ record the error, general and specific\n        String[] tags = getTags(actorCell.self().path(), actorCell.actor());\n        this.counterInterface.incrementCounter(\"akka.actor.error\", tags);\n        this.counterInterface.incrementCounter(String.format(\"akka.actor.error.%s\", failure.getMessage()), tags);\n    }\n\n    \/**\n     * Advises the {@code EventStream.publish(event: Any): Unit}\n     *\n     * @param event the received event\n     *\/\n    before(Object event) : Pointcuts.eventStreamPublish(event) {\n        if (event instanceof UnhandledMessage) {\n            UnhandledMessage unhandledMessage = (UnhandledMessage)event;\n            String[] tags = getTags(unhandledMessage.recipient().path(), null);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered\", tags);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered.\" + unhandledMessage.getMessage().getClass().getSimpleName(), tags);\n        }\n    }\n\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorCell} and {@code ActorSystem}\n     *\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after() returning (ActorRef actor): Pointcuts.anyActorOf() {\n        if (!includeActorPath(actor.path(), this.noActorClazz)) return;\n\n        final String tag = actor.path().root().toString();\n        this.counterInterface.incrementCounter(\"akka.actor.count\", tag);\n    }\n\n    \/**\n     * Advises the {@code ActorCell.stop} method\n     *\n     * @param actor the actor being stopped\n     *\/\n    after(ActorRef actor) : Pointcuts.actorCellStop(actor) {\n        if (!includeActorPath(actor.path(), this.noActorClazz)) return;\n\n        final String tag = actor.path().root().toString();\n        this.counterInterface.decrementCounter(\"akka.actor.count\", tag);\n    }\n\n}","old_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.actor.*;\nimport org.eigengo.monitor.agent.AgentConfiguration;\nimport org.eigengo.monitor.output.CounterInterface;\nimport scala.Option;\n\nimport java.util.ArrayList;\nimport java.util.List;\nimport java.util.concurrent.ConcurrentHashMap;\nimport java.util.HashMap;\nimport java.util.concurrent.atomic.AtomicLong;\n\n\/**\n * Contains advices for monitoring behaviour of an actor; typically imprisoned in an {@code ActorCell}.\n *\/\npublic aspect ActorCellMonitoringAspect extends AbstractMonitoringAspect issingleton() {\n    private AkkaAgentConfiguration agentConfiguration;\n    private final CounterInterface counterInterface;\n    private final Option<String> noActorClazz = Option.empty();\n    private final HashMap<ActorFilter, AtomicLong> concurrentCounters;\n\n    \/**\n     * Constructs this aspect\n     *\/\n    public ActorCellMonitoringAspect() {\n        AgentConfiguration<AkkaAgentConfiguration> configuration = getAgentConfiguration(\"akka\", AkkaAgentConfigurationJapi.apply());\n        this.agentConfiguration = configuration.agent();\n        this.counterInterface = createCounterInterface(configuration.common());\n    \/\/ we initialise all the keys we'll be using for our sampling here, so that we can access the HashMap once per query\n        this.concurrentCounters = getCounterKeys(configuration);\n    }\n\n    \/**\n     * Injects the new {@code AkkaAgentConfiguration} instance.\n     *\n     * @param agentConfiguration the new configuration\n     *\/\n    synchronized final void setAgentConfiguration(AkkaAgentConfiguration agentConfiguration) {\n        this.agentConfiguration = agentConfiguration;\n    }\n\n    \/\/ decide whether to include this ActorCell in our measurements\n    private boolean includeActorPath(final ActorPath actorPath, final Option<String> actorClassName) {\n        if (!this.agentConfiguration.incuded().accept(actorPath, actorClassName)) return false;\n        if (this.agentConfiguration.excluded().accept(actorPath, actorClassName)) return false;\n\n        if (this.agentConfiguration.includeSystemAgents()) return true;\n\n        String userOrSystem = actorPath.getElements().iterator().next();\n        return \"user\".equals(userOrSystem);\n    }\n\n    private int getSampleRate(final ActorPath actorPath) {\n        return agentConfiguration.sampling().getRate(actorPath);\n    }\n\n    private Option<ActorFilter> getFilterToSampleOver(final ActorPath actorPath) {\n        return agentConfiguration.sampling().getFilterFor(actorPath);\n    }\n\n    private final boolean sampleMessage(final ActorPath actorPath) {\n        int sampleRate = getSampleRate(actorPath);\n        if (sampleRate == 1) {return true;}\n\n        \/\/ We've already essentially checked that the actorFilter is not None (with `sampleRate == 1`) so this is legit\n        ActorFilter actorFilter = getFilterToSampleOver(actorPath).get();\n        \/\/ And we initialised the HashMap element with AtomicLong(0) in the constructor\n        long timesSeenSoFar = concurrentCounters.get(actorFilter).incrementAndGet();\n        return (timesSeenSoFar % sampleRate == 0);\n    }\n\n    \/\/ get the tags for the cell\n    private String[] getTags(final ActorPath actorPath, final Actor actor) {\n        List<String> tags = new ArrayList<String>();\n\n        \/\/ TODO: Improve detection of routed actors. This relies only on the naming :(.\n        String lastPathElement = actorPath.elements().last();\n        if (lastPathElement.startsWith(\"$\")) {\n            \/\/ this is routed actor.\n            tags.add(actorPath.parent().toString());\n            if (this.agentConfiguration.includeRoutees()) tags.add(actorPath.toString());\n        } else {\n            \/\/ there is no supervisor\n            tags.add(actorPath.toString());\n        }\n        if (actor != null) {\n            tags.add(String.format(\"akka:%s.%s\", actor.context().system().name(), actor.getClass().getCanonicalName()));\n        }\n\n        return tags.toArray(new String[tags.size()]);\n    }\n\n    \/**\n     * Advises the {@code ActorCell.receiveMessage(message: Object): Unit}\n     *\n     * @param actorCell the ActorCell where the actor that receives the message \"lives\"\n     * @param msg the incoming message\n     *\/\n    Object around(ActorCell actorCell, Object msg) : Pointcuts.actorCellReceiveMessage(actorCell, msg) {\n        final ActorPath actorPath = actorCell.self().path();\n        if (!includeActorPath(actorPath, Option.apply(actorCell.actor().getClass().getCanonicalName())) ||\n                !sampleMessage(actorPath)) return proceed(actorCell, msg);\n\n        \/\/ we tag by actor name\n        final String[] tags = getTags(actorPath, actorCell.actor());\n\n        \/\/ record the queue size\n        this.counterInterface.recordGaugeValue(\"akka.queue.size\", actorCell.numberOfMessages(), tags);\n        \/\/ record the message, general and specific\n        this.counterInterface.incrementCounter(\"akka.actor.delivered\", tags);\n        this.counterInterface.incrementCounter(\"akka.actor.delivered.\" + msg.getClass().getSimpleName(), tags);\n\n        \/\/ measure the time. we're using the ``nanoTime`` call to access the high-precision timer.\n        \/\/ since we're not really interested in wall time, but just some increasing measure of\n        \/\/ elapsed time\n        Object result = null;\n        final long start = System.nanoTime();\n        \/\/ result will always be ``null``, because target returns ``Unit``\n        result = proceed(actorCell, msg);\n        \/\/ ns or \u00b5s is too fine. ms will do for now.\n        final long duration = (System.nanoTime() - start) \/ 1000000;\n\n        \/\/ record the actor duration\n        this.counterInterface.recordExecutionTime(\"akka.actor.duration\", (int)duration, tags);\n\n        \/\/ return null would do the trick, but we want to be _proper_.\n        return result;\n    }\n\n    \/**\n     * Advises the {@code ActorCell.handleInvokeFailure(_, failure: Throwable): Unit}\n     *\n     * @param actorCell the ActorCell where the error spreads from\n     * @param failure the exception that escaped from the {@code receive} method\n     *\/\n    before(ActorCell actorCell, Throwable failure) : Pointcuts.actorCellHandleInvokeFailure(actorCell, failure) {\n        \/\/ record the error, general and specific\n        String[] tags = getTags(actorCell.self().path(), actorCell.actor());\n        this.counterInterface.incrementCounter(\"akka.actor.error\", tags);\n        this.counterInterface.incrementCounter(String.format(\"akka.actor.error.%s\", failure.getMessage()), tags);\n    }\n\n    \/**\n     * Advises the {@code EventStream.publish(event: Any): Unit}\n     *\n     * @param event the received event\n     *\/\n    before(Object event) : Pointcuts.eventStreamPublish(event) {\n        if (event instanceof UnhandledMessage) {\n            UnhandledMessage unhandledMessage = (UnhandledMessage)event;\n            String[] tags = getTags(unhandledMessage.recipient().path(), null);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered\", tags);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered.\" + unhandledMessage.getMessage().getClass().getSimpleName(), tags);\n        }\n    }\n\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorCell} and {@code ActorSystem}\n     *\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after() returning (ActorRef actor): Pointcuts.anyActorOf() {\n        if (!includeActorPath(actor.path(), this.noActorClazz)) return;\n\n        final String tag = actor.path().root().toString();\n        this.counterInterface.incrementCounter(\"akka.actor.count\", tag);\n    }\n\n    \/**\n     * Advises the {@code ActorCell.stop} method\n     *\n     * @param actor the actor being stopped\n     *\/\n    after(ActorRef actor) : Pointcuts.actorCellStop(actor) {\n        if (!includeActorPath(actor.path(), this.noActorClazz)) return;\n\n        final String tag = actor.path().root().toString();\n        this.counterInterface.decrementCounter(\"akka.actor.count\", tag);\n    }\n\n}","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"f74789ffbe1a671aaf8175987e6f68afd639f5a6","subject":"optimize AJ pointcut definition (SPR-8890)","message":"optimize AJ pointcut definition (SPR-8890)\n","repos":"spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework","old_file":"org.springframework.aspects\/src\/main\/java\/org\/springframework\/cache\/aspectj\/AnnotationCacheAspect.aj","new_file":"org.springframework.aspects\/src\/main\/java\/org\/springframework\/cache\/aspectj\/AnnotationCacheAspect.aj","new_contents":"\/*\r\n * Copyright 2002-2011 the original author or authors.\r\n *\r\n * Licensed under the Apache License, Version 2.0 (the \"License\");\r\n * you may not use this file except in compliance with the License.\r\n * You may obtain a copy of the License at\r\n *\r\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\r\n *\r\n * Unless required by applicable law or agreed to in writing, software\r\n * distributed under the License is distributed on an \"AS IS\" BASIS,\r\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n * See the License for the specific language governing permissions and\r\n * limitations under the License.\r\n *\/\r\n\r\npackage org.springframework.cache.aspectj;\r\n\r\nimport org.springframework.cache.annotation.AnnotationCacheOperationSource;\r\nimport org.springframework.cache.annotation.CacheEvict;\r\nimport org.springframework.cache.annotation.CachePut;\r\nimport org.springframework.cache.annotation.Cacheable;\r\nimport org.springframework.cache.annotation.Caching;\r\n\r\n\/**\r\n * Concrete AspectJ cache aspect using Spring's @{@link Cacheable} annotation.\r\n *\r\n * <p>When using this aspect, you <i>must<\/i> annotate the implementation class (and\/or\r\n * methods within that class), <i>not<\/i> the interface (if any) that the class\r\n * implements. AspectJ follows Java's rule that annotations on interfaces are <i>not<\/i>\r\n * inherited.\r\n *\r\n * <p>A {@code @Cacheable} annotation on a class specifies the default caching semantics\r\n * for the execution of any <b>public<\/b> operation in the class.\r\n *\r\n * <p>A {@code @Cacheable} annotation on a method within the class overrides the default\r\n * caching semantics given by the class annotation (if present). Any method may be\r\n * annotated (regardless of visibility). Annotating non-public methods directly is the\r\n * only way to get caching demarcation for the execution of such operations.\r\n *\r\n * @author Costin Leau\r\n * @since 3.1\r\n *\/\r\npublic aspect AnnotationCacheAspect extends AbstractCacheAspect {\r\n\r\n\tpublic AnnotationCacheAspect() {\r\n\t\tsuper(new AnnotationCacheOperationSource(false));\r\n\t}\r\n\r\n\t\/**\r\n\t * Matches the execution of any public method in a type with the @{@link Cacheable}\r\n\t * annotation, or any subtype of a type with the {@code @Cacheable} annotation.\r\n\t *\/\r\n\tprivate pointcut executionOfAnyPublicMethodInAtCacheableType() :\r\n\t\texecution(public * ((@Cacheable *)+).*(..)) && within(@Cacheable *);\r\n\r\n\t\/**\r\n\t * Matches the execution of any public method in a type with the @{@link CacheEvict}\r\n\t * annotation, or any subtype of a type with the {@code CacheEvict} annotation.\r\n\t *\/\r\n\tprivate pointcut executionOfAnyPublicMethodInAtCacheEvictType() :\r\n\t\texecution(public * ((@CacheEvict *)+).*(..)) && within(@CacheEvict *);\r\n\r\n\t\/**\r\n\t * Matches the execution of any public method in a type with the @{@link CachePut}\r\n\t * annotation, or any subtype of a type with the {@code CachePut} annotation.\r\n\t *\/\r\n\tprivate pointcut executionOfAnyPublicMethodInAtCachePutType() :\r\n\t\texecution(public * ((@CachePut *)+).*(..)) && within(@CachePut *);\r\n\r\n\t\/**\r\n\t * Matches the execution of any public method in a type with the @{@link Caching}\r\n\t * annotation, or any subtype of a type with the {@code Caching} annotation.\r\n\t *\/\r\n\tprivate pointcut executionOfAnyPublicMethodInAtCachingType() :\r\n\t\texecution(public * ((@Caching *)+).*(..)) && within(@Caching *);\r\n\r\n\t\/**\r\n\t * Matches the execution of any method with the @{@link Cacheable} annotation.\r\n\t *\/\r\n\tprivate pointcut executionOfCacheableMethod() :\r\n\t\texecution(@Cacheable * *(..));\r\n\r\n\t\/**\r\n\t * Matches the execution of any method with the @{@link CacheEvict} annotation.\r\n\t *\/\r\n\tprivate pointcut executionOfCacheEvictMethod() :\r\n\t\texecution(@CacheEvict * *(..));\r\n\r\n\t\/**\r\n\t * Matches the execution of any method with the @{@link CachePut} annotation.\r\n\t *\/\r\n\tprivate pointcut executionOfCachePutMethod() :\r\n\t\texecution(@CachePut * *(..));\r\n\r\n\t\/**\r\n\t * Matches the execution of any method with the @{@link Caching} annotation.\r\n\t *\/\r\n\tprivate pointcut executionOfCachingMethod() :\r\n\t\texecution(@Caching * *(..));\r\n\r\n\t\/**\r\n\t * Definition of pointcut from super aspect - matched join points will have Spring\r\n\t * cache management applied.\r\n\t *\/\r\n\tprotected pointcut cacheMethodExecution(Object cachedObject) :\r\n\t\t(executionOfAnyPublicMethodInAtCacheableType()\r\n\t\t\t\t|| executionOfAnyPublicMethodInAtCacheEvictType()\r\n\t\t\t\t|| executionOfAnyPublicMethodInAtCachePutType()\r\n\t\t\t\t|| executionOfAnyPublicMethodInAtCachingType()\r\n\t\t\t\t|| executionOfCacheableMethod()\r\n\t\t\t\t|| executionOfCacheEvictMethod()\r\n\t\t\t\t|| executionOfCachePutMethod()\r\n\t\t\t\t|| executionOfCachingMethod())\r\n\t\t\t&& this(cachedObject);\r\n}","old_contents":"\/*\r\n * Copyright 2002-2011 the original author or authors.\r\n *\r\n * Licensed under the Apache License, Version 2.0 (the \"License\");\r\n * you may not use this file except in compliance with the License.\r\n * You may obtain a copy of the License at\r\n *\r\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\r\n *\r\n * Unless required by applicable law or agreed to in writing, software\r\n * distributed under the License is distributed on an \"AS IS\" BASIS,\r\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n * See the License for the specific language governing permissions and\r\n * limitations under the License.\r\n *\/\r\n\r\npackage org.springframework.cache.aspectj;\r\n\r\nimport org.springframework.cache.annotation.AnnotationCacheOperationSource;\r\nimport org.springframework.cache.annotation.CacheEvict;\r\nimport org.springframework.cache.annotation.CachePut;\r\nimport org.springframework.cache.annotation.Cacheable;\r\nimport org.springframework.cache.annotation.Caching;\r\n\r\n\/**\r\n * Concrete AspectJ cache aspect using Spring's @{@link Cacheable} annotation.\r\n *\r\n * <p>When using this aspect, you <i>must<\/i> annotate the implementation class (and\/or\r\n * methods within that class), <i>not<\/i> the interface (if any) that the class\r\n * implements. AspectJ follows Java's rule that annotations on interfaces are <i>not<\/i>\r\n * inherited.\r\n *\r\n * <p>A {@code @Cacheable} annotation on a class specifies the default caching semantics\r\n * for the execution of any <b>public<\/b> operation in the class.\r\n *\r\n * <p>A {@code @Cacheable} annotation on a method within the class overrides the default\r\n * caching semantics given by the class annotation (if present). Any method may be\r\n * annotated (regardless of visibility). Annotating non-public methods directly is the\r\n * only way to get caching demarcation for the execution of such operations.\r\n *\r\n * @author Costin Leau\r\n * @since 3.1\r\n *\/\r\npublic aspect AnnotationCacheAspect extends AbstractCacheAspect {\r\n\r\n\tpublic AnnotationCacheAspect() {\r\n\t\tsuper(new AnnotationCacheOperationSource(false));\r\n\t}\r\n\r\n\t\/**\r\n\t * Matches the execution of any public method in a type with the @{@link Cacheable}\r\n\t * annotation, or any subtype of a type with the {@code @Cacheable} annotation.\r\n\t *\/\r\n\tprivate pointcut executionOfAnyPublicMethodInAtCacheableType() :\r\n\t\texecution(public * ((@Cacheable *)+).*(..)) && @this(Cacheable);\r\n\r\n\t\/**\r\n\t * Matches the execution of any public method in a type with the @{@link CacheEvict}\r\n\t * annotation, or any subtype of a type with the {@code CacheEvict} annotation.\r\n\t *\/\r\n\tprivate pointcut executionOfAnyPublicMethodInAtCacheEvictType() :\r\n\t\texecution(public * ((@CacheEvict *)+).*(..)) && @this(CacheEvict);\r\n\r\n\t\/**\r\n\t * Matches the execution of any public method in a type with the @{@link CachePut}\r\n\t * annotation, or any subtype of a type with the {@code CachePut} annotation.\r\n\t *\/\r\n\tprivate pointcut executionOfAnyPublicMethodInAtCachePutType() :\r\n\t\texecution(public * ((@CachePut *)+).*(..)) && @this(CachePut);\r\n\r\n\t\/**\r\n\t * Matches the execution of any public method in a type with the @{@link Caching}\r\n\t * annotation, or any subtype of a type with the {@code Caching} annotation.\r\n\t *\/\r\n\tprivate pointcut executionOfAnyPublicMethodInAtCachingType() :\r\n\t\texecution(public * ((@Caching *)+).*(..)) && @this(Caching);\r\n\r\n\t\/**\r\n\t * Matches the execution of any method with the @{@link Cacheable} annotation.\r\n\t *\/\r\n\tprivate pointcut executionOfCacheableMethod() :\r\n\t\texecution(* *(..)) && @annotation(Cacheable);\r\n\r\n\t\/**\r\n\t * Matches the execution of any method with the @{@link CacheEvict} annotation.\r\n\t *\/\r\n\tprivate pointcut executionOfCacheEvictMethod() :\r\n\t\texecution(* *(..)) && @annotation(CacheEvict);\r\n\r\n\t\/**\r\n\t * Matches the execution of any method with the @{@link CachePut} annotation.\r\n\t *\/\r\n\tprivate pointcut executionOfCachePutMethod() :\r\n\t\texecution(* *(..)) && @annotation(CachePut);\r\n\r\n\t\/**\r\n\t * Matches the execution of any method with the @{@link Caching} annotation.\r\n\t *\/\r\n\tprivate pointcut executionOfCachingMethod() :\r\n\t\texecution(* *(..)) && @annotation(Caching);\r\n\r\n\t\/**\r\n\t * Definition of pointcut from super aspect - matched join points will have Spring\r\n\t * cache management applied.\r\n\t *\/\r\n\tprotected pointcut cacheMethodExecution(Object cachedObject) :\r\n\t\t(executionOfAnyPublicMethodInAtCacheableType()\r\n\t\t\t\t|| executionOfAnyPublicMethodInAtCacheEvictType()\r\n\t\t\t\t|| executionOfAnyPublicMethodInAtCachePutType()\r\n\t\t\t\t|| executionOfAnyPublicMethodInAtCachingType()\r\n\t\t\t\t|| executionOfCacheableMethod()\r\n\t\t\t\t|| executionOfCacheEvictMethod()\r\n\t\t\t\t|| executionOfCachePutMethod()\r\n\t\t\t\t|| executionOfCachingMethod())\r\n\t\t\t&& this(cachedObject);\r\n}","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"2782596b9758e354a52133940d70343c0ebe5104","subject":"Fixed incorrectly specified pointcut. No review.","message":"Fixed incorrectly specified pointcut. No review.\n\ngit-svn-id: f4ecfe233223879a4a16cd7937f11b5152963d8e@21089 5e8d7ff9-d8ef-0310-90f0-a4852d11357a\n","repos":"romanowski\/scala-ide,andrey-ilinykh\/scala-ide,mlangc\/scala-ide,scala-ide\/scala-ide,dragos\/scala-ide,scala-ide\/scala-ide,andrey-ilinykh\/scala-ide,aleksi-lukkarinen\/scala-ide,pilipolio\/scala-ide,romanowski\/scala-ide,romanowski\/scala-ide,aleksi-lukkarinen\/scala-ide,dragos\/scala-ide,stephenh\/scala-ide,aleksi-lukkarinen\/scala-ide,Kwestor\/scala-ide,sschaef\/scala-ide,andrey-ilinykh\/scala-ide,andrey-ilinykh\/scala-ide,dragos\/scala-ide,pilipolio\/scala-ide,wpopielarski\/scala-ide,scala-ide\/scala-ide,scala-ide\/scala-ide,Duhemm\/scala-ide,wpopielarski\/scala-ide,stephenh\/scala-ide,dragos\/scala-ide,Kwestor\/scala-ide,Duhemm\/scala-ide,aleksi-lukkarinen\/scala-ide,wpopielarski\/scala-ide,wpopielarski\/scala-ide,pilipolio\/scala-ide,Duhemm\/scala-ide,Kwestor\/scala-ide,romanowski\/scala-ide,stephenh\/scala-ide,Duhemm\/scala-ide,stephenh\/scala-ide,sschaef\/scala-ide,pilipolio\/scala-ide,mlangc\/scala-ide,mlangc\/scala-ide,sschaef\/scala-ide,mlangc\/scala-ide,sschaef\/scala-ide,Kwestor\/scala-ide","old_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/cfprovider\/ClassFileProviderAspect.aj","new_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/cfprovider\/ClassFileProviderAspect.aj","new_contents":"\/*\n * Copyright 2005-2010 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.cfprovider;\n\nimport java.util.HashSet;\n\nimport org.eclipse.core.filebuffers.FileBuffers;\nimport org.eclipse.core.filebuffers.ITextFileBuffer;\nimport org.eclipse.core.filebuffers.ITextFileBufferManager;\nimport org.eclipse.core.filebuffers.LocationKind;\nimport org.eclipse.core.resources.IResource;\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.core.IBuffer;\nimport org.eclipse.jdt.core.IClassFile;\nimport org.eclipse.jdt.core.IImportDeclaration;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IOpenable;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.ITypeRoot;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.core.dom.CompilationUnit;\nimport org.eclipse.jdt.core.search.TypeNameMatch;\nimport org.eclipse.jdt.internal.compiler.CompilationResult;\nimport org.eclipse.jdt.internal.compiler.ast.ASTNode;\nimport org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.ImportReference;\nimport org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.TypeReference;\nimport org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;\nimport org.eclipse.jdt.internal.compiler.env.IBinaryType;\nimport org.eclipse.jdt.internal.compiler.env.ICompilationUnit;\nimport org.eclipse.jdt.internal.compiler.env.IGenericType;\nimport org.eclipse.jdt.internal.compiler.env.ISourceImport;\nimport org.eclipse.jdt.internal.compiler.env.ISourceType;\nimport org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer;\nimport org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding;\nimport org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding;\nimport org.eclipse.jdt.internal.compiler.parser.Parser;\nimport org.eclipse.jdt.internal.compiler.parser.SourceTypeConverter;\nimport org.eclipse.jdt.internal.core.BinaryType;\nimport org.eclipse.jdt.internal.core.ClassFile;\nimport org.eclipse.jdt.internal.core.CompilationUnitElementInfo;\nimport org.eclipse.jdt.internal.core.ImportDeclaration;\nimport org.eclipse.jdt.internal.core.JavaElement;\nimport org.eclipse.jdt.internal.core.NameLookup;\nimport org.eclipse.jdt.internal.core.Openable;\nimport org.eclipse.jdt.internal.core.PackageFragment;\nimport org.eclipse.jdt.internal.core.SearchableEnvironment;\nimport org.eclipse.jdt.internal.core.SourceMapper;\nimport org.eclipse.jdt.internal.core.SourceType;\nimport org.eclipse.jdt.internal.core.SourceTypeElementInfo;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyResolver;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyType;\nimport org.eclipse.jdt.internal.core.util.Util;\nimport org.eclipse.jdt.internal.corext.util.OpenTypeHistory;\nimport org.eclipse.jdt.internal.ui.filters.InnerClassFilesFilter;\nimport org.eclipse.jdt.ui.SharedASTProvider;\nimport org.eclipse.jface.viewers.Viewer;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaClassFile;\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaElement;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect ClassFileProviderAspect {\n\n  pointcut classFileCreations(PackageFragment parent, String name) : \n    call(protected ClassFile.new(PackageFragment, String)) &&\n    within(org.eclipse.jdt..*) &&\n    args(parent, name);\n  \n  pointcut getTypeName(ClassFile cf) :\n    execution(public String ClassFile.getTypeName()) &&\n    target(cf);\n\n  pointcut getType(ClassFile cf) :\n    call(public IType IClassFile.getType()) &&\n    target(cf);\n  \n  pointcut mapSource() :\n    execution(IBuffer ClassFile.mapSource(SourceMapper, IBinaryType)) &&\n    target(IScalaClassFile);\n  \n  pointcut mapSource2() :\n    execution(void SourceMapper.mapSource(IType, char[], IBinaryType));\n  \n  pointcut getSourceFileName(BinaryType bt) :\n    execution(String BinaryType.getSourceFileName(IBinaryType)) &&\n    target(bt);\n  \n  pointcut select(Viewer viewer, Object parentElement, Object element) :\n    execution(boolean InnerClassFilesFilter.select(Viewer, Object, Object)) &&\n    args(viewer, parentElement, element);\n  \n  pointcut getChildren(BinaryType bt) :\n    execution(IJavaElement[] BinaryType.getChildren()) &&\n    target(bt);\n  \n  pointcut getAST(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) : \n    execution(CompilationUnit SharedASTProvider.getAST(ITypeRoot, SharedASTProvider.WAIT_FLAG, IProgressMonitor)) &&\n    args(element, waitFlag, progressMonitor);\n  \n  pointcut resolve(HierarchyResolver hr, IGenericType suppliedType) :\n    execution(void HierarchyResolver.resolve(IGenericType)) &&\n    target(hr) &&\n    args(suppliedType);\n  \n  pointcut remember(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    execution(void HierarchyResolver.remember(IType, ReferenceBinding)) &&\n    target(hr) &&\n    args(type, typeBinding);\n  \n  pointcut acceptType(IType type, int acceptFlags, boolean isSourceType) :\n    execution(boolean NameLookup.acceptType(IType, int, boolean)) &&\n    args(type, acceptFlags, isSourceType);\n  \n  pointcut find(SearchableEnvironment se, String typeName, String packageName) :\n    execution(NameEnvironmentAnswer find(String, String)) &&\n    target(se) &&\n    args(typeName, packageName);\n  \n  pointcut convert(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) :\n    execution(CompilationUnitDeclaration SourceTypeConverter.convert(ISourceType[], CompilationResult)) &&\n    target(stc) &&\n    args(sourceTypes, compilationResult);\n  \n  pointcut getAncestor(JavaElement je, int ancestorType) :\n    execution(IJavaElement JavaElement.getAncestor(int)) &&\n    target(je) &&\n    args(ancestorType);\n  \n  pointcut isContainerDirty(TypeNameMatch match) :\n    execution(boolean OpenTypeHistory.isContainerDirty(TypeNameMatch)) &&\n    args(match);\n  \n  ClassFile around(PackageFragment parent, String name) : \n    classFileCreations(parent, name) {\n\n    ClassFile javaClassFile = proceed(parent, name);\n    byte[] bytes;\n    \n    try {\n      bytes = javaClassFile.getBytes();\n    } catch(Throwable t) {\n      return javaClassFile; \n    }\n    \n    for (IClassFileProvider provider : ClassFileProviderRegistry.getInstance().getProviders()) {\n      ClassFile cf = provider.create(bytes, parent, name);\n      if (cf != null)\n        return cf;\n    }\n    \n    return javaClassFile;\n  }\n  \n  void around() :\n    mapSource2() &&\n    cflow(mapSource()) {\n    return;\n  }\n  \n  IType around(ClassFile cf) :\n    getType(cf) &&\n    cflow(mapSource()) {\n    if (cf.binaryType == null)\n      cf.binaryType = new BinaryType(cf, cf.getTypeName());\n    return cf.binaryType;\n  }\n  \n  String around(ClassFile cf) :\n    getTypeName(cf) {\n    if(cf instanceof IScalaClassFile) {\n      int lastDollar = cf.name.lastIndexOf('$');\n      return (lastDollar == -1 || lastDollar == cf.name.length()-1) ? cf.name : Util.localTypeName(cf.name, lastDollar, cf.name.length());\n    } else\n      return proceed(cf);\n  }\n  \n  boolean around(Viewer viewer, Object parentElement, Object element) :\n    select(viewer, parentElement, element) {\n    if (element instanceof IScalaClassFile) {\n      IClassFile classFile = (IClassFile) element;\n      String name = classFile.getElementName(); \n      int dollarIndex = name.indexOf('$');\n      return dollarIndex == -1 || dollarIndex == name.length()-7; \/\/ Trailing '$' implies object rather than inner class \n    }\n    return proceed(viewer, parentElement, element);\n  }\n  \n  IJavaElement[] around(BinaryType bt) throws JavaModelException :\n    getChildren(bt) && \n    target(BinaryType) {\n    ClassFile cf = (ClassFile)bt.parent;\n    if (cf instanceof IScalaClassFile)\n      return cf.getChildren();\n    else\n      return proceed(bt);\n  }\n  \n  CompilationUnit around(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) :\n    getAST(element, waitFlag, progressMonitor) {\n      if (element instanceof IScalaElement)\n        return null;\n      else\n        return proceed(element, waitFlag, progressMonitor);\n  }\n  \n  void around(HierarchyResolver hr, IGenericType suppliedType) :\n    resolve(hr, suppliedType) {\n    if (!suppliedType.isBinaryType()) {\n      IType tpe = ((SourceTypeElementInfo)suppliedType).getHandle();\n      IClassFile cf = tpe.getClassFile();\n      if (cf instanceof IScalaClassFile) {\n        hr.resolve(new Openable[]{(Openable)cf}, new HashSet(), null);\n        return;\n      }\n    }\n      \n    proceed(hr, suppliedType);\n  }\n  \n  void around(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    remember(hr, type, typeBinding) {\n    if (((IOpenable)type.getCompilationUnit()).isOpen()) {\n      try {\n        IGenericType genericType = (IGenericType)((JavaElement)type).getElementInfo();\n        hr.remember(genericType, typeBinding);\n      } catch (JavaModelException e) {\n        \/\/ cannot happen since element is open\n        return;\n      }\n    } else {\n      if (typeBinding == null) return;\n\n      TypeDeclaration typeDeclaration = ((SourceTypeBinding)typeBinding).scope.referenceType();\n\n      \/\/ simple super class name\n      char[] superclassName = null;\n      TypeReference superclass;\n      if ((typeDeclaration.bits & ASTNode.IsAnonymousType) != 0) {\n        superclass = typeDeclaration.allocation.type;\n      } else {\n        superclass = typeDeclaration.superclass;\n      }\n      if (superclass != null) {\n        char[][] typeName = superclass.getTypeName();\n        superclassName = typeName == null ? null : typeName[typeName.length-1];\n      }\n\n      \/\/ simple super interface names\n      char[][] superInterfaceNames = null;\n      TypeReference[] superInterfaces = typeDeclaration.superInterfaces;\n      if (superInterfaces != null) {\n        int length = superInterfaces.length;\n        superInterfaceNames = new char[length][];\n        for (int i = 0; i < length; i++) {\n          TypeReference superInterface = superInterfaces[i];\n          char[][] typeName = superInterface.getTypeName();\n          superInterfaceNames[i] = typeName[typeName.length-1];\n        }\n      }\n\n      HierarchyType hierarchyType = new HierarchyType(\n        type,\n        typeDeclaration.name,\n        typeDeclaration.binding.modifiers,\n        superclassName,\n        superInterfaceNames);\n      hr.remember(hierarchyType, typeDeclaration.binding);\n    }\n  }\n  \n  String around(BinaryType bt) :\n    getSourceFileName(bt) {\n    IJavaElement parent = bt.getParent(); \n    if (parent instanceof IScalaClassFile)\n      return ((IScalaClassFile)parent).getSourceFileName();\n    else\n      return proceed(bt);\n  }\n  \n  boolean around(IType type, int acceptFlags, boolean isSourceType) :\n    acceptType(type, acceptFlags, isSourceType) {\n    if (!isSourceType && (type instanceof SourceType)) {\n      IJavaElement parent = type.getParent(); \n      if (parent instanceof IScalaClassFile)\n        return proceed(type, acceptFlags, true);\n    }\n    \n    return proceed(type, acceptFlags, isSourceType);\n  }\n  \n  CompilationUnitDeclaration around(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) throws JavaModelException :\n    convert(stc, sourceTypes, compilationResult) {\n    stc.unit = new CompilationUnitDeclaration(stc.problemReporter, compilationResult, 0);\n    \/\/ not filled at this point\n\n    if (sourceTypes.length == 0) return stc.unit;\n    SourceTypeElementInfo topLevelTypeInfo = (SourceTypeElementInfo) sourceTypes[0];\n    org.eclipse.jdt.core.ICompilationUnit cuHandle = topLevelTypeInfo.getHandle().getCompilationUnit();\n    stc.cu = (ICompilationUnit) cuHandle;\n\n    CompilationUnitElementInfo cuei = null;\n    Object info = ((JavaElement)stc.cu).getElementInfo();\n    if (info instanceof CompilationUnitElementInfo)\n      cuei = (CompilationUnitElementInfo)info;\n    \n    \n    if (stc.has1_5Compliance && cuei != null && cuei.annotationNumber > 10) { \/\/ experimental value\n      \/\/ if more than 10 annotations, diet parse as this is faster\n      return new Parser(stc.problemReporter, true).dietParse(stc.cu, compilationResult);\n    }\n\n    \/* only positions available *\/\n    int start = topLevelTypeInfo.getNameSourceStart();\n    int end = topLevelTypeInfo.getNameSourceEnd();\n\n    \/* convert package and imports *\/\n    String[] packageName = ((PackageFragment) cuHandle.getParent()).names;\n    if (packageName.length > 0)\n      \/\/ if its null then it is defined in the default package\n      stc.unit.currentPackage =\n        stc.createImportReference(packageName, start, end, false, ClassFileConstants.AccDefault);\n    IImportDeclaration[] importDeclarations = topLevelTypeInfo.getHandle().getCompilationUnit().getImports();\n    int importCount = importDeclarations.length;\n    stc.unit.imports = new ImportReference[importCount];\n    for (int i = 0; i < importCount; i++) {\n      ImportDeclaration importDeclaration = (ImportDeclaration) importDeclarations[i];\n      ISourceImport sourceImport = (ISourceImport) importDeclaration.getElementInfo();\n      String nameWithoutStar = importDeclaration.getNameWithoutStar();\n      stc.unit.imports[i] = stc.createImportReference(\n        Util.splitOn('.', nameWithoutStar, 0, nameWithoutStar.length()),\n        sourceImport.getDeclarationSourceStart(),\n        sourceImport.getDeclarationSourceEnd(),\n        importDeclaration.isOnDemand(),\n        sourceImport.getModifiers());\n    }\n    \/* convert type(s) *\/\n    try {\n      int typeCount = sourceTypes.length;\n      final TypeDeclaration[] types = new TypeDeclaration[typeCount];\n      \/*\n       * We used a temporary types collection to prevent this.unit.types from being null during a call to\n       * convert(...) when the source is syntactically incorrect and the parser is flushing the unit's types.\n       * See https:\/\/bugs.eclipse.org\/bugs\/show_bug.cgi?id=97466\n       *\/\n      for (int i = 0; i < typeCount; i++) {\n        SourceTypeElementInfo typeInfo = (SourceTypeElementInfo) sourceTypes[i];\n        types[i] = stc.convert((SourceType) typeInfo.getHandle(), compilationResult);\n      }\n      stc.unit.types = types;\n      return stc.unit;\n    } catch (SourceTypeConverter.AnonymousMemberFound e) {\n      return new Parser(stc.problemReporter, true).parse(stc.cu, compilationResult);\n    }\n  }\n  \n  IJavaElement around(JavaElement je, int ancestorType) :\n    getAncestor(je, ancestorType) {\n    IJavaElement element = je;\n    while (element != null) {\n      if (element.getElementType() == ancestorType)\n        return element;\n      else if (element instanceof IScalaClassFile && ancestorType == IJavaElement.COMPILATION_UNIT)\n        return ((JavaElement)element).getCompilationUnit();\n      element= element.getParent();\n    }\n    return null;\n  }\n\n  boolean around(TypeNameMatch match) :\n    isContainerDirty(match) {\n    org.eclipse.jdt.core.ICompilationUnit cu = match.getType().getCompilationUnit();\n    if (cu == null) {\n      return false;\n    }\n    IResource resource= cu.getResource();\n    if (resource == null)\n      return false;\n    \n    ITextFileBufferManager manager= FileBuffers.getTextFileBufferManager();\n    ITextFileBuffer textFileBuffer= manager.getTextFileBuffer(resource.getFullPath(), LocationKind.IFILE);\n    if (textFileBuffer != null) {\n      return textFileBuffer.isDirty();\n    }\n    return false;\n  }\n}\n","old_contents":"\/*\n * Copyright 2005-2010 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.cfprovider;\n\nimport java.util.HashSet;\n\nimport org.eclipse.core.filebuffers.FileBuffers;\nimport org.eclipse.core.filebuffers.ITextFileBuffer;\nimport org.eclipse.core.filebuffers.ITextFileBufferManager;\nimport org.eclipse.core.filebuffers.LocationKind;\nimport org.eclipse.core.resources.IResource;\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.core.IBuffer;\nimport org.eclipse.jdt.core.IClassFile;\nimport org.eclipse.jdt.core.IImportDeclaration;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IOpenable;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.ITypeRoot;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.core.dom.CompilationUnit;\nimport org.eclipse.jdt.core.search.TypeNameMatch;\nimport org.eclipse.jdt.internal.compiler.CompilationResult;\nimport org.eclipse.jdt.internal.compiler.ast.ASTNode;\nimport org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.ImportReference;\nimport org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.TypeReference;\nimport org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;\nimport org.eclipse.jdt.internal.compiler.env.IBinaryType;\nimport org.eclipse.jdt.internal.compiler.env.ICompilationUnit;\nimport org.eclipse.jdt.internal.compiler.env.IGenericType;\nimport org.eclipse.jdt.internal.compiler.env.ISourceImport;\nimport org.eclipse.jdt.internal.compiler.env.ISourceType;\nimport org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer;\nimport org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding;\nimport org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding;\nimport org.eclipse.jdt.internal.compiler.parser.Parser;\nimport org.eclipse.jdt.internal.compiler.parser.SourceTypeConverter;\nimport org.eclipse.jdt.internal.core.BinaryType;\nimport org.eclipse.jdt.internal.core.ClassFile;\nimport org.eclipse.jdt.internal.core.CompilationUnitElementInfo;\nimport org.eclipse.jdt.internal.core.ImportDeclaration;\nimport org.eclipse.jdt.internal.core.JavaElement;\nimport org.eclipse.jdt.internal.core.NameLookup;\nimport org.eclipse.jdt.internal.core.Openable;\nimport org.eclipse.jdt.internal.core.PackageFragment;\nimport org.eclipse.jdt.internal.core.SearchableEnvironment;\nimport org.eclipse.jdt.internal.core.SourceMapper;\nimport org.eclipse.jdt.internal.core.SourceType;\nimport org.eclipse.jdt.internal.core.SourceTypeElementInfo;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyResolver;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyType;\nimport org.eclipse.jdt.internal.core.util.Util;\nimport org.eclipse.jdt.internal.corext.util.OpenTypeHistory;\nimport org.eclipse.jdt.internal.ui.filters.InnerClassFilesFilter;\nimport org.eclipse.jdt.ui.SharedASTProvider;\nimport org.eclipse.jface.viewers.Viewer;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaClassFile;\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaElement;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect ClassFileProviderAspect {\n\n  pointcut classFileCreations(PackageFragment parent, String name) : \n    call(protected ClassFile.new(PackageFragment, String)) &&\n    within(org.eclipse.jdt..*) &&\n    args(parent, name);\n  \n  pointcut getTypeName(ClassFile cf) :\n    execution(public String ClassFile.getTypeName()) &&\n    target(cf);\n\n  pointcut getType(ClassFile cf) :\n    call(public IType ClassFile.getType()) &&\n    target(cf);\n  \n  pointcut mapSource() :\n    execution(IBuffer ClassFile.mapSource(SourceMapper, IBinaryType)) &&\n    target(IScalaClassFile);\n  \n  pointcut mapSource2() :\n    execution(void SourceMapper.mapSource(IType, char[], IBinaryType));\n  \n  pointcut getSourceFileName(BinaryType bt) :\n    execution(String BinaryType.getSourceFileName(IBinaryType)) &&\n    target(bt);\n  \n  pointcut select(Viewer viewer, Object parentElement, Object element) :\n    execution(boolean InnerClassFilesFilter.select(Viewer, Object, Object)) &&\n    args(viewer, parentElement, element);\n  \n  pointcut getChildren(BinaryType bt) :\n    execution(IJavaElement[] BinaryType.getChildren()) &&\n    target(bt);\n  \n  pointcut getAST(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) : \n    execution(CompilationUnit SharedASTProvider.getAST(ITypeRoot, SharedASTProvider.WAIT_FLAG, IProgressMonitor)) &&\n    args(element, waitFlag, progressMonitor);\n  \n  pointcut resolve(HierarchyResolver hr, IGenericType suppliedType) :\n    execution(void HierarchyResolver.resolve(IGenericType)) &&\n    target(hr) &&\n    args(suppliedType);\n  \n  pointcut remember(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    execution(void HierarchyResolver.remember(IType, ReferenceBinding)) &&\n    target(hr) &&\n    args(type, typeBinding);\n  \n  pointcut acceptType(IType type, int acceptFlags, boolean isSourceType) :\n    execution(boolean NameLookup.acceptType(IType, int, boolean)) &&\n    args(type, acceptFlags, isSourceType);\n  \n  pointcut find(SearchableEnvironment se, String typeName, String packageName) :\n    execution(NameEnvironmentAnswer find(String, String)) &&\n    target(se) &&\n    args(typeName, packageName);\n  \n  pointcut convert(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) :\n    execution(CompilationUnitDeclaration SourceTypeConverter.convert(ISourceType[], CompilationResult)) &&\n    target(stc) &&\n    args(sourceTypes, compilationResult);\n  \n  pointcut getAncestor(JavaElement je, int ancestorType) :\n    execution(IJavaElement JavaElement.getAncestor(int)) &&\n    target(je) &&\n    args(ancestorType);\n  \n  pointcut isContainerDirty(TypeNameMatch match) :\n    execution(boolean OpenTypeHistory.isContainerDirty(TypeNameMatch)) &&\n    args(match);\n  \n  ClassFile around(PackageFragment parent, String name) : \n    classFileCreations(parent, name) {\n\n    ClassFile javaClassFile = proceed(parent, name);\n    byte[] bytes;\n    \n    try {\n      bytes = javaClassFile.getBytes();\n    } catch(Throwable t) {\n      return javaClassFile; \n    }\n    \n    for (IClassFileProvider provider : ClassFileProviderRegistry.getInstance().getProviders()) {\n      ClassFile cf = provider.create(bytes, parent, name);\n      if (cf != null)\n        return cf;\n    }\n    \n    return javaClassFile;\n  }\n  \n  void around() :\n    mapSource2() &&\n    cflow(mapSource()) {\n    return;\n  }\n  \n  IType around(ClassFile cf) :\n    getType(cf) &&\n    cflow(mapSource()) {\n    if (cf.binaryType == null)\n      cf.binaryType = new BinaryType(cf, cf.getTypeName());\n    return cf.binaryType;\n  }\n  \n  String around(ClassFile cf) :\n    getTypeName(cf) {\n    if(cf instanceof IScalaClassFile) {\n      int lastDollar = cf.name.lastIndexOf('$');\n      return (lastDollar == -1 || lastDollar == cf.name.length()-1) ? cf.name : Util.localTypeName(cf.name, lastDollar, cf.name.length());\n    } else\n      return proceed(cf);\n  }\n  \n  boolean around(Viewer viewer, Object parentElement, Object element) :\n    select(viewer, parentElement, element) {\n    if (element instanceof IScalaClassFile) {\n      IClassFile classFile = (IClassFile) element;\n      String name = classFile.getElementName(); \n      int dollarIndex = name.indexOf('$');\n      return dollarIndex == -1 || dollarIndex == name.length()-7; \/\/ Trailing '$' implies object rather than inner class \n    }\n    return proceed(viewer, parentElement, element);\n  }\n  \n  IJavaElement[] around(BinaryType bt) throws JavaModelException :\n    getChildren(bt) && \n    target(BinaryType) {\n    ClassFile cf = (ClassFile)bt.parent;\n    if (cf instanceof IScalaClassFile)\n      return cf.getChildren();\n    else\n      return proceed(bt);\n  }\n  \n  CompilationUnit around(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) :\n    getAST(element, waitFlag, progressMonitor) {\n      if (element instanceof IScalaElement)\n        return null;\n      else\n        return proceed(element, waitFlag, progressMonitor);\n  }\n  \n  void around(HierarchyResolver hr, IGenericType suppliedType) :\n    resolve(hr, suppliedType) {\n    if (!suppliedType.isBinaryType()) {\n      IType tpe = ((SourceTypeElementInfo)suppliedType).getHandle();\n      IClassFile cf = tpe.getClassFile();\n      if (cf instanceof IScalaClassFile) {\n        hr.resolve(new Openable[]{(Openable)cf}, new HashSet(), null);\n        return;\n      }\n    }\n      \n    proceed(hr, suppliedType);\n  }\n  \n  void around(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    remember(hr, type, typeBinding) {\n    if (((IOpenable)type.getCompilationUnit()).isOpen()) {\n      try {\n        IGenericType genericType = (IGenericType)((JavaElement)type).getElementInfo();\n        hr.remember(genericType, typeBinding);\n      } catch (JavaModelException e) {\n        \/\/ cannot happen since element is open\n        return;\n      }\n    } else {\n      if (typeBinding == null) return;\n\n      TypeDeclaration typeDeclaration = ((SourceTypeBinding)typeBinding).scope.referenceType();\n\n      \/\/ simple super class name\n      char[] superclassName = null;\n      TypeReference superclass;\n      if ((typeDeclaration.bits & ASTNode.IsAnonymousType) != 0) {\n        superclass = typeDeclaration.allocation.type;\n      } else {\n        superclass = typeDeclaration.superclass;\n      }\n      if (superclass != null) {\n        char[][] typeName = superclass.getTypeName();\n        superclassName = typeName == null ? null : typeName[typeName.length-1];\n      }\n\n      \/\/ simple super interface names\n      char[][] superInterfaceNames = null;\n      TypeReference[] superInterfaces = typeDeclaration.superInterfaces;\n      if (superInterfaces != null) {\n        int length = superInterfaces.length;\n        superInterfaceNames = new char[length][];\n        for (int i = 0; i < length; i++) {\n          TypeReference superInterface = superInterfaces[i];\n          char[][] typeName = superInterface.getTypeName();\n          superInterfaceNames[i] = typeName[typeName.length-1];\n        }\n      }\n\n      HierarchyType hierarchyType = new HierarchyType(\n        type,\n        typeDeclaration.name,\n        typeDeclaration.binding.modifiers,\n        superclassName,\n        superInterfaceNames);\n      hr.remember(hierarchyType, typeDeclaration.binding);\n    }\n  }\n  \n  String around(BinaryType bt) :\n    getSourceFileName(bt) {\n    IJavaElement parent = bt.getParent(); \n    if (parent instanceof IScalaClassFile)\n      return ((IScalaClassFile)parent).getSourceFileName();\n    else\n      return proceed(bt);\n  }\n  \n  boolean around(IType type, int acceptFlags, boolean isSourceType) :\n    acceptType(type, acceptFlags, isSourceType) {\n    if (!isSourceType && (type instanceof SourceType)) {\n      IJavaElement parent = type.getParent(); \n      if (parent instanceof IScalaClassFile)\n        return proceed(type, acceptFlags, true);\n    }\n    \n    return proceed(type, acceptFlags, isSourceType);\n  }\n  \n  CompilationUnitDeclaration around(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) throws JavaModelException :\n    convert(stc, sourceTypes, compilationResult) {\n    stc.unit = new CompilationUnitDeclaration(stc.problemReporter, compilationResult, 0);\n    \/\/ not filled at this point\n\n    if (sourceTypes.length == 0) return stc.unit;\n    SourceTypeElementInfo topLevelTypeInfo = (SourceTypeElementInfo) sourceTypes[0];\n    org.eclipse.jdt.core.ICompilationUnit cuHandle = topLevelTypeInfo.getHandle().getCompilationUnit();\n    stc.cu = (ICompilationUnit) cuHandle;\n\n    CompilationUnitElementInfo cuei = null;\n    Object info = ((JavaElement)stc.cu).getElementInfo();\n    if (info instanceof CompilationUnitElementInfo)\n      cuei = (CompilationUnitElementInfo)info;\n    \n    \n    if (stc.has1_5Compliance && cuei != null && cuei.annotationNumber > 10) { \/\/ experimental value\n      \/\/ if more than 10 annotations, diet parse as this is faster\n      return new Parser(stc.problemReporter, true).dietParse(stc.cu, compilationResult);\n    }\n\n    \/* only positions available *\/\n    int start = topLevelTypeInfo.getNameSourceStart();\n    int end = topLevelTypeInfo.getNameSourceEnd();\n\n    \/* convert package and imports *\/\n    String[] packageName = ((PackageFragment) cuHandle.getParent()).names;\n    if (packageName.length > 0)\n      \/\/ if its null then it is defined in the default package\n      stc.unit.currentPackage =\n        stc.createImportReference(packageName, start, end, false, ClassFileConstants.AccDefault);\n    IImportDeclaration[] importDeclarations = topLevelTypeInfo.getHandle().getCompilationUnit().getImports();\n    int importCount = importDeclarations.length;\n    stc.unit.imports = new ImportReference[importCount];\n    for (int i = 0; i < importCount; i++) {\n      ImportDeclaration importDeclaration = (ImportDeclaration) importDeclarations[i];\n      ISourceImport sourceImport = (ISourceImport) importDeclaration.getElementInfo();\n      String nameWithoutStar = importDeclaration.getNameWithoutStar();\n      stc.unit.imports[i] = stc.createImportReference(\n        Util.splitOn('.', nameWithoutStar, 0, nameWithoutStar.length()),\n        sourceImport.getDeclarationSourceStart(),\n        sourceImport.getDeclarationSourceEnd(),\n        importDeclaration.isOnDemand(),\n        sourceImport.getModifiers());\n    }\n    \/* convert type(s) *\/\n    try {\n      int typeCount = sourceTypes.length;\n      final TypeDeclaration[] types = new TypeDeclaration[typeCount];\n      \/*\n       * We used a temporary types collection to prevent this.unit.types from being null during a call to\n       * convert(...) when the source is syntactically incorrect and the parser is flushing the unit's types.\n       * See https:\/\/bugs.eclipse.org\/bugs\/show_bug.cgi?id=97466\n       *\/\n      for (int i = 0; i < typeCount; i++) {\n        SourceTypeElementInfo typeInfo = (SourceTypeElementInfo) sourceTypes[i];\n        types[i] = stc.convert((SourceType) typeInfo.getHandle(), compilationResult);\n      }\n      stc.unit.types = types;\n      return stc.unit;\n    } catch (SourceTypeConverter.AnonymousMemberFound e) {\n      return new Parser(stc.problemReporter, true).parse(stc.cu, compilationResult);\n    }\n  }\n  \n  IJavaElement around(JavaElement je, int ancestorType) :\n    getAncestor(je, ancestorType) {\n    IJavaElement element = je;\n    while (element != null) {\n      if (element.getElementType() == ancestorType)\n        return element;\n      else if (element instanceof IScalaClassFile && ancestorType == IJavaElement.COMPILATION_UNIT)\n        return ((JavaElement)element).getCompilationUnit();\n      element= element.getParent();\n    }\n    return null;\n  }\n\n  boolean around(TypeNameMatch match) :\n    isContainerDirty(match) {\n    org.eclipse.jdt.core.ICompilationUnit cu = match.getType().getCompilationUnit();\n    if (cu == null) {\n      return false;\n    }\n    IResource resource= cu.getResource();\n    if (resource == null)\n      return false;\n    \n    ITextFileBufferManager manager= FileBuffers.getTextFileBufferManager();\n    ITextFileBuffer textFileBuffer= manager.getTextFileBuffer(resource.getFullPath(), LocationKind.IFILE);\n    if (textFileBuffer != null) {\n      return textFileBuffer.isDirty();\n    }\n    return false;\n  }\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"e76175ed9fc672c7e2db37e672c11a13218a11a5","subject":"Revert \"Remove obsolete pointcut.\"","message":"Revert \"Remove obsolete pointcut.\"\n\nThis reverts commit 747fdc38fe5f567e1968c19194ae42c366855274.\n","repos":"wpopielarski\/scala-ide,romanowski\/scala-ide,andrey-ilinykh\/scala-ide,stephenh\/scala-ide,aleksi-lukkarinen\/scala-ide,scala-ide\/scala-ide,sschaef\/scala-ide,sschaef\/scala-ide,romanowski\/scala-ide,stephenh\/scala-ide,Duhemm\/scala-ide,pilipolio\/scala-ide,romanowski\/scala-ide,andrey-ilinykh\/scala-ide,stephenh\/scala-ide,pilipolio\/scala-ide,Kwestor\/scala-ide,sschaef\/scala-ide,dragos\/scala-ide,wpopielarski\/scala-ide,wpopielarski\/scala-ide,mlangc\/scala-ide,dragos\/scala-ide,mlangc\/scala-ide,romanowski\/scala-ide,aleksi-lukkarinen\/scala-ide,mlangc\/scala-ide,Duhemm\/scala-ide,Kwestor\/scala-ide,scala-ide\/scala-ide,andrey-ilinykh\/scala-ide,Duhemm\/scala-ide,dragos\/scala-ide,Kwestor\/scala-ide,pilipolio\/scala-ide,wpopielarski\/scala-ide,stephenh\/scala-ide,dragos\/scala-ide,mlangc\/scala-ide,scala-ide\/scala-ide,sschaef\/scala-ide,aleksi-lukkarinen\/scala-ide,pilipolio\/scala-ide,andrey-ilinykh\/scala-ide,scala-ide\/scala-ide,aleksi-lukkarinen\/scala-ide,Kwestor\/scala-ide,Duhemm\/scala-ide","old_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/cfprovider\/ClassFileProviderAspect.aj","new_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/cfprovider\/ClassFileProviderAspect.aj","new_contents":"\/*\n * Copyright 2005-2010 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.cfprovider;\n\nimport java.util.HashSet;\n\nimport org.eclipse.core.filebuffers.FileBuffers;\nimport org.eclipse.core.filebuffers.ITextFileBuffer;\nimport org.eclipse.core.filebuffers.ITextFileBufferManager;\nimport org.eclipse.core.filebuffers.LocationKind;\nimport org.eclipse.core.resources.IResource;\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.core.IBuffer;\nimport org.eclipse.jdt.core.IClassFile;\nimport org.eclipse.jdt.core.IImportDeclaration;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IOpenable;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.ITypeRoot;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.core.dom.CompilationUnit;\nimport org.eclipse.jdt.core.search.TypeNameMatch;\nimport org.eclipse.jdt.internal.compiler.CompilationResult;\nimport org.eclipse.jdt.internal.compiler.ast.ASTNode;\nimport org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.ImportReference;\nimport org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.TypeReference;\nimport org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;\nimport org.eclipse.jdt.internal.compiler.env.IBinaryType;\nimport org.eclipse.jdt.internal.compiler.env.ICompilationUnit;\nimport org.eclipse.jdt.internal.compiler.env.IGenericType;\nimport org.eclipse.jdt.internal.compiler.env.ISourceImport;\nimport org.eclipse.jdt.internal.compiler.env.ISourceType;\nimport org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer;\nimport org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding;\nimport org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding;\nimport org.eclipse.jdt.internal.compiler.parser.Parser;\nimport org.eclipse.jdt.internal.compiler.parser.SourceTypeConverter;\nimport org.eclipse.jdt.internal.core.BinaryType;\nimport org.eclipse.jdt.internal.core.ClassFile;\nimport org.eclipse.jdt.internal.core.CompilationUnitElementInfo;\nimport org.eclipse.jdt.internal.core.ImportDeclaration;\nimport org.eclipse.jdt.internal.core.JavaElement;\nimport org.eclipse.jdt.internal.core.BufferManager;\nimport org.eclipse.jdt.internal.core.NameLookup;\nimport org.eclipse.jdt.internal.core.Openable;\nimport org.eclipse.jdt.internal.core.PackageFragment;\nimport org.eclipse.jdt.internal.core.SearchableEnvironment;\nimport org.eclipse.jdt.internal.core.SourceMapper;\nimport org.eclipse.jdt.internal.core.SourceType;\nimport org.eclipse.jdt.internal.core.SourceTypeElementInfo;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyResolver;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyType;\nimport org.eclipse.jdt.internal.core.util.Util;\nimport org.eclipse.jdt.internal.corext.util.OpenTypeHistory;\nimport org.eclipse.jdt.internal.ui.filters.InnerClassFilesFilter;\nimport org.eclipse.jdt.ui.SharedASTProvider;\nimport org.eclipse.jface.viewers.Viewer;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaClassFile;\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaElement;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect ClassFileProviderAspect {\n\n  pointcut classFileCreations(PackageFragment parent, String name) : \n    call(protected ClassFile.new(PackageFragment, String)) &&\n    within(org.eclipse.jdt..*) &&\n    args(parent, name);\n  \n  pointcut getTypeName(ClassFile cf) :\n    execution(public String ClassFile.getTypeName()) &&\n    target(cf);\n\n  \/\/ For 3.6\n  pointcut mapSource(ClassFile cf, SourceMapper mapper, IBinaryType info, IClassFile owner) :\n    execution(IBuffer ClassFile.mapSource(SourceMapper, IBinaryType, IClassFile)) &&\n    target(cf) &&\n    target(IScalaClassFile) &&\n    args(mapper, info, owner);\n\n  \/\/ For 3.5\n  pointcut mapSource2(ClassFile cf, SourceMapper mapper, IBinaryType info) :\n    execution(IBuffer ClassFile.mapSource(SourceMapper, IBinaryType)) &&\n    target(cf) &&\n    target(IScalaClassFile) &&\n    args(mapper, info);\n\n  pointcut getSourceFileName(BinaryType bt) :\n    execution(String BinaryType.getSourceFileName(IBinaryType)) &&\n    target(bt);\n  \n  pointcut select(Viewer viewer, Object parentElement, Object element) :\n    execution(boolean InnerClassFilesFilter.select(Viewer, Object, Object)) &&\n    args(viewer, parentElement, element);\n  \n  pointcut getChildren(BinaryType bt) :\n    execution(IJavaElement[] BinaryType.getChildren()) &&\n    target(bt);\n  \n  pointcut getAST(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) : \n    execution(CompilationUnit SharedASTProvider.getAST(ITypeRoot, SharedASTProvider.WAIT_FLAG, IProgressMonitor)) &&\n    args(element, waitFlag, progressMonitor);\n  \n  pointcut resolve(HierarchyResolver hr, IGenericType suppliedType) :\n    execution(void HierarchyResolver.resolve(IGenericType)) &&\n    target(hr) &&\n    args(suppliedType);\n  \n  pointcut remember(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    execution(void HierarchyResolver.remember(IType, ReferenceBinding)) &&\n    target(hr) &&\n    args(type, typeBinding);\n  \n  pointcut acceptType(IType type, int acceptFlags, boolean isSourceType) :\n    execution(boolean NameLookup.acceptType(IType, int, boolean)) &&\n    args(type, acceptFlags, isSourceType);\n  \n  pointcut find(SearchableEnvironment se, String typeName, String packageName) :\n    execution(NameEnvironmentAnswer find(String, String)) &&\n    target(se) &&\n    args(typeName, packageName);\n  \n  pointcut convert(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) :\n    execution(CompilationUnitDeclaration SourceTypeConverter.convert(ISourceType[], CompilationResult)) &&\n    target(stc) &&\n    args(sourceTypes, compilationResult);\n  \n  pointcut getAncestor(JavaElement je, int ancestorType) :\n    execution(IJavaElement JavaElement.getAncestor(int)) &&\n    target(je) &&\n    args(ancestorType);\n  \n  pointcut isContainerDirty(TypeNameMatch match) :\n    execution(boolean OpenTypeHistory.isContainerDirty(TypeNameMatch)) &&\n    args(match);\n  \n  ClassFile around(PackageFragment parent, String name) : \n    classFileCreations(parent, name) {\n\n    ClassFile javaClassFile = proceed(parent, name);\n    byte[] bytes;\n    \n    try {\n      bytes = javaClassFile.getBytes();\n    } catch(Throwable t) {\n      return javaClassFile; \n    }\n    \n    for (IClassFileProvider provider : ClassFileProviderRegistry.getInstance().getProviders()) {\n      ClassFile cf = provider.create(bytes, parent, name);\n      if (cf != null)\n        return cf;\n    }\n    \n    return javaClassFile;\n  }\n  \n  IBuffer around(ClassFile cf, SourceMapper mapper, IBinaryType info, IClassFile owner) :\n    mapSource(cf, mapper, info, owner) {\n    return mapSourceSubst(cf, mapper, info);\n  }\n\n  IBuffer around(ClassFile cf, SourceMapper mapper, IBinaryType info) :\n    mapSource2(cf, mapper, info) {\n    return mapSourceSubst(cf, mapper, info);\n  }\n\n  IBuffer mapSourceSubst(ClassFile cf, SourceMapper mapper, IBinaryType info) {\n    char[] contents = mapper.findSource(cf.getType(), info);\n    IBuffer buffer;\n    if (contents != null) {\n      buffer = BufferManager.createBuffer(cf);\n      buffer.setContents(contents);\n    } else {\n      buffer = BufferManager.createNullBuffer(cf);\n    }\n    BufferManager bufManager = cf.getBufferManager();\n    bufManager.addBuffer(buffer);\n    buffer.addBufferChangedListener(cf);\n    return buffer;\n  }\n\n  String around(ClassFile cf) :\n    getTypeName(cf) {\n    if(cf instanceof IScalaClassFile) {\n      int lastDollar = cf.name.lastIndexOf('$');\n      return (lastDollar == -1 || lastDollar == cf.name.length()-1) ? cf.name : Util.localTypeName(cf.name, lastDollar, cf.name.length());\n    } else\n      return proceed(cf);\n  }\n  \n  boolean around(Viewer viewer, Object parentElement, Object element) :\n    select(viewer, parentElement, element) {\n    if (element instanceof IScalaClassFile) {\n      IClassFile classFile = (IClassFile) element;\n      String name = classFile.getElementName(); \n      int dollarIndex = name.indexOf('$');\n      return dollarIndex == -1 || dollarIndex == name.length()-7; \/\/ Trailing '$' implies object rather than inner class \n    }\n    return proceed(viewer, parentElement, element);\n  }\n  \n  IJavaElement[] around(BinaryType bt) throws JavaModelException :\n    getChildren(bt) && \n    target(BinaryType) {\n    ClassFile cf = (ClassFile)bt.parent;\n    if (cf instanceof IScalaClassFile)\n      return cf.getChildren();\n    else\n      return proceed(bt);\n  }\n  \n  CompilationUnit around(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) :\n    getAST(element, waitFlag, progressMonitor) {\n      if (element instanceof IScalaElement)\n        return null;\n      else\n        return proceed(element, waitFlag, progressMonitor);\n  }\n  \n  void around(HierarchyResolver hr, IGenericType suppliedType) :\n    resolve(hr, suppliedType) {\n    if (!suppliedType.isBinaryType()) {\n      IType tpe = ((SourceTypeElementInfo)suppliedType).getHandle();\n      IClassFile cf = tpe.getClassFile();\n      if (cf instanceof IScalaClassFile) {\n        hr.resolve(new Openable[]{(Openable)cf}, new HashSet(), null);\n        return;\n      }\n    }\n      \n    proceed(hr, suppliedType);\n  }\n  \n  void around(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    remember(hr, type, typeBinding) {\n    if (((IOpenable)type.getCompilationUnit()).isOpen()) {\n      try {\n        IGenericType genericType = (IGenericType)((JavaElement)type).getElementInfo();\n        hr.remember(genericType, typeBinding);\n      } catch (JavaModelException e) {\n        \/\/ cannot happen since element is open\n        return;\n      }\n    } else {\n      if (typeBinding == null) return;\n\n      TypeDeclaration typeDeclaration = ((SourceTypeBinding)typeBinding).scope.referenceType();\n\n      \/\/ simple super class name\n      char[] superclassName = null;\n      TypeReference superclass;\n      if ((typeDeclaration.bits & ASTNode.IsAnonymousType) != 0) {\n        superclass = typeDeclaration.allocation.type;\n      } else {\n        superclass = typeDeclaration.superclass;\n      }\n      if (superclass != null) {\n        char[][] typeName = superclass.getTypeName();\n        superclassName = typeName == null ? null : typeName[typeName.length-1];\n      }\n\n      \/\/ simple super interface names\n      char[][] superInterfaceNames = null;\n      TypeReference[] superInterfaces = typeDeclaration.superInterfaces;\n      if (superInterfaces != null) {\n        int length = superInterfaces.length;\n        superInterfaceNames = new char[length][];\n        for (int i = 0; i < length; i++) {\n          TypeReference superInterface = superInterfaces[i];\n          char[][] typeName = superInterface.getTypeName();\n          superInterfaceNames[i] = typeName[typeName.length-1];\n        }\n      }\n\n      HierarchyType hierarchyType = new HierarchyType(\n        type,\n        typeDeclaration.name,\n        typeDeclaration.binding.modifiers,\n        superclassName,\n        superInterfaceNames);\n      hr.remember(hierarchyType, typeDeclaration.binding);\n    }\n  }\n  \n  String around(BinaryType bt) :\n    getSourceFileName(bt) {\n    IJavaElement parent = bt.getTypeRoot(); \n    if (parent instanceof IScalaClassFile) {\n      return ((IScalaClassFile)parent).getSourceFileName();\n    }\n    else\n      return proceed(bt);\n  }\n  \n  boolean around(IType type, int acceptFlags, boolean isSourceType) :\n    acceptType(type, acceptFlags, isSourceType) {\n    if (!isSourceType && (type instanceof SourceType)) {\n      IJavaElement parent = type.getParent(); \n      if (parent instanceof IScalaClassFile)\n        return proceed(type, acceptFlags, true);\n    }\n    \n    return proceed(type, acceptFlags, isSourceType);\n  }\n  \n  CompilationUnitDeclaration around(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) throws JavaModelException :\n    convert(stc, sourceTypes, compilationResult) {\n    stc.unit = new CompilationUnitDeclaration(stc.problemReporter, compilationResult, 0);\n    \/\/ not filled at this point\n\n    if (sourceTypes.length == 0) return stc.unit;\n    SourceTypeElementInfo topLevelTypeInfo = (SourceTypeElementInfo) sourceTypes[0];\n    org.eclipse.jdt.core.ICompilationUnit cuHandle = topLevelTypeInfo.getHandle().getCompilationUnit();\n    stc.cu = (ICompilationUnit) cuHandle;\n\n    CompilationUnitElementInfo cuei = null;\n    Object info = ((JavaElement)stc.cu).getElementInfo();\n    if (info instanceof CompilationUnitElementInfo)\n      cuei = (CompilationUnitElementInfo)info;\n    \n    \n    if (stc.has1_5Compliance && cuei != null && cuei.annotationNumber > 10) { \/\/ experimental value\n      \/\/ if more than 10 annotations, diet parse as this is faster\n      return new Parser(stc.problemReporter, true).dietParse(stc.cu, compilationResult);\n    }\n\n    \/* only positions available *\/\n    int start = topLevelTypeInfo.getNameSourceStart();\n    int end = topLevelTypeInfo.getNameSourceEnd();\n\n    \/* convert package and imports *\/\n    String[] packageName = ((PackageFragment) cuHandle.getParent()).names;\n    if (packageName.length > 0)\n      \/\/ if its null then it is defined in the default package\n      stc.unit.currentPackage =\n        stc.createImportReference(packageName, start, end, false, ClassFileConstants.AccDefault);\n    IImportDeclaration[] importDeclarations = topLevelTypeInfo.getHandle().getCompilationUnit().getImports();\n    int importCount = importDeclarations.length;\n    stc.unit.imports = new ImportReference[importCount];\n    for (int i = 0; i < importCount; i++) {\n      ImportDeclaration importDeclaration = (ImportDeclaration) importDeclarations[i];\n      ISourceImport sourceImport = (ISourceImport) importDeclaration.getElementInfo();\n      String nameWithoutStar = importDeclaration.getNameWithoutStar();\n      stc.unit.imports[i] = stc.createImportReference(\n        Util.splitOn('.', nameWithoutStar, 0, nameWithoutStar.length()),\n        sourceImport.getDeclarationSourceStart(),\n        sourceImport.getDeclarationSourceEnd(),\n        importDeclaration.isOnDemand(),\n        sourceImport.getModifiers());\n    }\n    \/* convert type(s) *\/\n    try {\n      int typeCount = sourceTypes.length;\n      final TypeDeclaration[] types = new TypeDeclaration[typeCount];\n      \/*\n       * We used a temporary types collection to prevent this.unit.types from being null during a call to\n       * convert(...) when the source is syntactically incorrect and the parser is flushing the unit's types.\n       * See https:\/\/bugs.eclipse.org\/bugs\/show_bug.cgi?id=97466\n       *\/\n      for (int i = 0; i < typeCount; i++) {\n        SourceTypeElementInfo typeInfo = (SourceTypeElementInfo) sourceTypes[i];\n        types[i] = stc.convert((SourceType) typeInfo.getHandle(), compilationResult);\n      }\n      stc.unit.types = types;\n      return stc.unit;\n    } catch (SourceTypeConverter.AnonymousMemberFound e) {\n      return new Parser(stc.problemReporter, true).parse(stc.cu, compilationResult);\n    }\n  }\n  \n  IJavaElement around(JavaElement je, int ancestorType) :\n    getAncestor(je, ancestorType) {\n    IJavaElement element = je;\n    while (element != null) {\n      if (element.getElementType() == ancestorType)\n        return element;\n      else if (element instanceof IScalaClassFile && ancestorType == IJavaElement.COMPILATION_UNIT)\n        return ((JavaElement)element).getCompilationUnit();\n      element= element.getParent();\n    }\n    return null;\n  }\n\n  boolean around(TypeNameMatch match) :\n    isContainerDirty(match) {\n    org.eclipse.jdt.core.ICompilationUnit cu = match.getType().getCompilationUnit();\n    if (cu == null) {\n      return false;\n    }\n    IResource resource= cu.getResource();\n    if (resource == null)\n      return false;\n    \n    ITextFileBufferManager manager= FileBuffers.getTextFileBufferManager();\n    ITextFileBuffer textFileBuffer= manager.getTextFileBuffer(resource.getFullPath(), LocationKind.IFILE);\n    if (textFileBuffer != null) {\n      return textFileBuffer.isDirty();\n    }\n    return false;\n  }\n}\n","old_contents":"\/*\n * Copyright 2005-2010 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.cfprovider;\n\nimport java.util.HashSet;\n\nimport org.eclipse.core.filebuffers.FileBuffers;\nimport org.eclipse.core.filebuffers.ITextFileBuffer;\nimport org.eclipse.core.filebuffers.ITextFileBufferManager;\nimport org.eclipse.core.filebuffers.LocationKind;\nimport org.eclipse.core.resources.IResource;\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.core.IBuffer;\nimport org.eclipse.jdt.core.IClassFile;\nimport org.eclipse.jdt.core.IImportDeclaration;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IOpenable;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.ITypeRoot;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.core.dom.CompilationUnit;\nimport org.eclipse.jdt.core.search.TypeNameMatch;\nimport org.eclipse.jdt.internal.compiler.CompilationResult;\nimport org.eclipse.jdt.internal.compiler.ast.ASTNode;\nimport org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.ImportReference;\nimport org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.TypeReference;\nimport org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;\nimport org.eclipse.jdt.internal.compiler.env.IBinaryType;\nimport org.eclipse.jdt.internal.compiler.env.ICompilationUnit;\nimport org.eclipse.jdt.internal.compiler.env.IGenericType;\nimport org.eclipse.jdt.internal.compiler.env.ISourceImport;\nimport org.eclipse.jdt.internal.compiler.env.ISourceType;\nimport org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer;\nimport org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding;\nimport org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding;\nimport org.eclipse.jdt.internal.compiler.parser.Parser;\nimport org.eclipse.jdt.internal.compiler.parser.SourceTypeConverter;\nimport org.eclipse.jdt.internal.core.BinaryType;\nimport org.eclipse.jdt.internal.core.ClassFile;\nimport org.eclipse.jdt.internal.core.CompilationUnitElementInfo;\nimport org.eclipse.jdt.internal.core.ImportDeclaration;\nimport org.eclipse.jdt.internal.core.JavaElement;\nimport org.eclipse.jdt.internal.core.BufferManager;\nimport org.eclipse.jdt.internal.core.NameLookup;\nimport org.eclipse.jdt.internal.core.Openable;\nimport org.eclipse.jdt.internal.core.PackageFragment;\nimport org.eclipse.jdt.internal.core.SearchableEnvironment;\nimport org.eclipse.jdt.internal.core.SourceMapper;\nimport org.eclipse.jdt.internal.core.SourceType;\nimport org.eclipse.jdt.internal.core.SourceTypeElementInfo;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyResolver;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyType;\nimport org.eclipse.jdt.internal.core.util.Util;\nimport org.eclipse.jdt.internal.corext.util.OpenTypeHistory;\nimport org.eclipse.jdt.internal.ui.filters.InnerClassFilesFilter;\nimport org.eclipse.jdt.ui.SharedASTProvider;\nimport org.eclipse.jface.viewers.Viewer;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaClassFile;\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaElement;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect ClassFileProviderAspect {\n\n  pointcut classFileCreations(PackageFragment parent, String name) : \n    call(protected ClassFile.new(PackageFragment, String)) &&\n    within(org.eclipse.jdt..*) &&\n    args(parent, name);\n  \n  pointcut getTypeName(ClassFile cf) :\n    execution(public String ClassFile.getTypeName()) &&\n    target(cf);\n\n  \/\/ For 3.6\n  pointcut mapSource(ClassFile cf, SourceMapper mapper, IBinaryType info, IClassFile owner) :\n    execution(IBuffer ClassFile.mapSource(SourceMapper, IBinaryType, IClassFile)) &&\n    target(cf) &&\n    target(IScalaClassFile) &&\n    args(mapper, info, owner);\n\n  \/\/ For 3.5\n  pointcut mapSource2(ClassFile cf, SourceMapper mapper, IBinaryType info) :\n    execution(IBuffer ClassFile.mapSource(SourceMapper, IBinaryType)) &&\n    target(cf) &&\n    target(IScalaClassFile) &&\n    args(mapper, info);\n\n  pointcut getSourceFileName(BinaryType bt) :\n    execution(String BinaryType.getSourceFileName(IBinaryType)) &&\n    target(bt);\n  \n  pointcut select(Viewer viewer, Object parentElement, Object element) :\n    execution(boolean InnerClassFilesFilter.select(Viewer, Object, Object)) &&\n    args(viewer, parentElement, element);\n  \n  pointcut getAST(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) : \n    execution(CompilationUnit SharedASTProvider.getAST(ITypeRoot, SharedASTProvider.WAIT_FLAG, IProgressMonitor)) &&\n    args(element, waitFlag, progressMonitor);\n  \n  pointcut resolve(HierarchyResolver hr, IGenericType suppliedType) :\n    execution(void HierarchyResolver.resolve(IGenericType)) &&\n    target(hr) &&\n    args(suppliedType);\n  \n  pointcut remember(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    execution(void HierarchyResolver.remember(IType, ReferenceBinding)) &&\n    target(hr) &&\n    args(type, typeBinding);\n  \n  pointcut acceptType(IType type, int acceptFlags, boolean isSourceType) :\n    execution(boolean NameLookup.acceptType(IType, int, boolean)) &&\n    args(type, acceptFlags, isSourceType);\n  \n  pointcut find(SearchableEnvironment se, String typeName, String packageName) :\n    execution(NameEnvironmentAnswer find(String, String)) &&\n    target(se) &&\n    args(typeName, packageName);\n  \n  pointcut convert(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) :\n    execution(CompilationUnitDeclaration SourceTypeConverter.convert(ISourceType[], CompilationResult)) &&\n    target(stc) &&\n    args(sourceTypes, compilationResult);\n  \n  pointcut getAncestor(JavaElement je, int ancestorType) :\n    execution(IJavaElement JavaElement.getAncestor(int)) &&\n    target(je) &&\n    args(ancestorType);\n  \n  pointcut isContainerDirty(TypeNameMatch match) :\n    execution(boolean OpenTypeHistory.isContainerDirty(TypeNameMatch)) &&\n    args(match);\n  \n  ClassFile around(PackageFragment parent, String name) : \n    classFileCreations(parent, name) {\n\n    ClassFile javaClassFile = proceed(parent, name);\n    byte[] bytes;\n    \n    try {\n      bytes = javaClassFile.getBytes();\n    } catch(Throwable t) {\n      return javaClassFile; \n    }\n    \n    for (IClassFileProvider provider : ClassFileProviderRegistry.getInstance().getProviders()) {\n      ClassFile cf = provider.create(bytes, parent, name);\n      if (cf != null)\n        return cf;\n    }\n    \n    return javaClassFile;\n  }\n  \n  IBuffer around(ClassFile cf, SourceMapper mapper, IBinaryType info, IClassFile owner) :\n    mapSource(cf, mapper, info, owner) {\n    return mapSourceSubst(cf, mapper, info);\n  }\n\n  IBuffer around(ClassFile cf, SourceMapper mapper, IBinaryType info) :\n    mapSource2(cf, mapper, info) {\n    return mapSourceSubst(cf, mapper, info);\n  }\n\n  IBuffer mapSourceSubst(ClassFile cf, SourceMapper mapper, IBinaryType info) {\n    char[] contents = mapper.findSource(cf.getType(), info);\n    IBuffer buffer;\n    if (contents != null) {\n      buffer = BufferManager.createBuffer(cf);\n      buffer.setContents(contents);\n    } else {\n      buffer = BufferManager.createNullBuffer(cf);\n    }\n    BufferManager bufManager = cf.getBufferManager();\n    bufManager.addBuffer(buffer);\n    buffer.addBufferChangedListener(cf);\n    return buffer;\n  }\n\n  String around(ClassFile cf) :\n    getTypeName(cf) {\n    if(cf instanceof IScalaClassFile) {\n      int lastDollar = cf.name.lastIndexOf('$');\n      return (lastDollar == -1 || lastDollar == cf.name.length()-1) ? cf.name : Util.localTypeName(cf.name, lastDollar, cf.name.length());\n    } else\n      return proceed(cf);\n  }\n  \n  boolean around(Viewer viewer, Object parentElement, Object element) :\n    select(viewer, parentElement, element) {\n    if (element instanceof IScalaClassFile) {\n      IClassFile classFile = (IClassFile) element;\n      String name = classFile.getElementName(); \n      int dollarIndex = name.indexOf('$');\n      return dollarIndex == -1 || dollarIndex == name.length()-7; \/\/ Trailing '$' implies object rather than inner class \n    }\n    return proceed(viewer, parentElement, element);\n  }\n  \n  CompilationUnit around(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) :\n    getAST(element, waitFlag, progressMonitor) {\n      if (element instanceof IScalaElement)\n        return null;\n      else\n        return proceed(element, waitFlag, progressMonitor);\n  }\n  \n  void around(HierarchyResolver hr, IGenericType suppliedType) :\n    resolve(hr, suppliedType) {\n    if (!suppliedType.isBinaryType()) {\n      IType tpe = ((SourceTypeElementInfo)suppliedType).getHandle();\n      IClassFile cf = tpe.getClassFile();\n      if (cf instanceof IScalaClassFile) {\n        hr.resolve(new Openable[]{(Openable)cf}, new HashSet(), null);\n        return;\n      }\n    }\n      \n    proceed(hr, suppliedType);\n  }\n  \n  void around(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    remember(hr, type, typeBinding) {\n    if (((IOpenable)type.getCompilationUnit()).isOpen()) {\n      try {\n        IGenericType genericType = (IGenericType)((JavaElement)type).getElementInfo();\n        hr.remember(genericType, typeBinding);\n      } catch (JavaModelException e) {\n        \/\/ cannot happen since element is open\n        return;\n      }\n    } else {\n      if (typeBinding == null) return;\n\n      TypeDeclaration typeDeclaration = ((SourceTypeBinding)typeBinding).scope.referenceType();\n\n      \/\/ simple super class name\n      char[] superclassName = null;\n      TypeReference superclass;\n      if ((typeDeclaration.bits & ASTNode.IsAnonymousType) != 0) {\n        superclass = typeDeclaration.allocation.type;\n      } else {\n        superclass = typeDeclaration.superclass;\n      }\n      if (superclass != null) {\n        char[][] typeName = superclass.getTypeName();\n        superclassName = typeName == null ? null : typeName[typeName.length-1];\n      }\n\n      \/\/ simple super interface names\n      char[][] superInterfaceNames = null;\n      TypeReference[] superInterfaces = typeDeclaration.superInterfaces;\n      if (superInterfaces != null) {\n        int length = superInterfaces.length;\n        superInterfaceNames = new char[length][];\n        for (int i = 0; i < length; i++) {\n          TypeReference superInterface = superInterfaces[i];\n          char[][] typeName = superInterface.getTypeName();\n          superInterfaceNames[i] = typeName[typeName.length-1];\n        }\n      }\n\n      HierarchyType hierarchyType = new HierarchyType(\n        type,\n        typeDeclaration.name,\n        typeDeclaration.binding.modifiers,\n        superclassName,\n        superInterfaceNames);\n      hr.remember(hierarchyType, typeDeclaration.binding);\n    }\n  }\n  \n  String around(BinaryType bt) :\n    getSourceFileName(bt) {\n    IJavaElement parent = bt.getTypeRoot(); \n    if (parent instanceof IScalaClassFile) {\n      return ((IScalaClassFile)parent).getSourceFileName();\n    }\n    else\n      return proceed(bt);\n  }\n  \n  boolean around(IType type, int acceptFlags, boolean isSourceType) :\n    acceptType(type, acceptFlags, isSourceType) {\n    if (!isSourceType && (type instanceof SourceType)) {\n      IJavaElement parent = type.getParent(); \n      if (parent instanceof IScalaClassFile)\n        return proceed(type, acceptFlags, true);\n    }\n    \n    return proceed(type, acceptFlags, isSourceType);\n  }\n  \n  CompilationUnitDeclaration around(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) throws JavaModelException :\n    convert(stc, sourceTypes, compilationResult) {\n    stc.unit = new CompilationUnitDeclaration(stc.problemReporter, compilationResult, 0);\n    \/\/ not filled at this point\n\n    if (sourceTypes.length == 0) return stc.unit;\n    SourceTypeElementInfo topLevelTypeInfo = (SourceTypeElementInfo) sourceTypes[0];\n    org.eclipse.jdt.core.ICompilationUnit cuHandle = topLevelTypeInfo.getHandle().getCompilationUnit();\n    stc.cu = (ICompilationUnit) cuHandle;\n\n    CompilationUnitElementInfo cuei = null;\n    Object info = ((JavaElement)stc.cu).getElementInfo();\n    if (info instanceof CompilationUnitElementInfo)\n      cuei = (CompilationUnitElementInfo)info;\n    \n    \n    if (stc.has1_5Compliance && cuei != null && cuei.annotationNumber > 10) { \/\/ experimental value\n      \/\/ if more than 10 annotations, diet parse as this is faster\n      return new Parser(stc.problemReporter, true).dietParse(stc.cu, compilationResult);\n    }\n\n    \/* only positions available *\/\n    int start = topLevelTypeInfo.getNameSourceStart();\n    int end = topLevelTypeInfo.getNameSourceEnd();\n\n    \/* convert package and imports *\/\n    String[] packageName = ((PackageFragment) cuHandle.getParent()).names;\n    if (packageName.length > 0)\n      \/\/ if its null then it is defined in the default package\n      stc.unit.currentPackage =\n        stc.createImportReference(packageName, start, end, false, ClassFileConstants.AccDefault);\n    IImportDeclaration[] importDeclarations = topLevelTypeInfo.getHandle().getCompilationUnit().getImports();\n    int importCount = importDeclarations.length;\n    stc.unit.imports = new ImportReference[importCount];\n    for (int i = 0; i < importCount; i++) {\n      ImportDeclaration importDeclaration = (ImportDeclaration) importDeclarations[i];\n      ISourceImport sourceImport = (ISourceImport) importDeclaration.getElementInfo();\n      String nameWithoutStar = importDeclaration.getNameWithoutStar();\n      stc.unit.imports[i] = stc.createImportReference(\n        Util.splitOn('.', nameWithoutStar, 0, nameWithoutStar.length()),\n        sourceImport.getDeclarationSourceStart(),\n        sourceImport.getDeclarationSourceEnd(),\n        importDeclaration.isOnDemand(),\n        sourceImport.getModifiers());\n    }\n    \/* convert type(s) *\/\n    try {\n      int typeCount = sourceTypes.length;\n      final TypeDeclaration[] types = new TypeDeclaration[typeCount];\n      \/*\n       * We used a temporary types collection to prevent this.unit.types from being null during a call to\n       * convert(...) when the source is syntactically incorrect and the parser is flushing the unit's types.\n       * See https:\/\/bugs.eclipse.org\/bugs\/show_bug.cgi?id=97466\n       *\/\n      for (int i = 0; i < typeCount; i++) {\n        SourceTypeElementInfo typeInfo = (SourceTypeElementInfo) sourceTypes[i];\n        types[i] = stc.convert((SourceType) typeInfo.getHandle(), compilationResult);\n      }\n      stc.unit.types = types;\n      return stc.unit;\n    } catch (SourceTypeConverter.AnonymousMemberFound e) {\n      return new Parser(stc.problemReporter, true).parse(stc.cu, compilationResult);\n    }\n  }\n  \n  IJavaElement around(JavaElement je, int ancestorType) :\n    getAncestor(je, ancestorType) {\n    IJavaElement element = je;\n    while (element != null) {\n      if (element.getElementType() == ancestorType)\n        return element;\n      else if (element instanceof IScalaClassFile && ancestorType == IJavaElement.COMPILATION_UNIT)\n        return ((JavaElement)element).getCompilationUnit();\n      element= element.getParent();\n    }\n    return null;\n  }\n\n  boolean around(TypeNameMatch match) :\n    isContainerDirty(match) {\n    org.eclipse.jdt.core.ICompilationUnit cu = match.getType().getCompilationUnit();\n    if (cu == null) {\n      return false;\n    }\n    IResource resource= cu.getResource();\n    if (resource == null)\n      return false;\n    \n    ITextFileBufferManager manager= FileBuffers.getTextFileBufferManager();\n    ITextFileBuffer textFileBuffer= manager.getTextFileBuffer(resource.getFullPath(), LocationKind.IFILE);\n    if (textFileBuffer != null) {\n      return textFileBuffer.isDirty();\n    }\n    return false;\n  }\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"f9ab223bb3e490720981305a8681bc13844d2c5b","subject":"avoid NPE if this member is not declared in a compilation unit (for example, a binary type) (see javadoc of getCompilationUnit)","message":"avoid NPE if this member is not declared in a compilation unit (for example, a binary type) (see javadoc of getCompilationUnit)","repos":"mlangc\/scala-ide,romanowski\/scala-ide,wpopielarski\/scala-ide,sschaef\/scala-ide,andrey-ilinykh\/scala-ide,Duhemm\/scala-ide,pilipolio\/scala-ide,mlangc\/scala-ide,scala-ide\/scala-ide,aleksi-lukkarinen\/scala-ide,aleksi-lukkarinen\/scala-ide,andrey-ilinykh\/scala-ide,stephenh\/scala-ide,Duhemm\/scala-ide,dragos\/scala-ide,romanowski\/scala-ide,sschaef\/scala-ide,romanowski\/scala-ide,Duhemm\/scala-ide,dragos\/scala-ide,stephenh\/scala-ide,scala-ide\/scala-ide,mlangc\/scala-ide,scala-ide\/scala-ide,aleksi-lukkarinen\/scala-ide,romanowski\/scala-ide,stephenh\/scala-ide,wpopielarski\/scala-ide,pilipolio\/scala-ide,sschaef\/scala-ide,Kwestor\/scala-ide,Kwestor\/scala-ide,dragos\/scala-ide,Duhemm\/scala-ide,sschaef\/scala-ide,andrey-ilinykh\/scala-ide,stephenh\/scala-ide,scala-ide\/scala-ide,pilipolio\/scala-ide,wpopielarski\/scala-ide,mlangc\/scala-ide,aleksi-lukkarinen\/scala-ide,andrey-ilinykh\/scala-ide,wpopielarski\/scala-ide,Kwestor\/scala-ide,dragos\/scala-ide,pilipolio\/scala-ide,Kwestor\/scala-ide","old_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/cfprovider\/ClassFileProviderAspect.aj","new_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/cfprovider\/ClassFileProviderAspect.aj","new_contents":"\/*\n * Copyright 2005-2010 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.cfprovider;\n\nimport java.util.HashSet;\n\nimport org.eclipse.core.filebuffers.FileBuffers;\nimport org.eclipse.core.filebuffers.ITextFileBuffer;\nimport org.eclipse.core.filebuffers.ITextFileBufferManager;\nimport org.eclipse.core.filebuffers.LocationKind;\nimport org.eclipse.core.resources.IResource;\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.core.IBuffer;\nimport org.eclipse.jdt.core.IClassFile;\nimport org.eclipse.jdt.core.IImportDeclaration;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IOpenable;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.ITypeRoot;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.core.dom.CompilationUnit;\nimport org.eclipse.jdt.core.search.TypeNameMatch;\nimport org.eclipse.jdt.internal.compiler.CompilationResult;\nimport org.eclipse.jdt.internal.compiler.ast.ASTNode;\nimport org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.ImportReference;\nimport org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.TypeReference;\nimport org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;\nimport org.eclipse.jdt.internal.compiler.env.IBinaryType;\nimport org.eclipse.jdt.internal.compiler.env.ICompilationUnit;\nimport org.eclipse.jdt.internal.compiler.env.IGenericType;\nimport org.eclipse.jdt.internal.compiler.env.ISourceImport;\nimport org.eclipse.jdt.internal.compiler.env.ISourceType;\nimport org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer;\nimport org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding;\nimport org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding;\nimport org.eclipse.jdt.internal.compiler.parser.Parser;\nimport org.eclipse.jdt.internal.compiler.parser.SourceTypeConverter;\nimport org.eclipse.jdt.internal.core.BinaryType;\nimport org.eclipse.jdt.internal.core.ClassFile;\nimport org.eclipse.jdt.internal.core.CompilationUnitElementInfo;\nimport org.eclipse.jdt.internal.core.ImportDeclaration;\nimport org.eclipse.jdt.internal.core.JavaElement;\nimport org.eclipse.jdt.internal.core.NameLookup;\nimport org.eclipse.jdt.internal.core.Openable;\nimport org.eclipse.jdt.internal.core.PackageFragment;\nimport org.eclipse.jdt.internal.core.SearchableEnvironment;\nimport org.eclipse.jdt.internal.core.SourceMapper;\nimport org.eclipse.jdt.internal.core.SourceType;\nimport org.eclipse.jdt.internal.core.SourceTypeElementInfo;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyResolver;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyType;\nimport org.eclipse.jdt.internal.core.util.Util;\nimport org.eclipse.jdt.internal.corext.util.OpenTypeHistory;\nimport org.eclipse.jdt.internal.ui.filters.InnerClassFilesFilter;\nimport org.eclipse.jdt.ui.SharedASTProvider;\nimport org.eclipse.jface.viewers.Viewer;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaClassFile;\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaElement;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect ClassFileProviderAspect {\n\n  pointcut classFileCreations(PackageFragment parent, String name) : \n    call(protected ClassFile.new(PackageFragment, String)) &&\n    within(org.eclipse.jdt..*) &&\n    args(parent, name);\n  \n  pointcut getTypeName(ClassFile cf) :\n    execution(public String ClassFile.getTypeName()) &&\n    target(cf);\n\n  pointcut getType(ClassFile cf) :\n    call(public IType IClassFile.getType()) &&\n    target(cf);\n  \n  pointcut mapSource() :\n    execution(IBuffer ClassFile.mapSource(SourceMapper, IBinaryType)) &&\n    target(IScalaClassFile);\n  \n  pointcut mapSource2() :\n    execution(void SourceMapper.mapSource(IType, char[], IBinaryType));\n  \n  pointcut getSourceFileName(BinaryType bt) :\n    execution(String BinaryType.getSourceFileName(IBinaryType)) &&\n    target(bt);\n  \n  pointcut select(Viewer viewer, Object parentElement, Object element) :\n    execution(boolean InnerClassFilesFilter.select(Viewer, Object, Object)) &&\n    args(viewer, parentElement, element);\n  \n  pointcut getChildren(BinaryType bt) :\n    execution(IJavaElement[] BinaryType.getChildren()) &&\n    target(bt);\n  \n  pointcut getAST(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) : \n    execution(CompilationUnit SharedASTProvider.getAST(ITypeRoot, SharedASTProvider.WAIT_FLAG, IProgressMonitor)) &&\n    args(element, waitFlag, progressMonitor);\n  \n  pointcut resolve(HierarchyResolver hr, IGenericType suppliedType) :\n    execution(void HierarchyResolver.resolve(IGenericType)) &&\n    target(hr) &&\n    args(suppliedType);\n  \n  pointcut remember(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    execution(void HierarchyResolver.remember(IType, ReferenceBinding)) &&\n    target(hr) &&\n    args(type, typeBinding);\n  \n  pointcut acceptType(IType type, int acceptFlags, boolean isSourceType) :\n    execution(boolean NameLookup.acceptType(IType, int, boolean)) &&\n    args(type, acceptFlags, isSourceType);\n  \n  pointcut find(SearchableEnvironment se, String typeName, String packageName) :\n    execution(NameEnvironmentAnswer find(String, String)) &&\n    target(se) &&\n    args(typeName, packageName);\n  \n  pointcut convert(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) :\n    execution(CompilationUnitDeclaration SourceTypeConverter.convert(ISourceType[], CompilationResult)) &&\n    target(stc) &&\n    args(sourceTypes, compilationResult);\n  \n  pointcut getAncestor(JavaElement je, int ancestorType) :\n    execution(IJavaElement JavaElement.getAncestor(int)) &&\n    target(je) &&\n    args(ancestorType);\n  \n  pointcut isContainerDirty(TypeNameMatch match) :\n    execution(boolean OpenTypeHistory.isContainerDirty(TypeNameMatch)) &&\n    args(match);\n  \n  ClassFile around(PackageFragment parent, String name) : \n    classFileCreations(parent, name) {\n\n    ClassFile javaClassFile = proceed(parent, name);\n    byte[] bytes;\n    \n    try {\n      bytes = javaClassFile.getBytes();\n    } catch(Throwable t) {\n      return javaClassFile; \n    }\n    \n    for (IClassFileProvider provider : ClassFileProviderRegistry.getInstance().getProviders()) {\n      ClassFile cf = provider.create(bytes, parent, name);\n      if (cf != null)\n        return cf;\n    }\n    \n    return javaClassFile;\n  }\n  \n  void around() :\n    mapSource2() &&\n    cflow(mapSource()) {\n    return;\n  }\n  \n  IType around(ClassFile cf) :\n    getType(cf) &&\n    cflow(mapSource()) {\n    if (cf.binaryType == null)\n      cf.binaryType = new BinaryType(cf, cf.getTypeName());\n    return cf.binaryType;\n  }\n  \n  String around(ClassFile cf) :\n    getTypeName(cf) {\n    if(cf instanceof IScalaClassFile) {\n      int lastDollar = cf.name.lastIndexOf('$');\n      return (lastDollar == -1 || lastDollar == cf.name.length()-1) ? cf.name : Util.localTypeName(cf.name, lastDollar, cf.name.length());\n    } else\n      return proceed(cf);\n  }\n  \n  boolean around(Viewer viewer, Object parentElement, Object element) :\n    select(viewer, parentElement, element) {\n    if (element instanceof IScalaClassFile) {\n      IClassFile classFile = (IClassFile) element;\n      String name = classFile.getElementName(); \n      int dollarIndex = name.indexOf('$');\n      return dollarIndex == -1 || dollarIndex == name.length()-7; \/\/ Trailing '$' implies object rather than inner class \n    }\n    return proceed(viewer, parentElement, element);\n  }\n  \n  IJavaElement[] around(BinaryType bt) throws JavaModelException :\n    getChildren(bt) && \n    target(BinaryType) {\n    ClassFile cf = (ClassFile)bt.parent;\n    if (cf instanceof IScalaClassFile)\n      return cf.getChildren();\n    else\n      return proceed(bt);\n  }\n  \n  CompilationUnit around(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) :\n    getAST(element, waitFlag, progressMonitor) {\n      if (element instanceof IScalaElement)\n        return null;\n      else\n        return proceed(element, waitFlag, progressMonitor);\n  }\n  \n  void around(HierarchyResolver hr, IGenericType suppliedType) :\n    resolve(hr, suppliedType) {\n    if (!suppliedType.isBinaryType()) {\n      IType tpe = ((SourceTypeElementInfo)suppliedType).getHandle();\n      IClassFile cf = tpe.getClassFile();\n      if (cf instanceof IScalaClassFile) {\n        hr.resolve(new Openable[]{(Openable)cf}, new HashSet(), null);\n        return;\n      }\n    }\n      \n    proceed(hr, suppliedType);\n  }\n  \n  void around(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    remember(hr, type, typeBinding) {\n    IOpenable openable = (IOpenable) type.getCompilationUnit();\n    if (openable != null && openable.isOpen()) {\n      try {\n        IGenericType genericType = (IGenericType)((JavaElement)type).getElementInfo();\n        hr.remember(genericType, typeBinding);\n      } catch (JavaModelException e) {\n        \/\/ cannot happen since element is open\n        return;\n      }\n    } else {\n      if (typeBinding == null) return;\n\n      TypeDeclaration typeDeclaration = ((SourceTypeBinding)typeBinding).scope.referenceType();\n\n      \/\/ simple super class name\n      char[] superclassName = null;\n      TypeReference superclass;\n      if ((typeDeclaration.bits & ASTNode.IsAnonymousType) != 0) {\n        superclass = typeDeclaration.allocation.type;\n      } else {\n        superclass = typeDeclaration.superclass;\n      }\n      if (superclass != null) {\n        char[][] typeName = superclass.getTypeName();\n        superclassName = typeName == null ? null : typeName[typeName.length-1];\n      }\n\n      \/\/ simple super interface names\n      char[][] superInterfaceNames = null;\n      TypeReference[] superInterfaces = typeDeclaration.superInterfaces;\n      if (superInterfaces != null) {\n        int length = superInterfaces.length;\n        superInterfaceNames = new char[length][];\n        for (int i = 0; i < length; i++) {\n          TypeReference superInterface = superInterfaces[i];\n          char[][] typeName = superInterface.getTypeName();\n          superInterfaceNames[i] = typeName[typeName.length-1];\n        }\n      }\n\n      HierarchyType hierarchyType = new HierarchyType(\n        type,\n        typeDeclaration.name,\n        typeDeclaration.binding.modifiers,\n        superclassName,\n        superInterfaceNames);\n      hr.remember(hierarchyType, typeDeclaration.binding);\n    }\n  }\n  \n  String around(BinaryType bt) :\n    getSourceFileName(bt) {\n    IJavaElement parent = bt.getParent(); \n    if (parent instanceof IScalaClassFile)\n      return ((IScalaClassFile)parent).getSourceFileName();\n    else\n      return proceed(bt);\n  }\n  \n  boolean around(IType type, int acceptFlags, boolean isSourceType) :\n    acceptType(type, acceptFlags, isSourceType) {\n    if (!isSourceType && (type instanceof SourceType)) {\n      IJavaElement parent = type.getParent(); \n      if (parent instanceof IScalaClassFile)\n        return proceed(type, acceptFlags, true);\n    }\n    \n    return proceed(type, acceptFlags, isSourceType);\n  }\n  \n  CompilationUnitDeclaration around(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) throws JavaModelException :\n    convert(stc, sourceTypes, compilationResult) {\n    stc.unit = new CompilationUnitDeclaration(stc.problemReporter, compilationResult, 0);\n    \/\/ not filled at this point\n\n    if (sourceTypes.length == 0) return stc.unit;\n    SourceTypeElementInfo topLevelTypeInfo = (SourceTypeElementInfo) sourceTypes[0];\n    org.eclipse.jdt.core.ICompilationUnit cuHandle = topLevelTypeInfo.getHandle().getCompilationUnit();\n    stc.cu = (ICompilationUnit) cuHandle;\n\n    CompilationUnitElementInfo cuei = null;\n    Object info = ((JavaElement)stc.cu).getElementInfo();\n    if (info instanceof CompilationUnitElementInfo)\n      cuei = (CompilationUnitElementInfo)info;\n    \n    \n    if (stc.has1_5Compliance && cuei != null && cuei.annotationNumber > 10) { \/\/ experimental value\n      \/\/ if more than 10 annotations, diet parse as this is faster\n      return new Parser(stc.problemReporter, true).dietParse(stc.cu, compilationResult);\n    }\n\n    \/* only positions available *\/\n    int start = topLevelTypeInfo.getNameSourceStart();\n    int end = topLevelTypeInfo.getNameSourceEnd();\n\n    \/\/cuHanlde could be null if this member is not declared in a compilation unit (for example, a binary type) (see javadoc of getCompilationUnit)\n    if (cuHandle != null) {\n      \/* convert package and imports *\/\n      String[] packageName = ((PackageFragment) cuHandle.getParent()).names;\n      if (packageName.length > 0)\n        \/\/ if its null then it is defined in the default package\n        stc.unit.currentPackage =\n          stc.createImportReference(packageName, start, end, false, ClassFileConstants.AccDefault);\n      IImportDeclaration[] importDeclarations = cuHandle.getImports();\n      int importCount = importDeclarations.length;\n      stc.unit.imports = new ImportReference[importCount];\n      for (int i = 0; i < importCount; i++) {\n        ImportDeclaration importDeclaration = (ImportDeclaration) importDeclarations[i];\n        ISourceImport sourceImport = (ISourceImport) importDeclaration.getElementInfo();\n        String nameWithoutStar = importDeclaration.getNameWithoutStar();\n        stc.unit.imports[i] = stc.createImportReference(\n          Util.splitOn('.', nameWithoutStar, 0, nameWithoutStar.length()),\n          sourceImport.getDeclarationSourceStart(),\n          sourceImport.getDeclarationSourceEnd(),\n          importDeclaration.isOnDemand(),\n          sourceImport.getModifiers());\n      }\n    }\n    \/* convert type(s) *\/\n    try {\n      int typeCount = sourceTypes.length;\n      final TypeDeclaration[] types = new TypeDeclaration[typeCount];\n      \/*\n       * We used a temporary types collection to prevent this.unit.types from being null during a call to\n       * convert(...) when the source is syntactically incorrect and the parser is flushing the unit's types.\n       * See https:\/\/bugs.eclipse.org\/bugs\/show_bug.cgi?id=97466\n       *\/\n      for (int i = 0; i < typeCount; i++) {\n        SourceTypeElementInfo typeInfo = (SourceTypeElementInfo) sourceTypes[i];\n        types[i] = stc.convert((SourceType) typeInfo.getHandle(), compilationResult);\n      }\n      stc.unit.types = types;\n      return stc.unit;\n    } catch (SourceTypeConverter.AnonymousMemberFound e) {\n      return new Parser(stc.problemReporter, true).parse(stc.cu, compilationResult);\n    }\n  }\n  \n  IJavaElement around(JavaElement je, int ancestorType) :\n    getAncestor(je, ancestorType) {\n    IJavaElement element = je;\n    while (element != null) {\n      if (element.getElementType() == ancestorType)\n        return element;\n      else if (element instanceof IScalaClassFile && ancestorType == IJavaElement.COMPILATION_UNIT)\n        return ((JavaElement)element).getCompilationUnit();\n      element= element.getParent();\n    }\n    return null;\n  }\n\n  boolean around(TypeNameMatch match) :\n    isContainerDirty(match) {\n    org.eclipse.jdt.core.ICompilationUnit cu = match.getType().getCompilationUnit();\n    if (cu == null) {\n      return false;\n    }\n    IResource resource= cu.getResource();\n    if (resource == null)\n      return false;\n    \n    ITextFileBufferManager manager= FileBuffers.getTextFileBufferManager();\n    ITextFileBuffer textFileBuffer= manager.getTextFileBuffer(resource.getFullPath(), LocationKind.IFILE);\n    if (textFileBuffer != null) {\n      return textFileBuffer.isDirty();\n    }\n    return false;\n  }\n}\n","old_contents":"\/*\n * Copyright 2005-2010 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.cfprovider;\n\nimport java.util.HashSet;\n\nimport org.eclipse.core.filebuffers.FileBuffers;\nimport org.eclipse.core.filebuffers.ITextFileBuffer;\nimport org.eclipse.core.filebuffers.ITextFileBufferManager;\nimport org.eclipse.core.filebuffers.LocationKind;\nimport org.eclipse.core.resources.IResource;\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.core.IBuffer;\nimport org.eclipse.jdt.core.IClassFile;\nimport org.eclipse.jdt.core.IImportDeclaration;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IOpenable;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.ITypeRoot;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.core.dom.CompilationUnit;\nimport org.eclipse.jdt.core.search.TypeNameMatch;\nimport org.eclipse.jdt.internal.compiler.CompilationResult;\nimport org.eclipse.jdt.internal.compiler.ast.ASTNode;\nimport org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.ImportReference;\nimport org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.TypeReference;\nimport org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;\nimport org.eclipse.jdt.internal.compiler.env.IBinaryType;\nimport org.eclipse.jdt.internal.compiler.env.ICompilationUnit;\nimport org.eclipse.jdt.internal.compiler.env.IGenericType;\nimport org.eclipse.jdt.internal.compiler.env.ISourceImport;\nimport org.eclipse.jdt.internal.compiler.env.ISourceType;\nimport org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer;\nimport org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding;\nimport org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding;\nimport org.eclipse.jdt.internal.compiler.parser.Parser;\nimport org.eclipse.jdt.internal.compiler.parser.SourceTypeConverter;\nimport org.eclipse.jdt.internal.core.BinaryType;\nimport org.eclipse.jdt.internal.core.ClassFile;\nimport org.eclipse.jdt.internal.core.CompilationUnitElementInfo;\nimport org.eclipse.jdt.internal.core.ImportDeclaration;\nimport org.eclipse.jdt.internal.core.JavaElement;\nimport org.eclipse.jdt.internal.core.NameLookup;\nimport org.eclipse.jdt.internal.core.Openable;\nimport org.eclipse.jdt.internal.core.PackageFragment;\nimport org.eclipse.jdt.internal.core.SearchableEnvironment;\nimport org.eclipse.jdt.internal.core.SourceMapper;\nimport org.eclipse.jdt.internal.core.SourceType;\nimport org.eclipse.jdt.internal.core.SourceTypeElementInfo;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyResolver;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyType;\nimport org.eclipse.jdt.internal.core.util.Util;\nimport org.eclipse.jdt.internal.corext.util.OpenTypeHistory;\nimport org.eclipse.jdt.internal.ui.filters.InnerClassFilesFilter;\nimport org.eclipse.jdt.ui.SharedASTProvider;\nimport org.eclipse.jface.viewers.Viewer;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaClassFile;\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaElement;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect ClassFileProviderAspect {\n\n  pointcut classFileCreations(PackageFragment parent, String name) : \n    call(protected ClassFile.new(PackageFragment, String)) &&\n    within(org.eclipse.jdt..*) &&\n    args(parent, name);\n  \n  pointcut getTypeName(ClassFile cf) :\n    execution(public String ClassFile.getTypeName()) &&\n    target(cf);\n\n  pointcut getType(ClassFile cf) :\n    call(public IType IClassFile.getType()) &&\n    target(cf);\n  \n  pointcut mapSource() :\n    execution(IBuffer ClassFile.mapSource(SourceMapper, IBinaryType)) &&\n    target(IScalaClassFile);\n  \n  pointcut mapSource2() :\n    execution(void SourceMapper.mapSource(IType, char[], IBinaryType));\n  \n  pointcut getSourceFileName(BinaryType bt) :\n    execution(String BinaryType.getSourceFileName(IBinaryType)) &&\n    target(bt);\n  \n  pointcut select(Viewer viewer, Object parentElement, Object element) :\n    execution(boolean InnerClassFilesFilter.select(Viewer, Object, Object)) &&\n    args(viewer, parentElement, element);\n  \n  pointcut getChildren(BinaryType bt) :\n    execution(IJavaElement[] BinaryType.getChildren()) &&\n    target(bt);\n  \n  pointcut getAST(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) : \n    execution(CompilationUnit SharedASTProvider.getAST(ITypeRoot, SharedASTProvider.WAIT_FLAG, IProgressMonitor)) &&\n    args(element, waitFlag, progressMonitor);\n  \n  pointcut resolve(HierarchyResolver hr, IGenericType suppliedType) :\n    execution(void HierarchyResolver.resolve(IGenericType)) &&\n    target(hr) &&\n    args(suppliedType);\n  \n  pointcut remember(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    execution(void HierarchyResolver.remember(IType, ReferenceBinding)) &&\n    target(hr) &&\n    args(type, typeBinding);\n  \n  pointcut acceptType(IType type, int acceptFlags, boolean isSourceType) :\n    execution(boolean NameLookup.acceptType(IType, int, boolean)) &&\n    args(type, acceptFlags, isSourceType);\n  \n  pointcut find(SearchableEnvironment se, String typeName, String packageName) :\n    execution(NameEnvironmentAnswer find(String, String)) &&\n    target(se) &&\n    args(typeName, packageName);\n  \n  pointcut convert(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) :\n    execution(CompilationUnitDeclaration SourceTypeConverter.convert(ISourceType[], CompilationResult)) &&\n    target(stc) &&\n    args(sourceTypes, compilationResult);\n  \n  pointcut getAncestor(JavaElement je, int ancestorType) :\n    execution(IJavaElement JavaElement.getAncestor(int)) &&\n    target(je) &&\n    args(ancestorType);\n  \n  pointcut isContainerDirty(TypeNameMatch match) :\n    execution(boolean OpenTypeHistory.isContainerDirty(TypeNameMatch)) &&\n    args(match);\n  \n  ClassFile around(PackageFragment parent, String name) : \n    classFileCreations(parent, name) {\n\n    ClassFile javaClassFile = proceed(parent, name);\n    byte[] bytes;\n    \n    try {\n      bytes = javaClassFile.getBytes();\n    } catch(Throwable t) {\n      return javaClassFile; \n    }\n    \n    for (IClassFileProvider provider : ClassFileProviderRegistry.getInstance().getProviders()) {\n      ClassFile cf = provider.create(bytes, parent, name);\n      if (cf != null)\n        return cf;\n    }\n    \n    return javaClassFile;\n  }\n  \n  void around() :\n    mapSource2() &&\n    cflow(mapSource()) {\n    return;\n  }\n  \n  IType around(ClassFile cf) :\n    getType(cf) &&\n    cflow(mapSource()) {\n    if (cf.binaryType == null)\n      cf.binaryType = new BinaryType(cf, cf.getTypeName());\n    return cf.binaryType;\n  }\n  \n  String around(ClassFile cf) :\n    getTypeName(cf) {\n    if(cf instanceof IScalaClassFile) {\n      int lastDollar = cf.name.lastIndexOf('$');\n      return (lastDollar == -1 || lastDollar == cf.name.length()-1) ? cf.name : Util.localTypeName(cf.name, lastDollar, cf.name.length());\n    } else\n      return proceed(cf);\n  }\n  \n  boolean around(Viewer viewer, Object parentElement, Object element) :\n    select(viewer, parentElement, element) {\n    if (element instanceof IScalaClassFile) {\n      IClassFile classFile = (IClassFile) element;\n      String name = classFile.getElementName(); \n      int dollarIndex = name.indexOf('$');\n      return dollarIndex == -1 || dollarIndex == name.length()-7; \/\/ Trailing '$' implies object rather than inner class \n    }\n    return proceed(viewer, parentElement, element);\n  }\n  \n  IJavaElement[] around(BinaryType bt) throws JavaModelException :\n    getChildren(bt) && \n    target(BinaryType) {\n    ClassFile cf = (ClassFile)bt.parent;\n    if (cf instanceof IScalaClassFile)\n      return cf.getChildren();\n    else\n      return proceed(bt);\n  }\n  \n  CompilationUnit around(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) :\n    getAST(element, waitFlag, progressMonitor) {\n      if (element instanceof IScalaElement)\n        return null;\n      else\n        return proceed(element, waitFlag, progressMonitor);\n  }\n  \n  void around(HierarchyResolver hr, IGenericType suppliedType) :\n    resolve(hr, suppliedType) {\n    if (!suppliedType.isBinaryType()) {\n      IType tpe = ((SourceTypeElementInfo)suppliedType).getHandle();\n      IClassFile cf = tpe.getClassFile();\n      if (cf instanceof IScalaClassFile) {\n        hr.resolve(new Openable[]{(Openable)cf}, new HashSet(), null);\n        return;\n      }\n    }\n      \n    proceed(hr, suppliedType);\n  }\n  \n  void around(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    remember(hr, type, typeBinding) {\n    if (((IOpenable)type.getCompilationUnit()).isOpen()) {\n      try {\n        IGenericType genericType = (IGenericType)((JavaElement)type).getElementInfo();\n        hr.remember(genericType, typeBinding);\n      } catch (JavaModelException e) {\n        \/\/ cannot happen since element is open\n        return;\n      }\n    } else {\n      if (typeBinding == null) return;\n\n      TypeDeclaration typeDeclaration = ((SourceTypeBinding)typeBinding).scope.referenceType();\n\n      \/\/ simple super class name\n      char[] superclassName = null;\n      TypeReference superclass;\n      if ((typeDeclaration.bits & ASTNode.IsAnonymousType) != 0) {\n        superclass = typeDeclaration.allocation.type;\n      } else {\n        superclass = typeDeclaration.superclass;\n      }\n      if (superclass != null) {\n        char[][] typeName = superclass.getTypeName();\n        superclassName = typeName == null ? null : typeName[typeName.length-1];\n      }\n\n      \/\/ simple super interface names\n      char[][] superInterfaceNames = null;\n      TypeReference[] superInterfaces = typeDeclaration.superInterfaces;\n      if (superInterfaces != null) {\n        int length = superInterfaces.length;\n        superInterfaceNames = new char[length][];\n        for (int i = 0; i < length; i++) {\n          TypeReference superInterface = superInterfaces[i];\n          char[][] typeName = superInterface.getTypeName();\n          superInterfaceNames[i] = typeName[typeName.length-1];\n        }\n      }\n\n      HierarchyType hierarchyType = new HierarchyType(\n        type,\n        typeDeclaration.name,\n        typeDeclaration.binding.modifiers,\n        superclassName,\n        superInterfaceNames);\n      hr.remember(hierarchyType, typeDeclaration.binding);\n    }\n  }\n  \n  String around(BinaryType bt) :\n    getSourceFileName(bt) {\n    IJavaElement parent = bt.getParent(); \n    if (parent instanceof IScalaClassFile)\n      return ((IScalaClassFile)parent).getSourceFileName();\n    else\n      return proceed(bt);\n  }\n  \n  boolean around(IType type, int acceptFlags, boolean isSourceType) :\n    acceptType(type, acceptFlags, isSourceType) {\n    if (!isSourceType && (type instanceof SourceType)) {\n      IJavaElement parent = type.getParent(); \n      if (parent instanceof IScalaClassFile)\n        return proceed(type, acceptFlags, true);\n    }\n    \n    return proceed(type, acceptFlags, isSourceType);\n  }\n  \n  CompilationUnitDeclaration around(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) throws JavaModelException :\n    convert(stc, sourceTypes, compilationResult) {\n    stc.unit = new CompilationUnitDeclaration(stc.problemReporter, compilationResult, 0);\n    \/\/ not filled at this point\n\n    if (sourceTypes.length == 0) return stc.unit;\n    SourceTypeElementInfo topLevelTypeInfo = (SourceTypeElementInfo) sourceTypes[0];\n    org.eclipse.jdt.core.ICompilationUnit cuHandle = topLevelTypeInfo.getHandle().getCompilationUnit();\n    stc.cu = (ICompilationUnit) cuHandle;\n\n    CompilationUnitElementInfo cuei = null;\n    Object info = ((JavaElement)stc.cu).getElementInfo();\n    if (info instanceof CompilationUnitElementInfo)\n      cuei = (CompilationUnitElementInfo)info;\n    \n    \n    if (stc.has1_5Compliance && cuei != null && cuei.annotationNumber > 10) { \/\/ experimental value\n      \/\/ if more than 10 annotations, diet parse as this is faster\n      return new Parser(stc.problemReporter, true).dietParse(stc.cu, compilationResult);\n    }\n\n    \/* only positions available *\/\n    int start = topLevelTypeInfo.getNameSourceStart();\n    int end = topLevelTypeInfo.getNameSourceEnd();\n\n    \/* convert package and imports *\/\n    String[] packageName = ((PackageFragment) cuHandle.getParent()).names;\n    if (packageName.length > 0)\n      \/\/ if its null then it is defined in the default package\n      stc.unit.currentPackage =\n        stc.createImportReference(packageName, start, end, false, ClassFileConstants.AccDefault);\n    IImportDeclaration[] importDeclarations = topLevelTypeInfo.getHandle().getCompilationUnit().getImports();\n    int importCount = importDeclarations.length;\n    stc.unit.imports = new ImportReference[importCount];\n    for (int i = 0; i < importCount; i++) {\n      ImportDeclaration importDeclaration = (ImportDeclaration) importDeclarations[i];\n      ISourceImport sourceImport = (ISourceImport) importDeclaration.getElementInfo();\n      String nameWithoutStar = importDeclaration.getNameWithoutStar();\n      stc.unit.imports[i] = stc.createImportReference(\n        Util.splitOn('.', nameWithoutStar, 0, nameWithoutStar.length()),\n        sourceImport.getDeclarationSourceStart(),\n        sourceImport.getDeclarationSourceEnd(),\n        importDeclaration.isOnDemand(),\n        sourceImport.getModifiers());\n    }\n    \/* convert type(s) *\/\n    try {\n      int typeCount = sourceTypes.length;\n      final TypeDeclaration[] types = new TypeDeclaration[typeCount];\n      \/*\n       * We used a temporary types collection to prevent this.unit.types from being null during a call to\n       * convert(...) when the source is syntactically incorrect and the parser is flushing the unit's types.\n       * See https:\/\/bugs.eclipse.org\/bugs\/show_bug.cgi?id=97466\n       *\/\n      for (int i = 0; i < typeCount; i++) {\n        SourceTypeElementInfo typeInfo = (SourceTypeElementInfo) sourceTypes[i];\n        types[i] = stc.convert((SourceType) typeInfo.getHandle(), compilationResult);\n      }\n      stc.unit.types = types;\n      return stc.unit;\n    } catch (SourceTypeConverter.AnonymousMemberFound e) {\n      return new Parser(stc.problemReporter, true).parse(stc.cu, compilationResult);\n    }\n  }\n  \n  IJavaElement around(JavaElement je, int ancestorType) :\n    getAncestor(je, ancestorType) {\n    IJavaElement element = je;\n    while (element != null) {\n      if (element.getElementType() == ancestorType)\n        return element;\n      else if (element instanceof IScalaClassFile && ancestorType == IJavaElement.COMPILATION_UNIT)\n        return ((JavaElement)element).getCompilationUnit();\n      element= element.getParent();\n    }\n    return null;\n  }\n\n  boolean around(TypeNameMatch match) :\n    isContainerDirty(match) {\n    org.eclipse.jdt.core.ICompilationUnit cu = match.getType().getCompilationUnit();\n    if (cu == null) {\n      return false;\n    }\n    IResource resource= cu.getResource();\n    if (resource == null)\n      return false;\n    \n    ITextFileBufferManager manager= FileBuffers.getTextFileBufferManager();\n    ITextFileBuffer textFileBuffer= manager.getTextFileBuffer(resource.getFullPath(), LocationKind.IFILE);\n    if (textFileBuffer != null) {\n      return textFileBuffer.isDirty();\n    }\n    return false;\n  }\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"03514c1a5c6ed8e61f09764a880b16eb2a91b7f6","subject":"NPE: 100% induced by some incorrect AST, but I'm too lazy to dig who is to blame, us or JDT, so fix it here.","message":"NPE: 100% induced by some incorrect AST, but I'm too lazy to dig who is to blame, us or JDT, so fix it here.\n","repos":"scala-ide\/scala-ide,andrey-ilinykh\/scala-ide,andrey-ilinykh\/scala-ide,dragos\/scala-ide,andrey-ilinykh\/scala-ide,andrey-ilinykh\/scala-ide,wpopielarski\/scala-ide,romanowski\/scala-ide,romanowski\/scala-ide,dragos\/scala-ide,stephenh\/scala-ide,pilipolio\/scala-ide,Kwestor\/scala-ide,sschaef\/scala-ide,mlangc\/scala-ide,dragos\/scala-ide,pilipolio\/scala-ide,romanowski\/scala-ide,stephenh\/scala-ide,mlangc\/scala-ide,stephenh\/scala-ide,Duhemm\/scala-ide,Duhemm\/scala-ide,Duhemm\/scala-ide,aleksi-lukkarinen\/scala-ide,Duhemm\/scala-ide,mlangc\/scala-ide,aleksi-lukkarinen\/scala-ide,sschaef\/scala-ide,wpopielarski\/scala-ide,scala-ide\/scala-ide,aleksi-lukkarinen\/scala-ide,mlangc\/scala-ide,sschaef\/scala-ide,pilipolio\/scala-ide,sschaef\/scala-ide,Kwestor\/scala-ide,Kwestor\/scala-ide,wpopielarski\/scala-ide,pilipolio\/scala-ide,stephenh\/scala-ide,romanowski\/scala-ide,aleksi-lukkarinen\/scala-ide,scala-ide\/scala-ide,Kwestor\/scala-ide,dragos\/scala-ide,wpopielarski\/scala-ide,scala-ide\/scala-ide","old_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/core\/DOMAspect.aj","new_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/core\/DOMAspect.aj","new_contents":"\/*\n * Copyright 2005-2010 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.core;\n\nimport java.util.Locale;\nimport java.util.Map;\n\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.core.ICompilationUnit;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.core.compiler.CharOperation;\nimport org.eclipse.jdt.core.dom.AST;\nimport org.eclipse.jdt.core.dom.ASTNode;\nimport org.eclipse.jdt.core.dom.ASTParser;\nimport org.eclipse.jdt.internal.compiler.CompilationResult;\nimport org.eclipse.jdt.internal.compiler.DefaultErrorHandlingPolicies;\nimport org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.AbstractVariableDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.AnnotationMethodDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.Argument;\nimport org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.ConstructorDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.Expression;\nimport org.eclipse.jdt.internal.compiler.ast.MethodDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.QualifiedAllocationExpression;\nimport org.eclipse.jdt.internal.compiler.ast.Statement;\nimport org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.TypeParameter;\nimport org.eclipse.jdt.internal.compiler.ast.TypeReference;\nimport org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;\nimport org.eclipse.jdt.internal.compiler.env.AccessRestriction;\nimport org.eclipse.jdt.internal.compiler.env.IBinaryType;\nimport org.eclipse.jdt.internal.compiler.env.INameEnvironment;\nimport org.eclipse.jdt.internal.compiler.env.ISourceType;\nimport org.eclipse.jdt.internal.compiler.impl.CompilerOptions;\nimport org.eclipse.jdt.internal.compiler.impl.ITypeRequestor;\nimport org.eclipse.jdt.internal.compiler.lookup.LookupEnvironment;\nimport org.eclipse.jdt.internal.compiler.lookup.PackageBinding;\nimport org.eclipse.jdt.internal.compiler.parser.SourceTypeConverter;\nimport org.eclipse.jdt.internal.compiler.problem.DefaultProblemFactory;\nimport org.eclipse.jdt.internal.compiler.problem.ProblemReporter;\nimport org.eclipse.jdt.internal.core.DefaultWorkingCopyOwner;\nimport org.eclipse.jdt.internal.core.JavaProject;\nimport org.eclipse.jdt.internal.core.SourceAnnotationMethodInfo;\nimport org.eclipse.jdt.internal.core.SourceMethod;\nimport org.eclipse.jdt.internal.core.SourceMethodElementInfo;\nimport org.eclipse.jdt.internal.core.SourceType;\nimport org.eclipse.jdt.internal.core.SourceTypeElementInfo;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaCompilationUnit;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect DOMAspect {\n  pointcut internalCreateAST(ASTParser parser, IProgressMonitor monitor) :\n    execution(ASTNode ASTParser.internalCreateAST(IProgressMonitor)) &&\n    args(monitor) &&\n    target(parser);\n  \n  pointcut convert(SourceTypeConverter stc, SourceMethod methodHandle, SourceMethodElementInfo methodInfo, CompilationResult compilationResult) :\n    execution(AbstractMethodDeclaration SourceTypeConverter.convert(SourceMethod, SourceMethodElementInfo, CompilationResult)) &&\n    args(methodHandle, methodInfo, compilationResult) &&\n    target(stc);\n  \n  ASTNode around(ASTParser parser, IProgressMonitor monitor) :\n    internalCreateAST(parser, monitor) {\n    try {\n      if (!(parser.typeRoot instanceof IScalaCompilationUnit))\n        return proceed(parser, monitor);\n      \n      ICompilationUnit cu = (ICompilationUnit)parser.typeRoot;\n      org.eclipse.jdt.internal.compiler.env.ICompilationUnit sourceUnit = (org.eclipse.jdt.internal.compiler.env.ICompilationUnit)cu;\n      \n      IType[] topLevelTypes = cu.getTypes();\n      int length = topLevelTypes.length;\n      if (length == 0)\n        throw new IllegalStateException();\n      \n      SourceTypeElementInfo[] topLevelInfos = new SourceTypeElementInfo[length];\n      for (int i = 0; i < length; i++) {\n        topLevelInfos[i] = (SourceTypeElementInfo) ((SourceType)topLevelTypes[i]).getElementInfo();\n      }\n      char[] fileName = ((ISourceType)topLevelInfos[0]).getFileName();\n      \n      CompilationResult result = new CompilationResult(fileName, 1, 1, 100);\n\n      JavaProject javaProject = (JavaProject)cu.getJavaProject(); \n      Map compilerOptions0 = javaProject.getOptions(true);\n      CompilerOptions compilerOptions = new CompilerOptions(compilerOptions0);\n      compilerOptions.storeAnnotations = true;\n      \n      ProblemReporter problemReporter =\n        new ProblemReporter(\n          DefaultErrorHandlingPolicies.proceedWithAllProblems(),\n          compilerOptions,\n          new DefaultProblemFactory(Locale.getDefault()));\n      \n      int flags = SourceTypeConverter.FIELD_AND_METHOD | SourceTypeConverter.MEMBER_TYPE;\n      \n      CompilationUnitDeclaration unit =\n        SourceTypeConverter.buildCompilationUnit(topLevelInfos, flags, problemReporter, result);\n      \n      INameEnvironment ne = javaProject.newSearchableNameEnvironment(DefaultWorkingCopyOwner.PRIMARY);\n      final LookupEnvironment le = new LookupEnvironment(null, compilerOptions, problemReporter, ne);\n      ITypeRequestor typeRequestor = new ITypeRequestor() {\n        public void accept(IBinaryType binaryType, PackageBinding packageBinding, AccessRestriction accessRestriction) {\n          le.createBinaryTypeFrom(binaryType, packageBinding, accessRestriction);\n        }\n        public void accept(org.eclipse.jdt.internal.compiler.env.ICompilationUnit unit, AccessRestriction accessRestriction) {}\n        public void accept(ISourceType[] sourceType, PackageBinding packageBinding, AccessRestriction accessRestriction) {}\n      };\n      le.typeRequestor = typeRequestor;\n      \n      le.buildTypeBindings(unit, null);\n      le.completeTypeBindings();\n      fixTypes(unit.types);\n      \n      AST ast = AST.newAST(AST.JLS3);\n      ast.setFlag(AST.RESOLVED_BINDINGS);\n      ast.setDefaultNodeFlag(ASTNode.ORIGINAL);\n\n      org.eclipse.jdt.core.dom.ASTConverter converter =\n        new org.eclipse.jdt.core.dom.ASTConverter(compilerOptions0, true, monitor);\n      \n      org.eclipse.jdt.core.dom.BindingResolver resolver =\n        new org.eclipse.jdt.core.dom.DefaultBindingResolver(\n          unit.scope,\n          DefaultWorkingCopyOwner.PRIMARY,\n          new org.eclipse.jdt.core.dom.DefaultBindingResolver.BindingTables(),\n          true);\n      ast.setBindingResolver(resolver);\n      converter.setAST(ast);\n      \n      ASTNode node = converter.convert(unit, sourceUnit.getContents());\n      return node;\n    } catch (JavaModelException ex) {\n      throw new IllegalArgumentException(ex);\n    }\n  }\n  \n  private void fixTypes(TypeDeclaration[] types) {\n    for(int i = 0, iLimit = types.length; i < iLimit ; ++i) {\n      TypeDeclaration tpe = types[i];\n      if (tpe != null) {\n        tpe.binding.getAnnotationTagBits();\n        tpe.scope.buildFields();\n        tpe.scope.buildMethods();\n        fixFields(tpe.fields);\n        fixMethods(tpe.methods);\n        fixTypes(tpe.memberTypes);\n      }\n    }\n  }\n  \n  private void fixMethods(AbstractMethodDeclaration[] methods) {\n    if (methods == null)\n      return;\n    \n    for(int i = 0, iLimit = methods.length; i < iLimit; ++i) {\n      AbstractMethodDeclaration m = methods[i];\n      m.bodyStart = m.declarationSourceStart;\n      m.bodyEnd = m.declarationSourceEnd;\n      m.binding.getAnnotationTagBits();\n    }\n  }\n  \n  private void fixFields(AbstractVariableDeclaration[] fields) {\n    if (fields == null)\n      return;\n    \n    for(int i = 0, iLimit = fields.length; i < iLimit; ++i) {\n      AbstractVariableDeclaration f = fields[i];\n      f.declarationEnd = f.declarationSourceEnd;\n    }\n  }\n\n  AbstractMethodDeclaration around(SourceTypeConverter stc, SourceMethod methodHandle, SourceMethodElementInfo methodInfo, CompilationResult compilationResult) throws JavaModelException :\n    convert(stc, methodHandle, methodInfo, compilationResult) {\n    AbstractMethodDeclaration method;\n\n    \/* only source positions available *\/\n    int start = methodInfo.getNameSourceStart();\n    int end = methodInfo.getNameSourceEnd();\n\n    \/\/ convert 1.5 specific constructs only if compliance is 1.5 or above\n    TypeParameter[] typeParams = null;\n    if (stc.has1_5Compliance) {\n      \/* convert type parameters *\/\n      char[][] typeParameterNames = methodInfo.getTypeParameterNames();\n      if (typeParameterNames != null) {\n        int parameterCount = typeParameterNames.length;\n        if (parameterCount > 0) { \/\/ method's type parameters must be null if no type parameter\n          char[][][] typeParameterBounds = methodInfo.getTypeParameterBounds();\n          typeParams = new TypeParameter[parameterCount];\n          for (int i = 0; i < parameterCount; i++) {\n            typeParams[i] = stc.createTypeParameter(typeParameterNames[i], typeParameterBounds[i], start, end);\n          }\n        }\n      }\n    }\n\n    int modifiers = methodInfo.getModifiers();\n    if (methodInfo.isConstructor()) {\n      ConstructorDeclaration decl = new ConstructorDeclaration(compilationResult);\n      decl.bits &= ~org.eclipse.jdt.internal.compiler.ast.ASTNode.IsDefaultConstructor;\n      method = decl;\n      decl.typeParameters = typeParams;\n    } else {\n      MethodDeclaration decl;\n      if (methodInfo.isAnnotationMethod()) {\n        AnnotationMethodDeclaration annotationMethodDeclaration = new AnnotationMethodDeclaration(compilationResult);\n\n        \/* conversion of default value *\/\n        SourceAnnotationMethodInfo annotationMethodInfo = (SourceAnnotationMethodInfo) methodInfo;\n        boolean hasDefaultValue = annotationMethodInfo.defaultValueStart != -1 || annotationMethodInfo.defaultValueEnd != -1;\n        if ((stc.flags & SourceTypeConverter.FIELD_INITIALIZATION) != 0) {\n          if (hasDefaultValue) {\n            char[] defaultValueSource = CharOperation.subarray(stc.getSource(), annotationMethodInfo.defaultValueStart, annotationMethodInfo.defaultValueEnd+1);\n            if (defaultValueSource != null) {\n                Expression expression =  stc.parseMemberValue(defaultValueSource);\n                if (expression != null) {\n                  annotationMethodDeclaration.defaultValue = expression;\n                }\n            } else {\n              \/\/ could not retrieve the default value\n              hasDefaultValue = false;\n            }\n          }\n        }\n        if (hasDefaultValue)\n          modifiers |= ClassFileConstants.AccAnnotationDefault;\n        decl = annotationMethodDeclaration;\n      } else {\n        decl = new MethodDeclaration(compilationResult);\n      }\n\n      \/\/ convert return type\n      decl.returnType = stc.createTypeReference(methodInfo.getReturnTypeName(), start, end);\n\n      \/\/ type parameters\n      decl.typeParameters = typeParams;\n\n      method = decl;\n    }\n    method.selector = methodHandle.getElementName().toCharArray();\n    boolean isVarargs = (modifiers & ClassFileConstants.AccVarargs) != 0;\n    method.modifiers = modifiers & ~ClassFileConstants.AccVarargs;\n    method.sourceStart = start;\n    method.sourceEnd = end;\n    method.declarationSourceStart = methodInfo.getDeclarationSourceStart();\n    method.declarationSourceEnd = methodInfo.getDeclarationSourceEnd();\n\n    \/\/ convert 1.5 specific constructs only if compliance is 1.5 or above\n    if (stc.has1_5Compliance) {\n      \/* convert annotations *\/\n      method.annotations = stc.convertAnnotations(methodHandle);\n    }\n\n    \/* convert arguments *\/\n    String[] argumentTypeSignatures = methodHandle.getParameterTypes();\n    char[][] argumentNames = methodInfo.getArgumentNames();\n    int argumentCount = argumentTypeSignatures == null ? 0 : argumentTypeSignatures.length;\n    if (argumentCount > 0) {\n      long position = ((long) start << 32) + end;\n      method.arguments = new Argument[argumentCount];\n      for (int i = 0; i < argumentCount; i++) {\n        TypeReference typeReference = stc.createTypeReference(argumentTypeSignatures[i], start, end);\n        if (isVarargs && i == argumentCount-1) {\n          typeReference.bits |= org.eclipse.jdt.internal.compiler.ast.ASTNode.IsVarArgs;\n        }\n        method.arguments[i] =\n          new Argument(\n            argumentNames[i],\n            position,\n            typeReference,\n            ClassFileConstants.AccDefault);\n        \/\/ do not care whether was final or not\n      }\n    }\n\n    \/* convert thrown exceptions *\/\n    char[][] exceptionTypeNames = methodInfo.getExceptionTypeNames();\n    int exceptionCount = exceptionTypeNames == null ? 0 : exceptionTypeNames.length;\n    if (exceptionCount > 0) {\n      method.thrownExceptions = new TypeReference[exceptionCount];\n      for (int i = 0; i < exceptionCount; i++) {\n        method.thrownExceptions[i] =\n          stc.createTypeReference(exceptionTypeNames[i], start, end);\n      }\n    }\n\n    \/* convert local and anonymous types *\/\n    if ((stc.flags & SourceTypeConverter.LOCAL_TYPE) != 0) {\n      IJavaElement[] children = methodInfo.getChildren();\n      int typesLength = 0;\n      int childrenLength = children.length;\n      for (int i = 0; i < childrenLength; ++i)\n        if (children[i] instanceof SourceType)\n          ++typesLength;\n      \n      if (typesLength != 0) {\n        Statement[] statements = new Statement[typesLength];\n        int typeIndex = 0;\n        for (int i = 0; i < childrenLength; i++) {\n          if (children[i] instanceof SourceType) {\n            SourceType type = (SourceType) children[i];\n            TypeDeclaration localType = stc.convert(type, compilationResult);\n            if ((localType.bits & org.eclipse.jdt.internal.compiler.ast.ASTNode.IsAnonymousType) != 0) {\n              QualifiedAllocationExpression expression = new QualifiedAllocationExpression(localType);\n              expression.type = localType.superclass;\n              localType.superclass = null;\n              localType.superInterfaces = null;\n              localType.allocation = expression;\n              statements[typeIndex] = expression;\n            } else {\n              statements[typeIndex] = localType;\n            }\n            ++typeIndex;\n          }\n        }\n        method.statements = statements;\n      }\n    }\n\n    return method;\n  }\n}\n","old_contents":"\/*\n * Copyright 2005-2010 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.core;\n\nimport java.util.Locale;\nimport java.util.Map;\n\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.core.ICompilationUnit;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.core.compiler.CharOperation;\nimport org.eclipse.jdt.core.dom.AST;\nimport org.eclipse.jdt.core.dom.ASTNode;\nimport org.eclipse.jdt.core.dom.ASTParser;\nimport org.eclipse.jdt.internal.compiler.CompilationResult;\nimport org.eclipse.jdt.internal.compiler.DefaultErrorHandlingPolicies;\nimport org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.AbstractVariableDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.AnnotationMethodDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.Argument;\nimport org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.ConstructorDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.Expression;\nimport org.eclipse.jdt.internal.compiler.ast.MethodDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.QualifiedAllocationExpression;\nimport org.eclipse.jdt.internal.compiler.ast.Statement;\nimport org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.TypeParameter;\nimport org.eclipse.jdt.internal.compiler.ast.TypeReference;\nimport org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;\nimport org.eclipse.jdt.internal.compiler.env.AccessRestriction;\nimport org.eclipse.jdt.internal.compiler.env.IBinaryType;\nimport org.eclipse.jdt.internal.compiler.env.INameEnvironment;\nimport org.eclipse.jdt.internal.compiler.env.ISourceType;\nimport org.eclipse.jdt.internal.compiler.impl.CompilerOptions;\nimport org.eclipse.jdt.internal.compiler.impl.ITypeRequestor;\nimport org.eclipse.jdt.internal.compiler.lookup.LookupEnvironment;\nimport org.eclipse.jdt.internal.compiler.lookup.PackageBinding;\nimport org.eclipse.jdt.internal.compiler.parser.SourceTypeConverter;\nimport org.eclipse.jdt.internal.compiler.problem.DefaultProblemFactory;\nimport org.eclipse.jdt.internal.compiler.problem.ProblemReporter;\nimport org.eclipse.jdt.internal.core.DefaultWorkingCopyOwner;\nimport org.eclipse.jdt.internal.core.JavaProject;\nimport org.eclipse.jdt.internal.core.SourceAnnotationMethodInfo;\nimport org.eclipse.jdt.internal.core.SourceMethod;\nimport org.eclipse.jdt.internal.core.SourceMethodElementInfo;\nimport org.eclipse.jdt.internal.core.SourceType;\nimport org.eclipse.jdt.internal.core.SourceTypeElementInfo;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaCompilationUnit;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect DOMAspect {\n  pointcut internalCreateAST(ASTParser parser, IProgressMonitor monitor) :\n    execution(ASTNode ASTParser.internalCreateAST(IProgressMonitor)) &&\n    args(monitor) &&\n    target(parser);\n  \n  pointcut convert(SourceTypeConverter stc, SourceMethod methodHandle, SourceMethodElementInfo methodInfo, CompilationResult compilationResult) :\n    execution(AbstractMethodDeclaration SourceTypeConverter.convert(SourceMethod, SourceMethodElementInfo, CompilationResult)) &&\n    args(methodHandle, methodInfo, compilationResult) &&\n    target(stc);\n  \n  ASTNode around(ASTParser parser, IProgressMonitor monitor) :\n    internalCreateAST(parser, monitor) {\n    try {\n      if (!(parser.typeRoot instanceof IScalaCompilationUnit))\n        return proceed(parser, monitor);\n      \n      ICompilationUnit cu = (ICompilationUnit)parser.typeRoot;\n      org.eclipse.jdt.internal.compiler.env.ICompilationUnit sourceUnit = (org.eclipse.jdt.internal.compiler.env.ICompilationUnit)cu;\n      \n      IType[] topLevelTypes = cu.getTypes();\n      int length = topLevelTypes.length;\n      if (length == 0)\n        throw new IllegalStateException();\n      \n      SourceTypeElementInfo[] topLevelInfos = new SourceTypeElementInfo[length];\n      for (int i = 0; i < length; i++) {\n        topLevelInfos[i] = (SourceTypeElementInfo) ((SourceType)topLevelTypes[i]).getElementInfo();\n      }\n      char[] fileName = ((ISourceType)topLevelInfos[0]).getFileName();\n      \n      CompilationResult result = new CompilationResult(fileName, 1, 1, 100);\n\n      JavaProject javaProject = (JavaProject)cu.getJavaProject(); \n      Map compilerOptions0 = javaProject.getOptions(true);\n      CompilerOptions compilerOptions = new CompilerOptions(compilerOptions0);\n      compilerOptions.storeAnnotations = true;\n      \n      ProblemReporter problemReporter =\n        new ProblemReporter(\n          DefaultErrorHandlingPolicies.proceedWithAllProblems(),\n          compilerOptions,\n          new DefaultProblemFactory(Locale.getDefault()));\n      \n      int flags = SourceTypeConverter.FIELD_AND_METHOD | SourceTypeConverter.MEMBER_TYPE;\n      \n      CompilationUnitDeclaration unit =\n        SourceTypeConverter.buildCompilationUnit(topLevelInfos, flags, problemReporter, result);\n      \n      INameEnvironment ne = javaProject.newSearchableNameEnvironment(DefaultWorkingCopyOwner.PRIMARY);\n      final LookupEnvironment le = new LookupEnvironment(null, compilerOptions, problemReporter, ne);\n      ITypeRequestor typeRequestor = new ITypeRequestor() {\n        public void accept(IBinaryType binaryType, PackageBinding packageBinding, AccessRestriction accessRestriction) {\n          le.createBinaryTypeFrom(binaryType, packageBinding, accessRestriction);\n        }\n        public void accept(org.eclipse.jdt.internal.compiler.env.ICompilationUnit unit, AccessRestriction accessRestriction) {}\n        public void accept(ISourceType[] sourceType, PackageBinding packageBinding, AccessRestriction accessRestriction) {}\n      };\n      le.typeRequestor = typeRequestor;\n      \n      le.buildTypeBindings(unit, null);\n      le.completeTypeBindings();\n      fixTypes(unit.types);\n      \n      AST ast = AST.newAST(AST.JLS3);\n      ast.setFlag(AST.RESOLVED_BINDINGS);\n      ast.setDefaultNodeFlag(ASTNode.ORIGINAL);\n\n      org.eclipse.jdt.core.dom.ASTConverter converter =\n        new org.eclipse.jdt.core.dom.ASTConverter(compilerOptions0, true, monitor);\n      \n      org.eclipse.jdt.core.dom.BindingResolver resolver =\n        new org.eclipse.jdt.core.dom.DefaultBindingResolver(\n          unit.scope,\n          DefaultWorkingCopyOwner.PRIMARY,\n          new org.eclipse.jdt.core.dom.DefaultBindingResolver.BindingTables(),\n          true);\n      ast.setBindingResolver(resolver);\n      converter.setAST(ast);\n      \n      ASTNode node = converter.convert(unit, sourceUnit.getContents());\n      return node;\n    } catch (JavaModelException ex) {\n      throw new IllegalArgumentException(ex);\n    }\n  }\n  \n  private void fixTypes(TypeDeclaration[] types) {\n    for(int i = 0, iLimit = types.length; i < iLimit ; ++i) {\n      TypeDeclaration tpe = types[i];\n      tpe.binding.getAnnotationTagBits();\n      tpe.scope.buildFields();\n      tpe.scope.buildMethods();\n      fixFields(tpe.fields);\n      fixMethods(tpe.methods);\n      fixTypes(tpe.memberTypes);\n    }\n  }\n  \n  private void fixMethods(AbstractMethodDeclaration[] methods) {\n    if (methods == null)\n      return;\n    \n    for(int i = 0, iLimit = methods.length; i < iLimit; ++i) {\n      AbstractMethodDeclaration m = methods[i];\n      m.bodyStart = m.declarationSourceStart;\n      m.bodyEnd = m.declarationSourceEnd;\n      m.binding.getAnnotationTagBits();\n    }\n  }\n  \n  private void fixFields(AbstractVariableDeclaration[] fields) {\n    if (fields == null)\n      return;\n    \n    for(int i = 0, iLimit = fields.length; i < iLimit; ++i) {\n      AbstractVariableDeclaration f = fields[i];\n      f.declarationEnd = f.declarationSourceEnd;\n    }\n  }\n\n  AbstractMethodDeclaration around(SourceTypeConverter stc, SourceMethod methodHandle, SourceMethodElementInfo methodInfo, CompilationResult compilationResult) throws JavaModelException :\n    convert(stc, methodHandle, methodInfo, compilationResult) {\n    AbstractMethodDeclaration method;\n\n    \/* only source positions available *\/\n    int start = methodInfo.getNameSourceStart();\n    int end = methodInfo.getNameSourceEnd();\n\n    \/\/ convert 1.5 specific constructs only if compliance is 1.5 or above\n    TypeParameter[] typeParams = null;\n    if (stc.has1_5Compliance) {\n      \/* convert type parameters *\/\n      char[][] typeParameterNames = methodInfo.getTypeParameterNames();\n      if (typeParameterNames != null) {\n        int parameterCount = typeParameterNames.length;\n        if (parameterCount > 0) { \/\/ method's type parameters must be null if no type parameter\n          char[][][] typeParameterBounds = methodInfo.getTypeParameterBounds();\n          typeParams = new TypeParameter[parameterCount];\n          for (int i = 0; i < parameterCount; i++) {\n            typeParams[i] = stc.createTypeParameter(typeParameterNames[i], typeParameterBounds[i], start, end);\n          }\n        }\n      }\n    }\n\n    int modifiers = methodInfo.getModifiers();\n    if (methodInfo.isConstructor()) {\n      ConstructorDeclaration decl = new ConstructorDeclaration(compilationResult);\n      decl.bits &= ~org.eclipse.jdt.internal.compiler.ast.ASTNode.IsDefaultConstructor;\n      method = decl;\n      decl.typeParameters = typeParams;\n    } else {\n      MethodDeclaration decl;\n      if (methodInfo.isAnnotationMethod()) {\n        AnnotationMethodDeclaration annotationMethodDeclaration = new AnnotationMethodDeclaration(compilationResult);\n\n        \/* conversion of default value *\/\n        SourceAnnotationMethodInfo annotationMethodInfo = (SourceAnnotationMethodInfo) methodInfo;\n        boolean hasDefaultValue = annotationMethodInfo.defaultValueStart != -1 || annotationMethodInfo.defaultValueEnd != -1;\n        if ((stc.flags & SourceTypeConverter.FIELD_INITIALIZATION) != 0) {\n          if (hasDefaultValue) {\n            char[] defaultValueSource = CharOperation.subarray(stc.getSource(), annotationMethodInfo.defaultValueStart, annotationMethodInfo.defaultValueEnd+1);\n            if (defaultValueSource != null) {\n                Expression expression =  stc.parseMemberValue(defaultValueSource);\n                if (expression != null) {\n                  annotationMethodDeclaration.defaultValue = expression;\n                }\n            } else {\n              \/\/ could not retrieve the default value\n              hasDefaultValue = false;\n            }\n          }\n        }\n        if (hasDefaultValue)\n          modifiers |= ClassFileConstants.AccAnnotationDefault;\n        decl = annotationMethodDeclaration;\n      } else {\n        decl = new MethodDeclaration(compilationResult);\n      }\n\n      \/\/ convert return type\n      decl.returnType = stc.createTypeReference(methodInfo.getReturnTypeName(), start, end);\n\n      \/\/ type parameters\n      decl.typeParameters = typeParams;\n\n      method = decl;\n    }\n    method.selector = methodHandle.getElementName().toCharArray();\n    boolean isVarargs = (modifiers & ClassFileConstants.AccVarargs) != 0;\n    method.modifiers = modifiers & ~ClassFileConstants.AccVarargs;\n    method.sourceStart = start;\n    method.sourceEnd = end;\n    method.declarationSourceStart = methodInfo.getDeclarationSourceStart();\n    method.declarationSourceEnd = methodInfo.getDeclarationSourceEnd();\n\n    \/\/ convert 1.5 specific constructs only if compliance is 1.5 or above\n    if (stc.has1_5Compliance) {\n      \/* convert annotations *\/\n      method.annotations = stc.convertAnnotations(methodHandle);\n    }\n\n    \/* convert arguments *\/\n    String[] argumentTypeSignatures = methodHandle.getParameterTypes();\n    char[][] argumentNames = methodInfo.getArgumentNames();\n    int argumentCount = argumentTypeSignatures == null ? 0 : argumentTypeSignatures.length;\n    if (argumentCount > 0) {\n      long position = ((long) start << 32) + end;\n      method.arguments = new Argument[argumentCount];\n      for (int i = 0; i < argumentCount; i++) {\n        TypeReference typeReference = stc.createTypeReference(argumentTypeSignatures[i], start, end);\n        if (isVarargs && i == argumentCount-1) {\n          typeReference.bits |= org.eclipse.jdt.internal.compiler.ast.ASTNode.IsVarArgs;\n        }\n        method.arguments[i] =\n          new Argument(\n            argumentNames[i],\n            position,\n            typeReference,\n            ClassFileConstants.AccDefault);\n        \/\/ do not care whether was final or not\n      }\n    }\n\n    \/* convert thrown exceptions *\/\n    char[][] exceptionTypeNames = methodInfo.getExceptionTypeNames();\n    int exceptionCount = exceptionTypeNames == null ? 0 : exceptionTypeNames.length;\n    if (exceptionCount > 0) {\n      method.thrownExceptions = new TypeReference[exceptionCount];\n      for (int i = 0; i < exceptionCount; i++) {\n        method.thrownExceptions[i] =\n          stc.createTypeReference(exceptionTypeNames[i], start, end);\n      }\n    }\n\n    \/* convert local and anonymous types *\/\n    if ((stc.flags & SourceTypeConverter.LOCAL_TYPE) != 0) {\n      IJavaElement[] children = methodInfo.getChildren();\n      int typesLength = 0;\n      int childrenLength = children.length;\n      for (int i = 0; i < childrenLength; ++i)\n        if (children[i] instanceof SourceType)\n          ++typesLength;\n      \n      if (typesLength != 0) {\n        Statement[] statements = new Statement[typesLength];\n        int typeIndex = 0;\n        for (int i = 0; i < childrenLength; i++) {\n          if (children[i] instanceof SourceType) {\n            SourceType type = (SourceType) children[i];\n            TypeDeclaration localType = stc.convert(type, compilationResult);\n            if ((localType.bits & org.eclipse.jdt.internal.compiler.ast.ASTNode.IsAnonymousType) != 0) {\n              QualifiedAllocationExpression expression = new QualifiedAllocationExpression(localType);\n              expression.type = localType.superclass;\n              localType.superclass = null;\n              localType.superInterfaces = null;\n              localType.allocation = expression;\n              statements[typeIndex] = expression;\n            } else {\n              statements[typeIndex] = localType;\n            }\n            ++typeIndex;\n          }\n        }\n        method.statements = statements;\n      }\n    }\n\n    return method;\n  }\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"c45fa30e530156c2b03d769b16583c26f55f7619","subject":"Fixed #2884.","message":"Fixed #2884.\n\ngit-svn-id: f4ecfe233223879a4a16cd7937f11b5152963d8e@20439 5e8d7ff9-d8ef-0310-90f0-a4852d11357a\n","repos":"Kwestor\/scala-ide,romanowski\/scala-ide,dragos\/scala-ide,romanowski\/scala-ide,Kwestor\/scala-ide,pilipolio\/scala-ide,stephenh\/scala-ide,mlangc\/scala-ide,andrey-ilinykh\/scala-ide,dragos\/scala-ide,scala-ide\/scala-ide,romanowski\/scala-ide,Kwestor\/scala-ide,wpopielarski\/scala-ide,wpopielarski\/scala-ide,wpopielarski\/scala-ide,sschaef\/scala-ide,sschaef\/scala-ide,sschaef\/scala-ide,aleksi-lukkarinen\/scala-ide,Kwestor\/scala-ide,aleksi-lukkarinen\/scala-ide,scala-ide\/scala-ide,scala-ide\/scala-ide,stephenh\/scala-ide,dragos\/scala-ide,mlangc\/scala-ide,Duhemm\/scala-ide,andrey-ilinykh\/scala-ide,Duhemm\/scala-ide,dragos\/scala-ide,mlangc\/scala-ide,stephenh\/scala-ide,wpopielarski\/scala-ide,Duhemm\/scala-ide,andrey-ilinykh\/scala-ide,pilipolio\/scala-ide,Duhemm\/scala-ide,scala-ide\/scala-ide,andrey-ilinykh\/scala-ide,aleksi-lukkarinen\/scala-ide,sschaef\/scala-ide,romanowski\/scala-ide,mlangc\/scala-ide,pilipolio\/scala-ide,aleksi-lukkarinen\/scala-ide,pilipolio\/scala-ide,stephenh\/scala-ide","old_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/core\/NameLookupAspect.aj","new_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/core\/NameLookupAspect.aj","new_contents":"\/*\n * Copyright 2005-2010 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.core;\n\nimport org.eclipse.jdt.core.ICompilationUnit;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IPackageFragment;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.internal.core.IJavaElementRequestor;\nimport org.eclipse.jdt.internal.core.NameLookup;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaCompilationUnit;\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaElement;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect NameLookupAspect {\n  pointcut seekTypesInSourcePackage(\n    NameLookup nl,\n    String name,\n    IPackageFragment pkg,\n    int firstDot,\n    boolean partialMatch,\n    String topLevelTypeName,\n    int acceptFlags,\n    IJavaElementRequestor requestor) :\n    execution(void NameLookup.seekTypesInSourcePackage(\n      String,\n      IPackageFragment,\n      int,\n      boolean,\n      String,\n      int,\n      IJavaElementRequestor)) &&\n    target(nl) &&\n    args(\n      name,\n      pkg,\n      firstDot,\n      partialMatch,\n      topLevelTypeName,\n      acceptFlags,\n      requestor);\n       \n  void around(\n    NameLookup nl,\n    String name,\n    IPackageFragment pkg,\n    int firstDot,\n    boolean partialMatch,\n    String topLevelTypeName,\n    int acceptFlags,\n    IJavaElementRequestor requestor) :\n      seekTypesInSourcePackage(\n        nl,\n        name,\n        pkg,\n        firstDot,\n        partialMatch,\n        topLevelTypeName,\n        acceptFlags,\n        requestor) {\n\n    long start = -1;\n    if (NameLookup.VERBOSE)\n      start = System.currentTimeMillis();\n    try {\n      if (!partialMatch) {\n        try {\n          IJavaElement[] compilationUnits = pkg.getChildren();\n          for (int i = 0, length = compilationUnits.length; i < length; i++) {\n            if (requestor.isCanceled())\n              return;\n            IJavaElement cu = compilationUnits[i];\n            String cuName = cu.getElementName();\n            int lastDot = cuName.lastIndexOf('.');\n            boolean isScala = cu instanceof IScalaCompilationUnit;\n            if (!isScala && (lastDot != topLevelTypeName.length() || !topLevelTypeName.regionMatches(0, cuName, 0, lastDot)))\n              continue;\n            IType type = ((ICompilationUnit) cu).getType(topLevelTypeName);\n            type = nl.getMemberType(type, name, firstDot);\n            if ((isScala && (type instanceof IScalaElement)) || (!isScala && nl.acceptType(type, acceptFlags, true\/*a source type*\/))) { \/\/ accept type checks for existence unless cu is Scala\n              requestor.acceptType(type);\n              break;  \/\/ since an exact match was requested, no other matching type can exist\n            }\n          }\n        } catch (JavaModelException e) {\n          \/\/ package doesn't exist -> ignore\n        }\n      } else {\n        try {\n          String cuPrefix = firstDot == -1 ? name : name.substring(0, firstDot);\n          IJavaElement[] compilationUnits = pkg.getChildren();\n          for (int i = 0, length = compilationUnits.length; i < length; i++) {\n            if (requestor.isCanceled())\n              return;\n            IJavaElement cu = compilationUnits[i];\n            if (!(cu instanceof IScalaCompilationUnit) && !cu.getElementName().toLowerCase().startsWith(cuPrefix))\n              continue;\n            try {\n              IType[] types = ((ICompilationUnit) cu).getTypes();\n              for (int j = 0, typeLength = types.length; j < typeLength; j++)\n                nl.seekTypesInTopLevelType(name, firstDot, types[j], requestor, acceptFlags);\n            } catch (JavaModelException e) {\n              \/\/ cu doesn't exist -> ignore\n            }\n          }\n        } catch (JavaModelException e) {\n          \/\/ package doesn't exist -> ignore\n        }\n      }\n    } finally {\n      if (NameLookup.VERBOSE)\n        nl.timeSpentInSeekTypesInSourcePackage += System.currentTimeMillis()-start;\n    }\n  }\n}\n","old_contents":"\/*\n * Copyright 2005-2010 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.core;\n\nimport org.eclipse.jdt.core.ICompilationUnit;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IPackageFragment;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.internal.core.IJavaElementRequestor;\nimport org.eclipse.jdt.internal.core.NameLookup;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaCompilationUnit;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect NameLookupAspect {\n  pointcut seekTypesInSourcePackage(\n    NameLookup nl,\n    String name,\n    IPackageFragment pkg,\n    int firstDot,\n    boolean partialMatch,\n    String topLevelTypeName,\n    int acceptFlags,\n    IJavaElementRequestor requestor) :\n    execution(void NameLookup.seekTypesInSourcePackage(\n      String,\n      IPackageFragment,\n      int,\n      boolean,\n      String,\n      int,\n      IJavaElementRequestor)) &&\n    target(nl) &&\n    args(\n      name,\n      pkg,\n      firstDot,\n      partialMatch,\n      topLevelTypeName,\n      acceptFlags,\n      requestor);\n       \n  void around(\n    NameLookup nl,\n    String name,\n    IPackageFragment pkg,\n    int firstDot,\n    boolean partialMatch,\n    String topLevelTypeName,\n    int acceptFlags,\n    IJavaElementRequestor requestor) :\n      seekTypesInSourcePackage(\n        nl,\n        name,\n        pkg,\n        firstDot,\n        partialMatch,\n        topLevelTypeName,\n        acceptFlags,\n        requestor) {\n\n    long start = -1;\n    if (NameLookup.VERBOSE)\n      start = System.currentTimeMillis();\n    try {\n      if (!partialMatch) {\n        try {\n          IJavaElement[] compilationUnits = pkg.getChildren();\n          for (int i = 0, length = compilationUnits.length; i < length; i++) {\n            if (requestor.isCanceled())\n              return;\n            IJavaElement cu = compilationUnits[i];\n            String cuName = cu.getElementName();\n            int lastDot = cuName.lastIndexOf('.');\n            if (!(cu instanceof IScalaCompilationUnit) && (lastDot != topLevelTypeName.length() || !topLevelTypeName.regionMatches(0, cuName, 0, lastDot)))\n              continue;\n            IType type = ((ICompilationUnit) cu).getType(topLevelTypeName);\n            type = nl.getMemberType(type, name, firstDot);\n            if (nl.acceptType(type, acceptFlags, true\/*a source type*\/)) { \/\/ accept type checks for existence\n              requestor.acceptType(type);\n              break;  \/\/ since an exact match was requested, no other matching type can exist\n            }\n          }\n        } catch (JavaModelException e) {\n          \/\/ package doesn't exist -> ignore\n        }\n      } else {\n        try {\n          String cuPrefix = firstDot == -1 ? name : name.substring(0, firstDot);\n          IJavaElement[] compilationUnits = pkg.getChildren();\n          for (int i = 0, length = compilationUnits.length; i < length; i++) {\n            if (requestor.isCanceled())\n              return;\n            IJavaElement cu = compilationUnits[i];\n            if (!(cu instanceof IScalaCompilationUnit) && !cu.getElementName().toLowerCase().startsWith(cuPrefix))\n              continue;\n            try {\n              IType[] types = ((ICompilationUnit) cu).getTypes();\n              for (int j = 0, typeLength = types.length; j < typeLength; j++)\n                nl.seekTypesInTopLevelType(name, firstDot, types[j], requestor, acceptFlags);\n            } catch (JavaModelException e) {\n              \/\/ cu doesn't exist -> ignore\n            }\n          }\n        } catch (JavaModelException e) {\n          \/\/ package doesn't exist -> ignore\n        }\n      }\n    } finally {\n      if (NameLookup.VERBOSE)\n        nl.timeSpentInSeekTypesInSourcePackage += System.currentTimeMillis()-start;\n    }\n  }\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"92d315f8088af14a7eecde6f1b82582745382f09","subject":"Strange... SAIS seems to have a memory complexity equal to naive sort (no extra memory allocation). The aspect is correct, the only way I can explain this is that internal variables inside methods are freed before the actual calculation of the memory usage.","message":"Strange... SAIS seems to have a memory complexity equal to naive sort (no extra memory allocation). The aspect is correct, the only way I can explain this is that internal variables inside methods\nare freed before the actual calculation of the memory usage.\n\ngit-svn-id: 4050ee570c0b454ed3c2eee326cdaf8b6ad603bd@35 e65ff1b4-dc2a-11dd-afbb-e3e17473af86\n","repos":"carrotsearch\/jsuffixarrays","old_file":"src\/perf\/org\/jsuffixarrays\/MemoryLogger.aj","new_file":"src\/perf\/org\/jsuffixarrays\/MemoryLogger.aj","new_contents":"package org.jsuffixarrays;\r\n\r\n\/**\r\n * This aspect logs the memory state at entry and exit from methods\r\n * declared in inheriting aspects. The aspect is a singleton, so is generally\r\n * not very useful for multi-threaded applications or whenever more than one instance\r\n * of a given instrumented class is used.\r\n *\/\r\nabstract aspect MemoryLogger issingleton()\r\n{\r\n    \/**\r\n     * Declare classes to track memory from.\r\n     *\/\r\n    abstract pointcut tracedClasses();\r\n\r\n    \/**\r\n     * Override and remove methods for which logging should not occur.\r\n     *\/\r\n    pointcut excludedMethods() : !execution(* *(..));\r\n\r\n    \/**\r\n     * Declare methods to track memory in.\r\n     *\/\r\n    final pointcut tracedMethods() : \r\n        tracedClasses() && execution(* *(..)) && !excludedMethods();\r\n\r\n    \/**\r\n     * \r\n     *\/\r\n    before () : tracedClasses() && tracedMethods()\r\n    {\r\n        update();\r\n    }\r\n\r\n    \/**\r\n     * \r\n     *\/\r\n    after () returning : tracedMethods()\r\n    {\r\n        update();\r\n    }\r\n\r\n    \/**\r\n     * Starting amount of memory from which we will begin measurements.\r\n     * \r\n     * @see #reset()\r\n     *\/\r\n    private static volatile long startingPoint;\r\n    \r\n    \/*\r\n     * \r\n     *\/\r\n    private static volatile long maxMemoryUsed;\r\n\r\n    \/*\r\n     * \r\n     *\/\r\n    private static void update()\r\n    {\r\n        final long now = getUsedMemory();\r\n        if (maxMemoryUsed < now)\r\n        {\r\n            maxMemoryUsed = now;\r\n        }\r\n    }\r\n\r\n    \/*\r\n     * \r\n     *\/\r\n    private static long getUsedMemory()\r\n    {\r\n        final Runtime rt = Runtime.getRuntime();\r\n        return rt.totalMemory() - rt.freeMemory();\r\n    }\r\n\r\n    \/**\r\n     * Reset memory status, preparing for measurement.\r\n     *\/\r\n    public static void reset()\r\n    {\r\n        \/\/ Try to clean the GC. Will not work for parallel GC, but we did our best.\r\n        for (int i = 0; i < 5; i++)\r\n        {\r\n            System.gc();\r\n        }\r\n        \r\n        startingPoint = getUsedMemory();\r\n        maxMemoryUsed = 0;\r\n    }\r\n\r\n    \/**\r\n     * Returns the absolute memory peak recorded so far. \r\n     *\/\r\n    public static long getMemoryPeak()\r\n    {\r\n        return maxMemoryUsed;\r\n    }\r\n\r\n    \/**\r\n     * Returns the maximum memory difference from the last time \r\n     * since {@link #reset()} was called. This value may be negative\r\n     * with certain GCs and scenarios. \r\n     *\/\r\n    public static long getMemoryUsed()\r\n    {\r\n        return maxMemoryUsed - startingPoint;\r\n    }\r\n}\r\n\r\n\/**\r\n * Track memory in {@link Skew} algorithm.\r\n *\/\r\naspect SkewMemLogger extends MemoryLogger\r\n{\r\n    @Override\r\n    pointcut tracedClasses() : within(Skew);\r\n    @Override\r\n    pointcut excludedMethods(): execution(* leq*(..));\r\n}\r\n\r\n\/**\r\n * Track memory in {@link NaiveSort} algorithm.\r\n *\/\r\naspect NaiveSortMemLogger extends MemoryLogger\r\n{\r\n    @Override\r\n    pointcut tracedClasses() : within(NaiveSort);\r\n    @Override\r\n    pointcut excludedMethods(): execution(* compare(..));\r\n}\r\n\r\n\/**\r\n * Track memory in {@link DivSufSort} algorithm.\r\n *\/\r\naspect DivSufSortMemLogger extends MemoryLogger\r\n{\r\n    \/* 3 methods using stack are excluded, because they use max. 64 * 4 bytes of extra memory for stack *\/\r\n    \/\/ TODO: somehow exclude TRBudget class; within(DivSufSort && !DivSufSort.TRBudget) does not work);\r\n    @Override\r\n    pointcut tracedClasses(): within(DivSufSort);\r\n    @Override\r\n    pointcut excludedMethods(): execution(private * *(..)) ;\r\n}\r\n\r\n\/**\r\n * Track memory in {@link QSufSort} algorithm.\r\n *\/\r\naspect QSUfSortMemLogger extends MemoryLogger\r\n{\r\n    @Override\r\n    pointcut tracedClasses() : within(QSufSort);\r\n    @Override\r\n    pointcut excludedMethods(): execution(private * *(..));\r\n}\r\n\r\n\/**\r\n * Track memory in {@link BPR} algorithm.\r\n *\/\r\naspect BPRMemLogger extends MemoryLogger\r\n{\r\n    @Override\r\n    pointcut tracedClasses() : within(BPR);\r\n    @Override\r\n    pointcut excludedMethods(): execution(private * *(..));\r\n}\r\n\r\n\/**\r\n * Track memory in {@link DeepShallow} algorithm.\r\n *\/\r\naspect DeepShallowMemLogger extends MemoryLogger\r\n{\r\n    @Override\r\n    pointcut tracedClasses() : within(DeepShallow);\r\n    @Override\r\n    pointcut excludedMethods(): execution(private * *(..));\r\n}\r\n    \r\n\/**\r\n * Track memory in {@link SAIS} algorithm.\r\n *\/\r\naspect SaisMemLogger extends MemoryLogger\r\n{\r\n    @Override\r\n    pointcut tracedClasses() : within(SAIS) && !within(org.jsuffixarrays.SAIS..*);\r\n    \r\n    @Override\r\n    pointcut excludedMethods(): execution(private * *(..)) \r\n        && !execution(private * SA_IS(..))\r\n        && !execution(private * induceSA(..));\r\n}\r\n    \r\n\r\n\r\n","old_contents":"package org.jsuffixarrays;\r\n\r\n\/**\r\n * This aspect logs the memory state at entry and exit from methods\r\n * declared in inheriting aspects. The aspect is a singleton, so is generally\r\n * not very useful for multi-threaded applications or whenever more than one instance\r\n * of a given instrumented class is used.\r\n *\/\r\nabstract aspect MemoryLogger issingleton()\r\n{\r\n    \/**\r\n     * Declare classes to track memory from.\r\n     *\/\r\n    abstract pointcut tracedClasses();\r\n\r\n    \/**\r\n     * Override and remove methods for which logging should not occur.\r\n     *\/\r\n    pointcut excludedMethods() : !execution(* *(..));\r\n\r\n    \/**\r\n     * Declare methods to track memory in.\r\n     *\/\r\n    final pointcut tracedMethods() : \r\n        tracedClasses() && execution(* *(..)) && !excludedMethods();\r\n\r\n    \/**\r\n     * \r\n     *\/\r\n    before () : tracedClasses() && tracedMethods()\r\n    {\r\n        update();\r\n    }\r\n\r\n    \/**\r\n     * \r\n     *\/\r\n    after () returning : tracedMethods()\r\n    {\r\n        update();\r\n    }\r\n\r\n    \/**\r\n     * Starting amount of memory from which we will begin measurements.\r\n     * \r\n     * @see #reset()\r\n     *\/\r\n    private static volatile long startingPoint;\r\n    \r\n    \/*\r\n     * \r\n     *\/\r\n    private static volatile long maxMemoryUsed;\r\n\r\n    \/*\r\n     * \r\n     *\/\r\n    private static void update()\r\n    {\r\n        final long now = getUsedMemory();\r\n        if (maxMemoryUsed < now)\r\n        {\r\n            maxMemoryUsed = now;\r\n        }\r\n    }\r\n\r\n    \/*\r\n     * \r\n     *\/\r\n    private static long getUsedMemory()\r\n    {\r\n        final Runtime rt = Runtime.getRuntime();\r\n        return rt.totalMemory() - rt.freeMemory();\r\n    }\r\n\r\n    \/**\r\n     * Reset memory status, preparing for measurement.\r\n     *\/\r\n    public static void reset()\r\n    {\r\n        \/\/ Try to clean the GC. Will not work for parallel GC, but we did our best.\r\n        for (int i = 0; i < 5; i++)\r\n        {\r\n            System.gc();\r\n        }\r\n        \r\n        startingPoint = getUsedMemory();\r\n        maxMemoryUsed = 0;\r\n    }\r\n\r\n    \/**\r\n     * Returns the absolute memory peak recorded so far. \r\n     *\/\r\n    public static long getMemoryPeak()\r\n    {\r\n        return maxMemoryUsed;\r\n    }\r\n\r\n    \/**\r\n     * Returns the maximum memory difference from the last time \r\n     * since {@link #reset()} was called. This value may be negative\r\n     * with certain GCs and scenarios. \r\n     *\/\r\n    public static long getMemoryUsed()\r\n    {\r\n        return maxMemoryUsed - startingPoint;\r\n    }\r\n}\r\n\r\n\/**\r\n * Track memory in {@link Skew} algorithm.\r\n *\/\r\naspect SkewMemLogger extends MemoryLogger\r\n{\r\n    @Override\r\n    pointcut tracedClasses() : within(Skew);\r\n    @Override\r\n    pointcut excludedMethods(): execution(* leq*(..));\r\n}\r\n\r\n\/**\r\n * Track memory in {@link NaiveSort} algorithm.\r\n *\/\r\naspect NaiveSortMemLogger extends MemoryLogger\r\n{\r\n    @Override\r\n    pointcut tracedClasses() : within(NaiveSort);\r\n    @Override\r\n    pointcut excludedMethods(): execution(* compare(..));\r\n}\r\n\r\n\/**\r\n * Track memory in {@link DivSufSort} algorithm.\r\n *\/\r\naspect DivSufSortMemLogger extends MemoryLogger\r\n{\r\n    \/* 3 methods using stack are excluded, because they use max. 64 * 4 bytes of extra memory for stack *\/\r\n    \/\/ TODO: somehow exclude TRBudget class; within(DivSufSort && !DivSufSort.TRBudget) does not work);\r\n    @Override\r\n    pointcut tracedClasses(): within(DivSufSort);\r\n    @Override\r\n    pointcut excludedMethods(): execution(private * *(..)) ;\r\n}\r\n\r\n\/**\r\n * Track memory in {@link QSufSort} algorithm.\r\n *\/\r\naspect QSUfSortMemLogger extends MemoryLogger\r\n{\r\n    @Override\r\n    pointcut tracedClasses() : within(QSufSort);\r\n    @Override\r\n    pointcut excludedMethods(): execution(private * *(..));\r\n}\r\n\r\n\/**\r\n * Track memory in {@link BPR} algorithm.\r\n *\/\r\naspect BPRMemLogger extends MemoryLogger\r\n{\r\n    @Override\r\n    pointcut tracedClasses() : within(BPR);\r\n    @Override\r\n    pointcut excludedMethods(): execution(private * *(..));\r\n}\r\n\r\n\/**\r\n * Track memory in {@link DeepShallow} algorithm.\r\n *\/\r\naspect DeepShallowMemLogger extends MemoryLogger\r\n{\r\n    @Override\r\n    pointcut tracedClasses() : within(DeepShallow);\r\n    @Override\r\n    pointcut excludedMethods(): execution(private * *(..));\r\n}\r\n    \r\n\/**\r\n * Track memory in {@link SAIS} algorithm.\r\n *\/\r\naspect SaisMemLogger extends MemoryLogger\r\n{\r\n    @Override\r\n    pointcut tracedClasses() : within(SAIS) && !within(org.jsuffixarrays.SAIS..*);\r\n    @Override\r\n    pointcut excludedMethods(): execution(private * *(..));\r\n}\r\n    \r\n\r\n\r\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"a2a5676d321665cc3f1b25f89a1855edd17d2f59","subject":"Add a precedence for Program adapter of core project","message":"Add a precedence for Program adapter of core project\n","repos":"christophe-w\/parallelj.runtime,awltech\/org.parallelj","old_file":"parallelj-launching\/src\/main\/java\/org\/parallelj\/launching\/quartz\/ProgramJobsAdapter.aj","new_file":"parallelj-launching\/src\/main\/java\/org\/parallelj\/launching\/quartz\/ProgramJobsAdapter.aj","new_contents":"\/*\n *     ParallelJ, framework for parallel computing\n *\n *     Copyright (C) 2010, 2011, 2012 Atos Worldline or third-party contributors as\n *     indicated by the @author tags or express copyright attribution\n *     statements applied by the authors.\n *\n *     This library is free software; you can redistribute it and\/or\n *     modify it under the terms of the GNU Lesser General Public\n *     License as published by the Free Software Foundation; either\n *     version 2.1 of the License.\n *\n *     This library is distributed in the hope that it will be useful,\n *     but WITHOUT ANY WARRANTY; without even the implied warranty of\n *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n *     Lesser General Public License for more details.\n *\n *     You should have received a copy of the GNU Lesser General Public\n *     License along with this library; if not, write to the Free Software\n *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n *\/\npackage org.parallelj.launching.quartz;\n\nimport java.lang.reflect.InvocationTargetException;\nimport java.lang.reflect.Method;\nimport java.util.concurrent.ExecutorService;\nimport java.util.concurrent.Executors;\n\nimport org.parallelj.Programs;\nimport org.parallelj.Programs.ProcessHelper;\nimport org.parallelj.internal.kernel.KCall;\nimport org.parallelj.internal.kernel.KProgram;\nimport org.parallelj.internal.reflect.ProgramAdapter;\nimport org.parallelj.internal.reflect.ProgramAdapter.Adapter;\nimport org.parallelj.launching.LaunchingMessageKind;\nimport org.parallelj.launching.ReturnCodes;\nimport org.parallelj.mirror.ProgramType;\nimport org.quartz.Job;\nimport org.quartz.JobDataMap;\nimport org.quartz.JobExecutionContext;\nimport org.quartz.JobExecutionException;\n\n\/**\n * Implements the Job.execute(..) method\n * \n * \n *\/\nprivileged public aspect ProgramJobsAdapter percflow (execution(public void Job+.execute(..) throws JobExecutionException)) {\n\n\t\/**\n\t * The JobExecutionContext where get Program's arguments ant where to put\n\t * the Result.\n\t *\/\n\tpublic JobExecutionContext context;\n\n\t\/*\n\t * The Aspect JobsAdapter must be passed before this.\n\t *\/\n\tdeclare precedence :\n\t\torg.parallelj.internal.reflect.ProgramAdapter,\n\t\torg.parallelj.launching.quartz.JobsAdapter;\n\n\tprivate Adapter adpater;\n\n\t\/**\n\t * Launch a Program and initialize the Result as a JobDataMap.\n\t * \n\t * @param self\n\t * @param context\n\t * @throws JobExecutionException\n\t *\/\n\tvoid around(Job self, JobExecutionContext context)\n\t\t\tthrows JobExecutionException : \n\t\texecution( public void  Job+.execute(..) throws JobExecutionException) \n\t\t\t&& (within(@org.parallelj.Program *) || within(JobsAdapter)) \n\t\t\t\t&& args(context) && this(self) {\n\t\tthis.adpater = (Adapter) self;\n\t\tthis.context = context;\n\t\tJobDataMap jobDataMap = new JobDataMap();\n\t\tcontext.setResult(jobDataMap);\n\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.SUCCESS);\n\t\ttry {\n\t\t\tproceed(self, context);\n\n\t\t\ttry {\n\t\t\t\t\/\/ Initialize an ExecutorService with the Capacity of the Program\n\t\t\t\tProcessHelper<?> processHelper = Programs.as((Adapter) self);\n\t\t\t\tProgramType programType = processHelper.getProcess().getProgram();\n\t\t\t\tExecutorService service = null;\n\t\t\t\tif (programType instanceof KProgram) {\n\t\t\t\t\tshort programCapacity = ((KProgram) programType)\n\t\t\t\t\t\t\t.getCapacity();\n\t\t\t\t\tservice = (programCapacity == Short.MAX_VALUE) ? Executors\n\t\t\t\t\t\t\t.newCachedThreadPool() : Executors\n\t\t\t\t\t\t\t.newFixedThreadPool(programCapacity);\n\t\t\t\t} else {\n\t\t\t\t\tservice = Executors\n\t\t\t\t\t\t\t.newCachedThreadPool();\n\t\t\t\t}\n\t\t\t\t\/\/ Launch the program with the initialized ExecutorService\n\t\t\t\tprocessHelper.execute(service).join();\n\t\t\t\tservice.shutdown();\n\t\t\t\tProgramFieldsBinder.getProgramOutputFields(this, context);\n\t\t\t} catch (IllegalAccessException e) {\n\t\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.FAILURE);\n\t\t\t} catch (NoSuchFieldException e) {\n\t\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.FAILURE);\n\t\t\t}\n\t\t} catch (InvocationTargetException e) {\n\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.FAILURE);\n\t\t}\n\t}\n\n\t\/**\n\t * Intercept Exception thrown in RunnableProcedure\/CallableProcedure for\n\t * tracing. If an Exception is thrown, the return code of a Launch becomes\n\t * FAILURE.\n\t * \n\t * @param self\n\t *\/\n\tpointcut enter(KCall _kCall): call(* org.parallelj.internal.kernel.callback.Entry+.enter(KCall)) && args(_kCall);\n\n\tpointcut invoke(): call(public Object Method.invoke(Object, ..)) && !within(ProgramJobsAdapter);\n\n\tafter(Object oo, KCall _kCall) throwing (InvocationTargetException ite) : \n    \tinvoke() && args(oo, ..) && cflow(enter(_kCall)) {\n\n\t\tLaunchingMessageKind.ELAUNCH0002.format(this.adpater, ite);\n\t\tif (this.context != null && this.context.getResult() != null\n\t\t\t\t&& this.context.getResult() instanceof JobDataMap) {\n\t\t\t((JobDataMap) this.context.getResult()).put(\n\t\t\t\t\tQuartzUtils.RETURN_CODE, ReturnCodes.FAILURE);\n\t\t}\n\t}\n}\n","old_contents":"\/*\n *     ParallelJ, framework for parallel computing\n *\n *     Copyright (C) 2010, 2011, 2012 Atos Worldline or third-party contributors as\n *     indicated by the @author tags or express copyright attribution\n *     statements applied by the authors.\n *\n *     This library is free software; you can redistribute it and\/or\n *     modify it under the terms of the GNU Lesser General Public\n *     License as published by the Free Software Foundation; either\n *     version 2.1 of the License.\n *\n *     This library is distributed in the hope that it will be useful,\n *     but WITHOUT ANY WARRANTY; without even the implied warranty of\n *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n *     Lesser General Public License for more details.\n *\n *     You should have received a copy of the GNU Lesser General Public\n *     License along with this library; if not, write to the Free Software\n *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n *\/\npackage org.parallelj.launching.quartz;\n\nimport java.lang.reflect.InvocationTargetException;\nimport java.lang.reflect.Method;\nimport java.util.List;\nimport java.util.concurrent.ExecutorService;\nimport java.util.concurrent.Executors;\n\nimport org.parallelj.Programs;\nimport org.parallelj.Programs.ProcessHelper;\nimport org.parallelj.internal.kernel.KCall;\nimport org.parallelj.internal.kernel.KProgram;\nimport org.parallelj.internal.kernel.KReflection;\nimport org.parallelj.internal.reflect.ProgramAdapter.Adapter;\nimport org.parallelj.launching.LaunchingMessageKind;\nimport org.parallelj.launching.ReturnCodes;\nimport org.parallelj.mirror.ProgramType;\nimport org.quartz.Job;\nimport org.quartz.JobDataMap;\nimport org.quartz.JobExecutionContext;\nimport org.quartz.JobExecutionException;\n\n\/**\n * Implements the Job.execute(..) method\n * \n * \n *\/\nprivileged public aspect ProgramJobsAdapter percflow (execution(public void Job+.execute(..) throws JobExecutionException)) {\n\n\t\/**\n\t * The JobExecutionContext where get Program's arguments ant where to put\n\t * the Result.\n\t *\/\n\tpublic JobExecutionContext context;\n\n\t\/*\n\t * The Aspect JobsAdapter must be passed before this.\n\t *\/\n\tdeclare precedence :\n\t\torg.parallelj.launching.quartz.JobsAdapter;\n\n\tprivate Adapter adpater;\n\n\t\/**\n\t * Launch a Program and initialize the Result as a JobDataMap.\n\t * \n\t * @param self\n\t * @param context\n\t * @throws JobExecutionException\n\t *\/\n\tvoid around(Job self, JobExecutionContext context)\n\t\t\tthrows JobExecutionException : \n\t\texecution( public void  Job+.execute(..) throws JobExecutionException) \n\t\t\t&& (within(@org.parallelj.Program *) || within(JobsAdapter)) \n\t\t\t\t&& args(context) && this(self) {\n\t\tthis.adpater = (Adapter) self;\n\t\tthis.context = context;\n\t\tJobDataMap jobDataMap = new JobDataMap();\n\t\tcontext.setResult(jobDataMap);\n\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.SUCCESS);\n\t\ttry {\n\t\t\tproceed(self, context);\n\n\t\t\ttry {\n\t\t\t\t\/\/ Initialize an ExecutorService with the Capacity of the Program\n\t\t\t\tProcessHelper<?> processHelper = Programs.as((Adapter) self);\n\t\t\t\tProgramType programType = processHelper.getProcess().getProgram();\n\t\t\t\tExecutorService service = null;\n\t\t\t\tif (programType instanceof KProgram) {\n\t\t\t\t\tshort programCapacity = ((KProgram) programType)\n\t\t\t\t\t\t\t.getCapacity();\n\t\t\t\t\tservice = (programCapacity == Short.MAX_VALUE) ? Executors\n\t\t\t\t\t\t\t.newCachedThreadPool() : Executors\n\t\t\t\t\t\t\t.newFixedThreadPool(programCapacity);\n\t\t\t\t} else {\n\t\t\t\t\tservice = Executors\n\t\t\t\t\t\t\t.newCachedThreadPool();\n\t\t\t\t}\n\t\t\t\t\/\/ Launch the program with the initialized ExecutorService\n\t\t\t\tprocessHelper.execute(service).join();\n\t\t\t\tservice.shutdown();\n\t\t\t\tProgramFieldsBinder.getProgramOutputFields(this, context);\n\t\t\t} catch (IllegalAccessException e) {\n\t\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.FAILURE);\n\t\t\t} catch (NoSuchFieldException e) {\n\t\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.FAILURE);\n\t\t\t}\n\t\t} catch (InvocationTargetException e) {\n\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.FAILURE);\n\t\t}\n\t}\n\n\t\/**\n\t * Intercept Exception thrown in RunnableProcedure\/CallableProcedure for\n\t * tracing. If an Exception is thrown, the return code of a Launch becomes\n\t * FAILURE.\n\t * \n\t * @param self\n\t *\/\n\tpointcut enter(KCall _kCall): call(* org.parallelj.internal.kernel.callback.Entry+.enter(KCall)) && args(_kCall);\n\n\tpointcut invoke(): call(public Object Method.invoke(Object, ..)) && !within(ProgramJobsAdapter);\n\n\tafter(Object oo, KCall _kCall) throwing (InvocationTargetException ite) : \n    \tinvoke() && args(oo, ..) && cflow(enter(_kCall)) {\n\n\t\tLaunchingMessageKind.ELAUNCH0002.format(this.adpater, ite);\n\t\tif (this.context != null && this.context.getResult() != null\n\t\t\t\t&& this.context.getResult() instanceof JobDataMap) {\n\t\t\t((JobDataMap) this.context.getResult()).put(\n\t\t\t\t\tQuartzUtils.RETURN_CODE, ReturnCodes.FAILURE);\n\t\t}\n\t}\n}\n","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"3c3cd68fe0299c290b211b55b3e1fee6daae0d93","subject":"Account for null contents, i.e. when the sources are not attached","message":"Account for null contents, i.e. when the sources are not attached\n","repos":"scala-ide\/scala-ide,mlangc\/scala-ide,Duhemm\/scala-ide,mlangc\/scala-ide,romanowski\/scala-ide,scala-ide\/scala-ide,aleksi-lukkarinen\/scala-ide,andrey-ilinykh\/scala-ide,pilipolio\/scala-ide,Kwestor\/scala-ide,aleksi-lukkarinen\/scala-ide,sschaef\/scala-ide,andrey-ilinykh\/scala-ide,Kwestor\/scala-ide,Duhemm\/scala-ide,pilipolio\/scala-ide,pilipolio\/scala-ide,scala-ide\/scala-ide,romanowski\/scala-ide,dragos\/scala-ide,wpopielarski\/scala-ide,stephenh\/scala-ide,romanowski\/scala-ide,pilipolio\/scala-ide,wpopielarski\/scala-ide,dragos\/scala-ide,Kwestor\/scala-ide,dragos\/scala-ide,sschaef\/scala-ide,aleksi-lukkarinen\/scala-ide,mlangc\/scala-ide,sschaef\/scala-ide,andrey-ilinykh\/scala-ide,scala-ide\/scala-ide,wpopielarski\/scala-ide,mlangc\/scala-ide,aleksi-lukkarinen\/scala-ide,Kwestor\/scala-ide,stephenh\/scala-ide,wpopielarski\/scala-ide,dragos\/scala-ide,Duhemm\/scala-ide,stephenh\/scala-ide,andrey-ilinykh\/scala-ide,sschaef\/scala-ide,stephenh\/scala-ide,romanowski\/scala-ide,Duhemm\/scala-ide","old_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/cfprovider\/ClassFileProviderAspect.aj","new_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/cfprovider\/ClassFileProviderAspect.aj","new_contents":"\/*\n * Copyright 2005-2010 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.cfprovider;\n\nimport java.util.HashSet;\n\nimport org.eclipse.core.filebuffers.FileBuffers;\nimport org.eclipse.core.filebuffers.ITextFileBuffer;\nimport org.eclipse.core.filebuffers.ITextFileBufferManager;\nimport org.eclipse.core.filebuffers.LocationKind;\nimport org.eclipse.core.resources.IResource;\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.core.IBuffer;\nimport org.eclipse.jdt.core.IClassFile;\nimport org.eclipse.jdt.core.IImportDeclaration;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IOpenable;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.ITypeRoot;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.core.dom.CompilationUnit;\nimport org.eclipse.jdt.core.search.TypeNameMatch;\nimport org.eclipse.jdt.internal.compiler.CompilationResult;\nimport org.eclipse.jdt.internal.compiler.ast.ASTNode;\nimport org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.ImportReference;\nimport org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.TypeReference;\nimport org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;\nimport org.eclipse.jdt.internal.compiler.env.IBinaryType;\nimport org.eclipse.jdt.internal.compiler.env.ICompilationUnit;\nimport org.eclipse.jdt.internal.compiler.env.IGenericType;\nimport org.eclipse.jdt.internal.compiler.env.ISourceImport;\nimport org.eclipse.jdt.internal.compiler.env.ISourceType;\nimport org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer;\nimport org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding;\nimport org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding;\nimport org.eclipse.jdt.internal.compiler.parser.Parser;\nimport org.eclipse.jdt.internal.compiler.parser.SourceTypeConverter;\nimport org.eclipse.jdt.internal.core.BinaryType;\nimport org.eclipse.jdt.internal.core.ClassFile;\nimport org.eclipse.jdt.internal.core.CompilationUnitElementInfo;\nimport org.eclipse.jdt.internal.core.ImportDeclaration;\nimport org.eclipse.jdt.internal.core.JavaElement;\nimport org.eclipse.jdt.internal.core.BufferManager;\nimport org.eclipse.jdt.internal.core.NameLookup;\nimport org.eclipse.jdt.internal.core.Openable;\nimport org.eclipse.jdt.internal.core.PackageFragment;\nimport org.eclipse.jdt.internal.core.SearchableEnvironment;\nimport org.eclipse.jdt.internal.core.SourceMapper;\nimport org.eclipse.jdt.internal.core.SourceType;\nimport org.eclipse.jdt.internal.core.SourceTypeElementInfo;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyResolver;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyType;\nimport org.eclipse.jdt.internal.core.util.Util;\nimport org.eclipse.jdt.internal.corext.util.OpenTypeHistory;\nimport org.eclipse.jdt.internal.ui.filters.InnerClassFilesFilter;\nimport org.eclipse.jdt.ui.SharedASTProvider;\nimport org.eclipse.jface.viewers.Viewer;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaClassFile;\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaElement;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect ClassFileProviderAspect {\n\n  pointcut classFileCreations(PackageFragment parent, String name) : \n    call(protected ClassFile.new(PackageFragment, String)) &&\n    within(org.eclipse.jdt..*) &&\n    args(parent, name);\n  \n  pointcut getTypeName(ClassFile cf) :\n    execution(public String ClassFile.getTypeName()) &&\n    target(cf);\n\n  \/\/ For 3.6\n  pointcut mapSource(ClassFile cf, SourceMapper mapper, IBinaryType info, IClassFile owner) :\n    execution(IBuffer ClassFile.mapSource(SourceMapper, IBinaryType, IClassFile)) &&\n    target(cf) &&\n    target(IScalaClassFile) &&\n    args(mapper, info, owner);\n\n  \/\/ For 3.5\n  pointcut mapSource2(ClassFile cf, SourceMapper mapper, IBinaryType info) :\n    execution(IBuffer ClassFile.mapSource(SourceMapper, IBinaryType)) &&\n    target(cf) &&\n    target(IScalaClassFile) &&\n    args(mapper, info);\n\n  pointcut getSourceFileName(BinaryType bt) :\n    execution(String BinaryType.getSourceFileName(IBinaryType)) &&\n    target(bt);\n  \n  pointcut select(Viewer viewer, Object parentElement, Object element) :\n    execution(boolean InnerClassFilesFilter.select(Viewer, Object, Object)) &&\n    args(viewer, parentElement, element);\n  \n  pointcut getChildren(BinaryType bt) :\n    execution(IJavaElement[] BinaryType.getChildren()) &&\n    target(bt);\n  \n  pointcut getAST(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) : \n    execution(CompilationUnit SharedASTProvider.getAST(ITypeRoot, SharedASTProvider.WAIT_FLAG, IProgressMonitor)) &&\n    args(element, waitFlag, progressMonitor);\n  \n  pointcut resolve(HierarchyResolver hr, IGenericType suppliedType) :\n    execution(void HierarchyResolver.resolve(IGenericType)) &&\n    target(hr) &&\n    args(suppliedType);\n  \n  pointcut remember(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    execution(void HierarchyResolver.remember(IType, ReferenceBinding)) &&\n    target(hr) &&\n    args(type, typeBinding);\n  \n  pointcut acceptType(IType type, int acceptFlags, boolean isSourceType) :\n    execution(boolean NameLookup.acceptType(IType, int, boolean)) &&\n    args(type, acceptFlags, isSourceType);\n  \n  pointcut find(SearchableEnvironment se, String typeName, String packageName) :\n    execution(NameEnvironmentAnswer find(String, String)) &&\n    target(se) &&\n    args(typeName, packageName);\n  \n  pointcut convert(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) :\n    execution(CompilationUnitDeclaration SourceTypeConverter.convert(ISourceType[], CompilationResult)) &&\n    target(stc) &&\n    args(sourceTypes, compilationResult);\n  \n  pointcut getAncestor(JavaElement je, int ancestorType) :\n    execution(IJavaElement JavaElement.getAncestor(int)) &&\n    target(je) &&\n    args(ancestorType);\n  \n  pointcut isContainerDirty(TypeNameMatch match) :\n    execution(boolean OpenTypeHistory.isContainerDirty(TypeNameMatch)) &&\n    args(match);\n  \n  ClassFile around(PackageFragment parent, String name) : \n    classFileCreations(parent, name) {\n\n    ClassFile javaClassFile = proceed(parent, name);\n    byte[] bytes;\n    \n    try {\n      bytes = javaClassFile.getBytes();\n    } catch(Throwable t) {\n      return javaClassFile; \n    }\n    \n    for (IClassFileProvider provider : ClassFileProviderRegistry.getInstance().getProviders()) {\n      ClassFile cf = provider.create(bytes, parent, name);\n      if (cf != null)\n        return cf;\n    }\n    \n    return javaClassFile;\n  }\n  \n  IBuffer around(ClassFile cf, SourceMapper mapper, IBinaryType info, IClassFile owner) :\n    mapSource(cf, mapper, info, owner) {\n    return mapSourceSubst(cf, mapper, info);\n  }\n\n  IBuffer around(ClassFile cf, SourceMapper mapper, IBinaryType info) :\n    mapSource2(cf, mapper, info) {\n    return mapSourceSubst(cf, mapper, info);\n  }\n\n  IBuffer mapSourceSubst(ClassFile cf, SourceMapper mapper, IBinaryType info) {\n    char[] contents = mapper.findSource(cf.getType(), info);\n    IBuffer buffer;\n    if (contents != null) {\n      buffer = BufferManager.createBuffer(cf);\n      buffer.setContents(contents);\n    } else {\n      buffer = BufferManager.createNullBuffer(cf);\n    }\n    BufferManager bufManager = cf.getBufferManager();\n    bufManager.addBuffer(buffer);\n    buffer.addBufferChangedListener(cf);\n    return buffer;\n  }\n\n  String around(ClassFile cf) :\n    getTypeName(cf) {\n    if(cf instanceof IScalaClassFile) {\n      int lastDollar = cf.name.lastIndexOf('$');\n      return (lastDollar == -1 || lastDollar == cf.name.length()-1) ? cf.name : Util.localTypeName(cf.name, lastDollar, cf.name.length());\n    } else\n      return proceed(cf);\n  }\n  \n  boolean around(Viewer viewer, Object parentElement, Object element) :\n    select(viewer, parentElement, element) {\n    if (element instanceof IScalaClassFile) {\n      IClassFile classFile = (IClassFile) element;\n      String name = classFile.getElementName(); \n      int dollarIndex = name.indexOf('$');\n      return dollarIndex == -1 || dollarIndex == name.length()-7; \/\/ Trailing '$' implies object rather than inner class \n    }\n    return proceed(viewer, parentElement, element);\n  }\n  \n  IJavaElement[] around(BinaryType bt) throws JavaModelException :\n    getChildren(bt) && \n    target(BinaryType) {\n    ClassFile cf = (ClassFile)bt.parent;\n    if (cf instanceof IScalaClassFile)\n      return cf.getChildren();\n    else\n      return proceed(bt);\n  }\n  \n  CompilationUnit around(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) :\n    getAST(element, waitFlag, progressMonitor) {\n      if (element instanceof IScalaElement)\n        return null;\n      else\n        return proceed(element, waitFlag, progressMonitor);\n  }\n  \n  void around(HierarchyResolver hr, IGenericType suppliedType) :\n    resolve(hr, suppliedType) {\n    if (!suppliedType.isBinaryType()) {\n      IType tpe = ((SourceTypeElementInfo)suppliedType).getHandle();\n      IClassFile cf = tpe.getClassFile();\n      if (cf instanceof IScalaClassFile) {\n        hr.resolve(new Openable[]{(Openable)cf}, new HashSet(), null);\n        return;\n      }\n    }\n      \n    proceed(hr, suppliedType);\n  }\n  \n  void around(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    remember(hr, type, typeBinding) {\n    if (((IOpenable)type.getCompilationUnit()).isOpen()) {\n      try {\n        IGenericType genericType = (IGenericType)((JavaElement)type).getElementInfo();\n        hr.remember(genericType, typeBinding);\n      } catch (JavaModelException e) {\n        \/\/ cannot happen since element is open\n        return;\n      }\n    } else {\n      if (typeBinding == null) return;\n\n      TypeDeclaration typeDeclaration = ((SourceTypeBinding)typeBinding).scope.referenceType();\n\n      \/\/ simple super class name\n      char[] superclassName = null;\n      TypeReference superclass;\n      if ((typeDeclaration.bits & ASTNode.IsAnonymousType) != 0) {\n        superclass = typeDeclaration.allocation.type;\n      } else {\n        superclass = typeDeclaration.superclass;\n      }\n      if (superclass != null) {\n        char[][] typeName = superclass.getTypeName();\n        superclassName = typeName == null ? null : typeName[typeName.length-1];\n      }\n\n      \/\/ simple super interface names\n      char[][] superInterfaceNames = null;\n      TypeReference[] superInterfaces = typeDeclaration.superInterfaces;\n      if (superInterfaces != null) {\n        int length = superInterfaces.length;\n        superInterfaceNames = new char[length][];\n        for (int i = 0; i < length; i++) {\n          TypeReference superInterface = superInterfaces[i];\n          char[][] typeName = superInterface.getTypeName();\n          superInterfaceNames[i] = typeName[typeName.length-1];\n        }\n      }\n\n      HierarchyType hierarchyType = new HierarchyType(\n        type,\n        typeDeclaration.name,\n        typeDeclaration.binding.modifiers,\n        superclassName,\n        superInterfaceNames);\n      hr.remember(hierarchyType, typeDeclaration.binding);\n    }\n  }\n  \n  String around(BinaryType bt) :\n    getSourceFileName(bt) {\n    IJavaElement parent = bt.getTypeRoot(); \n    if (parent instanceof IScalaClassFile) {\n      return ((IScalaClassFile)parent).getSourceFileName();\n    }\n    else\n      return proceed(bt);\n  }\n  \n  boolean around(IType type, int acceptFlags, boolean isSourceType) :\n    acceptType(type, acceptFlags, isSourceType) {\n    if (!isSourceType && (type instanceof SourceType)) {\n      IJavaElement parent = type.getParent(); \n      if (parent instanceof IScalaClassFile)\n        return proceed(type, acceptFlags, true);\n    }\n    \n    return proceed(type, acceptFlags, isSourceType);\n  }\n  \n  CompilationUnitDeclaration around(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) throws JavaModelException :\n    convert(stc, sourceTypes, compilationResult) {\n    stc.unit = new CompilationUnitDeclaration(stc.problemReporter, compilationResult, 0);\n    \/\/ not filled at this point\n\n    if (sourceTypes.length == 0) return stc.unit;\n    SourceTypeElementInfo topLevelTypeInfo = (SourceTypeElementInfo) sourceTypes[0];\n    org.eclipse.jdt.core.ICompilationUnit cuHandle = topLevelTypeInfo.getHandle().getCompilationUnit();\n    stc.cu = (ICompilationUnit) cuHandle;\n\n    CompilationUnitElementInfo cuei = null;\n    Object info = ((JavaElement)stc.cu).getElementInfo();\n    if (info instanceof CompilationUnitElementInfo)\n      cuei = (CompilationUnitElementInfo)info;\n    \n    \n    if (stc.has1_5Compliance && cuei != null && cuei.annotationNumber > 10) { \/\/ experimental value\n      \/\/ if more than 10 annotations, diet parse as this is faster\n      return new Parser(stc.problemReporter, true).dietParse(stc.cu, compilationResult);\n    }\n\n    \/* only positions available *\/\n    int start = topLevelTypeInfo.getNameSourceStart();\n    int end = topLevelTypeInfo.getNameSourceEnd();\n\n    \/* convert package and imports *\/\n    String[] packageName = ((PackageFragment) cuHandle.getParent()).names;\n    if (packageName.length > 0)\n      \/\/ if its null then it is defined in the default package\n      stc.unit.currentPackage =\n        stc.createImportReference(packageName, start, end, false, ClassFileConstants.AccDefault);\n    IImportDeclaration[] importDeclarations = topLevelTypeInfo.getHandle().getCompilationUnit().getImports();\n    int importCount = importDeclarations.length;\n    stc.unit.imports = new ImportReference[importCount];\n    for (int i = 0; i < importCount; i++) {\n      ImportDeclaration importDeclaration = (ImportDeclaration) importDeclarations[i];\n      ISourceImport sourceImport = (ISourceImport) importDeclaration.getElementInfo();\n      String nameWithoutStar = importDeclaration.getNameWithoutStar();\n      stc.unit.imports[i] = stc.createImportReference(\n        Util.splitOn('.', nameWithoutStar, 0, nameWithoutStar.length()),\n        sourceImport.getDeclarationSourceStart(),\n        sourceImport.getDeclarationSourceEnd(),\n        importDeclaration.isOnDemand(),\n        sourceImport.getModifiers());\n    }\n    \/* convert type(s) *\/\n    try {\n      int typeCount = sourceTypes.length;\n      final TypeDeclaration[] types = new TypeDeclaration[typeCount];\n      \/*\n       * We used a temporary types collection to prevent this.unit.types from being null during a call to\n       * convert(...) when the source is syntactically incorrect and the parser is flushing the unit's types.\n       * See https:\/\/bugs.eclipse.org\/bugs\/show_bug.cgi?id=97466\n       *\/\n      for (int i = 0; i < typeCount; i++) {\n        SourceTypeElementInfo typeInfo = (SourceTypeElementInfo) sourceTypes[i];\n        types[i] = stc.convert((SourceType) typeInfo.getHandle(), compilationResult);\n      }\n      stc.unit.types = types;\n      return stc.unit;\n    } catch (SourceTypeConverter.AnonymousMemberFound e) {\n      return new Parser(stc.problemReporter, true).parse(stc.cu, compilationResult);\n    }\n  }\n  \n  IJavaElement around(JavaElement je, int ancestorType) :\n    getAncestor(je, ancestorType) {\n    IJavaElement element = je;\n    while (element != null) {\n      if (element.getElementType() == ancestorType)\n        return element;\n      else if (element instanceof IScalaClassFile && ancestorType == IJavaElement.COMPILATION_UNIT)\n        return ((JavaElement)element).getCompilationUnit();\n      element= element.getParent();\n    }\n    return null;\n  }\n\n  boolean around(TypeNameMatch match) :\n    isContainerDirty(match) {\n    org.eclipse.jdt.core.ICompilationUnit cu = match.getType().getCompilationUnit();\n    if (cu == null) {\n      return false;\n    }\n    IResource resource= cu.getResource();\n    if (resource == null)\n      return false;\n    \n    ITextFileBufferManager manager= FileBuffers.getTextFileBufferManager();\n    ITextFileBuffer textFileBuffer= manager.getTextFileBuffer(resource.getFullPath(), LocationKind.IFILE);\n    if (textFileBuffer != null) {\n      return textFileBuffer.isDirty();\n    }\n    return false;\n  }\n}\n","old_contents":"\/*\n * Copyright 2005-2010 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.cfprovider;\n\nimport java.util.HashSet;\n\nimport org.eclipse.core.filebuffers.FileBuffers;\nimport org.eclipse.core.filebuffers.ITextFileBuffer;\nimport org.eclipse.core.filebuffers.ITextFileBufferManager;\nimport org.eclipse.core.filebuffers.LocationKind;\nimport org.eclipse.core.resources.IResource;\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.core.IBuffer;\nimport org.eclipse.jdt.core.IClassFile;\nimport org.eclipse.jdt.core.IImportDeclaration;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IOpenable;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.ITypeRoot;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.core.dom.CompilationUnit;\nimport org.eclipse.jdt.core.search.TypeNameMatch;\nimport org.eclipse.jdt.internal.compiler.CompilationResult;\nimport org.eclipse.jdt.internal.compiler.ast.ASTNode;\nimport org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.ImportReference;\nimport org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.TypeReference;\nimport org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;\nimport org.eclipse.jdt.internal.compiler.env.IBinaryType;\nimport org.eclipse.jdt.internal.compiler.env.ICompilationUnit;\nimport org.eclipse.jdt.internal.compiler.env.IGenericType;\nimport org.eclipse.jdt.internal.compiler.env.ISourceImport;\nimport org.eclipse.jdt.internal.compiler.env.ISourceType;\nimport org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer;\nimport org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding;\nimport org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding;\nimport org.eclipse.jdt.internal.compiler.parser.Parser;\nimport org.eclipse.jdt.internal.compiler.parser.SourceTypeConverter;\nimport org.eclipse.jdt.internal.core.BinaryType;\nimport org.eclipse.jdt.internal.core.ClassFile;\nimport org.eclipse.jdt.internal.core.CompilationUnitElementInfo;\nimport org.eclipse.jdt.internal.core.ImportDeclaration;\nimport org.eclipse.jdt.internal.core.JavaElement;\nimport org.eclipse.jdt.internal.core.BufferManager;\nimport org.eclipse.jdt.internal.core.NameLookup;\nimport org.eclipse.jdt.internal.core.Openable;\nimport org.eclipse.jdt.internal.core.PackageFragment;\nimport org.eclipse.jdt.internal.core.SearchableEnvironment;\nimport org.eclipse.jdt.internal.core.SourceMapper;\nimport org.eclipse.jdt.internal.core.SourceType;\nimport org.eclipse.jdt.internal.core.SourceTypeElementInfo;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyResolver;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyType;\nimport org.eclipse.jdt.internal.core.util.Util;\nimport org.eclipse.jdt.internal.corext.util.OpenTypeHistory;\nimport org.eclipse.jdt.internal.ui.filters.InnerClassFilesFilter;\nimport org.eclipse.jdt.ui.SharedASTProvider;\nimport org.eclipse.jface.viewers.Viewer;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaClassFile;\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaElement;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect ClassFileProviderAspect {\n\n  pointcut classFileCreations(PackageFragment parent, String name) : \n    call(protected ClassFile.new(PackageFragment, String)) &&\n    within(org.eclipse.jdt..*) &&\n    args(parent, name);\n  \n  pointcut getTypeName(ClassFile cf) :\n    execution(public String ClassFile.getTypeName()) &&\n    target(cf);\n\n  \/\/ For 3.6\n  pointcut mapSource(ClassFile cf, SourceMapper mapper, IBinaryType info, IClassFile owner) :\n    execution(IBuffer ClassFile.mapSource(SourceMapper, IBinaryType, IClassFile)) &&\n    target(cf) &&\n    target(IScalaClassFile) &&\n    args(mapper, info, owner);\n\n  \/\/ For 3.5\n  pointcut mapSource2(ClassFile cf, SourceMapper mapper, IBinaryType info) :\n    execution(IBuffer ClassFile.mapSource(SourceMapper, IBinaryType)) &&\n    target(cf) &&\n    target(IScalaClassFile) &&\n    args(mapper, info);\n\n  pointcut getSourceFileName(BinaryType bt) :\n    execution(String BinaryType.getSourceFileName(IBinaryType)) &&\n    target(bt);\n  \n  pointcut select(Viewer viewer, Object parentElement, Object element) :\n    execution(boolean InnerClassFilesFilter.select(Viewer, Object, Object)) &&\n    args(viewer, parentElement, element);\n  \n  pointcut getChildren(BinaryType bt) :\n    execution(IJavaElement[] BinaryType.getChildren()) &&\n    target(bt);\n  \n  pointcut getAST(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) : \n    execution(CompilationUnit SharedASTProvider.getAST(ITypeRoot, SharedASTProvider.WAIT_FLAG, IProgressMonitor)) &&\n    args(element, waitFlag, progressMonitor);\n  \n  pointcut resolve(HierarchyResolver hr, IGenericType suppliedType) :\n    execution(void HierarchyResolver.resolve(IGenericType)) &&\n    target(hr) &&\n    args(suppliedType);\n  \n  pointcut remember(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    execution(void HierarchyResolver.remember(IType, ReferenceBinding)) &&\n    target(hr) &&\n    args(type, typeBinding);\n  \n  pointcut acceptType(IType type, int acceptFlags, boolean isSourceType) :\n    execution(boolean NameLookup.acceptType(IType, int, boolean)) &&\n    args(type, acceptFlags, isSourceType);\n  \n  pointcut find(SearchableEnvironment se, String typeName, String packageName) :\n    execution(NameEnvironmentAnswer find(String, String)) &&\n    target(se) &&\n    args(typeName, packageName);\n  \n  pointcut convert(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) :\n    execution(CompilationUnitDeclaration SourceTypeConverter.convert(ISourceType[], CompilationResult)) &&\n    target(stc) &&\n    args(sourceTypes, compilationResult);\n  \n  pointcut getAncestor(JavaElement je, int ancestorType) :\n    execution(IJavaElement JavaElement.getAncestor(int)) &&\n    target(je) &&\n    args(ancestorType);\n  \n  pointcut isContainerDirty(TypeNameMatch match) :\n    execution(boolean OpenTypeHistory.isContainerDirty(TypeNameMatch)) &&\n    args(match);\n  \n  ClassFile around(PackageFragment parent, String name) : \n    classFileCreations(parent, name) {\n\n    ClassFile javaClassFile = proceed(parent, name);\n    byte[] bytes;\n    \n    try {\n      bytes = javaClassFile.getBytes();\n    } catch(Throwable t) {\n      return javaClassFile; \n    }\n    \n    for (IClassFileProvider provider : ClassFileProviderRegistry.getInstance().getProviders()) {\n      ClassFile cf = provider.create(bytes, parent, name);\n      if (cf != null)\n        return cf;\n    }\n    \n    return javaClassFile;\n  }\n  \n  IBuffer around(ClassFile cf, SourceMapper mapper, IBinaryType info, IClassFile owner) :\n    mapSource(cf, mapper, info, owner) {\n    return mapSourceSubst(cf, mapper, info);\n  }\n\n  IBuffer around(ClassFile cf, SourceMapper mapper, IBinaryType info) :\n    mapSource2(cf, mapper, info) {\n    return mapSourceSubst(cf, mapper, info);\n  }\n\n  IBuffer mapSourceSubst(ClassFile cf, SourceMapper mapper, IBinaryType info) {\n    char[] contents = mapper.findSource(cf.getType(), info);\n    assert(contents != null);\n    IBuffer buffer = BufferManager.createBuffer(cf);\n    BufferManager bufManager = cf.getBufferManager();\n    bufManager.addBuffer(buffer);\n    buffer.setContents(contents);\n    buffer.addBufferChangedListener(cf);\n    return buffer;\n  }\n\n  String around(ClassFile cf) :\n    getTypeName(cf) {\n    if(cf instanceof IScalaClassFile) {\n      int lastDollar = cf.name.lastIndexOf('$');\n      return (lastDollar == -1 || lastDollar == cf.name.length()-1) ? cf.name : Util.localTypeName(cf.name, lastDollar, cf.name.length());\n    } else\n      return proceed(cf);\n  }\n  \n  boolean around(Viewer viewer, Object parentElement, Object element) :\n    select(viewer, parentElement, element) {\n    if (element instanceof IScalaClassFile) {\n      IClassFile classFile = (IClassFile) element;\n      String name = classFile.getElementName(); \n      int dollarIndex = name.indexOf('$');\n      return dollarIndex == -1 || dollarIndex == name.length()-7; \/\/ Trailing '$' implies object rather than inner class \n    }\n    return proceed(viewer, parentElement, element);\n  }\n  \n  IJavaElement[] around(BinaryType bt) throws JavaModelException :\n    getChildren(bt) && \n    target(BinaryType) {\n    ClassFile cf = (ClassFile)bt.parent;\n    if (cf instanceof IScalaClassFile)\n      return cf.getChildren();\n    else\n      return proceed(bt);\n  }\n  \n  CompilationUnit around(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) :\n    getAST(element, waitFlag, progressMonitor) {\n      if (element instanceof IScalaElement)\n        return null;\n      else\n        return proceed(element, waitFlag, progressMonitor);\n  }\n  \n  void around(HierarchyResolver hr, IGenericType suppliedType) :\n    resolve(hr, suppliedType) {\n    if (!suppliedType.isBinaryType()) {\n      IType tpe = ((SourceTypeElementInfo)suppliedType).getHandle();\n      IClassFile cf = tpe.getClassFile();\n      if (cf instanceof IScalaClassFile) {\n        hr.resolve(new Openable[]{(Openable)cf}, new HashSet(), null);\n        return;\n      }\n    }\n      \n    proceed(hr, suppliedType);\n  }\n  \n  void around(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    remember(hr, type, typeBinding) {\n    if (((IOpenable)type.getCompilationUnit()).isOpen()) {\n      try {\n        IGenericType genericType = (IGenericType)((JavaElement)type).getElementInfo();\n        hr.remember(genericType, typeBinding);\n      } catch (JavaModelException e) {\n        \/\/ cannot happen since element is open\n        return;\n      }\n    } else {\n      if (typeBinding == null) return;\n\n      TypeDeclaration typeDeclaration = ((SourceTypeBinding)typeBinding).scope.referenceType();\n\n      \/\/ simple super class name\n      char[] superclassName = null;\n      TypeReference superclass;\n      if ((typeDeclaration.bits & ASTNode.IsAnonymousType) != 0) {\n        superclass = typeDeclaration.allocation.type;\n      } else {\n        superclass = typeDeclaration.superclass;\n      }\n      if (superclass != null) {\n        char[][] typeName = superclass.getTypeName();\n        superclassName = typeName == null ? null : typeName[typeName.length-1];\n      }\n\n      \/\/ simple super interface names\n      char[][] superInterfaceNames = null;\n      TypeReference[] superInterfaces = typeDeclaration.superInterfaces;\n      if (superInterfaces != null) {\n        int length = superInterfaces.length;\n        superInterfaceNames = new char[length][];\n        for (int i = 0; i < length; i++) {\n          TypeReference superInterface = superInterfaces[i];\n          char[][] typeName = superInterface.getTypeName();\n          superInterfaceNames[i] = typeName[typeName.length-1];\n        }\n      }\n\n      HierarchyType hierarchyType = new HierarchyType(\n        type,\n        typeDeclaration.name,\n        typeDeclaration.binding.modifiers,\n        superclassName,\n        superInterfaceNames);\n      hr.remember(hierarchyType, typeDeclaration.binding);\n    }\n  }\n  \n  String around(BinaryType bt) :\n    getSourceFileName(bt) {\n    IJavaElement parent = bt.getTypeRoot(); \n    if (parent instanceof IScalaClassFile) {\n      return ((IScalaClassFile)parent).getSourceFileName();\n    }\n    else\n      return proceed(bt);\n  }\n  \n  boolean around(IType type, int acceptFlags, boolean isSourceType) :\n    acceptType(type, acceptFlags, isSourceType) {\n    if (!isSourceType && (type instanceof SourceType)) {\n      IJavaElement parent = type.getParent(); \n      if (parent instanceof IScalaClassFile)\n        return proceed(type, acceptFlags, true);\n    }\n    \n    return proceed(type, acceptFlags, isSourceType);\n  }\n  \n  CompilationUnitDeclaration around(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) throws JavaModelException :\n    convert(stc, sourceTypes, compilationResult) {\n    stc.unit = new CompilationUnitDeclaration(stc.problemReporter, compilationResult, 0);\n    \/\/ not filled at this point\n\n    if (sourceTypes.length == 0) return stc.unit;\n    SourceTypeElementInfo topLevelTypeInfo = (SourceTypeElementInfo) sourceTypes[0];\n    org.eclipse.jdt.core.ICompilationUnit cuHandle = topLevelTypeInfo.getHandle().getCompilationUnit();\n    stc.cu = (ICompilationUnit) cuHandle;\n\n    CompilationUnitElementInfo cuei = null;\n    Object info = ((JavaElement)stc.cu).getElementInfo();\n    if (info instanceof CompilationUnitElementInfo)\n      cuei = (CompilationUnitElementInfo)info;\n    \n    \n    if (stc.has1_5Compliance && cuei != null && cuei.annotationNumber > 10) { \/\/ experimental value\n      \/\/ if more than 10 annotations, diet parse as this is faster\n      return new Parser(stc.problemReporter, true).dietParse(stc.cu, compilationResult);\n    }\n\n    \/* only positions available *\/\n    int start = topLevelTypeInfo.getNameSourceStart();\n    int end = topLevelTypeInfo.getNameSourceEnd();\n\n    \/* convert package and imports *\/\n    String[] packageName = ((PackageFragment) cuHandle.getParent()).names;\n    if (packageName.length > 0)\n      \/\/ if its null then it is defined in the default package\n      stc.unit.currentPackage =\n        stc.createImportReference(packageName, start, end, false, ClassFileConstants.AccDefault);\n    IImportDeclaration[] importDeclarations = topLevelTypeInfo.getHandle().getCompilationUnit().getImports();\n    int importCount = importDeclarations.length;\n    stc.unit.imports = new ImportReference[importCount];\n    for (int i = 0; i < importCount; i++) {\n      ImportDeclaration importDeclaration = (ImportDeclaration) importDeclarations[i];\n      ISourceImport sourceImport = (ISourceImport) importDeclaration.getElementInfo();\n      String nameWithoutStar = importDeclaration.getNameWithoutStar();\n      stc.unit.imports[i] = stc.createImportReference(\n        Util.splitOn('.', nameWithoutStar, 0, nameWithoutStar.length()),\n        sourceImport.getDeclarationSourceStart(),\n        sourceImport.getDeclarationSourceEnd(),\n        importDeclaration.isOnDemand(),\n        sourceImport.getModifiers());\n    }\n    \/* convert type(s) *\/\n    try {\n      int typeCount = sourceTypes.length;\n      final TypeDeclaration[] types = new TypeDeclaration[typeCount];\n      \/*\n       * We used a temporary types collection to prevent this.unit.types from being null during a call to\n       * convert(...) when the source is syntactically incorrect and the parser is flushing the unit's types.\n       * See https:\/\/bugs.eclipse.org\/bugs\/show_bug.cgi?id=97466\n       *\/\n      for (int i = 0; i < typeCount; i++) {\n        SourceTypeElementInfo typeInfo = (SourceTypeElementInfo) sourceTypes[i];\n        types[i] = stc.convert((SourceType) typeInfo.getHandle(), compilationResult);\n      }\n      stc.unit.types = types;\n      return stc.unit;\n    } catch (SourceTypeConverter.AnonymousMemberFound e) {\n      return new Parser(stc.problemReporter, true).parse(stc.cu, compilationResult);\n    }\n  }\n  \n  IJavaElement around(JavaElement je, int ancestorType) :\n    getAncestor(je, ancestorType) {\n    IJavaElement element = je;\n    while (element != null) {\n      if (element.getElementType() == ancestorType)\n        return element;\n      else if (element instanceof IScalaClassFile && ancestorType == IJavaElement.COMPILATION_UNIT)\n        return ((JavaElement)element).getCompilationUnit();\n      element= element.getParent();\n    }\n    return null;\n  }\n\n  boolean around(TypeNameMatch match) :\n    isContainerDirty(match) {\n    org.eclipse.jdt.core.ICompilationUnit cu = match.getType().getCompilationUnit();\n    if (cu == null) {\n      return false;\n    }\n    IResource resource= cu.getResource();\n    if (resource == null)\n      return false;\n    \n    ITextFileBufferManager manager= FileBuffers.getTextFileBufferManager();\n    ITextFileBuffer textFileBuffer= manager.getTextFileBuffer(resource.getFullPath(), LocationKind.IFILE);\n    if (textFileBuffer != null) {\n      return textFileBuffer.isDirty();\n    }\n    return false;\n  }\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"3f695e329a5f217c05ecbcd7c90c5ba91c283a49","subject":"*around pointcuts added for lock and unlock","message":"*around pointcuts added for lock and unlock\n","repos":"selig\/qea","old_file":"code\/qea\/src\/benchmark\/competition\/java\/jUnitRV_MMT\/monitoring\/JUnitRV_MMTThreeAspect.aj","new_file":"code\/qea\/src\/benchmark\/competition\/java\/jUnitRV_MMT\/monitoring\/JUnitRV_MMTThreeAspect.aj","new_contents":"package benchmark.competition.java.jUnitRV_MMT.monitoring;\r\n\r\nimport java.util.concurrent.locks.Lock;\r\n\r\nimport monitoring.impl.MonitorFactory;\r\nimport monitoring.intf.Monitor;\r\nimport properties.Property;\r\nimport properties.competition.JavaRV_mmt;\r\nimport structure.impl.other.Verdict;\r\nimport structure.intf.QEA;\r\nimport benchmark.competition.java.jUnitRV_MMT.ExampleLocking;\r\n\r\npublic aspect JUnitRV_MMTThreeAspect {\r\n\r\n\tprivate final Monitor monitor;\r\n\r\n\tprivate final int RUN = 1;\r\n\tprivate final int LOCK_TRUE = 2;\r\n\tprivate final int UNLOCK = 3;\r\n\tprivate final int ACTION = 4;\r\n\r\n\tpublic JUnitRV_MMTThreeAspect() {\r\n\t\tQEA qea = new JavaRV_mmt().make(Property.JAVARV_MMT_THREE);\r\n\t\tmonitor = MonitorFactory.create(qea);\r\n\t}\r\n\r\n\tpointcut run(ExampleLocking thread) : execution(void ExampleLocking.run())\r\n\t\t&& target(thread);\r\n\r\n\tpointcut action(ExampleLocking thread) : call(void ExampleLocking.action())\r\n\t\t&& target(thread);\r\n\r\n\tbefore(ExampleLocking thread) : run(thread) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(RUN, thread);\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [thread=\"\r\n\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n\tboolean around(Lock lockObj, ExampleLocking thread) :\r\n\t\t\tcall(boolean Lock.tryLock())\r\n\t\t\t&& cflow(call(boolean ExampleLocking.lock())) && target(lockObj)\r\n\t\t\t&& this(thread) {\r\n\r\n\t\tboolean result = false;\r\n\t\tsynchronized (lockObj) {\r\n\t\t\tresult = proceed(lockObj, thread); \/\/ TODO Not sure if this is right\r\n\t\t}\r\n\t\tif (result) {\r\n\t\t\tVerdict verdict = null;\r\n\t\t\tsynchronized (monitor) {\r\n\t\t\t\tverdict = monitor.step(LOCK_TRUE, thread);\r\n\t\t\t}\r\n\t\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\t\tSystem.err\r\n\t\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [thread=\"\r\n\t\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t\t}\r\n\r\n\t\t}\r\n\t\treturn result;\r\n\t};\r\n\r\n\tvoid around(Lock lockObj, ExampleLocking thread) :\r\n\t\tcall(void Lock.unlock()) && cflow(call(void ExampleLocking.unlock()))\r\n\t\t&& target(lockObj) && this(thread) {\r\n\r\n\t\tsynchronized (lockObj) {\r\n\t\t\tproceed(lockObj, thread); \/\/ TODO Not sure if this is right\r\n\t\t}\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(LOCK_TRUE, thread);\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [thread=\"\r\n\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n\tbefore(ExampleLocking thread) : action(thread) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(ACTION, thread);\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [id=\"\r\n\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n}\r\n","old_contents":"package benchmark.competition.java.jUnitRV_MMT.monitoring;\r\n\r\nimport monitoring.impl.MonitorFactory;\r\nimport monitoring.intf.Monitor;\r\nimport properties.Property;\r\nimport properties.competition.JavaRV_mmt;\r\nimport structure.impl.other.Verdict;\r\nimport structure.intf.QEA;\r\nimport benchmark.competition.java.jUnitRV_MMT.ExampleLocking;\r\n\r\npublic aspect JUnitRV_MMTThreeAspect {\r\n\r\n\tprivate final Monitor monitor;\r\n\r\n\tprivate final int RUN = 1;\r\n\tprivate final int LOCK_TRUE = 2;\r\n\tprivate final int UNLOCK = 3;\r\n\tprivate final int ACTION = 4;\r\n\r\n\tpublic JUnitRV_MMTThreeAspect() {\r\n\t\tQEA qea = new JavaRV_mmt().make(Property.JAVARV_MMT_THREE);\r\n\t\tmonitor = MonitorFactory.create(qea);\r\n\t}\r\n\r\n\tpointcut run(ExampleLocking t) : execution(void ExampleLocking.run())\r\n\t\t&& target(t);\r\n\r\n\tpointcut lockEvent(ExampleLocking t) : call(boolean ExampleLocking.lock())\r\n\t\t&& target(t);\r\n\r\n\tpointcut unlockEvent(ExampleLocking t) :\r\n\t\tcall(void ExampleLocking.unlock()) && target(t);\r\n\r\n\tpointcut action(ExampleLocking t) : call(void ExampleLocking.action())\r\n\t\t&& target(t);\r\n\r\n\tbefore(ExampleLocking t) : run(t) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(RUN, t.getId());\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [id=\"\r\n\t\t\t\t\t\t\t+ t.getId()\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n\tafter(ExampleLocking t) returning(boolean result) : lockEvent(t) {\r\n\t\tif (result) {\r\n\t\t\tVerdict verdict = null;\r\n\t\t\tsynchronized (monitor) {\r\n\t\t\t\tverdict = monitor.step(LOCK_TRUE, t.getId());\r\n\t\t\t}\r\n\t\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\t\tSystem.err\r\n\t\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [id=\"\r\n\t\t\t\t\t\t\t\t+ t.getId()\r\n\t\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t\t}\r\n\t\t}\r\n\t};\r\n\r\n\tbefore(ExampleLocking t) : unlockEvent(t) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(UNLOCK, t.getId());\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [id=\"\r\n\t\t\t\t\t\t\t+ t.getId()\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n\tbefore(ExampleLocking t) : action(t) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(ACTION, t.getId());\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [id=\"\r\n\t\t\t\t\t\t\t+ t.getId()\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n}\r\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"9cb9dfdddedcfdfc59ab7729f69c58d3e6a1e221","subject":"Update Tracer.aj","message":"Update Tracer.aj","repos":"rimpybharot\/AOP_windows","old_file":"src\/Tracer.aj","new_file":"src\/Tracer.aj","new_contents":"\nimport java.lang.reflect.Method;\n\n\nimport java.lang.reflect.Parameter;\nimport java.util.ArrayList;\nimport java.lang.String;\n\nimport org.aspectj.lang.reflect.MethodSignature;\n\n\npublic aspect Tracer {\n\tstatic boolean running;\n\tpublic static String sequence = \"\";\n\n\tArrayList<String> caller = new ArrayList<String>();\n\tint count = 0;\n\tString counter = \"\";\n\n\n\t\tpointcut traceMethods()               \n\t\t: \t(execution(* *.*(..)))\n\t\t&& if(running)\n\t\t;\n\n\n\tbefore(): traceMethods(){\n\t\tcaller.add(0, \"Actor\");\n\t\t\n\n\t\tif(\n\t\t\t\t(thisJoinPoint.getThis()!=null)\n\t\t\t\t&& \n\t\t\t\t(thisJoinPointStaticPart.getKind()==\"method-execution\")\n\t\t\t\t&& (thisJoinPoint.getTarget()!=null)\n\n\t\t\t\t){\n\n\n\t\t\tString method = thisJoinPointStaticPart.getSignature().toString();\n\t\t\tMethodSignature signature = (MethodSignature) thisJoinPoint.getSignature();\n\t\t\tMethod method1 = signature.getMethod();\n\n\n\t\t\tboolean first = true;\n\t\t\tString paramTypes = new String();\n\n\t\t\tfor(Parameter p : method1.getParameters()){\n\n\t\t\t\tif(!first){\n\t\t\t\t\tparamTypes += \",\" + p.getType().getSimpleName();\n\t\t\t\t}\n\t\t\t\telse{\n\t\t\t\t\tparamTypes += p.getType().getSimpleName();\n\t\t\t\t\tfirst = false;\n\t\t\t\t}\n\t\t\t}\n\n\t\t\tString returnString = \"\";\n\n\n\t\t\tif((method1.getReturnType() != null)\n\t\t\t\t\t&&\n\t\t\t\t\t(method1.getReturnType()!=void.class)){\n\t\t\t\treturnString = thisJoinPoint.getTarget().getClass().getSimpleName()\n\t\t\t\t\t\t+ \"-->\"\n\t\t\t\t\t\t+ caller.get(caller.size()-1);\n\t\t\t}\n\n\t\t\tif(!returnString.contains(\"-->\")){\n\t\t\t\treturnString= \"\";\n\n\t\t\t}\n\n\t\t\tString returnType = method.subSequence(0, method.indexOf(\" \")).toString();\n\t\t\tcount++;\n\t\t\tsequence += \"\\n\"+caller.get(caller.size()-1)\n\t\t\t+ \" ->\"\n\t\t\t+ thisJoinPoint.getTarget().getClass().getSimpleName()\n\t\t\t+ \":\"\n\t\t\t+ count+\".  \"\n\t\t\t+ thisJoinPointStaticPart.getSignature().getName()\n\t\t\t+ \"(\"+paramTypes+\"):\"\n\t\t\t+ returnType\n\t\t\t+ \"\\nactivate \" + thisJoinPoint.getTarget().getClass().getSimpleName()\n\t\t\t+\"\\n\" + returnString\n\t\t\t;\n\t\t\t\n\t\t\tcaller.add(caller.size(), thisJoinPoint.getTarget().getClass().getSimpleName() );\n\t\t}\n\t}\n\n\n\tafter(): traceMethods(){\n\t\tif(\n\t\t\t\t(thisJoinPoint.getThis()!=null)\n\t\t\t\t&& \n\t\t\t\t(thisJoinPointStaticPart.getKind()==\"method-execution\")\n\t\t\t\t&& (thisJoinPoint.getTarget()!=null)\n\t\t\t\t){\t\tsequence += \"\\ndeactivate \" + caller.get(caller.size()-1) + \"\\n\";\n\n\n\t\t\t\tcaller.remove(caller.size()-1);\n\t\t}\n\t}\n\n\tpublic static String getSequence() {\n\n\t\treturn sequence;\n\t}\n}\n","old_contents":"\nimport java.lang.reflect.Method;\n\n\nimport java.lang.reflect.Parameter;\nimport java.util.ArrayList;\nimport java.lang.String;\n\nimport org.aspectj.lang.reflect.MethodSignature;\n\n\npublic aspect Tracer {\n\tstatic boolean running;\n\tpublic static String sequence = \"\";\n\n\tArrayList<String> caller = new ArrayList<String>();\n\tint count = 0;\n\tString counter = \"\";\n\n\n\t\tpointcut traceMethods()               \n\t\t: \t(execution(* *.*(..)))\n\t\t&& if(running)\n\t\t;\n\n\n\tbefore(): traceMethods(){\n\t\tcaller.add(0, \"InitialActor\");\n\t\t\n\n\t\tif(\n\t\t\t\t(thisJoinPoint.getThis()!=null)\n\t\t\t\t&& \n\t\t\t\t(thisJoinPointStaticPart.getKind()==\"method-execution\")\n\t\t\t\t&& (thisJoinPoint.getTarget()!=null)\n\n\t\t\t\t){\n\n\n\t\t\tString method = thisJoinPointStaticPart.getSignature().toString();\n\t\t\tMethodSignature signature = (MethodSignature) thisJoinPoint.getSignature();\n\t\t\tMethod method1 = signature.getMethod();\n\n\n\t\t\tboolean first = true;\n\t\t\tString paramTypes = new String();\n\n\t\t\tfor(Parameter p : method1.getParameters()){\n\n\t\t\t\tif(!first){\n\t\t\t\t\tparamTypes += \",\" + p.getType().getSimpleName();\n\t\t\t\t}\n\t\t\t\telse{\n\t\t\t\t\tparamTypes += p.getType().getSimpleName();\n\t\t\t\t\tfirst = false;\n\t\t\t\t}\n\t\t\t}\n\n\t\t\tString returnString = \"\";\n\n\n\t\t\tif((method1.getReturnType() != null)\n\t\t\t\t\t&&\n\t\t\t\t\t(method1.getReturnType()!=void.class)){\n\t\t\t\treturnString = thisJoinPoint.getTarget().getClass().getSimpleName()\n\t\t\t\t\t\t+ \"-->\"\n\t\t\t\t\t\t+ caller.get(caller.size()-1);\n\t\t\t}\n\n\t\t\tif(!returnString.contains(\"-->\")){\n\t\t\t\treturnString= \"\";\n\n\t\t\t}\n\n\t\t\tString returnType = method.subSequence(0, method.indexOf(\" \")).toString();\n\t\t\tcount++;\n\t\t\tsequence += \"\\n\"+caller.get(caller.size()-1)\n\t\t\t+ \" ->\"\n\t\t\t+ thisJoinPoint.getTarget().getClass().getSimpleName()\n\t\t\t+ \":\"\n\t\t\t+ count+\".  \"\n\t\t\t+ thisJoinPointStaticPart.getSignature().getName()\n\t\t\t+ \"(\"+paramTypes+\"):\"\n\t\t\t+ returnType\n\t\t\t+\"\\n\" + returnString\n\t\t\t+ \"\\nactivate \" + thisJoinPoint.getTarget().getClass().getSimpleName()\n\t\t\t;\n\t\t\tcaller.add(caller.size(), thisJoinPoint.getTarget().getClass().getSimpleName() );\n\t\t\t\n\t\t\t\n\/\/\t\t\tfor(int i : count){\n\/\/\t\t\t\tcounter += i;\n\/\/\t\t\t}\n\/\/\t\t\tSystem.out.println(counter);\n\n\t\t\tSystem.out.println(sequence);\n\t\t}\n\t}\n\n\n\tafter(): traceMethods(){\n\t\tif(\n\t\t\t\t(thisJoinPoint.getThis()!=null)\n\t\t\t\t&& \n\t\t\t\t(thisJoinPointStaticPart.getKind()==\"method-execution\")\n\t\t\t\t&& (thisJoinPoint.getTarget()!=null)\n\t\t\t\t){\t\tsequence += \"\\ndeactivate \" + caller.get(caller.size()-1) + \"\\n\";\n\n\n\t\t\t\tcaller.remove(caller.size()-1);\n\/\/\t\t\t\tcount.remove(count.size()-1);\n\n\t\t\t\tSystem.out.println(sequence);\n\t\t}\n\t}\n\n\tpublic static String getSequence() {\n\n\t\treturn sequence;\n\t}\n\n\n\n\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"654ef6cf38c2165a4a7340f8de21f027118ed726","subject":"This code should not be commented as it needed for backward compatibility...","message":"This code should not be commented as it needed for backward compatibility...\n\ngit-svn-id: cfa2b40e478804c47c05d0f328c574ec5aa2b82e@9683 f329d543-caf0-0310-9063-dda96c69346f\n","repos":"pbondoer\/xwiki-platform,xwiki\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform","old_file":"xwiki-core\/src\/main\/aspect\/compatibility\/com\/xpn\/xwiki\/stats\/impl\/StatsUtilCompatibilityAspect.aj","new_file":"xwiki-core\/src\/main\/aspect\/compatibility\/com\/xpn\/xwiki\/stats\/impl\/StatsUtilCompatibilityAspect.aj","new_contents":"\/*\n * See the NOTICE file distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This is free software; you can redistribute it and\/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF site: http:\/\/www.fsf.org.\n *\n *\/\npackage com.xpn.xwiki.stats.impl;\n\nimport java.util.Date;\n\n\/**\n * Add a backward compatibility layer to the {@link StatsUtil} class.\n * \n * @version $Id: $\n *\/\npublic privileged aspect StatsUtilCompatibilityAspect\n{\n    \/**\n     * @deprecated Use {@link PeriodType} since 1.4M1.\n     *\/\n    @Deprecated\n    public static int StatsUtil.PERIOD_MONTH = 0;\n\n    \/**\n     * @deprecated Use {@link PeriodType} since 1.4M1.\n     *\/\n    @Deprecated\n    public static int StatsUtil.PERIOD_DAY = 1;\n\n    \/**\n     * Computes an integer representation of the passed date using the following format:\n     * <ul>\n     * <li>\"yyyMMdd\" for {@link PERIOD_DAY}<\/li>\n     * <li>\"yyyMM\" for {@link PERIOD_MONTH}<\/li>\n     * <\/ul>\n     * \n     * @param date the date for which to return an integer representation\n     * @param type the date type. It can be {@link PERIOD_DAY} or {@link PERIOD_MONTH}\n     * @return the integer representation of the specified date\n     * @see java.text.SimpleDateFormat\n     * @deprecated Use\n     *             {@link StatsUtil#getPeriodAsInt(Date, com.xpn.xwiki.stats.impl.StatsUtil.PeriodType)}\n     *             since 1.4M1.\n     *\/\n    @Deprecated\n    public static int StatsUtil.getPeriodAsInt(Date date, int type)\n    {\n        return StatsUtil.getPeriodAsInt(date, PeriodType.values()[type]);\n    }\n}\n","old_contents":"\/*\n * See the NOTICE file distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This is free software; you can redistribute it and\/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF site: http:\/\/www.fsf.org.\n *\n *\/\npackage com.xpn.xwiki.stats.impl;\n\nimport java.util.Date;\n\n\/**\n * Add a backward compatibility layer to the {@link StatsUtil} class.\n * \n * @version $Id: $\n *\/\npublic privileged aspect StatsUtilCompatibilityAspect\n{\n    \/**\n     * @deprecated Use {@link PeriodType} since 1.4M1.\n     *\/\n    \/\/@Deprecated\n    \/\/public static int StatsUtil.PERIOD_MONTH = 0;\n\n    \/**\n     * @deprecated Use {@link PeriodType} since 1.4M1.\n     *\/\n    \/\/@Deprecated\n    \/\/public static int StatsUtil.PERIOD_DAY = 1;\n\n    \/**\n     * Computes an integer representation of the passed date using the following format:\n     * <ul>\n     * <li>\"yyyMMdd\" for {@link PERIOD_DAY}<\/li>\n     * <li>\"yyyMM\" for {@link PERIOD_MONTH}<\/li>\n     * <\/ul>\n     * \n     * @param date the date for which to return an integer representation\n     * @param type the date type. It can be {@link PERIOD_DAY} or {@link PERIOD_MONTH}\n     * @return the integer representation of the specified date\n     * @see java.text.SimpleDateFormat\n     * @deprecated Use\n     *             {@link StatsUtil#getPeriodAsInt(Date, com.xpn.xwiki.stats.impl.StatsUtil.PeriodType)}\n     *             since 1.4M1.\n     *\/\n    \/\/@Deprecated\n    \/*public static int StatsUtil.getPeriodAsInt(Date date, int type)\n    {\n        return StatsUtil.getPeriodAsInt(date, PeriodType.values()[type]);\n    }*\/\n}\n","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"d9df50c6cd4c5b126b621dd932f1a0611baf4b7b","subject":"@Entity no longer required with spring-aspect","message":"@Entity no longer required with spring-aspect\n\nThis commits complements 222d2b1 for another required dependency.\n\njavax.persistence.Entity was previously required, regardless of which\naspects were actually used by the project. It is now optional and will\nnot break the build if it is not present. Note that the side effect is that\nAnnotationDrivenStaticEntityMockingControl is disabled as well if the\nJPA API is not available.\n\nIssue: SPR-6819\n","repos":"spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework","old_file":"spring-aspects\/src\/main\/java\/org\/springframework\/mock\/staticmock\/AnnotationDrivenStaticEntityMockingControl.aj","new_file":"spring-aspects\/src\/main\/java\/org\/springframework\/mock\/staticmock\/AnnotationDrivenStaticEntityMockingControl.aj","new_contents":"\/*\n * Copyright 2002-2014 the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.springframework.mock.staticmock;\n\nimport org.aspectj.lang.annotation.RequiredTypes;\n\n\/**\n * Annotation-based aspect to use in test builds to enable mocking of static methods\n * on JPA-annotated {@code @Entity} classes, as used by Spring Roo for so-called\n * <em>finder methods<\/em>.\n *\n * <p>Mocking will occur within the call stack of any {@code public} method in a\n * class (typically a test class) that is annotated with {@code @MockStaticEntityMethods}.\n * Thus mocking is not limited to {@code @Test} methods. Furthermore, new mock\n * state will be created for the invocation of each such public method, even when\n * the method is invoked from another such public method.\n *\n * <p>This aspect also provides static methods to simplify the programming model for\n * setting expectations and entering playback mode.\n *\n * <h3>Usage<\/h3>\n * <ol>\n * <li>Annotate a test class with {@code @MockStaticEntityMethods}.\n * <li>In each test method, the {@code AnnotationDrivenStaticEntityMockingControl}\n * will begin in <em>recording<\/em> mode.\n * <li>Invoke static methods on JPA-annotated {@code @Entity} classes, with each\n * recording-mode invocation being followed by an invocation of either\n * {@link #expectReturn(Object)} or {@link #expectThrow(Throwable)} on the\n * {@code AnnotationDrivenStaticEntityMockingControl}.\n * <li>Invoke the {@link #playback()} method.\n * <li>Call the code you wish to test that uses the static methods on the\n * JPA-annotated {@code @Entity} classes.\n * <li>Verification will occur automatically after the test method has executed\n * and returned. However, mock verification will not occur if the test method\n * throws an exception.\n * <\/ol>\n *\n * <h3>Programmatic Control of the Mock<\/h3>\n * <p>For scenarios where it would be convenient to programmatically <em>verify<\/em>\n * the recorded expectations or <em>reset<\/em> the state of the mock, consider\n * using combinations of {@link #verify()} and {@link #reset()}.\n *\n * @author Rod Johnson\n * @author Ramnivas Laddad\n * @author Sam Brannen\n * @see MockStaticEntityMethods\n *\/\n@RequiredTypes(\"javax.persistence.Entity\")\npublic aspect AnnotationDrivenStaticEntityMockingControl extends AbstractMethodMockingControl {\n\n\t\/**\n\t * Expect the supplied {@link Object} to be returned by the previous static\n\t * method invocation.\n\t * @see #playback()\n\t *\/\n\tpublic static void expectReturn(Object retVal) {\n\t\tAnnotationDrivenStaticEntityMockingControl.aspectOf().expectReturnInternal(retVal);\n\t}\n\n\t\/**\n\t * Expect the supplied {@link Throwable} to be thrown by the previous static\n\t * method invocation.\n\t * @see #playback()\n\t *\/\n\tpublic static void expectThrow(Throwable throwable) {\n\t\tAnnotationDrivenStaticEntityMockingControl.aspectOf().expectThrowInternal(throwable);\n\t}\n\n\t\/**\n\t * Stop recording mock expectations and enter <em>playback<\/em> mode.\n\t * @see #expectReturn(Object)\n\t * @see #expectThrow(Throwable)\n\t *\/\n\tpublic static void playback() {\n\t\tAnnotationDrivenStaticEntityMockingControl.aspectOf().playbackInternal();\n\t}\n\n\t\/**\n\t * Verify that all expectations have been fulfilled.\n\t * @since 4.0.2\n\t * @see #reset()\n\t *\/\n\tpublic static void verify() {\n\t\tAnnotationDrivenStaticEntityMockingControl.aspectOf().verifyInternal();\n\t}\n\n\t\/**\n\t * Reset the state of the mock and enter <em>recording<\/em> mode.\n\t * @since 4.0.2\n\t * @see #verify()\n\t *\/\n\tpublic static void reset() {\n\t\tAnnotationDrivenStaticEntityMockingControl.aspectOf().resetInternal();\n\t}\n\n\t\/\/ Apparently, the following pointcut was originally defined to only match\n\t\/\/ methods directly annotated with @Test (in order to allow methods in\n\t\/\/ @MockStaticEntityMethods classes to invoke each other without creating a\n\t\/\/ new mocking environment); however, this is no longer the case. The current\n\t\/\/ pointcut applies to all public methods in @MockStaticEntityMethods classes.\n\tprotected pointcut mockStaticsTestMethod() : execution(public * (@MockStaticEntityMethods *).*(..));\n\n\tprotected pointcut methodToMock() : execution(public static * (@javax.persistence.Entity *).*(..));\n\n}\n","old_contents":"\/*\n * Copyright 2002-2014 the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.springframework.mock.staticmock;\n\n\/**\n * Annotation-based aspect to use in test builds to enable mocking of static methods\n * on JPA-annotated {@code @Entity} classes, as used by Spring Roo for so-called\n * <em>finder methods<\/em>.\n *\n * <p>Mocking will occur within the call stack of any {@code public} method in a\n * class (typically a test class) that is annotated with {@code @MockStaticEntityMethods}.\n * Thus mocking is not limited to {@code @Test} methods. Furthermore, new mock\n * state will be created for the invocation of each such public method, even when\n * the method is invoked from another such public method.\n *\n * <p>This aspect also provides static methods to simplify the programming model for\n * setting expectations and entering playback mode.\n *\n * <h3>Usage<\/h3>\n * <ol>\n * <li>Annotate a test class with {@code @MockStaticEntityMethods}.\n * <li>In each test method, the {@code AnnotationDrivenStaticEntityMockingControl}\n * will begin in <em>recording<\/em> mode.\n * <li>Invoke static methods on JPA-annotated {@code @Entity} classes, with each\n * recording-mode invocation being followed by an invocation of either\n * {@link #expectReturn(Object)} or {@link #expectThrow(Throwable)} on the\n * {@code AnnotationDrivenStaticEntityMockingControl}.\n * <li>Invoke the {@link #playback()} method.\n * <li>Call the code you wish to test that uses the static methods on the\n * JPA-annotated {@code @Entity} classes.\n * <li>Verification will occur automatically after the test method has executed\n * and returned. However, mock verification will not occur if the test method\n * throws an exception.\n * <\/ol>\n *\n * <h3>Programmatic Control of the Mock<\/h3>\n * <p>For scenarios where it would be convenient to programmatically <em>verify<\/em>\n * the recorded expectations or <em>reset<\/em> the state of the mock, consider\n * using combinations of {@link #verify()} and {@link #reset()}.\n *\n * @author Rod Johnson\n * @author Ramnivas Laddad\n * @author Sam Brannen\n * @see MockStaticEntityMethods\n *\/\npublic aspect AnnotationDrivenStaticEntityMockingControl extends AbstractMethodMockingControl {\n\n\t\/**\n\t * Expect the supplied {@link Object} to be returned by the previous static\n\t * method invocation.\n\t * @see #playback()\n\t *\/\n\tpublic static void expectReturn(Object retVal) {\n\t\tAnnotationDrivenStaticEntityMockingControl.aspectOf().expectReturnInternal(retVal);\n\t}\n\n\t\/**\n\t * Expect the supplied {@link Throwable} to be thrown by the previous static\n\t * method invocation.\n\t * @see #playback()\n\t *\/\n\tpublic static void expectThrow(Throwable throwable) {\n\t\tAnnotationDrivenStaticEntityMockingControl.aspectOf().expectThrowInternal(throwable);\n\t}\n\n\t\/**\n\t * Stop recording mock expectations and enter <em>playback<\/em> mode.\n\t * @see #expectReturn(Object)\n\t * @see #expectThrow(Throwable)\n\t *\/\n\tpublic static void playback() {\n\t\tAnnotationDrivenStaticEntityMockingControl.aspectOf().playbackInternal();\n\t}\n\n\t\/**\n\t * Verify that all expectations have been fulfilled.\n\t * @since 4.0.2\n\t * @see #reset()\n\t *\/\n\tpublic static void verify() {\n\t\tAnnotationDrivenStaticEntityMockingControl.aspectOf().verifyInternal();\n\t}\n\n\t\/**\n\t * Reset the state of the mock and enter <em>recording<\/em> mode.\n\t * @since 4.0.2\n\t * @see #verify()\n\t *\/\n\tpublic static void reset() {\n\t\tAnnotationDrivenStaticEntityMockingControl.aspectOf().resetInternal();\n\t}\n\n\t\/\/ Apparently, the following pointcut was originally defined to only match\n\t\/\/ methods directly annotated with @Test (in order to allow methods in\n\t\/\/ @MockStaticEntityMethods classes to invoke each other without creating a\n\t\/\/ new mocking environment); however, this is no longer the case. The current\n\t\/\/ pointcut applies to all public methods in @MockStaticEntityMethods classes.\n\tprotected pointcut mockStaticsTestMethod() : execution(public * (@MockStaticEntityMethods *).*(..));\n\n\tprotected pointcut methodToMock() : execution(public static * (@javax.persistence.Entity *).*(..));\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"aeab42ca2b2fbce494eafd5fb73aab09c20ab51f","subject":"Added headline to statistics export","message":"Added headline to statistics export\n","repos":"stieglma\/Schafkopfauswerter","old_file":"src\/StatisticsExport.aj","new_file":"src\/StatisticsExport.aj","new_contents":"import java.io.IOException;\n\nimport org.apache.pdfbox.pdmodel.PDDocument;\nimport org.apache.pdfbox.pdmodel.PDPage;\nimport org.apache.pdfbox.pdmodel.edit.PDPageContentStream;\nimport org.apache.pdfbox.pdmodel.font.PDType1Font;\n\nimport view.GUI;\n\npublic privileged aspect StatisticsExport {\n\n    declare precedence: StatisticsExport, GraphExport, PdfExport;\n    private GUI gui;\n\n    \/**\n     * catch constructor call, so that we have the correct gui, to refer to everywhere\n     *\/\n    after() returning(GUI gui): call(GUI.new(*)) {\n        this.gui = gui;\n    }\n    \n    \/**\n     * Catch the call on {@link PDFReportListener.drawTable(PDDocument)} to get the pdf\n     * creator object.\n     * \n     * @param document\n     * @throws IOException\n     *\/\n    after(PDDocument document) returning() throws IOException\n    : call(* PDFReportListener.drawTable(PDDocument))\n    && args(document) {\n        PDPage page = new PDPage();\n        document.addPage(page);\n        PDPageContentStream contentStream = new PDPageContentStream(document,\n                page);\n        \n        contentStream.beginText();\n        contentStream.setFont(PDType1Font.HELVETICA_BOLD, 15);\n        contentStream.moveTextPositionByAmount(100, 680);\n        contentStream.drawString(\"Statistik ueber das gesamte Spiel\");\n        contentStream.endText();\n        \n        contentStream.beginText();\n        contentStream.setFont(PDType1Font.HELVETICA_BOLD, 10);\n        createOverallContent(contentStream);\n        contentStream.endText();\n        contentStream.close();\n    }\n\t\n\t\/**\n\t * Write statistics to given <code>contentStream<\/code> of a pdf page.\n\t * \n\t * @param contentStream The <code>contentStream<\/code> of the pdf page to write on.\n\t * @throws IOException\n\t *\/\n\tprivate void createOverallContent(PDPageContentStream contentStream) throws IOException {\n\t\tOverallStatistics data = gui.model.gameDB.getOverallStatistics();\n\n        contentStream.moveTextPositionByAmount(50, 650);\n        contentStream.drawString(\"#Spiele (ohne weiter): \" + data.getAnzahlSpieleGesamt()\n        \t\t+ \" (gewonnen: \"\n        \t\t+ String.format(\"%.2f\", data.getGesamtWinPerc()) + \"%)\");\n        \n        contentStream.moveTextPositionByAmount(0, -16);\n        contentStream.drawString(\"#Rufspiele: \" + data.getAnzahlRufspiele() + \" (gewonnen: \"\n        \t\t+ String.format(\"%.2f\", data.getRufspieleWinPerc()) + \"%)\");\n        \n        contentStream.moveTextPositionByAmount(50, -16);\n        contentStream.drawString(\"-> teuerstes Rufspiel: \"\n        + data.getTeuerstesRufspiel());\n        \n        contentStream.moveTextPositionByAmount(-50, -16);\n        contentStream.drawString(\"#Soli gesamt: \"\n        \t\t+ data.getAnzahlSoliGesamt() + \" (gewonnen: \"\n        \t\t+ String.format(\"%.2f\", data.getSoliGesamtWinPerc())\n        \t\t+ \"%)\");\n        \n        contentStream.moveTextPositionByAmount(0, -16);\n        contentStream.drawString(\"#Soli normal: \" + data.getAnzahlSoli()\n        \t\t+ \" (gewonnen: \"\n        \t\t+ String.format(\"%.2f\", data.getSoliNormalWinPerc()) + \"%)\");\n        \n        contentStream.moveTextPositionByAmount(50, -16);\n        contentStream.drawString(\"-> teuerstes Solo: \" + data.getTeuerstesSolo());\n        \n        contentStream.moveTextPositionByAmount(-50, -16);\n        contentStream.drawString(\"#Solo Tout: \" + data.getAnzahlSoliTout()\n        \t\t+ \" (gewonnen: \"\n        \t\t+ String.format(\"%.2f\", data.getSoliToutWinPerc()) + \"%)\");\n        \n        contentStream.moveTextPositionByAmount(50, -16);\n        contentStream.drawString(\"-> teuerstes Solo Tout: \"\n        \t\t+ data.getTeuerstesSoloTout());\n        \n        contentStream.moveTextPositionByAmount(-50, -16);\n        contentStream.drawString(\"#Solo Sie: \" + data.getAnzahlSoliSie());\n        \n        contentStream.moveTextPositionByAmount(50, -16);\n        contentStream.drawString(\"-> teuerstes Solo Sie: \" + data.getTeuerstesSoloSie());\n        \n        contentStream.moveTextPositionByAmount(-50, -16);\n        contentStream.drawString(\"#Weiter: \" + data.getAnzahlWeiter());\n\t}\n}\n","old_contents":"import java.io.IOException;\n\nimport org.apache.pdfbox.pdmodel.PDDocument;\nimport org.apache.pdfbox.pdmodel.PDPage;\nimport org.apache.pdfbox.pdmodel.edit.PDPageContentStream;\nimport org.apache.pdfbox.pdmodel.font.PDType1Font;\n\nimport view.GUI;\n\npublic privileged aspect StatisticsExport {\n\n    declare precedence: StatisticsExport, GraphExport, PdfExport;\n    private GUI gui;\n\n    \/**\n     * catch constructor call, so that we have the correct gui, to refer to everywhere\n     *\/\n    after() returning(GUI gui): call(GUI.new(*)) {\n        this.gui = gui;\n    }\n    \n    \/**\n     * Catch the call on {@link PDFReportListener.drawTable(PDDocument)} to get the pdf\n     * creator object.\n     * \n     * @param document\n     * @throws IOException\n     *\/\n    after(PDDocument document) returning() throws IOException\n    : call(* PDFReportListener.drawTable(PDDocument))\n    && args(document) {\n        PDPage page = new PDPage();\n        document.addPage(page);\n        PDPageContentStream contentStream = new PDPageContentStream(document,\n                page);\n        contentStream.setFont(PDType1Font.HELVETICA_BOLD, 10);\n        contentStream.beginText();\n        createContent(contentStream);\n        contentStream.endText();\n        contentStream.close();\n    }\n\t\n\t\/**\n\t * Write statistics to given <code>contentStream<\/code> of a pdf page.\n\t * \n\t * @param contentStream The <code>contentStream<\/code> of the pdf page to write on.\n\t * @throws IOException\n\t *\/\n\tprivate void createContent(PDPageContentStream contentStream) throws IOException {\n\t\tOverallStatistics data = gui.model.gameDB.getOverallStatistics();\n\n        contentStream.moveTextPositionByAmount(50, 650);\n        contentStream.drawString(\"#Spiele (ohne weiter): \" + data.getAnzahlSpieleGesamt()\n        \t\t+ \" (gewonnen: \"\n        \t\t+ String.format(\"%.2f\", data.getGesamtWinPerc()) + \"%)\");\n        \n        contentStream.moveTextPositionByAmount(0, -20);\n        contentStream.drawString(\"#Rufspiele: \" + data.getAnzahlRufspiele() + \" (gewonnen: \"\n        \t\t+ String.format(\"%.2f\", data.getRufspieleWinPerc()) + \"%)\");\n        \n        contentStream.moveTextPositionByAmount(50, -20);\n        contentStream.drawString(\"-> teurstes Rufspiel: \"\n        + data.getTeuerstesRufspiel());\n        \n        contentStream.moveTextPositionByAmount(-50, -20);\n        contentStream.drawString(\"#Soli gesamt: \"\n        \t\t+ data.getAnzahlSoliGesamt() + \" (gewonnen: \"\n        \t\t+ String.format(\"%.2f\", data.getSoliGesamtWinPerc())\n        \t\t+ \"%)\");\n        \n        contentStream.moveTextPositionByAmount(0, -20);\n        contentStream.drawString(\"#Soli normal: \" + data.getAnzahlSoli()\n        \t\t+ \" (gewonnen: \"\n        \t\t+ String.format(\"%.2f\", data.getSoliNormalWinPerc()) + \"%)\");\n        \n        contentStream.moveTextPositionByAmount(50, -20);\n        contentStream.drawString(\"-> teurstes Solo: \" + data.getTeuerstesSolo());\n        \n        contentStream.moveTextPositionByAmount(-50, -20);\n        contentStream.drawString(\"#Solo Tout: \" + data.getAnzahlSoliTout()\n        \t\t+ \" (gewonnen: \"\n        \t\t+ String.format(\"%.2f\", data.getSoliToutWinPerc()) + \"%)\");\n        \n        contentStream.moveTextPositionByAmount(50, -20);\n        contentStream.drawString(\"-> teurstes Solo Tout: \"\n        \t\t+ data.getTeuerstesSoloTout());\n        \n        contentStream.moveTextPositionByAmount(-50, -20);\n        contentStream.drawString(\"#Solo Sie: \" + data.getAnzahlSoliSie());\n        \n        contentStream.moveTextPositionByAmount(50, -20);\n        contentStream.drawString(\"-> teurstes Solo Sie: \" + data.getTeuerstesSoloSie());\n        \n        contentStream.moveTextPositionByAmount(-50, -20);\n        contentStream.drawString(\"#Weiter: \" + data.getAnzahlWeiter());\n\t}\n}\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"1b8323d0d2fbd0c6a97ab8e6d8665666ff4426a5","subject":"Throw a more useful exception if the ThreadConfigurableBeanFactory singleton instance has been set to null when we try to use it.","message":"Throw a more useful exception if the ThreadConfigurableBeanFactory\nsingleton instance has been set to null when we try to use it.\n","repos":"archiecobbs\/jsimpledb,archiecobbs\/jsimpledb,permazen\/permazen,permazen\/permazen,archiecobbs\/jsimpledb,permazen\/permazen,tempbottle\/jsimpledb,tempbottle\/jsimpledb,tempbottle\/jsimpledb","old_file":"src\/java\/org\/dellroad\/stuff\/spring\/ThreadConfigurableAspect.aj","new_file":"src\/java\/org\/dellroad\/stuff\/spring\/ThreadConfigurableAspect.aj","new_contents":"\n\/*\n * Copyright (C) 2011 Archie L. Cobbs and other authors. All rights reserved.\n *\n * $Id: ThreadConfigurableAspect.aj 282 2012-02-16 20:48:06Z archie.cobbs $\n *\/\n\npackage org.dellroad.stuff.spring;\n\nimport java.io.ObjectStreamException;\nimport java.io.Serializable;\n\nimport org.springframework.beans.factory.BeanFactory;\nimport org.springframework.beans.factory.aspectj.AbstractDependencyInjectionAspect;\nimport org.springframework.beans.factory.wiring.BeanConfigurerSupport;\nimport org.springframework.beans.factory.wiring.BeanWiringInfoResolver;\n\n\/**\n * Aspect that autowires classes marked with the {@link ThreadConfigurable @ThreadConfigurable} annotation using\n * the Spring application context returned by {@link ThreadConfigurableBeanFactory#get()}.\n *\n * <p>\n * This implementation is derived from Spring's {@code AnnotationBeanConfigurerAspect} implementation\n * and therefore shares its license (also Apache).\n * <\/p>\n *\n * @see ThreadConfigurableBeanFactory\n * @see ThreadConfigurable\n *\/\npublic aspect ThreadConfigurableAspect extends AbstractConfigurableAspect {\n\n\/\/ Stuff copied from AbstractInterfaceDrivenDependencyInjectionAspect.aj\n\n    public pointcut beanConstruction(Object bean) :\n        initialization(ThreadConfigurableObject+.new(..)) && this(bean);\n\n    public pointcut beanDeserialization(Object bean) :\n        execution(Object ThreadConfigurableDeserializationSupport+.readResolve()) &&\n        this(bean);\n\n    public pointcut leastSpecificSuperTypeConstruction() : initialization(ThreadConfigurableObject.new(..));\n\n    declare parents: \n        ThreadConfigurableObject+ && Serializable+ implements ThreadConfigurableDeserializationSupport;\n\n    static interface ThreadConfigurableDeserializationSupport extends Serializable {\n    }\n\n    public Object ThreadConfigurableDeserializationSupport.readResolve() throws ObjectStreamException {\n        return this;\n    }\n\n\/\/ Stuff copied from AnnotationBeanConfigurerAspect.aj\n\n    public pointcut inConfigurableBean() : @this(ThreadConfigurable);\n\n    public pointcut preConstructionConfiguration() : preConstructionConfigurationSupport(*);\n\n    declare parents: @ThreadConfigurable * implements ThreadConfigurableObject;\n\n    private pointcut preConstructionConfigurationSupport(ThreadConfigurable c) : @this(c) && if(c.preConstruction());\n\n\tdeclare parents: @ThreadConfigurable Serializable+ implements ThreadConfigurableDeserializationSupport;\n\n\/\/ Our implementation\n\n    @Override\n    protected BeanFactory getBeanFactory(Object bean) {\n        ThreadConfigurableBeanFactory threadConfigurableBeanFactory = ThreadConfigurableBeanFactory.getInstance();\n        if (threadConfigurableBeanFactory == null) {\n            throw new IllegalStateException(\"can't configure @\" + ThreadConfigurable.class.getName()\n              + \"-annotated bean of type \" + bean.getClass().getName()\n              + \" because the ThreadConfigurableBeanFactory singleton instance has been set to null\");\n        }\n        BeanFactory beanFactory = threadConfigurableBeanFactory.get();\n        if (beanFactory == null) {\n            throw new IllegalStateException(\"can't configure @\" + ThreadConfigurable.class.getName()\n              + \"-annotated bean of type \" + bean.getClass().getName()\n              + \" because no BeanFactory has been configured for the current thread via \"\n              + ThreadConfigurableBeanFactory.class.getName() + \".set()\");\n        }\n        return beanFactory;\n    }\n\n    @Override\n    protected BeanWiringInfoResolver getBeanWiringInfoResolver(Object bean) {\n        return new ThreadConfigurableBeanWiringInfoResolver();\n    }\n}\n\n","old_contents":"\n\/*\n * Copyright (C) 2011 Archie L. Cobbs and other authors. All rights reserved.\n *\n * $Id: ThreadConfigurableAspect.aj 282 2012-02-16 20:48:06Z archie.cobbs $\n *\/\n\npackage org.dellroad.stuff.spring;\n\nimport java.io.ObjectStreamException;\nimport java.io.Serializable;\n\nimport org.springframework.beans.factory.BeanFactory;\nimport org.springframework.beans.factory.aspectj.AbstractDependencyInjectionAspect;\nimport org.springframework.beans.factory.wiring.BeanConfigurerSupport;\nimport org.springframework.beans.factory.wiring.BeanWiringInfoResolver;\n\n\/**\n * Aspect that autowires classes marked with the {@link ThreadConfigurable @ThreadConfigurable} annotation using\n * the Spring application context returned by {@link ThreadConfigurableBeanFactory#get()}.\n *\n * <p>\n * This implementation is derived from Spring's {@code AnnotationBeanConfigurerAspect} implementation\n * and therefore shares its license (also Apache).\n * <\/p>\n *\n * @see ThreadConfigurableBeanFactory\n * @see ThreadConfigurable\n *\/\npublic aspect ThreadConfigurableAspect extends AbstractConfigurableAspect {\n\n\/\/ Stuff copied from AbstractInterfaceDrivenDependencyInjectionAspect.aj\n\n    public pointcut beanConstruction(Object bean) :\n        initialization(ThreadConfigurableObject+.new(..)) && this(bean);\n\n    public pointcut beanDeserialization(Object bean) :\n        execution(Object ThreadConfigurableDeserializationSupport+.readResolve()) &&\n        this(bean);\n\n    public pointcut leastSpecificSuperTypeConstruction() : initialization(ThreadConfigurableObject.new(..));\n\n    declare parents: \n        ThreadConfigurableObject+ && Serializable+ implements ThreadConfigurableDeserializationSupport;\n\n    static interface ThreadConfigurableDeserializationSupport extends Serializable {\n    }\n\n    public Object ThreadConfigurableDeserializationSupport.readResolve() throws ObjectStreamException {\n        return this;\n    }\n\n\/\/ Stuff copied from AnnotationBeanConfigurerAspect.aj\n\n    public pointcut inConfigurableBean() : @this(ThreadConfigurable);\n\n    public pointcut preConstructionConfiguration() : preConstructionConfigurationSupport(*);\n\n    declare parents: @ThreadConfigurable * implements ThreadConfigurableObject;\n\n    private pointcut preConstructionConfigurationSupport(ThreadConfigurable c) : @this(c) && if(c.preConstruction());\n\n\tdeclare parents: @ThreadConfigurable Serializable+ implements ThreadConfigurableDeserializationSupport;\n\n\/\/ Our implementation\n\n    @Override\n    protected BeanFactory getBeanFactory(Object bean) {\n        BeanFactory beanFactory = ThreadConfigurableBeanFactory.getInstance().get();\n        if (beanFactory == null) {\n            throw new IllegalStateException(\"can't configure @\" + ThreadConfigurable.class.getName()\n              + \"-annotated bean of type \" + bean.getClass().getName()\n              + \" because no BeanFactory has been configured for the current thread via \"\n              + ThreadConfigurableBeanFactory.class.getName() + \".set()\");\n        }\n        return beanFactory;\n    }\n\n    @Override\n    protected BeanWiringInfoResolver getBeanWiringInfoResolver(Object bean) {\n        return new ThreadConfigurableBeanWiringInfoResolver();\n    }\n}\n\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"5eb7838e8270151cdde330c55dbefe307e17ed09","subject":"Suppress incorrect AJ warnings (AJDT does not recognize joinpoints in dependency bundles)","message":"Suppress incorrect AJ warnings (AJDT does not recognize joinpoints in dependency bundles)\n\ngit-svn-id: 7acc490bd371dbc82047a939b87dc892fdc31f59@22174 76a6fc44-f60b-0410-a9a8-e67b0e8fc65c\n","repos":"tlaplus\/tlaplus,lemmy\/tlaplus,tlaplus\/tlaplus,lemmy\/tlaplus,tlaplus\/tlaplus,tlaplus\/tlaplus,lemmy\/tlaplus,lemmy\/tlaplus","old_file":"org.lamport.tla.toolbox.uitest\/src\/org\/lamport\/tla\/toolbox\/test\/threading\/MonitorAspect.aj","new_file":"org.lamport.tla.toolbox.uitest\/src\/org\/lamport\/tla\/toolbox\/test\/threading\/MonitorAspect.aj","new_contents":"package org.lamport.tla.toolbox.test.threading;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\n\n\/**\n * The purpose of this advice is to intercept method execution in the backend\n * code - namely all code in the packages tlc2, tla2sany, tla2tex, pcal and util.\n * \n * It notifies the {@link MonitorAdaptor} about the method execution.\n *\/\npublic aspect MonitorAspect {\n\n\tpublic MonitorAspect() {\n\t\tMonitorAdaptor.setAspect(this);\n\t}\n\t\n\t\/\/ known places where backend call within UI thread are acceptable\n\tpointcut inFilter() : \n\t\twithincode(public boolean org.lamport.tla.toolbox.util.ResourceHelper.isValidSpecName(String));\n\n\t\/\/ catch all method calls (static and object ones)\n\tpointcut callToBackend() : \n\t\t   execution(* tlc2..*.*(..))\n\t\t|| execution(* tla2sany..*.*(..))\n\t\t|| execution(* tla2tex..*.*(..))\n\t\t|| execution(* pcal..*.*(..))\n\t\t|| execution(* util..*.*(..));\n\t\n\t\/\/ capture calls to backend, but not within ourself or in filter\n\t@SuppressAjWarnings\n\tbefore(): (callToBackend()\n\t\t\t&& !cflowbelow(callToBackend()) && !cflowbelow(inFilter())) { \n\t\tMonitorAdaptor.enter(thisJoinPoint);\n\t}\n}\n","old_contents":"package org.lamport.tla.toolbox.test.threading;\n\n\/**\n * The purpose of this advice is to intercept method execution in the backend\n * code - namely all code in the packages tlc2, tla2sany, tla2tex, pcal and util.\n * \n * It notifies the {@link MonitorAdaptor} about the method execution.\n *\/\npublic aspect MonitorAspect {\n\n\tpublic MonitorAspect() {\n\t\tMonitorAdaptor.setAspect(this);\n\t}\n\t\n\t\/\/ known places where backend call within UI thread are acceptable\n\tpointcut inFilter() : \n\t\twithincode(public boolean org.lamport.tla.toolbox.util.ResourceHelper.isValidSpecName(String));\n\n\t\/\/ catch all method calls (static and object ones)\n\tpointcut callToBackend() : \n\t\t   execution(* tlc2..*.*(..))\n\t\t|| execution(* tla2sany..*.*(..))\n\t\t|| execution(* tla2tex..*.*(..))\n\t\t|| execution(* pcal..*.*(..))\n\t\t|| execution(* util..*.*(..));\n\t\n\t\/\/ capture calls to backend, but not within ourself or in filter\n\tbefore(): (callToBackend()\n\t\t\t&& !cflowbelow(callToBackend()) && !cflowbelow(inFilter())) { \n\t\tMonitorAdaptor.enter(thisJoinPoint);\n\t}\n}\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"ebc61b5e487f63fd4ea88bbb3003a2f813f128ce","subject":"added marked rollback only behaviour","message":"added marked rollback only behaviour\n","repos":"palava\/palava-jta","old_file":"src\/main\/java\/de\/cosmocode\/palava\/jta\/AbstractUserTransactionAspect.aj","new_file":"src\/main\/java\/de\/cosmocode\/palava\/jta\/AbstractUserTransactionAspect.aj","new_contents":"\/**\n * palava - a java-php-bridge\n * Copyright (C) 2007-2010  CosmoCode GmbH\n *\n * This program is free software; you can redistribute it and\/or\n * modify it under the terms of the GNU General Public License\n * as published by the Free Software Foundation; either version 2\n * of the License, or (at your option) any later version.\n *\n * This program is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n * along with this program; if not, write to the Free Software\n * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n * MA  02110-1301, USA.\n *\/\n\npackage de.cosmocode.palava.jta;\n\nimport javax.transaction.NotSupportedException;\nimport javax.transaction.Status;\nimport javax.transaction.SystemException;\nimport javax.transaction.UserTransaction;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\n\npublic abstract aspect AbstractUserTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(AbstractUserTransactionAspect.class);\n\n    private Provider<UserTransaction> provider;\n    \n    @Inject\n    void setProvider(Provider<UserTransaction> provider) {\n        this.provider = Preconditions.checkNotNull(provider, \"Provider\");\n    }\n    \n    protected abstract pointcut transactional();\n    \n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        final UserTransaction tx = provider.get();\n        LOG.trace(\"Using transaction {}\", tx);\n        \n        final boolean local;\n        \n        try {\n            local = tx.getStatus() == Status.STATUS_NO_TRANSACTION;\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        if (local) {\n            LOG.trace(\"Beginning automatic transaction\");\n            try {\n                tx.begin();\n            } catch (NotSupportedException e) {\n                throw new IllegalStateException(e);\n            } catch (SystemException e) {\n                throw new IllegalStateException(e);\n            }\n        } else {\n            LOG.trace(\"Transaction already active\");\n        }\n\n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (Exception e) {\n            LOG.error(\"Exception inside automatic transaction context\", e);\n            try {\n                if (local && tx.getStatus() == Status.STATUS_ACTIVE) {\n                    tx.rollback();\n                } else {\n                    tx.setRollbackOnly();\n                }\n            } catch (SystemException inner) {\n                throw new IllegalStateException(inner);\n            }\n            throw new IllegalStateException(e);\n        }\n        \n        final int status;\n        \n        try {\n            status = tx.getStatus();\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n        \n        if (local) {\n            if (status == Status.STATUS_MARKED_ROLLBACK) {\n                try {\n                    tx.rollback();\n                } catch (SystemException e) {\n                    throw new IllegalStateException(e);\n                }\n            } else {\n                try {\n                    tx.commit();\n                    LOG.trace(\"Committed automatic transaction\");\n                } catch (Exception e) {\n                    LOG.error(\"Commit in automatic transaction context failed\", e);\n                    try {\n                        tx.rollback();\n                    } catch (SystemException inner) {\n                        throw new IllegalStateException(inner);\n                    }\n                    throw new IllegalStateException(e);\n                }\n            }\n        }\n        \n        return returnValue;\n    }\n    \n}\n","old_contents":"\/**\n * palava - a java-php-bridge\n * Copyright (C) 2007-2010  CosmoCode GmbH\n *\n * This program is free software; you can redistribute it and\/or\n * modify it under the terms of the GNU General Public License\n * as published by the Free Software Foundation; either version 2\n * of the License, or (at your option) any later version.\n *\n * This program is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n * along with this program; if not, write to the Free Software\n * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n * MA  02110-1301, USA.\n *\/\n\npackage de.cosmocode.palava.jta;\n\nimport javax.transaction.NotSupportedException;\nimport javax.transaction.Status;\nimport javax.transaction.SystemException;\nimport javax.transaction.UserTransaction;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\n\npublic abstract aspect AbstractUserTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(AbstractUserTransactionAspect.class);\n\n    private Provider<UserTransaction> provider;\n    \n    @Inject\n    void setProvider(Provider<UserTransaction> provider) {\n        this.provider = Preconditions.checkNotNull(provider, \"Provider\");\n    }\n    \n    protected abstract pointcut transactional();\n    \n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        final UserTransaction tx = provider.get();\n        LOG.trace(\"Using transaction {}\", tx);\n        \n        final boolean localTx;\n        \n        try {\n            localTx = tx.getStatus() == Status.STATUS_NO_TRANSACTION;\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        if (localTx) {\n            LOG.trace(\"Beginning automatic transaction\");\n            try {\n                tx.begin();\n            } catch (NotSupportedException e) {\n                throw new IllegalStateException(e);\n            } catch (SystemException e) {\n                throw new IllegalStateException(e);\n            }\n        } else {\n            LOG.trace(\"Transaction already active\");\n        }\n\n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (Exception e) {\n            LOG.error(\"Exception inside automatic transaction context\", e);\n            try {\n                tx.rollback();\n            } catch (SystemException inner) {\n                throw new IllegalStateException(inner);\n            }\n            throw new IllegalStateException(e);\n        }\n        \n        try {\n            if (localTx && tx.getStatus() == Status.STATUS_ACTIVE) {\n                tx.commit();\n                LOG.trace(\"Committed automatic transaction\");\n            }\n            return returnValue;\n        } catch (Exception e) {\n            LOG.error(\"Commit in automatic transaction context failed\", e);\n            try {\n                tx.rollback();\n            } catch (SystemException inner) {\n                throw new IllegalStateException(inner);\n            }\n            throw new IllegalStateException(e);\n        }\n    }\n    \n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"569bf3511d097af683d1d7fc6750190ebfe28551","subject":"[misc] Adding back APIs removed by mistake","message":"[misc] Adding back APIs removed by mistake\n","repos":"pbondoer\/xwiki-platform,pbondoer\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,xwiki\/xwiki-platform","old_file":"xwiki-platform-core\/xwiki-platform-legacy\/xwiki-platform-legacy-oldcore\/src\/main\/aspect\/compatibility\/com\/xpn\/xwiki\/api\/XWikiCompatibilityAspect.aj","new_file":"xwiki-platform-core\/xwiki-platform-legacy\/xwiki-platform-legacy-oldcore\/src\/main\/aspect\/compatibility\/com\/xpn\/xwiki\/api\/XWikiCompatibilityAspect.aj","new_contents":"\/*\n * See the NOTICE file distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This is free software; you can redistribute it and\/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF site: http:\/\/www.fsf.org.\n *\/\npackage com.xpn.xwiki.api;\n\nimport java.awt.image.BufferedImage;\nimport java.io.IOException;\nimport java.util.ArrayList;\nimport java.util.Collections;\nimport java.util.Date;\nimport java.util.HashMap;\nimport java.util.List;\nimport java.util.Map;\nimport java.util.TreeMap;\n\nimport org.xwiki.xml.XMLUtils;\n\nimport com.xpn.xwiki.XWikiException;\nimport com.xpn.xwiki.plugin.query.XWikiCriteria;\nimport com.xpn.xwiki.plugin.query.XWikiQuery;\nimport com.xpn.xwiki.stats.api.XWikiStatsService;\nimport com.xpn.xwiki.web.XWikiMessageTool;\n\n\/**\n * Add a backward compatibility layer to the {@link com.xpn.xwiki.api.XWiki} class.\n *\n * @version $Id$\n *\/\npublic privileged aspect XWikiCompatibilityAspect\n{\n    \/**\n     * Utility methods have been moved in version 1.3 Milestone 2 to the {@link Util} class.\n     * However to preserve backward compatibility we have deprecated them in this class and\n     * not removed them yet. All calls are funnelled through this class variable.\n     *\/\n    private Util XWiki.util;\n\n    \/**\n     * Capture the api.XWiki constructor so that we can initialize this.util.\n     *\/\n    private pointcut xwikiCreation(XWiki x): this(x) && execution( public XWiki.new(..) );\n\n    after(XWiki x): xwikiCreation(x)\n    {\n        x.util = new Util(x.xwiki, x.context);\n    }\n\n    \/**\n     * API to protect Text from Wiki transformation\n     * @param text\n     * @return escaped text\n     * @deprecated replaced by Util#escapeText since 1.3M2\n     *\/\n    @Deprecated\n    public String XWiki.escapeText(String text)\n    {\n        return this.util.escapeText(text);\n    }\n\n    \/**\n     * API to protect URLs from Wiki transformation\n     * @param url\n     * @return encoded URL\n     * @deprecated replaced by Util#escapeURL since 1.3M2\n     *\/\n    @Deprecated\n    public String XWiki.escapeURL(String url)\n    {\n        return this.util.escapeURL(url);\n    }\n\n    \/**\n     * @deprecated use {@link #getLanguagePreference()} instead\n     *\/\n    @Deprecated\n    public String XWiki.getDocLanguagePreference()\n    {\n        return xwiki.getDocLanguagePreference(getXWikiContext());\n    }\n\n    \/**\n     * Privileged API to send a message to an email address\n     *\n     * @param sender email of the sender of the message\n     * @param recipient email of the recipient of the message\n     * @param message Message to send\n     * @throws XWikiException if the mail was not send successfully\n     * @deprecated replaced by the\n     *   <a href=\"http:\/\/code.xwiki.org\/xwiki\/bin\/view\/Plugins\/MailSenderPlugin\">Mail Sender\n     *   Plugin<\/a> since 1.3M2\n     *\/\n    @Deprecated\n    public void XWiki.sendMessage(String sender, String recipient, String message)\n        throws XWikiException\n    {\n        if (hasProgrammingRights())\n            xwiki.sendMessage(sender, recipient, message, getXWikiContext());\n    }\n\n    \/**\n     * Privileged API to send a message to an email address\n     *\n     * @param sender email of the sender of the message\n     * @param recipient emails of the recipients of the message\n     * @param message Message to send\n     * @throws XWikiException if the mail was not send successfully\n     * @deprecated replaced by the\n     *   <a href=\"http:\/\/code.xwiki.org\/xwiki\/bin\/view\/Plugins\/MailSenderPlugin\">Mail Sender\n     *   Plugin<\/a> since 1.3M2\n     *\/\n    @Deprecated\n    public void XWiki.sendMessage(String sender, String[] recipient, String message)\n        throws XWikiException\n    {\n        if (hasProgrammingRights())\n            xwiki.sendMessage(sender, recipient, message, getXWikiContext());\n    }\n\n    \/**\n     * @return the current date\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#getDate()} since 1.3M2\n     *\/\n    @Deprecated\n    public Date XWiki.getCurrentDate()\n    {\n        return this.util.getDate();\n    }\n\n    \/**\n     * @return the current date\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#getDate()} since 1.3M2\n     *\/\n    @Deprecated\n    public Date XWiki.getDate()\n    {\n        return this.util.getDate();\n    }\n\n    \/**\n     * @param time the time in milliseconds\n     * @return the time delta in milliseconds between the current date and the time passed\n     *         as parameter\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#getTimeDelta(long)} since 1.3M2\n     *\/\n    @Deprecated\n    public int XWiki.getTimeDelta(long time)\n    {\n        return this.util.getTimeDelta(time);\n    }\n\n    \/**\n     * @param time time in milliseconds since 1970, 00:00:00 GMT\n     * @return Date a date from a time in milliseconds since 01\/01\/1970 as a\n     *         Java {@link Date} Object\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#getDate(long)} since 1.3M2\n     *\/\n    @Deprecated\n    public Date XWiki.getDate(long time)\n    {\n        return this.util.getDate(time);\n    }\n\n    \/**\n     * Split a text to an array of texts, according to a separator.\n     *\n     * @param text the original text\n     * @param sep the separator characters. The separator is one or more of the\n     *        separator characters\n     * @return An array containing the split text\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#split(String, String)} since 1.3M2\n     *\/\n    @Deprecated\n    public String[] XWiki.split(String text, String sep)\n    {\n        return this.util.split(text, sep);\n    }\n\n    \/**\n     * Get a stack trace as a String\n     *\n     * @param e the exception to convert to a String\n     * @return the exception stack trace as a String\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#printStrackTrace(Throwable)}\n     *             since 1.3M2\n     *\/\n    @Deprecated\n    public String XWiki.printStrackTrace(Throwable e)\n    {\n        return this.util.printStrackTrace(e);\n    }\n\n    \/**\n     * Get a Null object. This is useful in Velocity where there is no real null object\n     * for comparaisons.\n     *\n     * @return a Null Object\n     * @deprecated replaced by {@link Util#getNull()} since 1.3M2\n     *\/\n    @Deprecated\n    public Object XWiki.getNull()\n    {\n        return this.util.getNull();\n    }\n\n    \/**\n     * Get a New Line character. This is useful in Velocity where there is no real new\n     * line character for inclusion in texts.\n     *\n     * @return a new line character\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#getNewline()} since 1.3M2\n     *\/\n    @Deprecated\n    public String XWiki.getNl()\n    {\n        return this.util.getNewline();\n    }\n\n    \/**\n     * Creates an Array List. This is useful from Velocity since you cannot\n     * create Object from Velocity with our secure uberspector.\n     *\n     * @return a {@link ArrayList} object\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#getArrayList()} since 1.3M2\n     *\/\n    @Deprecated\n    public List XWiki.getArrayList()\n    {\n        return this.util.getArrayList();\n    }\n\n    \/**\n     * Creates a Hash Map. This is useful from Velocity since you cannot\n     * create Object from Velocity with our secure uberspector.\n     *\n     * @return a {@link HashMap} object\n     * @deprecated replaced by {@link Util#getHashMap()} since 1.3M2\n     *\/\n    @Deprecated\n    public Map XWiki.getHashMap()\n    {\n        return this.util.getHashMap();\n    }\n\n    \/**\n     * Creates a Tree Map. This is useful from Velocity since you cannot\n     * create Object from Velocity with our secure uberspector.\n     *\n     * @return a {@link TreeMap} object\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#getTreeMap()} since 1.3M2\n     *\/\n    @Deprecated\n    public Map XWiki.getTreeMap()\n    {\n        return this.util.getTreeMap();\n    }\n\n    \/**\n     * Sort a list using a standard comparator. Elements need to be mutally comparable and\n     * implement the Comparable interface.\n     *\n     * @param list the list to sort\n     * @return the sorted list (as the same oject reference)\n     * @see {@link java.util.Collections#sort(java.util.List)}\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#sort(java.util.List)} since 1.3M2\n     *\/\n    @Deprecated\n    public List XWiki.sort(List list)\n    {\n        return this.util.sort(list);\n    }\n\n    \/**\n     * Convert an Object to a number and return null if the object is not a Number.\n     *\n     * @param object the object to convert\n     * @return the object as a {@link Number}\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#toNumber(Object)} since 1.3M2\n     *\/\n    @Deprecated\n    public Number XWiki.toNumber(Object object)\n    {\n        return this.util.toNumber(object);\n    }\n\n    \/**\n     * Generate a random string.\n     *\n     * @param size the desired size of the string\n     * @return the randomly generated string\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#generateRandomString(int)}\n                   since 1.3M2\n     *\/\n    @Deprecated\n    public String XWiki.generateRandomString(int size)\n    {\n        return this.util.generateRandomString(size);\n    }\n\n    \/**\n     * Output a BufferedImage object into the response outputstream.\n     * Once this method has been called, not further action is possible.\n     * Users should set $context.setFinished(true) to\n     * avoid template output The image is outpout as image\/jpeg.\n     *\n     * @param image the BufferedImage to output\n     * @throws java.io.IOException if the output fails\n     * @deprecated replaced by\n     *             {@link com.xpn.xwiki.api.Util#outputImage(java.awt.image.BufferedImage)}\n     *             since 1.3M2\n     *\/\n    @Deprecated\n    public void XWiki.outputImage(BufferedImage image) throws IOException\n    {\n        this.util.outputImage(image);\n    }\n\n    \/**\n     * Returns the recently visited pages for a specific action\n     *\n     * @param action (\"view\" or \"edit\")\n     * @param size how many recent actions to retrieve\n     * @return a ArrayList of document names\n     * @deprecated use {@link #getStatsService()} instead\n     *\/\n    @Deprecated\n    public java.util.Collection XWiki.getRecentActions(String action, int size)\n    {\n        XWikiStatsService stats = getXWikiContext().getWiki().getStatsService(getXWikiContext());\n        if (stats == null)\n            return Collections.EMPTY_LIST;\n        return stats.getRecentActions(action, size, getXWikiContext());\n    }\n\n    \/**\n     * @param str the String to convert to an integer\n     * @return the parsed integer or zero in case of exception\n     * @deprecated replaced by {@link Util#parseInt(String)} since 1.3M2\n     *\/\n    @Deprecated\n    public int XWiki.parseInt(String str)\n    {\n        return this.util.parseInt(str);\n    }\n\n    \/**\n     * @param str the String to convert to an Integer Object\n     * @return the parsed integer or zero in case of exception\n     * @deprecated replaced by {@link Util#parseInteger(String)} since 1.3M2\n     *\/\n    @Deprecated\n    public Integer XWiki.parseInteger(String str)\n    {\n        return this.util.parseInteger(str);\n    }\n\n    \/**\n     * @param str the String to convert to a long\n     * @return the parsed long or zero in case of exception\n     * @deprecated replaced by {@link Util#parseLong(String)} since 1.3M2\n     *\/\n    @Deprecated\n    public long XWiki.parseLong(String str)\n    {\n        return this.util.parseLong(str);\n    }\n\n    \/**\n     * @param str the String to convert to a float\n     * @return the parsed float or zero in case of exception\n     * @deprecated replaced by {@link Util#parseFloat(String)} since 1.3M2\n     *\/\n    @Deprecated\n    public float XWiki.parseFloat(String str)\n    {\n        return this.util.parseFloat(str);\n    }\n\n    \/**\n     * @param str the String to convert to a double\n     * @return the parsed double or zero in case of exception\n     * @deprecated replaced by {@link Util#parseDouble(String)} since 1.3M2\n     *\/\n    @Deprecated\n    public double XWiki.parseDouble(String str)\n    {\n        return this.util.parseDouble(str);\n    }\n\n    \/**\n     * Escape text so that it can be used in a like clause or in a test for equality clause.\n     * For example it escapes single quote characters.\n     *\n     * @param text the text to escape\n     * @return filtered text\n     * @deprecated replaced by {@link Util#escapeSQL(String)} since 1.3M2\n     *\/\n    @Deprecated\n    public String XWiki.sqlfilter(String text)\n    {\n        return this.util.escapeSQL(text);\n    }\n\n    \/**\n     * Cleans up the passed text by removing all accents and special characters to make it\n     * a valid page name.\n     *\n     * @param name the page name to normalize\n     * @return the valid page name\n     * @deprecated replaced by {@link Util#clearName(String)} since 1.3M2\n     *\/\n    @Deprecated\n    public String XWiki.clearName(String name)\n    {\n        return this.util.clearName(name);\n    }\n\n    \/**\n     * Replace all accents by their alpha equivalent.\n     *\n     * @param text the text to parse\n     * @return a string with accents replaced with their alpha equivalent\n     * @deprecated replaced by {@link Util#clearAccents(String)} since 1.3M2\n     *\/\n    @Deprecated\n    public String XWiki.clearAccents(String text)\n    {\n        return this.util.clearAccents(text);\n    }\n\n    \/**\n     * Add a and b because Velocity operations are not always working.\n     *\n     * @param a an integer to add\n     * @param b an integer to add\n     * @return the sum of a and b\n     * @deprecated replaced by {@link Util#add(int, int)} since 1.3M2\n     *\/\n    @Deprecated\n    public int XWiki.add(int a, int b)\n    {\n        return this.util.add(a, b);\n    }\n\n    \/**\n     * Add a and b because Velocity operations are not working with longs.\n     *\n     * @param a a long to add\n     * @param b a long to add\n     * @return the sum of a and b\n     * @deprecated replaced by {@link Util#add(long, long)} since 1.3M2\n     *\/\n    @Deprecated\n    public long XWiki.add(long a, long b)\n    {\n        return this.util.add(a, b);\n    }\n\n    \/**\n     * Add a and b where a and b are non decimal numbers specified as Strings.\n     *\n     * @param a a string representing a non decimal number\n     * @param b a string representing a non decimal number\n     * @return the sum of a and b as a String\n     * @deprecated replaced by {@link Util#add(String, String)} since 1.3M2\n     *\/\n    @Deprecated\n    public String XWiki.add(String a, String b)\n    {\n        return this.util.add(a,  b);\n    }\n\n    \/**\n     * Transform a text in a URL compatible text\n     * \n     * @param content text to transform\n     * @return encoded result\n     * @deprecated replaced by {@link Util#encodeURI(String)} since 1.3M2\n     *\/\n    @Deprecated\n    public String XWiki.getURLEncoded(String content)\n    {\n        return this.util.encodeURI(content);\n    }\n    \n    \/**\n     * @return true for multi-wiki\/false for mono-wiki\n     * @deprecated replaced by {@link XWiki#isVirtualMode()} since 1.4M1.\n     *\/\n    @Deprecated\n    public boolean XWiki.isVirtual()\n    {\n        return this.isVirtualMode();\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpaceCopyright()} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebCopyright()\n    {\n        return this.getSpaceCopyright();\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference)\n    {\n        return this.getSpacePreference(preference);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceFor(String, String)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreferenceFor(String preference, String space)\n    {\n        return this.getSpacePreferenceFor(preference, space);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceFor(String, String, String)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreferenceFor(String preference, String space, String defaultValue)\n    {\n        return this.getSpacePreferenceFor(preference, space, defaultValue);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsLong(String, long)} since 2.3M1\n     *\/\n    @Deprecated\n    public long XWiki.getWebPreferenceAsLong(String preference, long defaultValue)\n    {\n        return this.getSpacePreferenceAsLong(preference, defaultValue);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsLong(String)} since 2.3M1\n     *\/\n    @Deprecated\n    public long XWiki.getWebPreferenceAsLong(String preference)\n    {\n        return this.getSpacePreferenceAsLong(preference);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsInt(String, int)} since 2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.getWebPreferenceAsInt(String preference, int defaultValue)\n    {\n        return this.getSpacePreferenceAsInt(preference, defaultValue);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, String)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, String defaultValue)\n    {\n        return this.getSpacePreference(preference, defaultValue);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsInt(String)} since 2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.getWebPreferenceAsInt(String preference)\n    {\n        return this.getSpacePreferenceAsInt(preference);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#copySpaceBetweenWikis(String, String, String, String, boolean)} since 2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.copyWikiWeb(String space, String sourceWiki, String targetWiki, String language, boolean clean)\n        throws XWikiException\n    {\n        return this.copySpaceBetweenWikis(space, sourceWiki, targetWiki, language, clean);\n    }\n    \n    \/**\n     * API to parse the message being stored in the Context. A message can be an error message or an information message\n     * either as text or as a message ID pointing to ApplicationResources. The message is also parse for velocity scripts\n     * \n     * @return Final message\n     * @deprecated use {@link XWikiMessageTool#get(String, List)} instead. From velocity you can access XWikiMessageTool\n     *             with $msg binding.\n     *\/\n    @Deprecated\n    public String XWiki.parseMessage()\n    {\n        return this.xwiki.parseMessage(getXWikiContext());\n    }\n\n    \/**\n     * API to parse a message. A message can be an error message or an information message either as text or as a message\n     * ID pointing to ApplicationResources. The message is also parse for velocity scripts\n     * \n     * @return Final message\n     * @param id\n     * @return the result of the parsed message\n     * @deprecated use {@link XWikiMessageTool#get(String, List)} instead. From velocity you can access XWikiMessageTool\n     *             with $msg binding.\n     *\/\n    @Deprecated\n    public String XWiki.parseMessage(String id)\n    {\n        return this.xwiki.parseMessage(id, getXWikiContext());\n    }\n\n    \/**\n     * API to get a message. A message can be an error message or an information message either as text or as a message\n     * ID pointing to ApplicationResources. The message is also parsed for velocity scripts\n     * \n     * @return Final message\n     * @param id\n     * @return the result of the parsed message\n     * @deprecated use {@link XWikiMessageTool#get(String, List)} instead. From velocity you can access XWikiMessageTool\n     *             with $msg binding.\n     *\/\n    @Deprecated\n    public String XWiki.getMessage(String id)\n    {\n        return this.xwiki.getMessage(id, getXWikiContext());\n    }\n\n    \/**\n     * Transform a text in a form compatible text\n     * \n     * @param content text to transform\n     * @return encoded result\n     * @deprecated Use $escapetool.xml\n     *\/\n    @Deprecated\n    public String XWiki.getFormEncoded(String content)\n    {\n        return XMLUtils.escape(content);\n    }\n\n    \/**\n     * Transform a text in a XML compatible text This method uses Apache CharacterFilter which swaps single quote\n     * (&#39;) for left single quotation mark (&#8217;)\n     * \n     * @param content text to transform\n     * @return encoded result\n     * @deprecated Use $escapetool.xml\n     *\/\n    @Deprecated\n    public String XWiki.getXMLEncoded(String content)\n    {\n        return XMLUtils.escape(content);\n    }\n\n    \/**\n     * Output content in the edit content htmlarea\n     * \n     * @param content content to output\n     * @return the htmlarea text content\n     * @deprecated Removed since it isn't used; since 3.1M2.\n     *\/\n    @Deprecated\n    public String XWiki.getHTMLArea(String content)\n    {\n        return this.xwiki.getHTMLArea(content, getXWikiContext());\n    }\n    \n\n    \/**\n     * API to display a select box for the list of available field for a specific class This field data can then be used\n     * to generate an XWiki Query showing a table with the relevant data\n     * \n     * @param className XWiki Class Name to display the list of columns for\n     * @param query Query to pre-select the currently selected columns\n     * @return text of the select field\n     * @throws XWikiException exception is a failure occured\n     *\/\n    @Deprecated\n    public String XWiki.displaySearchColumns(String className, XWikiQuery query) throws XWikiException\n    {\n        return this.xwiki.displaySearchColumns(className, \"\", query, getXWikiContext());\n    }\n\n    \/**\n     * API to display a select box for the list of available field for a specific class, optionally adding a prefix This\n     * field data can then be used to generate an XWiki Query showing a table with the relevant data\n     * \n     * @param className XWiki Class Name to display the list of columns for\n     * @param prefix Prefix to add to the field name\n     * @param query Query to pre-select the currently selected columns\n     * @return text of the select field\n     * @throws XWikiException exception is a failure occured\n     *\/\n    @Deprecated\n    public String XWiki.displaySearchColumns(String className, String prefix, XWikiQuery query) throws XWikiException\n    {\n        return this.xwiki.displaySearchColumns(className, prefix, query, getXWikiContext());\n    }\n\n    \/**\n     * API to display a select box for the list of available field for a specific class This field data can then be used\n     * to generate the order element of an XWiki Query showing a table with the relevant data\n     * \n     * @param className XWiki Class Name to display the list of columns for\n     * @param query Query to pre-select the currently selected columns\n     * @return text of the select field\n     * @throws XWikiException exception is a failure occured\n     *\/\n    @Deprecated\n    public String XWiki.displaySearchOrder(String className, XWikiQuery query) throws XWikiException\n    {\n        return this.xwiki.displaySearchOrder(className, \"\", query, getXWikiContext());\n    }\n\n    \/**\n     * API to display a select box for the list of available field for a specific class, optionally adding a prefix This\n     * field data can then be used to generate the order element of an XWiki Query showing a table with the relevant\n     * data\n     * \n     * @param className XWiki Class Name to display the list of columns for\n     * @param prefix Prefix to add to the field name\n     * @param query Query to pre-select the currently selected columns\n     * @return text of the select field\n     * @throws XWikiException exception is a failure occured\n     *\/\n    @Deprecated\n    public String XWiki.displaySearchOrder(String className, String prefix, XWikiQuery query) throws XWikiException\n    {\n        return this.xwiki.displaySearchOrder(className, prefix, query, getXWikiContext());\n    }\n\n    \/**\n     * API to run a search from an XWikiQuery Object An XWikiQuery object can be created from a request using the\n     * createQueryFromRequest function\n     * \n     * @param query query to run the search for\n     * @return A list of document names matching the query\n     * @throws XWikiException exception is a failure occured\n     *\/\n    public <T> List<T> XWiki.search(XWikiQuery query) throws XWikiException\n    {\n        return this.xwiki.search(query, getXWikiContext());\n    }\n\n    \/**\n     * API to create a query from a request Object The request object is the result of a form created from the\n     * displaySearch() and displaySearchColumns() functions\n     * \n     * @param className class name to create the query from\n     * @return an XWikiQuery object matching the selected values in the request object\n     * @throws XWikiException exception is a failure occured\n     *\/\n    public XWikiQuery XWiki.createQueryFromRequest(String className) throws XWikiException\n    {\n        return this.xwiki.createQueryFromRequest(className, getXWikiContext());\n    }\n\n    \/**\n     * API to run a search from an XWikiQuery Object and display it as a HTML table An XWikiQuery object can be created\n     * from a request using the createQueryFromRequest function\n     * \n     * @param query query to run the search for\n     * @return An HTML table showing the result\n     * @throws XWikiException exception is a failure occured\n     *\/\n    public String XWiki.searchAsTable(XWikiQuery query) throws XWikiException\n    {\n        return this.xwiki.searchAsTable(query, getXWikiContext());\n    }\n\n    \/**\n     * API to display a field in search mode for a specific class with preselected values This field data can then be\n     * used to generate an XWiki Query showing a table with the relevant data\n     * \n     * @param fieldname field name in the class\n     * @param className class name to display the field from\n     * @param criteria XWikiCriteria object (usually the XWikiQuery object) to take the preselected values from\n     * @return text of the select field\n     * @throws XWikiException exception is a failure occured\n     *\/\n    public String XWiki.displaySearch(String fieldname, String className, XWikiCriteria criteria) throws XWikiException\n    {\n        return this.xwiki.displaySearch(fieldname, className, criteria, getXWikiContext());\n    }\n\n    \/**\n     * API to display a field in search mode for a specific class with preselected values, optionally adding a prefix to\n     * the field name This field data can then be used to generate an XWiki Query showing a table with the relevant data\n     * \n     * @param fieldname field name in the class\n     * @param className class name to display the field from\n     * @param prefix prefix to add to the field name\n     * @param criteria XWikiCriteria object (usually the XWikiQuery object) to take the preselected values from\n     * @return text of the select field\n     * @throws XWikiException exception is a failure occured\n     *\/\n    public String XWiki.displaySearch(String fieldname, String className, String prefix, XWikiCriteria criteria)\n        throws XWikiException\n    {\n        return this.xwiki.displaySearch(fieldname, className, prefix, criteria, getXWikiContext());\n    }\n\n    \/**\n     * API to display a field in search mode for a specific class without preselected values This field data can then be\n     * used to generate an XWiki Query showing a table with the relevant data\n     * \n     * @param fieldname field name in the class\n     * @param className class name to display the field from\n     * @return text of the select field\n     * @throws XWikiException exception is a failure occured\n     *\/\n    public String XWiki.displaySearch(String fieldname, String className) throws XWikiException\n    {\n        return this.xwiki.displaySearch(fieldname, className, getXWikiContext());\n    }\n\n    \/**\n     * Priviledged API to create a new Wiki from an existing wiki This creates the database, copies to documents from a\n     * existing wiki Assigns the admin rights, creates the Wiki identification page in the main wiki\n     * \n     * @param wikiName Wiki Name to create\n     * @param wikiUrl Wiki URL to accept requests from\n     * @param wikiAdmin Wiki admin user\n     * @param baseWikiName Wiki to copy documents from\n     * @param failOnExist true to fail if the wiki already exists, false to overwrite\n     * @return Success of Failure code (0 for success, -1 for missing programming rights, > 0 for other errors\n     * @throws XWikiException\n     * @deprecated use WikiManager plugin instead\n     *\/\n    @Deprecated\n    public int XWiki.createNewWiki(String wikiName, String wikiUrl, String wikiAdmin, String baseWikiName, boolean failOnExist)\n        throws XWikiException\n    {\n        return createNewWiki(wikiName, wikiUrl, wikiAdmin, baseWikiName, \"\", null, failOnExist);\n    }\n\n    \/**\n     * Priviledged API to create a new Wiki from an existing wiki This creates the database, copies to documents from a\n     * existing wiki Assigns the admin rights, creates the Wiki identification page in the main wiki\n     * \n     * @param wikiName Wiki Name to create\n     * @param wikiUrl Wiki URL to accept requests from\n     * @param wikiAdmin Wiki admin user\n     * @param baseWikiName Wiki to copy documents from\n     * @param description Description of the Wiki\n     * @param failOnExist true to fail if the wiki already exists, false to overwrite\n     * @return Success of Failure code (0 for success, -1 for missing programming rights, > 0 for other errors\n     * @throws XWikiException\n     * @deprecated use WikiManager plugin instead\n     *\/\n    @Deprecated\n    public int XWiki.createNewWiki(String wikiName, String wikiUrl, String wikiAdmin, String baseWikiName,\n        String description, boolean failOnExist) throws XWikiException\n    {\n        return createNewWiki(wikiName, wikiUrl, wikiAdmin, baseWikiName, description, null, failOnExist);\n    }\n\n    \/**\n     * Priviledged API to create a new Wiki from an existing wiki This creates the database, copies to documents from a\n     * existing wiki Assigns the admin rights, creates the Wiki identification page in the main wiki Copy is limited to\n     * documents of a specified language. If a document for the language is not found, the default language document is\n     * used\n     * \n     * @param wikiName Wiki Name to create\n     * @param wikiUrl Wiki URL to accept requests from\n     * @param wikiAdmin Wiki admin user\n     * @param baseWikiName Wiki to copy documents from\n     * @param description Description of the Wiki\n     * @param language Language to copy\n     * @param failOnExist true to fail if the wiki already exists, false to overwrite\n     * @return Success of Failure code (0 for success, -1 for missing programming rights, > 0 for other errors\n     * @throws XWikiException\n     * @deprecated use WikiManager plugin instead\n     *\/\n    @Deprecated\n    public int XWiki.createNewWiki(String wikiName, String wikiUrl, String wikiAdmin, String baseWikiName,\n        String description, String language, boolean failOnExist) throws XWikiException\n    {\n        if (hasProgrammingRights()) {\n            return this.xwiki.createNewWiki(wikiName, wikiUrl, wikiAdmin, baseWikiName, description, language,\n                failOnExist, getXWikiContext());\n        }\n\n        return -1;\n    }\n}","old_contents":"\/*\n * See the NOTICE file distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This is free software; you can redistribute it and\/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF site: http:\/\/www.fsf.org.\n *\/\npackage com.xpn.xwiki.api;\n\nimport java.awt.image.BufferedImage;\nimport java.io.IOException;\nimport java.util.ArrayList;\nimport java.util.Collections;\nimport java.util.Date;\nimport java.util.HashMap;\nimport java.util.List;\nimport java.util.Map;\nimport java.util.TreeMap;\n\nimport org.xwiki.xml.XMLUtils;\n\nimport com.xpn.xwiki.XWikiException;\nimport com.xpn.xwiki.plugin.query.XWikiCriteria;\nimport com.xpn.xwiki.plugin.query.XWikiQuery;\nimport com.xpn.xwiki.stats.api.XWikiStatsService;\nimport com.xpn.xwiki.web.XWikiMessageTool;\n\n\/**\n * Add a backward compatibility layer to the {@link com.xpn.xwiki.api.XWiki} class.\n *\n * @version $Id$\n *\/\npublic privileged aspect XWikiCompatibilityAspect\n{\n    \/**\n     * Utility methods have been moved in version 1.3 Milestone 2 to the {@link Util} class.\n     * However to preserve backward compatibility we have deprecated them in this class and\n     * not removed them yet. All calls are funnelled through this class variable.\n     *\/\n    private Util XWiki.util;\n\n    \/**\n     * Capture the api.XWiki constructor so that we can initialize this.util.\n     *\/\n    private pointcut xwikiCreation(XWiki x): this(x) && execution( public XWiki.new(..) );\n\n    after(XWiki x): xwikiCreation(x)\n    {\n        x.util = new Util(x.xwiki, x.context);\n    }\n\n    \/**\n     * @deprecated use {@link #getLanguagePreference()} instead\n     *\/\n    @Deprecated\n    public String XWiki.getDocLanguagePreference()\n    {\n        return xwiki.getDocLanguagePreference(getXWikiContext());\n    }\n\n    \/**\n     * Privileged API to send a message to an email address\n     *\n     * @param sender email of the sender of the message\n     * @param recipient email of the recipient of the message\n     * @param message Message to send\n     * @throws XWikiException if the mail was not send successfully\n     * @deprecated replaced by the\n     *   <a href=\"http:\/\/code.xwiki.org\/xwiki\/bin\/view\/Plugins\/MailSenderPlugin\">Mail Sender\n     *   Plugin<\/a> since 1.3M2\n     *\/\n    @Deprecated\n    public void XWiki.sendMessage(String sender, String recipient, String message)\n        throws XWikiException\n    {\n        if (hasProgrammingRights())\n            xwiki.sendMessage(sender, recipient, message, getXWikiContext());\n    }\n\n    \/**\n     * Privileged API to send a message to an email address\n     *\n     * @param sender email of the sender of the message\n     * @param recipient emails of the recipients of the message\n     * @param message Message to send\n     * @throws XWikiException if the mail was not send successfully\n     * @deprecated replaced by the\n     *   <a href=\"http:\/\/code.xwiki.org\/xwiki\/bin\/view\/Plugins\/MailSenderPlugin\">Mail Sender\n     *   Plugin<\/a> since 1.3M2\n     *\/\n    @Deprecated\n    public void XWiki.sendMessage(String sender, String[] recipient, String message)\n        throws XWikiException\n    {\n        if (hasProgrammingRights())\n            xwiki.sendMessage(sender, recipient, message, getXWikiContext());\n    }\n\n    \/**\n     * @return the current date\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#getDate()} since 1.3M2\n     *\/\n    @Deprecated\n    public Date XWiki.getCurrentDate()\n    {\n        return this.util.getDate();\n    }\n\n    \/**\n     * @return the current date\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#getDate()} since 1.3M2\n     *\/\n    @Deprecated\n    public Date XWiki.getDate()\n    {\n        return this.util.getDate();\n    }\n\n    \/**\n     * @param time the time in milliseconds\n     * @return the time delta in milliseconds between the current date and the time passed\n     *         as parameter\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#getTimeDelta(long)} since 1.3M2\n     *\/\n    @Deprecated\n    public int XWiki.getTimeDelta(long time)\n    {\n        return this.util.getTimeDelta(time);\n    }\n\n    \/**\n     * @param time time in milliseconds since 1970, 00:00:00 GMT\n     * @return Date a date from a time in milliseconds since 01\/01\/1970 as a\n     *         Java {@link Date} Object\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#getDate(long)} since 1.3M2\n     *\/\n    @Deprecated\n    public Date XWiki.getDate(long time)\n    {\n        return this.util.getDate(time);\n    }\n\n    \/**\n     * Split a text to an array of texts, according to a separator.\n     *\n     * @param text the original text\n     * @param sep the separator characters. The separator is one or more of the\n     *        separator characters\n     * @return An array containing the split text\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#split(String, String)} since 1.3M2\n     *\/\n    @Deprecated\n    public String[] XWiki.split(String text, String sep)\n    {\n        return this.util.split(text, sep);\n    }\n\n    \/**\n     * Get a stack trace as a String\n     *\n     * @param e the exception to convert to a String\n     * @return the exception stack trace as a String\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#printStrackTrace(Throwable)}\n     *             since 1.3M2\n     *\/\n    @Deprecated\n    public String XWiki.printStrackTrace(Throwable e)\n    {\n        return this.util.printStrackTrace(e);\n    }\n\n    \/**\n     * Get a Null object. This is useful in Velocity where there is no real null object\n     * for comparaisons.\n     *\n     * @return a Null Object\n     * @deprecated replaced by {@link Util#getNull()} since 1.3M2\n     *\/\n    @Deprecated\n    public Object XWiki.getNull()\n    {\n        return this.util.getNull();\n    }\n\n    \/**\n     * Get a New Line character. This is useful in Velocity where there is no real new\n     * line character for inclusion in texts.\n     *\n     * @return a new line character\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#getNewline()} since 1.3M2\n     *\/\n    @Deprecated\n    public String XWiki.getNl()\n    {\n        return this.util.getNewline();\n    }\n\n    \/**\n     * Creates an Array List. This is useful from Velocity since you cannot\n     * create Object from Velocity with our secure uberspector.\n     *\n     * @return a {@link ArrayList} object\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#getArrayList()} since 1.3M2\n     *\/\n    @Deprecated\n    public List XWiki.getArrayList()\n    {\n        return this.util.getArrayList();\n    }\n\n    \/**\n     * Creates a Hash Map. This is useful from Velocity since you cannot\n     * create Object from Velocity with our secure uberspector.\n     *\n     * @return a {@link HashMap} object\n     * @deprecated replaced by {@link Util#getHashMap()} since 1.3M2\n     *\/\n    @Deprecated\n    public Map XWiki.getHashMap()\n    {\n        return this.util.getHashMap();\n    }\n\n    \/**\n     * Creates a Tree Map. This is useful from Velocity since you cannot\n     * create Object from Velocity with our secure uberspector.\n     *\n     * @return a {@link TreeMap} object\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#getTreeMap()} since 1.3M2\n     *\/\n    @Deprecated\n    public Map XWiki.getTreeMap()\n    {\n        return this.util.getTreeMap();\n    }\n\n    \/**\n     * Sort a list using a standard comparator. Elements need to be mutally comparable and\n     * implement the Comparable interface.\n     *\n     * @param list the list to sort\n     * @return the sorted list (as the same oject reference)\n     * @see {@link java.util.Collections#sort(java.util.List)}\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#sort(java.util.List)} since 1.3M2\n     *\/\n    @Deprecated\n    public List XWiki.sort(List list)\n    {\n        return this.util.sort(list);\n    }\n\n    \/**\n     * Convert an Object to a number and return null if the object is not a Number.\n     *\n     * @param object the object to convert\n     * @return the object as a {@link Number}\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#toNumber(Object)} since 1.3M2\n     *\/\n    @Deprecated\n    public Number XWiki.toNumber(Object object)\n    {\n        return this.util.toNumber(object);\n    }\n\n    \/**\n     * Generate a random string.\n     *\n     * @param size the desired size of the string\n     * @return the randomly generated string\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#generateRandomString(int)}\n                   since 1.3M2\n     *\/\n    @Deprecated\n    public String XWiki.generateRandomString(int size)\n    {\n        return this.util.generateRandomString(size);\n    }\n\n    \/**\n     * Output a BufferedImage object into the response outputstream.\n     * Once this method has been called, not further action is possible.\n     * Users should set $context.setFinished(true) to\n     * avoid template output The image is outpout as image\/jpeg.\n     *\n     * @param image the BufferedImage to output\n     * @throws java.io.IOException if the output fails\n     * @deprecated replaced by\n     *             {@link com.xpn.xwiki.api.Util#outputImage(java.awt.image.BufferedImage)}\n     *             since 1.3M2\n     *\/\n    @Deprecated\n    public void XWiki.outputImage(BufferedImage image) throws IOException\n    {\n        this.util.outputImage(image);\n    }\n\n    \/**\n     * Returns the recently visited pages for a specific action\n     *\n     * @param action (\"view\" or \"edit\")\n     * @param size how many recent actions to retrieve\n     * @return a ArrayList of document names\n     * @deprecated use {@link #getStatsService()} instead\n     *\/\n    @Deprecated\n    public java.util.Collection XWiki.getRecentActions(String action, int size)\n    {\n        XWikiStatsService stats = getXWikiContext().getWiki().getStatsService(getXWikiContext());\n        if (stats == null)\n            return Collections.EMPTY_LIST;\n        return stats.getRecentActions(action, size, getXWikiContext());\n    }\n\n    \/**\n     * @param str the String to convert to an integer\n     * @return the parsed integer or zero in case of exception\n     * @deprecated replaced by {@link Util#parseInt(String)} since 1.3M2\n     *\/\n    @Deprecated\n    public int XWiki.parseInt(String str)\n    {\n        return this.util.parseInt(str);\n    }\n\n    \/**\n     * @param str the String to convert to an Integer Object\n     * @return the parsed integer or zero in case of exception\n     * @deprecated replaced by {@link Util#parseInteger(String)} since 1.3M2\n     *\/\n    @Deprecated\n    public Integer XWiki.parseInteger(String str)\n    {\n        return this.util.parseInteger(str);\n    }\n\n    \/**\n     * @param str the String to convert to a long\n     * @return the parsed long or zero in case of exception\n     * @deprecated replaced by {@link Util#parseLong(String)} since 1.3M2\n     *\/\n    @Deprecated\n    public long XWiki.parseLong(String str)\n    {\n        return this.util.parseLong(str);\n    }\n\n    \/**\n     * @param str the String to convert to a float\n     * @return the parsed float or zero in case of exception\n     * @deprecated replaced by {@link Util#parseFloat(String)} since 1.3M2\n     *\/\n    @Deprecated\n    public float XWiki.parseFloat(String str)\n    {\n        return this.util.parseFloat(str);\n    }\n\n    \/**\n     * @param str the String to convert to a double\n     * @return the parsed double or zero in case of exception\n     * @deprecated replaced by {@link Util#parseDouble(String)} since 1.3M2\n     *\/\n    @Deprecated\n    public double XWiki.parseDouble(String str)\n    {\n        return this.util.parseDouble(str);\n    }\n\n    \/**\n     * Escape text so that it can be used in a like clause or in a test for equality clause.\n     * For example it escapes single quote characters.\n     *\n     * @param text the text to escape\n     * @return filtered text\n     * @deprecated replaced by {@link Util#escapeSQL(String)} since 1.3M2\n     *\/\n    @Deprecated\n    public String XWiki.sqlfilter(String text)\n    {\n        return this.util.escapeSQL(text);\n    }\n\n    \/**\n     * Cleans up the passed text by removing all accents and special characters to make it\n     * a valid page name.\n     *\n     * @param name the page name to normalize\n     * @return the valid page name\n     * @deprecated replaced by {@link Util#clearName(String)} since 1.3M2\n     *\/\n    @Deprecated\n    public String XWiki.clearName(String name)\n    {\n        return this.util.clearName(name);\n    }\n\n    \/**\n     * Replace all accents by their alpha equivalent.\n     *\n     * @param text the text to parse\n     * @return a string with accents replaced with their alpha equivalent\n     * @deprecated replaced by {@link Util#clearAccents(String)} since 1.3M2\n     *\/\n    @Deprecated\n    public String XWiki.clearAccents(String text)\n    {\n        return this.util.clearAccents(text);\n    }\n\n    \/**\n     * Add a and b because Velocity operations are not always working.\n     *\n     * @param a an integer to add\n     * @param b an integer to add\n     * @return the sum of a and b\n     * @deprecated replaced by {@link Util#add(int, int)} since 1.3M2\n     *\/\n    @Deprecated\n    public int XWiki.add(int a, int b)\n    {\n        return this.util.add(a, b);\n    }\n\n    \/**\n     * Add a and b because Velocity operations are not working with longs.\n     *\n     * @param a a long to add\n     * @param b a long to add\n     * @return the sum of a and b\n     * @deprecated replaced by {@link Util#add(long, long)} since 1.3M2\n     *\/\n    @Deprecated\n    public long XWiki.add(long a, long b)\n    {\n        return this.util.add(a, b);\n    }\n\n    \/**\n     * Add a and b where a and b are non decimal numbers specified as Strings.\n     *\n     * @param a a string representing a non decimal number\n     * @param b a string representing a non decimal number\n     * @return the sum of a and b as a String\n     * @deprecated replaced by {@link Util#add(String, String)} since 1.3M2\n     *\/\n    @Deprecated\n    public String XWiki.add(String a, String b)\n    {\n        return this.util.add(a,  b);\n    }\n\n    \/**\n     * Transform a text in a URL compatible text\n     * \n     * @param content text to transform\n     * @return encoded result\n     * @deprecated replaced by {@link Util#encodeURI(String)} since 1.3M2\n     *\/\n    @Deprecated\n    public String XWiki.getURLEncoded(String content)\n    {\n        return this.util.encodeURI(content);\n    }\n    \n    \/**\n     * @return true for multi-wiki\/false for mono-wiki\n     * @deprecated replaced by {@link XWiki#isVirtualMode()} since 1.4M1.\n     *\/\n    @Deprecated\n    public boolean XWiki.isVirtual()\n    {\n        return this.isVirtualMode();\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpaceCopyright()} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebCopyright()\n    {\n        return this.getSpaceCopyright();\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference)\n    {\n        return this.getSpacePreference(preference);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceFor(String, String)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreferenceFor(String preference, String space)\n    {\n        return this.getSpacePreferenceFor(preference, space);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceFor(String, String, String)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreferenceFor(String preference, String space, String defaultValue)\n    {\n        return this.getSpacePreferenceFor(preference, space, defaultValue);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsLong(String, long)} since 2.3M1\n     *\/\n    @Deprecated\n    public long XWiki.getWebPreferenceAsLong(String preference, long defaultValue)\n    {\n        return this.getSpacePreferenceAsLong(preference, defaultValue);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsLong(String)} since 2.3M1\n     *\/\n    @Deprecated\n    public long XWiki.getWebPreferenceAsLong(String preference)\n    {\n        return this.getSpacePreferenceAsLong(preference);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsInt(String, int)} since 2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.getWebPreferenceAsInt(String preference, int defaultValue)\n    {\n        return this.getSpacePreferenceAsInt(preference, defaultValue);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, String)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, String defaultValue)\n    {\n        return this.getSpacePreference(preference, defaultValue);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsInt(String)} since 2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.getWebPreferenceAsInt(String preference)\n    {\n        return this.getSpacePreferenceAsInt(preference);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#copySpaceBetweenWikis(String, String, String, String, boolean)} since 2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.copyWikiWeb(String space, String sourceWiki, String targetWiki, String language, boolean clean)\n        throws XWikiException\n    {\n        return this.copySpaceBetweenWikis(space, sourceWiki, targetWiki, language, clean);\n    }\n    \n    \/**\n     * API to parse the message being stored in the Context. A message can be an error message or an information message\n     * either as text or as a message ID pointing to ApplicationResources. The message is also parse for velocity scripts\n     * \n     * @return Final message\n     * @deprecated use {@link XWikiMessageTool#get(String, List)} instead. From velocity you can access XWikiMessageTool\n     *             with $msg binding.\n     *\/\n    @Deprecated\n    public String XWiki.parseMessage()\n    {\n        return this.xwiki.parseMessage(getXWikiContext());\n    }\n\n    \/**\n     * API to parse a message. A message can be an error message or an information message either as text or as a message\n     * ID pointing to ApplicationResources. The message is also parse for velocity scripts\n     * \n     * @return Final message\n     * @param id\n     * @return the result of the parsed message\n     * @deprecated use {@link XWikiMessageTool#get(String, List)} instead. From velocity you can access XWikiMessageTool\n     *             with $msg binding.\n     *\/\n    @Deprecated\n    public String XWiki.parseMessage(String id)\n    {\n        return this.xwiki.parseMessage(id, getXWikiContext());\n    }\n\n    \/**\n     * API to get a message. A message can be an error message or an information message either as text or as a message\n     * ID pointing to ApplicationResources. The message is also parsed for velocity scripts\n     * \n     * @return Final message\n     * @param id\n     * @return the result of the parsed message\n     * @deprecated use {@link XWikiMessageTool#get(String, List)} instead. From velocity you can access XWikiMessageTool\n     *             with $msg binding.\n     *\/\n    @Deprecated\n    public String XWiki.getMessage(String id)\n    {\n        return this.xwiki.getMessage(id, getXWikiContext());\n    }\n\n    \/**\n     * Transform a text in a form compatible text\n     * \n     * @param content text to transform\n     * @return encoded result\n     * @deprecated Use $escapetool.xml\n     *\/\n    @Deprecated\n    public String XWiki.getFormEncoded(String content)\n    {\n        return XMLUtils.escape(content);\n    }\n\n    \/**\n     * Transform a text in a XML compatible text This method uses Apache CharacterFilter which swaps single quote\n     * (&#39;) for left single quotation mark (&#8217;)\n     * \n     * @param content text to transform\n     * @return encoded result\n     * @deprecated Use $escapetool.xml\n     *\/\n    @Deprecated\n    public String XWiki.getXMLEncoded(String content)\n    {\n        return XMLUtils.escape(content);\n    }\n\n    \/**\n     * Output content in the edit content htmlarea\n     * \n     * @param content content to output\n     * @return the htmlarea text content\n     * @deprecated Removed since it isn't used; since 3.1M2.\n     *\/\n    @Deprecated\n    public String XWiki.getHTMLArea(String content)\n    {\n        return this.xwiki.getHTMLArea(content, getXWikiContext());\n    }\n    \n\n    \/**\n     * API to display a select box for the list of available field for a specific class This field data can then be used\n     * to generate an XWiki Query showing a table with the relevant data\n     * \n     * @param className XWiki Class Name to display the list of columns for\n     * @param query Query to pre-select the currently selected columns\n     * @return text of the select field\n     * @throws XWikiException exception is a failure occured\n     *\/\n    @Deprecated\n    public String XWiki.displaySearchColumns(String className, XWikiQuery query) throws XWikiException\n    {\n        return this.xwiki.displaySearchColumns(className, \"\", query, getXWikiContext());\n    }\n\n    \/**\n     * API to display a select box for the list of available field for a specific class, optionally adding a prefix This\n     * field data can then be used to generate an XWiki Query showing a table with the relevant data\n     * \n     * @param className XWiki Class Name to display the list of columns for\n     * @param prefix Prefix to add to the field name\n     * @param query Query to pre-select the currently selected columns\n     * @return text of the select field\n     * @throws XWikiException exception is a failure occured\n     *\/\n    @Deprecated\n    public String XWiki.displaySearchColumns(String className, String prefix, XWikiQuery query) throws XWikiException\n    {\n        return this.xwiki.displaySearchColumns(className, prefix, query, getXWikiContext());\n    }\n\n    \/**\n     * API to display a select box for the list of available field for a specific class This field data can then be used\n     * to generate the order element of an XWiki Query showing a table with the relevant data\n     * \n     * @param className XWiki Class Name to display the list of columns for\n     * @param query Query to pre-select the currently selected columns\n     * @return text of the select field\n     * @throws XWikiException exception is a failure occured\n     *\/\n    @Deprecated\n    public String XWiki.displaySearchOrder(String className, XWikiQuery query) throws XWikiException\n    {\n        return this.xwiki.displaySearchOrder(className, \"\", query, getXWikiContext());\n    }\n\n    \/**\n     * API to display a select box for the list of available field for a specific class, optionally adding a prefix This\n     * field data can then be used to generate the order element of an XWiki Query showing a table with the relevant\n     * data\n     * \n     * @param className XWiki Class Name to display the list of columns for\n     * @param prefix Prefix to add to the field name\n     * @param query Query to pre-select the currently selected columns\n     * @return text of the select field\n     * @throws XWikiException exception is a failure occured\n     *\/\n    @Deprecated\n    public String XWiki.displaySearchOrder(String className, String prefix, XWikiQuery query) throws XWikiException\n    {\n        return this.xwiki.displaySearchOrder(className, prefix, query, getXWikiContext());\n    }\n\n    \/**\n     * API to run a search from an XWikiQuery Object An XWikiQuery object can be created from a request using the\n     * createQueryFromRequest function\n     * \n     * @param query query to run the search for\n     * @return A list of document names matching the query\n     * @throws XWikiException exception is a failure occured\n     *\/\n    public <T> List<T> XWiki.search(XWikiQuery query) throws XWikiException\n    {\n        return this.xwiki.search(query, getXWikiContext());\n    }\n\n    \/**\n     * API to create a query from a request Object The request object is the result of a form created from the\n     * displaySearch() and displaySearchColumns() functions\n     * \n     * @param className class name to create the query from\n     * @return an XWikiQuery object matching the selected values in the request object\n     * @throws XWikiException exception is a failure occured\n     *\/\n    public XWikiQuery XWiki.createQueryFromRequest(String className) throws XWikiException\n    {\n        return this.xwiki.createQueryFromRequest(className, getXWikiContext());\n    }\n\n    \/**\n     * API to run a search from an XWikiQuery Object and display it as a HTML table An XWikiQuery object can be created\n     * from a request using the createQueryFromRequest function\n     * \n     * @param query query to run the search for\n     * @return An HTML table showing the result\n     * @throws XWikiException exception is a failure occured\n     *\/\n    public String XWiki.searchAsTable(XWikiQuery query) throws XWikiException\n    {\n        return this.xwiki.searchAsTable(query, getXWikiContext());\n    }\n\n    \/**\n     * API to display a field in search mode for a specific class with preselected values This field data can then be\n     * used to generate an XWiki Query showing a table with the relevant data\n     * \n     * @param fieldname field name in the class\n     * @param className class name to display the field from\n     * @param criteria XWikiCriteria object (usually the XWikiQuery object) to take the preselected values from\n     * @return text of the select field\n     * @throws XWikiException exception is a failure occured\n     *\/\n    public String XWiki.displaySearch(String fieldname, String className, XWikiCriteria criteria) throws XWikiException\n    {\n        return this.xwiki.displaySearch(fieldname, className, criteria, getXWikiContext());\n    }\n\n    \/**\n     * API to display a field in search mode for a specific class with preselected values, optionally adding a prefix to\n     * the field name This field data can then be used to generate an XWiki Query showing a table with the relevant data\n     * \n     * @param fieldname field name in the class\n     * @param className class name to display the field from\n     * @param prefix prefix to add to the field name\n     * @param criteria XWikiCriteria object (usually the XWikiQuery object) to take the preselected values from\n     * @return text of the select field\n     * @throws XWikiException exception is a failure occured\n     *\/\n    public String XWiki.displaySearch(String fieldname, String className, String prefix, XWikiCriteria criteria)\n        throws XWikiException\n    {\n        return this.xwiki.displaySearch(fieldname, className, prefix, criteria, getXWikiContext());\n    }\n\n    \/**\n     * API to display a field in search mode for a specific class without preselected values This field data can then be\n     * used to generate an XWiki Query showing a table with the relevant data\n     * \n     * @param fieldname field name in the class\n     * @param className class name to display the field from\n     * @return text of the select field\n     * @throws XWikiException exception is a failure occured\n     *\/\n    public String XWiki.displaySearch(String fieldname, String className) throws XWikiException\n    {\n        return this.xwiki.displaySearch(fieldname, className, getXWikiContext());\n    }\n\n    \/**\n     * Priviledged API to create a new Wiki from an existing wiki This creates the database, copies to documents from a\n     * existing wiki Assigns the admin rights, creates the Wiki identification page in the main wiki\n     * \n     * @param wikiName Wiki Name to create\n     * @param wikiUrl Wiki URL to accept requests from\n     * @param wikiAdmin Wiki admin user\n     * @param baseWikiName Wiki to copy documents from\n     * @param failOnExist true to fail if the wiki already exists, false to overwrite\n     * @return Success of Failure code (0 for success, -1 for missing programming rights, > 0 for other errors\n     * @throws XWikiException\n     * @deprecated use WikiManager plugin instead\n     *\/\n    @Deprecated\n    public int XWiki.createNewWiki(String wikiName, String wikiUrl, String wikiAdmin, String baseWikiName, boolean failOnExist)\n        throws XWikiException\n    {\n        return createNewWiki(wikiName, wikiUrl, wikiAdmin, baseWikiName, \"\", null, failOnExist);\n    }\n\n    \/**\n     * Priviledged API to create a new Wiki from an existing wiki This creates the database, copies to documents from a\n     * existing wiki Assigns the admin rights, creates the Wiki identification page in the main wiki\n     * \n     * @param wikiName Wiki Name to create\n     * @param wikiUrl Wiki URL to accept requests from\n     * @param wikiAdmin Wiki admin user\n     * @param baseWikiName Wiki to copy documents from\n     * @param description Description of the Wiki\n     * @param failOnExist true to fail if the wiki already exists, false to overwrite\n     * @return Success of Failure code (0 for success, -1 for missing programming rights, > 0 for other errors\n     * @throws XWikiException\n     * @deprecated use WikiManager plugin instead\n     *\/\n    @Deprecated\n    public int XWiki.createNewWiki(String wikiName, String wikiUrl, String wikiAdmin, String baseWikiName,\n        String description, boolean failOnExist) throws XWikiException\n    {\n        return createNewWiki(wikiName, wikiUrl, wikiAdmin, baseWikiName, description, null, failOnExist);\n    }\n\n    \/**\n     * Priviledged API to create a new Wiki from an existing wiki This creates the database, copies to documents from a\n     * existing wiki Assigns the admin rights, creates the Wiki identification page in the main wiki Copy is limited to\n     * documents of a specified language. If a document for the language is not found, the default language document is\n     * used\n     * \n     * @param wikiName Wiki Name to create\n     * @param wikiUrl Wiki URL to accept requests from\n     * @param wikiAdmin Wiki admin user\n     * @param baseWikiName Wiki to copy documents from\n     * @param description Description of the Wiki\n     * @param language Language to copy\n     * @param failOnExist true to fail if the wiki already exists, false to overwrite\n     * @return Success of Failure code (0 for success, -1 for missing programming rights, > 0 for other errors\n     * @throws XWikiException\n     * @deprecated use WikiManager plugin instead\n     *\/\n    @Deprecated\n    public int XWiki.createNewWiki(String wikiName, String wikiUrl, String wikiAdmin, String baseWikiName,\n        String description, String language, boolean failOnExist) throws XWikiException\n    {\n        if (hasProgrammingRights()) {\n            return this.xwiki.createNewWiki(wikiName, wikiUrl, wikiAdmin, baseWikiName, description, language,\n                failOnExist, getXWikiContext());\n        }\n\n        return -1;\n    }\n}","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"605ac0e230b314e170a195de077980252a18c6ef","subject":"Remove redundant @Aspect from CodeStyleAspect.aj","message":"Remove redundant @Aspect from CodeStyleAspect.aj\n\nThis has been present for quite some time, and compilation at the\ncommand line was never a problem.  However, after upgrading to\nSTS 2.3.3.M2, errors started appearing in the Problems tab about\n'duplicate @Aspect annotations'.  This message was a bit misleading\ngiven that the underlying issue is that applying an @Aspect annotation\non an aspect declared in .aj style is redundant.  Andy Clement is\ninvestigating as well, but for now the reason for the change in behavior\nremains a mystery.\n","repos":"spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework","old_file":"org.springframework.aspects\/src\/test\/java\/org\/springframework\/aop\/aspectj\/autoproxy\/CodeStyleAspect.aj","new_file":"org.springframework.aspects\/src\/test\/java\/org\/springframework\/aop\/aspectj\/autoproxy\/CodeStyleAspect.aj","new_contents":"\/*\r\n * Copyright 2002-2010 the original author or authors.\r\n *\r\n * Licensed under the Apache License, Version 2.0 (the \"License\");\r\n * you may not use this file except in compliance with the License.\r\n * You may obtain a copy of the License at\r\n *\r\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\r\n *\r\n * Unless required by applicable law or agreed to in writing, software\r\n * distributed under the License is distributed on an \"AS IS\" BASIS,\r\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n * See the License for the specific language governing permissions and\r\n * limitations under the License.\r\n *\/\r\n\r\npackage org.springframework.aop.aspectj.autoproxy;\r\n\r\n\/**\r\n * @author Adrian Colyer\r\n *\/\r\npublic aspect CodeStyleAspect {\r\n\r\n\tprivate String foo;\r\n\r\n\tpointcut somePC() : call(* someMethod());\r\n\r\n\tbefore() : somePC() {\r\n\t\tSystem.out.println(\"match\");\r\n\t}\r\n\r\n\tpublic void setFoo(String foo) {\r\n\t\tthis.foo = foo;\r\n\t}\r\n\r\n}\r\n","old_contents":"\/*\r\n * Copyright 2002-2007 the original author or authors.\r\n *\r\n * Licensed under the Apache License, Version 2.0 (the \"License\");\r\n * you may not use this file except in compliance with the License.\r\n * You may obtain a copy of the License at\r\n *\r\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\r\n *\r\n * Unless required by applicable law or agreed to in writing, software\r\n * distributed under the License is distributed on an \"AS IS\" BASIS,\r\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n * See the License for the specific language governing permissions and\r\n * limitations under the License.\r\n *\/\r\n\r\npackage org.springframework.aop.aspectj.autoproxy;\r\n\r\nimport org.aspectj.lang.annotation.Aspect;\r\n\r\n\/**\r\n * @author Adrian Colyer\r\n *\/\r\n@Aspect\r\npublic aspect CodeStyleAspect {\r\n\r\n\tprivate String foo;\r\n\r\n\tpointcut somePC() : call(* someMethod());\r\n\r\n\tbefore() : somePC() {\r\n\t\tSystem.out.println(\"match\");\r\n\t}\r\n\r\n\tpublic void setFoo(String foo) {\r\n\t\tthis.foo = foo;\r\n\t}\r\n\r\n}\r\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"9da2819f9a06ffa61006b3a5f5269ae5b39e9c78","subject":"launch may be null if running a program directly from \/\/J api (not launching one)","message":"launch may be null if running a program directly from \/\/J api (not launching one)\n","repos":"christophe-w\/parallelj.runtime,awltech\/org.parallelj","old_file":"parallelj-launching\/src\/main\/java\/org\/parallelj\/launching\/internal\/LaunchManagement.aj","new_file":"parallelj-launching\/src\/main\/java\/org\/parallelj\/launching\/internal\/LaunchManagement.aj","new_contents":"\/*\n *     ParallelJ, framework for parallel computing\n *\n *     Copyright (C) 2010, 2011, 2012 Atos Worldline or third-party contributors as\n *     indicated by the @author tags or express copyright attribution\n *     statements applied by the authors.\n *\n *     This library is free software; you can redistribute it and\/or\n *     modify it under the terms of the GNU Lesser General Public\n *     License as published by the Free Software Foundation; either\n *     version 2.1 of the License.\n *\n *     This library is distributed in the hope that it will be useful,\n *     but WITHOUT ANY WARRANTY; without even the implied warranty of\n *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n *     Lesser General Public License for more details.\n *\n *     You should have received a copy of the GNU Lesser General Public\n *     License along with this library; if not, write to the Free Software\n *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n *\/\npackage org.parallelj.launching.internal;\n\nimport java.util.Map;\nimport java.util.concurrent.ConcurrentHashMap;\nimport java.util.concurrent.ExecutorService;\n\nimport org.parallelj.Programs;\nimport org.parallelj.internal.conf.ConfigurationService;\nimport org.parallelj.internal.conf.ParalleljConfigurationManager;\nimport org.parallelj.internal.conf.pojos.CExecutors;\nimport org.parallelj.internal.conf.pojos.ParalleljConfiguration;\nimport org.parallelj.internal.kernel.KProcess;\nimport org.parallelj.internal.kernel.KProcessor;\nimport org.parallelj.internal.kernel.procedure.CallableProcedure.CallableCall.CallableCallRunnable;\nimport org.parallelj.internal.kernel.procedure.RunnableProcedure.RunnableCall.RunnableCallRunnable;\nimport org.parallelj.internal.kernel.procedure.SubProcessProcedure.SubProcessCall.SubProcessRunnable;\nimport org.parallelj.internal.reflect.ProcessHelperImpl;\nimport org.parallelj.launching.Launch;\nimport org.parallelj.launching.LaunchException;\nimport org.parallelj.launching.LaunchingMessageKind;\nimport org.parallelj.launching.ProgramReturnCodes;\nimport org.parallelj.launching.internal.LaunchManagement.LaunchAdapter.IKProcessorLaunch;\nimport org.parallelj.mirror.ParallelJThreadFactory;\n\nimport org.parallelj.launching.executors.ExecutorServiceManager;\n\n\/**\n * Implements the synchLaunch(..) and aSynchLaunch(..) methods of Launch.\n * \n * \n *\/\nprivileged aspect LaunchManagement { \n\t\n\tprivate static Map<KProcessor, LaunchImpl<?>> phl = new ConcurrentHashMap<>(); \n\t\n\tstatic privileged public aspect LaunchAdapter percflow(launchInstance() ) {\n\t\n\t\tdeclare precedence :\n\t\t\torg.parallelj.internal.kernel.Identifiers,\n\t\t\torg.parallelj.internal.reflect.ProgramAdapter,\n\t\t\torg.parallelj.internal.util.sm.impl.KStateMachines,\n\t\t\torg.parallelj.internal.util.sm.impl.KStateMachines.PerMachine,\n\t\t\torg.parallelj.Executables$PerExecutable,\n\t\t\torg.parallelj.internal.reflect.ProgramAdapter.PerProgram,\n\t\t\torg.parallelj.internal.log.Logs;\n\t\n\t\tpointcut launchInstance() : execution(* Launch+.*(..));\n\t\n\t\tinterface IKProcessorLaunch {}\n\t\tLaunchImpl<?> IKProcessorLaunch.launch;\n\t\tdeclare parents: KProcessor implements IKProcessorLaunch;\n\t\t\n\t\tinterface ILaunchExecutors {}\n\t\tExecutorServiceManager ILaunchExecutors.executorServiceManager;\t\t\n\t\tdeclare parents: LaunchImpl implements ILaunchExecutors;\n\t\t\n\t\tprivate LaunchingObservable observable = new LaunchingObservable();\n\t\t\n\t\tboolean stopExecutorServiceAfterExecution = false;\n\t\n\t\tprivate static class AsyncThread implements Runnable {\n\t\n\t\t\tprivate LaunchAdapter launchAdapter;\n\t\t\tprivate LaunchImpl<?> launch;\n\t\n\t\t\tpublic AsyncThread(LaunchImpl<?> launch, LaunchAdapter launchAdapter) {\n\t\t\t\tthis.launch = launch;\n\t\t\t\tthis.launchAdapter = launchAdapter;\n\t\t\t}\n\t\n\t\t\t@Override\n\t\t\tpublic void run() {\n\t\t\t\tthis.launchAdapter.internalSyncLaunch(this.launch);\n\t\t\t}\n\t\t}\n\t\t\n\t\t@SuppressWarnings({ \"rawtypes\", \"unchecked\" })\n\t\tLaunch around(LaunchImpl launch) throws LaunchException: \n\t\t\t\t\texecution(public Launch Launch+.synchLaunch(..) throws LaunchException)\n\t\t\t\t\t\t&& this(launch) {\n\t\t\tproceed(launch);\n\t\t\tlaunch.processHelper = Programs.as(launch.jobInstance);\n\t\t\tlaunch.getLaunchResult().setStatusCode(ProgramReturnCodes.RUNNING);\n\t\t\tthis.observable.prepareLaunching(launch);\n\t\n\t\t\treturn internalSyncLaunch(launch);\n\t\t}\n\t\n\t\t@SuppressWarnings({ \"rawtypes\", \"unchecked\" })\n\t\tLaunch around(LaunchImpl launch) throws LaunchException: \n\t\t\t\t\texecution(public Launch Launch+.aSynchLaunch() throws LaunchException)\n\t\t\t\t\t\t&& this(launch) {\n\t\t\tproceed(launch);\n\t\t\tlaunch.processHelper = Programs.as(launch.jobInstance);\n\t\t\tlaunch.getLaunchResult().setStatusCode(ProgramReturnCodes.RUNNING);\n\t\t\tthis.observable.prepareLaunching(launch);\n\t\t\tif (launch.getExecutorService()!=null) {\n\t\t\t\tlaunch.getExecutorService().execute(new AsyncThread(launch, this));\n\t\t\t} else {\n\t\t\t\tParallelJThreadFactory.getInstance().newThread(new AsyncThread(launch, this)).start();\n\t \t\t}\n\t\t\treturn launch;\n\t\t}\n\t\n\t\t@SuppressWarnings(\"rawtypes\")\n\t\tprivate Launch<?> internalSyncLaunch(LaunchImpl<?> launch) {\n\t\t\tLaunchingMessageKind.ILAUNCH0002.format(launch.getJobInstance()\n\t\t\t\t\t.getClass().getCanonicalName(), launch.getLaunchId());\n\t\t\tinitializeExecutors(launch);\n\t\t\tProcessHelperImpl processHelper = (ProcessHelperImpl)launch.getProcessHelper();\n\t\t\tKProcessor processor = processHelper.processor;\n\t\t\tif (processor == null) {\n\t\t\t\tif ( ((ILaunchExecutors)launch).executorServiceManager!=null \n\t\t\t\t\t\t&& ((ILaunchExecutors)launch).executorServiceManager.getDefaultExecutor()!=null) {\n\t\t\t\t\tprocessor = new KProcessor(((ILaunchExecutors)launch).executorServiceManager.getDefaultExecutor());\n\t\t\t\t} else {\n\t\t\t\t\tprocessor = new KProcessor(launch.getExecutorService());\n\t\t\t\t}\n\t\t\t\t((IKProcessorLaunch)processor).launch = launch;\n\t\t\t\tphl.put(processor, launch);\n\t\t\t}\n\t\t\tprocessor.execute(processHelper.process);\n\t\t\tlaunch.getProcessHelper().join();\n\t\t\tthis.observable.finalizeLaunching(launch);\n\t\t\tlaunch.complete();\n\t\t\tif(launch.executorServiceManager!=null) {\n\t\t\t\tlaunch.executorServiceManager.clean();\n\t\t\t}\n\t\t\tphl.remove(processor);\n\t\t\t\n\t\t\tif (launch.getLaunchResult().getStatusCode()!=ProgramReturnCodes.FAILURE\n\t\t\t\t\t&&launch.getLaunchResult().getStatusCode()!=ProgramReturnCodes.ABORTED) {\n\t\t\t\tlaunch.getLaunchResult().setStatusCode(ProgramReturnCodes.SUCCESS);\n\t\t\t}\n\t\t\tLaunchingMessageKind.ILAUNCH0003.format(launch.getJobInstance()\n\t\t\t\t\t.getClass().getCanonicalName(), launch.getLaunchId(), launch\n\t\t\t\t\t.getLaunchResult().getStatusCode(), launch.getLaunchResult()\n\t\t\t\t\t.getReturnCode());\n\t\t\treturn launch;\n\t\t}\n\t\t\n\t\tprivate void initializeExecutors(LaunchImpl<?> launch) {\n\t\t\tParalleljConfiguration configuration = (ParalleljConfiguration) ConfigurationService\n\t\t\t\t\t.getConfigurationService().getConfigurationManager()\n\t\t\t\t\t.get(ParalleljConfigurationManager.class)\n\t\t\t\t\t.getConfiguration();\n\t\t\tCExecutors cExecutors = configuration != null ? configuration\n\t\t\t\t\t.getExecutorServices() : null;\n\t\t\tif (cExecutors != null) {\n\t\t\t\tlaunch.executorServiceManager = new ExecutorServiceManager(cExecutors);\n\t\t\t}\n\t\t}\n\t}\n\n    void around(KProcessor kProcessor, SubProcessRunnable runnable):execution(public void submit(..))\n                && args(runnable)\n                &&this(kProcessor){\n\t\tLaunchImpl<?> launch = phl.get(kProcessor);\n\t\tKProcess process = runnable.getSubProcessCall().getProcess();\n\t\tif (launch!=null && launch.executorServiceManager!=null) {\n\t\t\tExecutorService service = launch.executorServiceManager.get(process);\n\t\t\tif (service!=null) {\n\t\t\t\tkProcessor.submit(runnable, service);\n\t\t\t} else {\n\t\t\t\tproceed(kProcessor, runnable);\n\t\t\t}\n\t\t} else {\n\t\t\tproceed(kProcessor, runnable);\n\t\t}\n    }\n\n    void around(KProcessor kProcessor, CallableCallRunnable runnable):execution(public void submit(..))\n            && args(runnable)\n            &&this(kProcessor){\n\t\tLaunchImpl<?> launch = phl.get(kProcessor);\n\t\tKProcess process = runnable.getCallableCall().getProcess();\n\t\tif (launch!=null && launch.executorServiceManager!=null) {\n\t\t\tExecutorService service = launch.executorServiceManager.get(process);\n\t\t\tif (service!=null) {\n\t\t\t\tkProcessor.submit(runnable, service);\n\t\t\t} else {\n\t\t\t\tproceed(kProcessor, runnable);\n\t\t\t}\n\t\t} else {\n\t\t\tproceed(kProcessor, runnable);\n\t\t}\n    }\n\n    void around(KProcessor kProcessor, RunnableCallRunnable runnable):execution(public void submit(..))\n            && args(runnable)\n            &&this(kProcessor) {\n\t\tLaunchImpl<?> launch = phl.get(kProcessor);\n\t\tKProcess process = runnable.getRunnableCall().getProcess();\n\t\tif (launch!=null && launch.executorServiceManager!=null) {\n\t\t\tExecutorService service = launch.executorServiceManager.get(process);\n\t\t\tif (service!=null) {\n\t\t\t\tkProcessor.submit(runnable, service);\n\t\t\t} else {\n\t\t\t\tproceed(kProcessor, runnable);\n\t\t\t}\n\t\t} else {\n\t\t\tproceed(kProcessor, runnable);\n\t\t}\n    }\n\n    void around(KProcess kProcess):execution(private void complete(..))\n    \t&& this(kProcess) {\n    \tproceed(kProcess);\n\t\tLaunchImpl<?> launch = ((IKProcessorLaunch)kProcess.getProcessor()).launch;\n\t\tif(launch != null && launch.executorServiceManager!=null) {\n\t\t\tlaunch.executorServiceManager.complete(kProcess);\n\t\t}\n    }\n\n }\n","old_contents":"\/*\n *     ParallelJ, framework for parallel computing\n *\n *     Copyright (C) 2010, 2011, 2012 Atos Worldline or third-party contributors as\n *     indicated by the @author tags or express copyright attribution\n *     statements applied by the authors.\n *\n *     This library is free software; you can redistribute it and\/or\n *     modify it under the terms of the GNU Lesser General Public\n *     License as published by the Free Software Foundation; either\n *     version 2.1 of the License.\n *\n *     This library is distributed in the hope that it will be useful,\n *     but WITHOUT ANY WARRANTY; without even the implied warranty of\n *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n *     Lesser General Public License for more details.\n *\n *     You should have received a copy of the GNU Lesser General Public\n *     License along with this library; if not, write to the Free Software\n *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n *\/\npackage org.parallelj.launching.internal;\n\nimport java.util.Map;\nimport java.util.concurrent.ConcurrentHashMap;\nimport java.util.concurrent.ExecutorService;\n\nimport org.parallelj.Programs;\nimport org.parallelj.internal.conf.ConfigurationService;\nimport org.parallelj.internal.conf.ParalleljConfigurationManager;\nimport org.parallelj.internal.conf.pojos.CExecutors;\nimport org.parallelj.internal.conf.pojos.ParalleljConfiguration;\nimport org.parallelj.internal.kernel.KProcess;\nimport org.parallelj.internal.kernel.KProcessor;\nimport org.parallelj.internal.kernel.procedure.CallableProcedure.CallableCall.CallableCallRunnable;\nimport org.parallelj.internal.kernel.procedure.RunnableProcedure.RunnableCall.RunnableCallRunnable;\nimport org.parallelj.internal.kernel.procedure.SubProcessProcedure.SubProcessCall.SubProcessRunnable;\nimport org.parallelj.internal.reflect.ProcessHelperImpl;\nimport org.parallelj.launching.Launch;\nimport org.parallelj.launching.LaunchException;\nimport org.parallelj.launching.LaunchingMessageKind;\nimport org.parallelj.launching.ProgramReturnCodes;\nimport org.parallelj.launching.internal.LaunchManagement.LaunchAdapter.IKProcessorLaunch;\nimport org.parallelj.mirror.ParallelJThreadFactory;\n\nimport org.parallelj.launching.executors.ExecutorServiceManager;\n\n\/**\n * Implements the synchLaunch(..) and aSynchLaunch(..) methods of Launch.\n * \n * \n *\/\nprivileged aspect LaunchManagement { \n\t\n\tprivate static Map<KProcessor, LaunchImpl<?>> phl = new ConcurrentHashMap<>(); \n\t\n\tstatic privileged public aspect LaunchAdapter percflow(launchInstance() ) {\n\t\n\t\tdeclare precedence :\n\t\t\torg.parallelj.internal.kernel.Identifiers,\n\t\t\torg.parallelj.internal.reflect.ProgramAdapter,\n\t\t\torg.parallelj.internal.util.sm.impl.KStateMachines,\n\t\t\torg.parallelj.internal.util.sm.impl.KStateMachines.PerMachine,\n\t\t\torg.parallelj.Executables$PerExecutable,\n\t\t\torg.parallelj.internal.reflect.ProgramAdapter.PerProgram,\n\t\t\torg.parallelj.internal.log.Logs;\n\t\n\t\tpointcut launchInstance() : execution(* Launch+.*(..));\n\t\n\t\tinterface IKProcessorLaunch {}\n\t\tLaunchImpl<?> IKProcessorLaunch.launch;\n\t\tdeclare parents: KProcessor implements IKProcessorLaunch;\n\t\t\n\t\tinterface ILaunchExecutors {}\n\t\tExecutorServiceManager ILaunchExecutors.executorServiceManager;\t\t\n\t\tdeclare parents: LaunchImpl implements ILaunchExecutors;\n\t\t\n\t\tprivate LaunchingObservable observable = new LaunchingObservable();\n\t\t\n\t\tboolean stopExecutorServiceAfterExecution = false;\n\t\n\t\tprivate static class AsyncThread implements Runnable {\n\t\n\t\t\tprivate LaunchAdapter launchAdapter;\n\t\t\tprivate LaunchImpl<?> launch;\n\t\n\t\t\tpublic AsyncThread(LaunchImpl<?> launch, LaunchAdapter launchAdapter) {\n\t\t\t\tthis.launch = launch;\n\t\t\t\tthis.launchAdapter = launchAdapter;\n\t\t\t}\n\t\n\t\t\t@Override\n\t\t\tpublic void run() {\n\t\t\t\tthis.launchAdapter.internalSyncLaunch(this.launch);\n\t\t\t}\n\t\t}\n\t\t\n\t\t@SuppressWarnings({ \"rawtypes\", \"unchecked\" })\n\t\tLaunch around(LaunchImpl launch) throws LaunchException: \n\t\t\t\t\texecution(public Launch Launch+.synchLaunch(..) throws LaunchException)\n\t\t\t\t\t\t&& this(launch) {\n\t\t\tproceed(launch);\n\t\t\tlaunch.processHelper = Programs.as(launch.jobInstance);\n\t\t\tlaunch.getLaunchResult().setStatusCode(ProgramReturnCodes.RUNNING);\n\t\t\tthis.observable.prepareLaunching(launch);\n\t\n\t\t\treturn internalSyncLaunch(launch);\n\t\t}\n\t\n\t\t@SuppressWarnings({ \"rawtypes\", \"unchecked\" })\n\t\tLaunch around(LaunchImpl launch) throws LaunchException: \n\t\t\t\t\texecution(public Launch Launch+.aSynchLaunch() throws LaunchException)\n\t\t\t\t\t\t&& this(launch) {\n\t\t\tproceed(launch);\n\t\t\tlaunch.processHelper = Programs.as(launch.jobInstance);\n\t\t\tlaunch.getLaunchResult().setStatusCode(ProgramReturnCodes.RUNNING);\n\t\t\tthis.observable.prepareLaunching(launch);\n\t\t\tif (launch.getExecutorService()!=null) {\n\t\t\t\tlaunch.getExecutorService().execute(new AsyncThread(launch, this));\n\t\t\t} else {\n\t\t\t\tParallelJThreadFactory.getInstance().newThread(new AsyncThread(launch, this)).start();\n\t \t\t}\n\t\t\treturn launch;\n\t\t}\n\t\n\t\t@SuppressWarnings(\"rawtypes\")\n\t\tprivate Launch<?> internalSyncLaunch(LaunchImpl<?> launch) {\n\t\t\tLaunchingMessageKind.ILAUNCH0002.format(launch.getJobInstance()\n\t\t\t\t\t.getClass().getCanonicalName(), launch.getLaunchId());\n\t\t\tinitializeExecutors(launch);\n\t\t\tProcessHelperImpl processHelper = (ProcessHelperImpl)launch.getProcessHelper();\n\t\t\tKProcessor processor = processHelper.processor;\n\t\t\tif (processor == null) {\n\t\t\t\tif ( ((ILaunchExecutors)launch).executorServiceManager!=null \n\t\t\t\t\t\t&& ((ILaunchExecutors)launch).executorServiceManager.getDefaultExecutor()!=null) {\n\t\t\t\t\tprocessor = new KProcessor(((ILaunchExecutors)launch).executorServiceManager.getDefaultExecutor());\n\t\t\t\t} else {\n\t\t\t\t\tprocessor = new KProcessor(launch.getExecutorService());\n\t\t\t\t}\n\t\t\t\t((IKProcessorLaunch)processor).launch = launch;\n\t\t\t\tphl.put(processor, launch);\n\t\t\t}\n\t\t\tprocessor.execute(processHelper.process);\n\t\t\tlaunch.getProcessHelper().join();\n\t\t\tthis.observable.finalizeLaunching(launch);\n\t\t\tlaunch.complete();\n\t\t\tif(launch.executorServiceManager!=null) {\n\t\t\t\tlaunch.executorServiceManager.clean();\n\t\t\t}\n\t\t\tphl.remove(processor);\n\t\t\t\n\t\t\tif (launch.getLaunchResult().getStatusCode()!=ProgramReturnCodes.FAILURE\n\t\t\t\t\t&&launch.getLaunchResult().getStatusCode()!=ProgramReturnCodes.ABORTED) {\n\t\t\t\tlaunch.getLaunchResult().setStatusCode(ProgramReturnCodes.SUCCESS);\n\t\t\t}\n\t\t\tLaunchingMessageKind.ILAUNCH0003.format(launch.getJobInstance()\n\t\t\t\t\t.getClass().getCanonicalName(), launch.getLaunchId(), launch\n\t\t\t\t\t.getLaunchResult().getStatusCode(), launch.getLaunchResult()\n\t\t\t\t\t.getReturnCode());\n\t\t\treturn launch;\n\t\t}\n\t\t\n\t\tprivate void initializeExecutors(LaunchImpl<?> launch) {\n\t\t\tParalleljConfiguration configuration = (ParalleljConfiguration) ConfigurationService\n\t\t\t\t\t.getConfigurationService().getConfigurationManager()\n\t\t\t\t\t.get(ParalleljConfigurationManager.class)\n\t\t\t\t\t.getConfiguration();\n\t\t\tCExecutors cExecutors = configuration != null ? configuration\n\t\t\t\t\t.getExecutorServices() : null;\n\t\t\tif (cExecutors != null) {\n\t\t\t\tlaunch.executorServiceManager = new ExecutorServiceManager(cExecutors);\n\t\t\t}\n\t\t}\n\t}\n\n    void around(KProcessor kProcessor, SubProcessRunnable runnable):execution(public void submit(..))\n                && args(runnable)\n                &&this(kProcessor){\n\t\tLaunchImpl<?> launch = phl.get(kProcessor);\n\t\tKProcess process = runnable.getSubProcessCall().getProcess();\n\t\tif (launch!=null && launch.executorServiceManager!=null) {\n\t\t\tExecutorService service = launch.executorServiceManager.get(process);\n\t\t\tif (service!=null) {\n\t\t\t\tkProcessor.submit(runnable, service);\n\t\t\t} else {\n\t\t\t\tproceed(kProcessor, runnable);\n\t\t\t}\n\t\t} else {\n\t\t\tproceed(kProcessor, runnable);\n\t\t}\n    }\n\n    void around(KProcessor kProcessor, CallableCallRunnable runnable):execution(public void submit(..))\n            && args(runnable)\n            &&this(kProcessor){\n\t\tLaunchImpl<?> launch = phl.get(kProcessor);\n\t\tKProcess process = runnable.getCallableCall().getProcess();\n\t\tif (launch!=null && launch.executorServiceManager!=null) {\n\t\t\tExecutorService service = launch.executorServiceManager.get(process);\n\t\t\tif (service!=null) {\n\t\t\t\tkProcessor.submit(runnable, service);\n\t\t\t} else {\n\t\t\t\tproceed(kProcessor, runnable);\n\t\t\t}\n\t\t} else {\n\t\t\tproceed(kProcessor, runnable);\n\t\t}\n    }\n\n    void around(KProcessor kProcessor, RunnableCallRunnable runnable):execution(public void submit(..))\n            && args(runnable)\n            &&this(kProcessor) {\n\t\tLaunchImpl<?> launch = phl.get(kProcessor);\n\t\tKProcess process = runnable.getRunnableCall().getProcess();\n\t\tif (launch!=null && launch.executorServiceManager!=null) {\n\t\t\tExecutorService service = launch.executorServiceManager.get(process);\n\t\t\tif (service!=null) {\n\t\t\t\tkProcessor.submit(runnable, service);\n\t\t\t} else {\n\t\t\t\tproceed(kProcessor, runnable);\n\t\t\t}\n\t\t} else {\n\t\t\tproceed(kProcessor, runnable);\n\t\t}\n    }\n\n    void around(KProcess kProcess):execution(private void complete(..))\n    \t&& this(kProcess) {\n    \tproceed(kProcess);\n\t\tLaunchImpl<?> launch = ((IKProcessorLaunch)kProcess.getProcessor()).launch;\n\t\tif(launch.executorServiceManager!=null) {\n\t\t\tlaunch.executorServiceManager.complete(kProcess);\n\t\t}\n    }\n\n }\n","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"9c34b9af86628dff7cac85e20c34d2f36598f602","subject":"addressed other comments","message":"addressed other comments\n","repos":"eigengo\/monitor,DataDog\/monitor,eigengo\/monitor,DataDog\/monitor","old_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/ActorCellMonitoringAspect.aj","new_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/ActorCellMonitoringAspect.aj","new_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.actor.*;\nimport org.eigengo.monitor.agent.AgentConfiguration;\nimport org.eigengo.monitor.output.CounterInterface;\nimport scala.Option;\n\nimport java.util.ArrayList;\nimport java.util.List;\nimport java.util.concurrent.atomic.AtomicLong;\nimport java.util.concurrent.ConcurrentHashMap;\n\n\/**\n * Contains advices for monitoring behaviour of an actor; typically imprisoned in an {@code ActorCell}.\n *\/\npublic aspect ActorCellMonitoringAspect extends AbstractMonitoringAspect issingleton() {\n    private AkkaAgentConfiguration agentConfiguration;\n    private final CounterInterface counterInterface;\n    private final Option<String> noActorClazz = Option.empty();\n    private final ConcurrentHashMap<Option<String>, AtomicLong> samplingCounters;\n    private final ConcurrentHashMap<Option<String>, AtomicLong> numberOfActors;\n\n\n    \/**\n     * Constructs this aspect\n     *\/\n    public ActorCellMonitoringAspect() {\n        AgentConfiguration<AkkaAgentConfiguration> configuration = getAgentConfiguration(\"akka\", AkkaAgentConfigurationJapi.apply());\n        this.agentConfiguration = configuration.agent();\n        this.counterInterface = createCounterInterface(configuration.common());\n        this.samplingCounters = new ConcurrentHashMap<Option<String>, AtomicLong>();\n        this.numberOfActors = new ConcurrentHashMap<Option<String>, AtomicLong>();\n    }\n\n    \/**\n     * Injects the new {@code AkkaAgentConfiguration} instance.\n     *\n     * @param agentConfiguration the new configuration\n     *\/\n    synchronized final void setAgentConfiguration(AkkaAgentConfiguration agentConfiguration) {\n        this.agentConfiguration = agentConfiguration;\n    }\n\n    \/\/ decide whether to include this ActorCell in our measurements\n    private boolean includeActorPath(final PathAndClass pathAndClass) {\n        if (!this.agentConfiguration.incuded().accept(pathAndClass)) return false;\n        if (this.agentConfiguration.excluded().accept(pathAndClass)) return false;\n\n        if (this.agentConfiguration.includeSystemAgents()) return true;\n\n        String userOrSystem = pathAndClass.actorPath().getElements().iterator().next();\n        return \"user\".equals(userOrSystem);\n    }\n\n    \/\/ get the sample rate for an actor\n    private int getSampleRate(final PathAndClass pathAndClass) {\n        return this.agentConfiguration.sampling().getRate(pathAndClass);\n    }\n\n    \/\/ decide whether to sample an actor on a particular occasion\n    private final boolean sampleMessage(final PathAndClass pathAndClass) {\n        int sampleRate = getSampleRate(pathAndClass);\n        if (sampleRate == 1) return true;\n\n        this.samplingCounters.putIfAbsent(pathAndClass.actorClassName(), new AtomicLong(0));\n        long timesSeenSoFar = this.samplingCounters.get(pathAndClass.actorClassName()).incrementAndGet();\n        return (timesSeenSoFar % sampleRate == 1); \/\/ == 1 to log first value (incrementAndGet returns updated value)\n    }\n\n    \/\/ get the tags for the cell\n    private String[] getTags(final ActorPath actorPath, final Actor actor) {\n        List<String> tags = new ArrayList<String>();\n\n        \/\/ TODO: Improve detection of routed actors. This relies only on the naming :(.\n        String lastPathElement = actorPath.elements().last();\n        if (lastPathElement.startsWith(\"$\")) {\n            \/\/ this is routed actor.\n            tags.add(actorPath.parent().toString());\n            if (this.agentConfiguration.includeRoutees()) tags.add(actorPath.toString());\n        } else {\n            \/\/ there is no supervisor\n            tags.add(actorPath.toString());\n        }\n        if (actor != null) {\n            tags.add(String.format(\"akka:%s.%s\", actor.context().system().name(), actor.getClass().getCanonicalName()));\n        }\n\n        return tags.toArray(new String[tags.size()]);\n    }\n\n    \/\/ returns the canonical name of the actor type associated with an ActorCell\n    private String uncheckedActorNameFrom(final ActorCell actorCell) {\n        return uncheckedActorNameFrom(actorCell.props());\n    }\n\n    \/\/ returns the canonical name of the actor type associated with a Props instance\n    private String uncheckedActorNameFrom(final Props props) {\n        return props.actorClass().getCanonicalName();\n    }\n\n    \/**\n     * Advises the {@code ActorCell.receiveMessage(message: Object): Unit}\n     * We proceed with the pointcut if the actor is to be included in the monitoring *and* this is\n     * the 'multiple-of-n'th time we've seen a message for an actor with a sample rate of n.\n     *\n     * Currently, we sample queue size, the fact that the message is delivered, the simple name of the class of the\n     * message, and the time taken to complete the actor's reactive action.\n     *\n     * @param actorCell the ActorCell where the actor that receives the message \"lives\"\n     * @param msg the incoming message\n     *\/\n    Object around(ActorCell actorCell, Object msg) : Pointcuts.actorCellReceiveMessage(actorCell, msg) {\n        final ActorPath actorPath = actorCell.self().path();\n        final PathAndClass pathAndClass = new PathAndClass(actorPath, Option.apply(uncheckedActorNameFrom(actorCell)));\n        if (!includeActorPath(pathAndClass) || !sampleMessage(pathAndClass)) return proceed(actorCell, msg);\n\n        int samplingRate = getSampleRate(pathAndClass);\n\n        \/\/ we tag by actor name\n        final String[] tags = getTags(actorPath, actorCell.actor());\n\n        \/\/ record the queue size\n        this.counterInterface.recordGaugeValue(\"akka.queue.size\", actorCell.numberOfMessages(), tags);\n        \/\/ record the message, general and specific\n        this.counterInterface.incrementCounter(\"akka.actor.delivered\", samplingRate, tags);\n        this.counterInterface.incrementCounter(\"akka.actor.delivered.\" + msg.getClass().getSimpleName(), samplingRate, tags);\n\n        \/\/ measure the time. we're using the ``nanoTime`` call to access the high-precision timer.\n        \/\/ since we're not really interested in wall time, but just some increasing measure of\n        \/\/ elapsed time\n        Object result = null;\n        final long start = System.nanoTime();\n        \/\/ result will always be ``null``, because target returns ``Unit``\n        result = proceed(actorCell, msg);\n        \/\/ ns or \u00b5s is too fine. ms will do for now.\n        final long duration = (System.nanoTime() - start) \/ 1000000;\n\n        \/\/ record the actor duration\n        this.counterInterface.recordExecutionTime(\"akka.actor.duration\", (int)duration, tags);\n\n        \/\/ return null would do the trick, but we want to be _proper_.\n        return result;\n    }\n\n    \/**\n     * Advises the {@code ActorCell.handleInvokeFailure(_, failure: Throwable): Unit}\n     *\n     * @param actorCell the ActorCell where the error spreads from\n     * @param failure the exception that escaped from the {@code receive} method\n     *\/\n    before(ActorCell actorCell, Throwable failure) : Pointcuts.actorCellHandleInvokeFailure(actorCell, failure) {\n        \/\/ record the error, general and specific\n        String[] tags = getTags(actorCell.self().path(), actorCell.actor());\n        this.counterInterface.incrementCounter(\"akka.actor.error\", tags);\n        this.counterInterface.incrementCounter(String.format(\"akka.actor.error.%s\", failure.getMessage()), tags);\n    }\n\n    \/**\n     * Advises the {@code EventStream.publish(event: Any): Unit}\n     *\n     * @param event the received event\n     *\/\n    before(Object event) : Pointcuts.eventStreamPublish(event) {\n        if (event instanceof UnhandledMessage) {\n            UnhandledMessage unhandledMessage = (UnhandledMessage)event;\n            String[] tags = getTags(unhandledMessage.recipient().path(), null);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered\", tags);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered.\" + unhandledMessage.getMessage().getClass().getSimpleName(), tags);\n        }\n    }\n\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorCell} and {@code ActorSystem}\n     *\n     * @param props the {@code Props} instance used in the call\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after(Props props) returning (ActorRef actor): Pointcuts.anyActorOf(props) {\n        recordActorCreation(props, actor);\n    }\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorCell} and {@code ActorSystem} when actor is named in construction\n     *\n     * @param props the {@code Props} instance used in the call\n     * @param actorName the {@code String} used to name the actor at creation site\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after(Props props, String actorName) returning (ActorRef actor): Pointcuts.namedActorOf(props, actorName) {\n        recordActorCreation(props, actor);\n    }\n\n    \/\/ method containing the recording logic for advising actor creation\n    private void recordActorCreation(Props props, ActorRef actor) {\n        if (!includeActorPath(new PathAndClass(actor.path(), this.noActorClazz))) return;\n        final String uncheckedClassName = uncheckedActorNameFrom(props);\n        final Option<String> className = Option.apply(uncheckedClassName);\n\n        this.numberOfActors.putIfAbsent(className, new AtomicLong(0));\n        \/\/ increment and get the current number of actors of this type (if the value was 0, then this returns 1 -- which is correct)\n        final long currentNumberOfActors = this.numberOfActors.get(className).incrementAndGet();\n\n        \/\/ record the current number of actors of this type\n        this.counterInterface.recordGaugeValue(\"akka.actor.count\", (int)currentNumberOfActors, uncheckedClassName);\n    }\n\n    \/**\n     * Advises the {@code LocalActorRef.stop} method\n     *\n     *\n     * @param actorCell the {@code ActorCell} of the actor being stopped\n     *\/\n    after(ActorCell actorCell) : Pointcuts.actorCellInternalStop(actorCell) {\n        if (!includeActorPath(new PathAndClass(actorCell.self().path(), this.noActorClazz))) return;\n        final String uncheckedClassName = uncheckedActorNameFrom(actorCell);\n        final Option<String> className = Option.apply(uncheckedClassName);\n\n        this.numberOfActors.putIfAbsent(className, new AtomicLong(0));\n        \/\/ decrement and get the current number of actors of this type (if the value was 1, then this returns 0 -- which is correct)\n        final long currentNumberOfActors = this.numberOfActors.get(className).decrementAndGet();\n\n        this.counterInterface.recordGaugeValue(\"akka.actor.count\", (int)currentNumberOfActors, uncheckedClassName);\n    }\n\n}","old_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.actor.*;\nimport org.eigengo.monitor.agent.AgentConfiguration;\nimport org.eigengo.monitor.output.CounterInterface;\nimport scala.Option;\n\nimport java.util.ArrayList;\nimport java.util.List;\nimport java.util.concurrent.atomic.AtomicLong;\nimport java.util.concurrent.ConcurrentHashMap;\n\n\/**\n * Contains advices for monitoring behaviour of an actor; typically imprisoned in an {@code ActorCell}.\n *\/\npublic aspect ActorCellMonitoringAspect extends AbstractMonitoringAspect issingleton() {\n    private AkkaAgentConfiguration agentConfiguration;\n    private final CounterInterface counterInterface;\n    private final Option<String> noActorClazz = Option.empty();\n    private final ConcurrentHashMap<Option<String>, AtomicLong> samplingCounters;\n    private final ConcurrentHashMap<Option<String>, AtomicLong> numberOfActors;\n\n\n    \/**\n     * Constructs this aspect\n     *\/\n    public ActorCellMonitoringAspect() {\n        AgentConfiguration<AkkaAgentConfiguration> configuration = getAgentConfiguration(\"akka\", AkkaAgentConfigurationJapi.apply());\n        this.agentConfiguration = configuration.agent();\n        this.counterInterface = createCounterInterface(configuration.common());\n        this.samplingCounters = new ConcurrentHashMap<Option<String>, AtomicLong>();\n        this.numberOfActors = new ConcurrentHashMap<Option<String>, AtomicLong>();\n    }\n\n    \/**\n     * Injects the new {@code AkkaAgentConfiguration} instance.\n     *\n     * @param agentConfiguration the new configuration\n     *\/\n    synchronized final void setAgentConfiguration(AkkaAgentConfiguration agentConfiguration) {\n        this.agentConfiguration = agentConfiguration;\n    }\n\n    \/\/ decide whether to include this ActorCell in our measurements\n    private boolean includeActorPath(final PathAndClass pathAndClass) {\n        if (!this.agentConfiguration.incuded().accept(pathAndClass)) return false;\n        if (this.agentConfiguration.excluded().accept(pathAndClass)) return false;\n\n        if (this.agentConfiguration.includeSystemAgents()) return true;\n\n        String userOrSystem = pathAndClass.actorPath().getElements().iterator().next();\n        return \"user\".equals(userOrSystem);\n    }\n\n    \/\/ get the sample rate for an actor\n    private int getSampleRate(final PathAndClass pathAndClass) {\n        return this.agentConfiguration.sampling().getRate(pathAndClass);\n    }\n\n    \/\/ decide whether to sample an actor on a particular occasion\n    private final boolean sampleMessage(final PathAndClass pathAndClass) {\n        int sampleRate = getSampleRate(pathAndClass);\n        if (sampleRate == 1) return true;\n\n        this.samplingCounters.putIfAbsent(pathAndClass.actorClassName(), new AtomicLong(0));\n        long timesSeenSoFar = this.samplingCounters.get(pathAndClass.actorClassName()).incrementAndGet();\n        return (timesSeenSoFar % sampleRate == 1); \/\/ == 1 to log first value (incrementAndGet returns updated value)\n    }\n\n    \/\/ get the tags for the cell\n    private String[] getTags(final ActorPath actorPath, final Actor actor) {\n        List<String> tags = new ArrayList<String>();\n\n        \/\/ TODO: Improve detection of routed actors. This relies only on the naming :(.\n        String lastPathElement = actorPath.elements().last();\n        if (lastPathElement.startsWith(\"$\")) {\n            \/\/ this is routed actor.\n            tags.add(actorPath.parent().toString());\n            if (this.agentConfiguration.includeRoutees()) tags.add(actorPath.toString());\n        } else {\n            \/\/ there is no supervisor\n            tags.add(actorPath.toString());\n        }\n        if (actor != null) {\n            tags.add(String.format(\"akka:%s.%s\", actor.context().system().name(), actor.getClass().getCanonicalName()));\n        }\n\n        return tags.toArray(new String[tags.size()]);\n    }\n\n    \/\/ returns the canonical name of the actor type associated with an ActorCell\n    private String uncheckedActorNameFrom(final ActorCell actorCell) {\n        return uncheckedActorNameFrom(actorCell.props());\n    }\n\n    \/\/ returns the canonical name of the actor type associated with a Props instance\n    private String uncheckedActorNameFrom(final Props props) {\n        return props.actorClass().getCanonicalName();\n    }\n\n    \/**\n     * Advises the {@code ActorCell.receiveMessage(message: Object): Unit}\n     * We proceed with the pointcut if the actor is to be included in the monitoring *and* this is\n     * the 'multiple-of-n'th time we've seen a message for an actor with a sample rate of n.\n     *\n     * Currently, we sample queue size, the fact that the message is delivered, the simple name of the class of the\n     * message, and the time taken to complete the actor's reactive action.\n     *\n     * @param actorCell the ActorCell where the actor that receives the message \"lives\"\n     * @param msg the incoming message\n     *\/\n    Object around(ActorCell actorCell, Object msg) : Pointcuts.actorCellReceiveMessage(actorCell, msg) {\n        final ActorPath actorPath = actorCell.self().path();\n        final PathAndClass pathAndClass = new PathAndClass(actorPath, Option.apply(uncheckedActorNameFrom(actorCell)));\n        if (!includeActorPath(pathAndClass) || !sampleMessage(pathAndClass)) return proceed(actorCell, msg);\n\n        int samplingRate = getSampleRate(pathAndClass);\n\n        \/\/ we tag by actor name\n        final String[] tags = getTags(actorPath, actorCell.actor());\n\n        \/\/ record the queue size\n        this.counterInterface.recordGaugeValue(\"akka.queue.size\", actorCell.numberOfMessages(), tags);\n        \/\/ record the message, general and specific\n        this.counterInterface.incrementCounter(\"akka.actor.delivered\", samplingRate, tags);\n        this.counterInterface.incrementCounter(\"akka.actor.delivered.\" + msg.getClass().getSimpleName(), samplingRate, tags);\n\n        \/\/ measure the time. we're using the ``nanoTime`` call to access the high-precision timer.\n        \/\/ since we're not really interested in wall time, but just some increasing measure of\n        \/\/ elapsed time\n        Object result = null;\n        final long start = System.nanoTime();\n        \/\/ result will always be ``null``, because target returns ``Unit``\n        result = proceed(actorCell, msg);\n        \/\/ ns or \u00b5s is too fine. ms will do for now.\n        final long duration = (System.nanoTime() - start) \/ 1000000;\n\n        \/\/ record the actor duration\n        this.counterInterface.recordExecutionTime(\"akka.actor.duration\", (int)duration, tags);\n\n        \/\/ return null would do the trick, but we want to be _proper_.\n        return result;\n    }\n\n    \/**\n     * Advises the {@code ActorCell.handleInvokeFailure(_, failure: Throwable): Unit}\n     *\n     * @param actorCell the ActorCell where the error spreads from\n     * @param failure the exception that escaped from the {@code receive} method\n     *\/\n    before(ActorCell actorCell, Throwable failure) : Pointcuts.actorCellHandleInvokeFailure(actorCell, failure) {\n        \/\/ record the error, general and specific\n        String[] tags = getTags(actorCell.self().path(), actorCell.actor());\n        this.counterInterface.incrementCounter(\"akka.actor.error\", tags);\n        this.counterInterface.incrementCounter(String.format(\"akka.actor.error.%s\", failure.getMessage()), tags);\n    }\n\n    \/**\n     * Advises the {@code EventStream.publish(event: Any): Unit}\n     *\n     * @param event the received event\n     *\/\n    before(Object event) : Pointcuts.eventStreamPublish(event) {\n        if (event instanceof UnhandledMessage) {\n            UnhandledMessage unhandledMessage = (UnhandledMessage)event;\n            String[] tags = getTags(unhandledMessage.recipient().path(), null);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered\", tags);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered.\" + unhandledMessage.getMessage().getClass().getSimpleName(), tags);\n        }\n    }\n\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorCell} and {@code ActorSystem}\n     *\n     * @param props the {@code Props} instance used in the call\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after(Props props) returning (ActorRef actor): Pointcuts.anyActorOf(props) {\n        recordActorCreation(props, actor);\n    }\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorCell} and {@code ActorSystem} when actor is named in construction\n     *\n     * @param props the {@code Props} instance used in the call\n     * @param actorName the {@code String} used to name the actor at creation site\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after(Props props, String actorName) returning (ActorRef actor): Pointcuts.namedActorOf(props, actorName) {\n        recordActorCreation(props, actor);\n    }\n\n    \/\/ method containing the recording logic for advising actor creation\n    private void recordActorCreation(Props props, ActorRef actor) {\n        if (!includeActorPath(new PathAndClass(actor.path(), this.noActorClazz))) return;\n        final String uncheckedClassName = uncheckedActorNameFrom(props);\n        final Option<String> className = Option.apply(uncheckedClassName);\n\n        this.numberOfActors.putIfAbsent(className, new AtomicLong(0));\n        \/\/ increment and get the current number of actors of this type (if the value was 0, then this returns 1 -- which is correct)\n        final long value = this.numberOfActors.get(className).incrementAndGet();\n\n        \/\/ record the current number of actors of this type\n        this.counterInterface.recordGaugeValue(\"akka.actor.count\", (int)value, uncheckedClassName);\n    }\n\n    \/**\n     * Advises the {@code LocalActorRef.stop} method\n     *\n     *\n     * @param actorCell the {@code ActorCell} of the actor being stopped\n     *\/\n    after(ActorCell actorCell) : Pointcuts.actorCellInternalStop(actorCell) {\n        if (!includeActorPath(new PathAndClass(actorCell.self().path(), this.noActorClazz))) return;\n        final String uncheckedClassName = uncheckedActorNameFrom(actorCell);\n        final Option<String> className = Option.apply(uncheckedClassName);\n\n        this.numberOfActors.putIfAbsent(className, new AtomicLong(0));\n        final long value = this.numberOfActors.get(className).decrementAndGet();\n\n        this.counterInterface.recordGaugeValue(\"akka.actor.count\", (int)value, uncheckedClassName);\n    }\n\n}","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"f2ea3962120d732d313fead732fabc793d6aa82c","subject":"Widening the pointcut to catch more potential places where plugin-loading could be a problem.","message":"Widening the pointcut to catch more potential places where plugin-loading could be a problem.\n\ngit-svn-id: 2c527eb49caa05e19d6b2be874bf74fa9d7ea670@614330 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"rogerchina\/maven,karthikjaps\/maven,likaiwalkman\/maven,wangyuesong\/maven,cstamas\/maven,Distrotech\/maven,atanasenko\/maven,pkozelka\/maven,vedmishr\/demo1,ChristianSchulte\/maven,wangyuesong0\/maven,vedmishr\/demo1,apache\/maven,josephw\/maven,lbndev\/maven,dsyer\/maven,barthel\/maven,ChristianSchulte\/maven,trajano\/maven,atanasenko\/maven,aheritier\/maven,trajano\/maven,cstamas\/maven,olamy\/maven,cstamas\/maven,karthikjaps\/maven,Mounika-Chirukuri\/maven,aheritier\/maven,xasx\/maven,changbai1980\/maven,rogerchina\/maven,keith-turner\/maven,skitt\/maven,xasx\/maven,changbai1980\/maven,apache\/maven,rogerchina\/maven,xasx\/maven,likaiwalkman\/maven,mcculls\/maven,ChristianSchulte\/maven,mizdebsk\/maven,Tibor17\/maven,vedmishr\/demo1,runepeter\/maven-deploy-plugin-2.8.1,wangyuesong\/maven,kidaa\/maven-1,wangyuesong0\/maven,skitt\/maven,mizdebsk\/maven,stephenc\/maven,gorcz\/maven,trajano\/maven,stephenc\/maven,stephenc\/maven,keith-turner\/maven,changbai1980\/maven,karthikjaps\/maven,josephw\/maven,barthel\/maven,gorcz\/maven,njuneau\/maven,olamy\/maven,skitt\/maven,josephw\/maven,Distrotech\/maven,keith-turner\/maven,njuneau\/maven,dsyer\/maven,apache\/maven,lbndev\/maven,Mounika-Chirukuri\/maven,pkozelka\/maven,Tibor17\/maven,olamy\/maven,wangyuesong0\/maven,barthel\/maven,gorcz\/maven,mcculls\/maven,Mounika-Chirukuri\/maven,dsyer\/maven,pkozelka\/maven,mcculls\/maven,njuneau\/maven,atanasenko\/maven,wangyuesong\/maven,likaiwalkman\/maven,mizdebsk\/maven,lbndev\/maven,aheritier\/maven,runepeter\/maven-deploy-plugin-2.8.1,kidaa\/maven-1,kidaa\/maven-1","old_file":"maven-core\/src\/main\/aspect\/org\/apache\/maven\/errors\/LifecycleErrorReporterAspect.aj","new_file":"maven-core\/src\/main\/aspect\/org\/apache\/maven\/errors\/LifecycleErrorReporterAspect.aj","new_contents":"package org.apache.maven.errors;\n\nimport org.codehaus.plexus.logging.console.ConsoleLogger;\nimport org.codehaus.plexus.logging.Logger;\nimport org.codehaus.plexus.util.introspection.ReflectionValueExtractor;\nimport org.apache.maven.project.path.PathTranslator;\nimport org.apache.maven.plugin.MojoExecution;\nimport org.apache.maven.artifact.resolver.ArtifactResolutionException;\nimport org.apache.maven.artifact.resolver.MultipleArtifactsNotFoundException;\nimport org.apache.maven.plugin.PluginConfigurationException;\nimport org.apache.maven.plugin.descriptor.Parameter;\nimport org.apache.maven.plugin.loader.PluginLoaderException;\nimport org.apache.maven.plugin.loader.PluginLoader;\nimport org.apache.maven.plugin.PluginExecutionException;\nimport org.apache.maven.plugin.MojoExecutionException;\nimport org.apache.maven.artifact.resolver.ArtifactNotFoundException;\nimport org.apache.maven.execution.MavenSession;\nimport org.apache.maven.lifecycle.model.MojoBinding;\nimport org.apache.maven.lifecycle.statemgmt.StateManagementUtils;\nimport org.apache.maven.lifecycle.DefaultLifecycleExecutor;\nimport org.apache.maven.lifecycle.LifecycleException;\nimport org.apache.maven.lifecycle.LifecycleExecutionException;\nimport org.apache.maven.project.MavenProject;\nimport org.apache.maven.plugin.DefaultPluginManager;\nimport org.apache.maven.plugin.PluginManager;\nimport org.apache.maven.plugin.PluginParameterExpressionEvaluator;\nimport org.apache.maven.plugin.PluginParameterException;\nimport org.apache.maven.plugin.Mojo;\nimport org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;\nimport org.codehaus.plexus.component.repository.exception.ComponentLookupException;\nimport org.codehaus.plexus.configuration.PlexusConfiguration;\nimport org.codehaus.plexus.PlexusContainer;\nimport org.codehaus.plexus.util.introspection.ReflectionValueExtractor;\n\nimport java.util.List;\n\npublic privileged aspect LifecycleErrorReporterAspect\n    extends AbstractCoreReporterAspect\n{\n\n    private pointcut le_executeGoalAndHandleFailures( MojoBinding binding ):\n        execution( void DefaultLifecycleExecutor.executeGoalAndHandleFailures( MojoBinding, .. ) )\n        && args( binding, .. );\n\n    private pointcut le_executeGoalAndHandleFailures_withSession( MojoBinding binding, MavenSession session ):\n        execution( void DefaultLifecycleExecutor.executeGoalAndHandleFailures( MojoBinding, MavenSession, .. ) )\n        && args( binding, session, .. );\n\n    private pointcut pm_executeMojo( MavenProject project ):\n        execution( void PluginManager+.executeMojo( MavenProject, .. ) )\n        && args( project, .. );\n\n    private pointcut within_pm_executeMojo( MavenProject project ):\n        withincode( void PluginManager+.executeMojo( MavenProject, .. ) )\n        && args( project, .. );\n\n    after( MojoBinding binding, MavenProject project ) throwing ( PluginLoaderException cause ):\n        call( * PluginLoader+.loadPlugin( MojoBinding, MavenProject, .. ) )\n        && args( binding, project, .. )\n    {\n        getReporter().reportErrorLoadingPlugin( binding, project, cause );\n    }\n\n    after( MojoBinding binding, MavenProject project ) throwing ( MojoExecutionException cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && call( void Mojo+.execute() )\n    {\n        \/\/ this will be covered by the reportErrorLoadingPlugin(..) method.\n        if ( !StateManagementUtils.RESOLVE_LATE_BOUND_PLUGIN_GOAL.equals( binding.getGoal() ) )\n        {\n            getReporter().reportMojoExecutionException( binding, project, cause );\n        }\n    }\n\n    PluginExecutionException around( MojoBinding binding, MavenProject project ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && call( PluginExecutionException.new( .., String ) )\n    {\n        PluginExecutionException cause = proceed( binding, project );\n        getReporter().reportInvalidPluginExecutionEnvironment( binding, project, cause );\n\n        return cause;\n    }\n\n    after( MojoBinding binding, MavenProject project ) throwing ( ComponentLookupException cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && withincode( Mojo DefaultPluginManager.getConfiguredMojo( .. ) )\n        && call( Object PlexusContainer+.lookup( .. ) )\n    {\n        getReporter().reportMojoLookupError( binding, project, cause );\n    }\n\n    Parameter currentParameter;\n\n    private pointcut paramGetName( Parameter parameter ):\n        call( String Parameter.getName() )\n        && target( parameter );\n\n    private pointcut pm_validatePomConfig():\n        execution( void DefaultPluginManager.validatePomConfiguration( .. ) );\n\n    private pointcut within_pm_validatePomConfig():\n        withincode( void DefaultPluginManager.validatePomConfiguration( .. ) );\n\n    private pointcut pm_checkRequiredParameters():\n        execution( void DefaultPluginManager.checkRequiredParameters( .. ) );\n\n    private pointcut within_pm_checkRequiredParameters():\n        withincode( void DefaultPluginManager.checkRequiredParameters( .. ) );\n\n    before( Parameter parameter ):\n        ( within_pm_validatePomConfig()\n          || within_pm_checkRequiredParameters() )\n        && paramGetName( parameter )\n    {\n        currentParameter = parameter;\n    }\n\n    after() returning:\n        pm_validatePomConfig() ||\n        pm_checkRequiredParameters()\n    {\n        currentParameter = null;\n    }\n\n    private pointcut pm_executeMojoWithSessionAndExec( MavenProject project, MojoExecution exec, MavenSession session, DefaultPluginManager manager ):\n        execution( void DefaultPluginManager.executeMojo( MavenProject, MojoExecution, MavenSession ) )\n        && args( project, exec, session )\n        && this( manager );\n\n    after( MojoBinding binding, MavenProject project, MojoExecution exec, MavenSession session, DefaultPluginManager manager ) throwing( PluginConfigurationException cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojoWithSessionAndExec( project, exec, session, manager ) )\n        && pm_validatePomConfig()\n    {\n        PathTranslator translator = manager.pathTranslator;\n        Logger logger = new ConsoleLogger( Logger.LEVEL_INFO, \"error reporting\" );\n        getReporter().reportAttemptToOverrideUneditableMojoParameter( currentParameter, binding, project, session, exec, translator, logger, cause );\n    }\n\n    PluginParameterException around( MojoBinding binding, MavenProject project, List invalidParameters ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && cflow( pm_checkRequiredParameters() )\n        && call( PluginParameterException.new( .., List ) )\n        && args( .., invalidParameters )\n    {\n        PluginParameterException err = proceed( binding, project, invalidParameters );\n\n        getReporter().reportMissingRequiredMojoParameter( binding, project, invalidParameters, err );\n\n        return err;\n    }\n\n    private pointcut ppee_evaluate( String expression ):\n        execution( Object PluginParameterExpressionEvaluator.evaluate( String ) )\n        && args( expression );\n\n    private pointcut within_ppee_evaluate( String expression ):\n        withincode( Object PluginParameterExpressionEvaluator.evaluate( String ) )\n        && args( expression );\n\n    before( MojoBinding binding, MavenProject project, String expression, ExpressionEvaluationException err ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && cflow( pm_checkRequiredParameters() )\n        && cflow( ppee_evaluate( expression ) )\n        && execution( ExpressionEvaluationException.new( String ) )\n        && this( err )\n    {\n        getReporter().reportUseOfBannedMojoParameter( currentParameter,\n                                                      binding,\n                                                      project,\n                                                      expression,\n                                                      (String) PluginParameterExpressionEvaluator.BANNED_EXPRESSIONS.get( expression ),\n                                                      err );\n    }\n\n    after( MojoBinding binding, MavenProject project, String expression ) throwing ( Exception cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && cflow( pm_checkRequiredParameters() )\n        && cflow( ppee_evaluate( expression ) )\n        && within( PluginParameterExpressionEvaluator )\n        && call( Object ReflectionValueExtractor.evaluate( String, Object ) )\n    {\n        getReporter().reportReflectionErrorWhileEvaluatingMojoParameter( currentParameter,\n                                                      binding,\n                                                      project,\n                                                      expression,\n                                                      cause );\n    }\n\n    after( MojoBinding binding, MavenProject project, PlexusConfiguration config ) throwing( PluginConfigurationException cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && execution( void DefaultPluginManager.populatePluginFields( *, *, PlexusConfiguration, .. ) )\n        && args( *, *, config, .. )\n    {\n        getReporter().reportErrorApplyingMojoConfiguration( binding, project, config, cause );\n    }\n\n    private pointcut pm_resolveTransitiveDependencies( MavenProject project, String scope ):\n        execution( void DefaultPluginManager.resolveTransitiveDependencies( *, *, String, *, MavenProject ) )\n        && args( *, *, scope, *, project );\n\n    after( MavenProject project, String scope ) throwing( ArtifactNotFoundException cause ):\n        pm_resolveTransitiveDependencies( project, scope )\n    {\n        getReporter().reportProjectDependenciesNotFound( project, scope, cause );\n    }\n\n    after( MavenProject project, String scope ) throwing( ArtifactResolutionException cause ):\n        pm_resolveTransitiveDependencies( project, scope )\n    {\n        if ( cause instanceof MultipleArtifactsNotFoundException )\n        {\n            getReporter().reportProjectDependenciesNotFound( project, scope, (MultipleArtifactsNotFoundException) cause );\n        }\n        else\n        {\n            getReporter().reportProjectDependenciesUnresolvable( project, scope, cause );\n        }\n    }\n\n    private pointcut le_getLifecycleBindings( List tasks, MavenProject configuringProject, String targetDescription ):\n        execution( List DefaultLifecycleExecutor.getLifecycleBindings( List, MavenProject, *, String ) )\n        && args( tasks, configuringProject, *, targetDescription );\n\n    before( List tasks, MavenProject configuringProject, String targetDescription, LifecycleException cause ):\n        cflow( le_getLifecycleBindings( tasks, configuringProject, targetDescription ) )\n        && call( LifecycleExecutionException.new( .., LifecycleException ) )\n        && args( .., cause )\n    {\n        getReporter().reportErrorFormulatingBuildPlan( tasks, configuringProject, targetDescription, cause );\n    }\n\n}\n","old_contents":"package org.apache.maven.errors;\n\nimport org.codehaus.plexus.logging.console.ConsoleLogger;\nimport org.codehaus.plexus.logging.Logger;\nimport org.codehaus.plexus.util.introspection.ReflectionValueExtractor;\nimport org.apache.maven.project.path.PathTranslator;\nimport org.apache.maven.plugin.MojoExecution;\nimport org.apache.maven.artifact.resolver.ArtifactResolutionException;\nimport org.apache.maven.artifact.resolver.MultipleArtifactsNotFoundException;\nimport org.apache.maven.plugin.PluginConfigurationException;\nimport org.apache.maven.plugin.descriptor.Parameter;\nimport org.apache.maven.plugin.loader.PluginLoaderException;\nimport org.apache.maven.plugin.loader.PluginLoader;\nimport org.apache.maven.plugin.PluginExecutionException;\nimport org.apache.maven.plugin.MojoExecutionException;\nimport org.apache.maven.artifact.resolver.ArtifactNotFoundException;\nimport org.apache.maven.execution.MavenSession;\nimport org.apache.maven.lifecycle.model.MojoBinding;\nimport org.apache.maven.lifecycle.statemgmt.StateManagementUtils;\nimport org.apache.maven.lifecycle.DefaultLifecycleExecutor;\nimport org.apache.maven.lifecycle.LifecycleException;\nimport org.apache.maven.lifecycle.LifecycleExecutionException;\nimport org.apache.maven.project.MavenProject;\nimport org.apache.maven.plugin.DefaultPluginManager;\nimport org.apache.maven.plugin.PluginManager;\nimport org.apache.maven.plugin.PluginParameterExpressionEvaluator;\nimport org.apache.maven.plugin.PluginParameterException;\nimport org.apache.maven.plugin.Mojo;\nimport org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;\nimport org.codehaus.plexus.component.repository.exception.ComponentLookupException;\nimport org.codehaus.plexus.configuration.PlexusConfiguration;\nimport org.codehaus.plexus.PlexusContainer;\nimport org.codehaus.plexus.util.introspection.ReflectionValueExtractor;\n\nimport java.util.List;\n\npublic privileged aspect LifecycleErrorReporterAspect\n    extends AbstractCoreReporterAspect\n{\n\n    private pointcut le_executeGoalAndHandleFailures( MojoBinding binding ):\n        execution( void DefaultLifecycleExecutor.executeGoalAndHandleFailures( MojoBinding, .. ) )\n        && args( binding, .. );\n\n    private pointcut le_executeGoalAndHandleFailures_withSession( MojoBinding binding, MavenSession session ):\n        execution( void DefaultLifecycleExecutor.executeGoalAndHandleFailures( MojoBinding, MavenSession, .. ) )\n        && args( binding, session, .. );\n\n    private pointcut pm_executeMojo( MavenProject project ):\n        execution( void PluginManager+.executeMojo( MavenProject, .. ) )\n        && args( project, .. );\n\n    private pointcut within_pm_executeMojo( MavenProject project ):\n        withincode( void PluginManager+.executeMojo( MavenProject, .. ) )\n        && args( project, .. );\n\n    after( MojoBinding binding, MavenProject project ) throwing ( PluginLoaderException cause ):\n        cflow( le_executeGoalAndHandleFailures( MojoBinding ) )\n        && call( * PluginLoader+.loadPlugin( MojoBinding, MavenProject, .. ) )\n        && args( binding, project, .. )\n    {\n        getReporter().reportErrorLoadingPlugin( binding, project, cause );\n    }\n\n    after( MojoBinding binding, MavenProject project ) throwing ( MojoExecutionException cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && call( void Mojo+.execute() )\n    {\n        \/\/ this will be covered by the reportErrorLoadingPlugin(..) method.\n        if ( !StateManagementUtils.RESOLVE_LATE_BOUND_PLUGIN_GOAL.equals( binding.getGoal() ) )\n        {\n            getReporter().reportMojoExecutionException( binding, project, cause );\n        }\n    }\n\n    PluginExecutionException around( MojoBinding binding, MavenProject project ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && call( PluginExecutionException.new( .., String ) )\n    {\n        PluginExecutionException cause = proceed( binding, project );\n        getReporter().reportInvalidPluginExecutionEnvironment( binding, project, cause );\n\n        return cause;\n    }\n\n    after( MojoBinding binding, MavenProject project ) throwing ( ComponentLookupException cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && withincode( Mojo DefaultPluginManager.getConfiguredMojo( .. ) )\n        && call( Object PlexusContainer+.lookup( .. ) )\n    {\n        getReporter().reportMojoLookupError( binding, project, cause );\n    }\n\n    Parameter currentParameter;\n\n    private pointcut paramGetName( Parameter parameter ):\n        call( String Parameter.getName() )\n        && target( parameter );\n\n    private pointcut pm_validatePomConfig():\n        execution( void DefaultPluginManager.validatePomConfiguration( .. ) );\n\n    private pointcut within_pm_validatePomConfig():\n        withincode( void DefaultPluginManager.validatePomConfiguration( .. ) );\n\n    private pointcut pm_checkRequiredParameters():\n        execution( void DefaultPluginManager.checkRequiredParameters( .. ) );\n\n    private pointcut within_pm_checkRequiredParameters():\n        withincode( void DefaultPluginManager.checkRequiredParameters( .. ) );\n\n    before( Parameter parameter ):\n        ( within_pm_validatePomConfig()\n          || within_pm_checkRequiredParameters() )\n        && paramGetName( parameter )\n    {\n        currentParameter = parameter;\n    }\n\n    after() returning:\n        pm_validatePomConfig() ||\n        pm_checkRequiredParameters()\n    {\n        currentParameter = null;\n    }\n\n    private pointcut pm_executeMojoWithSessionAndExec( MavenProject project, MojoExecution exec, MavenSession session, DefaultPluginManager manager ):\n        execution( void DefaultPluginManager.executeMojo( MavenProject, MojoExecution, MavenSession ) )\n        && args( project, exec, session )\n        && this( manager );\n\n    after( MojoBinding binding, MavenProject project, MojoExecution exec, MavenSession session, DefaultPluginManager manager ) throwing( PluginConfigurationException cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojoWithSessionAndExec( project, exec, session, manager ) )\n        && pm_validatePomConfig()\n    {\n        PathTranslator translator = manager.pathTranslator;\n        Logger logger = new ConsoleLogger( Logger.LEVEL_INFO, \"error reporting\" );\n        getReporter().reportAttemptToOverrideUneditableMojoParameter( currentParameter, binding, project, session, exec, translator, logger, cause );\n    }\n\n    PluginParameterException around( MojoBinding binding, MavenProject project, List invalidParameters ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && cflow( pm_checkRequiredParameters() )\n        && call( PluginParameterException.new( .., List ) )\n        && args( .., invalidParameters )\n    {\n        PluginParameterException err = proceed( binding, project, invalidParameters );\n\n        getReporter().reportMissingRequiredMojoParameter( binding, project, invalidParameters, err );\n\n        return err;\n    }\n\n    private pointcut ppee_evaluate( String expression ):\n        execution( Object PluginParameterExpressionEvaluator.evaluate( String ) )\n        && args( expression );\n\n    private pointcut within_ppee_evaluate( String expression ):\n        withincode( Object PluginParameterExpressionEvaluator.evaluate( String ) )\n        && args( expression );\n\n    before( MojoBinding binding, MavenProject project, String expression, ExpressionEvaluationException err ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && cflow( pm_checkRequiredParameters() )\n        && cflow( ppee_evaluate( expression ) )\n        && execution( ExpressionEvaluationException.new( String ) )\n        && this( err )\n    {\n        getReporter().reportUseOfBannedMojoParameter( currentParameter,\n                                                      binding,\n                                                      project,\n                                                      expression,\n                                                      (String) PluginParameterExpressionEvaluator.BANNED_EXPRESSIONS.get( expression ),\n                                                      err );\n    }\n\n    after( MojoBinding binding, MavenProject project, String expression ) throwing ( Exception cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && cflow( pm_checkRequiredParameters() )\n        && cflow( ppee_evaluate( expression ) )\n        && within( PluginParameterExpressionEvaluator )\n        && call( Object ReflectionValueExtractor.evaluate( String, Object ) )\n    {\n        getReporter().reportReflectionErrorWhileEvaluatingMojoParameter( currentParameter,\n                                                      binding,\n                                                      project,\n                                                      expression,\n                                                      cause );\n    }\n\n    after( MojoBinding binding, MavenProject project, PlexusConfiguration config ) throwing( PluginConfigurationException cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && execution( void DefaultPluginManager.populatePluginFields( *, *, PlexusConfiguration, .. ) )\n        && args( *, *, config, .. )\n    {\n        getReporter().reportErrorApplyingMojoConfiguration( binding, project, config, cause );\n    }\n\n    private pointcut pm_resolveTransitiveDependencies( MavenProject project, String scope ):\n        execution( void DefaultPluginManager.resolveTransitiveDependencies( *, *, String, *, MavenProject ) )\n        && args( *, *, scope, *, project );\n\n    after( MavenProject project, String scope ) throwing( ArtifactNotFoundException cause ):\n        pm_resolveTransitiveDependencies( project, scope )\n    {\n        getReporter().reportProjectDependenciesNotFound( project, scope, cause );\n    }\n\n    after( MavenProject project, String scope ) throwing( ArtifactResolutionException cause ):\n        pm_resolveTransitiveDependencies( project, scope )\n    {\n        if ( cause instanceof MultipleArtifactsNotFoundException )\n        {\n            getReporter().reportProjectDependenciesNotFound( project, scope, (MultipleArtifactsNotFoundException) cause );\n        }\n        else\n        {\n            getReporter().reportProjectDependenciesUnresolvable( project, scope, cause );\n        }\n    }\n\n    private pointcut le_getLifecycleBindings( List tasks, MavenProject configuringProject, String targetDescription ):\n        execution( List DefaultLifecycleExecutor.getLifecycleBindings( List, MavenProject, *, String ) )\n        && args( tasks, configuringProject, *, targetDescription );\n\n    before( List tasks, MavenProject configuringProject, String targetDescription, LifecycleException cause ):\n        cflow( le_getLifecycleBindings( tasks, configuringProject, targetDescription ) )\n        && call( LifecycleExecutionException.new( .., LifecycleException ) )\n        && args( .., cause )\n    {\n        getReporter().reportErrorFormulatingBuildPlan( tasks, configuringProject, targetDescription, cause );\n    }\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"38d18d35767b78183cc06f430c5fd69f2ef02deb","subject":"Fixed broken aspect after last location finder refactoring","message":"Fixed broken aspect after last location finder refactoring\n","repos":"Applied-Duality\/ignition,hongnguyenpro\/ignition,treejames\/ignition,beni55\/ignition,mttkay\/ignition","old_file":"ignition-location\/ignition-location-lib\/src\/com\/github\/ignition\/location\/IgnitedLocationManager.aj","new_file":"ignition-location\/ignition-location-lib\/src\/com\/github\/ignition\/location\/IgnitedLocationManager.aj","new_contents":"\/*\n * Copyright 2011 Google Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * This code has been modified by Stefano Dacchille.\n *\/\n\npackage com.github.ignition.location;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\n\nimport android.app.Activity;\nimport android.app.PendingIntent;\nimport android.content.BroadcastReceiver;\nimport android.content.Context;\nimport android.content.Intent;\nimport android.content.IntentFilter;\nimport android.content.SharedPreferences;\nimport android.content.SharedPreferences.Editor;\nimport android.location.Criteria;\nimport android.location.Location;\nimport android.location.LocationListener;\nimport android.location.LocationManager;\nimport android.os.AsyncTask;\nimport android.os.BatteryManager;\nimport android.os.Bundle;\nimport android.os.Handler;\nimport android.util.Log;\n\nimport com.github.ignition.location.annotations.IgnitedLocation;\nimport com.github.ignition.location.annotations.IgnitedLocationActivity;\nimport com.github.ignition.location.receivers.IgnitedLocationChangedReceiver;\nimport com.github.ignition.location.receivers.IgnitedPassiveLocationChangedReceiver;\nimport com.github.ignition.location.tasks.IgnitedLastKnownLocationAsyncTask;\nimport com.github.ignition.location.templates.ILastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLocationUpdateRequester;\nimport com.github.ignition.location.templates.OnIgnitedLocationChangedListener;\nimport com.github.ignition.location.utils.PlatformSpecificImplementationFactory;\nimport com.github.ignition.support.IgnitedDiagnostics;\n\n@SuppressAjWarnings\npublic aspect IgnitedLocationManager {\n    public static final String LOG_TAG = IgnitedLocationManager.class.getSimpleName();\n\n    declare parents : (@IgnitedLocationActivity *) implements OnIgnitedLocationChangedListener;\n\n    private Criteria defaultCriteria, lowPowerCriteria;\n    protected IgnitedAbstractLocationUpdateRequester locationUpdateRequester;\n    protected PendingIntent locationListenerPendingIntent, locationListenerPassivePendingIntent;\n    protected LocationManager locationManager;\n    protected IgnitedLocationListener bestInactiveLocationProviderListener;\n\n    private Context context;\n    private volatile Location currentLocation;\n\n    private AsyncTask<Void, Void, Location> ignitedLastKnownLocationTask;\n    private SharedPreferences prefs;\n    private Handler handler;\n\n    private long locationUpdatesInterval, passiveLocationUpdatesInterval;\n    private int locationUpdatesDistanceDiff;\n    private int passiveLocationUpdatesDistanceDiff;\n    private boolean requestLocationUpdates;\n    private boolean locationUpdatesDisabled = true;\n    \n    \/\/ Switch to another provider if gps doesn't return a location quickly enough.\n    private Runnable removeGpsUpdates = new Runnable() {\n        @Override\n        public void run() {\n            Log.d(LOG_TAG,\n                    \"It looks like GPS isn't available at this time (i.e.: maybe you're indoors). Removing GPS location updates and requesting network updates.\");\n\n            disableLocationUpdates(false);\n            requestLocationUpdates(context);\n        }\n    };\n\n    \/**\n     * If the Location Provider we're using to receive location updates is disabled while the app is\n     * running, this Receiver will be notified, allowing us to re-register our Location Receivers\n     * using the best available Location Provider is still available.\n     *\/\n    protected BroadcastReceiver locationProviderDisabledReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            boolean providerDisabled = !intent.getBooleanExtra(\n                    LocationManager.KEY_PROVIDER_ENABLED, false);\n            \/\/ Re-register the location listeners using the best available\n            \/\/ Location Provider.\n            if (providerDisabled) {\n                disableLocationUpdates(false);\n                requestLocationUpdates(context);\n            }\n        }\n    };\n\n    \/**\n     * If the battery state is low disable the passive location update receiver.\n     *\/\n    protected BroadcastReceiver refreshLocationUpdatesReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            disableLocationUpdates(false);\n            requestLocationUpdates(context);\n        }\n    };\n\n    after(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onCreate(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n\n        \/\/ Get a reference to the Context\n        this.context = context;\n        \/\/ Set pref file\n        prefs = context.getSharedPreferences(IgnitedLocationConstants.SHARED_PREFERENCE_FILE,\n                Context.MODE_PRIVATE);\n        \/\/ Get references to the managers\n        locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);\n        handler = new Handler();\n\n        \/\/ Specify the Criteria to use when requesting location updates while\n        \/\/ the application is Active\n        if (defaultCriteria == null) {\n            defaultCriteria = new Criteria();\n        }\n        \/\/ Use gps if it's enabled and if battery level is at least 15%\n        boolean useGps = prefs.getBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS,\n                IgnitedLocationConstants.USE_GPS_DEFAULT);\n        if (useGps) {\n            defaultCriteria.setAccuracy(Criteria.ACCURACY_FINE);\n        } else {\n            defaultCriteria.setPowerRequirement(Criteria.POWER_LOW);\n        }\n\n        \/\/ Setup the location update Pending Intent\n        Intent activeIntent = new Intent(IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_ACTION);\n        locationListenerPendingIntent = PendingIntent.getBroadcast(context, 0, activeIntent,\n                PendingIntent.FLAG_UPDATE_CURRENT);\n        \/\/ Setup the passive location update Pending Intent\n        Intent passiveIntent = new Intent(context, IgnitedPassiveLocationChangedReceiver.class);\n        locationListenerPassivePendingIntent = PendingIntent.getBroadcast(context, 0,\n                passiveIntent, PendingIntent.FLAG_UPDATE_CURRENT);\n\n        \/\/ Instantiate a Location Update Requester class based on the available\n        \/\/ platform version. This will be used to request location updates.\n        locationUpdateRequester = PlatformSpecificImplementationFactory\n                .getLocationUpdateRequester(context);\n    }\n\n    private boolean isBatteryOk() {\n        IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);\n        Intent intent = context.registerReceiver(null, filter);\n        double currentLevel = 100.0;\n        if (intent != null) {\n            currentLevel = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1);\n        }\n\n        return currentLevel >= prefs.getInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                IgnitedLocationConstants.MIN_BATTERY_LEVEL_DEFAULT);\n    }\n\n    before(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onResume(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n        \/\/ Get a reference to the Context if this context is null\n        if (this.context == null) {\n            this.context = context;\n        }\n\n        saveToPreferences(context, ignitedAnnotation);\n\n        Log.d(LOG_TAG, \"Retrieving last known location...\");\n        \/\/ Get the last known location. This isn't directly affecting the UI, so put it on a\n        \/\/ worker thread.\n        ignitedLastKnownLocationTask = new IgnitedLastKnownLocationAsyncTask(\n                context, locationUpdatesDistanceDiff, locationUpdatesInterval);\n        ignitedLastKnownLocationTask.execute();\n    }\n\n    \/**\n     * Save last settings to preferences.\n     * \n     * @param context\n     * @param locationAnnotation\n     *\/\n    private void saveToPreferences(Context context, IgnitedLocationActivity locationAnnotation) {\n        requestLocationUpdates = locationAnnotation.requestLocationUpdates();\n        locationUpdatesDistanceDiff = locationAnnotation.locationUpdatesDistanceDiff();\n        locationUpdatesInterval = locationAnnotation.locationUpdatesInterval();\n        passiveLocationUpdatesDistanceDiff = locationAnnotation\n                .passiveLocationUpdatesDistanceDiff();\n        passiveLocationUpdatesInterval = locationAnnotation.passiveLocationUpdatesInterval();\n        boolean enablePassiveLocationUpdates = locationAnnotation.enablePassiveUpdates();\n        boolean useGps = locationAnnotation.useGps();\n\n        Editor editor = prefs.edit();\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_LOCATION_UPDATES,\n                requestLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                enablePassiveLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS, useGps);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_DISTANCE_DIFF,\n                locationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_INTERVAL,\n                locationUpdatesInterval);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_DISTANCE_DIFF,\n                passiveLocationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_INTERVAL,\n                passiveLocationUpdatesInterval);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_RUN_ONCE, true);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                locationAnnotation.minBatteryLevel());\n        editor.putLong(IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                locationAnnotation.waitForGpsFix());\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                locationAnnotation.showWaitForLocationDialog());\n        editor.commit();\n\n    }\n\n    before(Activity activity, IgnitedLocationActivity ignitedAnnotation) : execution(* Activity.onPause(..)) \n        && @this(ignitedAnnotation) && this(activity)\n        && within(@IgnitedLocationActivity *) && if (ignitedAnnotation.requestLocationUpdates()) {\n\n        disableLocationUpdates(true);\n\n        handler.removeCallbacks(removeGpsUpdates);\n\n        boolean finishing = activity.isFinishing();\n        if (finishing) {\n            if (ignitedLastKnownLocationTask != null && ignitedLastKnownLocationTask.getStatus() != AsyncTask.Status.FINISHED) {\n                ignitedLastKnownLocationTask.cancel(true);\n            } else {\n                PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            }\n\n            context = null;\n        }\n    }\n\n    \/\/ after() : execution(* Activity.onDestroy(..)) && @this(IgnitedLocationActivity)\n    \/\/ && within(@IgnitedLocationActivity *) {\n    \/\/ }\n\n    Location around() : get(@IgnitedLocation Location *) {\n        return currentLocation;\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && within(IgnitedPassiveLocationChangedReceiver) && !adviceexecution() {\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, long): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude());\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && (within(IgnitedLocationChangedReceiver) || within(IgnitedAbstractLastLocationFinder)\n                || within(IgnitedLastKnownLocationAsyncTask)) && !adviceexecution() {\n\n        if (context == null) {\n            return;\n        }\n        final Activity activity = (Activity) context;\n        boolean showWaitForLocationDialog = prefs.getBoolean(\n                IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                IgnitedLocationConstants.SHOW_WAIT_FOR_LOCATION_DIALOG_DEFAULT);\n        if (freshLocation == null && showWaitForLocationDialog) {\n            activity.showDialog(R.id.ign_loc_dialog_wait_for_fix);\n            return;\n        }\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, long): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude());\n        boolean keepRequestingLocationUpdates = ((OnIgnitedLocationChangedListener) context)\n                .onIgnitedLocationChanged(currentLocation);\n        Bundle extras = freshLocation.getExtras();\n        if (!keepRequestingLocationUpdates) {\n            disableLocationUpdates(true);\n            PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            return;\n        } else if (requestLocationUpdates\n                && !extras.containsKey(ILastLocationFinder.LAST_LOCATION_TOO_OLD_EXTRA)) {\n            \/\/ If we requested location updates, turn them on here.\n            requestLocationUpdates(context);\n        }\n\n        \/\/ If gps is enabled location comes from gps, remove runnable that removes gps updates\n        boolean lastLocation = extras.containsKey(IgnitedLocationConstants.IGNITED_LAST_LOCATION_EXTRA);\n        if (!lastLocation && defaultCriteria.getAccuracy() == Criteria.ACCURACY_FINE\n                && currentLocation.getProvider().equals(LocationManager.GPS_PROVIDER)) {\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n    }\n\n    \/**\n     * Start listening for location updates.\n     *\/\n    protected void requestLocationUpdates(Context context) {\n        if (!locationUpdatesDisabled) {\n            return;\n        }\n        Criteria locationUpdateCriteria;\n        if (isBatteryOk()) {\n            locationUpdateCriteria = defaultCriteria;\n        } else {\n            locationUpdateCriteria = lowPowerCriteria();\n        }\n\n        Log.d(LOG_TAG, \"Disabling passive location updates\");\n        locationManager.removeUpdates(locationListenerPassivePendingIntent);\n\n        Log.d(LOG_TAG, \"Requesting location updates\");\n        \/\/ Normal updates while activity is visible.\n        locationUpdateRequester.requestLocationUpdates(locationUpdatesInterval,\n                locationUpdatesDistanceDiff, locationUpdateCriteria, locationListenerPendingIntent);\n\n        \/\/ Register a receiver that listens for when the provider I'm using has\n        \/\/ been disabled.\n        IntentFilter locationProviderDisabledIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_PROVIDER_DISABLED_ACTION);\n        context.registerReceiver(locationProviderDisabledReceiver,\n                locationProviderDisabledIntentFilter);\n\n        IntentFilter refreshLocationUpdatesIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.UPDATE_LOCATION_UPDATES_CRITERIA_ACTION);\n        context.registerReceiver(refreshLocationUpdatesReceiver, refreshLocationUpdatesIntentFilter);\n\n        \/\/ Register a receiver that listens for when a better provider than I'm\n        \/\/ using becomes available.\n        String bestProvider = locationManager.getBestProvider(locationUpdateCriteria, false);\n        String bestAvailableProvider = locationManager.getBestProvider(locationUpdateCriteria, true);\n        if (bestProvider != null && !bestProvider.equals(bestAvailableProvider)) {\n            bestInactiveLocationProviderListener = new IgnitedLocationListener(context);\n            locationManager.requestLocationUpdates(bestProvider, 0, 0,\n                    bestInactiveLocationProviderListener, context.getMainLooper());\n        }\n\n        if (bestAvailableProvider.equals(LocationManager.GPS_PROVIDER)) {\n            Log.d(LOG_TAG, \"Posting delayed remove GPS updates message\");\n            \/\/ Post a runnable that will remove gps updates if no gps location is returned after 1\n            \/\/ minute in order to avoid draining the battery.\n            handler.postDelayed(removeGpsUpdates, prefs.getLong(\n                    IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                    IgnitedLocationConstants.WAIT_FOR_GPS_FIX_INTERVAL_DEFAULT));\n        }\n\n        locationUpdatesDisabled = false;\n    }\n\n    \/**\n     * Stop listening for location updates\n     * \n     * @param enablePassiveLocationUpdates\n     *\/\n    protected void disableLocationUpdates(boolean requestPassiveLocationUpdates) {\n        if (locationUpdatesDisabled) {\n            return;\n        }\n\n        Log.d(LOG_TAG, \"Disabling location updates\");\n        context.unregisterReceiver(locationProviderDisabledReceiver);\n        context.unregisterReceiver(refreshLocationUpdatesReceiver);\n\n        locationUpdateRequester.removeLocationUpdates();\n        if (bestInactiveLocationProviderListener != null) {\n            locationManager.removeUpdates(bestInactiveLocationProviderListener);\n        }\n\n        boolean finishing = ((Activity) context).isFinishing();\n\n        if (requestPassiveLocationUpdates && !finishing) {\n            requestPassiveLocationUpdates();\n        }\n\n        locationUpdatesDisabled = true;\n    }\n\n    private void requestPassiveLocationUpdates() {\n        if (IgnitedDiagnostics.SUPPORTS_FROYO\n                && prefs.getBoolean(\n                        IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                        IgnitedLocationConstants.ENABLE_PASSIVE_LOCATION_UPDATES_DEFAULT)) {\n            Log.d(LOG_TAG, \"Requesting passive location updates\");\n            \/\/ Passive location updates from 3rd party apps when the Activity isn't\n            \/\/ visible. Only for Android 2.2+.\n            locationUpdateRequester.requestPassiveLocationUpdates(passiveLocationUpdatesInterval,\n                    passiveLocationUpdatesDistanceDiff, locationListenerPassivePendingIntent);\n        }\n    }\n\n    public boolean isLocationUpdatesDisabled() {\n        return locationUpdatesDisabled;\n    }\n\n    public Criteria lowPowerCriteria() {\n        if (lowPowerCriteria == null) {\n            lowPowerCriteria = new Criteria();\n            lowPowerCriteria.setPowerRequirement(Criteria.POWER_LOW);\n            lowPowerCriteria.setAccuracy(Criteria.NO_REQUIREMENT);\n        }\n        return lowPowerCriteria;\n    }\n\n    \/**\n     * If the best Location Provider (usually GPS) is not available when we request location\n     * updates, this listener will be notified if \/ when it becomes available. It calls\n     * requestLocationUpdates to re-register the location listeners using the better Location\n     * Provider.\n     *\/\n    private class IgnitedLocationListener implements LocationListener {\n        private Context context;\n\n        public IgnitedLocationListener(Context appContext) {\n            this.context = appContext;\n        }\n\n        @Override\n        public void onLocationChanged(Location l) {\n        }\n\n        @Override\n        public void onProviderDisabled(String provider) {\n        }\n\n        @Override\n        public void onStatusChanged(String provider, int status, Bundle extras) {\n        }\n\n        @Override\n        public void onProviderEnabled(String provider) {\n            \/\/ Re-register the location listeners using the better Location\n            \/\/ Provider.\n            disableLocationUpdates(false);\n            requestLocationUpdates(context);\n        }\n    }\n\n}\n","old_contents":"\/*\n * Copyright 2011 Google Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * This code has been modified by Stefano Dacchille.\n *\/\n\npackage com.github.ignition.location;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\n\nimport android.app.Activity;\nimport android.app.PendingIntent;\nimport android.content.BroadcastReceiver;\nimport android.content.Context;\nimport android.content.Intent;\nimport android.content.IntentFilter;\nimport android.content.SharedPreferences;\nimport android.content.SharedPreferences.Editor;\nimport android.location.Criteria;\nimport android.location.Location;\nimport android.location.LocationListener;\nimport android.location.LocationManager;\nimport android.os.AsyncTask;\nimport android.os.BatteryManager;\nimport android.os.Bundle;\nimport android.os.Handler;\nimport android.util.Log;\n\nimport com.github.ignition.location.annotations.IgnitedLocation;\nimport com.github.ignition.location.annotations.IgnitedLocationActivity;\nimport com.github.ignition.location.receivers.IgnitedLocationChangedReceiver;\nimport com.github.ignition.location.receivers.IgnitedPassiveLocationChangedReceiver;\nimport com.github.ignition.location.tasks.IgnitedLastKnownLocationAsyncTask;\nimport com.github.ignition.location.templates.ILastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLocationUpdateRequester;\nimport com.github.ignition.location.templates.OnIgnitedLocationChangedListener;\nimport com.github.ignition.location.utils.PlatformSpecificImplementationFactory;\nimport com.github.ignition.support.IgnitedDiagnostics;\n\n@SuppressAjWarnings\npublic aspect IgnitedLocationManager {\n    public static final String LOG_TAG = IgnitedLocationManager.class.getSimpleName();\n\n    declare parents : (@IgnitedLocationActivity *) implements OnIgnitedLocationChangedListener;\n\n    private Criteria defaultCriteria, lowPowerCriteria;\n    protected IgnitedAbstractLocationUpdateRequester locationUpdateRequester;\n    protected PendingIntent locationListenerPendingIntent, locationListenerPassivePendingIntent;\n    protected LocationManager locationManager;\n    protected IgnitedLocationListener bestInactiveLocationProviderListener;\n\n    private Context context;\n    private volatile Location currentLocation;\n\n    private AsyncTask<Void, Void, Location> ignitedLastKnownLocationTask;\n    private SharedPreferences prefs;\n    private Handler handler;\n\n    private long locationUpdatesInterval, passiveLocationUpdatesInterval;\n    private int locationUpdatesDistanceDiff;\n    private int passiveLocationUpdatesDistanceDiff;\n    private boolean requestLocationUpdates;\n    private boolean locationUpdatesDisabled = true;\n    \n    \/\/ Switch to another provider if gps doesn't return a location quickly enough.\n    private Runnable removeGpsUpdates = new Runnable() {\n        @Override\n        public void run() {\n            Log.d(LOG_TAG,\n                    \"It looks like GPS isn't available at this time (i.e.: maybe you're indoors). Removing GPS location updates and requesting network updates.\");\n\n            disableLocationUpdates(false);\n            requestLocationUpdates(context);\n        }\n    };\n\n    \/**\n     * If the Location Provider we're using to receive location updates is disabled while the app is\n     * running, this Receiver will be notified, allowing us to re-register our Location Receivers\n     * using the best available Location Provider is still available.\n     *\/\n    protected BroadcastReceiver locationProviderDisabledReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            boolean providerDisabled = !intent.getBooleanExtra(\n                    LocationManager.KEY_PROVIDER_ENABLED, false);\n            \/\/ Re-register the location listeners using the best available\n            \/\/ Location Provider.\n            if (providerDisabled) {\n                disableLocationUpdates(false);\n                requestLocationUpdates(context);\n            }\n        }\n    };\n\n    \/**\n     * If the battery state is low disable the passive location update receiver.\n     *\/\n    protected BroadcastReceiver refreshLocationUpdatesReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            disableLocationUpdates(false);\n            requestLocationUpdates(context);\n        }\n    };\n\n    after(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onCreate(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n\n        \/\/ Get a reference to the Context\n        this.context = context;\n        \/\/ Set pref file\n        prefs = context.getSharedPreferences(IgnitedLocationConstants.SHARED_PREFERENCE_FILE,\n                Context.MODE_PRIVATE);\n        \/\/ Get references to the managers\n        locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);\n        handler = new Handler();\n\n        \/\/ Specify the Criteria to use when requesting location updates while\n        \/\/ the application is Active\n        if (defaultCriteria == null) {\n            defaultCriteria = new Criteria();\n        }\n        \/\/ Use gps if it's enabled and if battery level is at least 15%\n        boolean useGps = prefs.getBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS,\n                IgnitedLocationConstants.USE_GPS_DEFAULT);\n        if (useGps) {\n            defaultCriteria.setAccuracy(Criteria.ACCURACY_FINE);\n        } else {\n            defaultCriteria.setPowerRequirement(Criteria.POWER_LOW);\n        }\n\n        \/\/ Setup the location update Pending Intent\n        Intent activeIntent = new Intent(IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_ACTION);\n        locationListenerPendingIntent = PendingIntent.getBroadcast(context, 0, activeIntent,\n                PendingIntent.FLAG_UPDATE_CURRENT);\n        \/\/ Setup the passive location update Pending Intent\n        Intent passiveIntent = new Intent(context, IgnitedPassiveLocationChangedReceiver.class);\n        locationListenerPassivePendingIntent = PendingIntent.getBroadcast(context, 0,\n                passiveIntent, PendingIntent.FLAG_UPDATE_CURRENT);\n\n        \/\/ Instantiate a Location Update Requester class based on the available\n        \/\/ platform version. This will be used to request location updates.\n        locationUpdateRequester = PlatformSpecificImplementationFactory\n                .getLocationUpdateRequester(context);\n    }\n\n    private boolean isBatteryOk() {\n        IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);\n        Intent intent = context.registerReceiver(null, filter);\n        double currentLevel = 100.0;\n        if (intent != null) {\n            currentLevel = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1);\n        }\n\n        return currentLevel >= prefs.getInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                IgnitedLocationConstants.MIN_BATTERY_LEVEL_DEFAULT);\n    }\n\n    before(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onResume(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n        \/\/ Get a reference to the Context if this context is null\n        if (this.context == null) {\n            this.context = context;\n        }\n\n        saveToPreferences(context, ignitedAnnotation);\n\n        Log.d(LOG_TAG, \"Retrieving last known location...\");\n        \/\/ Get the last known location. This isn't directly affecting the UI, so put it on a\n        \/\/ worker thread.\n        ignitedLastKnownLocationTask = new IgnitedLastKnownLocationAsyncTask(\n                context, locationUpdatesDistanceDiff, locationUpdatesInterval);\n        ignitedLastKnownLocationTask.execute();\n    }\n\n    \/**\n     * Save last settings to preferences.\n     * \n     * @param context\n     * @param locationAnnotation\n     *\/\n    private void saveToPreferences(Context context, IgnitedLocationActivity locationAnnotation) {\n        requestLocationUpdates = locationAnnotation.requestLocationUpdates();\n        locationUpdatesDistanceDiff = locationAnnotation.locationUpdatesDistanceDiff();\n        locationUpdatesInterval = locationAnnotation.locationUpdatesInterval();\n        passiveLocationUpdatesDistanceDiff = locationAnnotation\n                .passiveLocationUpdatesDistanceDiff();\n        passiveLocationUpdatesInterval = locationAnnotation.passiveLocationUpdatesInterval();\n        boolean enablePassiveLocationUpdates = locationAnnotation.enablePassiveUpdates();\n        boolean useGps = locationAnnotation.useGps();\n\n        Editor editor = prefs.edit();\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_LOCATION_UPDATES,\n                requestLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                enablePassiveLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS, useGps);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_DISTANCE_DIFF,\n                locationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_INTERVAL,\n                locationUpdatesInterval);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_DISTANCE_DIFF,\n                passiveLocationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_INTERVAL,\n                passiveLocationUpdatesInterval);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_RUN_ONCE, true);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                locationAnnotation.minBatteryLevel());\n        editor.putLong(IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                locationAnnotation.waitForGpsFix());\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                locationAnnotation.showWaitForLocationDialog());\n        editor.commit();\n\n    }\n\n    before(Activity activity, IgnitedLocationActivity ignitedAnnotation) : execution(* Activity.onPause(..)) \n        && @this(ignitedAnnotation) && this(activity)\n        && within(@IgnitedLocationActivity *) && if (ignitedAnnotation.requestLocationUpdates()) {\n\n        disableLocationUpdates(true);\n\n        handler.removeCallbacks(removeGpsUpdates);\n\n        boolean finishing = activity.isFinishing();\n        if (finishing) {\n            if (ignitedLastKnownLocationTask != null && ignitedLastKnownLocationTask.getStatus() != AsyncTask.Status.FINISHED) {\n                ignitedLastKnownLocationTask.cancel(true);\n            } else {\n                PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            }\n\n            context = null;\n        }\n    }\n\n    \/\/ after() : execution(* Activity.onDestroy(..)) && @this(IgnitedLocationActivity)\n    \/\/ && within(@IgnitedLocationActivity *) {\n    \/\/ }\n\n    Location around() : get(@IgnitedLocation Location *) {\n        return currentLocation;\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && within(IgnitedPassiveLocationChangedReceiver) && !adviceexecution() {\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, long): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude());\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && (within(IgnitedLocationChangedReceiver) || within(com.github.ignition.location.utils.*)\n                || within(IgnitedLastKnownLocationAsyncTask)) && !adviceexecution() {\n\n        if (context == null) {\n            return;\n        }\n        final Activity activity = (Activity) context;\n        boolean showWaitForLocationDialog = prefs.getBoolean(\n                IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                IgnitedLocationConstants.SHOW_WAIT_FOR_LOCATION_DIALOG_DEFAULT);\n        if (freshLocation == null && showWaitForLocationDialog) {\n            activity.showDialog(R.id.ign_loc_dialog_wait_for_fix);\n            return;\n        }\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, long): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude());\n        boolean keepRequestingLocationUpdates = ((OnIgnitedLocationChangedListener) context)\n                .onIgnitedLocationChanged(currentLocation);\n        Bundle extras = freshLocation.getExtras();\n        if (!keepRequestingLocationUpdates) {\n            disableLocationUpdates(true);\n            PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            return;\n        } else if (requestLocationUpdates\n                && !extras.containsKey(ILastLocationFinder.LAST_LOCATION_TOO_OLD_EXTRA)) {\n            \/\/ If we requested location updates, turn them on here.\n            requestLocationUpdates(context);\n        }\n\n        \/\/ If gps is enabled location comes from gps, remove runnable that removes gps updates\n        boolean lastLocation = extras.containsKey(IgnitedLocationConstants.IGNITED_LAST_LOCATION_EXTRA);\n        if (!lastLocation && defaultCriteria.getAccuracy() == Criteria.ACCURACY_FINE\n                && currentLocation.getProvider().equals(LocationManager.GPS_PROVIDER)) {\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n    }\n\n    \/**\n     * Start listening for location updates.\n     *\/\n    protected void requestLocationUpdates(Context context) {\n        if (!locationUpdatesDisabled) {\n            return;\n        }\n        Criteria locationUpdateCriteria;\n        if (isBatteryOk()) {\n            locationUpdateCriteria = defaultCriteria;\n        } else {\n            locationUpdateCriteria = lowPowerCriteria();\n        }\n\n        Log.d(LOG_TAG, \"Disabling passive location updates\");\n        locationManager.removeUpdates(locationListenerPassivePendingIntent);\n\n        Log.d(LOG_TAG, \"Requesting location updates\");\n        \/\/ Normal updates while activity is visible.\n        locationUpdateRequester.requestLocationUpdates(locationUpdatesInterval,\n                locationUpdatesDistanceDiff, locationUpdateCriteria, locationListenerPendingIntent);\n\n        \/\/ Register a receiver that listens for when the provider I'm using has\n        \/\/ been disabled.\n        IntentFilter locationProviderDisabledIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_PROVIDER_DISABLED_ACTION);\n        context.registerReceiver(locationProviderDisabledReceiver,\n                locationProviderDisabledIntentFilter);\n\n        IntentFilter refreshLocationUpdatesIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.UPDATE_LOCATION_UPDATES_CRITERIA_ACTION);\n        context.registerReceiver(refreshLocationUpdatesReceiver, refreshLocationUpdatesIntentFilter);\n\n        \/\/ Register a receiver that listens for when a better provider than I'm\n        \/\/ using becomes available.\n        String bestProvider = locationManager.getBestProvider(locationUpdateCriteria, false);\n        String bestAvailableProvider = locationManager.getBestProvider(locationUpdateCriteria, true);\n        if (bestProvider != null && !bestProvider.equals(bestAvailableProvider)) {\n            bestInactiveLocationProviderListener = new IgnitedLocationListener(context);\n            locationManager.requestLocationUpdates(bestProvider, 0, 0,\n                    bestInactiveLocationProviderListener, context.getMainLooper());\n        }\n\n        if (bestAvailableProvider.equals(LocationManager.GPS_PROVIDER)) {\n            Log.d(LOG_TAG, \"Posting delayed remove GPS updates message\");\n            \/\/ Post a runnable that will remove gps updates if no gps location is returned after 1\n            \/\/ minute in order to avoid draining the battery.\n            handler.postDelayed(removeGpsUpdates, prefs.getLong(\n                    IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                    IgnitedLocationConstants.WAIT_FOR_GPS_FIX_INTERVAL_DEFAULT));\n        }\n\n        locationUpdatesDisabled = false;\n    }\n\n    \/**\n     * Stop listening for location updates\n     * \n     * @param enablePassiveLocationUpdates\n     *\/\n    protected void disableLocationUpdates(boolean requestPassiveLocationUpdates) {\n        if (locationUpdatesDisabled) {\n            return;\n        }\n\n        Log.d(LOG_TAG, \"Disabling location updates\");\n        context.unregisterReceiver(locationProviderDisabledReceiver);\n        context.unregisterReceiver(refreshLocationUpdatesReceiver);\n\n        locationUpdateRequester.removeLocationUpdates();\n        if (bestInactiveLocationProviderListener != null) {\n            locationManager.removeUpdates(bestInactiveLocationProviderListener);\n        }\n\n        boolean finishing = ((Activity) context).isFinishing();\n\n        if (requestPassiveLocationUpdates && !finishing) {\n            requestPassiveLocationUpdates();\n        }\n\n        locationUpdatesDisabled = true;\n    }\n\n    private void requestPassiveLocationUpdates() {\n        if (IgnitedDiagnostics.SUPPORTS_FROYO\n                && prefs.getBoolean(\n                        IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                        IgnitedLocationConstants.ENABLE_PASSIVE_LOCATION_UPDATES_DEFAULT)) {\n            Log.d(LOG_TAG, \"Requesting passive location updates\");\n            \/\/ Passive location updates from 3rd party apps when the Activity isn't\n            \/\/ visible. Only for Android 2.2+.\n            locationUpdateRequester.requestPassiveLocationUpdates(passiveLocationUpdatesInterval,\n                    passiveLocationUpdatesDistanceDiff, locationListenerPassivePendingIntent);\n        }\n    }\n\n    public boolean isLocationUpdatesDisabled() {\n        return locationUpdatesDisabled;\n    }\n\n    public Criteria lowPowerCriteria() {\n        if (lowPowerCriteria == null) {\n            lowPowerCriteria = new Criteria();\n            lowPowerCriteria.setPowerRequirement(Criteria.POWER_LOW);\n            lowPowerCriteria.setAccuracy(Criteria.NO_REQUIREMENT);\n        }\n        return lowPowerCriteria;\n    }\n\n    \/**\n     * If the best Location Provider (usually GPS) is not available when we request location\n     * updates, this listener will be notified if \/ when it becomes available. It calls\n     * requestLocationUpdates to re-register the location listeners using the better Location\n     * Provider.\n     *\/\n    private class IgnitedLocationListener implements LocationListener {\n        private Context context;\n\n        public IgnitedLocationListener(Context appContext) {\n            this.context = appContext;\n        }\n\n        @Override\n        public void onLocationChanged(Location l) {\n        }\n\n        @Override\n        public void onProviderDisabled(String provider) {\n        }\n\n        @Override\n        public void onStatusChanged(String provider, int status, Bundle extras) {\n        }\n\n        @Override\n        public void onProviderEnabled(String provider) {\n            \/\/ Re-register the location listeners using the better Location\n            \/\/ Provider.\n            disableLocationUpdates(false);\n            requestLocationUpdates(context);\n        }\n    }\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"f0008e9861dd40e49782ca5f2b86446ad9a24f0e","subject":"log plus beau\/propre","message":"log plus beau\/propre","repos":"Kar0t\/GLO-4003-B5,Kar0t\/GLO-4003-B5","old_file":"GLO-4003-B5\/src\/main\/java\/logger\/LogBoughtTicketAspect.aj","new_file":"GLO-4003-B5\/src\/main\/java\/logger\/LogBoughtTicketAspect.aj","new_contents":"package logger;\n\nimport java.io.FileWriter;\nimport java.io.IOException;\nimport java.text.DateFormat;\nimport java.text.SimpleDateFormat;\nimport java.util.ArrayList;\nimport java.util.Arrays;\nimport java.util.Date;\nimport java.util.List;\nimport java.util.UUID;\n\nimport ca.ulaval.ticketmaster.events.tickets.model.Ticket;\nimport ca.ulaval.ticketmaster.users.model.User;\n\npublic aspect LogBoughtTicketAspect {\n\n\tprivate static final String LOG_FILE = \"src\/main\/resources\/log.log\";\n\tprivate static final DateFormat dateFormat = new SimpleDateFormat(\"yyyy\/MM\/dd HH:mm:ss\");\n\tprivate static void log( String str )\n\t{\n\t\tFileWriter fwLog = null;\n\t\t\n\t\ttry {\n\t\t\tfwLog = new FileWriter(LOG_FILE, true);\n\t\t\tfwLog.append(\"\\n\");\n\t\t\tfwLog.append(dateFormat.format(new Date()));\n\t\t\tfwLog.append(\" :\\n\");\n\t\t\tfwLog.append(str);\n\t\t\tfwLog.flush();\n\t\t\tfwLog.close();\n\t\t} catch (IOException e) {\n\t\t\tSystem.out.println(\"Ne peut pas logger :\");\n\t\t\te.printStackTrace();\n\t\t}\n\t\t\n\t}\n\t\n\tpointcut logConfirmation() :\n\t\texecution(\n\t\t\t\tprivate void ca.ulaval.ticketmaster.dao.util.DataManager.sendConfirmationMail(User, UUID, List<Ticket>) );\n\t\n\t@SuppressWarnings(\"unchecked\")\n\tbefore() : logConfirmation()\n\t{\n\t\tSystem.out.println(\"around\");\n\n\t\tUser user = (User)thisJoinPoint.getArgs()[0];\n\t\tUUID transactionId = (UUID)thisJoinPoint.getArgs()[1];\n\t\tArrayList<Ticket> ticketList = (ArrayList<Ticket>)thisJoinPoint.getArgs()[2];\n\n\t\tLogBoughtTicketAspect.log(\"Envoi du courriel de confirmation  l'utilisateur '\" + user.getUsername()\n\t\t\t\t+ \"' (email='\" + user.getEmail() + \"') avec transactionId = '\" + transactionId \n\t\t\t\t+ \"', les billets :\\n\" + Arrays.toString(ticketList.toArray()));\n\t}\n\n}\n","old_contents":"package logger;\n\nimport java.io.FileWriter;\nimport java.io.IOException;\nimport java.util.ArrayList;\nimport java.util.Arrays;\nimport java.util.List;\nimport java.util.UUID;\n\nimport ca.ulaval.ticketmaster.events.tickets.model.Ticket;\nimport ca.ulaval.ticketmaster.purchase.model.PurchaseViewModel;\nimport ca.ulaval.ticketmaster.users.model.User;\n\nimport javax.servlet.http.HttpServletRequest;\nimport javax.servlet.http.HttpSession;\n\nimport org.springframework.ui.Model;\nimport org.springframework.validation.BindingResult;\n\npublic aspect LogBoughtTicketAspect {\n\n\tprivate static final String LOG_FILE = \"src\/main\/resources\/log.log\";\n\tprivate static void log( String str )\n\t{\n\t\tFileWriter fwLog = null;\n\t\t\n\t\ttry {\n\t\t\tfwLog = new FileWriter(LOG_FILE, true);\n\t\t\tfwLog.append(str);\n\t\t\tfwLog.flush();\n\t\t\tfwLog.close();\n\t\t} catch (IOException e) {\n\t\t\tSystem.out.println(\"Ne peut pas logger :\");\n\t\t\te.printStackTrace();\n\t\t}\n\t\t\n\t}\n\t\n\t\/\/Purchase\n\tpointcut logPurchase() :\n\t\texecution( \n\t\t\t\tpublic String ca.ulaval.ticketmaster.purchase.PurchaseController.purchase(PurchaseViewModel, Model, HttpSession,\n\t\t\t\t\t    BindingResult, HttpServletRequest) );\n\t\n\tbefore() : logPurchase()\n\t{\n\t\tSystem.out.println(\"About to log\");\n\t\t\n\t\tSystem.out.println(thisJoinPoint.getSignature());\n\t\tSystem.out.println(thisJoinPoint.getArgs().length);\n\t\t\n\t\tSystem.out.println(thisJoinPoint.getArgs()[0] instanceof PurchaseViewModel);\n\t\t\n\t\tif ( thisJoinPoint.getArgs()[0] instanceof PurchaseViewModel )\n\t\t{\n\t\t\tPurchaseViewModel pModel = (PurchaseViewModel)thisJoinPoint.getArgs()[0];\n\t\t\t\n\t\t\tSystem.out.println(pModel.toString());\n\t\t}\n\t\t\/\/pModel.\n\t\t\/\/System.out.println(model.);\n\t\t\t\t\/\/thisJoinPoint().getArgs();\n\t}\n\t\n\tpointcut logConfirmation() :\n\t\texecution(\n\t\t\t\tprivate void ca.ulaval.ticketmaster.dao.util.DataManager.sendConfirmationMail(User, UUID, List<Ticket>) );\n\t\n\t@SuppressWarnings(\"unchecked\")\n\tObject around() : logConfirmation()\n\t{\n\t\tSystem.out.println(\"around\");\n\n\t\tUser user = (User)thisJoinPoint.getArgs()[0];\n\t\tUUID transactionId = (UUID)thisJoinPoint.getArgs()[1];\n\t\tArrayList<Ticket> ticketList = (ArrayList<Ticket>)thisJoinPoint.getArgs()[2];\n\n\t\tLogBoughtTicketAspect.log(\"Envoi du courriel de confirmation  l'utilisateur '\" + user.getUsername()\n\t\t\t\t+ \"' avec transactionId = '\" + transactionId \n\t\t\t\t+ \"', les billets :\\n\" + Arrays.toString(ticketList.toArray()));\n\t\t\n\t\tObject retval = proceed();\n\t\t\n\t\treturn retval;\n\t}\n\n}\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"9b458b30ded2ca658076d83472a99de5324481a8","subject":"fixed bug in counting weiter games","message":"fixed bug in counting weiter games\n","repos":"stieglma\/Schafkopfauswerter","old_file":"src\/OverallStats.aj","new_file":"src\/OverallStats.aj","new_contents":"import model.SystemValues.WIN;\nimport model.db.DataObject;\nimport model.db.GameData;\n\npublic privileged aspect OverallStats {\n    public OverallStatistics GameData.getOverallStatistics() {\n        int anzahlSpieleGesamt = 0;\n        int anzahlSpieleGesamtGewonnen = 0;\n        int teuerstesRufspiel = 0;\n        int teuerstesSolo = 0;\n        int teuerstesSoloTout = 0;\n        int teuerstesSoloSie = 0;\n        int anzahlRufspiele = 0;\n        int anzahlSoli = 0;\n        int anzahlSoliTout = 0;\n        int anzahlSoliSie = 0;\n        int anzahlSoliGesamt = 0;\n        int anzahlGewonneneSoliGesamt = 0;\n        int anzahlGewonneneRufspiele = 0;\n        int anzahlGewonneneSoli = 0;\n        int anzahlGewonneneSoliTout = 0;\n        int anzahlGewonneneSoliSie = 0;\n        int anzahlWeiter = 0;\n        double gesamtWinPerc = 0.0;\n        double rufspieleWinPerc = 0.0;\n        double soliGesamtWinPerc = 0.0;\n        double soliNormalWinPerc = 0.0;\n        double soliToutWinPerc = 0.0;\n        double soliSieWinPerc = 0.0;\n\n        for (DataObject obj : data) {\n            switch (obj.getGameKind()) {\n            case RUFSPIEL:\n                anzahlRufspiele++;\n                anzahlSpieleGesamt++;\n                if (obj.getGameWon() == WIN.PLAYER) {\n                    anzahlGewonneneRufspiele++;\n                    anzahlSpieleGesamtGewonnen++;\n                }\n                if (obj.getGameValue() > teuerstesRufspiel) {\n                    teuerstesRufspiel = obj.getGameValue();\n                }\n                break;\n            case SOLO:\n                anzahlSoli++;\n                anzahlSpieleGesamt++;\n                if (obj.getGameWon() == WIN.PLAYER) {\n                    anzahlGewonneneSoli++;\n                    anzahlSpieleGesamtGewonnen++;\n                }\n                if (obj.getGameValue() > teuerstesSolo) {\n                    teuerstesSolo = obj.getGameValue();\n                }\n                break;\n            case TOUT:\n                anzahlSpieleGesamt++;\n                if (obj.getGameWon() == WIN.PLAYER) {\n                    anzahlGewonneneSoliTout++;\n                    anzahlSpieleGesamtGewonnen++;\n                }\n                if (obj.getGameValue() > teuerstesSoloTout) {\n                    teuerstesSoloTout = obj.getGameValue();\n                }\n                anzahlSoliTout++;\n                break;\n            case SIE:\n                anzahlSpieleGesamt++;\n                if (obj.getGameWon() == WIN.PLAYER) {\n                    anzahlGewonneneSoliSie++;\n                    anzahlSpieleGesamtGewonnen++;\n                }\n                anzahlSoliSie++;\n                if (obj.getGameValue() > teuerstesSoloSie) {\n                    teuerstesSoloSie = obj.getGameValue();\n                }\n                break;\n            case WEITER:\n                anzahlWeiter++;\n                break;\n            case NONE: \/\/ nothing to do here\n                break;\n            default: \/\/ here neither\n                break;\n            }\n        }\n\n        anzahlSoliGesamt = anzahlSoli + anzahlSoliTout + anzahlSoliSie;\n        anzahlGewonneneSoliGesamt = anzahlGewonneneSoli\n                + anzahlGewonneneSoliSie + anzahlGewonneneSoliTout;\n\n        gesamtWinPerc = (anzahlSpieleGesamt > 0 ? anzahlSpieleGesamtGewonnen\n                \/ ((double) anzahlSpieleGesamt) : 0) * 100;\n        rufspieleWinPerc = (anzahlRufspiele > 0 ? anzahlGewonneneRufspiele\n                \/ ((double) anzahlRufspiele) : 0) * 100;\n        soliGesamtWinPerc = ((anzahlSoli + anzahlSoliSie + anzahlSoliTout) > 0 ? ((anzahlGewonneneSoli\n                + anzahlGewonneneSoliTout + anzahlSoliSie) \/ 1.0 \/ (anzahlSoli\n                + anzahlSoliSie + anzahlSoliTout))\n                : 0) * 100;\n        soliNormalWinPerc = (anzahlSoli > 0 ? anzahlGewonneneSoli\n                \/ ((double) anzahlSoli) : 0) * 100;\n        soliToutWinPerc = (anzahlSoliTout > 0 ? anzahlGewonneneSoliTout\n                \/ ((double) anzahlSoliTout) : 0) * 100;\n        soliSieWinPerc = (anzahlSoliSie > 0 ? anzahlSoliSie\n                \/ ((double) anzahlSoliSie) : 0) * 100;\n\n        return new OverallStatistics(anzahlSpieleGesamt,\n                anzahlSpieleGesamtGewonnen, anzahlRufspiele,\n                anzahlGewonneneRufspiele, anzahlSoli, anzahlGewonneneSoli,\n                anzahlSoliTout, anzahlGewonneneSoliTout, anzahlSoliSie,\n                anzahlGewonneneSoliSie, anzahlSoliGesamt,\n                anzahlGewonneneSoliGesamt, anzahlWeiter, teuerstesRufspiel,\n                teuerstesSolo, teuerstesSoloTout, teuerstesSoloSie,\n                gesamtWinPerc, rufspieleWinPerc, soliGesamtWinPerc,\n                soliNormalWinPerc, soliToutWinPerc, soliSieWinPerc);\n    }\n}\n\nclass OverallStatistics {\n    private int anzahlSpieleGesamt;\n    private int anzahlSpieleGesamtGewonnen;\n    private int anzahlRufspiele;\n    private int anzahlGewonneneRufspiele;\n    private int anzahlSoli;\n    private int anzahlGewonneneSoli;\n    private int anzahlSoliTout;\n    private int anzahlGewonneneSoliTout;\n    private int anzahlSoliSie;\n    private int anzahlGewonneneSoliSie;\n    private int anzahlSoliGesamt;\n    private int anzahlGewonneneSoliGesamt;\n    private int anzahlWeiter;\n    private int teuerstesRufspiel = 0;\n    private int teuerstesSolo = 0;\n    private int teuerstesSoloTout = 0;\n    private int teuerstesSoloSie = 0;\n    private double gesamtWinPerc = 0.0;\n    private double rufspieleWinPerc = 0.0;\n    private double soliGesamtWinPerc = 0.0;\n    private double soliNormalWinPerc = 0.0;\n    private double soliToutWinPerc = 0.0;\n    private double soliSieWinPerc = 0.0;\n\n    public OverallStatistics(int anzahlSpieleGesamt,\n            int anzahlSpieleGesamtGewonnen, int anzahlRufspiele,\n            int anzahlGewonneneRufspiele, int anzahlSoli,\n            int anzahlGewonneneSoli, int anzahlSoliTout,\n            int anzahlGewonneneSoliTout, int anzahlSoliSie,\n            int anzahlGewonneneSoliSie, int anzahlSoliGesamt,\n            int anzahlGewonneneSoliGesamt, int anzahlWeiter,\n            int teuerstesRufspiel, int teuerstesSolo, int teuerstesSoloTout,\n            int teuerstesSoloSie, double gesamtWinPerc,\n            double rufspieleWinPerc, double soliGesamtWinPerc,\n            double soliNormalWinPerc, double soliToutWinPerc,\n            double soliSieWinPerc) {\n        this.anzahlSpieleGesamt = anzahlSpieleGesamt;\n        this.anzahlSpieleGesamtGewonnen = anzahlSpieleGesamtGewonnen;\n        this.anzahlRufspiele = anzahlRufspiele;\n        this.anzahlGewonneneRufspiele = anzahlGewonneneRufspiele;\n        this.anzahlSoli = anzahlSoli;\n        this.anzahlGewonneneSoli = anzahlGewonneneSoli;\n        this.anzahlSoliTout = anzahlSoliTout;\n        this.anzahlGewonneneSoliTout = anzahlGewonneneSoliTout;\n        this.anzahlSoliSie = anzahlSoliSie;\n        this.anzahlGewonneneSoliSie = anzahlGewonneneSoliSie;\n        this.anzahlSoliGesamt = anzahlSoliGesamt;\n        this.anzahlGewonneneSoliGesamt = anzahlGewonneneSoliGesamt;\n        this.anzahlWeiter = anzahlWeiter;\n        this.teuerstesRufspiel = teuerstesRufspiel;\n        this.teuerstesSolo = teuerstesSolo;\n        this.teuerstesSoloTout = teuerstesSoloTout;\n        this.teuerstesSoloSie = teuerstesSoloSie;\n        this.gesamtWinPerc = gesamtWinPerc;\n        this.rufspieleWinPerc = rufspieleWinPerc;\n        this.soliGesamtWinPerc = soliGesamtWinPerc;\n        this.soliNormalWinPerc = soliNormalWinPerc;\n        this.soliToutWinPerc = soliToutWinPerc;\n        this.soliSieWinPerc = soliSieWinPerc;\n    }\n\n    public int getAnzahlSpieleGesamt() {\n        return anzahlSpieleGesamt;\n    }\n\n    public int getAnzahlSpieleGesamtGewonnen() {\n        return anzahlSpieleGesamtGewonnen;\n    }\n\n    public int getAnzahlRufspiele() {\n        return anzahlRufspiele;\n    }\n\n    public int getAnzahlGewonneneRufspiele() {\n        return anzahlGewonneneRufspiele;\n    }\n\n    public int getAnzahlSoli() {\n        return anzahlSoli;\n    }\n\n    public int getAnzahlGewonneneSoli() {\n        return anzahlGewonneneSoli;\n    }\n\n    public int getAnzahlSoliTout() {\n        return anzahlSoliTout;\n    }\n\n    public int getAnzahlGewonneneSoliTout() {\n        return anzahlGewonneneSoliTout;\n    }\n\n    public int getAnzahlSoliSie() {\n        return anzahlSoliSie;\n    }\n\n    public int getAnzahlGewonneneSoliSie() {\n        return anzahlGewonneneSoliSie;\n    }\n\n    public int getAnzahlSoliGesamt() {\n        return anzahlSoliGesamt;\n    }\n\n    public int getAnzahlGewonneneSoliGesamt() {\n        return anzahlGewonneneSoliGesamt;\n    }\n\n    public int getAnzahlWeiter() {\n        return anzahlWeiter;\n    }\n\n    public int getTeuerstesRufspiel() {\n        return teuerstesRufspiel;\n    }\n\n    public int getTeuerstesSolo() {\n        return teuerstesSolo;\n    }\n\n    public int getTeuerstesSoloTout() {\n        return teuerstesSoloTout;\n    }\n\n    public int getTeuerstesSoloSie() {\n        return teuerstesSoloSie;\n    }\n\n    public double getGesamtWinPerc() {\n        return gesamtWinPerc;\n    }\n\n    public double getRufspieleWinPerc() {\n        return rufspieleWinPerc;\n    }\n\n    public double getSoliGesamtWinPerc() {\n        return soliGesamtWinPerc;\n    }\n\n    public double getSoliNormalWinPerc() {\n        return soliNormalWinPerc;\n    }\n\n    public double getSoliToutWinPerc() {\n        return soliToutWinPerc;\n    }\n\n    public double getSoliSieWinPerc() {\n        return soliSieWinPerc;\n    }\n}","old_contents":"import model.SystemValues.WIN;\nimport model.db.DataObject;\nimport model.db.GameData;\n\npublic privileged aspect OverallStats {\n    public OverallStatistics GameData.getOverallStatistics() {\n        int anzahlSpieleGesamt = 0;\n        int anzahlSpieleGesamtGewonnen = 0;\n        int teuerstesRufspiel = 0;\n        int teuerstesSolo = 0;\n        int teuerstesSoloTout = 0;\n        int teuerstesSoloSie = 0;\n        int anzahlRufspiele = 0;\n        int anzahlSoli = 0;\n        int anzahlSoliTout = 0;\n        int anzahlSoliSie = 0;\n        int anzahlSoliGesamt = 0;\n        int anzahlGewonneneSoliGesamt = 0;\n        int anzahlGewonneneRufspiele = 0;\n        int anzahlGewonneneSoli = 0;\n        int anzahlGewonneneSoliTout = 0;\n        int anzahlGewonneneSoliSie = 0;\n        int anzahlWeiter = -1;\n        double gesamtWinPerc = 0.0;\n        double rufspieleWinPerc = 0.0;\n        double soliGesamtWinPerc = 0.0;\n        double soliNormalWinPerc = 0.0;\n        double soliToutWinPerc = 0.0;\n        double soliSieWinPerc = 0.0;\n\n        for (DataObject obj : data) {\n            switch (obj.getGameKind()) {\n            case RUFSPIEL:\n                anzahlRufspiele++;\n                anzahlSpieleGesamt++;\n                if (obj.getGameWon() == WIN.PLAYER) {\n                    anzahlGewonneneRufspiele++;\n                    anzahlSpieleGesamtGewonnen++;\n                }\n                if (obj.getGameValue() > teuerstesRufspiel) {\n                    teuerstesRufspiel = obj.getGameValue();\n                }\n                break;\n            case SOLO:\n                anzahlSoli++;\n                anzahlSpieleGesamt++;\n                if (obj.getGameWon() == WIN.PLAYER) {\n                    anzahlGewonneneSoli++;\n                    anzahlSpieleGesamtGewonnen++;\n                }\n                if (obj.getGameValue() > teuerstesSolo) {\n                    teuerstesSolo = obj.getGameValue();\n                }\n                break;\n            case TOUT:\n                anzahlSpieleGesamt++;\n                if (obj.getGameWon() == WIN.PLAYER) {\n                    anzahlGewonneneSoliTout++;\n                    anzahlSpieleGesamtGewonnen++;\n                }\n                if (obj.getGameValue() > teuerstesSoloTout) {\n                    teuerstesSoloTout = obj.getGameValue();\n                }\n                anzahlSoliTout++;\n                break;\n            case SIE:\n                anzahlSpieleGesamt++;\n                if (obj.getGameWon() == WIN.PLAYER) {\n                    anzahlGewonneneSoliSie++;\n                    anzahlSpieleGesamtGewonnen++;\n                }\n                anzahlSoliSie++;\n                if (obj.getGameValue() > teuerstesSoloSie) {\n                    teuerstesSoloSie = obj.getGameValue();\n                }\n                break;\n            case WEITER:\n                anzahlWeiter++;\n                break;\n            case NONE: \/\/ nothing to do here\n                break;\n            default: \/\/ here neither\n                break;\n            }\n        }\n\n        anzahlSoliGesamt = anzahlSoli + anzahlSoliTout + anzahlSoliSie;\n        anzahlGewonneneSoliGesamt = anzahlGewonneneSoli\n                + anzahlGewonneneSoliSie + anzahlGewonneneSoliTout;\n\n        gesamtWinPerc = (anzahlSpieleGesamt > 0 ? anzahlSpieleGesamtGewonnen\n                \/ ((double) anzahlSpieleGesamt) : 0) * 100;\n        rufspieleWinPerc = (anzahlRufspiele > 0 ? anzahlGewonneneRufspiele\n                \/ ((double) anzahlRufspiele) : 0) * 100;\n        soliGesamtWinPerc = ((anzahlSoli + anzahlSoliSie + anzahlSoliTout) > 0 ? ((anzahlGewonneneSoli\n                + anzahlGewonneneSoliTout + anzahlSoliSie) \/ 1.0 \/ (anzahlSoli\n                + anzahlSoliSie + anzahlSoliTout))\n                : 0) * 100;\n        soliNormalWinPerc = (anzahlSoli > 0 ? anzahlGewonneneSoli\n                \/ ((double) anzahlSoli) : 0) * 100;\n        soliToutWinPerc = (anzahlSoliTout > 0 ? anzahlGewonneneSoliTout\n                \/ ((double) anzahlSoliTout) : 0) * 100;\n        soliSieWinPerc = (anzahlSoliSie > 0 ? anzahlSoliSie\n                \/ ((double) anzahlSoliSie) : 0) * 100;\n\n        return new OverallStatistics(anzahlSpieleGesamt,\n                anzahlSpieleGesamtGewonnen, anzahlRufspiele,\n                anzahlGewonneneRufspiele, anzahlSoli, anzahlGewonneneSoli,\n                anzahlSoliTout, anzahlGewonneneSoliTout, anzahlSoliSie,\n                anzahlGewonneneSoliSie, anzahlSoliGesamt,\n                anzahlGewonneneSoliGesamt, anzahlWeiter, teuerstesRufspiel,\n                teuerstesSolo, teuerstesSoloTout, teuerstesSoloSie,\n                gesamtWinPerc, rufspieleWinPerc, soliGesamtWinPerc,\n                soliNormalWinPerc, soliToutWinPerc, soliSieWinPerc);\n    }\n}\n\nclass OverallStatistics {\n    private int anzahlSpieleGesamt;\n    private int anzahlSpieleGesamtGewonnen;\n    private int anzahlRufspiele;\n    private int anzahlGewonneneRufspiele;\n    private int anzahlSoli;\n    private int anzahlGewonneneSoli;\n    private int anzahlSoliTout;\n    private int anzahlGewonneneSoliTout;\n    private int anzahlSoliSie;\n    private int anzahlGewonneneSoliSie;\n    private int anzahlSoliGesamt;\n    private int anzahlGewonneneSoliGesamt;\n    private int anzahlWeiter;\n    private int teuerstesRufspiel = 0;\n    private int teuerstesSolo = 0;\n    private int teuerstesSoloTout = 0;\n    private int teuerstesSoloSie = 0;\n    private double gesamtWinPerc = 0.0;\n    private double rufspieleWinPerc = 0.0;\n    private double soliGesamtWinPerc = 0.0;\n    private double soliNormalWinPerc = 0.0;\n    private double soliToutWinPerc = 0.0;\n    private double soliSieWinPerc = 0.0;\n\n    public OverallStatistics(int anzahlSpieleGesamt,\n            int anzahlSpieleGesamtGewonnen, int anzahlRufspiele,\n            int anzahlGewonneneRufspiele, int anzahlSoli,\n            int anzahlGewonneneSoli, int anzahlSoliTout,\n            int anzahlGewonneneSoliTout, int anzahlSoliSie,\n            int anzahlGewonneneSoliSie, int anzahlSoliGesamt,\n            int anzahlGewonneneSoliGesamt, int anzahlWeiter,\n            int teuerstesRufspiel, int teuerstesSolo, int teuerstesSoloTout,\n            int teuerstesSoloSie, double gesamtWinPerc,\n            double rufspieleWinPerc, double soliGesamtWinPerc,\n            double soliNormalWinPerc, double soliToutWinPerc,\n            double soliSieWinPerc) {\n        this.anzahlSpieleGesamt = anzahlSpieleGesamt;\n        this.anzahlSpieleGesamtGewonnen = anzahlSpieleGesamtGewonnen;\n        this.anzahlRufspiele = anzahlRufspiele;\n        this.anzahlGewonneneRufspiele = anzahlGewonneneRufspiele;\n        this.anzahlSoli = anzahlSoli;\n        this.anzahlGewonneneSoli = anzahlGewonneneSoli;\n        this.anzahlSoliTout = anzahlSoliTout;\n        this.anzahlGewonneneSoliTout = anzahlGewonneneSoliTout;\n        this.anzahlSoliSie = anzahlSoliSie;\n        this.anzahlGewonneneSoliSie = anzahlGewonneneSoliSie;\n        this.anzahlSoliGesamt = anzahlSoliGesamt;\n        this.anzahlGewonneneSoliGesamt = anzahlGewonneneSoliGesamt;\n        this.anzahlWeiter = anzahlWeiter;\n        this.teuerstesRufspiel = teuerstesRufspiel;\n        this.teuerstesSolo = teuerstesSolo;\n        this.teuerstesSoloTout = teuerstesSoloTout;\n        this.teuerstesSoloSie = teuerstesSoloSie;\n        this.gesamtWinPerc = gesamtWinPerc;\n        this.rufspieleWinPerc = rufspieleWinPerc;\n        this.soliGesamtWinPerc = soliGesamtWinPerc;\n        this.soliNormalWinPerc = soliNormalWinPerc;\n        this.soliToutWinPerc = soliToutWinPerc;\n        this.soliSieWinPerc = soliSieWinPerc;\n    }\n\n    public int getAnzahlSpieleGesamt() {\n        return anzahlSpieleGesamt;\n    }\n\n    public int getAnzahlSpieleGesamtGewonnen() {\n        return anzahlSpieleGesamtGewonnen;\n    }\n\n    public int getAnzahlRufspiele() {\n        return anzahlRufspiele;\n    }\n\n    public int getAnzahlGewonneneRufspiele() {\n        return anzahlGewonneneRufspiele;\n    }\n\n    public int getAnzahlSoli() {\n        return anzahlSoli;\n    }\n\n    public int getAnzahlGewonneneSoli() {\n        return anzahlGewonneneSoli;\n    }\n\n    public int getAnzahlSoliTout() {\n        return anzahlSoliTout;\n    }\n\n    public int getAnzahlGewonneneSoliTout() {\n        return anzahlGewonneneSoliTout;\n    }\n\n    public int getAnzahlSoliSie() {\n        return anzahlSoliSie;\n    }\n\n    public int getAnzahlGewonneneSoliSie() {\n        return anzahlGewonneneSoliSie;\n    }\n\n    public int getAnzahlSoliGesamt() {\n        return anzahlSoliGesamt;\n    }\n\n    public int getAnzahlGewonneneSoliGesamt() {\n        return anzahlGewonneneSoliGesamt;\n    }\n\n    public int getAnzahlWeiter() {\n        return anzahlWeiter;\n    }\n\n    public int getTeuerstesRufspiel() {\n        return teuerstesRufspiel;\n    }\n\n    public int getTeuerstesSolo() {\n        return teuerstesSolo;\n    }\n\n    public int getTeuerstesSoloTout() {\n        return teuerstesSoloTout;\n    }\n\n    public int getTeuerstesSoloSie() {\n        return teuerstesSoloSie;\n    }\n\n    public double getGesamtWinPerc() {\n        return gesamtWinPerc;\n    }\n\n    public double getRufspieleWinPerc() {\n        return rufspieleWinPerc;\n    }\n\n    public double getSoliGesamtWinPerc() {\n        return soliGesamtWinPerc;\n    }\n\n    public double getSoliNormalWinPerc() {\n        return soliNormalWinPerc;\n    }\n\n    public double getSoliToutWinPerc() {\n        return soliToutWinPerc;\n    }\n\n    public double getSoliSieWinPerc() {\n        return soliSieWinPerc;\n    }\n}","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"9f50c3bdc03ba078c7b9690d258cb8effb4c2947","subject":"Revert 80c455f312db210dad581ae50042cc437dc56dbd","message":"Revert 80c455f312db210dad581ae50042cc437dc56dbd\n","repos":"inbloom\/secure-data-service,inbloom\/secure-data-service,inbloom\/secure-data-service,inbloom\/secure-data-service,inbloom\/secure-data-service","old_file":"sli\/ingestion\/ingestion-core\/src\/main\/java\/org\/slc\/sli\/aspect\/LoggerCarrierAspect.aj","new_file":"sli\/ingestion\/ingestion-core\/src\/main\/java\/org\/slc\/sli\/aspect\/LoggerCarrierAspect.aj","new_contents":"package org.slc.sli.aspect;\n\nimport java.util.HashMap;\nimport java.util.Map;\n\nimport org.slf4j.LoggerFactory;\nimport org.springframework.beans.factory.annotation.Value;\nimport org.springframework.data.mongodb.core.CollectionOptions;\nimport org.springframework.data.mongodb.core.MongoTemplate;\nimport org.slc.sli.domain.Entity;\nimport org.slc.sli.domain.Repository;\nimport org.slc.sli.dal.repository.MongoRepository;\n\nimport org.slc.sli.common.util.logging.SecurityEvent;\nimport org.slc.sli.common.util.logging.LoggerCarrier;\n\nimport com.mongodb.BasicDBObject;\nimport com.mongodb.DBObject;\n\npublic aspect LoggerCarrierAspect {\n\tdeclare parents : (org.slc.sli.ingestion..* &&\n            !java.lang.Enum+)  implements LoggerCarrier;\n    \n    private Repository<Entity> entityRepository;\n    \n    @Value(\"${sli.ingestion.securityEvent.capSize}\")\n    private String capSize;\n    \n    public void LoggerCarrier.audit(SecurityEvent event) {\n        MongoRepository<Entity> mer = (MongoRepository<Entity>) LoggerCarrierAspect.aspectOf().getEntityRepository();\n        if (mer != null) {\n            MongoTemplate mongoTemplate = mer.getTemplate();\n            String capSizeStr = LoggerCarrierAspect.aspectOf().getCapSize();\n            \n            if (capSizeStr != null && !capSizeStr.isEmpty()) {\n                int capSizeInt = Integer.parseInt(capSizeStr);\n                \/\/ UN: If the collection is not present, create the capped collection.\n                \/\/ However, if it is present and uncapped, change it to capped collection\n                \/\/ 496 bytes is size of 1 security event document * capsize ~ the size that we want.\n                if (!mongoTemplate.collectionExists(\"securityEvent\")) {\n                    CollectionOptions collectionOptions = new CollectionOptions(capSizeInt * 496, capSizeInt, true);\n                    mongoTemplate.createCollection(\"securityEvent\", collectionOptions);\n                } else {\n                    if (!mongoTemplate.getCollection(\"securityEvent\").isCapped()) {\n                        DBObject cmd = new BasicDBObject();\n                        cmd.put(\"convertToCapped\", \"securityEvent\");\n                        cmd.put(\"size\", capSizeInt * 496);\n                        mongoTemplate.getDb().command(cmd);\n                    }\n                }\n            }\n            \n            Map<String, Object> metadata = new HashMap<String, Object>();\n            metadata.put(\"tenantId\", event.getTenantId());\n            mer.create(\"securityEvent\", event.getProperties(), metadata, \"securityEvent\");\n        } else {\n            LoggerFactory.getLogger(\"SecurityMonitor\").info(\"[Could not log SecurityEvent to mongo!]\");\n        }\n        \n        switch (event.getLogLevel()) {\n            case TYPE_DEBUG:\n                LoggerFactory.getLogger(\"SecurityMonitor\").debug(event.toString());\n                break;\n            \n            case TYPE_WARN:\n                LoggerFactory.getLogger(\"SecurityMonitor\").warn(event.toString());\n                break;\n            \n            case TYPE_INFO:\n                LoggerFactory.getLogger(\"SecurityMonitor\").info(event.toString());\n                break;\n            \n            case TYPE_ERROR:\n                LoggerFactory.getLogger(\"SecurityMonitor\").error(event.toString());\n                break;\n            \n            case TYPE_TRACE:\n                LoggerFactory.getLogger(\"SecurityMonitor\").trace(event.toString());\n                break;\n            \n            default:\n                LoggerFactory.getLogger(\"SecurityMonitor\").info(event.toString());\n                break;\n        }\n    }\n\n    public Repository<Entity> getEntityRepository() {\n        return entityRepository;\n    }\n    \n    public void setEntityRepository(Repository<Entity> entityRepository) {\n        this.entityRepository = entityRepository;\n    }\n\n    public String getCapSize() {\n        return capSize;\n    }\n    \n    public void setCapSize(String capSize) {\n        this.capSize = capSize;\n    }\n    \n}\n","old_contents":"package org.slc.sli.aspect;\n\nimport java.util.HashMap;\nimport java.util.Map;\n\nimport org.slf4j.LoggerFactory;\nimport org.springframework.beans.factory.annotation.Value;\nimport org.springframework.data.mongodb.core.CollectionOptions;\nimport org.springframework.data.mongodb.core.MongoTemplate;\nimport org.slc.sli.domain.Entity;\nimport org.slc.sli.domain.Repository;\nimport org.slc.sli.dal.repository.MongoRepository;\n\nimport org.slc.sli.common.util.logging.SecurityEvent;\nimport org.slc.sli.common.util.logging.LoggerCarrier;\n\nimport com.mongodb.BasicDBObject;\nimport com.mongodb.DBObject;\n\npublic aspect LoggerCarrierAspect {\n\tdeclare parents : (org.slc.sli.ingestion..* &&\n            !java.lang.Enum+)  implements LoggerCarrier;\n    \n    private Repository<Entity> entityRepository;\n    \n\/\/    private MongoTemplate template;\n    \n\/\/    public MongoTemplate getTemplate() {\n\/\/    \treturn template;\n\/\/    }\n    \n\/\/    public void setTemplate(MongoTemplate template) {\n\/\/    \tthis.template = template;\n\/\/    }\n    \n    \n    @Value(\"${sli.ingestion.securityEvent.capSize}\")\n    private String capSize;\n    \n    public void LoggerCarrier.audit(SecurityEvent event) {\n        MongoRepository<Entity> mer = (MongoRepository<Entity>) LoggerCarrierAspect.aspectOf().getEntityRepository();\n        if (mer != null) {\n            MongoTemplate mongoTemplate = mer.getTemplate();\n            String capSizeStr = LoggerCarrierAspect.aspectOf().getCapSize();\n            \n            if (capSizeStr != null && !capSizeStr.isEmpty()) {\n                int capSizeInt = Integer.parseInt(capSizeStr);\n                \/\/ UN: If the collection is not present, create the capped collection.\n                \/\/ However, if it is present and uncapped, change it to capped collection\n                \/\/ 496 bytes is size of 1 security event document * capsize ~ the size that we want.\n                if (!mongoTemplate.collectionExists(\"securityEvent\")) {\n                    CollectionOptions collectionOptions = new CollectionOptions(capSizeInt * 496, capSizeInt, true);\n                    mongoTemplate.createCollection(\"securityEvent\", collectionOptions);\n                } else {\n                    if (!mongoTemplate.getCollection(\"securityEvent\").isCapped()) {\n                        DBObject cmd = new BasicDBObject();\n                        cmd.put(\"convertToCapped\", \"securityEvent\");\n                        cmd.put(\"size\", capSizeInt * 496);\n                        mongoTemplate.getDb().command(cmd);\n                    }\n                }\n            }\n            \n            Map<String, Object> metadata = new HashMap<String, Object>();\n            metadata.put(\"tenantId\", event.getTenantId());\n            mer.create(\"securityEvent\", event.getProperties(), metadata, \"securityEvent\");\n        } else {\n            LoggerFactory.getLogger(\"SecurityMonitor\").info(\"[Could not log SecurityEvent to mongo!]\");\n        }\n        \n        switch (event.getLogLevel()) {\n            case TYPE_DEBUG:\n                LoggerFactory.getLogger(\"SecurityMonitor\").debug(event.toString());\n                break;\n            \n            case TYPE_WARN:\n                LoggerFactory.getLogger(\"SecurityMonitor\").warn(event.toString());\n                break;\n            \n            case TYPE_INFO:\n                LoggerFactory.getLogger(\"SecurityMonitor\").info(event.toString());\n                break;\n            \n            case TYPE_ERROR:\n                LoggerFactory.getLogger(\"SecurityMonitor\").error(event.toString());\n                break;\n            \n            case TYPE_TRACE:\n                LoggerFactory.getLogger(\"SecurityMonitor\").trace(event.toString());\n                break;\n            \n            default:\n                LoggerFactory.getLogger(\"SecurityMonitor\").info(event.toString());\n                break;\n        }\n    }\n\n    public Repository<Entity> getEntityRepository() {\n        return entityRepository;\n    }\n    \n    public void setEntityRepository(Repository<Entity> entityRepository) {\n        this.entityRepository = entityRepository;\n    }\n\n    public String getCapSize() {\n        return capSize;\n    }\n    \n    public void setCapSize(String capSize) {\n        this.capSize = capSize;\n    }\n    \n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"2a189ab9998ea0fb2996e906063e2c47ae0eb883","subject":"CThread2 renamed to CThread","message":"CThread2 renamed to CThread\n","repos":"selig\/qea","old_file":"qeaBenchmark\/src\/JavaMOPThreeAspect.aj","new_file":"qeaBenchmark\/src\/JavaMOPThreeAspect.aj","new_contents":"import properties.Property;\nimport properties.competition.JavaMOP;\nimport structure.impl.other.Verdict;\nimport benchmark.competition.java.QEAMonitoringAspect;\n\npublic aspect JavaMOPThreeAspect extends QEAMonitoringAspect {\n\n\tprivate final int A = 1;\n\tprivate final int B = 2;\n\tprivate final int C = 3;\n\n\tpublic JavaMOPThreeAspect() {\n\t\tsuper(new JavaMOP().make(Property.JAVAMOP_THREE));\n\t\tvalidationMsg = \"Property JavaMOP 3 satisfied\";\n\t\tviolationMsg = \"Property JavaMOP 3 violated. The functions A(), B(), C() must be called equal times\";\n\t}\n\n\tpointcut A() : call(void CThread.A());\n\n\tpointcut B() : call(void CThread.B());\n\n\tpointcut C() : call(void CThread.C());\n\n\tbefore() : A() {\n\t\tVerdict verdict;\n\t\tsynchronized (monitor) {\n\t\t\tverdict = monitor.step(A);\n\t\t}\n\t\tif (verdict == Verdict.FAILURE) {\n\t\t\tSystem.err.println(violationMsg);\n\t\t\tprintTimeAndExit();\n\t\t}\n\t}\n\n\tbefore() : B() {\n\t\tVerdict verdict;\n\t\tsynchronized (monitor) {\n\t\t\tverdict = monitor.step(B);\n\t\t}\n\t\tif (verdict == Verdict.FAILURE) {\n\t\t\tSystem.err.println(violationMsg);\n\t\t\tprintTimeAndExit();\n\t\t}\n\t}\n\n\tbefore() : C() {\n\t\tVerdict verdict;\n\t\tsynchronized (monitor) {\n\t\t\tverdict = monitor.step(C);\n\t\t}\n\t\tif (verdict == Verdict.FAILURE) {\n\t\t\tSystem.err.println(violationMsg);\n\t\t\tprintTimeAndExit();\n\t\t}\n\t}\n}\n","old_contents":"\n\nimport properties.Property;\nimport properties.competition.JavaMOP;\nimport structure.impl.other.Verdict;\nimport benchmark.competition.java.QEAMonitoringAspect;\n\npublic aspect JavaMOPThreeAspect extends QEAMonitoringAspect {\n\n\tprivate final int A = 1;\n\tprivate final int B = 2;\n\tprivate final int C = 3;\n\n\tpublic JavaMOPThreeAspect() {\n\t\tsuper(new JavaMOP().make(Property.JAVAMOP_THREE));\n\t\tvalidationMsg = \"Property JavaMOP 3 satisfied\";\n\t\tviolationMsg = \"Property JavaMOP 3 violated. The functions A(), B(), C() must be called equal times\";\n\t}\n\n\tpointcut A() : call(void CThread2.A());\n\n\tpointcut B() : call(void CThread2.B());\n\n\tpointcut C() : call(void CThread2.C());\n\n\tbefore() : A() {\n\t\tVerdict verdict;\n\t\tsynchronized (monitor) {\n\t\t\tverdict = monitor.step(A);\n\t\t}\n\t\tif (verdict == Verdict.FAILURE) {\n\t\t\tSystem.err.println(violationMsg);\n\t\t\tprintTimeAndExit();\n\t\t}\n\t}\n\n\tbefore() : B() {\n\t\tVerdict verdict;\n\t\tsynchronized (monitor) {\n\t\t\tverdict = monitor.step(B);\n\t\t}\n\t\tif (verdict == Verdict.FAILURE) {\n\t\t\tSystem.err.println(violationMsg);\n\t\t\tprintTimeAndExit();\n\t\t}\n\t}\n\n\tbefore() : C() {\n\t\tVerdict verdict;\n\t\tsynchronized (monitor) {\n\t\t\tverdict = monitor.step(C);\n\t\t}\n\t\tif (verdict == Verdict.FAILURE) {\n\t\t\tSystem.err.println(violationMsg);\n\t\t\tprintTimeAndExit();\n\t\t}\n\t}\n}\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"b44d3d4f160df552fd3b37d0fb2d149162b45f9c","subject":"Aspect Tryouts","message":"Aspect Tryouts\n","repos":"rashmishrm\/cmpe202-UMLParser,rashmishrm\/cmpe202-UMLParser","old_file":"UMLGenerator\/aspectj\/MethodInterceptor.aj","new_file":"UMLGenerator\/aspectj\/MethodInterceptor.aj","new_contents":"import java.util.*;\n\npublic aspect MethodInterceptor {\n      Stack<String> st = new Stack<String>();\n\n\t\/\/pointcut traced() : !within(MethodInterceptor) && execution(public * *.*(..)) ;\n\tpointcut traced() : !within(MethodInterceptor) && execution( * *.*(..)) && !initialization(*.new(..));\nprivate String previousClass;\nprivate String currentClass;\nprivate int callDepth=1;\n\n\tbefore() : traced() {\n\n\nString prefix=null;\n\t\t\tif(callDepth==1){\n        prefix=\"NEW_CALL:\";\n\n\t\t}\n\t\telse{\n\t\tprefix=\"NESTED_CALL:\";\n\n\t\t}\n\t\tObject o = thisJoinPoint.getThis();\n        String currentClassName=null;\n        if(o!=null){\n        currentClassName=o.getClass().getName();\n        }\n        else{\n      String signature=  thisJoinPointStaticPart.getSignature().toString();\n\n      String array[]=signature.split(\"\\\\s\");\n         String methodName=array[1];\nSystem.out.println(signature);\n         if(methodName.contains(\".\"))\n         currentClassName=methodName.split(\"\\\\.\")[0];\nSystem.out.println(currentClassName);\n\n        }\n        String sender=null;\n\n        if(previousClass==null){\n        previousClass=currentClassName;\n        sender=currentClassName;\n\t    }\n       else  if(previousClass.equals(currentClassName)){\n        sender=currentClassName;\n\n        }\n        else{\n        sender=previousClass;\n        }\n\n      String call=  thisJoinPointStaticPart.getSignature().toString();\n\n      String array[]=call.split(\"\\\\s\");\n      String methodName=array[1];\n      String returnType=array[0];\n\n      if(methodName.contains(\".\")){\n      methodName=methodName.split(\"\\\\.\")[1];\n      }\n      if(st.size()>0){\n\n      sender=st.peek();\n      }\n\n      String methodCall=methodName+\":\"+returnType;\n\n\/\/System.out.println(callDepth+\"::::\"+prefix+\":::: \"+sender+\"------>\" + methodCall+\"---->\"+currentClassName);\nSystem.out.println(sender+\"->\"+currentClassName+\":\"+methodCall);\n\ncurrentClass=currentClassName;\n\n       st.push(currentClass);\n\n\npreviousClass=currentClass;\n\t\tcallDepth++;\n\n\n\n\n\n\t}\n\n\tafter() : traced() {\n\t\tcallDepth--;\n\n      st.pop();\n\n\t\t\/\/currentClass=previousClass;\n\t}\n\n\tprivate void print(String prefix, Object message) {\n\n\n\t\tif(callDepth==1){\n\n\n\n\t\t\t\t\tSystem.out.print(\"NEW_CALL:   \"+callDepth+\":\"+message);\n\n\n\n\t\t}\n\t\telse{\n\t\t\t\tSystem.out.print(\"NESTED_CALL\"+callDepth+message);\n\n\t\t}\n\n\n\t\t\/\/System.out.println(prefix + \": \" + message);\n\t}\n}\n","old_contents":"\n\npublic aspect MethodInterceptor {\n\n\t\/\/pointcut traced() : !within(MethodInterceptor) && execution(public * *.*(..)) ;\n\tpointcut traced() : !within(MethodInterceptor) && execution( * *.*(..)) && !initialization(*.new(..));\nprivate String previousClass;\nprivate String currentClass;\nprivate int callDepth=1;\n\n\tbefore() : traced() {\n\n\nString prefix=null;\n\t\t\tif(callDepth==1){\n        prefix=\"NEW_CALL:\";\n\n\t\t}\n\t\telse{\n\t\tprefix=\"NESTED_CALL:\";\n\n\t\t}\n\t\tObject o = thisJoinPoint.getThis();\n        String currentClassName=null;\n        if(o!=null){\n        currentClassName=o.getClass().getName();\n        }\n        else{\n      String signature=  thisJoinPointStaticPart.getSignature().toString();\n\n      String array[]=signature.split(\"\\\\s\");\n         String methodName=array[1];\nSystem.out.println(signature);\n         if(methodName.contains(\".\"))\n         currentClassName=methodName.split(\"\\\\.\")[0];\nSystem.out.println(currentClassName);\n\n        }\n        String sender=null;\n\n        if(previousClass==null){\n        previousClass=currentClassName;\n        sender=currentClassName;\n\t    }\n       else  if(previousClass.equals(currentClassName)){\n        sender=currentClassName;\n\n        }\n        else{\n        sender=previousClass;\n        }\n\n      String call=  thisJoinPointStaticPart.getSignature().toString();\n\n      String array[]=call.split(\"\\\\s\");\n      String methodName=array[1];\n      String returnType=array[0];\n\n      if(methodName.contains(\".\")){\n      methodName=methodName.split(\"\\\\.\")[1];\n      }\n\n      String methodCall=methodName+\":\"+returnType;\n\n\/\/System.out.println(callDepth+\"::::\"+prefix+\":::: \"+sender+\"------>\" + methodCall+\"---->\"+currentClassName);\nSystem.out.println(sender+\"->\"+currentClassName+\":\"+methodCall);\n\ncurrentClass=currentClassName;\npreviousClass=currentClass;\n\t\tcallDepth++;\n\n\n\n\n\n\t}\n\n\tafter() : traced() {\n\t\tcallDepth--;\n\n\n\t\tcurrentClass=previousClass;\n\t}\n\n\tprivate void print(String prefix, Object message) {\n\n\n\t\tif(callDepth==1){\n\n\n\n\t\t\t\t\tSystem.out.print(\"NEW_CALL:   \"+callDepth+\":\"+message);\n\n\n\n\t\t}\n\t\telse{\n\t\t\t\tSystem.out.print(\"NESTED_CALL\"+callDepth+message);\n\n\t\t}\n\n\n\t\t\/\/System.out.println(prefix + \": \" + message);\n\t}\n}\n","returncode":0,"stderr":"","license":"agpl-3.0","lang":"AspectJ"}
{"commit":"16a63201100dded839e0130819961c4c531231aa","subject":"* change comment","message":"* change comment","repos":"agentlab\/ru.agentlab.maia","old_file":"plugins\/ru.agentlab.maia.context\/aj-src\/ru\/agentlab\/maia\/context\/aj\/AMaiaContext.aj","new_file":"plugins\/ru.agentlab.maia.context\/aj-src\/ru\/agentlab\/maia\/context\/aj\/AMaiaContext.aj","new_contents":"package ru.agentlab.maia.context.aj;\n\nimport ru.agentlab.maia.context.IMaiaContext;\n\n\/**\n * Abstract aspect with pointcuts of {@link IMaiaContext} methods\n * \n * @author Shishkin Dmitriy\n *\n *\/\npublic abstract aspect AMaiaContext {\n\n\t\/**\n\t * When actual {@link IMaiaContext} object is created\n\t *\/\n\tpublic pointcut onConstruct() : \n\t\texecution(IMaiaContext+.new(..));\n\n\t\/**\n\t * When {@link IMaiaContext} get service object by string identifier\n\t * \n\t * @param context\n\t *            - current context\n\t * @param id\n\t *            - string identifier of context service\n\t *\/\n\tpublic pointcut onGetByString(IMaiaContext context, String id) : \n\t\texecution(Object IMaiaContext+.get(String)) && \n\t\ttarget(context) && \n\t\targs(id);\n\n\t\/**\n\t * When {@link IMaiaContext} get service object by it's type\n\t * \n\t * @param context\n\t *            - current context\n\t * @param id\n\t *            - type of context service\n\t *\/\n\tpublic pointcut onGetByClass(IMaiaContext context, Class<?> id) : \n\t\texecution(Object IMaiaContext+.get(Class)) && \n\t\ttarget(context) && \n\t\targs(id);\n\n\t\/**\n\t * When {@link IMaiaContext} set service object by string identifier\n\t * \n\t * @param context\n\t *            - current context\n\t * @param id\n\t *            - string identifier of context service\n\t * @param obj\n\t *            - service object\n\t *\/\n\tpublic pointcut onSetByString(IMaiaContext context, String id, Object obj) : \n\t\texecution(void IMaiaContext+.set(String, Object)) && \n\t\ttarget(context) && \n\t\targs(id, obj);\n\n\t\/**\n\t * When {@link IMaiaContext} set service object by it's type\n\t * \n\t * @param context\n\t *            - current context\n\t * @param id\n\t *            - type of context service\n\t * @param obj\n\t *            - service object\n\t *\/\n\tpublic pointcut onSetByClass(IMaiaContext context, Class<?> id,\n\t\t\tObject obj) : \n\t\texecution(void IMaiaContext+.set(Class, Object)) && \n\t\ttarget(context) && \n\t\targs(id, obj);\n\n\t\/**\n\t * When {@link IMaiaContext} get service object locally by string identifier\n\t * \n\t * @param context\n\t *            - current context\n\t * @param id\n\t *            - string identifier of context service\n\t *\/\n\tpublic pointcut onGetLocalByString(IMaiaContext context, String id) : \n\t\texecution(Object IMaiaContext+.getLocal(String)) && \n\t\ttarget(context) && \n\t\targs(id);\n\n\t\/**\n\t * When {@link IMaiaContext} get service object locally by it's type\n\t * \n\t * @param context\n\t *            - current context\n\t * @param id\n\t *            - type of context service\n\t *\/\n\tpublic pointcut onGetLocalByClass(IMaiaContext context, Class<?> id) : \n\t\texecution(Object IMaiaContext+.getLocal(Class)) && \n\t\ttarget(context) && \n\t\targs(id);\n\n\t\/**\n\t * When {@link IMaiaContext} remove service object by string identifier\n\t * \n\t * @param context\n\t *            - current context\n\t * @param id\n\t *            - string identifier of context service to be removed\n\t *\/\n\tpublic pointcut onRemoveByString(IMaiaContext context, String id) : \n\t\texecution(void IMaiaContext+.remove(String)) && \n\t\ttarget(context) && \n\t\targs(id);\n\n\t\/**\n\t * When {@link IMaiaContext} remove service object by it's type\n\t * \n\t * @param context\n\t *            - current context\n\t * @param id\n\t *            - type of context service\n\t *\/\n\tpublic pointcut onRemoveByClass(IMaiaContext context, Class<?> id) : \n\t\texecution(void IMaiaContext+.remove(Class)) && \n\t\ttarget(context) && \n\t\targs(id);\n\n\t\/**\n\t * When {@link IMaiaContext} retrieve all it's childs contexts\n\t * \n\t * @param context\n\t *            - current context\n\t *\/\n\tpublic pointcut onGetChilds(IMaiaContext context) : \n\t\texecution(Iterable<IMaiaContext>  IMaiaContext+.getChilds()) && \n\t\ttarget(context);\n\n\t\/**\n\t * When {@link IMaiaContext} retrieve parent context\n\t * \n\t * @param context\n\t *            - current context\n\t *\/\n\tpublic pointcut onGetParent(IMaiaContext context) : \n\t\texecution(IMaiaContext IMaiaContext+.getParent(..)) && \n\t\ttarget(context);\n\n}","old_contents":"package ru.agentlab.maia.context.aj;\n\nimport ru.agentlab.maia.context.IMaiaContext;\n\n\/**\n * Abstract aspect with pointcuts of {@link IMaiaContext} methods\n * \n * @author Shishkin Dmitriy\n *\n *\/\npublic abstract aspect AMaiaContext {\n\n\t\/**\n\t * When actual IMaiaContext object is created\n\t *\/\n\tpublic pointcut onConstruct() : \n\t\texecution(IMaiaContext+.new(..));\n\n\t\/**\n\t * When {@link IMaiaContext} get service object by string identifier\n\t * \n\t * @param context\n\t *            - current context\n\t * @param id\n\t *            - string identifier of context service\n\t *\/\n\tpublic pointcut onGetByString(IMaiaContext context, String id) : \n\t\texecution(Object IMaiaContext+.get(String)) && \n\t\ttarget(context) && \n\t\targs(id);\n\n\t\/**\n\t * When {@link IMaiaContext} get service object by it's type\n\t * \n\t * @param context\n\t *            - current context\n\t * @param id\n\t *            - type of context service\n\t *\/\n\tpublic pointcut onGetByClass(IMaiaContext context, Class<?> id) : \n\t\texecution(Object IMaiaContext+.get(Class)) && \n\t\ttarget(context) && \n\t\targs(id);\n\n\t\/**\n\t * When {@link IMaiaContext} set service object by string identifier\n\t * \n\t * @param context\n\t *            - current context\n\t * @param id\n\t *            - string identifier of context service\n\t * @param obj\n\t *            - service object\n\t *\/\n\tpublic pointcut onSetByString(IMaiaContext context, String id, Object obj) : \n\t\texecution(void IMaiaContext+.set(String, Object)) && \n\t\ttarget(context) && \n\t\targs(id, obj);\n\n\t\/**\n\t * When {@link IMaiaContext} set service object by it's type\n\t * \n\t * @param context\n\t *            - current context\n\t * @param id\n\t *            - type of context service\n\t * @param obj\n\t *            - service object\n\t *\/\n\tpublic pointcut onSetByClass(IMaiaContext context, Class<?> id,\n\t\t\tObject obj) : \n\t\texecution(void IMaiaContext+.set(Class, Object)) && \n\t\ttarget(context) && \n\t\targs(id, obj);\n\n\t\/**\n\t * When {@link IMaiaContext} get service object locally by string identifier\n\t * \n\t * @param context\n\t *            - current context\n\t * @param id\n\t *            - string identifier of context service\n\t *\/\n\tpublic pointcut onGetLocalByString(IMaiaContext context, String id) : \n\t\texecution(Object IMaiaContext+.getLocal(String)) && \n\t\ttarget(context) && \n\t\targs(id);\n\n\t\/**\n\t * When {@link IMaiaContext} get service object locally by it's type\n\t * \n\t * @param context\n\t *            - current context\n\t * @param id\n\t *            - type of context service\n\t *\/\n\tpublic pointcut onGetLocalByClass(IMaiaContext context, Class<?> id) : \n\t\texecution(Object IMaiaContext+.getLocal(Class)) && \n\t\ttarget(context) && \n\t\targs(id);\n\n\t\/**\n\t * When {@link IMaiaContext} remove service object by string identifier\n\t * \n\t * @param context\n\t *            - current context\n\t * @param id\n\t *            - string identifier of context service to be removed\n\t *\/\n\tpublic pointcut onRemoveByString(IMaiaContext context, String id) : \n\t\texecution(void IMaiaContext+.remove(String)) && \n\t\ttarget(context) && \n\t\targs(id);\n\n\t\/**\n\t * When {@link IMaiaContext} remove service object by it's type\n\t * \n\t * @param context\n\t *            - current context\n\t * @param id\n\t *            - type of context service\n\t *\/\n\tpublic pointcut onRemoveByClass(IMaiaContext context, Class<?> id) : \n\t\texecution(void IMaiaContext+.remove(Class)) && \n\t\ttarget(context) && \n\t\targs(id);\n\n\t\/**\n\t * When {@link IMaiaContext} retrieve all it's childs contexts\n\t * \n\t * @param context\n\t *            - current context\n\t *\/\n\tpublic pointcut onGetChilds(IMaiaContext context) : \n\t\texecution(Iterable<IMaiaContext>  IMaiaContext+.getChilds()) && \n\t\ttarget(context);\n\n\t\/**\n\t * When {@link IMaiaContext} retrieve parent context\n\t * \n\t * @param context\n\t *            - current context\n\t *\/\n\tpublic pointcut onGetParent(IMaiaContext context) : \n\t\texecution(IMaiaContext IMaiaContext+.getParent(..)) && \n\t\ttarget(context);\n\n}","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"4f95fc0ff8b597b4d0b3d1e5808b945c5ce76e2d","subject":"attempt to fix npe","message":"attempt to fix npe\n","repos":"palava\/palava-jpa","old_file":"src\/main\/java\/de\/cosmocode\/palava\/jpa\/TransactionAspect.aj","new_file":"src\/main\/java\/de\/cosmocode\/palava\/jpa\/TransactionAspect.aj","new_contents":"package de.cosmocode.palava.jpa;\n\nimport javax.persistence.EntityManager;\nimport javax.persistence.EntityTransaction;\nimport javax.persistence.PersistenceException;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Guice;\nimport com.google.inject.Inject;\nimport com.google.inject.Injector;\nimport com.google.inject.Key;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.ipc.IpcConnection;\n\npublic final aspect TransactionAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(TransactionAspect.class);\n\n    private Provider<EntityManager> currentManager;\n    private Provider<IpcConnection> currentConnection;\n    \n    @Inject\n    public void setProvider(Provider<EntityManager> manager, Provider<IpcConnection> connection) {\n        this.currentManager = Preconditions.checkNotNull(manager, \"Manager\");\n        this.currentConnection = Preconditions.checkNotNull(connection, \"Connection\");\n    }\n    \n    pointcut createInjector(): call(Injector Guice.createInjector(..));\n    \n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    after() returning (Injector injector): createInjector() {\n        LOG.trace(\"Injecting members on {}\", this);\n        if (currentManager == null) {\n            injector.injectMembers(this);\n        } else {\n            throw new IllegalStateException(\"An injector has already been created\");\n        }\n    }\n\n    pointcut transactional(): execution(@Transactional * *.*(..));\n\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        final IpcConnection connection = currentConnection.get();\n        final Key<EntityManager> key = Key.get(EntityManager.class);\n        EntityManager manager = connection == null ? null : EntityManager.class.cast(connection.get(key));\n        if (manager == null) {\n            manager = currentManager.get();\n        }\n        final EntityTransaction tx = manager.getTransaction();\n        final boolean localTx = !tx.isActive();\n        if (localTx) {\n            LOG.trace(\"Beginning automatic transaction\");\n            tx.begin();\n        } else {\n            LOG.trace(\"Transaction already active\");\n        }\n        \n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (RuntimeException e) {\n            LOG.error(\"Exception inside automatic transaction context\", e);\n            tx.rollback();\n            throw e;\n        }\n        \n        try {\n            if (localTx) {\n                tx.commit();\n                LOG.trace(\"Committed automatic transaction\");\n            }\n            return returnValue;\n        } catch (PersistenceException e) {\n            LOG.error(\"Commit in automatic transaction context failed\", e);\n            tx.rollback();\n            throw e;\n        }\n    }\n    \n}\n","old_contents":"package de.cosmocode.palava.jpa;\n\nimport javax.persistence.EntityManager;\nimport javax.persistence.EntityTransaction;\nimport javax.persistence.PersistenceException;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Guice;\nimport com.google.inject.Inject;\nimport com.google.inject.Injector;\nimport com.google.inject.Key;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.ipc.IpcConnection;\n\npublic final aspect TransactionAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(TransactionAspect.class);\n\n    private Provider<EntityManager> currentManager;\n    private Provider<IpcConnection> currentConnection;\n    \n    @Inject\n    public void setProvider(Provider<EntityManager> manager, Provider<IpcConnection> connection) {\n        this.currentManager = Preconditions.checkNotNull(manager, \"Manager\");\n        this.currentConnection = Preconditions.checkNotNull(connection, \"Connection\");\n    }\n    \n    pointcut createInjector(): call(Injector Guice.createInjector(..));\n    \n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    after() returning (Injector injector): createInjector() {\n        LOG.trace(\"Injecting members on {}\", this);\n        if (currentManager == null) {\n            injector.injectMembers(this);\n        } else {\n            throw new IllegalStateException(\"An injector has already been created\");\n        }\n    }\n\n    pointcut transactional(): execution(@Transactional * *.*(..));\n\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        final IpcConnection connection = currentConnection.get();\n        if (connection == null) return proceed();\n        final Key<EntityManager> key = Key.get(EntityManager.class);\n        EntityManager manager = connection.get(key);\n        if (manager == null) {\n            manager = currentManager.get();\n        }\n        final EntityTransaction tx = manager.getTransaction();\n        final boolean localTx = !tx.isActive();\n        if (localTx) {\n            LOG.trace(\"Beginning automatic transaction\");\n            tx.begin();\n        } else {\n            LOG.trace(\"Transaction already active\");\n        }\n        \n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (RuntimeException e) {\n            LOG.error(\"Exception inside automatic transaction context\", e);\n            tx.rollback();\n            throw e;\n        }\n        \n        try {\n            if (localTx) {\n                tx.commit();\n                LOG.trace(\"Committed automatic transaction\");\n            }\n            return returnValue;\n        } catch (PersistenceException e) {\n            LOG.error(\"Commit in automatic transaction context failed\", e);\n            tx.rollback();\n            throw e;\n        }\n    }\n    \n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"e5aaf22fa87b5364e04c0f7822507c01f266a6ae","subject":"Corrected aspects.","message":"Corrected aspects.\n\ngit-svn-id: 4050ee570c0b454ed3c2eee326cdaf8b6ad603bd@39 e65ff1b4-dc2a-11dd-afbb-e3e17473af86\n","repos":"carrotsearch\/jsuffixarrays","old_file":"src\/perf\/org\/jsuffixarrays\/MemoryLogger.aj","new_file":"src\/perf\/org\/jsuffixarrays\/MemoryLogger.aj","new_contents":"package org.jsuffixarrays;\r\n\r\n\/**\r\n * This aspect logs the memory state at entry and exit from methods\r\n * declared in inheriting aspects. The aspect is a singleton, so is generally\r\n * not very useful for multi-threaded applications or whenever more than one instance\r\n * of a given instrumented class is used.\r\n *\/\r\nabstract aspect MemoryLogger issingleton()\r\n{\r\n    \/**\r\n     * Declare classes to track memory from.\r\n     *\/\r\n    abstract pointcut tracedClasses();\r\n\r\n    \/**\r\n     * Override and remove methods for which logging should not occur.\r\n     *\/\r\n    pointcut excludedMethods() : !execution(* *(..));\r\n\r\n    \/**\r\n     * Declare methods to track memory in.\r\n     *\/\r\n    final pointcut tracedMethods() : \r\n        tracedClasses() && execution(* *(..)) && !excludedMethods();\r\n\r\n    \/**\r\n     * \r\n     *\/\r\n    before () : tracedClasses() && tracedMethods()\r\n    {\r\n        update();\r\n    }\r\n\r\n    \/**\r\n     * \r\n     *\/\r\n    after () returning : tracedMethods()\r\n    {\r\n        update();\r\n    }\r\n\r\n    \/**\r\n     * Starting amount of memory from which we will begin measurements.\r\n     * \r\n     * @see #reset()\r\n     *\/\r\n    private static volatile long startingPoint;\r\n    \r\n    \/*\r\n     * \r\n     *\/\r\n    private static volatile long maxMemoryUsed;\r\n\r\n    \/*\r\n     * \r\n     *\/\r\n    private static void update()\r\n    {\r\n        final long now = getUsedMemory();\r\n        if (maxMemoryUsed < now)\r\n        {\r\n            maxMemoryUsed = now;\r\n        }\r\n    }\r\n\r\n    \/*\r\n     * \r\n     *\/\r\n    private static long getUsedMemory()\r\n    {\r\n        final Runtime rt = Runtime.getRuntime();\r\n        return rt.totalMemory() - rt.freeMemory();\r\n    }\r\n\r\n    \/**\r\n     * Reset memory status, preparing for measurement.\r\n     *\/\r\n    public static void reset()\r\n    {\r\n        \/\/ Try to clean the GC. Will not work for parallel GC, but we did our best.\r\n        for (int i = 0; i < 5; i++)\r\n        {\r\n            System.gc();\r\n        }\r\n        \r\n        startingPoint = getUsedMemory();\r\n        maxMemoryUsed = 0;\r\n    }\r\n\r\n    \/**\r\n     * Returns the absolute memory peak recorded so far. \r\n     *\/\r\n    public static long getMemoryPeak()\r\n    {\r\n        return maxMemoryUsed;\r\n    }\r\n\r\n    \/**\r\n     * Returns the maximum memory difference from the last time \r\n     * since {@link #reset()} was called. This value may be negative\r\n     * with certain GCs and scenarios. \r\n     *\/\r\n    public static long getMemoryUsed()\r\n    {\r\n        return maxMemoryUsed - startingPoint;\r\n    }\r\n}\r\n\r\n\/**\r\n * Track memory in {@link Skew} algorithm.\r\n *\/\r\naspect SkewMemLogger extends MemoryLogger\r\n{\r\n    @Override\r\n    pointcut tracedClasses() : within(Skew);\r\n    @Override\r\n    pointcut excludedMethods(): execution(* leq*(..));\r\n}\r\n\r\n\/**\r\n * Track memory in {@link NaiveSort} algorithm.\r\n *\/\r\naspect NaiveSortMemLogger extends MemoryLogger\r\n{\r\n    @Override\r\n    pointcut tracedClasses() : within(NaiveSort);\r\n    @Override\r\n    pointcut excludedMethods(): execution(* compare(..));\r\n}\r\n\r\n\/**\r\n * Track memory in {@link DivSufSort} algorithm.\r\n *\/\r\naspect DivSufSortMemLogger extends MemoryLogger\r\n{\r\n    \/* \r\n     * 3 private methods using stack are excluded, \r\n     * because they use max. 64 * 4 bytes of extra memory for stack.\r\n     *\/\r\n    @Override\r\n    pointcut tracedClasses(): within(DivSufSort) && !within(org.jsuffixarrays.DivSufSort..*);\r\n    @Override\r\n    pointcut excludedMethods(): execution(private * *(..)) ;\r\n}\r\n\r\n\/**\r\n * Track memory in {@link QSufSort} algorithm.\r\n *\/\r\naspect QSUfSortMemLogger extends MemoryLogger\r\n{\r\n    @Override\r\n    pointcut tracedClasses() : within(QSufSort);\r\n    @Override\r\n    pointcut excludedMethods(): execution(private * *(..));\r\n}\r\n\r\n\/**\r\n * Track memory in {@link BPR} algorithm.\r\n *\/\r\naspect BPRMemLogger extends MemoryLogger\r\n{\r\n    @Override\r\n    pointcut tracedClasses() : within(BPR);\r\n    @Override\r\n    pointcut excludedMethods(): execution(private * *(..));\r\n}\r\n\r\n\/**\r\n * Track memory in {@link DeepShallow} algorithm.\r\n *\/\r\naspect DeepShallowMemLogger extends MemoryLogger\r\n{\r\n    @Override\r\n    pointcut tracedClasses() : within(DeepShallow);\r\n    @Override\r\n    pointcut excludedMethods(): execution(private * *(..));\r\n}\r\n    \r\n\/**\r\n * Track memory in {@link SAIS} algorithm.\r\n *\/\r\naspect SaisMemLogger extends MemoryLogger\r\n{\r\n    @Override\r\n    pointcut tracedClasses() : within(SAIS) && !within(org.jsuffixarrays.SAIS..*);\r\n    \r\n    @Override\r\n    pointcut excludedMethods(): execution(private * *(..)) \r\n        && !execution(private * org.jsuffixarrays.SAIS.SA_IS(..))\r\n        && !execution(private * org.jsuffixarrays.SAIS.induceSA(..));\r\n}\r\n\r\n\r\n\r\n","old_contents":"package org.jsuffixarrays;\r\n\r\n\/**\r\n * This aspect logs the memory state at entry and exit from methods\r\n * declared in inheriting aspects. The aspect is a singleton, so is generally\r\n * not very useful for multi-threaded applications or whenever more than one instance\r\n * of a given instrumented class is used.\r\n *\/\r\nabstract aspect MemoryLogger issingleton()\r\n{\r\n    \/**\r\n     * Declare classes to track memory from.\r\n     *\/\r\n    abstract pointcut tracedClasses();\r\n\r\n    \/**\r\n     * Override and remove methods for which logging should not occur.\r\n     *\/\r\n    pointcut excludedMethods() : !execution(* *(..));\r\n\r\n    \/**\r\n     * Declare methods to track memory in.\r\n     *\/\r\n    final pointcut tracedMethods() : \r\n        tracedClasses() && execution(* *(..)) && !excludedMethods();\r\n\r\n    \/**\r\n     * \r\n     *\/\r\n    before () : tracedClasses() && tracedMethods()\r\n    {\r\n        update();\r\n    }\r\n\r\n    \/**\r\n     * \r\n     *\/\r\n    after () returning : tracedMethods()\r\n    {\r\n        update();\r\n    }\r\n\r\n    \/**\r\n     * Starting amount of memory from which we will begin measurements.\r\n     * \r\n     * @see #reset()\r\n     *\/\r\n    private static volatile long startingPoint;\r\n    \r\n    \/*\r\n     * \r\n     *\/\r\n    private static volatile long maxMemoryUsed;\r\n\r\n    \/*\r\n     * \r\n     *\/\r\n    private static void update()\r\n    {\r\n        final long now = getUsedMemory();\r\n        if (maxMemoryUsed < now)\r\n        {\r\n            maxMemoryUsed = now;\r\n        }\r\n    }\r\n\r\n    \/*\r\n     * \r\n     *\/\r\n    private static long getUsedMemory()\r\n    {\r\n        final Runtime rt = Runtime.getRuntime();\r\n        return rt.totalMemory() - rt.freeMemory();\r\n    }\r\n\r\n    \/**\r\n     * Reset memory status, preparing for measurement.\r\n     *\/\r\n    public static void reset()\r\n    {\r\n        \/\/ Try to clean the GC. Will not work for parallel GC, but we did our best.\r\n        for (int i = 0; i < 5; i++)\r\n        {\r\n            System.gc();\r\n        }\r\n        \r\n        startingPoint = getUsedMemory();\r\n        maxMemoryUsed = 0;\r\n    }\r\n\r\n    \/**\r\n     * Returns the absolute memory peak recorded so far. \r\n     *\/\r\n    public static long getMemoryPeak()\r\n    {\r\n        return maxMemoryUsed;\r\n    }\r\n\r\n    \/**\r\n     * Returns the maximum memory difference from the last time \r\n     * since {@link #reset()} was called. This value may be negative\r\n     * with certain GCs and scenarios. \r\n     *\/\r\n    public static long getMemoryUsed()\r\n    {\r\n        return maxMemoryUsed - startingPoint;\r\n    }\r\n}\r\n\r\n\/**\r\n * Track memory in {@link Skew} algorithm.\r\n *\/\r\naspect SkewMemLogger extends MemoryLogger\r\n{\r\n    @Override\r\n    pointcut tracedClasses() : within(Skew);\r\n    @Override\r\n    pointcut excludedMethods(): execution(* leq*(..));\r\n}\r\n\r\n\/**\r\n * Track memory in {@link NaiveSort} algorithm.\r\n *\/\r\naspect NaiveSortMemLogger extends MemoryLogger\r\n{\r\n    @Override\r\n    pointcut tracedClasses() : within(NaiveSort);\r\n    @Override\r\n    pointcut excludedMethods(): execution(* compare(..));\r\n}\r\n\r\n\/**\r\n * Track memory in {@link DivSufSort} algorithm.\r\n *\/\r\naspect DivSufSortMemLogger extends MemoryLogger\r\n{\r\n    \/* \r\n     * 3 private methods using stack are excluded, \r\n     * because they use max. 64 * 4 bytes of extra memory for stack.\r\n     *\/\r\n    @Override\r\n    pointcut tracedClasses(): within(DivSufSort) && !within(org.jsuffixarrays.DivSufSort..*);\r\n    @Override\r\n    pointcut excludedMethods(): execution(private * *(..)) ;\r\n}\r\n\r\n\/**\r\n * Track memory in {@link QSufSort} algorithm.\r\n *\/\r\naspect QSUfSortMemLogger extends MemoryLogger\r\n{\r\n    @Override\r\n    pointcut tracedClasses() : within(QSufSort);\r\n    @Override\r\n    pointcut excludedMethods(): execution(private * *(..));\r\n}\r\n\r\n\/**\r\n * Track memory in {@link BPR} algorithm.\r\n *\/\r\naspect BPRMemLogger extends MemoryLogger\r\n{\r\n    @Override\r\n    pointcut tracedClasses() : within(BPR);\r\n    @Override\r\n    pointcut excludedMethods(): execution(private * *(..));\r\n}\r\n\r\n\/**\r\n * Track memory in {@link DeepShallow} algorithm.\r\n *\/\r\naspect DeepShallowMemLogger extends MemoryLogger\r\n{\r\n    @Override\r\n    pointcut tracedClasses() : within(DeepShallow);\r\n    @Override\r\n    pointcut excludedMethods(): execution(private * *(..));\r\n}\r\n    \r\n\/**\r\n * Track memory in {@link SAIS} algorithm.\r\n *\/\r\naspect SaisMemLogger extends MemoryLogger\r\n{\r\n    @Override\r\n    pointcut tracedClasses() : within(SAIS) && !within(org.jsuffixarrays.SAIS..*);\r\n    \r\n    @Override\r\n    pointcut excludedMethods(): execution(private * *(..)) \r\n        && !execution(private * SA_IS(..))\r\n        && !execution(private * induceSA(..));\r\n}\r\n    \r\n\r\n\r\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"5f384c7700680a0d7c93dfc4b5036c205a3c0f1b","subject":"changed logging from trace to debug on actions","message":"changed logging from trace to debug on actions\n","repos":"palava\/palava-jta","old_file":"src\/main\/java\/de\/cosmocode\/palava\/jta\/AbstractUserTransactionAspect.aj","new_file":"src\/main\/java\/de\/cosmocode\/palava\/jta\/AbstractUserTransactionAspect.aj","new_contents":"\/**\n * Copyright 2010 CosmoCode GmbH\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage de.cosmocode.palava.jta;\n\nimport javax.transaction.NotSupportedException;\nimport javax.transaction.Status;\nimport javax.transaction.SystemException;\nimport javax.transaction.UserTransaction;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\n\npublic abstract aspect AbstractUserTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(AbstractUserTransactionAspect.class);\n\n    private Provider<UserTransaction> provider;\n    \n    @Inject\n    void setProvider(Provider<UserTransaction> provider) {\n        this.provider = Preconditions.checkNotNull(provider, \"Provider\");\n    }\n    \n    protected abstract pointcut transactional();\n    \n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        final UserTransaction tx = provider.get();\n        LOG.trace(\"Using transaction {}\", tx);\n\n        try {\n            LOG.trace(\"Status of transaction: {}\", tx.getStatus());\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n        \n        final boolean local;\n        \n        try {\n            local = tx.getStatus() == Status.STATUS_NO_TRANSACTION;\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        if (local) {\n            LOG.trace(\"Beginning automatic transaction {}\", tx);\n            try {\n                tx.begin();\n            } catch (NotSupportedException e) {\n                throw new IllegalStateException(e);\n            } catch (SystemException e) {\n                throw new IllegalStateException(e);\n            }\n        } else {\n            LOG.trace(\"Transaction {} already active\", tx);\n        }\n\n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (Exception e) {\n            try {\n                if (local && \n                    (tx.getStatus() == Status.STATUS_ACTIVE || tx.getStatus() == Status.STATUS_MARKED_ROLLBACK)) {\n                    LOG.info(\"Rolling back local\/active transaction {}\", tx);\n                    tx.rollback();\n                } else if (tx.getStatus() != Status.STATUS_ROLLEDBACK || tx.getStatus() != Status.STATUS_ROLLING_BACK) {\n                    LOG.debug(\"Setting transaction {} as rollback only\", tx);\n                    tx.setRollbackOnly();\n                }\n            } catch (Exception inner) {\n                LOG.error(\"Rollback failed\", inner);\n            }\n            throw new IllegalStateException(e);\n        }\n        \n        final int status;\n        \n        try {\n            status = tx.getStatus();\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n        \n        if (local) {\n            if (status == Status.STATUS_MARKED_ROLLBACK) {\n                try {\n                    LOG.debug(\"Rolling back marked transaction {}\", tx);\n                    tx.rollback();\n                } catch (SystemException e) {\n                    throw new IllegalStateException(e);\n                }\n            } else {\n                try {\n                    tx.commit();\n                    LOG.debug(\"Committed automatic transaction {}\", tx);\n                } catch (Exception e) {\n                    try {\n                        LOG.info(\"Rolling back transaction {}\", tx);\n                        tx.rollback();\n                    } catch (Exception inner) {\n                        LOG.error(\"Rollback failed\", inner);\n                    }\n                    throw new IllegalStateException(e);\n                }\n            }\n        }\n        \n        return returnValue;\n    }\n    \n}\n","old_contents":"\/**\n * Copyright 2010 CosmoCode GmbH\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage de.cosmocode.palava.jta;\n\nimport javax.transaction.NotSupportedException;\nimport javax.transaction.Status;\nimport javax.transaction.SystemException;\nimport javax.transaction.UserTransaction;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\n\npublic abstract aspect AbstractUserTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(AbstractUserTransactionAspect.class);\n\n    private Provider<UserTransaction> provider;\n    \n    @Inject\n    void setProvider(Provider<UserTransaction> provider) {\n        this.provider = Preconditions.checkNotNull(provider, \"Provider\");\n    }\n    \n    protected abstract pointcut transactional();\n    \n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        final UserTransaction tx = provider.get();\n        LOG.trace(\"Using transaction {}\", tx);\n\n        try {\n            LOG.trace(\"Status of transaction: {}\", tx.getStatus());\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n        \n        final boolean local;\n        \n        try {\n            local = tx.getStatus() == Status.STATUS_NO_TRANSACTION;\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        if (local) {\n            LOG.trace(\"Beginning automatic transaction {}\", tx);\n            try {\n                tx.begin();\n            } catch (NotSupportedException e) {\n                throw new IllegalStateException(e);\n            } catch (SystemException e) {\n                throw new IllegalStateException(e);\n            }\n        } else {\n            LOG.trace(\"Transaction {} already active\", tx);\n        }\n\n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (Exception e) {\n            try {\n                if (local && \n                    (tx.getStatus() == Status.STATUS_ACTIVE || tx.getStatus() == Status.STATUS_MARKED_ROLLBACK)) {\n                    LOG.info(\"Rolling back local\/active transaction {}\", tx);\n                    tx.rollback();\n                } else if (tx.getStatus() != Status.STATUS_ROLLEDBACK || tx.getStatus() != Status.STATUS_ROLLING_BACK) {\n                    LOG.debug(\"Setting transaction {} as rollback only\", tx);\n                    tx.setRollbackOnly();\n                }\n            } catch (Exception inner) {\n                LOG.error(\"Rollback failed\", inner);\n            }\n            throw new IllegalStateException(e);\n        }\n        \n        final int status;\n        \n        try {\n            status = tx.getStatus();\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n        \n        if (local) {\n            if (status == Status.STATUS_MARKED_ROLLBACK) {\n                try {\n                    LOG.trace(\"Rolling back marked transaction {}\", tx);\n                    tx.rollback();\n                } catch (SystemException e) {\n                    throw new IllegalStateException(e);\n                }\n            } else {\n                try {\n                    tx.commit();\n                    LOG.trace(\"Committed automatic transaction {}\", tx);\n                } catch (Exception e) {\n                    try {\n                        LOG.info(\"Rolling back transaction {}\", tx);\n                        tx.rollback();\n                    } catch (Exception inner) {\n                        LOG.error(\"Rollback failed\", inner);\n                    }\n                    throw new IllegalStateException(e);\n                }\n            }\n        }\n        \n        return returnValue;\n    }\n    \n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"1af6814c0720872f4200220394120660a6ca94e4","subject":"added todo","message":"added todo\n","repos":"palava\/palava-jta","old_file":"src\/main\/java\/de\/cosmocode\/palava\/jta\/AbstractUserTransactionAspect.aj","new_file":"src\/main\/java\/de\/cosmocode\/palava\/jta\/AbstractUserTransactionAspect.aj","new_contents":"\/**\n * Copyright 2010 CosmoCode GmbH\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage de.cosmocode.palava.jta;\n\nimport javax.transaction.NotSupportedException;\nimport javax.transaction.Status;\nimport javax.transaction.SystemException;\nimport javax.transaction.UserTransaction;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.Registry;\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\n\npublic abstract aspect AbstractUserTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(AbstractUserTransactionAspect.class);\n\n    private Provider<UserTransaction> provider;\n\n    private TransactionBeginEvent begin;\n    private TransactionBeganEvent began;\n    private TransactionCommitEvent commit;\n    private TransactionCommittedEvent committed;\n    private TransactionRollbackEvent rollback;\n    private TransactionRolledbackEvent rolledback;\n    \n    @Inject\n    void setProvider(Provider<UserTransaction> provider) {\n        this.provider = Preconditions.checkNotNull(provider, \"Provider\");\n    }\n    \n    @Inject\n    void setRegistry(Registry registry) {\n        Preconditions.checkNotNull(registry, \"Registry\");\n        this.begin = registry.proxy(TransactionBeginEvent.class);\n        this.began = registry.proxy(TransactionBeganEvent.class);\n        this.commit = registry.proxy(TransactionCommitEvent.class);\n        this.committed = registry.proxy(TransactionCommittedEvent.class);\n        this.rollback = registry.proxy(TransactionRollbackEvent.class);\n        this.rolledback = registry.proxy(TransactionRolledbackEvent.class);\n    }\n    \n    protected abstract pointcut transactional();\n    \n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        Preconditions.checkNotNull(provider, \"Provider not injected yet\");\n        final UserTransaction tx = provider.get();\n        LOG.trace(\"Using transaction {}\", tx);\n\n        try {\n            LOG.trace(\"Status of transaction: {}\", tx.getStatus());\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        int status;\n        final boolean local;\n        try {\n            status = tx.getStatus();\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        local = status == Status.STATUS_NO_TRANSACTION;\n\n        if (local) {\n            LOG.debug(\"Beginning automatic transaction {}\", tx);\n            try {\n                begin.eventTransactionBegin(tx);\n                tx.begin();\n                began.eventTransactionBegan(tx);\n            } catch (NotSupportedException e) {\n                throw new IllegalStateException(e);\n            } catch (SystemException e) {\n                throw new IllegalStateException(e);\n            }\n        } else {\n            LOG.trace(\"Transaction {} already active (Status: {})\", tx, status);\n        }\n\n        try {\n            status = tx.getStatus();\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        final Object returnValue;\n        \n        try {\n            LOG.trace(\"Status before execution: {}\", status);\n            returnValue = proceed();\n        } catch (Exception e) {\n            try {\n                if (local && \n                    (tx.getStatus() == Status.STATUS_ACTIVE || tx.getStatus() == Status.STATUS_MARKED_ROLLBACK)) {\n                    LOG.info(\"Rolling back local\/active transaction {}\", tx);\n                    rollback(tx);\n                } else if (tx.getStatus() != Status.STATUS_ROLLEDBACK || tx.getStatus() != Status.STATUS_ROLLING_BACK) {\n                    LOG.debug(\"Setting transaction {} as rollback only\", tx);\n                    tx.setRollbackOnly();\n                }\n            } catch (Exception inner) {\n                LOG.error(\"Rollback failed\", inner);\n            }\n            \/\/ FIXME this effectively shadows the real exceptions thus preventing correct exception handling \n            throw new IllegalStateException(e);\n        }\n        \n        try {\n            status = tx.getStatus();\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        LOG.trace(\"Status after execution: {}\", status);\n        \n        if (local) {\n            if (status == Status.STATUS_MARKED_ROLLBACK) {\n                try {\n                    LOG.debug(\"Rolling back marked transaction {}\", tx);\n                    rollback(tx);\n                } catch (SystemException e) {\n                    throw new IllegalStateException(e);\n                }\n            } else {\n                try {\n                    commit.eventTransactionCommit(tx);\n                    tx.commit();\n                    committed.eventTransactionCommitted(tx);\n                    LOG.debug(\"Committed automatic transaction {}\", tx);\n                } catch (Exception e) {\n                    try {\n                        LOG.info(\"Rolling back transaction {}\", tx);\n                        rollback(tx);\n                    } catch (Exception inner) {\n                        LOG.error(\"Rollback failed\", inner);\n                    }\n                    throw new IllegalStateException(e);\n                }\n            }\n        }\n        \n        return returnValue;\n    }\n    \n    private void rollback(UserTransaction tx) throws SystemException {\n        rollback.eventTransactionRollback(tx);\n        tx.rollback();\n        rolledback.eventTransactionRolledback(tx);\n    }\n    \n}\n","old_contents":"\/**\n * Copyright 2010 CosmoCode GmbH\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage de.cosmocode.palava.jta;\n\nimport javax.transaction.NotSupportedException;\nimport javax.transaction.Status;\nimport javax.transaction.SystemException;\nimport javax.transaction.UserTransaction;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.Registry;\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\n\npublic abstract aspect AbstractUserTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(AbstractUserTransactionAspect.class);\n\n    private Provider<UserTransaction> provider;\n\n    private TransactionBeginEvent begin;\n    private TransactionBeganEvent began;\n    private TransactionCommitEvent commit;\n    private TransactionCommittedEvent committed;\n    private TransactionRollbackEvent rollback;\n    private TransactionRolledbackEvent rolledback;\n    \n    @Inject\n    void setProvider(Provider<UserTransaction> provider) {\n        this.provider = Preconditions.checkNotNull(provider, \"Provider\");\n    }\n    \n    @Inject\n    void setRegistry(Registry registry) {\n        Preconditions.checkNotNull(registry, \"Registry\");\n        this.begin = registry.proxy(TransactionBeginEvent.class);\n        this.began = registry.proxy(TransactionBeganEvent.class);\n        this.commit = registry.proxy(TransactionCommitEvent.class);\n        this.committed = registry.proxy(TransactionCommittedEvent.class);\n        this.rollback = registry.proxy(TransactionRollbackEvent.class);\n        this.rolledback = registry.proxy(TransactionRolledbackEvent.class);\n    }\n    \n    protected abstract pointcut transactional();\n    \n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        Preconditions.checkNotNull(provider, \"Provider not injected yet\");\n        final UserTransaction tx = provider.get();\n        LOG.trace(\"Using transaction {}\", tx);\n\n        try {\n            LOG.trace(\"Status of transaction: {}\", tx.getStatus());\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        int status;\n        final boolean local;\n        try {\n            status = tx.getStatus();\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        local = status == Status.STATUS_NO_TRANSACTION;\n\n        if (local) {\n            LOG.debug(\"Beginning automatic transaction {}\", tx);\n            try {\n                begin.eventTransactionBegin(tx);\n                tx.begin();\n                began.eventTransactionBegan(tx);\n            } catch (NotSupportedException e) {\n                throw new IllegalStateException(e);\n            } catch (SystemException e) {\n                throw new IllegalStateException(e);\n            }\n        } else {\n            LOG.trace(\"Transaction {} already active (Status: {})\", tx, status);\n        }\n\n        try {\n            status = tx.getStatus();\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        final Object returnValue;\n        \n        try {\n            LOG.trace(\"Status before execution: {}\", status);\n            returnValue = proceed();\n        } catch (Exception e) {\n            try {\n                if (local && \n                    (tx.getStatus() == Status.STATUS_ACTIVE || tx.getStatus() == Status.STATUS_MARKED_ROLLBACK)) {\n                    LOG.info(\"Rolling back local\/active transaction {}\", tx);\n                    rollback(tx);\n                } else if (tx.getStatus() != Status.STATUS_ROLLEDBACK || tx.getStatus() != Status.STATUS_ROLLING_BACK) {\n                    LOG.debug(\"Setting transaction {} as rollback only\", tx);\n                    tx.setRollbackOnly();\n                }\n            } catch (Exception inner) {\n                LOG.error(\"Rollback failed\", inner);\n            }\n            throw new IllegalStateException(e);\n        }\n        \n        try {\n            status = tx.getStatus();\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        LOG.trace(\"Status after execution: {}\", status);\n        \n        if (local) {\n            if (status == Status.STATUS_MARKED_ROLLBACK) {\n                try {\n                    LOG.debug(\"Rolling back marked transaction {}\", tx);\n                    rollback(tx);\n                } catch (SystemException e) {\n                    throw new IllegalStateException(e);\n                }\n            } else {\n                try {\n                    commit.eventTransactionCommit(tx);\n                    tx.commit();\n                    committed.eventTransactionCommitted(tx);\n                    LOG.debug(\"Committed automatic transaction {}\", tx);\n                } catch (Exception e) {\n                    try {\n                        LOG.info(\"Rolling back transaction {}\", tx);\n                        rollback(tx);\n                    } catch (Exception inner) {\n                        LOG.error(\"Rollback failed\", inner);\n                    }\n                    throw new IllegalStateException(e);\n                }\n            }\n        }\n        \n        return returnValue;\n    }\n    \n    private void rollback(UserTransaction tx) throws SystemException {\n        rollback.eventTransactionRollback(tx);\n        tx.rollback();\n        rolledback.eventTransactionRolledback(tx);\n    }\n    \n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"d7727d4313caa465550d4c4921c535792d5a5d3a","subject":"add path-> class mapping regardless of filtering, to ensure sanity when message sampling","message":"add path-> class mapping regardless of filtering, to ensure sanity when message sampling\n","repos":"eigengo\/monitor,DataDog\/monitor,eigengo\/monitor,DataDog\/monitor","old_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/ActorCellMonitoringAspect.aj","new_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/ActorCellMonitoringAspect.aj","new_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.actor.*;\nimport akka.japi.Creator;\nimport org.eigengo.monitor.agent.AgentConfiguration;\nimport org.eigengo.monitor.output.CounterInterface;\nimport scala.Option;\n\nimport java.util.ArrayList;\nimport java.util.List;\nimport java.util.concurrent.atomic.AtomicInteger;\nimport java.util.concurrent.atomic.AtomicLong;\nimport java.util.concurrent.ConcurrentHashMap;\n\n\/**\n * Contains advices for monitoring behaviour of an actor; typically imprisoned in an {@code ActorCell}.\n *\/\npublic aspect ActorCellMonitoringAspect extends AbstractMonitoringAspect issingleton() {\n    private AkkaAgentConfiguration agentConfiguration;\n    private final CounterInterface counterInterface;\n    private final Option<String> anonymousActorClassName = Option.empty();\n    \/\/ we sample based on actor type (i.e. a sampling rate of 'n' for a filter means 'every nth actor with type k, for each type k that matches that filter')\n    private final ConcurrentHashMap<Option<String>, AtomicLong> samplingCounters  = new ConcurrentHashMap<Option<String>, AtomicLong>();\n    \/\/ we count actors by actor type (any 'anonymous' or 'generic' actors are treated as the same type)\n    private final ConcurrentHashMap<Option<String>, AtomicInteger> numberOfActors = new ConcurrentHashMap<Option<String>, AtomicInteger>();\n    private final ConcurrentHashMap<ActorPath, String> pathTags                   = new ConcurrentHashMap<ActorPath, String>();\n\n    \/**\n     * Constructs this aspect\n     *\/\n    public ActorCellMonitoringAspect() {\n        AgentConfiguration<AkkaAgentConfiguration> configuration = getAgentConfiguration(\"akka\", AkkaAgentConfigurationJapi.apply());\n        this.agentConfiguration = configuration.agent();\n        this.counterInterface = createCounterInterface(configuration.common());\n    }\n\n    \/**\n     * Advises the {@code ActorCell.receiveMessage(message: Object): Unit}\n     * We proceed with the pointcut if the actor is to be included in the monitoring *and* this is\n     * the 'multiple-of-n'th time we've seen a message for an actor with a sample rate of n.\n     *\n     * Currently, we sample queue size, the fact that the message is delivered, the simple name of the class of the\n     * message, and the time taken to complete the actor's reactive action.\n     *\n     * @param actorCell the ActorCell where the actor that receives the message \"lives\"\n     * @param msg the incoming message\n     *\/\n    Object around(ActorCell actorCell, Object msg) : Pointcuts.actorCellReceiveMessage(actorCell, msg) {\n        final ActorPath actorPath = actorCell.self().path();\n        final Option<String> className = getActorClassName(actorCell, actorPath);\n        final PathAndClass pathAndClass = new PathAndClass(actorPath, className);\n        if (!includeActorPath(pathAndClass) || !sampleMessage(pathAndClass)) return proceed(actorCell, msg);\n\n        int samplingRate = getSampleRate(pathAndClass);\n\n        \/\/ we tag by actor name\n        final String[] tags = getTags(actorPath, className);\n\n        \/\/ record the queue size\n        this.counterInterface.recordGaugeValue(Aspects.queueSize(), actorCell.numberOfMessages(), tags);\n        \/\/ record the message, general and specific\n        this.counterInterface.incrementCounter(Aspects.delivered(), samplingRate, tags);\n        this.counterInterface.incrementCounter(Aspects.delivered(msg), samplingRate, tags);\n\n        \/\/ measure the time. we're using the ``nanoTime`` call to access the high-precision timer.\n        \/\/ since we're not really interested in wall time, but just some increasing measure of\n        \/\/ elapsed time\n        Object result = null;\n        final long start = System.nanoTime();\n        \/\/ result will always be ``null``, because target returns ``Unit``\n        result = proceed(actorCell, msg);\n        \/\/ ns or \u00b5s is too fine. ms will do for now.\n        final long duration = (System.nanoTime() - start) \/ 1000000;\n\n        \/\/ record the actor duration\n        this.counterInterface.recordExecutionTime(Aspects.actorDuration(), (int)duration, tags);\n\n        \/\/ return null would do the trick, but we want to be _proper_.\n        return result;\n    }\n\n    \/**\n     * Advises the {@code ActorCell.handleInvokeFailure(_, failure: Throwable): Unit}\n     *\n     * @param actorCell the ActorCell where the error spreads from\n     * @param failure the exception that escaped from the {@code receive} method\n     *\/\n    before(ActorCell actorCell, Throwable failure) : Pointcuts.actorCellHandleInvokeFailure(actorCell, failure) {\n        \/\/ record the error, general and specific\n        String[] tags = getTags(actorCell.self().path(), getActorClassName(actorCell, actorCell.self().path()));\n        this.counterInterface.incrementCounter(Aspects.actorError(), tags);\n        this.counterInterface.incrementCounter(Aspects.actorError(failure), tags);\n    }\n\n    \/**\n     * Advises the {@code EventStream.publish(event: Any): Unit}\n     *\n     * @param event the received event\n     *\/\n    before(Object event) : Pointcuts.eventStreamPublish(event) {\n        if (event instanceof UnhandledMessage) {\n            UnhandledMessage unhandledMessage = (UnhandledMessage)event;\n            String[] tags = getTags(unhandledMessage.recipient().path(), this.anonymousActorClassName);\n            this.counterInterface.incrementCounter(Aspects.undelivered(), tags);\n            this.counterInterface.incrementCounter(Aspects.undelivered(unhandledMessage.getMessage()), tags);\n        }\n    }\n\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorRefFactory} implementations\n     *\n     * @param props the {@code Props} instance used in the call\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after(Props props) returning (ActorRef actor) : Pointcuts.anyActorOf(props) {\n        recordActorCount(actor.path(), props, CountType.Increment);\n    }\n\n    \/**\n     * Advises the {@code LocalActorRef.stop} method\n     *\n     * @param actorCell the {@code ActorCell} of the actor being stopped\n     *\/\n    after(ActorCell actorCell) : Pointcuts.actorCellInternalStop(actorCell) {\n        recordActorCount(actorCell.self().path(), actorCell.props(), CountType.Decrement);\n    }\n\n    \/**\n     * Records the actor count increment or decrement\n     *\n     * @param path the ActorPath being created or destroyed\n     * @param props the Props of the actor at the {@code path}\n     * @param countType the increment or decrement\n     *\/\n     private void recordActorCount(ActorPath path, Props props, CountType countType) {\n         final Option<String> className = getActorClassName(props, path);\n         final PathAndClass pac = new PathAndClass(path, getActorClassName(props, path));\n         if (!includeActorPath(pac)) return;\n\n         final String[] tags = getTags(path, className);\n         this.numberOfActors.putIfAbsent(className, new AtomicInteger(0));\n         \/\/ increment and get the current number of actors of this type (if the value was 0, then this returns 1 -- which is correct)\n         final int currentNumberOfActors;\n         switch (countType) {\n             case Increment:\n                 currentNumberOfActors = this.numberOfActors.get(className).incrementAndGet();\n                 break;\n             case Decrement:\n                 currentNumberOfActors = this.numberOfActors.get(className).decrementAndGet();\n                 break;\n             default:\n                 currentNumberOfActors = 0;\n                 break;\n         }\n\n         this.counterInterface.recordGaugeValue(Aspects.actorCount(), currentNumberOfActors, tags);\n     }\n\n    \/**\n     * Injects the new {@code AkkaAgentConfiguration} instance.\n     *\n     * @param agentConfiguration the new configuration\n     *\/\n    synchronized final void setAgentConfiguration(AkkaAgentConfiguration agentConfiguration) {\n        this.agentConfiguration = agentConfiguration;\n    }\n\n    \/**\n     * The count type for exhaustive matching\n     *\/\n    private static enum CountType {\n        Increment, Decrement\n    }\n\n    \/**\n     * Decide whether to include this ActorCell in our measurements\n     *\n     * @param pathAndClass the PAC container\n     * @return whether to include the given actor in the metrics\n     *\/\n    private boolean includeActorPath(final PathAndClass pathAndClass) {\n        \/\/ do not monitor our own output code\n        if (pathAndClass.actorClassName().isDefined()) {\n            if (pathAndClass.actorClassName().get().startsWith(\"org.eigengo.monitor.output\")) return false;\n        }\n\n        \/\/ include actor if it's in 'included' list\n        if (this.agentConfiguration.included().accept(pathAndClass)) return true;\n        \/\/ exclude actor if excluded (i.e. is in 'excluded' list, or excludeAllNotIncluded = true, and actor is not included)\n        if (this.agentConfiguration.excluded().accept(pathAndClass)) return false;\n\n        \/\/ skip system actor checks if we wish to monitor them\n        if (this.agentConfiguration.includeSystemAgents()) return true;\n\n        String userOrSystem = pathAndClass.actorPath().getElements().iterator().next();\n        return \"user\".equals(userOrSystem);\n    }\n\n    \/**\n     * Lookup the sample rate for an actor from the configuration\n     *\n     * @param pathAndClass the PAC container\n     * @return the sampling rate as non-negative integer\n     *\/\n    private int getSampleRate(final PathAndClass pathAndClass) {\n        return this.agentConfiguration.sampling().getRate(pathAndClass);\n    }\n\n    \/**\n     * Decide whether to sample an actor on a particular occasion\n     *\n     * @param pathAndClass the PAC container\n     * @return {@code true} if we should sample this actor\n     *\/\n    private boolean sampleMessage(final PathAndClass pathAndClass) {\n        final Option<String> className = pathAndClass.actorClassName();\n        int sampleRate = getSampleRate(pathAndClass);\n        if (sampleRate == 1) return true;\n\n        this.samplingCounters.putIfAbsent(className, new AtomicLong(0));\n        long timesSeenSoFar = this.samplingCounters.get(className).incrementAndGet();\n        return (timesSeenSoFar % sampleRate == 1); \/\/ == 1 to log first value (incrementAndGet returns updated value)\n    }\n\n    \/**\n     * Formats the given {@code path} in a way that can be used for tagging. For example, for\n     * path <code>akka:\/\/default\/user\/a\/b\/c<\/code>, it returns <code>akka.path:\/default\/user\/a\/b\/c<\/code>\n     *\n     * @param path the path\n     * @return the tag-ready path\n     *\/\n    private String actorPathToString(ActorPath path) {\n        StringBuilder sb = new StringBuilder();\n        sb.append(\"akka.path:\/\");\n        sb.append(path.address().system());\n        for (String element : path.getElements()) {\n            sb.append(\"\/\");\n            sb.append(element);\n        }\n        return sb.toString();\n    }\n\n    \/**\n     * Decides whether {@code path} represents the \"root\" of the user actors\n     *\n     * @param path the actor path\n     * @return {@code true} if root of user actors\n     *\/\n    private boolean isUserRoot(ActorPath path) {\n        return \"user\".equals(path.elements().mkString(\"\/\"));\n    }\n\n    \/**\n     * Computes the tags for the given {@code actorPath} and {@code actor} instances.\n     *\n     * @param actorPath the actor path; never {@code null}\n     * @param actorClassName the actor instance; may be {@code null}\n     * @return non-{@code null} array of tags\n     *\/\n    private String[] getTags(final ActorPath actorPath, final Option<String> actorClassName) {\n        List<String> tags = new ArrayList<String>();\n\n        \/\/ TODO: Improve detection of routed actors. This only detects \"root\" unnamed actors\n        String lastPathElement = actorPath.elements().last();\n        if (lastPathElement.startsWith(\"$\")) {\n            \/\/ this is routed actor.\n            final ActorPath parent = actorPath.parent();\n            if (isUserRoot(parent)) {\n                \/\/ the parent is akka:\/\/xxx\/user\n                tags.add(actorPathToString(actorPath));\n            } else {\n                \/\/ the parent is some other actor, akka:\/\/xxx\/user\/foo\n                tags.add(actorPathToString(parent));\n                if (this.agentConfiguration.includeRoutees()) tags.add(actorPathToString(actorPath));\n            }\n        } else {\n            \/\/ there is no supervisor\n            tags.add(actorPathToString(actorPath));\n        }\n        if (actorClassName.isDefined()) {\n            tags.add(String.format(\"akka.type:%s.%s\", actorPath.address().system(), actorClassName.get()));\n        }\n\n        return tags.toArray(new String[tags.size()]);\n    }\n\n    \/**\n     * returns the canonical name of the actor type associated with an ActorCell\n     *\n     * @param actorCell the actor cell to get the name for\n     * @return the Option of actor class, never {@code null}.\n     *\/\n    private Option<String> getActorClassName(final ActorCell actorCell, final ActorPath actorPath) {\n        return getActorClassName(actorCell.props(), actorPath);\n    }\n\n    \/**\n     * Returns the canonical name of the actor type associated with a Props instance\n     *\n     * Returns null if props.actorClass does not have a canonical name (i.e., if\n     * it is a local or anonymous class)\n     *\n     * Notably, when the actor class is anonymous, the {@code getCanonicalName} returns {@code null},\n     * which we deal with here.\n     *\n     * @param props the ActorRef {@code Props} instance\n     * @return the Option of actor class, never {@code null}.\n     *\/\n    private Option<String> getActorClassName(final Props props, final ActorPath actorPath) {\n        final String canonicalName = props.actorClass().getCanonicalName();\n        if (canonicalName == null \/*if actor is anonymous*\/||\/*OR actor is generic*\/\n                canonicalName.endsWith(\"akka.actor.Actor\")) {\n            \/\/ then we check to see if our path->className map can help...\n            if (this.pathTags.containsKey(actorPath)) return Option.apply(this.pathTags.get(actorPath));\n            return this.anonymousActorClassName;\n        }\n        return Option.apply(canonicalName);\n    }\n\n    \/**\n     * Catches actors created by the japi.Creator.create(), at a point when their type is visible to the runtime.\n     * We use the visibility of the type at this one pointcut to create a map from the actor path to its type,\n     * which we then access within the other pointcuts (notably on actor death and message receipt) to get the\n     * 'real' type at those points.\n     *\n     * Since the 'ActorRefFactory.actorOf' method is guaranteed to be called on the creation of any actors after the\n     * initialisation of the actorSystem itself, and since we consider anonymous\/untyped actors in our count, we also\n     * decrement the count of 'anonymous' actors here, for we know their type to be invisible to other pointcuts, and\n     * that the element mapping path to type will not have been created (i.e. we generally assume actor paths are unique,\n     * and that the actorOf advice will access the 'pathTags' map before we've inserted this new value). This approach\n     * may not be robust enough -- in particular, with regards the second assumption.\n     *\n     * Regardless, we still double check that the map element doesn't already exist. If it does, we make the assumption\n     * that it was created 'a while ago', and that the path referred to an actor of the same type.\n     *\n     * @param actor the Actor returned by the {@code Creator.create()} method\n     * *\/\n    after() returning(final Actor actor) : Pointcuts.actorCreator() {\n        final String className = actor.getClass().getCanonicalName();\n        final ActorPath actorPath = actor.self().path();\n        final PathAndClass pac = new PathAndClass(actorPath, Option.apply(className));\n        if (this.pathTags.containsKey(actorPath)) return; \/\/ the key is there, we need do nothing.\n        \/\/ add the path -> type pair to the pathTags map\n        this.pathTags.putIfAbsent(actorPath, className);\n\n        if (includeActorPath(pac)) {\n            \/\/ safe increment of the count of actors of this type\n            this.numberOfActors.putIfAbsent(pac.actorClassName(), new AtomicInteger(0));\n            final int currentNumberOfActors = this.numberOfActors.get(pac.actorClassName()).incrementAndGet();\n            this.counterInterface.recordGaugeValue(Aspects.actorCount(), currentNumberOfActors, getTags(actorPath, pac.actorClassName()));\n        }\n\n        if (includeActorPath(new PathAndClass(actorPath, this.anonymousActorClassName))) {\n            \/\/ safe decrement of the count of anonymous\/untyped actors\n            this.numberOfActors.putIfAbsent(this.anonymousActorClassName, new AtomicInteger(0));\n            final int currentNumberOfActors = this.numberOfActors.get(this.anonymousActorClassName).decrementAndGet();\n            this.counterInterface.recordGaugeValue(Aspects.actorCount(), currentNumberOfActors, getTags(actorPath, this.anonymousActorClassName));\n        }\n    }\n\n}\n","old_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.actor.*;\nimport akka.japi.Creator;\nimport org.eigengo.monitor.agent.AgentConfiguration;\nimport org.eigengo.monitor.output.CounterInterface;\nimport scala.Option;\n\nimport java.util.ArrayList;\nimport java.util.List;\nimport java.util.concurrent.atomic.AtomicInteger;\nimport java.util.concurrent.atomic.AtomicLong;\nimport java.util.concurrent.ConcurrentHashMap;\n\n\/**\n * Contains advices for monitoring behaviour of an actor; typically imprisoned in an {@code ActorCell}.\n *\/\npublic aspect ActorCellMonitoringAspect extends AbstractMonitoringAspect issingleton() {\n    private AkkaAgentConfiguration agentConfiguration;\n    private final CounterInterface counterInterface;\n    private final Option<String> anonymousActorClassName = Option.empty();\n    \/\/ we sample based on actor type (i.e. a sampling rate of 'n' for a filter means 'every nth actor with type k, for each type k that matches that filter')\n    private final ConcurrentHashMap<Option<String>, AtomicLong> samplingCounters  = new ConcurrentHashMap<Option<String>, AtomicLong>();\n    \/\/ we count actors by actor type (any 'anonymous' or 'generic' actors are treated as the same type)\n    private final ConcurrentHashMap<Option<String>, AtomicInteger> numberOfActors = new ConcurrentHashMap<Option<String>, AtomicInteger>();\n    private final ConcurrentHashMap<ActorPath, String> pathTags                   = new ConcurrentHashMap<ActorPath, String>();\n\n    \/**\n     * Constructs this aspect\n     *\/\n    public ActorCellMonitoringAspect() {\n        AgentConfiguration<AkkaAgentConfiguration> configuration = getAgentConfiguration(\"akka\", AkkaAgentConfigurationJapi.apply());\n        this.agentConfiguration = configuration.agent();\n        this.counterInterface = createCounterInterface(configuration.common());\n    }\n\n    \/**\n     * Advises the {@code ActorCell.receiveMessage(message: Object): Unit}\n     * We proceed with the pointcut if the actor is to be included in the monitoring *and* this is\n     * the 'multiple-of-n'th time we've seen a message for an actor with a sample rate of n.\n     *\n     * Currently, we sample queue size, the fact that the message is delivered, the simple name of the class of the\n     * message, and the time taken to complete the actor's reactive action.\n     *\n     * @param actorCell the ActorCell where the actor that receives the message \"lives\"\n     * @param msg the incoming message\n     *\/\n    Object around(ActorCell actorCell, Object msg) : Pointcuts.actorCellReceiveMessage(actorCell, msg) {\n        final ActorPath actorPath = actorCell.self().path();\n        final Option<String> className = getActorClassName(actorCell, actorPath);\n        final PathAndClass pathAndClass = new PathAndClass(actorPath, className);\n        if (!includeActorPath(pathAndClass) || !sampleMessage(pathAndClass)) return proceed(actorCell, msg);\n\n        int samplingRate = getSampleRate(pathAndClass);\n\n        \/\/ we tag by actor name\n        final String[] tags = getTags(actorPath, className);\n\n        \/\/ record the queue size\n        this.counterInterface.recordGaugeValue(Aspects.queueSize(), actorCell.numberOfMessages(), tags);\n        \/\/ record the message, general and specific\n        this.counterInterface.incrementCounter(Aspects.delivered(), samplingRate, tags);\n        this.counterInterface.incrementCounter(Aspects.delivered(msg), samplingRate, tags);\n\n        \/\/ measure the time. we're using the ``nanoTime`` call to access the high-precision timer.\n        \/\/ since we're not really interested in wall time, but just some increasing measure of\n        \/\/ elapsed time\n        Object result = null;\n        final long start = System.nanoTime();\n        \/\/ result will always be ``null``, because target returns ``Unit``\n        result = proceed(actorCell, msg);\n        \/\/ ns or \u00b5s is too fine. ms will do for now.\n        final long duration = (System.nanoTime() - start) \/ 1000000;\n\n        \/\/ record the actor duration\n        this.counterInterface.recordExecutionTime(Aspects.actorDuration(), (int)duration, tags);\n\n        \/\/ return null would do the trick, but we want to be _proper_.\n        return result;\n    }\n\n    \/**\n     * Advises the {@code ActorCell.handleInvokeFailure(_, failure: Throwable): Unit}\n     *\n     * @param actorCell the ActorCell where the error spreads from\n     * @param failure the exception that escaped from the {@code receive} method\n     *\/\n    before(ActorCell actorCell, Throwable failure) : Pointcuts.actorCellHandleInvokeFailure(actorCell, failure) {\n        \/\/ record the error, general and specific\n        String[] tags = getTags(actorCell.self().path(), getActorClassName(actorCell, actorCell.self().path()));\n        this.counterInterface.incrementCounter(Aspects.actorError(), tags);\n        this.counterInterface.incrementCounter(Aspects.actorError(failure), tags);\n    }\n\n    \/**\n     * Advises the {@code EventStream.publish(event: Any): Unit}\n     *\n     * @param event the received event\n     *\/\n    before(Object event) : Pointcuts.eventStreamPublish(event) {\n        if (event instanceof UnhandledMessage) {\n            UnhandledMessage unhandledMessage = (UnhandledMessage)event;\n            String[] tags = getTags(unhandledMessage.recipient().path(), this.anonymousActorClassName);\n            this.counterInterface.incrementCounter(Aspects.undelivered(), tags);\n            this.counterInterface.incrementCounter(Aspects.undelivered(unhandledMessage.getMessage()), tags);\n        }\n    }\n\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorRefFactory} implementations\n     *\n     * @param props the {@code Props} instance used in the call\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after(Props props) returning (ActorRef actor) : Pointcuts.anyActorOf(props) {\n        recordActorCount(actor.path(), props, CountType.Increment);\n    }\n\n    \/**\n     * Advises the {@code LocalActorRef.stop} method\n     *\n     * @param actorCell the {@code ActorCell} of the actor being stopped\n     *\/\n    after(ActorCell actorCell) : Pointcuts.actorCellInternalStop(actorCell) {\n        recordActorCount(actorCell.self().path(), actorCell.props(), CountType.Decrement);\n    }\n\n    \/**\n     * Records the actor count increment or decrement\n     *\n     * @param path the ActorPath being created or destroyed\n     * @param props the Props of the actor at the {@code path}\n     * @param countType the increment or decrement\n     *\/\n     private void recordActorCount(ActorPath path, Props props, CountType countType) {\n         final Option<String> className = getActorClassName(props, path);\n         final PathAndClass pac = new PathAndClass(path, getActorClassName(props, path));\n         if (!includeActorPath(pac)) return;\n\n         final String[] tags = getTags(path, className);\n         this.numberOfActors.putIfAbsent(className, new AtomicInteger(0));\n         \/\/ increment and get the current number of actors of this type (if the value was 0, then this returns 1 -- which is correct)\n         final int currentNumberOfActors;\n         switch (countType) {\n             case Increment:\n                 currentNumberOfActors = this.numberOfActors.get(className).incrementAndGet();\n                 break;\n             case Decrement:\n                 currentNumberOfActors = this.numberOfActors.get(className).decrementAndGet();\n                 break;\n             default:\n                 currentNumberOfActors = 0;\n                 break;\n         }\n\n         this.counterInterface.recordGaugeValue(Aspects.actorCount(), currentNumberOfActors, tags);\n     }\n\n    \/**\n     * Injects the new {@code AkkaAgentConfiguration} instance.\n     *\n     * @param agentConfiguration the new configuration\n     *\/\n    synchronized final void setAgentConfiguration(AkkaAgentConfiguration agentConfiguration) {\n        this.agentConfiguration = agentConfiguration;\n    }\n\n    \/**\n     * The count type for exhaustive matching\n     *\/\n    private static enum CountType {\n        Increment, Decrement\n    }\n\n    \/**\n     * Decide whether to include this ActorCell in our measurements\n     *\n     * @param pathAndClass the PAC container\n     * @return whether to include the given actor in the metrics\n     *\/\n    private boolean includeActorPath(final PathAndClass pathAndClass) {\n        \/\/ do not monitor our own output code\n        if (pathAndClass.actorClassName().isDefined()) {\n            if (pathAndClass.actorClassName().get().startsWith(\"org.eigengo.monitor.output\")) return false;\n        }\n\n        \/\/ include actor if it's in 'included' list\n        if (this.agentConfiguration.included().accept(pathAndClass)) return true;\n        \/\/ exclude actor if excluded (i.e. is in 'excluded' list, or excludeAllNotIncluded = true, and actor is not included)\n        if (this.agentConfiguration.excluded().accept(pathAndClass)) return false;\n\n        \/\/ skip system actor checks if we wish to monitor them\n        if (this.agentConfiguration.includeSystemAgents()) return true;\n\n        String userOrSystem = pathAndClass.actorPath().getElements().iterator().next();\n        return \"user\".equals(userOrSystem);\n    }\n\n    \/**\n     * Lookup the sample rate for an actor from the configuration\n     *\n     * @param pathAndClass the PAC container\n     * @return the sampling rate as non-negative integer\n     *\/\n    private int getSampleRate(final PathAndClass pathAndClass) {\n        return this.agentConfiguration.sampling().getRate(pathAndClass);\n    }\n\n    \/**\n     * Decide whether to sample an actor on a particular occasion\n     *\n     * @param pathAndClass the PAC container\n     * @return {@code true} if we should sample this actor\n     *\/\n    private boolean sampleMessage(final PathAndClass pathAndClass) {\n        final Option<String> className = pathAndClass.actorClassName();\n        int sampleRate = getSampleRate(pathAndClass);\n        if (sampleRate == 1) return true;\n\n        this.samplingCounters.putIfAbsent(className, new AtomicLong(0));\n        long timesSeenSoFar = this.samplingCounters.get(className).incrementAndGet();\n        return (timesSeenSoFar % sampleRate == 1); \/\/ == 1 to log first value (incrementAndGet returns updated value)\n    }\n\n    \/**\n     * Formats the given {@code path} in a way that can be used for tagging. For example, for\n     * path <code>akka:\/\/default\/user\/a\/b\/c<\/code>, it returns <code>akka.path:\/default\/user\/a\/b\/c<\/code>\n     *\n     * @param path the path\n     * @return the tag-ready path\n     *\/\n    private String actorPathToString(ActorPath path) {\n        StringBuilder sb = new StringBuilder();\n        sb.append(\"akka.path:\/\");\n        sb.append(path.address().system());\n        for (String element : path.getElements()) {\n            sb.append(\"\/\");\n            sb.append(element);\n        }\n        return sb.toString();\n    }\n\n    \/**\n     * Decides whether {@code path} represents the \"root\" of the user actors\n     *\n     * @param path the actor path\n     * @return {@code true} if root of user actors\n     *\/\n    private boolean isUserRoot(ActorPath path) {\n        return \"user\".equals(path.elements().mkString(\"\/\"));\n    }\n\n    \/**\n     * Computes the tags for the given {@code actorPath} and {@code actor} instances.\n     *\n     * @param actorPath the actor path; never {@code null}\n     * @param actorClassName the actor instance; may be {@code null}\n     * @return non-{@code null} array of tags\n     *\/\n    private String[] getTags(final ActorPath actorPath, final Option<String> actorClassName) {\n        List<String> tags = new ArrayList<String>();\n\n        \/\/ TODO: Improve detection of routed actors. This only detects \"root\" unnamed actors\n        String lastPathElement = actorPath.elements().last();\n        if (lastPathElement.startsWith(\"$\")) {\n            \/\/ this is routed actor.\n            final ActorPath parent = actorPath.parent();\n            if (isUserRoot(parent)) {\n                \/\/ the parent is akka:\/\/xxx\/user\n                tags.add(actorPathToString(actorPath));\n            } else {\n                \/\/ the parent is some other actor, akka:\/\/xxx\/user\/foo\n                tags.add(actorPathToString(parent));\n                if (this.agentConfiguration.includeRoutees()) tags.add(actorPathToString(actorPath));\n            }\n        } else {\n            \/\/ there is no supervisor\n            tags.add(actorPathToString(actorPath));\n        }\n        if (actorClassName.isDefined()) {\n            tags.add(String.format(\"akka.type:%s.%s\", actorPath.address().system(), actorClassName.get()));\n        }\n\n        return tags.toArray(new String[tags.size()]);\n    }\n\n    \/**\n     * returns the canonical name of the actor type associated with an ActorCell\n     *\n     * @param actorCell the actor cell to get the name for\n     * @return the Option of actor class, never {@code null}.\n     *\/\n    private Option<String> getActorClassName(final ActorCell actorCell, final ActorPath actorPath) {\n        return getActorClassName(actorCell.props(), actorPath);\n    }\n\n    \/**\n     * Returns the canonical name of the actor type associated with a Props instance\n     *\n     * Returns null if props.actorClass does not have a canonical name (i.e., if\n     * it is a local or anonymous class)\n     *\n     * Notably, when the actor class is anonymous, the {@code getCanonicalName} returns {@code null},\n     * which we deal with here.\n     *\n     * @param props the ActorRef {@code Props} instance\n     * @return the Option of actor class, never {@code null}.\n     *\/\n    private Option<String> getActorClassName(final Props props, final ActorPath actorPath) {\n        final String canonicalName = props.actorClass().getCanonicalName();\n        if (canonicalName == null \/*if actor is anonymous*\/||\/*OR actor is generic*\/\n                canonicalName.endsWith(\"akka.actor.Actor\")) {\n            \/\/ then we check to see if our path->className map can help...\n            if (this.pathTags.containsKey(actorPath)) return Option.apply(this.pathTags.get(actorPath));\n            return this.anonymousActorClassName;\n        }\n        return Option.apply(canonicalName);\n    }\n\n    \/**\n     * Catches actors created by the japi.Creator.create(), at a point when their type is visible to the runtime.\n     * We use the visibility of the type at this one pointcut to create a map from the actor path to its type,\n     * which we then access within the other pointcuts (notably on actor death and message receipt) to get the\n     * 'real' type at those points.\n     *\n     * Since the 'ActorRefFactory.actorOf' method is guaranteed to be called on the creation of any actors after the\n     * initialisation of the actorSystem itself, and since we consider anonymous\/untyped actors in our count, we also\n     * decrement the count of 'anonymous' actors here, for we know their type to be invisible to other pointcuts, and\n     * that the element mapping path to type will not have been created (i.e. we generally assume actor paths are unique,\n     * and that the actorOf advice will access the 'pathTags' map before we've inserted this new value). This approach\n     * may not be robust enough -- in particular, with regards the second assumption.\n     *\n     * Regardless, we still double check that the map element doesn't already exist. If it does, we make the assumption\n     * that it was created 'a while ago', and that the path referred to an actor of the same type.\n     *\n     * @param actor the Actor returned by the {@code Creator.create()} method\n     * *\/\n    after() returning(final Actor actor) : Pointcuts.actorCreator() {\n        final String className = actor.getClass().getCanonicalName();\n        final ActorPath actorPath = actor.self().path();\n        final PathAndClass pac = new PathAndClass(actorPath, Option.apply(className));\n        if (this.pathTags.containsKey(actorPath)) return; \/\/ the key is there, we need do nothing.\n\n        if (includeActorPath(pac)) {\n            \/\/ add the path -> type pair to the pathTags map\n            this.pathTags.putIfAbsent(actorPath, className);\n\n            \/\/ safe increment of the count of actors of this type\n            this.numberOfActors.putIfAbsent(pac.actorClassName(), new AtomicInteger(0));\n            final int currentNumberOfActors = this.numberOfActors.get(pac.actorClassName()).incrementAndGet();\n            this.counterInterface.recordGaugeValue(Aspects.actorCount(), currentNumberOfActors, getTags(actorPath, pac.actorClassName()));\n        }\n\n        if (includeActorPath(new PathAndClass(actorPath, this.anonymousActorClassName))) {\n            \/\/ safe decrement of the count of anonymous\/untyped actors\n            this.numberOfActors.putIfAbsent(this.anonymousActorClassName, new AtomicInteger(0));\n            final int currentNumberOfActors = this.numberOfActors.get(this.anonymousActorClassName).decrementAndGet();\n            this.counterInterface.recordGaugeValue(Aspects.actorCount(), currentNumberOfActors, getTags(actorPath, this.anonymousActorClassName));\n        }\n    }\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"22e2b4ab35e19ed66f807cc4d6a242f567e4a1c3","subject":"Commenting out debug pointcut because it causes class sizes to balloon.","message":"Commenting out debug pointcut because it causes class sizes to balloon.\n\ngit-svn-id: 2c527eb49caa05e19d6b2be874bf74fa9d7ea670@614620 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"josephw\/maven,pkozelka\/maven,dsyer\/maven,wangyuesong0\/maven,gorcz\/maven,rogerchina\/maven,Distrotech\/maven,apache\/maven,runepeter\/maven-deploy-plugin-2.8.1,wangyuesong\/maven,trajano\/maven,skitt\/maven,Mounika-Chirukuri\/maven,mizdebsk\/maven,dsyer\/maven,wangyuesong\/maven,kidaa\/maven-1,njuneau\/maven,barthel\/maven,changbai1980\/maven,apache\/maven,stephenc\/maven,aheritier\/maven,changbai1980\/maven,josephw\/maven,barthel\/maven,apache\/maven,keith-turner\/maven,lbndev\/maven,barthel\/maven,cstamas\/maven,wangyuesong\/maven,skitt\/maven,likaiwalkman\/maven,ChristianSchulte\/maven,rogerchina\/maven,Mounika-Chirukuri\/maven,keith-turner\/maven,mcculls\/maven,karthikjaps\/maven,pkozelka\/maven,likaiwalkman\/maven,karthikjaps\/maven,mizdebsk\/maven,mcculls\/maven,wangyuesong0\/maven,kidaa\/maven-1,xasx\/maven,keith-turner\/maven,mizdebsk\/maven,olamy\/maven,atanasenko\/maven,Mounika-Chirukuri\/maven,stephenc\/maven,vedmishr\/demo1,njuneau\/maven,wangyuesong0\/maven,vedmishr\/demo1,pkozelka\/maven,cstamas\/maven,vedmishr\/demo1,ChristianSchulte\/maven,trajano\/maven,aheritier\/maven,skitt\/maven,kidaa\/maven-1,olamy\/maven,ChristianSchulte\/maven,rogerchina\/maven,runepeter\/maven-deploy-plugin-2.8.1,karthikjaps\/maven,aheritier\/maven,likaiwalkman\/maven,atanasenko\/maven,gorcz\/maven,lbndev\/maven,trajano\/maven,Distrotech\/maven,Tibor17\/maven,josephw\/maven,stephenc\/maven,olamy\/maven,lbndev\/maven,dsyer\/maven,mcculls\/maven,cstamas\/maven,Tibor17\/maven,xasx\/maven,changbai1980\/maven,xasx\/maven,njuneau\/maven,gorcz\/maven,atanasenko\/maven","old_file":"maven-core\/src\/main\/aspect\/org\/apache\/maven\/CoreDebuggingAspect.aj","new_file":"maven-core\/src\/main\/aspect\/org\/apache\/maven\/CoreDebuggingAspect.aj","new_contents":"package org.apache.maven;\n\nimport org.apache.maven.execution.MavenExecutionRequest;\nimport org.apache.maven.execution.MavenSession;\nimport org.apache.maven.plugin.PluginParameterExpressionEvaluator;\nimport org.codehaus.plexus.classworlds.realm.ClassRealm;\nimport org.apache.maven.plugin.Mojo;\nimport org.apache.maven.plugin.DefaultPluginManager;\nimport org.apache.maven.plugin.descriptor.PluginDescriptor;\nimport org.aspectj.lang.JoinPoint;\n\nimport java.util.Iterator;\nimport java.util.List;\n\npublic aspect CoreDebuggingAspect\n{\n\n\/\/    after() throwing ( RuntimeException e ):\n\/\/\/\/        adviceexecution( )\n\/\/\/\/        && args( jp )\n\/\/        call( * *..*.*(..))\n\/\/        && !within( CoreDebuggingAspect+ )\n\/\/        && !handler( * )\n\/\/    {\n\/\/        System.out.println( \"Error: \" + e.getClass().getName() + \"\\nwas in join point: \" + thisJoinPoint.toLongString() + \"\\n(at: \" + thisJoinPoint.getSourceLocation() + \")\" );\n\/\/    }\n\n\/\/    after( MavenExecutionRequest request ) returning( List projects ):\n\/\/        call( List DefaultMaven.getProjects( MavenExecutionRequest ) )\n\/\/        && args( request )\n\/\/    {\n\/\/        System.out.println( \"Got projects-list of size \" + ( projects == null ? \"null\" : \"\" + projects.size() ) + \":\\n\\n\" + projects );\n\/\/    }\n\n\/\/    private ClassRealm pluginRealm;\n\/\/\n\/\/    after() returning( ClassRealm realm ):\n\/\/        call( ClassRealm PluginDescriptor.getClassRealm() )\n\/\/        && cflow( execution( * DefaultPluginManager.executeMojo( .. ) ) )\n\/\/    {\n\/\/        pluginRealm = realm;\n\/\/    }\n\/\/\n\/\/    after():\n\/\/        execution( * DefaultPluginManager.executeMojo( .. ) )\n\/\/    {\n\/\/        pluginRealm = null;\n\/\/    }\n\/\/\n\/\/    void around():\n\/\/        call( void Mojo+.execute( .. ) )\n\/\/    {\n\/\/        try\n\/\/        {\n\/\/            proceed();\n\/\/        }\n\/\/        catch( Error err )\n\/\/        {\n\/\/            System.out.println( \"Plugin realm was \" + pluginRealm + \":\\n\\n\\n\" );\n\/\/            pluginRealm.display();\n\/\/\n\/\/            throw err;\n\/\/        }\n\/\/    }\n\/\/\n\/\/    after() returning( List reports ):\n\/\/        cflow( execution( * PluginParameterExpressionEvaluator.evaluate( .. ) ) )\n\/\/        && call( List MavenSession.getReports() )\n\/\/    {\n\/\/        System.out.println( \"Injecting reports for ${reports} expression.\\n\\n\" );\n\/\/        if ( reports != null && !reports.isEmpty() )\n\/\/        {\n\/\/            for ( Iterator it = reports.iterator(); it.hasNext(); )\n\/\/            {\n\/\/                Object report = it.next();\n\/\/                System.out.println( \"Report: \" + report + \" has classloader:\\n\" + report.getClass().getClassLoader() );\n\/\/            }\n\/\/        }\n\/\/        System.out.println( \"\\n\\n\" );\n\/\/    }\n\n}\n","old_contents":"package org.apache.maven;\n\nimport org.apache.maven.execution.MavenExecutionRequest;\nimport org.apache.maven.execution.MavenSession;\nimport org.apache.maven.plugin.PluginParameterExpressionEvaluator;\nimport org.codehaus.plexus.classworlds.realm.ClassRealm;\nimport org.apache.maven.plugin.Mojo;\nimport org.apache.maven.plugin.DefaultPluginManager;\nimport org.apache.maven.plugin.descriptor.PluginDescriptor;\nimport org.aspectj.lang.JoinPoint;\n\nimport java.util.Iterator;\nimport java.util.List;\n\npublic aspect CoreDebuggingAspect\n{\n\n    after() throwing ( RuntimeException e ):\n\/\/        adviceexecution( )\n\/\/        && args( jp )\n        call( * *..*.*(..))\n        && !within( CoreDebuggingAspect+ )\n        && !handler( * )\n    {\n        System.out.println( \"Error: \" + e.getClass().getName() + \"\\nwas in join point: \" + thisJoinPoint.toLongString() + \"\\n(at: \" + thisJoinPoint.getSourceLocation() + \")\" );\n    }\n\n\/\/    after( MavenExecutionRequest request ) returning( List projects ):\n\/\/        call( List DefaultMaven.getProjects( MavenExecutionRequest ) )\n\/\/        && args( request )\n\/\/    {\n\/\/        System.out.println( \"Got projects-list of size \" + ( projects == null ? \"null\" : \"\" + projects.size() ) + \":\\n\\n\" + projects );\n\/\/    }\n\n\/\/    private ClassRealm pluginRealm;\n\/\/\n\/\/    after() returning( ClassRealm realm ):\n\/\/        call( ClassRealm PluginDescriptor.getClassRealm() )\n\/\/        && cflow( execution( * DefaultPluginManager.executeMojo( .. ) ) )\n\/\/    {\n\/\/        pluginRealm = realm;\n\/\/    }\n\/\/\n\/\/    after():\n\/\/        execution( * DefaultPluginManager.executeMojo( .. ) )\n\/\/    {\n\/\/        pluginRealm = null;\n\/\/    }\n\/\/\n\/\/    void around():\n\/\/        call( void Mojo+.execute( .. ) )\n\/\/    {\n\/\/        try\n\/\/        {\n\/\/            proceed();\n\/\/        }\n\/\/        catch( Error err )\n\/\/        {\n\/\/            System.out.println( \"Plugin realm was \" + pluginRealm + \":\\n\\n\\n\" );\n\/\/            pluginRealm.display();\n\/\/\n\/\/            throw err;\n\/\/        }\n\/\/    }\n\/\/\n\/\/    after() returning( List reports ):\n\/\/        cflow( execution( * PluginParameterExpressionEvaluator.evaluate( .. ) ) )\n\/\/        && call( List MavenSession.getReports() )\n\/\/    {\n\/\/        System.out.println( \"Injecting reports for ${reports} expression.\\n\\n\" );\n\/\/        if ( reports != null && !reports.isEmpty() )\n\/\/        {\n\/\/            for ( Iterator it = reports.iterator(); it.hasNext(); )\n\/\/            {\n\/\/                Object report = it.next();\n\/\/                System.out.println( \"Report: \" + report + \" has classloader:\\n\" + report.getClass().getClassLoader() );\n\/\/            }\n\/\/        }\n\/\/        System.out.println( \"\\n\\n\" );\n\/\/    }\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"ee4dea5c3706fc6e0266ce0c657ecbf897b46bf0","subject":"AbstractPalavaAspect now appends (instead of prepends) new modules","message":"AbstractPalavaAspect now appends (instead of prepends) new modules\n","repos":"palava\/palava-core,palava\/palava-core","old_file":"src\/main\/java\/de\/cosmocode\/palava\/core\/aop\/AbstractPalavaAspect.aj","new_file":"src\/main\/java\/de\/cosmocode\/palava\/core\/aop\/AbstractPalavaAspect.aj","new_contents":"\/**\n * palava - a java-php-bridge\n * Copyright (C) 2007-2010  CosmoCode GmbH\n *\n * This program is free software; you can redistribute it and\/or\n * modify it under the terms of the GNU General Public License\n * as published by the Free Software Foundation; either version 2\n * of the License, or (at your option) any later version.\n *\n * This program is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n * along with this program; if not, write to the Free Software\n * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.\n *\/\n\npackage de.cosmocode.palava.core.aop;\n\nimport java.util.Collections;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.common.collect.Iterables;\nimport com.google.inject.Binder;\nimport com.google.inject.Guice;\nimport com.google.inject.Injector;\nimport com.google.inject.Module;\nimport com.google.inject.Stage;\n\npublic abstract aspect AbstractPalavaAspect {\n\n    private static final Logger LOG = LoggerFactory.getLogger(AbstractPalavaAspect.class);\n    \n    private final Module module = new Module() {\n        \n        @Override\n        public void configure(Binder binder) {\n            final AbstractPalavaAspect self = AbstractPalavaAspect.this;\n            LOG.trace(\"Injecting members on {}\", self);\n            Preconditions.checkState(!alreadyInjected, \"Members have been already injected on {}\", self);\n            binder.requestInjection(self);\n            alreadyInjected = true;\n        }\n        \n    };\n    \n    private boolean alreadyInjected;\n    \n    private Module[] append(Module[] modules) {\n        final Module[] array = new Module[modules.length + 1];\n        System.arraycopy(modules, 0, array, 0, modules.length);\n        array[modules.length] = module;\n        return array;\n    }\n    \n    private Iterable<? extends Module> append(Iterable<? extends Module> modules) {\n        return Iterables.concat(modules, Collections.singleton(module));\n    }\n    \n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Injector around(Module[] modules): call(Injector Guice.createInjector(Module...)) && args(modules) {\n        return proceed(append(modules));\n    }\n\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Injector around(Iterable<? extends Module> modules): call(Injector Guice.createInjector(Iterable<? extends Module>)) && args(modules) {\n        return proceed(append(modules));\n    }\n\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Injector around(Stage stage, Module[] modules): call(Injector Guice.createInjector(Stage, Module...)) && args(stage, modules) {\n        return proceed(stage, append(modules));\n    }\n\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Injector around(Stage stage, Iterable<? extends Module> modules): call(Injector Guice.createInjector(Stage, Iterable<? extends Module>)) && args(stage, modules) {\n        return proceed(stage, append(modules));\n    }\n    \n    protected final void checkState() {\n        Preconditions.checkState(alreadyInjected, \"Members have not been injected on {}\", this);\n    }\n\n}\n","old_contents":"\/**\n * palava - a java-php-bridge\n * Copyright (C) 2007-2010  CosmoCode GmbH\n *\n * This program is free software; you can redistribute it and\/or\n * modify it under the terms of the GNU General Public License\n * as published by the Free Software Foundation; either version 2\n * of the License, or (at your option) any later version.\n *\n * This program is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n * along with this program; if not, write to the Free Software\n * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.\n *\/\n\npackage de.cosmocode.palava.core.aop;\n\nimport java.util.Collections;\n\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.common.collect.Iterables;\nimport com.google.inject.Binder;\nimport com.google.inject.Guice;\nimport com.google.inject.Injector;\nimport com.google.inject.Module;\nimport com.google.inject.Stage;\n\npublic abstract aspect AbstractPalavaAspect {\n\n    private static final Logger LOG = LoggerFactory.getLogger(AbstractPalavaAspect.class);\n    \n    private final Module module = new Module() {\n        \n        @Override\n        public void configure(Binder binder) {\n            final AbstractPalavaAspect self = AbstractPalavaAspect.this;\n            LOG.trace(\"Injecting members on {}\", self);\n            Preconditions.checkState(!alreadyInjected, \"Members have been already injected on {}\", self);\n            binder.requestInjection(self);\n            alreadyInjected = true;\n        }\n        \n    };\n    \n    private boolean alreadyInjected;\n    \n    private Module[] append(Module[] modules) {\n        final Module[] array = new Module[modules.length + 1];\n        array[0] = module;\n        System.arraycopy(modules, 0, array, 1, modules.length);\n        return array;\n    }\n    \n    private Iterable<? extends Module> append(Iterable<? extends Module> modules) {\n        return Iterables.concat(Collections.singleton(module), modules);\n    }\n    \n    Injector around(Module[] modules): call(Injector Guice.createInjector(Module...)) && args(modules) {\n        return proceed(append(modules));\n    }\n\n    Injector around(Iterable<? extends Module> modules): call(Injector Guice.createInjector(Iterable<? extends Module>)) && args(modules) {\n        return proceed(append(modules));\n    }\n\n    Injector around(Stage stage, Module[] modules): call(Injector Guice.createInjector(Stage, Module...)) && args(stage, modules) {\n        return proceed(stage, append(modules));\n    }\n    \n    Injector around(Stage stage, Iterable<? extends Module> modules): call(Injector Guice.createInjector(Stage, Iterable<? extends Module>)) && args(stage, modules) {\n        return proceed(stage, append(modules));\n    }\n    \n    protected final void checkState() {\n        Preconditions.checkState(alreadyInjected, \"Members have not been injected on {}\", this);\n    }\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"cff311b03cbd2b092269dbeef79992c675527139","subject":"Remove outdated JpaExceptionTranslatorAspect","message":"Remove outdated JpaExceptionTranslatorAspect\n\nIssue: SPR-15047\n","repos":"spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework","old_file":"spring-aspects\/src\/main\/java\/org\/springframework\/orm\/jpa\/aspectj\/JpaExceptionTranslatorAspect.aj","new_file":"spring-aspects\/src\/main\/java\/org\/springframework\/orm\/jpa\/aspectj\/JpaExceptionTranslatorAspect.aj","new_contents":"","old_contents":"\/*\n * Copyright 2002-2014 the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.springframework.orm.jpa.aspectj;\n\nimport javax.persistence.EntityManager;\nimport javax.persistence.EntityManagerFactory;\nimport javax.persistence.EntityTransaction;\nimport javax.persistence.Query;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\n\nimport org.springframework.dao.DataAccessException;\nimport org.springframework.orm.jpa.EntityManagerFactoryUtils;\n\npublic aspect JpaExceptionTranslatorAspect {\n\n\tpointcut entityManagerCall():\n\t\tcall(* EntityManager.*(..)) || call(* EntityManagerFactory.*(..)) ||\n\t\tcall(* EntityTransaction.*(..)) || call(* Query.*(..));\n\n\t@SuppressAjWarnings(\"adviceDidNotMatch\")\n\tafter() throwing(RuntimeException re): entityManagerCall() {\n\t\tDataAccessException dex = EntityManagerFactoryUtils.convertJpaAccessExceptionIfPossible(re);\n\t\tif (dex != null) {\n\t\t\tthrow dex;\n\t\t}\n\t\telse {\n\t\t\tthrow re;\n\t\t}\n\t}\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"659d920adf2ee959fa0e5f3cfd93207bff8b472d","subject":"Javadoc and log message tweaks.","message":"Javadoc and log message tweaks.\n","repos":"tempbottle\/jsimpledb,archiecobbs\/jsimpledb,archiecobbs\/jsimpledb,tempbottle\/jsimpledb,permazen\/permazen,permazen\/permazen,tempbottle\/jsimpledb,archiecobbs\/jsimpledb,permazen\/permazen","old_file":"src\/java\/org\/dellroad\/stuff\/spring\/ThreadConfigurableAspect.aj","new_file":"src\/java\/org\/dellroad\/stuff\/spring\/ThreadConfigurableAspect.aj","new_contents":"\n\/*\n * Copyright (C) 2011 Archie L. Cobbs and other authors. All rights reserved.\n *\n * $Id: ThreadConfigurableAspect.aj 282 2012-02-16 20:48:06Z archie.cobbs $\n *\/\n\npackage org.dellroad.stuff.spring;\n\nimport java.io.ObjectStreamException;\nimport java.io.Serializable;\n\nimport org.springframework.beans.factory.BeanFactory;\nimport org.springframework.beans.factory.aspectj.AbstractDependencyInjectionAspect;\nimport org.springframework.beans.factory.wiring.BeanConfigurerSupport;\nimport org.springframework.beans.factory.wiring.BeanWiringInfoResolver;\nimport org.springframework.context.ConfigurableApplicationContext;\n\n\/**\n * Aspect that autowires classes marked with the {@link ThreadConfigurable @ThreadConfigurable} annotation using\n * the per-thread Spring application context configured in the {@link ThreadConfigurableContextHolder} singleton.\n *\n * <p>\n * This implementation is derived from Spring's {@code AnnotationBeanConfigurerAspect} implementation\n * and therefore shares its license (also Apache).\n * <\/p>\n *\n * @see ThreadConfigurable\n * @see ThreadConfigurableContextHolder\n *\/\npublic aspect ThreadConfigurableAspect extends AbstractConfigurableAspect {\n\n\/\/ Stuff copied from AbstractInterfaceDrivenDependencyInjectionAspect.aj\n\n    public pointcut beanConstruction(Object bean) :\n        initialization(ThreadConfigurableObject+.new(..)) && this(bean);\n\n    public pointcut beanDeserialization(Object bean) :\n        execution(Object ThreadConfigurableDeserializationSupport+.readResolve()) &&\n        this(bean);\n\n    public pointcut leastSpecificSuperTypeConstruction() : initialization(ThreadConfigurableObject.new(..));\n\n    declare parents: \n        ThreadConfigurableObject+ && Serializable+ implements ThreadConfigurableDeserializationSupport;\n\n    static interface ThreadConfigurableDeserializationSupport extends Serializable {\n    }\n\n    public Object ThreadConfigurableDeserializationSupport.readResolve() throws ObjectStreamException {\n        return this;\n    }\n\n\/\/ Stuff copied from AnnotationBeanConfigurerAspect.aj\n\n    public pointcut inConfigurableBean() : @this(ThreadConfigurable);\n\n    public pointcut preConstructionConfiguration() : preConstructionConfigurationSupport(*);\n\n    declare parents: @ThreadConfigurable * implements ThreadConfigurableObject;\n\n    private pointcut preConstructionConfigurationSupport(ThreadConfigurable c) : @this(c) && if(c.preConstruction());\n\n\tdeclare parents: @ThreadConfigurable Serializable+ implements ThreadConfigurableDeserializationSupport;\n\n\/\/ Our implementation\n\n    @Override\n    protected BeanFactory getBeanFactory(Object bean) {\n\n        \/\/ Get ThreadConfigurableContextHolder singleton\n        ThreadConfigurableContextHolder threadConfigurableContextHolder = ThreadConfigurableContextHolder.getInstance();\n        if (threadConfigurableContextHolder == null) {\n            if (this.log.isDebugEnabled()) {\n                this.log.debug(\"can't configure @\" + ThreadConfigurable.class.getName()\n                  + \"-annotated bean of type \" + bean.getClass().getName()\n                  + \" because the ThreadConfigurableContextHolder singleton instance has been set to null;\"\n                  + \" proceeding without injection\");\n            }\n            return null;\n        }\n\n        \/\/ Get ConfigurableApplicationContext\n        ConfigurableApplicationContext context = threadConfigurableContextHolder.get();\n        if (context == null) {\n            if (this.log.isDebugEnabled()) {\n                this.log.debug(\"can't configure @\" + ThreadConfigurable.class.getName()\n                  + \"-annotated bean of type \" + bean.getClass().getName()\n                  + \" because no ConfigurableApplicationContext has been configured for the current thread via \"\n                  + ThreadConfigurableContextHolder.class.getName() + \".set() nor has a default been set;\"\n                  + \" proceeding without injection\");\n            }\n            return null;\n        }\n\n        \/\/ Return associated BeanFactory\n        return context.getBeanFactory();\n    }\n\n    @Override\n    protected BeanWiringInfoResolver getBeanWiringInfoResolver(Object bean) {\n        return new ThreadConfigurableBeanWiringInfoResolver();\n    }\n}\n\n","old_contents":"\n\/*\n * Copyright (C) 2011 Archie L. Cobbs and other authors. All rights reserved.\n *\n * $Id: ThreadConfigurableAspect.aj 282 2012-02-16 20:48:06Z archie.cobbs $\n *\/\n\npackage org.dellroad.stuff.spring;\n\nimport java.io.ObjectStreamException;\nimport java.io.Serializable;\n\nimport org.springframework.beans.factory.BeanFactory;\nimport org.springframework.beans.factory.aspectj.AbstractDependencyInjectionAspect;\nimport org.springframework.beans.factory.wiring.BeanConfigurerSupport;\nimport org.springframework.beans.factory.wiring.BeanWiringInfoResolver;\nimport org.springframework.context.ConfigurableApplicationContext;\n\n\/**\n * Aspect that autowires classes marked with the {@link ThreadConfigurable @ThreadConfigurable} annotation using\n * the Spring application context returned by {@link ThreadConfigurableContextHolder#get()}.\n *\n * <p>\n * This implementation is derived from Spring's {@code AnnotationBeanConfigurerAspect} implementation\n * and therefore shares its license (also Apache).\n * <\/p>\n *\n * @see ThreadConfigurable\n * @see ThreadConfigurableContextHolder\n *\/\npublic aspect ThreadConfigurableAspect extends AbstractConfigurableAspect {\n\n\/\/ Stuff copied from AbstractInterfaceDrivenDependencyInjectionAspect.aj\n\n    public pointcut beanConstruction(Object bean) :\n        initialization(ThreadConfigurableObject+.new(..)) && this(bean);\n\n    public pointcut beanDeserialization(Object bean) :\n        execution(Object ThreadConfigurableDeserializationSupport+.readResolve()) &&\n        this(bean);\n\n    public pointcut leastSpecificSuperTypeConstruction() : initialization(ThreadConfigurableObject.new(..));\n\n    declare parents: \n        ThreadConfigurableObject+ && Serializable+ implements ThreadConfigurableDeserializationSupport;\n\n    static interface ThreadConfigurableDeserializationSupport extends Serializable {\n    }\n\n    public Object ThreadConfigurableDeserializationSupport.readResolve() throws ObjectStreamException {\n        return this;\n    }\n\n\/\/ Stuff copied from AnnotationBeanConfigurerAspect.aj\n\n    public pointcut inConfigurableBean() : @this(ThreadConfigurable);\n\n    public pointcut preConstructionConfiguration() : preConstructionConfigurationSupport(*);\n\n    declare parents: @ThreadConfigurable * implements ThreadConfigurableObject;\n\n    private pointcut preConstructionConfigurationSupport(ThreadConfigurable c) : @this(c) && if(c.preConstruction());\n\n\tdeclare parents: @ThreadConfigurable Serializable+ implements ThreadConfigurableDeserializationSupport;\n\n\/\/ Our implementation\n\n    @Override\n    protected BeanFactory getBeanFactory(Object bean) {\n\n        \/\/ Get ThreadConfigurableContextHolder singleton\n        ThreadConfigurableContextHolder threadConfigurableContextHolder = ThreadConfigurableContextHolder.getInstance();\n        if (threadConfigurableContextHolder == null) {\n            if (this.log.isDebugEnabled()) {\n                this.log.debug(\"can't configure @\" + ThreadConfigurable.class.getName()\n                  + \"-annotated bean of type \" + bean.getClass().getName()\n                  + \" because the ThreadConfigurableContextHolder singleton instance has been set to null;\"\n                  + \" proceeding without injection\");\n            }\n            return null;\n        }\n\n        \/\/ Get ConfigurableApplicationContext\n        ConfigurableApplicationContext context = threadConfigurableContextHolder.get();\n        if (context == null) {\n            if (this.log.isDebugEnabled()) {\n                this.log.debug(\"can't configure @\" + ThreadConfigurable.class.getName()\n                  + \"-annotated bean of type \" + bean.getClass().getName()\n                  + \" because no ConfigurableApplicationContext has been configured for the current thread via \"\n                  + ThreadConfigurableContextHolder.class.getName() + \".set() nor has a default\"\n                  + \" ConfigurableApplicationContext has been set; proceeding without injection\");\n            }\n            return null;\n        }\n\n        \/\/ Return associated BeanFactory\n        return context.getBeanFactory();\n    }\n\n    @Override\n    protected BeanWiringInfoResolver getBeanWiringInfoResolver(Object bean) {\n        return new ThreadConfigurableBeanWiringInfoResolver();\n    }\n}\n\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"433cac7afbdce7786dda8305f1e49fe5e460d9f5","subject":"Clean","message":"Clean\n","repos":"awltech\/org.parallelj,christophe-w\/parallelj.runtime","old_file":"parallelj-launching\/src\/main\/java\/org\/parallelj\/launching\/errors\/ProceduresOnErrorManagement.aj","new_file":"parallelj-launching\/src\/main\/java\/org\/parallelj\/launching\/errors\/ProceduresOnErrorManagement.aj","new_contents":"package org.parallelj.launching.errors;\n\nimport java.lang.reflect.Field;\nimport java.lang.reflect.Method;\n\nimport org.parallelj.internal.MessageKind;\nimport org.parallelj.internal.kernel.KProcess;\nimport org.parallelj.internal.kernel.KProgram;\nimport org.parallelj.internal.kernel.procedure.CallableProcedure;\nimport org.parallelj.internal.kernel.procedure.RunnableProcedure;\nimport org.parallelj.launching.OnError;\n\nprivileged public aspect ProceduresOnErrorManagement {\n\n\tdeclare parents: org.parallelj.internal.kernel.KProgram implements IProceduresOnError;\n\n\t\/*\n\t * Add the interface IProceduresOnError to the KProgram\n\t*\/\n\tpublic Method IProceduresOnError.getterMethod;\n\tpublic String IProceduresOnError.fieldName;\n\tprivate boolean IProceduresOnError.isErrors=false;\n\tprivate boolean IProceduresOnError.isHandledErrors=false;\n\t\n\tpublic void IProceduresOnError.setGetterMethod(Method getterFieldMethod) {\n\t\tthis.getterMethod = getterFieldMethod;\n\t}\n\n\tpublic void IProceduresOnError.setFieldName(String fieldName) {\n\t\tthis.fieldName = fieldName;\n\t}\n\n\tpublic String IProceduresOnError.getFieldName() {\n\t\treturn this.fieldName;\n\t}\n\t\n\tpublic Method IProceduresOnError.getGetterMethod() {\n\t\treturn this.getterMethod;\n\t}\n\t\n\tpublic synchronized void IProceduresOnError.addProcedureInError(KProgram kprogram, Object program, Object procedure, Exception exception) {\n\t\tProceduresOnError obj;\n\t\t\n\t\tthis.isErrors=true;\n\t\tMethod method = ((IProceduresOnError)kprogram).getGetterMethod();\n\t\tif (method != null) {\n\t\t\ttry {\n\t\t\t\tobj = (ProceduresOnError)method.invoke(program, new Object[]{});\n\t\t\t\tif (obj==null) {\n\t\t\t\t\tobj = new ProceduresOnError();\n\t\t\t\t\tField field = program.getClass().getDeclaredField(((IProceduresOnError)kprogram).getFieldName());\n\t\t\t\t\tfield.setAccessible(true);\n\t\t\t\t\tfield.set(program, obj);\n\t\t\t\t}\n\t\t\t\tobj.addProcedureInError(procedure, exception);\n\t\t\t} catch (Exception e) {\n\t\t\t\te.printStackTrace();\n\t\t\t}\n\t\t}\n\t\t\n\t}\n\t\n\tpublic synchronized void IProceduresOnError.addProcedureHandledInError(KProgram kprogram, Object program, Object procedure, Exception exception) {\n\t\tProceduresOnError obj;\n\t\t\n\t\tthis.isHandledErrors=true;\n\t\tMethod method = ((IProceduresOnError)kprogram).getGetterMethod();\n\t\tif (method != null) {\n\t\t\ttry {\n\t\t\t\tobj = (ProceduresOnError)method.invoke(program, new Object[]{});\n\t\t\t\tif (obj==null) {\n\t\t\t\t\tobj = new ProceduresOnError();\n\t\t\t\t\tField field = program.getClass().getDeclaredField(((IProceduresOnError)kprogram).getFieldName());\n\t\t\t\t\tfield.setAccessible(true);\n\t\t\t\t\tfield.set(program, obj);\n\t\t\t\t}\n\t\t\t\tobj.addProcedureHandledInError(procedure, exception);\n\t\t\t} catch (Exception e) {\n\t\t\t\te.printStackTrace();\n\t\t\t}\n\t\t}\n\t\t\n\t}\n\t\n\tpublic synchronized ProceduresOnError IProceduresOnError.getAllProceduresInError(Object program) {\n\t\tProceduresOnError obj=null;\n\t\tif (this.getGetterMethod()!=null) {\n\t\t\ttry {\n\t\t\t\tobj = (ProceduresOnError)this.getGetterMethod().invoke(program, new Object[]{});\n\t\t\t} catch (Exception e) {\n\t\t\t\te.printStackTrace();\n\t\t\t}\n\t\t}\n\t\treturn obj; \n\t}\n\t\n\tpublic boolean IProceduresOnError.isError() {\n\t\treturn this.isErrors;\n\t}\n\t\n\tpublic boolean IProceduresOnError.isHandledError() {\n\t\treturn this.isHandledErrors;\n\t}\n\t\n    pointcut procsOnError(Object a): get(@OnError ProceduresOnError *.*) && this(a);\n    \n    before(Object procOnErrorField): procsOnError(procOnErrorField) {\n    }\n    \n\t\/*\n\t * Allow to get the procedures in error of a Process\n\t *\/\n\tpublic static synchronized ProceduresOnError getProceduresInErrors(\n\t\t\torg.parallelj.mirror.Process process) {\n\t\treturn ((IProceduresOnError)process.getProgram()).getAllProceduresInError(process.getContext());\n\t}\n\n\n\t\/\/ Interception around Runnable execution      \n\tvoid around(Object self): call(void complete())\n\t\t&& target(org.parallelj.internal.kernel.procedure.RunnableProcedure.RunnableCall)\n\t\t&& this(self)  {\n\t\t \n\t\tRunnableProcedure.RunnableCall runnable = (RunnableProcedure.RunnableCall)thisJoinPoint.getTarget();\n\t\tRunnableProcedure procedure = (RunnableProcedure)runnable.getProcedure();\n\t\tif (runnable.getException() != null) {\n\t\t\t\/\/ There is an error !!!\n\t\t\tKProcess process = runnable.getProcess();\n\t\t\tif(procedure.getHandler() == null) {\n\t\t\t\t((IProceduresOnError)process.getProgram()).addProcedureInError(process.getProgram(), process.getContext(), runnable.getContext(), runnable.getException());\n\t\t\t} else {\n\t\t\t\t((IProceduresOnError)process.getProgram()).addProcedureHandledInError(process.getProgram(), process.getContext(), runnable.getContext(), runnable.getException());\n\t\t\t}\n\t\t}\n\t\tproceed(self);\n\t}\n\n\t\/\/ Interception around Callable execution      \n\tvoid around(Object self): call(void complete())\n\t\t&& target(org.parallelj.internal.kernel.procedure.CallableProcedure.CallableCall)\n\t\t&& this(self)  {\n\n\t\tCallableProcedure.CallableCall callable = (CallableProcedure.CallableCall)thisJoinPoint.getTarget();\n\t\tCallableProcedure procedure = (CallableProcedure)callable.getProcedure(); \n\t\tif (callable.getException() != null) {\n\t\t\t\/\/ There is an error !!!\n\t\t\tKProcess process = callable.getProcess();\n\t\t\tif(procedure.getHandler() == null) {\n\t\t\t\t((IProceduresOnError)process.getProgram()).addProcedureInError(process.getProgram(), process.getContext(), callable.getContext(), callable.getException());\n\t\t\t} else {\n\t\t\t\t((IProceduresOnError)process.getProgram()).addProcedureHandledInError(process.getProgram(), process.getContext(), callable.getContext(), callable.getException());\t\t\t}\n\t\t}\n\t\tproceed(self);\n\t}\n\t\n\tboolean around(org.parallelj.internal.kernel.KJoin self, org.parallelj.internal.kernel.KProcess process)\n\t\t:execution(* org.parallelj.internal.kernel.KJoin+.isEnabled(..))\n\t\t&& this(self) && args(process)\n\t\t&& within(org.parallelj.internal.kernel.loop.KWhileLoop) {\n\t\t\n\t\ttry {\n\t\t\treturn proceed(self, process);\n\t\t} catch (Exception e) {\n\t\t\t((IProceduresOnError)process.getProgram()).addProcedureInError(process.getProgram(), process.getContext(), process.getContext(), e);\n\t\t\tMessageKind.E0005.format(process.getContext(), e);\n\t\t\treturn false;\n\t\t}\n\n\t}\n\t \n}\n","old_contents":"package org.parallelj.launching.errors;\n\nimport java.lang.reflect.Field;\nimport java.lang.reflect.Method;\n\nimport org.parallelj.internal.MessageKind;\nimport org.parallelj.internal.kernel.KCall;\nimport org.parallelj.internal.kernel.KJoin;\nimport org.parallelj.internal.kernel.KProcess;\nimport org.parallelj.internal.kernel.KProgram;\nimport org.parallelj.internal.kernel.KSplit;\nimport org.parallelj.internal.kernel.loop.KWhileLoop;\nimport org.parallelj.internal.kernel.procedure.CallableProcedure;\nimport org.parallelj.internal.kernel.procedure.RunnableProcedure;\nimport org.parallelj.launching.OnError;\nimport org.parallelj.launching.errors.IProceduresOnError;\n\nimport debug.Debug;\n\nprivileged public aspect ProceduresOnErrorManagement {\n\n\tdeclare parents: org.parallelj.internal.kernel.KProgram implements IProceduresOnError;\n\n\t\/*\n\t * Add the interface IProceduresOnError to the KProgram\n\t*\/\n\tpublic Method IProceduresOnError.getterMethod;\n\tpublic String IProceduresOnError.fieldName;\n\tprivate boolean IProceduresOnError.isErrors=false;\n\tprivate boolean IProceduresOnError.isHandledErrors=false;\n\t\n\tpublic void IProceduresOnError.setGetterMethod(Method getterFieldMethod) {\n\t\tthis.getterMethod = getterFieldMethod;\n\t}\n\n\tpublic void IProceduresOnError.setFieldName(String fieldName) {\n\t\tthis.fieldName = fieldName;\n\t}\n\n\tpublic String IProceduresOnError.getFieldName() {\n\t\treturn this.fieldName;\n\t}\n\t\n\tpublic Method IProceduresOnError.getGetterMethod() {\n\t\treturn this.getterMethod;\n\t}\n\t\n\tpublic synchronized void IProceduresOnError.addProcedureInError(KProgram kprogram, Object program, Object procedure, Exception exception) {\n\t\tProceduresOnError obj;\n\t\t\n\t\tthis.isErrors=true;\n\t\tMethod method = ((IProceduresOnError)kprogram).getGetterMethod();\n\t\tif (method != null) {\n\t\t\ttry {\n\t\t\t\tobj = (ProceduresOnError)method.invoke(program, new Object[]{});\n\t\t\t\tif (obj==null) {\n\t\t\t\t\tobj = new ProceduresOnError();\n\t\t\t\t\tField field = program.getClass().getDeclaredField(((IProceduresOnError)kprogram).getFieldName());\n\t\t\t\t\tfield.setAccessible(true);\n\t\t\t\t\tfield.set(program, obj);\n\t\t\t\t}\n\t\t\t\tobj.addProcedureInError(procedure, exception);\n\t\t\t} catch (Exception e) {\n\t\t\t\te.printStackTrace();\n\t\t\t}\n\t\t}\n\t\t\n\t}\n\t\n\tpublic synchronized void IProceduresOnError.addProcedureHandledInError(KProgram kprogram, Object program, Object procedure, Exception exception) {\n\t\tProceduresOnError obj;\n\t\t\n\t\tthis.isHandledErrors=true;\n\t\tMethod method = ((IProceduresOnError)kprogram).getGetterMethod();\n\t\tif (method != null) {\n\t\t\ttry {\n\t\t\t\tobj = (ProceduresOnError)method.invoke(program, new Object[]{});\n\t\t\t\tif (obj==null) {\n\t\t\t\t\tobj = new ProceduresOnError();\n\t\t\t\t\tField field = program.getClass().getDeclaredField(((IProceduresOnError)kprogram).getFieldName());\n\t\t\t\t\tfield.setAccessible(true);\n\t\t\t\t\tfield.set(program, obj);\n\t\t\t\t}\n\t\t\t\tobj.addProcedureHandledInError(procedure, exception);\n\t\t\t} catch (Exception e) {\n\t\t\t\te.printStackTrace();\n\t\t\t}\n\t\t}\n\t\t\n\t}\n\t\n\tpublic synchronized ProceduresOnError IProceduresOnError.getAllProceduresInError(Object program) {\n\t\tProceduresOnError obj=null;\n\t\tif (this.getGetterMethod()!=null) {\n\t\t\ttry {\n\t\t\t\tobj = (ProceduresOnError)this.getGetterMethod().invoke(program, new Object[]{});\n\t\t\t} catch (Exception e) {\n\t\t\t\te.printStackTrace();\n\t\t\t}\n\t\t}\n\t\treturn obj; \n\t}\n\t\n\tpublic boolean IProceduresOnError.isError() {\n\t\treturn this.isErrors;\n\t}\n\t\n\tpublic boolean IProceduresOnError.isHandledError() {\n\t\treturn this.isHandledErrors;\n\t}\n\t\n    pointcut procsOnError(Object a): get(@OnError ProceduresOnError *.*) && this(a);\n    \n    before(Object procOnErrorField): procsOnError(procOnErrorField) {\n    }\n    \n\t\/*\n\t * Allow to get the procedures in error of a Process\n\t *\/\n\tpublic static synchronized ProceduresOnError getProceduresInErrors(\n\t\t\torg.parallelj.mirror.Process process) {\n\t\treturn ((IProceduresOnError)process.getProgram()).getAllProceduresInError(process.getContext());\n\t}\n\n\n\t\/\/ Interception around Runnable execution      \n\tvoid around(Object self): call(void complete())\n\t\t&& target(org.parallelj.internal.kernel.procedure.RunnableProcedure.RunnableCall)\n\t\t&& this(self)  {\n\t\t \n\t\tRunnableProcedure.RunnableCall runnable = (RunnableProcedure.RunnableCall)thisJoinPoint.getTarget();\n\t\tRunnableProcedure procedure = (RunnableProcedure)runnable.getProcedure();\n\t\tif (runnable.getException() != null) {\n\t\t\t\/\/ There is an error !!!\n\t\t\tKProcess process = runnable.getProcess();\n\t\t\tif(procedure.getHandler() == null) {\n\t\t\t\t((IProceduresOnError)process.getProgram()).addProcedureInError(process.getProgram(), process.getContext(), runnable.getContext(), runnable.getException());\n\t\t\t} else {\n\t\t\t\t((IProceduresOnError)process.getProgram()).addProcedureHandledInError(process.getProgram(), process.getContext(), runnable.getContext(), runnable.getException());\n\t\t\t}\n\t\t}\n\t\tproceed(self);\n\t}\n\n\t\/\/ Interception around Callable execution      \n\tvoid around(Object self): call(void complete())\n\t\t&& target(org.parallelj.internal.kernel.procedure.CallableProcedure.CallableCall)\n\t\t&& this(self)  {\n\n\t\tCallableProcedure.CallableCall callable = (CallableProcedure.CallableCall)thisJoinPoint.getTarget();\n\t\tCallableProcedure procedure = (CallableProcedure)callable.getProcedure(); \n\t\tif (callable.getException() != null) {\n\t\t\t\/\/ There is an error !!!\n\t\t\tKProcess process = callable.getProcess();\n\t\t\tif(procedure.getHandler() == null) {\n\t\t\t\t((IProceduresOnError)process.getProgram()).addProcedureInError(process.getProgram(), process.getContext(), callable.getContext(), callable.getException());\n\t\t\t} else {\n\t\t\t\t((IProceduresOnError)process.getProgram()).addProcedureHandledInError(process.getProgram(), process.getContext(), callable.getContext(), callable.getException());\t\t\t}\n\t\t}\n\t\tproceed(self);\n\t}\n\t\n\tboolean around(org.parallelj.internal.kernel.KJoin self, org.parallelj.internal.kernel.KProcess process)\n\t\t:execution(* org.parallelj.internal.kernel.KJoin+.isEnabled(..))\n\t\t&& this(self) && args(process)\n\t\t&& within(org.parallelj.internal.kernel.loop.KWhileLoop) {\n\t\t\n\t\ttry {\n\t\t\treturn proceed(self, process);\n\t\t} catch (Exception e) {\n\t\t\t((IProceduresOnError)process.getProgram()).addProcedureInError(process.getProgram(), process.getContext(), process.getContext(), e);\n\t\t\tMessageKind.E0005.format(process.getContext(), e);\n\t\t\treturn false;\n\t\t}\n\n\t}\n\t \n}\n","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"52205838ca58546e6da49c5facecfe8423a27961","subject":"removed old renamed aspect","message":"removed old renamed aspect\n","repos":"palava\/palava-jpa-aspectj","old_file":"src\/main\/java\/de\/cosmocode\/palava\/jpa\/aspectj\/TransactionAspect.aj","new_file":"src\/main\/java\/de\/cosmocode\/palava\/jpa\/aspectj\/TransactionAspect.aj","new_contents":"","old_contents":"\/**\n * palava - a java-php-bridge\n * Copyright (C) 2007-2010  CosmoCode GmbH\n *\n * This program is free software; you can redistribute it and\/or\n * modify it under the terms of the GNU General Public License\n * as published by the Free Software Foundation; either version 2\n * of the License, or (at your option) any later version.\n *\n * This program is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n * along with this program; if not, write to the Free Software\n * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.\n *\/\n\npackage de.cosmocode.palava.jpa.aspectj;\n\nimport javax.persistence.EntityManager;\nimport javax.persistence.EntityTransaction;\nimport javax.persistence.PersistenceException;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\nimport de.cosmocode.palava.jpa.Transactional;\n\npublic final aspect TransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(TransactionAspect.class);\n\n    private Provider<EntityManager> currentManager;\n    \n    @Inject\n    public void setProvider(Provider<EntityManager> manager) {\n        this.currentManager = Preconditions.checkNotNull(manager, \"Manager\");\n    }\n    \n    pointcut transactional(): execution(@Transactional * *.*(..));\n\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        final EntityManager manager = currentManager.get();\n        LOG.trace(\"Retrieved entitymanager {}\", manager);\n        final EntityTransaction tx = manager.getTransaction();\n        LOG.trace(\"Using transaction {}\", tx);\n        final boolean localTx = !tx.isActive();\n        if (localTx) {\n            LOG.trace(\"Beginning automatic transaction\");\n            tx.begin();\n        } else {\n            LOG.trace(\"Transaction already active\");\n        }\n        \n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (RuntimeException e) {\n            LOG.error(\"Exception inside automatic transaction context\", e);\n            tx.rollback();\n            throw e;\n        }\n        \n        try {\n            if (localTx && tx.isActive()) {\n                tx.commit();\n                LOG.trace(\"Committed automatic transaction\");\n            }\n            return returnValue;\n        } catch (PersistenceException e) {\n            LOG.error(\"Commit in automatic transaction context failed\", e);\n            tx.rollback();\n            throw e;\n        }\n    }\n    \n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"2282589f609b684c06f87f1c213e8fb4ecb59252","subject":"Adding support for $proc (continued)","message":"Adding support for $proc (continued)\n","repos":"timmolderez\/adbc","old_file":"src\/be\/ac\/ua\/ansymo\/adbc\/aspects\/AspectContractEnforcer.aj","new_file":"src\/be\/ac\/ua\/ansymo\/adbc\/aspects\/AspectContractEnforcer.aj","new_contents":"\/**\n * Copyright (c) 2012 Tim Molderez.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the 3-Clause BSD License\n * which accompanies this distribution, and is available at\n * http:\/\/www.opensource.org\/licenses\/BSD-3-Clause\n *\/\n\npackage be.ac.ua.ansymo.adbc.aspects;\n\nimport java.lang.reflect.Method;\nimport java.util.Arrays;\nimport java.util.EmptyStackException;\nimport java.util.Vector;\n\nimport javax.script.ScriptException;\n\nimport org.aspectj.lang.JoinPoint;\nimport org.aspectj.lang.annotation.AdviceName;\nimport org.aspectj.lang.reflect.AdviceSignature;\nimport org.aspectj.lang.reflect.MethodSignature;\n\nimport be.ac.ua.ansymo.adbc.AdbcConfig;\nimport be.ac.ua.ansymo.adbc.annotations.advisedBy;\nimport be.ac.ua.ansymo.adbc.annotations.ensures;\nimport be.ac.ua.ansymo.adbc.annotations.invariant;\nimport be.ac.ua.ansymo.adbc.annotations.requires;\nimport be.ac.ua.ansymo.adbc.exceptions.InvariantException;\nimport be.ac.ua.ansymo.adbc.exceptions.PostConditionException;\nimport be.ac.ua.ansymo.adbc.exceptions.PreConditionException;\nimport be.ac.ua.ansymo.adbc.exceptions.SubstitutionException;\nimport be.ac.ua.ansymo.adbc.utilities.ContractInterpreter;\n\n\/**\n * This aspect enforces the contracts of all aspects in the application. \n * If a contract is broken, a ContractEnforcementException is thrown.\n * \n * @author Tim Molderez\n *\/\npublic aspect AspectContractEnforcer extends AbstractContractEnforcer {\n\tprivate JoinPoint tjp = null;\t\/\/ The thisjoinpoint object of the user-advice\n\tprivate String advKind;\t\t\t\/\/ User-advice kind (before, after around)\n\t\n\t\/\/ Contracts of the user-advice\n\tprotected String[] advPre;\n\tprotected String[] advPost;\n\tprotected String[] advInv;\n\t\n\tprivate String[] advBySuffix = null;\n\n\t\/**\n\t * Contract enforcer for advice\n\t *\/\n\tObject around(Object dyn): adviceexecution() && this(dyn) \n\t&& !within(be.ac.ua.ansymo.adbc.aspects.*) && excludeContractEnforcers() {\n\t\t\/* Very sensitive pointcut! Do not perform any method calls here besides preCheck() and postCheck() \n\t\t * or you'll trigger infinite pointcut matching! *\/\n\t\t\n\t\t\/\/ Retrieve the thisJoinPoint object of the user-advice\n\t\ttry {\n\t\t\t\/* Note that we're peeking into CallStack, not popping! Other contract enforcement\n\t\t\t * still need this top entry! *\/\n\t\t\ttjp = CallStack.peek();\n\t\t} catch (EmptyStackException e) {\n\t\t\t\/* In case the advice we've intercepted advises join points other than calls and executions,\n\t\t\t * there's not going to be an entry on the CallStack for it..\n\t\t\t * TODO: For now we don't support these kinds of advice yet.\n\t\t\t * Still need to figure out some way to get access to the join point they advise.. *\/\n\t\t\treturn proceed(dyn);\n\t\t}\n\t\t\n\t\ttry {\n\t\t\tpreCheck(thisJoinPoint, dyn);\n\t\t\tObject result = proceed(dyn);\n\t\t\tif (AdbcConfig.checkPostconditions) {\n\t\t\t\tpostCheck(thisJoinPoint,dyn, result);\n\t\t\t}\n\t\t\treturn result;\n\t\t} catch (ScriptException e) {\n\t\t\tthrow new RuntimeException(\"Failed to evaluate contract: \" + e.getMessage());\n\t\t}\n\t}\n\n\t\/*\n\t * Do the necessary preparation and\n\t * check all contracts before advice execution (preconditions, invariants, substitution principle)\n\t *\/\n\tprivate void preCheck(JoinPoint jp, Object dyn) throws ScriptException {\n\t\t\/* ****************************************************************\n\t\t * Fetching the necessary info...\n\t\t **************************************************************** *\/\n\t\t\n\t\t\/\/ Retrieve the join point advised by the user-advice \n\t\ttjp = CallStack.peek();\n\t\t\n\t\t\/\/ Retrieve the method being advised by the user-advice\n\t\tString m = tjp.getSignature().toString();\n\t\tint lastdot = m.lastIndexOf('.');\n\t\tm = m.substring(lastdot + 1, m.length());\n\t\tMethod mBody = ((MethodSignature) tjp.getSignature()).getMethod();\n\t\t\n\t\t\/\/ Retrieve the user-advice\n\t\tAdviceSignature aSig = (AdviceSignature) (jp.getSignature());\n\t\tMethod aBody = aSig.getAdvice();\n\t\t\n\t\t\/\/ Determine whether this advice is mentioned in an @advisedBy clause. And if so, which advice follow in that clause?\n\t\tboolean isAdvisedBy = isAdvisedBy(mBody, aBody);\n\t\t\n\t\t\/\/ Get the contracts of the user-advice's advised joinpoint\n\t\t\/\/ TODO: This currently does not work yet for higher-order advice..\n\t\tpre = new String[]{\"true\"};\n\t\tpost = new String[]{\"true\"};\n\t\tinv = new String[]{\"true\"};\n\t\t\n\t\tif (mBody.isAnnotationPresent(requires.class)) {\n\t\t\tpre = mBody.getAnnotation(requires.class).value();\n\t\t}\n\t\tif (mBody.isAnnotationPresent(ensures.class)) {\n\t\t\tpost = mBody.getAnnotation(ensures.class).value();\n\t\t}\n\t\tif (tjp.getTarget()!=null && tjp.getTarget().getClass().isAnnotationPresent(invariant.class)) {\n\t\t\tinv = tjp.getTarget().getClass().getAnnotation(invariant.class).value();\n\t\t}\n\t\t\n\t\t\/\/ Get the contracts of the user-advice itself\n\t\tadvPre = new String[]{\"true\"};\n\t\tadvPost = new String[]{\"true\"};\n\t\tadvInv = new String[]{\"true\"};\n\t\t\n\t\tif (AdbcConfig.checkSubstitutionPrinciple || isAdvisedBy) {\n\t\t\tif (aBody.isAnnotationPresent(requires.class)) {\n\t\t\t\tadvPre = aBody.getAnnotation(requires.class).value();\n\t\t\t}\n\t\t\tif (aBody.isAnnotationPresent(ensures.class)) {\n\t\t\t\tadvPost = aBody.getAnnotation(ensures.class).value();\n\t\t\t}\n\t\t\tif (dyn.getClass().isAnnotationPresent(invariant.class)) {\n\t\t\t\tadvInv = dyn.getClass().getAnnotation(invariant.class).value();\n\t\t\t}\n\t\t}\n\t\t\n\t\t\/\/ Determine user-advice kind (relying on its internal method name)\n\t\tadvKind = \"around\";\n\t\tif (aSig.getName().contains(\"$before$\")) {\n\t\t\tadvKind = \"before\";\n\t\t} else if (aSig.getName().contains(\"$after$\")) {\n\t\t\tadvKind = \"after\";\n\t\t}\n\t\t\n\t\t\/* ****************************************************************\n\t\t * Binding contract variables\n\t\t **************************************************************** *\/\n\t\t\n\t\t\/\/ Reset bindings\n\t\tceval = new ContractInterpreter();\n\t\t\n\t\t\/\/ Resolve the $proc keyword\n\t\tif(isAdvisedBy && advKind.equals(\"around\")) {\n\t\t\tpre = ceval.evalProc(advPre, pre);\n\t\t\tpost = ceval.evalProc(advPost, post);\n\t\t\t\n\t\t\tVector<String[]> advByPreSuffix = new Vector<String[]>();\n\t\t\tfor (String adv : advBySuffix) {\n\t\t\t\ttry {\n\t\t\t\t\tint separator = adv.lastIndexOf('.');\n\t\t\t\t\tString aspectName = adv.substring(0, separator);\n\t\t\t\t\tString adviceName = adv.substring(separator+1, adv.length());\n\t\t\t\t\t\n\t\t\t\t\tClass<?> asp = Class.forName(aspectName);\n\t\t\t\t\t\n\t\t\t\t} catch (ClassNotFoundException e) {e.printStackTrace();}\n\t\t\t}\n\t\t} else {\n\t\t\tpre = ceval.evalProc(advPre, pre);\n\t\t\tpost = ceval.evalProc(advPost, post);\n\t\t}\n\t\t\n\t\t\/\/ Evaluate calls to the $old() function in postconditions of advice\n\t\ttry {\n\t\t\tif (AdbcConfig.checkPostconditions) {\n\t\t\t\tceval.setThisBinding(jp.getThis());\n\t\t\t\tceval.setParameterBindings(aSig.getParameterNames(),jp.getArgs());\n\t\t\t\tadvPost = ceval.evalOldFunction(advPost);\n\t\t\t}\n\t\t} catch (ScriptException e) {\n\t\t\tthrow new RuntimeException(\"Failed to evaluate old() call: \" + e.getMessage());\n\t\t}\n\t\t\n\t\t\/\/ Bind parameter values of advised join point\n\t\tMethodSignature mSig = (MethodSignature) (tjp.getSignature());\n\t\tceval.setParameterBindings(mSig.getParameterNames(),tjp.getArgs());\n\t\t\n\t\t\/* ****************************************************************\n\t\t * Actual contract enforcement\n\t\t **************************************************************** *\/\n\t\t\n\t\t\/\/ Bind the \"this\" object\n\t\tceval.setThisBinding(tjp.getTarget());\n\t\t\n\t\t\/\/ Evaluate calls to the $old() function in postconditions of the advised join point\n\t\ttry {\n\t\t\tif (AdbcConfig.checkPostconditions) {\n\t\t\t\tpost = ceval.evalOldFunction(post);\n\t\t\t}\n\t\t} catch (ScriptException e) {\n\t\t\tthrow new RuntimeException(\"Failed to evaluate old() call: \" + e.getMessage());\n\t\t}\n\t\t\n\t\t\/\/ Test preconditions\n\t\tif (!advKind.equals(\"after\")) {\n\t\t\tString stPreFailed = ceval.evalContract(pre);\n\t\t\tif (stPreFailed != null) {\n\t\t\t\tthrow new PreConditionException(stPreFailed, getCaller());\n\t\t\t}\n\t\t}\n\t\t\n\t\t\/\/ Test invariants\n\t\tString invFailed = ceval.evalContract(inv);\n\t\tif (invFailed != null) {\n\t\t\tthrow new InvariantException(invFailed, getCaller(), \"precondition\");\n\t\t}\n\n\t\t\/\/ Test advice substitution, if applicable\n\t\tif (!isAdvisedBy && AdbcConfig.checkSubstitutionPrinciple) {\n\t\t\tceval.setThisBinding(jp.getThis());\n\t\t\tceval.setParameterBindings(aSig.getParameterNames(),jp.getArgs());\n\t\t\t\n\t\t\tString jpPreFailed = ceval.evalContract(advPre);\n\t\t\tif (jpPreFailed != null) {\n\t\t\t\tthrow new SubstitutionException(jpPreFailed, jp.getSignature().toString(), \"precondition too strong\");\n\t\t\t}\n\n\t\t\tinvFailed = ceval.evalContract(advInv);\n\t\t\tif (invFailed != null) {\n\t\t\t\tthrow new InvariantException(invFailed, jp.getSignature().toString(), \"invariant not preserved\");\n\t\t\t}\n\t\t}\n\t}\n\n\t\/**\n\t * Determine whether advice aBody appears in the advisedBy clause of method mBody (or the same method in an ancestor class)\n\t * @param mBody\n\t * @param aBody\n\t * @return\n\t *\/\n\tprivate boolean isAdvisedBy(Method mBody, Method aBody) {\n\t\tif (!aBody.isAnnotationPresent(AdviceName.class)) {\n\t\t\treturn false;\n\t\t}\n\t\t\n\t\tString advName = aBody.getAnnotation(AdviceName.class).value();\n\t\tClass<?> mClass = mBody.getDeclaringClass();\n\t\tClass<?>[] mParTypes = mBody.getParameterTypes();\n\t\tString mName = mBody.getName();\n\t\t\n\t\twhile(mClass!=null) {\n\t\t\ttry {\n\t\t\t\tmBody = mClass.getMethod(mName, mParTypes);\n\t\t\t\t\/\/ If there's an @advisedBy annotation, go check whether aBody is mentioned..\n\t\t\t\tif (mBody.isAnnotationPresent(advisedBy.class)) {\n\t\t\t\t\tString[] advBy = mBody.getAnnotation(advisedBy.class).value();\n\t\t\t\t\tint i=0;\n\t\t\t\t\tfor (String listedName : advBy) {\n\t\t\t\t\t\tif(listedName.equals(aBody.getDeclaringClass().getCanonicalName() + \".\" + advName)) {\n\t\t\t\t\t\t\tadvBySuffix = Arrays.copyOfRange(advBy, i, advBy.length);\n\t\t\t\t\t\t\treturn true;\n\t\t\t\t\t\t}\n\t\t\t\t\t\ti++;\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t} catch (Exception e) {\/* If the method is not found within mClass, do nothing.. *\/}\n\t\t\t\n\t\t\tmClass = mClass.getSuperclass();\n\t\t}\n\t\treturn false;\n\t}\n\n\t\/*\n\t * Check contracts after advice execution (postconditions, invariants, substitution principle)\n\t *\/\n\tprivate void postCheck(JoinPoint jp, Object dyn, Object result) throws ScriptException {\n\t\t\/\/ Bind the return value\n\t\tceval.setReturnValueBinding(result);\n\t\t\n\t\t\/\/ Bind the this object of the advised join point\n\t\tceval.setThisBinding(tjp.getTarget());\n\t\t\n\t\t\/\/ Test postconditions\n\t\tif (!advKind.equals(\"before\")) {\n\t\t\tString stPostFailed = ceval.evalContract(post);\n\t\t\tif (stPostFailed != null) {\n\t\t\t\tthrow new PostConditionException(stPostFailed, dyn.getClass()\n\t\t\t\t\t\t.toString());\n\t\t\t}\n\t\t}\n\t\t\n\t\t\/\/ Test invariants\n\t\tString invFailed = ceval.evalContract(inv);\n\t\tif (invFailed != null) {\n\t\t\tthrow new InvariantException(invFailed, dyn.getClass().toString(), \"postcondition\");\n\t\t}\n\n\t\t\/\/ Test advice substitution\n\t\tif (AdbcConfig.checkSubstitutionPrinciple) {\n\t\t\tceval.setThisBinding(jp.getThis());\n\t\t\t\n\t\t\tString jpPostFailed = ceval.evalContract(advPost);\n\t\t\tif (jpPostFailed != null) {\n\t\t\t\tthrow new SubstitutionException(jpPostFailed, jp.getSignature()\n\t\t\t\t\t\t.toString(), \"postcondition too weak\");\n\t\t\t}\n\n\t\t\tinvFailed = ceval.evalContract(advInv);\n\t\t\tif (invFailed != null) {\n\t\t\t\tthrow new InvariantException(invFailed, tjp.getTarget().toString(), \"invariant not preserved\");\n\t\t\t}\n\t\t}\n\t}\n\n\t\/*\n\t * Retrieve the caller of the user-advice\n\t *\/\n\tprivate String getCaller() {\n\t\t\/* Runtime stack at this point:\n\t\t * 0: getStackTrace()\n\t\t * 1: getCaller()\n\t\t * 2: preCheck()\n\t\t * 3: preCheck()\n\t\t * 4: around (contract enforcer)\n\t\t * 5: user-advice\n\t\t * 6: tjp\n\t\t * 7: caller <== This is what we're interested in..\t*\/\n\t\tStackTraceElement elem = Thread.currentThread().getStackTrace()[7];\n\t\treturn elem.toString();\n\t}\n}\n","old_contents":"\/**\n * Copyright (c) 2012 Tim Molderez.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the 3-Clause BSD License\n * which accompanies this distribution, and is available at\n * http:\/\/www.opensource.org\/licenses\/BSD-3-Clause\n *\/\n\npackage be.ac.ua.ansymo.adbc.aspects;\n\nimport java.lang.reflect.Method;\nimport java.util.EmptyStackException;\n\nimport javax.script.ScriptException;\n\nimport org.aspectj.lang.JoinPoint;\nimport org.aspectj.lang.annotation.AdviceName;\nimport org.aspectj.lang.reflect.AdviceSignature;\nimport org.aspectj.lang.reflect.MethodSignature;\n\nimport be.ac.ua.ansymo.adbc.AdbcConfig;\nimport be.ac.ua.ansymo.adbc.annotations.advisedBy;\nimport be.ac.ua.ansymo.adbc.annotations.ensures;\nimport be.ac.ua.ansymo.adbc.annotations.invariant;\nimport be.ac.ua.ansymo.adbc.annotations.requires;\nimport be.ac.ua.ansymo.adbc.exceptions.InvariantException;\nimport be.ac.ua.ansymo.adbc.exceptions.PostConditionException;\nimport be.ac.ua.ansymo.adbc.exceptions.PreConditionException;\nimport be.ac.ua.ansymo.adbc.exceptions.SubstitutionException;\nimport be.ac.ua.ansymo.adbc.utilities.ContractInterpreter;\n\n\/**\n * This aspect enforces the contracts of all aspects in the application. \n * If a contract is broken, a ContractEnforcementException is thrown.\n * \n * @author Tim Molderez\n *\/\npublic aspect AspectContractEnforcer extends AbstractContractEnforcer {\n\tprivate JoinPoint tjp = null;\t\/\/ The thisjoinpoint object of the user-advice\n\tprivate String advKind;\t\t\t\/\/ User-advice kind (before, after around)\n\t\n\t\/\/ Contracts of the user-advice\n\tprotected String[] advPre;\n\tprotected String[] advPost;\n\tprotected String[] advInv;\n\n\t\/**\n\t * Contract enforcer for advice\n\t *\/\n\tObject around(Object dyn): adviceexecution() && this(dyn) \n\t&& !within(be.ac.ua.ansymo.adbc.aspects.*) && excludeContractEnforcers() {\n\t\t\/* Very sensitive pointcut! Do not perform any method calls here besides preCheck() and postCheck() \n\t\t * or you'll trigger infinite pointcut matching! *\/\n\t\t\n\t\t\/\/ Retrieve the thisJoinPoint object of the user-advice\n\t\ttry {\n\t\t\t\/* Note that we're peeking into CallStack, not popping! Other contract enforcement\n\t\t\t * still need this top entry! *\/\n\t\t\ttjp = CallStack.peek();\n\t\t} catch (EmptyStackException e) {\n\t\t\t\/* In case the advice we've intercepted advises join points other than calls and executions,\n\t\t\t * there's not going to be an entry on the CallStack for it..\n\t\t\t * TODO: For now we don't support these kinds of advice yet.\n\t\t\t * Still need to figure out some way to get access to the join point they advise.. *\/\n\t\t\treturn proceed(dyn);\n\t\t}\n\t\t\n\t\ttry {\n\t\t\tpreCheck(thisJoinPoint, dyn);\n\t\t\tObject result = proceed(dyn);\n\t\t\tif (AdbcConfig.checkPostconditions) {\n\t\t\t\tpostCheck(thisJoinPoint,dyn, result);\n\t\t\t}\n\t\t\treturn result;\n\t\t} catch (ScriptException e) {\n\t\t\tthrow new RuntimeException(\"Failed to evaluate contract: \" + e.getMessage());\n\t\t}\n\t}\n\n\t\/*\n\t * Do the necessary preparation and\n\t * check all contracts before advice execution (preconditions, invariants, substitution principle)\n\t *\/\n\tprivate void preCheck(JoinPoint jp, Object dyn) throws ScriptException {\n\t\t\/* ****************************************************************\n\t\t * Fetching the necessary info...\n\t\t **************************************************************** *\/\n\t\t\n\t\t\/\/ Retrieve the join point advised by the user-advice \n\t\ttjp = CallStack.peek();\n\t\t\n\t\t\/\/ Retrieve the method being advised by the user-advice\n\t\tString m = tjp.getSignature().toString();\n\t\tint lastdot = m.lastIndexOf('.');\n\t\tm = m.substring(lastdot + 1, m.length());\n\t\tMethod mBody = ((MethodSignature) tjp.getSignature()).getMethod();\n\t\t\n\t\t\/\/ Retrieve the user-advice\n\t\tAdviceSignature aSig = (AdviceSignature) (jp.getSignature());\n\t\tMethod aBody = aSig.getAdvice();\n\t\t\n\t\t\/\/ Determine whether this advice is mentioned in an @advisedBy clause\n\t\tboolean isAdvisedBy = isAdvisedBy(mBody, aBody);\n\t\t\n\t\t\/\/ Get the contracts of the user-advice's advised joinpoint\n\t\t\/\/ TODO: This currently does not work yet for higher-order advice..\n\t\tpre = new String[]{\"true\"};\n\t\tpost = new String[]{\"true\"};\n\t\tinv = new String[]{\"true\"};\n\t\t\n\t\tif (mBody.isAnnotationPresent(requires.class)) {\n\t\t\tpre = mBody.getAnnotation(requires.class).value();\n\t\t}\n\t\tif (mBody.isAnnotationPresent(ensures.class)) {\n\t\t\tpost = mBody.getAnnotation(ensures.class).value();\n\t\t}\n\t\tif (tjp.getTarget()!=null && tjp.getTarget().getClass().isAnnotationPresent(invariant.class)) {\n\t\t\tinv = tjp.getTarget().getClass().getAnnotation(invariant.class).value();\n\t\t}\n\t\t\n\t\t\/\/ Get the contracts of the user-advice itself\n\t\tadvPre = new String[]{\"true\"};\n\t\tadvPost = new String[]{\"true\"};\n\t\tadvInv = new String[]{\"true\"};\n\t\t\n\t\tif (AdbcConfig.checkSubstitutionPrinciple || isAdvisedBy) {\n\t\t\tif (aBody.isAnnotationPresent(requires.class)) {\n\t\t\t\tadvPre = aBody.getAnnotation(requires.class).value();\n\t\t\t}\n\t\t\tif (aBody.isAnnotationPresent(ensures.class)) {\n\t\t\t\tadvPost = aBody.getAnnotation(ensures.class).value();\n\t\t\t}\n\t\t\tif (dyn.getClass().isAnnotationPresent(invariant.class)) {\n\t\t\t\tadvInv = dyn.getClass().getAnnotation(invariant.class).value();\n\t\t\t}\n\t\t}\n\t\t\n\t\t\/\/ Determine user-advice kind (relying on its internal method name)\n\t\tadvKind = \"around\";\n\t\tif (aSig.getName().contains(\"$before$\")) {\n\t\t\tadvKind = \"before\";\n\t\t} else if (aSig.getName().contains(\"$after$\")) {\n\t\t\tadvKind = \"after\";\n\t\t}\n\t\t\n\t\t\/* ****************************************************************\n\t\t * Binding contract variables\n\t\t **************************************************************** *\/\n\t\t\n\t\t\/\/ Reset bindings\n\t\tceval = new ContractInterpreter();\n\t\t\n\t\t\/\/ Resolve the $proc keyword\n\t\tif(isAdvisedBy && advKind.equals(\"around\")) {\n\t\t\tpre = ceval.evalProc(advPre, pre);\n\t\t\tpost = ceval.evalProc(advPost, post);\n\t\t} else {\n\t\t\t\n\t\t}\n\t\t\n\t\t\/\/ Evaluate calls to the $old() function in postconditions of advice\n\t\ttry {\n\t\t\tif (AdbcConfig.checkPostconditions) {\n\t\t\t\tceval.setThisBinding(jp.getThis());\n\t\t\t\tceval.setParameterBindings(aSig.getParameterNames(),jp.getArgs());\n\t\t\t\tadvPost = ceval.evalOldFunction(advPost);\n\t\t\t}\n\t\t} catch (ScriptException e) {\n\t\t\tthrow new RuntimeException(\"Failed to evaluate old() call: \" + e.getMessage());\n\t\t}\n\t\t\n\t\t\/\/ Bind parameter values of advised join point\n\t\tMethodSignature mSig = (MethodSignature) (tjp.getSignature());\n\t\tceval.setParameterBindings(mSig.getParameterNames(),tjp.getArgs());\n\t\t\n\t\t\/* ****************************************************************\n\t\t * Actual contract enforcement\n\t\t **************************************************************** *\/\n\t\t\n\t\t\/\/ Bind the \"this\" object\n\t\tceval.setThisBinding(tjp.getTarget());\n\t\t\n\t\t\/\/ Evaluate calls to the $old() function in postconditions of the advised join point\n\t\ttry {\n\t\t\tif (AdbcConfig.checkPostconditions) {\n\t\t\t\tpost = ceval.evalOldFunction(post);\n\t\t\t}\n\t\t} catch (ScriptException e) {\n\t\t\tthrow new RuntimeException(\"Failed to evaluate old() call: \" + e.getMessage());\n\t\t}\n\t\t\n\t\t\/\/ Test preconditions\n\t\tif (!advKind.equals(\"after\")) {\n\t\t\tString stPreFailed = ceval.evalContract(pre);\n\t\t\tif (stPreFailed != null) {\n\t\t\t\tthrow new PreConditionException(stPreFailed, getCaller());\n\t\t\t}\n\t\t}\n\t\t\n\t\t\/\/ Test invariants\n\t\tString invFailed = ceval.evalContract(inv);\n\t\tif (invFailed != null) {\n\t\t\tthrow new InvariantException(invFailed, getCaller(), \"precondition\");\n\t\t}\n\n\t\t\/\/ Test advice substitution, if applicable\n\t\tif (!isAdvisedBy && AdbcConfig.checkSubstitutionPrinciple) {\n\t\t\tceval.setThisBinding(jp.getThis());\n\t\t\tceval.setParameterBindings(aSig.getParameterNames(),jp.getArgs());\n\t\t\t\n\t\t\tString jpPreFailed = ceval.evalContract(advPre);\n\t\t\tif (jpPreFailed != null) {\n\t\t\t\tthrow new SubstitutionException(jpPreFailed, jp.getSignature().toString(), \"precondition too strong\");\n\t\t\t}\n\n\t\t\tinvFailed = ceval.evalContract(advInv);\n\t\t\tif (invFailed != null) {\n\t\t\t\tthrow new InvariantException(invFailed, jp.getSignature().toString(), \"invariant not preserved\");\n\t\t\t}\n\t\t}\n\t}\n\n\t\/**\n\t * Determine whether advice aBody appears in the advisedBy clause of method mBody (or the same method in an ancestor class)\n\t * @param mBody\n\t * @param aBody\n\t * @return\n\t *\/\n\tprivate boolean isAdvisedBy(Method mBody, Method aBody) {\n\t\tif (!aBody.isAnnotationPresent(AdviceName.class)) {\n\t\t\treturn false;\n\t\t}\n\t\t\n\t\tString advName = aBody.getAnnotation(AdviceName.class).value();\n\/\/\t\tSystem.out.println(advName + mBody);\n\t\tClass<?> mClass = mBody.getDeclaringClass();\n\t\tClass<?>[] mParTypes = mBody.getParameterTypes();\n\t\tString mName = mBody.getName();\n\t\t\n\t\t\n\t\twhile(mClass!=null) {\n\t\t\ttry {\n\t\t\t\tmBody = mClass.getMethod(mName, mParTypes);\n\t\t\t\t\/\/ If there's an @advisedBy annotation, go check whether aBody is mentioned..\n\t\t\t\tif (mBody.isAnnotationPresent(advisedBy.class)) {\n\t\t\t\t\tString[] advBy = mBody.getAnnotation(advisedBy.class).value();\n\t\t\t\t\tfor (String listedName : advBy) {\n\t\t\t\t\t\tif(listedName.equals(aBody.getDeclaringClass().getCanonicalName() + \".\" + advName)) {\n\t\t\t\t\t\t\treturn true;\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t} catch (Exception e) {\/* If the method is not found within mClass, do nothing.. *\/}\n\t\t\t\n\t\t\tmClass = mClass.getSuperclass();\n\t\t}\n\t\treturn false;\n\t}\n\n\t\/*\n\t * Check contracts after advice execution (postconditions, invariants, substitution principle)\n\t *\/\n\tprivate void postCheck(JoinPoint jp, Object dyn, Object result) throws ScriptException {\n\t\t\/\/ Bind the return value\n\t\tceval.setReturnValueBinding(result);\n\t\t\n\t\t\/\/ Bind the this object of the advised join point\n\t\tceval.setThisBinding(tjp.getTarget());\n\t\t\n\t\t\/\/ Test postconditions\n\t\tif (!advKind.equals(\"before\")) {\n\t\t\tString stPostFailed = ceval.evalContract(post);\n\t\t\tif (stPostFailed != null) {\n\t\t\t\tthrow new PostConditionException(stPostFailed, dyn.getClass()\n\t\t\t\t\t\t.toString());\n\t\t\t}\n\t\t}\n\t\t\n\t\t\/\/ Test invariants\n\t\tString invFailed = ceval.evalContract(inv);\n\t\tif (invFailed != null) {\n\t\t\tthrow new InvariantException(invFailed, dyn.getClass().toString(), \"postcondition\");\n\t\t}\n\n\t\t\/\/ Test advice substitution\n\t\tif (AdbcConfig.checkSubstitutionPrinciple) {\n\t\t\tceval.setThisBinding(jp.getThis());\n\t\t\t\n\t\t\tString jpPostFailed = ceval.evalContract(advPost);\n\t\t\tif (jpPostFailed != null) {\n\t\t\t\tthrow new SubstitutionException(jpPostFailed, jp.getSignature()\n\t\t\t\t\t\t.toString(), \"postcondition too weak\");\n\t\t\t}\n\n\t\t\tinvFailed = ceval.evalContract(advInv);\n\t\t\tif (invFailed != null) {\n\t\t\t\tthrow new InvariantException(invFailed, tjp.getTarget().toString(), \"invariant not preserved\");\n\t\t\t}\n\t\t}\n\t}\n\n\t\/*\n\t * Retrieve the caller of the user-advice\n\t *\/\n\tprivate String getCaller() {\n\t\t\/* Runtime stack at this point:\n\t\t * 0: getStackTrace()\n\t\t * 1: getCaller()\n\t\t * 2: preCheck()\n\t\t * 3: preCheck()\n\t\t * 4: around (contract enforcer)\n\t\t * 5: user-advice\n\t\t * 6: tjp\n\t\t * 7: caller <== This is what we're interested in..\t*\/\n\t\tStackTraceElement elem = Thread.currentThread().getStackTrace()[7];\n\t\treturn elem.toString();\n\t}\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"80c455f312db210dad581ae50042cc437dc56dbd","subject":"Fix LoggerCarrierAspect.aj","message":"Fix LoggerCarrierAspect.aj\n","repos":"inbloom\/secure-data-service,inbloom\/secure-data-service,inbloom\/secure-data-service,inbloom\/secure-data-service,inbloom\/secure-data-service","old_file":"sli\/ingestion\/ingestion-core\/src\/main\/java\/org\/slc\/sli\/aspect\/LoggerCarrierAspect.aj","new_file":"sli\/ingestion\/ingestion-core\/src\/main\/java\/org\/slc\/sli\/aspect\/LoggerCarrierAspect.aj","new_contents":"package org.slc.sli.aspect;\n\nimport java.util.HashMap;\nimport java.util.Map;\n\nimport org.slf4j.LoggerFactory;\nimport org.springframework.beans.factory.annotation.Value;\nimport org.springframework.data.mongodb.core.CollectionOptions;\nimport org.springframework.data.mongodb.core.MongoTemplate;\nimport org.slc.sli.domain.Entity;\nimport org.slc.sli.domain.Repository;\nimport org.slc.sli.dal.repository.MongoRepository;\n\nimport org.slc.sli.common.util.logging.SecurityEvent;\nimport org.slc.sli.common.util.logging.LoggerCarrier;\nimport org.slc.sli.common.util.tenantdb.TenantContext;\n\nimport com.mongodb.BasicDBObject;\nimport com.mongodb.DBObject;\n\npublic aspect LoggerCarrierAspect {\n\tdeclare parents : (org.slc.sli.ingestion..* &&\n            !java.lang.Enum+)  implements LoggerCarrier;\n    \n    private Repository<Entity> mongoEntityRepository;\n    \n    private MongoTemplate template;\n    \n    public MongoTemplate getTemplate() {\n    \treturn template;\n    }\n    \n    public void setTemplate(MongoTemplate template) {\n    \tthis.template = template;\n    }\n    \n    \n    @Value(\"${sli.ingestion.securityEvent.capSize}\")\n    private String capSize;\n    \n    public void LoggerCarrier.audit(SecurityEvent event) {\n        MongoRepository<Entity> mer = (MongoRepository<Entity>) LoggerCarrierAspect.aspectOf().getMongoEntityRepository();\n        if (mer != null) {\n            MongoTemplate mongoTemplate = mer.getTemplate();\n            String capSizeStr = LoggerCarrierAspect.aspectOf().getCapSize();\n            \n            if (capSizeStr != null && !capSizeStr.isEmpty()) {\n                int capSizeInt = Integer.parseInt(capSizeStr);\n                \/\/ UN: If the collection is not present, create the capped collection.\n                \/\/ However, if it is present and uncapped, change it to capped collection\n                \/\/ 496 bytes is size of 1 security event document * capsize ~ the size that we want.\n                if (!mongoTemplate.collectionExists(\"securityEvent\")) {\n                    CollectionOptions collectionOptions = new CollectionOptions(capSizeInt * 496, capSizeInt, true);\n                    mongoTemplate.createCollection(\"securityEvent\", collectionOptions);\n                } else {\n                    if (!mongoTemplate.getCollection(\"securityEvent\").isCapped()) {\n                        DBObject cmd = new BasicDBObject();\n                        cmd.put(\"convertToCapped\", \"securityEvent\");\n                        cmd.put(\"size\", capSizeInt * 496);\n                        mongoTemplate.getDb().command(cmd);\n                    }\n                }\n            }\n            \n            TenantContext.setIsSystemCall(true);\n            \n            Map<String, Object> metadata = new HashMap<String, Object>();\n            metadata.put(\"tenantId\", event.getTenantId());\n            mer.create(\"securityEvent\", event.getProperties(), metadata, \"securityEvent\");\n        } else {\n            LoggerFactory.getLogger(\"SecurityMonitor\").info(\"[Could not log SecurityEvent to mongo!]\");\n        }\n        \n        switch (event.getLogLevel()) {\n            case TYPE_DEBUG:\n                LoggerFactory.getLogger(\"SecurityMonitor\").debug(event.toString());\n                break;\n            \n            case TYPE_WARN:\n                LoggerFactory.getLogger(\"SecurityMonitor\").warn(event.toString());\n                break;\n            \n            case TYPE_INFO:\n                LoggerFactory.getLogger(\"SecurityMonitor\").info(event.toString());\n                break;\n            \n            case TYPE_ERROR:\n                LoggerFactory.getLogger(\"SecurityMonitor\").error(event.toString());\n                break;\n            \n            case TYPE_TRACE:\n                LoggerFactory.getLogger(\"SecurityMonitor\").trace(event.toString());\n                break;\n            \n            default:\n                LoggerFactory.getLogger(\"SecurityMonitor\").info(event.toString());\n                break;\n        }\n    }\n\n    public Repository<Entity> getMongoEntityRepository() {\n        return mongoEntityRepository;\n    }\n    \n    public void setMongoEntityRepository(Repository<Entity> mongoEntityRepository) {\n        this.mongoEntityRepository = mongoEntityRepository;\n    }\n\n    public String getCapSize() {\n        return capSize;\n    }\n    \n    public void setCapSize(String capSize) {\n        this.capSize = capSize;\n    }\n    \n}\n","old_contents":"package org.slc.sli.aspect;\n\nimport java.util.HashMap;\nimport java.util.Map;\n\nimport org.slf4j.LoggerFactory;\nimport org.springframework.beans.factory.annotation.Value;\nimport org.springframework.data.mongodb.core.CollectionOptions;\nimport org.springframework.data.mongodb.core.MongoTemplate;\nimport org.slc.sli.domain.Entity;\nimport org.slc.sli.domain.Repository;\nimport org.slc.sli.dal.repository.MongoRepository;\n\nimport org.slc.sli.common.util.logging.SecurityEvent;\nimport org.slc.sli.common.util.logging.LoggerCarrier;\nimport org.slc.sli.common.util.tenantdb.TenantContext;\n\nimport com.mongodb.BasicDBObject;\nimport com.mongodb.DBObject;\n\npublic aspect LoggerCarrierAspect {\n\tdeclare parents : (org.slc.sli.ingestion..* &&\n            !java.lang.Enum+)  implements LoggerCarrier;\n    \n    private Repository<Entity> mongoEntityRepository;\n    \n    @Value(\"${sli.ingestion.securityEvent.capSize}\")\n    private String capSize;\n    \n    public void LoggerCarrier.audit(SecurityEvent event) {\n        MongoRepository<Entity> mer = (MongoRepository<Entity>) LoggerCarrierAspect.aspectOf().getMongoEntityRepository();\n        if (mer != null) {\n            MongoTemplate mongoTemplate = mer.getTemplate();\n            String capSizeStr = LoggerCarrierAspect.aspectOf().getCapSize();\n            \n            if (capSizeStr != null && !capSizeStr.isEmpty()) {\n                int capSizeInt = Integer.parseInt(capSizeStr);\n                \/\/ UN: If the collection is not present, create the capped collection.\n                \/\/ However, if it is present and uncapped, change it to capped collection\n                \/\/ 496 bytes is size of 1 security event document * capsize ~ the size that we want.\n                if (!mongoTemplate.collectionExists(\"securityEvent\")) {\n                    CollectionOptions collectionOptions = new CollectionOptions(capSizeInt * 496, capSizeInt, true);\n                    mongoTemplate.createCollection(\"securityEvent\", collectionOptions);\n                } else {\n                    if (!mongoTemplate.getCollection(\"securityEvent\").isCapped()) {\n                        DBObject cmd = new BasicDBObject();\n                        cmd.put(\"convertToCapped\", \"securityEvent\");\n                        cmd.put(\"size\", capSizeInt * 496);\n                        mongoTemplate.getDb().command(cmd);\n                    }\n                }\n            }\n            \n            TenantContext.setIsSystemCall(true);\n            \n            Map<String, Object> metadata = new HashMap<String, Object>();\n            metadata.put(\"tenantId\", event.getTenantId());\n            mer.create(\"securityEvent\", event.getProperties(), metadata, \"securityEvent\");\n        } else {\n            LoggerFactory.getLogger(\"SecurityMonitor\").info(\"[Could not log SecurityEvent to mongo!]\");\n        }\n        \n        switch (event.getLogLevel()) {\n            case TYPE_DEBUG:\n                LoggerFactory.getLogger(\"SecurityMonitor\").debug(event.toString());\n                break;\n            \n            case TYPE_WARN:\n                LoggerFactory.getLogger(\"SecurityMonitor\").warn(event.toString());\n                break;\n            \n            case TYPE_INFO:\n                LoggerFactory.getLogger(\"SecurityMonitor\").info(event.toString());\n                break;\n            \n            case TYPE_ERROR:\n                LoggerFactory.getLogger(\"SecurityMonitor\").error(event.toString());\n                break;\n            \n            case TYPE_TRACE:\n                LoggerFactory.getLogger(\"SecurityMonitor\").trace(event.toString());\n                break;\n            \n            default:\n                LoggerFactory.getLogger(\"SecurityMonitor\").info(event.toString());\n                break;\n        }\n    }\n\n    public Repository<Entity> getMongoEntityRepository() {\n        return mongoEntityRepository;\n    }\n    \n    public void setMongoEntityRepository(Repository<Entity> mongoEntityRepository) {\n        this.mongoEntityRepository = mongoEntityRepository;\n    }\n\n    public String getCapSize() {\n        return capSize;\n    }\n    \n    public void setCapSize(String capSize) {\n        this.capSize = capSize;\n    }\n    \n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"0d9404151049dbf60a41bfe6dcf131ef67c012d1","subject":"added sneaky throws hack","message":"added sneaky throws hack\n","repos":"palava\/palava-jpa-aspectj","old_file":"src\/main\/java\/de\/cosmocode\/palava\/jpa\/aspectj\/EntityTransactionAspect.aj","new_file":"src\/main\/java\/de\/cosmocode\/palava\/jpa\/aspectj\/EntityTransactionAspect.aj","new_contents":"\/**\n * Copyright 2010 CosmoCode GmbH\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage de.cosmocode.palava.jpa.aspectj;\n\nimport javax.persistence.EntityManager;\nimport javax.persistence.EntityTransaction;\nimport javax.persistence.PersistenceException;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.gag.annotation.remark.Hack;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\nimport de.cosmocode.palava.jpa.Transactional;\n\npublic final aspect EntityTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(EntityTransactionAspect.class);\n\n    private Provider<EntityManager> currentManager;\n    \n    @Inject\n    public void setProvider(Provider<EntityManager> manager) {\n        this.currentManager = Preconditions.checkNotNull(manager, \"Manager\");\n    }\n    \n    pointcut transactional(): execution(@Transactional * *.*(..));\n\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        final EntityManager manager = currentManager.get();\n        LOG.trace(\"Retrieved entitymanager {}\", manager);\n        final EntityTransaction tx = manager.getTransaction();\n        LOG.trace(\"Using transaction {}\", tx);\n        \n        final boolean local = !tx.isActive();\n        \n        if (local) {\n            LOG.debug(\"Beginning automatic transaction {}\", tx);\n            tx.begin();\n        } else {\n            LOG.trace(\"Transaction {} already active\", tx);\n        }\n        \n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (Exception e) {\n            try {\n                if (local && (tx.isActive() || tx.getRollbackOnly())) {\n                    LOG.info(\"Rolling back local\/active transaction {}\", tx);\n                    tx.rollback();\n                } else if (!tx.getRollbackOnly()) {\n                    LOG.debug(\"Setting transaction {} as rollback only\", tx);\n                    tx.setRollbackOnly();\n                }\n            } catch (PersistenceException inner) {\n                LOG.error(\"Rollback failed\", inner);\n            }\n            \n            \/\/ hack to support throwing checked exceptions\n            return sneakyThrow(e);\n        }\n        \n        if (local && tx.isActive()) {\n            if (tx.getRollbackOnly()) {\n                LOG.debug(\"Rolling back marked transaction {}\", tx);\n                tx.rollback();\n            } else {\n                try {\n                    tx.commit();\n                    LOG.trace(\"Committed automatic transaction {}\", tx);\n                } catch (PersistenceException e) {\n                    try {\n                        LOG.info(\"Rolling back transaction {}\", tx);\n                        tx.rollback();\n                    } catch (PersistenceException inner) {\n                        LOG.error(\"Rollback failed\", inner);\n                    }\n                    throw e;\n                }\n            }\n        } else {\n            LOG.trace(\"Not committing non-local transaction {}\", tx);\n        }\n        \n        return returnValue;\n    }\n    \n    @Hack(\"Why is this possible?\")\n    private Object sneakyThrow(Throwable t) {\n        this.<RuntimeException>doSneakyThrow(t);\n        return null;\n    }\n\n    @SuppressWarnings(\"unchecked\")\n    private <T extends Throwable> T doSneakyThrow(Throwable t) throws T {\n        throw (T) t;\n    }\n    \n}\n","old_contents":"\/**\n * Copyright 2010 CosmoCode GmbH\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage de.cosmocode.palava.jpa.aspectj;\n\nimport javax.persistence.EntityManager;\nimport javax.persistence.EntityTransaction;\nimport javax.persistence.PersistenceException;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\nimport de.cosmocode.palava.jpa.Transactional;\n\npublic final aspect EntityTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(EntityTransactionAspect.class);\n\n    private Provider<EntityManager> currentManager;\n    \n    @Inject\n    public void setProvider(Provider<EntityManager> manager) {\n        this.currentManager = Preconditions.checkNotNull(manager, \"Manager\");\n    }\n    \n    pointcut transactional(): execution(@Transactional * *.*(..));\n\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        final EntityManager manager = currentManager.get();\n        LOG.trace(\"Retrieved entitymanager {}\", manager);\n        final EntityTransaction tx = manager.getTransaction();\n        LOG.trace(\"Using transaction {}\", tx);\n        final boolean localTx = !tx.isActive();\n        \n        if (localTx) {\n            LOG.trace(\"Beginning automatic transaction {}\", tx);\n            tx.begin();\n        } else {\n            LOG.trace(\"Transaction {} already active\", tx);\n        }\n        \n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (RuntimeException e) {\n            LOG.debug(\"Exception inside automatic transaction context; rolling back\", e);\n            tx.rollback();\n            throw e;\n        }\n        \n        if (localTx && tx.isActive()) {\n            if (tx.getRollbackOnly()) {\n                LOG.debug(\"Transaction {} was marked as rollback only. Rolling back...\", tx);\n                tx.rollback();\n            } else {\n                try {\n                    tx.commit();\n                    LOG.trace(\"Committed automatic transaction {}\", tx);\n                } catch (PersistenceException e) {\n                    LOG.debug(\"Commit in automatic transaction context failed\", e);\n                    if (tx.isActive()) {\n                        LOG.debug(\"Rolling back {}\", tx);\n                        try {\n                            tx.rollback();\n                        } catch (PersistenceException e2) {\n                            LOG.error(\"Commit in automatic transaction context failed\", e);\n                            throw e2;\n                        }\n                    } else {\n                        LOG.debug(\"Can't roll back inactive transaction {}\", tx);\n                    }\n                    throw e;\n                }\n            }\n        } else {\n            LOG.trace(\"Not committing non-local transaction {}\", tx);\n        }\n        \n        return returnValue;\n    }\n    \n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"f5cc99e2373f61ef1bfc516e9dbebec287cf4eff","subject":"refactor StatOverallTxt","message":"refactor StatOverallTxt\n","repos":"stieglma\/Schafkopfauswerter","old_file":"src\/StatOverallTxt.aj","new_file":"src\/StatOverallTxt.aj","new_contents":"import java.awt.GridLayout;\n\nimport javax.swing.JPanel;\nimport javax.swing.JTabbedPane;\nimport javax.swing.JTextArea;\n\nimport view.GUI;\nimport view.UIUpdater;\nimport model.db.GameData;\nimport model.SystemValues.WIN;\nimport model.db.DataObject;\n\npublic privileged aspect StatOverallTxt {\n\n    private static GUI gui;\n    private static JPanel panel = new JPanel();\n    private static JTextArea statText = new JTextArea();\n\n    after() returning(GUI gui): call(GUI.new(*)) {\n        StatOverallTxt.gui = gui;\n    }\n\n    after(JTabbedPane tabbedPane): \n\t\t\texecution(public static void StatisticsHelper.StatisticsPaneCreated(JTabbedPane))\n\t\t\t&& args(tabbedPane) {\n        statText.setEditable(false);\n        panel.setLayout(new GridLayout(0, 1));\n        panel.add(statText);\n        ((JTabbedPane) tabbedPane).addTab(\"OverallText\", panel);\n    }\n\n    after() : execution(* UIUpdater.run()) {\n        statText.setText(getOverallStatisticsString());\n    }\n\n    public String getOverallStatisticsString() {\n        OverallStatistics data = gui.model.getGameData().getOverallStatistics();\n\n        int anzahlSpieleGesamt = data.getAnzahlSpieleGesamt();\n        int anzahlSpieleGesamtGewonnen = data.getAnzahlSpieleGesamtGewonnen();\n        int teuerstesRufspiel = data.getTeuerstesRufspiel();\n        int teuerstesSolo = data.getTeuerstesSolo();\n        int teuerstesSoloTout = data.getTeuerstesSoloTout();\n        int teuerstesSoloSie = data.getTeuerstesSoloSie();\n        int anzahlRufspiele = data.getAnzahlRufspiele();\n        int anzahlSoli = data.getAnzahlSoli();\n        int anzahlSoliTout = data.getAnzahlSoliTout();\n        int anzahlSoliSie = data.getAnzahlSoliSie();\n        int anzahlSoliGesamt = data.getAnzahlSoliGesamt();\n        int anzahlGewonneneSoliGesamt = data.getAnzahlGewonneneSoliGesamt();\n        int anzahlGewonneneRufspiele = data.getAnzahlGewonneneRufspiele();\n        int anzahlGewonneneSoli = data.getAnzahlGewonneneSoli();\n        int anzahlGewonneneSoliTout = data.getAnzahlGewonneneSoliTout();\n        int anzahlGewonneneSoliSie = data.getAnzahlGewonneneSoliSie();\n        int anzahlWeiter = data.getAnzahlWeiter();\n\n        double sologesamtwin = (anzahlSoliGesamt) > 0 ? ((double) (anzahlGewonneneSoliGesamt) \/ (anzahlSoliGesamt))\n                : 0;\n\n        return \"#Spiele (ohne weiter): \"\n                + anzahlSpieleGesamt\n                + \" (gewonnen: \"\n                + String.format(\"%.2f\",\n                        (anzahlSpieleGesamt > 0 ? anzahlSpieleGesamtGewonnen\n                                \/ ((double) anzahlSpieleGesamt) : 0) * 100)\n                + \"%)\\n\"\n                + \"#Rufspiele: \"\n                + anzahlRufspiele\n                + \" (gewonnen: \"\n                + String.format(\"%.2f\",\n                        (anzahlRufspiele > 0 ? anzahlGewonneneRufspiele\n                                \/ ((double) anzahlRufspiele) : 0) * 100)\n                + \"%)\\n\"\n                + \"          -> teurstes Rufspiel: \"\n                + teuerstesRufspiel\n                + \"\\n\"\n                + \"#Soli gesamt: \"\n                + (anzahlSoli + anzahlSoliTout + anzahlSoliSie)\n                + \" (gewonnen: \"\n                + String.format(\"%.2f\", sologesamtwin * 100)\n                + \"%)\\n\"\n                + \"#Soli normal: \"\n                + anzahlSoli\n                + \" (gewonnen: \"\n                + String.format(\"%.2f\", (anzahlSoli > 0 ? anzahlGewonneneSoli\n                        \/ ((double) anzahlSoli) : 0) * 100)\n                + \"%)\\n\"\n                + \"            -> teurstes Solo: \"\n                + teuerstesSolo\n                + \"\\n\"\n                + \"#Solo Tout: \"\n                + anzahlSoliTout\n                + \" (gewonnen: \"\n                + String.format(\"%.2f\",\n                        (anzahlSoliTout > 0 ? anzahlGewonneneSoliTout\n                                \/ ((double) anzahlSoliTout) : 0) * 100)\n                + \"%)\\n\"\n                + \"          -> teurstes Solo Tout: \"\n                + teuerstesSoloTout\n                + \"\\n\"\n                + \"#Solo Sie: \"\n                + anzahlSoliSie\n                + \" (gewonnen: \"\n                + String.format(\"%.2f\",\n                        (anzahlSoliSie > 0 ? anzahlGewonneneSoliSie\n                                \/ ((double) anzahlSoliSie) : 0) * 100) + \"%)\\n\"\n                + \"         -> teurstes Solo Sie: \" + teuerstesSoloSie + \"\\n\"\n                + \"#Weiter: \" + anzahlWeiter;\n    }\n\n    public OverallStatistics GameData.getOverallStatistics() {\n        int anzahlSpieleGesamt = 0;\n        int anzahlSpieleGesamtGewonnen = 0;\n        int teuerstesRufspiel = 0;\n        int teuerstesSolo = 0;\n        int teuerstesSoloTout = 0;\n        int teuerstesSoloSie = 0;\n        int anzahlRufspiele = 0;\n        int anzahlSoli = 0;\n        int anzahlSoliTout = 0;\n        int anzahlSoliSie = 0;\n        int anzahlSoliGesamt = 0;\n        int anzahlGewonneneSoliGesamt = 0;\n        int anzahlGewonneneRufspiele = 0;\n        int anzahlGewonneneSoli = 0;\n        int anzahlGewonneneSoliTout = 0;\n        int anzahlGewonneneSoliSie = 0;\n        int anzahlWeiter = -1;\n\n        for (DataObject obj : data) {\n            switch (obj.getGameKind()) {\n            case RUFSPIEL:\n                anzahlRufspiele++;\n                anzahlSpieleGesamt++;\n                if (obj.getGameWon() == WIN.PLAYER) {\n                    anzahlGewonneneRufspiele++;\n                    anzahlSpieleGesamtGewonnen++;\n                }\n                if (obj.getGameValue() > teuerstesRufspiel) {\n                    teuerstesRufspiel = obj.getGameValue();\n                }\n                break;\n            case SOLO:\n                anzahlSoli++;\n                anzahlSpieleGesamt++;\n                if (obj.getGameWon() == WIN.PLAYER) {\n                    anzahlGewonneneSoli++;\n                    anzahlSpieleGesamtGewonnen++;\n                }\n                if (obj.getGameValue() > teuerstesSolo) {\n                    teuerstesSolo = obj.getGameValue();\n                }\n                break;\n            case TOUT:\n                anzahlSpieleGesamt++;\n                if (obj.getGameWon() == WIN.PLAYER) {\n                    anzahlGewonneneSoliTout++;\n                    anzahlSpieleGesamtGewonnen++;\n                }\n                if (obj.getGameValue() > teuerstesSoloTout) {\n                    teuerstesSoloTout = obj.getGameValue();\n                }\n                anzahlSoliTout++;\n                break;\n            case SIE:\n                anzahlSpieleGesamt++;\n                if (obj.getGameWon() == WIN.PLAYER) {\n                    anzahlGewonneneSoliSie++;\n                    anzahlSpieleGesamtGewonnen++;\n                }\n                anzahlSoliSie++;\n                if (obj.getGameValue() > teuerstesSoloSie) {\n                    teuerstesSoloSie = obj.getGameValue();\n                }\n                break;\n            case WEITER:\n                anzahlWeiter++;\n                break;\n            case NONE: \/\/ nothing to do here\n                break;\n            default: \/\/ here neither\n                break;\n            }\n        }\n\n        anzahlSoliGesamt = anzahlSoli + anzahlSoliTout + anzahlSoliSie;\n        anzahlGewonneneSoliGesamt = anzahlGewonneneSoli\n                + anzahlGewonneneSoliSie + anzahlGewonneneSoliTout;\n\n        return new OverallStatistics(anzahlSpieleGesamt,\n                anzahlSpieleGesamtGewonnen, anzahlRufspiele,\n                anzahlGewonneneRufspiele, anzahlSoli, anzahlGewonneneSoli,\n                anzahlSoliTout, anzahlGewonneneSoliTout, anzahlSoliSie,\n                anzahlGewonneneSoliSie, anzahlSoliGesamt,\n                anzahlGewonneneSoliGesamt, anzahlWeiter, teuerstesRufspiel,\n                teuerstesSolo, teuerstesSoloTout, teuerstesSoloSie);\n    }\n}\n\nclass OverallStatistics {\n\n    private int anzahlSpieleGesamt;\n    private int anzahlSpieleGesamtGewonnen;\n    private int anzahlRufspiele;\n    private int anzahlGewonneneRufspiele;\n    private int anzahlSoli;\n    private int anzahlGewonneneSoli;\n    private int anzahlSoliTout;\n    private int anzahlGewonneneSoliTout;\n    private int anzahlSoliSie;\n    private int anzahlGewonneneSoliSie;\n    private int anzahlSoliGesamt;\n    private int anzahlGewonneneSoliGesamt;\n    private int anzahlWeiter;\n    private int teuerstesRufspiel = 0;\n    private int teuerstesSolo = 0;\n    private int teuerstesSoloTout = 0;\n    private int teuerstesSoloSie = 0;\n\n    public OverallStatistics(int anzahlSpieleGesamt,\n            int anzahlSpieleGesamtGewonnen, int anzahlRufspiele,\n            int anzahlGewonneneRufspiele, int anzahlSoli,\n            int anzahlGewonneneSoli, int anzahlSoliTout,\n            int anzahlGewonneneSoliTout, int anzahlSoliSie,\n            int anzahlGewonneneSoliSie, int anzahlSoliGesamt,\n            int anzahlGewonneneSoliGesamt, int anzahlWeiter,\n            int teuerstesRufspiel, int teuerstesSolo, int teuerstesSoloTout,\n            int teuerstesSoloSie) {\n        this.anzahlSpieleGesamt = anzahlSpieleGesamt;\n        this.anzahlSpieleGesamtGewonnen = anzahlSpieleGesamtGewonnen;\n        this.anzahlRufspiele = anzahlRufspiele;\n        this.anzahlGewonneneRufspiele = anzahlGewonneneRufspiele;\n        this.anzahlSoli = anzahlSoli;\n        this.anzahlGewonneneSoli = anzahlGewonneneSoli;\n        this.anzahlSoliTout = anzahlSoliTout;\n        this.anzahlGewonneneSoliTout = anzahlGewonneneSoliTout;\n        this.anzahlSoliSie = anzahlSoliSie;\n        this.anzahlGewonneneSoliSie = anzahlGewonneneSoliSie;\n        this.anzahlSoliGesamt = anzahlSoliGesamt;\n        this.anzahlGewonneneSoliGesamt = anzahlGewonneneSoliGesamt;\n        this.anzahlWeiter = anzahlWeiter;\n        this.teuerstesRufspiel = teuerstesRufspiel;\n        this.teuerstesSolo = teuerstesSolo;\n        this.teuerstesSoloTout = teuerstesSoloTout;\n        this.teuerstesSoloSie = teuerstesSoloSie;\n    }\n\n    public int getAnzahlSpieleGesamt() {\n        return anzahlSpieleGesamt;\n    }\n\n    public int getAnzahlSpieleGesamtGewonnen() {\n        return anzahlSpieleGesamtGewonnen;\n    }\n\n    public int getAnzahlRufspiele() {\n        return anzahlRufspiele;\n    }\n\n    public int getAnzahlGewonneneRufspiele() {\n        return anzahlGewonneneRufspiele;\n    }\n\n    public int getAnzahlSoli() {\n        return anzahlSoli;\n    }\n\n    public int getAnzahlGewonneneSoli() {\n        return anzahlGewonneneSoli;\n    }\n\n    public int getAnzahlSoliTout() {\n        return anzahlSoliTout;\n    }\n\n    public int getAnzahlGewonneneSoliTout() {\n        return anzahlGewonneneSoliTout;\n    }\n\n    public int getAnzahlSoliSie() {\n        return anzahlSoliSie;\n    }\n\n    public int getAnzahlGewonneneSoliSie() {\n        return anzahlGewonneneSoliSie;\n    }\n\n    public int getAnzahlSoliGesamt() {\n        return anzahlSoliGesamt;\n    }\n\n    public int getAnzahlGewonneneSoliGesamt() {\n        return anzahlGewonneneSoliGesamt;\n    }\n\n    public int getAnzahlWeiter() {\n        return anzahlWeiter;\n    }\n\n    public int getTeuerstesRufspiel() {\n        return teuerstesRufspiel;\n    }\n\n    public int getTeuerstesSolo() {\n        return teuerstesSolo;\n    }\n\n    public int getTeuerstesSoloTout() {\n        return teuerstesSoloTout;\n    }\n\n    public int getTeuerstesSoloSie() {\n        return teuerstesSoloSie;\n    }\n}\n","old_contents":"import java.awt.GridLayout;\n\nimport javax.swing.JPanel;\nimport javax.swing.JTabbedPane;\nimport javax.swing.JTextArea;\n\nimport view.GUI;\nimport view.UIUpdater;\nimport model.db.GameData;\nimport model.SystemValues.WIN;\nimport model.db.DataObject;\n\npublic privileged aspect StatOverallTxt {\n\n    private static GUI gui;\n    private static JPanel panel = new JPanel();\n    private static JTextArea statText = new JTextArea();\n\n    after() returning(GUI gui): call(GUI.new(*)) {\n        StatOverallTxt.gui = gui;\n    }\n\n    after(JTabbedPane tabbedPane): \n\t\t\texecution(public static void StatisticsHelper.StatisticsPaneCreated(JTabbedPane))\n\t\t\t&& args(tabbedPane) {\n        statText.setEditable(false);\n        panel.setLayout(new GridLayout(0, 1));\n        panel.add(statText);\n        ((JTabbedPane) tabbedPane).addTab(\"OverallText\", panel);\n    }\n\n    after() : execution(* UIUpdater.run()) {\n        statText.setText(gui.model.getGameData().getOverallStatisticsString());\n    }\n\n    public String GameData.getOverallStatisticsString() {\n        int anzahlSpieleGesamt = 0;\n        int anzahlSpieleGesamtGewonnen = 0;\n        int teuerstesRufspiel = 0;\n        int teuerstesSolo = 0;\n        int teuerstesSoloTout = 0;\n        int teuerstesSoloSie = 0;\n        int anzahlRufspiele = 0;\n        int anzahlSolo = 0;\n        int anzahlSoloTout = 0;\n        int anzahlSoloSie = 0;\n        int anzahlGewonneneRufspiele = 0;\n        int anzahlGewonneneSoli = 0;\n        int anzahlGewonneneSoliTout = 0;\n        int anzahlWeiter = -1;\n\n        for (DataObject obj : data) {\n            switch (obj.getGameKind()) {\n            case RUFSPIEL:\n                anzahlRufspiele++;\n                anzahlSpieleGesamt++;\n                if (obj.getGameWon() == WIN.PLAYER) {\n                    anzahlGewonneneRufspiele++;\n                    anzahlSpieleGesamtGewonnen++;\n                }\n                if (obj.getGameValue() > teuerstesRufspiel) {\n                    teuerstesRufspiel = obj.getGameValue();\n                }\n                break;\n            case SOLO:\n                anzahlSolo++;\n                anzahlSpieleGesamt++;\n                if (obj.getGameWon() == WIN.PLAYER) {\n                    anzahlGewonneneSoli++;\n                    anzahlSpieleGesamtGewonnen++;\n                }\n                if (obj.getGameValue() > teuerstesSolo) {\n                    teuerstesSolo = obj.getGameValue();\n                }\n                break;\n            case TOUT:\n                anzahlSpieleGesamt++;\n                if (obj.getGameWon() == WIN.PLAYER) {\n                    anzahlGewonneneSoliTout++;\n                    anzahlSpieleGesamtGewonnen++;\n                }\n                if (obj.getGameValue() > teuerstesSoloTout) {\n                    teuerstesSoloTout = obj.getGameValue();\n                }\n                anzahlSoloTout++;\n                break;\n            case SIE:\n                anzahlSpieleGesamt++;\n                anzahlSpieleGesamtGewonnen++;\n                anzahlSoloSie++;\n                if (obj.getGameValue() > teuerstesSoloSie) {\n                    teuerstesSoloSie = obj.getGameValue();\n                }\n                break;\n            case WEITER:\n                anzahlWeiter++;\n                break;\n            case NONE: \/\/ nothing to do here\n                break;\n            default: \/\/ here neither\n                break;\n            }\n        }\n\n        double sologesamtwin = (anzahlSolo + anzahlSoloSie + anzahlSoloTout) > 0 ? ((anzahlGewonneneSoli\n                + anzahlGewonneneSoliTout + anzahlSoloSie) \/ 1.0 \/ (anzahlSolo\n                + anzahlSoloSie + anzahlSoloTout))\n                : 0;\n\n        return \"#Spiele (ohne weiter): \"\n                + anzahlSpieleGesamt\n                + \" (gewonnen: \"\n                + String.format(\"%.2f\", (anzahlSpieleGesamt > 0 ? anzahlSpieleGesamtGewonnen\n                        \/ ((double) anzahlSpieleGesamt) : 0) * 100)\n                + \"%)\\n\"\n                + \"#Rufspiele: \"\n                + anzahlRufspiele\n                + \" (gewonnen: \"\n                + String.format(\"%.2f\", (anzahlRufspiele > 0 ? anzahlGewonneneRufspiele\n                        \/ ((double) anzahlRufspiele) : 0) * 100)\n                + \"%)\\n\"\n                + \"          -> teurstes Rufspiel: \"\n                + teuerstesRufspiel\n                + \"\\n\"\n                + \"#Soli gesamt: \"\n                + (anzahlSolo + anzahlSoloTout + anzahlSoloSie)\n                + \" (gewonnen: \"\n                + String.format(\"%.2f\", sologesamtwin * 100)\n                + \"%)\\n\"\n                + \"#Soli normal: \"\n                + anzahlSolo\n                + \" (gewonnen: \"\n                + String.format(\"%.2f\", (anzahlSolo > 0 ? anzahlGewonneneSoli \/ ((double) anzahlSolo)\n                        : 0) * 100)\n                + \"%)\\n\"\n                + \"            -> teurstes Solo: \"\n                + teuerstesSolo\n                + \"\\n\"\n                + \"#Solo Tout: \"\n                + anzahlSoloTout\n                + \" (gewonnen: \"\n                + String.format(\"%.2f\", (anzahlSoloTout > 0 ? anzahlGewonneneSoliTout\n                        \/ ((double) anzahlSoloTout) : 0) * 100) + \"%)\\n\"\n                + \"          -> teurstes Solo Tout: \" + teuerstesSoloTout\n                + \"\\n\" + \"#Solo Sie: \" + anzahlSoloSie + \"\\n\"\n                + \"         -> teurstes Solo Sie: \" + teuerstesSoloSie + \"\\n\"\n                + \"#Weiter: \" + anzahlWeiter;\n    }\n}\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"f82cc6458bbae0e4d0f5feb13f0692e8dcc25876","subject":"Fixed SPR-6734 by resticting record\/replay logic to only entity methods that originated in a test method","message":"Fixed SPR-6734 by resticting record\/replay logic to only entity methods that originated in a test method\n","repos":"spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework","old_file":"org.springframework.aspects\/src\/main\/java\/org\/springframework\/mock\/staticmock\/AbstractMethodMockingControl.aj","new_file":"org.springframework.aspects\/src\/main\/java\/org\/springframework\/mock\/staticmock\/AbstractMethodMockingControl.aj","new_contents":"package org.springframework.mock.staticmock;\r\n\r\nimport java.util.Arrays;\r\nimport java.util.LinkedList;\r\nimport java.util.List;\r\n\r\n\/**\r\n * Abstract aspect to enable mocking of methods picked out by a pointcut.\r\n * Sub-aspects must define the mockStaticsTestMethod() pointcut to\r\n * indicate call stacks when mocking should be triggered, and the \r\n * methodToMock() pointcut to pick out a method invocations to mock.\r\n * \r\n * @author Rod Johnson\r\n * @author Ramnivas Laddad\r\n *\r\n *\/\r\npublic abstract aspect AbstractMethodMockingControl percflow(mockStaticsTestMethod()) {\r\n\r\n\tprotected abstract pointcut mockStaticsTestMethod();\r\n\r\n\tprotected abstract pointcut methodToMock();\r\n\r\n\tprivate boolean recording = true;\r\n\r\n\tstatic enum CallResponse { nothing, return_, throw_ };\r\n\r\n\t\/\/ Represents a list of expected calls to static entity methods\r\n\t\/\/ Public to allow inserted code to access: is this normal??\r\n\tpublic class Expectations {\r\n\t\t\r\n\t\t\/\/ Represents an expected call to a static entity method\r\n\t\tprivate class Call {\r\n\t\t\tprivate final String signature;\r\n\t\t\tprivate final Object[] args;\r\n\r\n\t\t\tprivate Object responseObject; \/\/ return value or throwable\r\n\t\t\tprivate CallResponse responseType = CallResponse.nothing;\r\n\t\t\t\r\n\t\t\tpublic Call(String name, Object[] args) {\r\n\t\t\t\tthis.signature = name;\r\n\t\t\t\tthis.args = args;\r\n\t\t\t}\r\n\t\t\t\r\n\t\t\tpublic boolean hasResponseSpecified() {\r\n\t\t\t\treturn responseType != CallResponse.nothing;\r\n\t\t\t}\r\n\t\t\t\r\n\t\t\tpublic void setReturnVal(Object retVal) {\r\n\t\t\t\tthis.responseObject = retVal;\r\n\t\t\t\tresponseType = CallResponse.return_;\r\n\t\t\t}\r\n\t\t\t\r\n\t\t\tpublic void setThrow(Throwable throwable) {\r\n\t\t\t\tthis.responseObject = throwable;\r\n\t\t\t\tresponseType = CallResponse.throw_;\r\n\t\t\t}\r\n\r\n\t\t\tpublic Object returnValue(String lastSig, Object[] args) {\r\n\t\t\t\tcheckSignature(lastSig, args);\r\n\t\t\t\treturn responseObject;\r\n\t\t\t}\r\n\r\n\t\t\tpublic Object throwException(String lastSig, Object[] args) {\r\n\t\t\t\tcheckSignature(lastSig, args);\r\n\t\t\t\tthrow (RuntimeException)responseObject;\r\n\t\t\t}\r\n\r\n\t\t\tprivate void checkSignature(String lastSig, Object[] args) {\r\n\t\t\t\tif (!signature.equals(lastSig)) {\r\n\t\t\t\t\tthrow new IllegalArgumentException(\"Signature doesn't match\");\r\n\t\t\t\t}\r\n\t\t\t\tif (!Arrays.equals(this.args, args)) {\r\n\t\t\t\t\tthrow new IllegalArgumentException(\"Arguments don't match\");\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\t\t\r\n\t\tprivate List<Call> calls = new LinkedList<Call>();\r\n\r\n\t\t\/\/ Calls already verified\r\n\t\tprivate int verified;\r\n\r\n\t\tpublic void verify() {\r\n\t\t\tif (verified != calls.size()) {\r\n\t\t\t\tthrow new IllegalStateException(\"Expected \" + calls.size()\r\n\t\t\t\t\t\t+ \" calls, received \" + verified);\r\n\t\t\t}\r\n\t\t}\r\n\t\t\r\n\t\t\/**\r\n\t\t * Validate the call and provide the expected return value\r\n\t\t * @param lastSig\r\n\t\t * @param args\r\n\t\t * @return\r\n\t\t *\/\r\n\t\tpublic Object respond(String lastSig, Object[] args) {\r\n\t\t\tCall call = nextCall();\r\n\t\t\tCallResponse responseType = call.responseType;\r\n\t\t\tif (responseType == CallResponse.return_) {\r\n\t\t\t\treturn call.returnValue(lastSig, args);\r\n\t\t\t} else if(responseType == CallResponse.throw_) {\r\n\t\t\t\treturn (RuntimeException)call.throwException(lastSig, args);\r\n\t\t\t} else if(responseType == CallResponse.nothing) {\r\n\t\t\t\t\/\/ do nothing\r\n\t\t\t}\r\n\t\t\tthrow new IllegalStateException(\"Behavior of \" + call + \" not specified\");\r\n\t\t}\r\n\r\n\t\tprivate Call nextCall() {\r\n\t\t\tif (verified > calls.size() - 1) {\r\n\t\t\t\tthrow new IllegalStateException(\"Expected \" + calls.size()\r\n\t\t\t\t\t\t+ \" calls, received \" + verified);\r\n\t\t\t}\r\n\t\t\treturn calls.get(verified++);\r\n\t\t}\r\n\r\n\t\tpublic void expectCall(String lastSig, Object lastArgs[]) {\r\n\t\t\tCall call = new Call(lastSig, lastArgs);\r\n\t\t\tcalls.add(call);\r\n\t\t}\r\n\r\n\t\tpublic boolean hasCalls() {\r\n\t\t\treturn !calls.isEmpty();\r\n\t\t}\r\n\r\n\t\tpublic void expectReturn(Object retVal) {\r\n\t\t\tCall call = calls.get(calls.size() - 1);\r\n\t\t\tif (call.hasResponseSpecified()) {\r\n\t\t\t\tthrow new IllegalStateException(\"No static method invoked before setting return value\");\r\n\t\t\t}\r\n\t\t\tcall.setReturnVal(retVal);\r\n\t\t}\r\n\r\n\t\tpublic void expectThrow(Throwable throwable) {\r\n\t\t\tCall call = calls.get(calls.size() - 1);\r\n\t\t\tif (call.hasResponseSpecified()) {\r\n\t\t\t\tthrow new IllegalStateException(\"No static method invoked before setting throwable\");\r\n\t\t\t}\r\n\t\t\tcall.setThrow(throwable);\r\n\t\t}\r\n\t}\r\n\r\n\tprivate Expectations expectations = new Expectations();\r\n\r\n\tafter() returning : mockStaticsTestMethod() {\r\n\t\tif (recording && (expectations.hasCalls())) {\r\n\t\t\tthrow new IllegalStateException(\r\n\t\t\t\t\t\"Calls recorded, yet playback state never reached: Create expectations then call \"\r\n\t\t\t\t\t\t\t+ this.getClass().getSimpleName() + \".playback()\");\r\n\t\t}\r\n\t\texpectations.verify();\r\n\t}\r\n\r\n\tObject around() : methodToMock() && cflowbelow(mockStaticsTestMethod()) {\r\n\t\tif (recording) {\r\n\t\t\texpectations.expectCall(thisJoinPointStaticPart.toLongString(), thisJoinPoint.getArgs());\r\n\t\t\t\/\/ Return value doesn't matter\r\n\t\t\treturn null;\r\n\t\t} else {\r\n\t\t\treturn expectations.respond(thisJoinPointStaticPart.toLongString(), thisJoinPoint.getArgs());\r\n\t\t}\r\n\t}\r\n\t\r\n\tpublic void expectReturnInternal(Object retVal) {\r\n\t\tif (!recording) {\r\n\t\t\tthrow new IllegalStateException(\"Not recording: Cannot set return value\");\r\n\t\t}\r\n\t\texpectations.expectReturn(retVal);\r\n\t}\r\n\r\n\tpublic void expectThrowInternal(Throwable throwable) {\r\n\t\tif (!recording) {\r\n\t\t\tthrow new IllegalStateException(\"Not recording: Cannot set throwable value\");\r\n\t\t}\r\n\t\texpectations.expectThrow(throwable);\r\n\t}\r\n\r\n\tpublic void playbackInternal() {\r\n\t\trecording = false;\r\n\t}\r\n\r\n}\r\n","old_contents":"package org.springframework.mock.staticmock;\r\n\r\nimport java.util.Arrays;\r\nimport java.util.LinkedList;\r\nimport java.util.List;\r\n\r\n\/**\r\n * Abstract aspect to enable mocking of methods picked out by a pointcut.\r\n * Sub-aspects must define the mockStaticsTestMethod() pointcut to\r\n * indicate call stacks when mocking should be triggered, and the \r\n * methodToMock() pointcut to pick out a method invocations to mock.\r\n * \r\n * @author Rod Johnson\r\n * @author Ramnivas Laddad\r\n *\r\n *\/\r\npublic abstract aspect AbstractMethodMockingControl percflow(mockStaticsTestMethod()) {\r\n\r\n\tprotected abstract pointcut mockStaticsTestMethod();\r\n\r\n\tprotected abstract pointcut methodToMock();\r\n\r\n\tprivate boolean recording = true;\r\n\r\n\tstatic enum CallResponse { nothing, return_, throw_ };\r\n\r\n\t\/\/ Represents a list of expected calls to static entity methods\r\n\t\/\/ Public to allow inserted code to access: is this normal??\r\n\tpublic class Expectations {\r\n\t\t\r\n\t\t\/\/ Represents an expected call to a static entity method\r\n\t\tprivate class Call {\r\n\t\t\tprivate final String signature;\r\n\t\t\tprivate final Object[] args;\r\n\r\n\t\t\tprivate Object responseObject; \/\/ return value or throwable\r\n\t\t\tprivate CallResponse responseType = CallResponse.nothing;\r\n\t\t\t\r\n\t\t\tpublic Call(String name, Object[] args) {\r\n\t\t\t\tthis.signature = name;\r\n\t\t\t\tthis.args = args;\r\n\t\t\t}\r\n\t\t\t\r\n\t\t\tpublic boolean hasResponseSpecified() {\r\n\t\t\t\treturn responseType != CallResponse.nothing;\r\n\t\t\t}\r\n\t\t\t\r\n\t\t\tpublic void setReturnVal(Object retVal) {\r\n\t\t\t\tthis.responseObject = retVal;\r\n\t\t\t\tresponseType = CallResponse.return_;\r\n\t\t\t}\r\n\t\t\t\r\n\t\t\tpublic void setThrow(Throwable throwable) {\r\n\t\t\t\tthis.responseObject = throwable;\r\n\t\t\t\tresponseType = CallResponse.throw_;\r\n\t\t\t}\r\n\r\n\t\t\tpublic Object returnValue(String lastSig, Object[] args) {\r\n\t\t\t\tcheckSignature(lastSig, args);\r\n\t\t\t\treturn responseObject;\r\n\t\t\t}\r\n\r\n\t\t\tpublic Object throwException(String lastSig, Object[] args) {\r\n\t\t\t\tcheckSignature(lastSig, args);\r\n\t\t\t\tthrow (RuntimeException)responseObject;\r\n\t\t\t}\r\n\r\n\t\t\tprivate void checkSignature(String lastSig, Object[] args) {\r\n\t\t\t\tif (!signature.equals(lastSig)) {\r\n\t\t\t\t\tthrow new IllegalArgumentException(\"Signature doesn't match\");\r\n\t\t\t\t}\r\n\t\t\t\tif (!Arrays.equals(this.args, args)) {\r\n\t\t\t\t\tthrow new IllegalArgumentException(\"Arguments don't match\");\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\t\t\r\n\t\tprivate List<Call> calls = new LinkedList<Call>();\r\n\r\n\t\t\/\/ Calls already verified\r\n\t\tprivate int verified;\r\n\r\n\t\tpublic void verify() {\r\n\t\t\tif (verified != calls.size()) {\r\n\t\t\t\tthrow new IllegalStateException(\"Expected \" + calls.size()\r\n\t\t\t\t\t\t+ \" calls, received \" + verified);\r\n\t\t\t}\r\n\t\t}\r\n\t\t\r\n\t\t\/**\r\n\t\t * Validate the call and provide the expected return value\r\n\t\t * @param lastSig\r\n\t\t * @param args\r\n\t\t * @return\r\n\t\t *\/\r\n\t\tpublic Object respond(String lastSig, Object[] args) {\r\n\t\t\tCall call = nextCall();\r\n\t\t\tCallResponse responseType = call.responseType;\r\n\t\t\tif (responseType == CallResponse.return_) {\r\n\t\t\t\treturn call.returnValue(lastSig, args);\r\n\t\t\t} else if(responseType == CallResponse.throw_) {\r\n\t\t\t\treturn (RuntimeException)call.throwException(lastSig, args);\r\n\t\t\t} else if(responseType == CallResponse.nothing) {\r\n\t\t\t\t\/\/ do nothing\r\n\t\t\t}\r\n\t\t\tthrow new IllegalStateException(\"Behavior of \" + call + \" not specified\");\r\n\t\t}\r\n\r\n\t\tprivate Call nextCall() {\r\n\t\t\tif (verified > calls.size() - 1) {\r\n\t\t\t\tthrow new IllegalStateException(\"Expected \" + calls.size()\r\n\t\t\t\t\t\t+ \" calls, received \" + verified);\r\n\t\t\t}\r\n\t\t\treturn calls.get(verified++);\r\n\t\t}\r\n\r\n\t\tpublic void expectCall(String lastSig, Object lastArgs[]) {\r\n\t\t\tCall call = new Call(lastSig, lastArgs);\r\n\t\t\tcalls.add(call);\r\n\t\t}\r\n\r\n\t\tpublic boolean hasCalls() {\r\n\t\t\treturn !calls.isEmpty();\r\n\t\t}\r\n\r\n\t\tpublic void expectReturn(Object retVal) {\r\n\t\t\tCall call = calls.get(calls.size() - 1);\r\n\t\t\tif (call.hasResponseSpecified()) {\r\n\t\t\t\tthrow new IllegalStateException(\"No static method invoked before setting return value\");\r\n\t\t\t}\r\n\t\t\tcall.setReturnVal(retVal);\r\n\t\t}\r\n\r\n\t\tpublic void expectThrow(Throwable throwable) {\r\n\t\t\tCall call = calls.get(calls.size() - 1);\r\n\t\t\tif (call.hasResponseSpecified()) {\r\n\t\t\t\tthrow new IllegalStateException(\"No static method invoked before setting throwable\");\r\n\t\t\t}\r\n\t\t\tcall.setThrow(throwable);\r\n\t\t}\r\n\t}\r\n\r\n\tprivate Expectations expectations = new Expectations();\r\n\r\n\tafter() returning : mockStaticsTestMethod() {\r\n\t\tif (recording && (expectations.hasCalls())) {\r\n\t\t\tthrow new IllegalStateException(\r\n\t\t\t\t\t\"Calls recorded, yet playback state never reached: Create expectations then call \"\r\n\t\t\t\t\t\t\t+ this.getClass().getSimpleName() + \".playback()\");\r\n\t\t}\r\n\t\texpectations.verify();\r\n\t}\r\n\r\n\tObject around() : methodToMock() {\r\n\t\tif (recording) {\r\n\t\t\texpectations.expectCall(thisJoinPointStaticPart.toLongString(), thisJoinPoint.getArgs());\r\n\t\t\t\/\/ Return value doesn't matter\r\n\t\t\treturn null;\r\n\t\t} else {\r\n\t\t\treturn expectations.respond(thisJoinPointStaticPart.toLongString(), thisJoinPoint.getArgs());\r\n\t\t}\r\n\t}\r\n\t\r\n\tpublic void expectReturnInternal(Object retVal) {\r\n\t\tif (!recording) {\r\n\t\t\tthrow new IllegalStateException(\"Not recording: Cannot set return value\");\r\n\t\t}\r\n\t\texpectations.expectReturn(retVal);\r\n\t}\r\n\r\n\tpublic void expectThrowInternal(Throwable throwable) {\r\n\t\tif (!recording) {\r\n\t\t\tthrow new IllegalStateException(\"Not recording: Cannot set throwable value\");\r\n\t\t}\r\n\t\texpectations.expectThrow(throwable);\r\n\t}\r\n\r\n\tpublic void playbackInternal() {\r\n\t\trecording = false;\r\n\t}\r\n\r\n}\r\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"c6a2ec7c449a3041f26d4e4e76b0fe6f856d30a9","subject":"refactoring do c\u00f3digo de disparo de notifica\u00e7\u00f5es","message":"refactoring do c\u00f3digo de disparo de notifica\u00e7\u00f5es\n","repos":"rslemos\/former-nlp","old_file":"brillevents\/src\/main\/java\/br\/eti\/rslemos\/brill\/events\/RuleBasedTaggerObserver.aj","new_file":"brillevents\/src\/main\/java\/br\/eti\/rslemos\/brill\/events\/RuleBasedTaggerObserver.aj","new_contents":"package br.eti.rslemos.brill.events;\n\nimport java.util.ArrayList;\nimport java.util.List;\n\nimport br.eti.rslemos.brill.Rule;\nimport br.eti.rslemos.brill.RuleBasedTagger;\nimport br.eti.rslemos.tagger.Sentence;\n\n@SuppressWarnings(\"unchecked\")\npublic aspect RuleBasedTaggerObserver extends RuleBasedTaggerEvents perthis(this(RuleBasedTagger+)) {\n\t\n\tprivate List<RuleBasedTaggerListener> listeners = new ArrayList<RuleBasedTaggerListener>();\n\t\n\tpublic void RuleBasedTagger.addRuleBasedTaggerListener(RuleBasedTaggerListener listener) {\n\t\taspectOf(this).listeners.add(listener);\n\t}\n\t\n\tpublic void RuleBasedTagger.removeRuleBasedTaggerListener(RuleBasedTaggerListener listener) {\n\t\taspectOf(this).listeners.remove(listener);\n\t}\n\n\tprivate static interface Method<T, A> {\n\t\tvoid invoke(T target, A argument);\n\t}\n\t\n\tprivate void fireNotification(Method<RuleBasedTaggerListener, RuleBasedTaggerEvent> method, RuleBasedTaggerEvent prototype) {\n\t\tfor (RuleBasedTaggerListener listener : listeners) {\n\t\t\tRuleBasedTaggerEvent event = (RuleBasedTaggerEvent) prototype.clone();\n\t\t\ttry {\n\t\t\t\tmethod.invoke(listener, event);\n\t\t\t} catch (Throwable t) {\n\t\t\t\t\/\/ swallow\n\t\t\t}\n\t\t}\n\t}\n\t\n\tprivate static final Method<RuleBasedTaggerListener, RuleBasedTaggerEvent> TAGGINGSENTENCE =\n\t\tnew Method<RuleBasedTaggerListener, RuleBasedTaggerEvent>() {\n\t\t\tpublic void invoke(RuleBasedTaggerListener target, RuleBasedTaggerEvent argument) {\n\t\t\t\ttarget.taggingSentence(argument);\n\t\t\t}\n\t};\n\t\n\tprivate static final Method<RuleBasedTaggerListener, RuleBasedTaggerEvent> SENTENCETAGGED =\n\t\tnew Method<RuleBasedTaggerListener, RuleBasedTaggerEvent>() {\n\t\t\tpublic void invoke(RuleBasedTaggerListener target, RuleBasedTaggerEvent argument) {\n\t\t\t\ttarget.sentenceTagged(argument);\n\t\t\t}\n\t};\n\t\n\tprivate static final Method<RuleBasedTaggerListener, RuleBasedTaggerEvent> BEFOREBASETAGGER =\n\t\tnew Method<RuleBasedTaggerListener, RuleBasedTaggerEvent>() {\n\t\t\tpublic void invoke(RuleBasedTaggerListener target, RuleBasedTaggerEvent argument) {\n\t\t\t\ttarget.beforeBaseTagger(argument);\n\t\t\t}\n\t};\n\t\n\tprivate static final Method<RuleBasedTaggerListener, RuleBasedTaggerEvent> AFTERBASETAGGER =\n\t\tnew Method<RuleBasedTaggerListener, RuleBasedTaggerEvent>() {\n\t\t\tpublic void invoke(RuleBasedTaggerListener target, RuleBasedTaggerEvent argument) {\n\t\t\t\ttarget.afterBaseTagger(argument);\n\t\t\t}\n\t};\n\t\n\tprivate static final Method<RuleBasedTaggerListener, RuleBasedTaggerEvent> BEFORERULEAPPLICATION =\n\t\tnew Method<RuleBasedTaggerListener, RuleBasedTaggerEvent>() {\n\t\t\tpublic void invoke(RuleBasedTaggerListener target, RuleBasedTaggerEvent argument) {\n\t\t\t\ttarget.beforeRuleApplication(argument);\n\t\t\t}\n\t};\n\t\n\tprivate static final Method<RuleBasedTaggerListener, RuleBasedTaggerEvent> AFTERRULEAPPLICATION =\n\t\tnew Method<RuleBasedTaggerListener, RuleBasedTaggerEvent>() {\n\t\t\tpublic void invoke(RuleBasedTaggerListener target, RuleBasedTaggerEvent argument) {\n\t\t\t\ttarget.afterRuleApplication(argument);\n\t\t\t}\n\t};\n\t\n\tbefore(RuleBasedTagger tagger, Sentence sentence): onTagSentence(tagger, sentence) {\n\t\tRuleBasedTaggerEvent prototype = new RuleBasedTaggerEvent(tagger);\n\t\tprototype.setOnSentence(sentence);\n\t\t\n\t\tfireNotification(TAGGINGSENTENCE, prototype);\n\t}\n\n\tafter(RuleBasedTagger tagger, Sentence sentence) returning: onTagSentence(tagger, sentence) {\n\t\tRuleBasedTaggerEvent prototype = new RuleBasedTaggerEvent(tagger);\n\t\tprototype.setOnSentence(sentence);\n\t\n\t\tfireNotification(SENTENCETAGGED, prototype);\n\t}\n\n\tbefore(RuleBasedTagger tagger, Sentence sentence): onBaseTagger(tagger, *, sentence) {\n\t\tRuleBasedTaggerEvent prototype = new RuleBasedTaggerEvent(tagger);\n\t\tprototype.setOnSentence(sentence);\n\t\n\t\tfireNotification(BEFOREBASETAGGER, prototype);\n\t}\n\n\tafter(RuleBasedTagger tagger, Sentence sentence) returning: onBaseTagger(tagger, *, sentence) {\n\t\tRuleBasedTaggerEvent prototype = new RuleBasedTaggerEvent(tagger);\n\t\tprototype.setOnSentence(sentence);\n\t\n\t\tfireNotification(AFTERBASETAGGER, prototype);\n\t}\n\n\tbefore(RuleBasedTagger tagger, Rule rule, Sentence sentence): onRuleApplication(tagger, rule, sentence) {\n\t\tRuleBasedTaggerEvent prototype = new RuleBasedTaggerEvent(tagger);\n\t\tprototype.setOnSentence(sentence);\n\t\tprototype.setActingRule(rule);\n\n\t\tfireNotification(BEFORERULEAPPLICATION, prototype);\n\t}\n\n\tafter(RuleBasedTagger tagger, Rule rule, Sentence sentence) returning: onRuleApplication(tagger, rule, sentence) {\n\t\tRuleBasedTaggerEvent prototype = new RuleBasedTaggerEvent(tagger);\n\t\tprototype.setOnSentence(sentence);\n\t\tprototype.setActingRule(rule);\n\n\t\tfireNotification(AFTERRULEAPPLICATION, prototype);\n\t}\n\n}\n","old_contents":"package br.eti.rslemos.brill.events;\n\nimport java.util.ArrayList;\nimport java.util.List;\n\nimport br.eti.rslemos.brill.Rule;\nimport br.eti.rslemos.brill.RuleBasedTagger;\nimport br.eti.rslemos.tagger.Sentence;\n\n@SuppressWarnings(\"unchecked\")\npublic aspect RuleBasedTaggerObserver extends RuleBasedTaggerEvents perthis(this(RuleBasedTagger+)) {\n\t\n\tprivate List<RuleBasedTaggerListener> listeners = new ArrayList<RuleBasedTaggerListener>();\n\t\n\tpublic void RuleBasedTagger.addRuleBasedTaggerListener(RuleBasedTaggerListener listener) {\n\t\taspectOf(this).listeners.add(listener);\n\t}\n\t\n\tpublic void RuleBasedTagger.removeRuleBasedTaggerListener(RuleBasedTaggerListener listener) {\n\t\taspectOf(this).listeners.remove(listener);\n\t}\n\n\tbefore(RuleBasedTagger tagger, Sentence sentence): onTagSentence(tagger, sentence) {\n\t\tRuleBasedTaggerEvent prototype = new RuleBasedTaggerEvent(tagger);\n\t\tprototype.setOnSentence(sentence);\n\t\n\t\tfor (RuleBasedTaggerListener listener : listeners) {\n\t\t\tRuleBasedTaggerEvent event = (RuleBasedTaggerEvent) prototype.clone();\n\t\t\ttry {\n\t\t\t\tlistener.taggingSentence(event);\n\t\t\t} catch (Throwable t) {\n\t\t\t\t\/\/ swallow\n\t\t\t}\n\t\t}\n\t}\n\n\tafter(RuleBasedTagger tagger, Sentence sentence) returning: onTagSentence(tagger, sentence) {\n\t\tRuleBasedTaggerEvent prototype = new RuleBasedTaggerEvent(tagger);\n\t\tprototype.setOnSentence(sentence);\n\t\n\t\tfor (RuleBasedTaggerListener listener : listeners) {\n\t\t\tRuleBasedTaggerEvent event = (RuleBasedTaggerEvent) prototype.clone();\n\t\t\ttry {\n\t\t\t\tlistener.sentenceTagged(event);\n\t\t\t} catch (Throwable t) {\n\t\t\t\t\/\/ swallow\n\t\t\t}\n\t\t}\n\t}\n\n\tbefore(RuleBasedTagger tagger, Sentence sentence): onBaseTagger(tagger, *, sentence) {\n\t\tRuleBasedTaggerEvent prototype = new RuleBasedTaggerEvent(tagger);\n\t\tprototype.setOnSentence(sentence);\n\t\n\t\tfor (RuleBasedTaggerListener listener : listeners) {\n\t\t\tRuleBasedTaggerEvent event = (RuleBasedTaggerEvent) prototype.clone();\n\t\t\ttry {\n\t\t\t\tlistener.beforeBaseTagger(event);\n\t\t\t} catch (Throwable t) {\n\t\t\t\t\/\/ swallow\n\t\t\t}\n\t\t}\n\t}\n\n\tafter(RuleBasedTagger tagger, Sentence sentence) returning: onBaseTagger(tagger, *, sentence) {\n\t\tRuleBasedTaggerEvent prototype = new RuleBasedTaggerEvent(tagger);\n\t\tprototype.setOnSentence(sentence);\n\t\n\t\tfor (RuleBasedTaggerListener listener : listeners) {\n\t\t\tRuleBasedTaggerEvent event = (RuleBasedTaggerEvent) prototype.clone();\n\t\t\ttry {\n\t\t\t\tlistener.afterBaseTagger(event);\n\t\t\t} catch (Throwable t) {\n\t\t\t\t\/\/ swallow\n\t\t\t}\n\t\t}\n\t}\n\n\tbefore(RuleBasedTagger tagger, Rule rule, Sentence sentence): onRuleApplication(tagger, rule, sentence) {\n\t\tRuleBasedTaggerEvent prototype = new RuleBasedTaggerEvent(tagger);\n\t\tprototype.setOnSentence(sentence);\n\t\tprototype.setActingRule(rule);\n\t\n\t\tfor (RuleBasedTaggerListener listener : listeners) {\n\t\t\tRuleBasedTaggerEvent event = (RuleBasedTaggerEvent) prototype.clone();\n\t\t\ttry {\n\t\t\t\tlistener.beforeRuleApplication(event);\n\t\t\t} catch (Throwable t) {\n\t\t\t\t\/\/ swallow\n\t\t\t}\n\t\t}\n\t}\n\n\tafter(RuleBasedTagger tagger, Rule rule, Sentence sentence) returning: onRuleApplication(tagger, rule, sentence) {\n\t\tRuleBasedTaggerEvent prototype = new RuleBasedTaggerEvent(tagger);\n\t\tprototype.setOnSentence(sentence);\n\t\tprototype.setActingRule(rule);\n\n\t\tfor (RuleBasedTaggerListener listener : listeners) {\n\t\t\tRuleBasedTaggerEvent event = (RuleBasedTaggerEvent) prototype.clone();\n\t\t\ttry {\n\t\t\t\tlistener.afterRuleApplication(event);\n\t\t\t} catch (Throwable t) {\n\t\t\t\t\/\/ swallow\n\t\t\t}\n\t\t}\n\t}\n\n}\n","returncode":0,"stderr":"","license":"agpl-3.0","lang":"AspectJ"}
{"commit":"ffff99f2a21822da349e3e41c44c2d152a54f0f0","subject":"reducing the logging level of a few statements in aspects.","message":"reducing the logging level of a few statements in aspects.","repos":"dukson\/curvature-scale-space-corners-and-transformations,nking\/curvature-scale-space-corners-and-transformations,dukson\/curvature-scale-space-corners-and-transformations,dukson\/curvature-scale-space-corners-and-transformations,nking\/curvature-scale-space-corners-and-transformations","old_file":"aspects\/algorithms\/imageProcessing\/CurvatureAspect.aj","new_file":"aspects\/algorithms\/imageProcessing\/CurvatureAspect.aj","new_contents":"package algorithms.imageProcessing;\n\nimport java.io.IOException;\nimport java.util.logging.Logger;\nimport algorithms.util.*;\nimport algorithms.misc.Histogram;\nimport algorithms.misc.HistogramHolder;\nimport algorithms.misc.MiscMath;\nimport algorithms.util.Errors;\nimport java.awt.Color;\nimport java.util.ArrayList;\nimport java.util.Arrays;\nimport java.util.HashMap;\nimport java.util.Iterator;\nimport java.util.List;\nimport java.util.Map;\nimport java.util.Map.Entry;\n\n\/**\nclass to create debugging output from the main source code\n*\/\npublic aspect CurvatureAspect {\n\n    private PolygonAndPointPlotter plotter = null;\n\n    \/\/ for the ContourFinder plots:\n    private PolygonAndPointPlotter plotter9 = null;\n\n    private Logger log2 = Logger.getAnonymousLogger();\n\n    private String currentEdgeStr = \"\";\n\n    after() :\n        target(algorithms.imageProcessing.ContourFinder) \n        && execution(public ContourFinder.new(..)) {\n\n        log2.fine(\"===> in aspect for ContourFinder\");\n\n        if (plotter9 == null) {\n            try {\n            plotter9 = new PolygonAndPointPlotter();\n            } catch (IOException e) {\n                log2.severe(\"ERROR: \" + e.getMessage());\n            }\n        }\n    }\n\n    before(ScaleSpaceCurveImage scaleSpaceImage, int edgeNumber) :\n        execution(List<CurvatureScaleSpaceContour> algorithms.imageProcessing.ContourFinder.findContours(ScaleSpaceCurveImage, int))\n        && args(scaleSpaceImage, edgeNumber) \n\t    && target(algorithms.imageProcessing.ContourFinder) {\n\n        Object obj = thisJoinPoint.getThis();\n\n        if (!(obj instanceof ContourFinder)) {\n            return;\n        }\n\n        ContourFinder instance = (ContourFinder)obj;\n\n        Object[] args = (Object[])thisJoinPoint.getArgs();\n\n        ScaleSpaceCurveImage scaleSpaceImageIn = (ScaleSpaceCurveImage)args[0];\n        int edgeNumberIn = ((Integer)args[1]).intValue();\n\n        String filePath = printImage(scaleSpaceImageIn, plotter9, 9);\n\n        log2.fine(\"===> in aspect for ContourFinder, filePath=\" + filePath);\n    }\n\n    after(ScaleSpaceCurveImage scaleSpaceImage, int edgeNumber) \n        returning(List<CurvatureScaleSpaceContour> contours) :\n        execution(List<CurvatureScaleSpaceContour> algorithms.imageProcessing.ContourFinder.findContours(ScaleSpaceCurveImage, int))\n        && args(scaleSpaceImage, edgeNumber) \n\t    && target(algorithms.imageProcessing.ContourFinder) {\n\n        Object obj = thisJoinPoint.getThis();\n\n        if (!(obj instanceof ContourFinder)) {\n            return;\n        }\n\n        ContourFinder instance = (ContourFinder)obj;\n\n        for (int i = 0; i < contours.size(); i++) {\n\n            CurvatureScaleSpaceContour contour = contours.get(i);\n\n            float sigma = contour.getPeakSigma();\n            float t = contour.getPeakScaleFreeLength();\n\n            String str = String.format(\"edge=%d contour=%d (%f, %f)\", \n                contour.getEdgeNumber(), i, sigma, t);\n\n            log2.fine(str);\n        }\n    }\n\n    after() returning() \n        : execution(public void algorithms.imageProcessing.CurvatureScaleSpaceInflectionMapper*.initialize() ) \n        && args() \n        && target(algorithms.imageProcessing.CurvatureScaleSpaceInflectionMapper) {\n    \n        Object obj = thisJoinPoint.getThis();\n\n        if (!(obj instanceof CurvatureScaleSpaceInflectionMapper)) {\n            return;\n        }\n\n        CurvatureScaleSpaceInflectionMapper instance = (CurvatureScaleSpaceInflectionMapper)obj;\n\n        List<CurvatureScaleSpaceContour> contours1 = instance.getContours1();\n\n        List<CurvatureScaleSpaceContour> contours2 = instance.getContours2();\n\n        log2.fine(\"number of matched contours1=\" + contours1.size() +\n            \" number of matched contours2=\" + contours2.size());\n\n        PairIntArray xyc1 = new PairIntArray();\n        PairIntArray xyc2 = new PairIntArray();\n\n        for (int i = 0; i < contours1.size(); i++) {\n            CurvatureScaleSpaceContour c1 = contours1.get(i);\n            CurvatureScaleSpaceImagePoint[] details = c1.getPeakDetails();\n            for (CurvatureScaleSpaceImagePoint detail : details) {\n                xyc1.add(detail.getXCoord(), detail.getYCoord());\n            }\n        }\n        for (int i = 0; i < contours2.size(); i++) {\n            CurvatureScaleSpaceContour c2 = contours2.get(i);\n            CurvatureScaleSpaceImagePoint[] details = c2.getPeakDetails();\n            for (CurvatureScaleSpaceImagePoint detail : details) {\n                xyc2.add(detail.getXCoord(), detail.getYCoord());\n            }\n        }\n\n        log2.info(\"Number of contours from image1=\" + contours1.size() +\n            \" number of contours from image2=\" + contours2.size());\n\n        try {\n\n            Image img1 = instance.getImage1().copyImageToGreen();\n            \n            ImageIOHelper.addCurveToImage(xyc1, img1, 2, 255, 0, 0);\n            String dirPath = ResourceFinder.findDirectory(\"bin\");\n            ImageIOHelper.writeOutputImage(\n                dirPath + \"\/contour_peaks1.png\", img1);\n\n            Image img2 = instance.getImage2().copyImageToGreen();\n            \n            ImageIOHelper.addCurveToImage(xyc2, img2, 2, 255, 0, 0);\n            ImageIOHelper.writeOutputImage(\n                dirPath + \"\/contour_peaks2.png\", img2);\n\n        } catch (IOException e) {\n            log2.severe(\"ERROR: \" + e.getMessage());\n        }\n\n    }\n\n    after() \n        returning(TransformationParameters params) :\n        execution(public TransformationParameters algorithms.imageProcessing.CurvatureScaleSpaceInflectionMapper.createEuclideanTransformation())\n\t    && target(algorithms.imageProcessing.CurvatureScaleSpaceInflectionMapper) {\n\n        Object obj = thisJoinPoint.getThis();\n\n        if (!(obj instanceof CurvatureScaleSpaceInflectionMapper)) {\n            return;\n        }\n\n        if (params == null) {\n            return;\n        }\n\n        CurvatureScaleSpaceInflectionMapper instance = (CurvatureScaleSpaceInflectionMapper)obj;\n\n        List<CurvatureScaleSpaceContour> contours1 = instance.getMatchedContours1();\n\n        List<CurvatureScaleSpaceContour> contours2 = instance.getMatchedContours2();\n\n        log2.fine(\"number of matched contours1=\" + contours1.size() +\n            \" number of matched contours2=\" + contours2.size());\n\n        for (int i = 0; i < contours1.size(); i++) {\n\n            CurvatureScaleSpaceContour c1 = contours1.get(i);\n            CurvatureScaleSpaceContour c2 = contours2.get(i);\n\n            float sigma1 = c1.getPeakSigma();\n            float t1 = c1.getPeakScaleFreeLength();\n            int i1 = c1.getEdgeNumber();\n\n            float sigma2 = c2.getPeakSigma();\n            float t2 = c2.getPeakScaleFreeLength();\n            int i2 = c2.getEdgeNumber();\n\n            String str = String.format(\n                \"matched edge=%d (%f, %f) (%f, %f) edge=%d\", i1, sigma1, t1, \n                sigma2, t2, i2);\n\n            log2.fine(str);\n        }\n        \n        PairIntArray[] matchedXY1 = instance.getMatchedXY1();\n        PairIntArray[] matchedXY2 = instance.getMatchedXY2();\n        if (matchedXY1 == null) {\n            matchedXY1 = new PairIntArray[0];\n            matchedXY2 = new PairIntArray[0];\n        }\n        PairIntArray xy1Tot = new PairIntArray();\n        PairIntArray xy2Tot = new PairIntArray();\n        for (int i = 0; i < matchedXY1.length; i++) {\n            for (int j = 0; j < matchedXY1[i].getN(); j++) {\n                xy1Tot.add(matchedXY1[i].getX(j), matchedXY1[i].getY(j));\n                xy2Tot.add(matchedXY2[i].getX(j), matchedXY2[i].getY(j));\n            }\n        }\n\n        try {\n\n            Image img1 = instance.getImage1().copyImageToGreen();\n            \n            ImageIOHelper.addCurveToImage(xy1Tot, img1, 1, 255, 0, 0);\n            String dirPath = ResourceFinder.findDirectory(\"bin\");\n            ImageIOHelper.writeOutputImage(\n                dirPath + \"\/contour_peaks1.png\", img1);\n\n            Image img2 = instance.getImage2().copyImageToGreen();\n            \n            ImageIOHelper.addCurveToImage(xy2Tot, img2, 1, 255, 0, 0);\n            ImageIOHelper.writeOutputImage(\n                dirPath + \"\/contour_peaks2.png\", img2);\n\n        } catch (IOException e) {\n            log2.severe(\"ERROR: \" + e.getMessage());\n        }\n\n    }\n\n    before(final PairIntArray edge, \n        final Map<SIGMA, ScaleSpaceCurve> scaleSpaceCurves, int edgeNumber) \n        : call(PairIntArray CurvatureScaleSpaceCornerDetector*.findCornersInScaleSpaceMap( \n        PairIntArray, Map<SIGMA, ScaleSpaceCurve>, int) ) \n        && args(edge, scaleSpaceCurves, edgeNumber) \n        && target(algorithms.imageProcessing.CurvatureScaleSpaceCornerDetector) {\n\n        try {\n            plotter = new PolygonAndPointPlotter();\n        } catch (IOException ex) {\n            ex.printStackTrace();\n            throw new RuntimeException(\"ERROR: l64\" + ex.getMessage());\n        }\n    }\n\n\tafter(PairIntArray curve, int cIndex, float[] g, final boolean calcX) \n        returning(double curvature) :\n        call(double Kernel1DHelper.convolvePointWithKernel(PairIntArray, int, \n        float[], boolean))\n        && args(curve, cIndex, g, calcX) \n\t    && target(algorithms.imageProcessing.Kernel1DHelper) {\n\n        \/*Object[] args = (Object[])thisJoinPoint.getArgs();\n\n        PairIntArray c = (PairIntArray)args[0];\n        int cIdx = (Integer)args[1];\n\n\t\tString str = String.format(\"k=%f  x,y=(%d, %d)\", curvature,\n            c.getX(cIdx), c.getY(cIdx));\n\n        log2.info(str);*\/\n\t}\n\n    after(GreyscaleImage img, int col, int row, float[] g, final boolean calcX) returning(double curvature) :\n        call(double Kernel1DHelper*.convolvePointWithKernel(GreyscaleImage, int, int, float[], boolean))\n        && args(img, col, row, g, calcX) \n\t    && target(algorithms.imageProcessing.Kernel1DHelper) {\t\t\n\n        \/*Object[] args = (Object[])thisJoinPoint.getArgs();\n        Integer c = (Integer)args[1];\n        Integer r = (Integer)args[2];\n\n\t\tString str = String.format(\"k=%f  x,y=(%d, %d)\", curvature, c, r);\n        log2.info(str);*\/\n\t}\n\n    after(GreyscaleImage input, HistogramHolder imgHistogram) returning(ImageStatistics stats) :\n        execution(public ImageStatistics LowIntensityRemovalFilter+.removeLowIntensityPixels(GreyscaleImage, HistogramHolder))\n        && args(input, imgHistogram) \n\t    && target(algorithms.imageProcessing.LowIntensityRemovalFilter) {\t\t\n\n        Object[] args = (Object[])thisJoinPoint.getArgs();\n\n        GreyscaleImage img = (GreyscaleImage)args[0];\n\n        try {\n            String dirPath = ResourceFinder.findDirectory(\"bin\");\n            ImageIOHelper.writeOutputImage(dirPath + \"\/filters_1.png\", img);\n        } catch(IOException e) {\n            log2.severe(e.getMessage());\n        }\n\t}\n\n    \/\/ note, execution binds to CannyEdgeFilter which is good,\n    \/\/ but call binds to the invoker CurvatureScaleSpaceCornerDetector\n    after(GreyscaleImage img) returning() :\n        execution(public void CannyEdgeFilter.applyFilter(GreyscaleImage))\n        && args(img)\n\t    && target(algorithms.imageProcessing.CannyEdgeFilter) {\n\n        Object obj = thisJoinPoint.getThis();\n\n        log2.fine(\"after CannyEdgeFilter.applyFilter instance=\" \n            + obj.getClass().getName());\n\n        if (!(obj instanceof CannyEdgeFilter)) {\n            return;\n        }\n\n        CannyEdgeFilter instance = (CannyEdgeFilter)obj;\n\n        Object[] args = (Object[])thisJoinPoint.getArgs();\n        GreyscaleImage image = (GreyscaleImage)args[0];\n\n        debugDisplay(image, \"after edge thinning\");\n\n        try {\n            String dirPath = ResourceFinder.findDirectory(\"bin\");\n\n            ImageIOHelper.writeOutputImage(dirPath + \"\/edgethinned.png\", image);\n\n        } catch (IOException e) {\n            log2.severe(e.getMessage());\n        }\n    }\n\n    after(GreyscaleImage input, float sigma) returning() :\n        call(public void ImageProcesser.blur(GreyscaleImage, float))\n        && args(input, sigma)\n\t    && target(algorithms.imageProcessing.ImageProcesser) {\n\n        Object[] args = (Object[])thisJoinPoint.getArgs();\n        GreyscaleImage output = (GreyscaleImage)args[0];\n\n        debugDisplay(output, \"blurred by \" + sigma);\n\n        try {\n            String dirPath = ResourceFinder.findDirectory(\"bin\");\n            ImageIOHelper.writeOutputImage(dirPath + \"\/blurred.png\", output);\n        } catch (IOException e) {\n            log2.severe(e.getMessage());\n        }\n    }\n\n    after(GreyscaleImage input) returning() :\n        call(void CannyEdgeFilter*.apply2LayerFilter(GreyscaleImage))\n        && args(input)\n\t    && target(algorithms.imageProcessing.CannyEdgeFilter) {\n\n        log2.fine(\"after CannyEdgeFilter*.apply2LayerFilter\");\n\n        Object[] args = (Object[])thisJoinPoint.getArgs();\n        GreyscaleImage output = (GreyscaleImage)args[0];\n\n        debugDisplay(output, \"after 2-threshold level filtering\");\n\n        try {\n            String dirPath = ResourceFinder.findDirectory(\"bin\");\n            ImageIOHelper.writeOutputImage(dirPath + \"\/filters2.png\", output);\n        } catch (IOException e) {\n            log2.severe(e.getMessage());\n        }\n    }\n\n    after(GreyscaleImage input, int k) returning() :\n        call(public void ImageProcesser.applyImageSegmentation(GreyscaleImage, int))\n        && args(input, k)\n\t    && target(algorithms.imageProcessing.ImageProcesser) {\n\n        Object[] args = (Object[])thisJoinPoint.getArgs();\n        GreyscaleImage image = (GreyscaleImage)args[0];\n        String kStr = ((Integer)args[1]).toString();\n\n        debugDisplay(image, \"segmented by k=\" + kStr);\n\n        try {\n            String dirPath = ResourceFinder.findDirectory(\"bin\");\n            ImageIOHelper.writeOutputImage(dirPath + \"\/segmented.png\", image);\n        } catch (IOException e) {\n            log2.severe(e.getMessage());\n        }\n    }\n\n    after(GreyscaleImage convolvedX, GreyscaleImage convolvedY) returning(GreyscaleImage output) :\n        call(public GreyscaleImage ImageProcesser.computeTheta(GreyscaleImage, GreyscaleImage))\n        && args(convolvedX, convolvedY)\n\t    && target(algorithms.imageProcessing.ImageProcesser) {\n\n        log2.fine(\"after ImageProcesser.computeTheta\");\n\n        debugDisplay(output, \"theta\");\n\n        try {\n            String dirPath = ResourceFinder.findDirectory(\"bin\");\n            ImageIOHelper.writeOutputImage(dirPath + \"\/gTheta.png\", output);\n        } catch (IOException e) {\n            log2.severe(e.getMessage());\n        }\n    }\n\n    after(GreyscaleImage convolvedX, GreyscaleImage convolvedY) returning(GreyscaleImage output) :\n        call(public GreyscaleImage ImageProcesser.combineConvolvedImages(GreyscaleImage, GreyscaleImage))\n        && args(convolvedX, convolvedY)\n\t    && target(algorithms.imageProcessing.ImageProcesser) {\n\n        log2.fine(\"after ImageProcesser*.combineConvolvedImages\");\n\n        Object[] args = (Object[])thisJoinPoint.getArgs();\n        GreyscaleImage cX = (GreyscaleImage)args[0];\n        GreyscaleImage cY = (GreyscaleImage)args[1];\n\n        debugDisplay(cX, \"gradient X\");\n        debugDisplay(cY, \"gradient Y\");\n        debugDisplay(output, \"gradient combined\");\n\n        try {\n            String dirPath = ResourceFinder.findDirectory(\"bin\");\n            ImageIOHelper.writeOutputImage(dirPath + \"\/gX.png\", cX);\n            ImageIOHelper.writeOutputImage(dirPath + \"\/gY.png\", cY);\n            ImageIOHelper.writeOutputImage(dirPath + \"\/gXY.png\", output);\n        } catch (IOException e) {\n            log2.severe(e.getMessage());\n        }\n    }\n   \n    before() \n        : call(void CurvatureScaleSpaceCornerDetector*.initialize() ) \n        && args() \n        && target(algorithms.imageProcessing.CurvatureScaleSpaceCornerDetector) {\n\n        Object obj = thisJoinPoint.getThis();\n\n        if (!(obj instanceof CurvatureScaleSpaceCornerDetector)) {\n            return;\n        }\n\n        CurvatureScaleSpaceCornerDetector instance = \n            (CurvatureScaleSpaceCornerDetector)obj;\n\n        if (!instance.getInitialized()) {\n            debugDisplay(instance.getImage(), \"original image\");\n        }\n    }\n\n    after(HistogramHolder h) returning(int[] peakAndMinIndexes) :\n        call(protected int[] CurvatureScaleSpaceCornerDetector.findFirstPeakAndMinimum(HistogramHolder))\n        && args(h) \n\t    && target(algorithms.imageProcessing.CurvatureScaleSpaceCornerDetector) { \t\t\n\n        Object[] args = (Object[])thisJoinPoint.getArgs();\n\n        HistogramHolder hist = (HistogramHolder)args[0];\n        \n        try {\n\n            float xMin = MiscMath.findMax(hist.getXHist());\n            float xMax = MiscMath.findMax(hist.getXHist());\n\n            float yMax = MiscMath.findMax(hist.getYHist());\n\n            if ((xMax > 0) && (yMax > 0)) {\n\n                plotter.addPlot(\n                    xMin, xMax, 0, yMax,\n                    hist.getXHist(), hist.getYHistFloat(), \n                    hist.getXErrors(), hist.getYErrors(), \n                    currentEdgeStr);\n\n                String filePath = plotter.writeFile(Integer.valueOf(10));\n            }\n\n            log2.fine(currentEdgeStr + \") x=\" + Arrays.toString(hist.getXHist()));\n\n            log2.fine(currentEdgeStr + \") y=\" + Arrays.toString(hist.getYHist()));\n\n        } catch(IOException e) {\n           log2.severe(e.getMessage());\n        }\n\t}\n\n    \/\/ execution works here, but call does not\n    after() returning : \n\t    target(algorithms.imageProcessing.CurvatureScaleSpaceCornerDetector) \n        && execution(public void findCorners())\n    {\n    \n        Object obj = thisJoinPoint.getThis();\n\n        log2.info(\"after findCorners() \" + obj.getClass().getSimpleName());\n\n        if (!(obj instanceof CurvatureScaleSpaceCornerDetector)) {\n            return;\n        }\n\n        CurvatureScaleSpaceCornerDetector instance = \n            (CurvatureScaleSpaceCornerDetector)obj;\n\n        Image img3 = instance.getOriginalImage().copyImageToGreen();\n\n        List<PairIntArray> edges = instance.getEdgesInOriginalReferenceFrame();\n\n        PairIntArray corners = instance.getCornersInOriginalReferenceFrame();\n\n        try {\n            \/\/ multi-colored edges alone:\n            debugDisplay(edges, \"edges extracted\", true, img3.getWidth(), img3.getHeight());\n\n            \n            for (PairIntArray edge : edges) {\n                ImageIOHelper.addCurveToImage(edge, img3, 0, 255, 255, 0);\n            }\n            ImageIOHelper.addCurveToImage(corners, img3, 1, 255, 0, 0);\n            \n            ImageIOHelper.addCurveToImage(\n                instance.getCornersForMatchingInOriginalReferenceFrame(),\n                img3, 2, 255, 0, 255);\n\n            debugDisplay(img3, \"original image w\/ edges and corners overplotted\");\n            String dirPath = ResourceFinder.findDirectory(\"bin\");\n            ImageIOHelper.writeOutputImage(\n                dirPath + \"\/image_with_edges_corners.png\", img3);\n \n        } catch (IOException ex) {\n            throw new RuntimeException(\"ERROR: l298\" + ex.getMessage());\n        }\n\n        log2.info(\"done\");\n    }\n\n    before(ScaleSpaceCurve scaleSpace, int edgeNumber, boolean rmFlseCrnrs, boolean isAClosedCurve) :\n        target(algorithms.imageProcessing.CurvatureScaleSpaceCornerDetector)\n        && call(protected PairFloatArray CurvatureScaleSpaceCornerDetector.findCornersInScaleSpaceMap(\n        ScaleSpaceCurve, int, boolean, boolean))\n        && args(scaleSpace, edgeNumber, rmFlseCrnrs, isAClosedCurve) {\n\n        log2.fine(\"before findCornersInScaleSpaceMap for edge \" \n            + Integer.toString(edgeNumber) + \":\");\n\n        Object[] args = (Object[])thisJoinPoint.getArgs();\n        Integer eNumber = (Integer)args[1];\n\n        currentEdgeStr = eNumber.toString();\n\n    }\n\n    after(PairIntArray xyCurve, List<Integer> maxCandidateCornerIndexes, \n        boolean isAClosedCurve) returning(PairIntArray jaggedLines) :\n        call(protected PairIntArray CurvatureScaleSpaceCornerDetector.removeFalseCorners(\n        PairIntArray, List<Integer>, boolean))\n        && args(xyCurve, maxCandidateCornerIndexes, isAClosedCurve) \n        && target(algorithms.imageProcessing.CurvatureScaleSpaceCornerDetector) {\n\n        \/\/disable for most uses\n        if (true) {\n            return;\n        }\n        Object obj = thisJoinPoint.getThis();\n\n        if (!(obj instanceof CurvatureScaleSpaceCornerDetector)) {\n            return;\n        }\n\n        CurvatureScaleSpaceCornerDetector instance = (CurvatureScaleSpaceCornerDetector)obj;\n\n        Object[] args = (Object[])thisJoinPoint.getArgs();\n        PairIntArray xy = (PairIntArray)args[0];\n        List<Integer> cI = (List<Integer>)args[1];\n\n        Image image2 = instance.getImage().copyImageToGreen();\n        \n        \/\/ draw a blue line between jagged line end points\n        int nExtraForDot = 2;\n        int rClr = 0; int bClr = 250; int gClr = 0;\n        for (int i = 0; i < jaggedLines.getN(); i++) {\n\n            int idx0 = jaggedLines.getX(i);\n            int idx1 = jaggedLines.getY(i);\n\n            int x0 = xy.getX(idx0);\n            int y0 = xy.getY(idx0);\n\n            int x1 = xy.getX(idx1);\n            int y1 = xy.getY(idx1);\n\n            for (int dx = (-1*nExtraForDot); dx < (nExtraForDot + 1); dx++) {\n                float xx = x0 + dx;\n                if ((xx > -1) && (xx < (image2.getWidth() - 1))) {\n                    for (int dy = (-1*nExtraForDot); dy < (nExtraForDot + 1); dy++) {\n                        float yy = y0 + dy;\n                        if ((yy > -1) && (yy < (image2.getHeight() - 1))) {\n                            image2.setRGB((int)xx, (int)yy, 0, 250, 250);\n                        }\n                    }\n                }\n            }\n            for (int dx = (-1*nExtraForDot); dx < (nExtraForDot + 1); dx++) {\n                float xx = x1 + dx;\n                if ((xx > -1) && (xx < (image2.getWidth() - 1))) {\n                    for (int dy = (-1*nExtraForDot); dy < (nExtraForDot + 1); dy++) {\n                        float yy = y1 + dy;\n                        if ((yy > -1) && (yy < (image2.getHeight() - 1))) {\n                            image2.setRGB((int)xx, (int)yy, 0, 0, 250);\n                        }\n                    }\n                }\n            }\n        }\n        nExtraForDot = 1;\n        rClr = 250; bClr = 0; gClr = 0;\n        for (Integer idx : cI) {\n\n            int x = xy.getX(idx.intValue());\n            int y = xy.getY(idx.intValue());\n\n            for (int dx = (-1*nExtraForDot); dx < (nExtraForDot + 1); dx++) {\n                float xx = x + dx;\n                if ((xx > -1) && (xx < (image2.getWidth() - 1))) {\n                    for (int dy = (-1*nExtraForDot); dy < (nExtraForDot + 1); dy++) {\n                        float yy = y + dy;\n                        if ((yy > -1) && (yy < (image2.getHeight() - 1))) {\n                            image2.setRGB((int)xx, (int)yy, rClr, gClr, bClr);\n                        }\n                    }\n                }\n            }\n        }\n\n        try {\n            ImageDisplayer.displayImage(\"corners and jagged lines\", image2);\n        } catch (IOException e) {\n            log2.severe(e.getMessage());\n        }\n      \n    }\n\n    after(ScaleSpaceCurve scaleSpace, int edgeNumber, boolean rmFlseCrnrs,\n        boolean isAClosedCurve) \n        returning(PairFloatArray xy) :\n        target(algorithms.imageProcessing.CurvatureScaleSpaceCornerDetector)\n        && call(protected PairFloatArray CurvatureScaleSpaceCornerDetector.findCornersInScaleSpaceMap(\n        ScaleSpaceCurve, int, boolean, boolean))\n        && args(scaleSpace, edgeNumber, rmFlseCrnrs, isAClosedCurve) {\n\n        log2.fine(\"after findCornersInScaleSpaceMap for edge \" \n            + Integer.toString(edgeNumber) + \":\");\n\n        for (int i = 0; i < xy.getN(); i++) {\n            log2.fine(String.format(\"(%f, %f)\", xy.getX(i), xy.getY(i)));\n        }\n    }\n\n    before() \n        : call(List<PairIntArray> EdgeExtractor*.findEdges() ) \n        && args() \n        && target(algorithms.imageProcessing.EdgeExtractor) {\n\n        log2.fine(\"before EdgeExtractor*.findEdges()\");\n\n        Object obj = thisJoinPoint.getThis();\n\n        if (!(obj instanceof EdgeExtractor)) {\n            return;\n        }\n\n        EdgeExtractor instance = (EdgeExtractor)obj;\n\n        try {\n            String dirPath = ResourceFinder.findDirectory(\"bin\");\n\n            ImageIOHelper.writeOutputImage(dirPath + \"\/edges0.png\", \n                instance.getImage());\n\n            plotHistogram(instance.getImage(), \"edges before dfs\");\n\n        } catch (IOException ex) {\n\n            log2.severe(\"ERROR: l359\" + ex.getMessage());\n        }\n    }\n\n    after() returning(List<PairIntArray> edges) : \n\t    target(algorithms.imageProcessing.EdgeExtractor) \n        && execution(List<PairIntArray> EdgeExtractor*.findEdges()) {\n\n        Object obj = thisJoinPoint.getThis();\n\n        if (!(obj instanceof EdgeExtractor)) {\n            return;\n        }\n\n        EdgeExtractor instance = (EdgeExtractor)obj;\n\n        GreyscaleImage img3 = instance.getImage();\n\n        try {\n            String dirPath = ResourceFinder.findDirectory(\"bin\");\n\n            \/\/ multi-colored edges alone:\n            debugDisplay(edges, \"edges extracted (not in original frame)\", \n                true, img3.getWidth(), img3.getHeight());\n\n        } catch (IOException ex) {\n\n            log2.severe(\"ERROR: l359\" + ex.getMessage());\n        }\n    }\n\n    before(ImageStatistics stats, HistogramHolder originalImageHistogram) \n        : call(int LowIntensityRemovalFilter*.determineLowThreshold( \n        ImageStatistics,  HistogramHolder))\n        && args(stats, originalImageHistogram) \n        && target(algorithms.imageProcessing.LowIntensityRemovalFilter) {\n\n        log2.fine(\"before LowIntensityRemovalFilter*.determineLowThreshold\");\n\n        plotHistogram0(stats.getHistogram(),  \"border histogram\");\n    }\n\n    private int debugfindEdgeWithRange(List<PairIntArray> edges,\n        int xLo, int xHi, int yLo, int yHi) {\n\n        for (int i = 0; i < edges.size(); i++) {\n            boolean c = debugContainsAPoint(edges.get(i), xLo, xHi, yLo, yHi);\n            if (c) {\n                return i;\n            }\n        }\n        return -1;\n    }\n    private boolean debugContainsAPoint(PairIntArray edge, \n        int xLo, int xHi, int yLo, int yHi) {\n        for (int i = 0; i < edge.getN(); i++) {\n            int x = edge.getX(i);\n            int y = edge.getY(i);\n            if (x >= xLo && x <= xHi && y >= yLo && y <= yHi) {\n                return true;\n            }\n        }\n        return false;\n    }\n\n    private void debugDisplay(Image input, String label) throws IOException {\n     \n        ImageDisplayer.displayImage(label, input);\n    }\n \n    private void debugDisplay(List<PairIntArray> curves, String label,\n        boolean writeImage, int width, int height) throws IOException {\n        \n        log2.fine(\"create multicolor curve debug image\");\n\n        Image img2 = new Image(width, height);\n\n        ImageIOHelper.addAlternatingColorCurvesToImage(curves, \"edges.png\",\n            writeImage, img2);        \n        \n        ImageDisplayer.displayImage(label, img2);\n       \n    }\n\n    public void debugDisplay(GreyscaleImage input, String label) {\n     \n        try {\n            ImageDisplayer.displayImage(label, input);\n\n        } catch (IOException e) {\n\n            log2.severe(e.getMessage());\n        }\n    }\n    \n    private void debugAddCurveToImage(float[] xPoints, float[] yPoints, \n        Image input, int nExtraForDot, int rClr, int gClr, int bClr) {\n        \n        for (int i = 0; i < xPoints.length; i++) {\n            int x = (int) xPoints[i];\n            int y = (int) yPoints[i];\n            \n            for (int dx = (-1*nExtraForDot); dx < (nExtraForDot + 1); dx++) {\n                float xx = x + dx;\n                if ((xx > -1) && (xx < (input.getWidth() - 1))) {\n                    for (int dy = (-1*nExtraForDot); dy < (nExtraForDot + 1); dy++) {\n                        float yy = y + dy;\n                        if ((yy > -1) && (yy < (input.getHeight() - 1))) {\n                            input.setRGB((int)xx, (int)yy, rClr, gClr, bClr);\n                        }\n                    }\n                }\n            }\n        }\n    }\n    \n    private void debugDisplayScaleSpaceImages(PairIntArray edge,\n        Map<SIGMA, ScaleSpaceCurve> map, GreyscaleImage img) {\n                \n        try {\n            \/\/plot the edge and all scale space images\n            Image debugImg = img.copyImageToGreen();\n            \n            ImageIOHelper.addCurveToImage(edge, debugImg, 0, 0, 255, 0);\n            \n\/\/the convolutions should be acting upon data that starts at (0,0)\n\/\/ and an offset applied?\n\/\/ check an edge which is near x=0 and y=0\n            \n            Iterator<Entry<SIGMA, ScaleSpaceCurve>> iter = map.entrySet().iterator();\n            while (iter.hasNext()) {\n                Entry<SIGMA, ScaleSpaceCurve> entry = iter.next();\n                ScaleSpaceCurve dss = entry.getValue();\n                ImageIOHelper.addCurveToImage(dss, debugImg, 0, 0, 0, 255);\n            }\n            \n            ImageDisplayer.displayImage(\"scale space images\", debugImg);\n                            \n            int z = 1;\n            \n        } catch (IOException ex) {\n            throw new RuntimeException(\"ERROR: l548\" + ex.getMessage());\n        }\n    }\n\n    private void debugDisplayScaleSpace(ScaleSpaceCurve maxScaleSpace, \n        List<Integer> maxCandidateCornerIndexes, PolygonAndPointPlotter plotter, \n        float[] xc, float[] yc, SIGMA sigma, int edgeNumber, \n        int width, int height) {\n        \n        float[] tCornersForPlot = new float[xc.length];\n        float[] kCornersForPlot = new float[xc.length];\n        for (int ii = 0; ii < maxCandidateCornerIndexes.size(); ii++) {\n            int idx = maxCandidateCornerIndexes.get(ii);\n            tCornersForPlot[ii] = maxScaleSpace.getT()[idx];\n            kCornersForPlot[ii] = maxScaleSpace.getK(idx);\n            if (kCornersForPlot[ii] < 0) {\n                kCornersForPlot[ii] *= -1;\n            }\n        }\n        try {\n            float[] tmpX = maxScaleSpace.getT();\n            float[] k = maxScaleSpace.getK();\n            float[] tmpk = Arrays.copyOf(k, k.length);\n            for (int ii = 1; ii < tmpk.length; ii++) {\n                if (tmpk[ii] < 0) {\n                    tmpk[ii] *= -1;\n                }\n            }\n            \n            plotter.addPlot(0.0f, 1.f, 0, MiscMath.findMax(tmpk), \n                tmpX, tmpk, tCornersForPlot, kCornersForPlot,\n                \"k for sigma=\" + sigma.toString() \n                + \" edge=\" + edgeNumber);\n\n            String filePath = plotter.writeFile();\n\n            Image img3 = new Image(width, height);\n\n            ImageIOHelper.addCurveToImage(maxScaleSpace, img3, 0, 255, 255, \n                255);\n\n            debugAddCurveToImage(xc, yc, img3, 1, 255, 0, 0);\n\n            ImageDisplayer.displayImage(\n                \"corner candidates (maxSigma=\" + sigma.toString() \n                + \")\", img3);\n\n        } catch (Exception e) {\n            throw new RuntimeException(\"ERROR: l595\" + e.getMessage());\n        }                \n    }\n\n    private void debugDisplay(ScaleSpaceCurve scaleSpace, List<Integer> \n        candidateCornerIndexes, String label, int width, int height) \n        throws IOException {\n        \n        Image img2 = new Image(width, height);\n        \n        ImageIOHelper.addCurveToImage(scaleSpace, img2, 0, 255, 255, 255);\n      \n        for (Integer idx : candidateCornerIndexes) {\n            float x = scaleSpace.getX(idx.intValue());\n            float y = scaleSpace.getY(idx.intValue());\n            \n            img2.setRGB((int)x, (int)y, 255, 0, 0);\n            \/\/ make a plus symbol because the dot is too small\n            for (int d = -1; d < 2; d++) {\n                float xx = x + d;\n                if ((xx > -1) && (xx < (width - 1))) {\n                    img2.setRGB((int)xx, (int)y, 255, 0, 0);\n                }\n            }\n            for (int d = -1; d < 2; d++) {\n                float yy = y + d;\n                if ((yy > -1) && (yy < (height - 1))) {\n                    img2.setRGB((int)x, (int)yy, 255, 0, 0);\n                }\n            }\n        }\n        \n        ImageDisplayer.displayImage(label, img2);\n    }\n      \n    public double debugAreaUnderTheCurve(float[] x, float[] y) {\n        \n        \/\/ using trapezoidal rule\n        \n        if (x.length == 0) {\n            return 0;\n        } else if (x.length == 1) {\n            \/\/ this isn't correct, but is fine for the one case it's used for\n            return (y[0]);\n        }\n        \n        double sum = 0;\n        \n        for (int i = 0; i < (x.length - 1); i++) {\n            float yTerm = y[i + 1] + y[i];\n            float xLen = x[i + 1] - x[i];\n            sum += (yTerm * xLen);\n        }\n        \n        sum *= 0.5;\n        \n        return sum;\n    }\n    \n    private void debugDisplay(PairIntArray edge, PairIntArray corners,\n        String label, int width, int height) throws IOException {\n        \n        Image img2 = new Image(width, height);\n        \n        ImageIOHelper.addCurveToImage(edge, img2, 0, 255, 255, 255);\n        \n        ImageIOHelper.addCurveToImage(corners, img2, 1, 255, 0, 0);\n        \n        ImageDisplayer.displayImage(label, img2);\n     \n        int z = 1;\n    }\n    \n    private void plotHistogram0(HistogramHolder h, String label) {\n                \n        float[] xh = h.getXHist();\n        float[] yh = h.getYHistFloat();\n        \n        float yMin = MiscMath.findMin(yh);\n        int yMaxIdx = MiscMath.findYMaxIndex(yh);\n        float yMax = yh[yMaxIdx];\n        \n        float xMin = MiscMath.findMin(xh);\n        float xMax = MiscMath.findMax(xh);        \n        \n        log2.fine(\"MODE=\" + xh[yMaxIdx]);\n        \n        try {\n\n            PolygonAndPointPlotter plotter = new PolygonAndPointPlotter();\n            \n            plotter.addPlot(\n                xMin, xMax, yMin, yMax,\n                xh, yh, xh, yh, label);\n\n            String filePath = plotter.writeFile3();\n            \n            log2.fine(\"created histogram at \" + filePath);\n            \n        } catch (IOException e) {\n            e.printStackTrace(); \n            log2.severe(\"ERROR while plotting histogram: \" + e.getMessage());\n        }\n    }\n\n    private void plotHistogram(GreyscaleImage img, String label) throws \n    IOException {\n        \n        float[] v = new float[img.getWidth() * img.getHeight()];\n        float[] ve = new float[v.length];\n        \n        int count = 0;\n        for (int i = 0; i < img.getWidth(); i++) {\n            for (int j = 0; j < img.getHeight(); j++) {\n                v[count] = img.getValue(i, j);\n                ve[count] = (float)Math.sqrt(v[count]);\n                count++;\n            }\n        }\n        \n        HistogramHolder h = Histogram.createSimpleHistogram(v, ve);\n        \/\/HistogramHolder h = Histogram.defaultHistogramCreator(v, ve);\n        \n        float[] xh = h.getXHist();\n        float[] xhe = h.getXErrors();\n        float[] yh = h.getYHistFloat();\n        float[] yhe = h.getYErrors();\n        int firstZero = -1;\n        for (int i = (yh.length - 1); i > -1; i--) {\n            if (yh[i] > 0) {\n                break;\n            } else {\n                firstZero = i;\n            }\n        }\n        if (firstZero > -1) {\n            int n = xh.length - firstZero;\n            xh = Arrays.copyOf(xh, n);\n            xhe = Arrays.copyOf(xhe, n);\n            yh = Arrays.copyOf(yh, n);\n            yhe = Arrays.copyOf(yhe, n);\n        }\n        \n        float xMax = MiscMath.findMax(xh);\n        float yMax = MiscMath.findMax(yh);\n        \n        int yMaxIdx = MiscMath.findYMaxIndex(yh);\n        yMax = yh[yMaxIdx + 3];\n        \n        PolygonAndPointPlotter plotter2 = new PolygonAndPointPlotter();\n        \n        plotter2.addPlot(0, xMax, 0, yMax, xh, yh, xhe, yhe, label);\n        \n        String filePath = plotter2.writeFile3();\n        \n        log2.info(\"filePath=\" + filePath);\n    }\n\n    public void printContents(ScaleSpaceCurveImage spaceImage) {\n        StringBuilder sb = new StringBuilder();\n        for (int i = 0; i < spaceImage.getImageSigmas().length; i++) {\n            sb.append(\"sigma=\").append(spaceImage.getImageSigmas()[i]).append(\": \");\n            float[] t = spaceImage.getScaleSpaceImage()[i];\n            for (int j = 0; j < t.length; j++) {\n                sb.append(\"t=\").append(t[j]).append(\" \");\n            }\n            sb.append(\"\\n\");\n        }\n        log2.fine(sb.toString());\n    }\n   \n    public String printImage(ScaleSpaceCurveImage spaceImage, \n        PolygonAndPointPlotter plotterC, int fileNumber) {\n        \n        if (plotterC == null) {\n            return null;\n        }\n        int nTotalPoints = 0;\n        for (int i = 0; i < spaceImage.getImageSigmas().length; i++) {\n            float[] t = spaceImage.getScaleSpaceImage()[i];\n            nTotalPoints+= t.length;\n        }\n        \n        try {\n            int count = 0;\n            float[] x = new float[nTotalPoints];\n            float[] y = new float[x.length];\n            for (int i = 0; i < spaceImage.getImageSigmas().length; i++) {\n                float sigma = spaceImage.getImageSigmas()[i];\n                float[] t = spaceImage.getScaleSpaceImage()[i];\n                for (int j = 0; j < t.length; j++) {\n                    y[count] = sigma;\n                    x[count] = t[j];\n                    count++;\n                }\n            }\n            float xMin = 0;\n            float xMax = 1.0f;\n            float yMin = MiscMath.findMin(y);\n            if (yMin < 0) {\n                yMin *= 1.1;\n            } else {\n                yMin *= 0.9;\n            }\n            float yMax = MiscMath.findMax(y);\n\n            plotterC.addPlot(xMin, xMax,yMin, yMax, x, y, null, null,\n                \"\");\n\n            String filePathC = plotterC.writeFile(fileNumber);\n            \n            return filePathC;\n            \n        } catch(Exception e) {\n            log2.severe(e.getMessage());\n        }\n        \n        return null;\n    }\n}\n","old_contents":"package algorithms.imageProcessing;\n\nimport java.io.IOException;\nimport java.util.logging.Logger;\nimport algorithms.util.*;\nimport algorithms.misc.Histogram;\nimport algorithms.misc.HistogramHolder;\nimport algorithms.misc.MiscMath;\nimport algorithms.util.Errors;\nimport java.awt.Color;\nimport java.util.ArrayList;\nimport java.util.Arrays;\nimport java.util.HashMap;\nimport java.util.Iterator;\nimport java.util.List;\nimport java.util.Map;\nimport java.util.Map.Entry;\n\n\/**\nclass to create debugging output from the main source code\n*\/\npublic aspect CurvatureAspect {\n\n    private PolygonAndPointPlotter plotter = null;\n\n    \/\/ for the ContourFinder plots:\n    private PolygonAndPointPlotter plotter9 = null;\n\n    private Logger log2 = Logger.getAnonymousLogger();\n\n    private String currentEdgeStr = \"\";\n\n    after() :\n        target(algorithms.imageProcessing.ContourFinder) \n        && execution(public ContourFinder.new(..)) {\n\n        log2.fine(\"===> in aspect for ContourFinder\");\n\n        if (plotter9 == null) {\n            try {\n            plotter9 = new PolygonAndPointPlotter();\n            } catch (IOException e) {\n                log2.severe(\"ERROR: \" + e.getMessage());\n            }\n        }\n    }\n\n    before(ScaleSpaceCurveImage scaleSpaceImage, int edgeNumber) :\n        execution(List<CurvatureScaleSpaceContour> algorithms.imageProcessing.ContourFinder.findContours(ScaleSpaceCurveImage, int))\n        && args(scaleSpaceImage, edgeNumber) \n\t    && target(algorithms.imageProcessing.ContourFinder) {\n\n        Object obj = thisJoinPoint.getThis();\n\n        if (!(obj instanceof ContourFinder)) {\n            return;\n        }\n\n        ContourFinder instance = (ContourFinder)obj;\n\n        Object[] args = (Object[])thisJoinPoint.getArgs();\n\n        ScaleSpaceCurveImage scaleSpaceImageIn = (ScaleSpaceCurveImage)args[0];\n        int edgeNumberIn = ((Integer)args[1]).intValue();\n\n        String filePath = printImage(scaleSpaceImageIn, plotter9, 9);\n\n        log2.fine(\"===> in aspect for ContourFinder, filePath=\" + filePath);\n    }\n\n    after(ScaleSpaceCurveImage scaleSpaceImage, int edgeNumber) \n        returning(List<CurvatureScaleSpaceContour> contours) :\n        execution(List<CurvatureScaleSpaceContour> algorithms.imageProcessing.ContourFinder.findContours(ScaleSpaceCurveImage, int))\n        && args(scaleSpaceImage, edgeNumber) \n\t    && target(algorithms.imageProcessing.ContourFinder) {\n\n        Object obj = thisJoinPoint.getThis();\n\n        if (!(obj instanceof ContourFinder)) {\n            return;\n        }\n\n        ContourFinder instance = (ContourFinder)obj;\n\n        for (int i = 0; i < contours.size(); i++) {\n\n            CurvatureScaleSpaceContour contour = contours.get(i);\n\n            float sigma = contour.getPeakSigma();\n            float t = contour.getPeakScaleFreeLength();\n\n            String str = String.format(\"edge=%d contour=%d (%f, %f)\", \n                contour.getEdgeNumber(), i, sigma, t);\n\n            log2.fine(str);\n        }\n    }\n\n    after() returning() \n        : execution(public void algorithms.imageProcessing.CurvatureScaleSpaceInflectionMapper*.initialize() ) \n        && args() \n        && target(algorithms.imageProcessing.CurvatureScaleSpaceInflectionMapper) {\n    \n        Object obj = thisJoinPoint.getThis();\n\n        if (!(obj instanceof CurvatureScaleSpaceInflectionMapper)) {\n            return;\n        }\n\n        CurvatureScaleSpaceInflectionMapper instance = (CurvatureScaleSpaceInflectionMapper)obj;\n\n        List<CurvatureScaleSpaceContour> contours1 = instance.getContours1();\n\n        List<CurvatureScaleSpaceContour> contours2 = instance.getContours2();\n\n        log2.info(\"number of matched contours1=\" + contours1.size() +\n            \" number of matched contours2=\" + contours2.size());\n\n        PairIntArray xyc1 = new PairIntArray();\n        PairIntArray xyc2 = new PairIntArray();\n\n        for (int i = 0; i < contours1.size(); i++) {\n            CurvatureScaleSpaceContour c1 = contours1.get(i);\n            CurvatureScaleSpaceImagePoint[] details = c1.getPeakDetails();\n            for (CurvatureScaleSpaceImagePoint detail : details) {\n                xyc1.add(detail.getXCoord(), detail.getYCoord());\n            }\n        }\n        for (int i = 0; i < contours2.size(); i++) {\n            CurvatureScaleSpaceContour c2 = contours2.get(i);\n            CurvatureScaleSpaceImagePoint[] details = c2.getPeakDetails();\n            for (CurvatureScaleSpaceImagePoint detail : details) {\n                xyc2.add(detail.getXCoord(), detail.getYCoord());\n            }\n        }\n\n        log2.info(\"Number of contours from image1=\" + contours1.size() +\n            \" number of contours from image2=\" + contours2.size());\n\n        try {\n\n            Image img1 = instance.getImage1().copyImageToGreen();\n            \n            ImageIOHelper.addCurveToImage(xyc1, img1, 2, 255, 0, 0);\n            String dirPath = ResourceFinder.findDirectory(\"bin\");\n            ImageIOHelper.writeOutputImage(\n                dirPath + \"\/contour_peaks1.png\", img1);\n\n            Image img2 = instance.getImage2().copyImageToGreen();\n            \n            ImageIOHelper.addCurveToImage(xyc2, img2, 2, 255, 0, 0);\n            ImageIOHelper.writeOutputImage(\n                dirPath + \"\/contour_peaks2.png\", img2);\n\n        } catch (IOException e) {\n            log2.severe(\"ERROR: \" + e.getMessage());\n        }\n\n    }\n\n    after() \n        returning(TransformationParameters params) :\n        execution(public TransformationParameters algorithms.imageProcessing.CurvatureScaleSpaceInflectionMapper.createEuclideanTransformation())\n\t    && target(algorithms.imageProcessing.CurvatureScaleSpaceInflectionMapper) {\n\n        Object obj = thisJoinPoint.getThis();\n\n        if (!(obj instanceof CurvatureScaleSpaceInflectionMapper)) {\n            return;\n        }\n\n        if (params == null) {\n            return;\n        }\n\n        CurvatureScaleSpaceInflectionMapper instance = (CurvatureScaleSpaceInflectionMapper)obj;\n\n        List<CurvatureScaleSpaceContour> contours1 = instance.getMatchedContours1();\n\n        List<CurvatureScaleSpaceContour> contours2 = instance.getMatchedContours2();\n\n        log2.info(\"number of matched contours1=\" + contours1.size() +\n            \" number of matched contours2=\" + contours2.size());\n\n        for (int i = 0; i < contours1.size(); i++) {\n\n            CurvatureScaleSpaceContour c1 = contours1.get(i);\n            CurvatureScaleSpaceContour c2 = contours2.get(i);\n\n            float sigma1 = c1.getPeakSigma();\n            float t1 = c1.getPeakScaleFreeLength();\n            int i1 = c1.getEdgeNumber();\n\n            float sigma2 = c2.getPeakSigma();\n            float t2 = c2.getPeakScaleFreeLength();\n            int i2 = c2.getEdgeNumber();\n\n            String str = String.format(\n                \"matched edge=%d (%f, %f) (%f, %f) edge=%d\", i1, sigma1, t1, \n                sigma2, t2, i2);\n\n            log2.fine(str);\n        }\n        \n        PairIntArray[] matchedXY1 = instance.getMatchedXY1();\n        PairIntArray[] matchedXY2 = instance.getMatchedXY2();\n        if (matchedXY1 == null) {\n            matchedXY1 = new PairIntArray[0];\n            matchedXY2 = new PairIntArray[0];\n        }\n        PairIntArray xy1Tot = new PairIntArray();\n        PairIntArray xy2Tot = new PairIntArray();\n        for (int i = 0; i < matchedXY1.length; i++) {\n            for (int j = 0; j < matchedXY1[i].getN(); j++) {\n                xy1Tot.add(matchedXY1[i].getX(j), matchedXY1[i].getY(j));\n                xy2Tot.add(matchedXY2[i].getX(j), matchedXY2[i].getY(j));\n            }\n        }\n\n        try {\n\n            Image img1 = instance.getImage1().copyImageToGreen();\n            \n            ImageIOHelper.addCurveToImage(xy1Tot, img1, 1, 255, 0, 0);\n            String dirPath = ResourceFinder.findDirectory(\"bin\");\n            ImageIOHelper.writeOutputImage(\n                dirPath + \"\/contour_peaks1.png\", img1);\n\n            Image img2 = instance.getImage2().copyImageToGreen();\n            \n            ImageIOHelper.addCurveToImage(xy2Tot, img2, 1, 255, 0, 0);\n            ImageIOHelper.writeOutputImage(\n                dirPath + \"\/contour_peaks2.png\", img2);\n\n        } catch (IOException e) {\n            log2.severe(\"ERROR: \" + e.getMessage());\n        }\n\n    }\n\n    before(final PairIntArray edge, \n        final Map<SIGMA, ScaleSpaceCurve> scaleSpaceCurves, int edgeNumber) \n        : call(PairIntArray CurvatureScaleSpaceCornerDetector*.findCornersInScaleSpaceMap( \n        PairIntArray, Map<SIGMA, ScaleSpaceCurve>, int) ) \n        && args(edge, scaleSpaceCurves, edgeNumber) \n        && target(algorithms.imageProcessing.CurvatureScaleSpaceCornerDetector) {\n\n        try {\n            plotter = new PolygonAndPointPlotter();\n        } catch (IOException ex) {\n            ex.printStackTrace();\n            throw new RuntimeException(\"ERROR: l64\" + ex.getMessage());\n        }\n    }\n\n\tafter(PairIntArray curve, int cIndex, float[] g, final boolean calcX) \n        returning(double curvature) :\n        call(double Kernel1DHelper.convolvePointWithKernel(PairIntArray, int, \n        float[], boolean))\n        && args(curve, cIndex, g, calcX) \n\t    && target(algorithms.imageProcessing.Kernel1DHelper) {\n\n        \/*Object[] args = (Object[])thisJoinPoint.getArgs();\n\n        PairIntArray c = (PairIntArray)args[0];\n        int cIdx = (Integer)args[1];\n\n\t\tString str = String.format(\"k=%f  x,y=(%d, %d)\", curvature,\n            c.getX(cIdx), c.getY(cIdx));\n\n        log2.info(str);*\/\n\t}\n\n    after(GreyscaleImage img, int col, int row, float[] g, final boolean calcX) returning(double curvature) :\n        call(double Kernel1DHelper*.convolvePointWithKernel(GreyscaleImage, int, int, float[], boolean))\n        && args(img, col, row, g, calcX) \n\t    && target(algorithms.imageProcessing.Kernel1DHelper) {\t\t\n\n        \/*Object[] args = (Object[])thisJoinPoint.getArgs();\n        Integer c = (Integer)args[1];\n        Integer r = (Integer)args[2];\n\n\t\tString str = String.format(\"k=%f  x,y=(%d, %d)\", curvature, c, r);\n        log2.info(str);*\/\n\t}\n\n    after(GreyscaleImage input, HistogramHolder imgHistogram) returning(ImageStatistics stats) :\n        execution(public ImageStatistics LowIntensityRemovalFilter+.removeLowIntensityPixels(GreyscaleImage, HistogramHolder))\n        && args(input, imgHistogram) \n\t    && target(algorithms.imageProcessing.LowIntensityRemovalFilter) {\t\t\n\n        Object[] args = (Object[])thisJoinPoint.getArgs();\n\n        GreyscaleImage img = (GreyscaleImage)args[0];\n\n        try {\n            String dirPath = ResourceFinder.findDirectory(\"bin\");\n            ImageIOHelper.writeOutputImage(dirPath + \"\/filters_1.png\", img);\n        } catch(IOException e) {\n            log2.severe(e.getMessage());\n        }\n\t}\n\n    \/\/ note, execution binds to CannyEdgeFilter which is good,\n    \/\/ but call binds to the invoker CurvatureScaleSpaceCornerDetector\n    after(GreyscaleImage img) returning() :\n        execution(public void CannyEdgeFilter.applyFilter(GreyscaleImage))\n        && args(img)\n\t    && target(algorithms.imageProcessing.CannyEdgeFilter) {\n\n        Object obj = thisJoinPoint.getThis();\n\n        log2.fine(\"after CannyEdgeFilter.applyFilter instance=\" \n            + obj.getClass().getName());\n\n        if (!(obj instanceof CannyEdgeFilter)) {\n            return;\n        }\n\n        CannyEdgeFilter instance = (CannyEdgeFilter)obj;\n\n        Object[] args = (Object[])thisJoinPoint.getArgs();\n        GreyscaleImage image = (GreyscaleImage)args[0];\n\n        debugDisplay(image, \"after edge thinning\");\n\n        try {\n            String dirPath = ResourceFinder.findDirectory(\"bin\");\n\n            ImageIOHelper.writeOutputImage(dirPath + \"\/edgethinned.png\", image);\n\n        } catch (IOException e) {\n            log2.severe(e.getMessage());\n        }\n    }\n\n    after(GreyscaleImage input, float sigma) returning() :\n        call(public void ImageProcesser.blur(GreyscaleImage, float))\n        && args(input, sigma)\n\t    && target(algorithms.imageProcessing.ImageProcesser) {\n\n        Object[] args = (Object[])thisJoinPoint.getArgs();\n        GreyscaleImage output = (GreyscaleImage)args[0];\n\n        debugDisplay(output, \"blurred by \" + sigma);\n\n        try {\n            String dirPath = ResourceFinder.findDirectory(\"bin\");\n            ImageIOHelper.writeOutputImage(dirPath + \"\/blurred.png\", output);\n        } catch (IOException e) {\n            log2.severe(e.getMessage());\n        }\n    }\n\n    after(GreyscaleImage input) returning() :\n        call(void CannyEdgeFilter*.apply2LayerFilter(GreyscaleImage))\n        && args(input)\n\t    && target(algorithms.imageProcessing.CannyEdgeFilter) {\n\n        log2.fine(\"after CannyEdgeFilter*.apply2LayerFilter\");\n\n        Object[] args = (Object[])thisJoinPoint.getArgs();\n        GreyscaleImage output = (GreyscaleImage)args[0];\n\n        debugDisplay(output, \"after 2-threshold level filtering\");\n\n        try {\n            String dirPath = ResourceFinder.findDirectory(\"bin\");\n            ImageIOHelper.writeOutputImage(dirPath + \"\/filters2.png\", output);\n        } catch (IOException e) {\n            log2.severe(e.getMessage());\n        }\n    }\n\n    after(GreyscaleImage input, int k) returning() :\n        call(public void ImageProcesser.applyImageSegmentation(GreyscaleImage, int))\n        && args(input, k)\n\t    && target(algorithms.imageProcessing.ImageProcesser) {\n\n        Object[] args = (Object[])thisJoinPoint.getArgs();\n        GreyscaleImage image = (GreyscaleImage)args[0];\n        String kStr = ((Integer)args[1]).toString();\n\n        debugDisplay(image, \"segmented by k=\" + kStr);\n\n        try {\n            String dirPath = ResourceFinder.findDirectory(\"bin\");\n            ImageIOHelper.writeOutputImage(dirPath + \"\/segmented.png\", image);\n        } catch (IOException e) {\n            log2.severe(e.getMessage());\n        }\n    }\n\n    after(GreyscaleImage convolvedX, GreyscaleImage convolvedY) returning(GreyscaleImage output) :\n        call(public GreyscaleImage ImageProcesser.computeTheta(GreyscaleImage, GreyscaleImage))\n        && args(convolvedX, convolvedY)\n\t    && target(algorithms.imageProcessing.ImageProcesser) {\n\n        log2.fine(\"after ImageProcesser.computeTheta\");\n\n        debugDisplay(output, \"theta\");\n\n        try {\n            String dirPath = ResourceFinder.findDirectory(\"bin\");\n            ImageIOHelper.writeOutputImage(dirPath + \"\/gTheta.png\", output);\n        } catch (IOException e) {\n            log2.severe(e.getMessage());\n        }\n    }\n\n    after(GreyscaleImage convolvedX, GreyscaleImage convolvedY) returning(GreyscaleImage output) :\n        call(public GreyscaleImage ImageProcesser.combineConvolvedImages(GreyscaleImage, GreyscaleImage))\n        && args(convolvedX, convolvedY)\n\t    && target(algorithms.imageProcessing.ImageProcesser) {\n\n        log2.fine(\"after ImageProcesser*.combineConvolvedImages\");\n\n        Object[] args = (Object[])thisJoinPoint.getArgs();\n        GreyscaleImage cX = (GreyscaleImage)args[0];\n        GreyscaleImage cY = (GreyscaleImage)args[1];\n\n        debugDisplay(cX, \"gradient X\");\n        debugDisplay(cY, \"gradient Y\");\n        debugDisplay(output, \"gradient combined\");\n\n        try {\n            String dirPath = ResourceFinder.findDirectory(\"bin\");\n            ImageIOHelper.writeOutputImage(dirPath + \"\/gX.png\", cX);\n            ImageIOHelper.writeOutputImage(dirPath + \"\/gY.png\", cY);\n            ImageIOHelper.writeOutputImage(dirPath + \"\/gXY.png\", output);\n        } catch (IOException e) {\n            log2.severe(e.getMessage());\n        }\n    }\n   \n    before() \n        : call(void CurvatureScaleSpaceCornerDetector*.initialize() ) \n        && args() \n        && target(algorithms.imageProcessing.CurvatureScaleSpaceCornerDetector) {\n\n        Object obj = thisJoinPoint.getThis();\n\n        if (!(obj instanceof CurvatureScaleSpaceCornerDetector)) {\n            return;\n        }\n\n        CurvatureScaleSpaceCornerDetector instance = \n            (CurvatureScaleSpaceCornerDetector)obj;\n\n        if (!instance.getInitialized()) {\n            debugDisplay(instance.getImage(), \"original image\");\n        }\n    }\n\n    after(HistogramHolder h) returning(int[] peakAndMinIndexes) :\n        call(protected int[] CurvatureScaleSpaceCornerDetector.findFirstPeakAndMinimum(HistogramHolder))\n        && args(h) \n\t    && target(algorithms.imageProcessing.CurvatureScaleSpaceCornerDetector) { \t\t\n\n        Object[] args = (Object[])thisJoinPoint.getArgs();\n\n        HistogramHolder hist = (HistogramHolder)args[0];\n        \n        try {\n\n            float xMin = MiscMath.findMax(hist.getXHist());\n            float xMax = MiscMath.findMax(hist.getXHist());\n\n            float yMax = MiscMath.findMax(hist.getYHist());\n\n            if ((xMax > 0) && (yMax > 0)) {\n\n                plotter.addPlot(\n                    xMin, xMax, 0, yMax,\n                    hist.getXHist(), hist.getYHistFloat(), \n                    hist.getXErrors(), hist.getYErrors(), \n                    currentEdgeStr);\n\n                String filePath = plotter.writeFile(Integer.valueOf(10));\n            }\n\n            log2.fine(currentEdgeStr + \") x=\" + Arrays.toString(hist.getXHist()));\n\n            log2.fine(currentEdgeStr + \") y=\" + Arrays.toString(hist.getYHist()));\n\n        } catch(IOException e) {\n           log2.severe(e.getMessage());\n        }\n\t}\n\n    \/\/ execution works here, but call does not\n    after() returning : \n\t    target(algorithms.imageProcessing.CurvatureScaleSpaceCornerDetector) \n        && execution(public void findCorners())\n    {\n    \n        Object obj = thisJoinPoint.getThis();\n\n        log2.info(\"after findCorners() \" + obj.getClass().getSimpleName());\n\n        if (!(obj instanceof CurvatureScaleSpaceCornerDetector)) {\n            return;\n        }\n\n        CurvatureScaleSpaceCornerDetector instance = \n            (CurvatureScaleSpaceCornerDetector)obj;\n\n        Image img3 = instance.getOriginalImage().copyImageToGreen();\n\n        List<PairIntArray> edges = instance.getEdgesInOriginalReferenceFrame();\n\n        PairIntArray corners = instance.getCornersInOriginalReferenceFrame();\n\n        try {\n            \/\/ multi-colored edges alone:\n            debugDisplay(edges, \"edges extracted\", true, img3.getWidth(), img3.getHeight());\n\n            \n            for (PairIntArray edge : edges) {\n                ImageIOHelper.addCurveToImage(edge, img3, 0, 255, 255, 0);\n            }\n            ImageIOHelper.addCurveToImage(corners, img3, 1, 255, 0, 0);\n            \n            ImageIOHelper.addCurveToImage(\n                instance.getCornersForMatchingInOriginalReferenceFrame(),\n                img3, 2, 255, 0, 255);\n\n            debugDisplay(img3, \"original image w\/ edges and corners overplotted\");\n            String dirPath = ResourceFinder.findDirectory(\"bin\");\n            ImageIOHelper.writeOutputImage(\n                dirPath + \"\/image_with_edges_corners.png\", img3);\n \n        } catch (IOException ex) {\n            throw new RuntimeException(\"ERROR: l298\" + ex.getMessage());\n        }\n\n        log2.info(\"done\");\n    }\n\n    before(ScaleSpaceCurve scaleSpace, int edgeNumber, boolean rmFlseCrnrs, boolean isAClosedCurve) :\n        target(algorithms.imageProcessing.CurvatureScaleSpaceCornerDetector)\n        && call(protected PairFloatArray CurvatureScaleSpaceCornerDetector.findCornersInScaleSpaceMap(\n        ScaleSpaceCurve, int, boolean, boolean))\n        && args(scaleSpace, edgeNumber, rmFlseCrnrs, isAClosedCurve) {\n\n        log2.fine(\"before findCornersInScaleSpaceMap for edge \" \n            + Integer.toString(edgeNumber) + \":\");\n\n        Object[] args = (Object[])thisJoinPoint.getArgs();\n        Integer eNumber = (Integer)args[1];\n\n        currentEdgeStr = eNumber.toString();\n\n    }\n\n    after(PairIntArray xyCurve, List<Integer> maxCandidateCornerIndexes, \n        boolean isAClosedCurve) returning(PairIntArray jaggedLines) :\n        call(protected PairIntArray CurvatureScaleSpaceCornerDetector.removeFalseCorners(\n        PairIntArray, List<Integer>, boolean))\n        && args(xyCurve, maxCandidateCornerIndexes, isAClosedCurve) \n        && target(algorithms.imageProcessing.CurvatureScaleSpaceCornerDetector) {\n\n        \/\/disable for most uses\n        if (true) {\n            return;\n        }\n        Object obj = thisJoinPoint.getThis();\n\n        if (!(obj instanceof CurvatureScaleSpaceCornerDetector)) {\n            return;\n        }\n\n        CurvatureScaleSpaceCornerDetector instance = (CurvatureScaleSpaceCornerDetector)obj;\n\n        Object[] args = (Object[])thisJoinPoint.getArgs();\n        PairIntArray xy = (PairIntArray)args[0];\n        List<Integer> cI = (List<Integer>)args[1];\n\n        Image image2 = instance.getImage().copyImageToGreen();\n        \n        \/\/ draw a blue line between jagged line end points\n        int nExtraForDot = 2;\n        int rClr = 0; int bClr = 250; int gClr = 0;\n        for (int i = 0; i < jaggedLines.getN(); i++) {\n\n            int idx0 = jaggedLines.getX(i);\n            int idx1 = jaggedLines.getY(i);\n\n            int x0 = xy.getX(idx0);\n            int y0 = xy.getY(idx0);\n\n            int x1 = xy.getX(idx1);\n            int y1 = xy.getY(idx1);\n\n            for (int dx = (-1*nExtraForDot); dx < (nExtraForDot + 1); dx++) {\n                float xx = x0 + dx;\n                if ((xx > -1) && (xx < (image2.getWidth() - 1))) {\n                    for (int dy = (-1*nExtraForDot); dy < (nExtraForDot + 1); dy++) {\n                        float yy = y0 + dy;\n                        if ((yy > -1) && (yy < (image2.getHeight() - 1))) {\n                            image2.setRGB((int)xx, (int)yy, 0, 250, 250);\n                        }\n                    }\n                }\n            }\n            for (int dx = (-1*nExtraForDot); dx < (nExtraForDot + 1); dx++) {\n                float xx = x1 + dx;\n                if ((xx > -1) && (xx < (image2.getWidth() - 1))) {\n                    for (int dy = (-1*nExtraForDot); dy < (nExtraForDot + 1); dy++) {\n                        float yy = y1 + dy;\n                        if ((yy > -1) && (yy < (image2.getHeight() - 1))) {\n                            image2.setRGB((int)xx, (int)yy, 0, 0, 250);\n                        }\n                    }\n                }\n            }\n        }\n        nExtraForDot = 1;\n        rClr = 250; bClr = 0; gClr = 0;\n        for (Integer idx : cI) {\n\n            int x = xy.getX(idx.intValue());\n            int y = xy.getY(idx.intValue());\n\n            for (int dx = (-1*nExtraForDot); dx < (nExtraForDot + 1); dx++) {\n                float xx = x + dx;\n                if ((xx > -1) && (xx < (image2.getWidth() - 1))) {\n                    for (int dy = (-1*nExtraForDot); dy < (nExtraForDot + 1); dy++) {\n                        float yy = y + dy;\n                        if ((yy > -1) && (yy < (image2.getHeight() - 1))) {\n                            image2.setRGB((int)xx, (int)yy, rClr, gClr, bClr);\n                        }\n                    }\n                }\n            }\n        }\n\n        try {\n            ImageDisplayer.displayImage(\"corners and jagged lines\", image2);\n        } catch (IOException e) {\n            log2.severe(e.getMessage());\n        }\n      \n    }\n\n    after(ScaleSpaceCurve scaleSpace, int edgeNumber, boolean rmFlseCrnrs,\n        boolean isAClosedCurve) \n        returning(PairFloatArray xy) :\n        target(algorithms.imageProcessing.CurvatureScaleSpaceCornerDetector)\n        && call(protected PairFloatArray CurvatureScaleSpaceCornerDetector.findCornersInScaleSpaceMap(\n        ScaleSpaceCurve, int, boolean, boolean))\n        && args(scaleSpace, edgeNumber, rmFlseCrnrs, isAClosedCurve) {\n\n        log2.fine(\"after findCornersInScaleSpaceMap for edge \" \n            + Integer.toString(edgeNumber) + \":\");\n\n        for (int i = 0; i < xy.getN(); i++) {\n            log2.fine(String.format(\"(%f, %f)\", xy.getX(i), xy.getY(i)));\n        }\n    }\n\n    before() \n        : call(List<PairIntArray> EdgeExtractor*.findEdges() ) \n        && args() \n        && target(algorithms.imageProcessing.EdgeExtractor) {\n\n        log2.fine(\"before EdgeExtractor*.findEdges()\");\n\n        Object obj = thisJoinPoint.getThis();\n\n        if (!(obj instanceof EdgeExtractor)) {\n            return;\n        }\n\n        EdgeExtractor instance = (EdgeExtractor)obj;\n\n        try {\n            String dirPath = ResourceFinder.findDirectory(\"bin\");\n\n            ImageIOHelper.writeOutputImage(dirPath + \"\/edges0.png\", \n                instance.getImage());\n\n            plotHistogram(instance.getImage(), \"edges before dfs\");\n\n        } catch (IOException ex) {\n\n            log2.severe(\"ERROR: l359\" + ex.getMessage());\n        }\n    }\n\n    after() returning(List<PairIntArray> edges) : \n\t    target(algorithms.imageProcessing.EdgeExtractor) \n        && execution(List<PairIntArray> EdgeExtractor*.findEdges()) {\n\n        Object obj = thisJoinPoint.getThis();\n\n        if (!(obj instanceof EdgeExtractor)) {\n            return;\n        }\n\n        EdgeExtractor instance = (EdgeExtractor)obj;\n\n        GreyscaleImage img3 = instance.getImage();\n\n        try {\n            String dirPath = ResourceFinder.findDirectory(\"bin\");\n\n            \/\/ multi-colored edges alone:\n            debugDisplay(edges, \"edges extracted (not in original frame)\", \n                true, img3.getWidth(), img3.getHeight());\n\n        } catch (IOException ex) {\n\n            log2.severe(\"ERROR: l359\" + ex.getMessage());\n        }\n    }\n\n    before(ImageStatistics stats, HistogramHolder originalImageHistogram) \n        : call(int LowIntensityRemovalFilter*.determineLowThreshold( \n        ImageStatistics,  HistogramHolder))\n        && args(stats, originalImageHistogram) \n        && target(algorithms.imageProcessing.LowIntensityRemovalFilter) {\n\n        log2.fine(\"before LowIntensityRemovalFilter*.determineLowThreshold\");\n\n        plotHistogram0(stats.getHistogram(),  \"border histogram\");\n    }\n\n    private int debugfindEdgeWithRange(List<PairIntArray> edges,\n        int xLo, int xHi, int yLo, int yHi) {\n\n        for (int i = 0; i < edges.size(); i++) {\n            boolean c = debugContainsAPoint(edges.get(i), xLo, xHi, yLo, yHi);\n            if (c) {\n                return i;\n            }\n        }\n        return -1;\n    }\n    private boolean debugContainsAPoint(PairIntArray edge, \n        int xLo, int xHi, int yLo, int yHi) {\n        for (int i = 0; i < edge.getN(); i++) {\n            int x = edge.getX(i);\n            int y = edge.getY(i);\n            if (x >= xLo && x <= xHi && y >= yLo && y <= yHi) {\n                return true;\n            }\n        }\n        return false;\n    }\n\n    private void debugDisplay(Image input, String label) throws IOException {\n     \n        ImageDisplayer.displayImage(label, input);\n    }\n \n    private void debugDisplay(List<PairIntArray> curves, String label,\n        boolean writeImage, int width, int height) throws IOException {\n        \n        log2.fine(\"create multicolor curve debug image\");\n\n        Image img2 = new Image(width, height);\n\n        ImageIOHelper.addAlternatingColorCurvesToImage(curves, \"edges.png\",\n            writeImage, img2);        \n        \n        ImageDisplayer.displayImage(label, img2);\n       \n    }\n\n    public void debugDisplay(GreyscaleImage input, String label) {\n     \n        try {\n            ImageDisplayer.displayImage(label, input);\n\n        } catch (IOException e) {\n\n            log2.severe(e.getMessage());\n        }\n    }\n    \n    private void debugAddCurveToImage(float[] xPoints, float[] yPoints, \n        Image input, int nExtraForDot, int rClr, int gClr, int bClr) {\n        \n        for (int i = 0; i < xPoints.length; i++) {\n            int x = (int) xPoints[i];\n            int y = (int) yPoints[i];\n            \n            for (int dx = (-1*nExtraForDot); dx < (nExtraForDot + 1); dx++) {\n                float xx = x + dx;\n                if ((xx > -1) && (xx < (input.getWidth() - 1))) {\n                    for (int dy = (-1*nExtraForDot); dy < (nExtraForDot + 1); dy++) {\n                        float yy = y + dy;\n                        if ((yy > -1) && (yy < (input.getHeight() - 1))) {\n                            input.setRGB((int)xx, (int)yy, rClr, gClr, bClr);\n                        }\n                    }\n                }\n            }\n        }\n    }\n    \n    private void debugDisplayScaleSpaceImages(PairIntArray edge,\n        Map<SIGMA, ScaleSpaceCurve> map, GreyscaleImage img) {\n                \n        try {\n            \/\/plot the edge and all scale space images\n            Image debugImg = img.copyImageToGreen();\n            \n            ImageIOHelper.addCurveToImage(edge, debugImg, 0, 0, 255, 0);\n            \n\/\/the convolutions should be acting upon data that starts at (0,0)\n\/\/ and an offset applied?\n\/\/ check an edge which is near x=0 and y=0\n            \n            Iterator<Entry<SIGMA, ScaleSpaceCurve>> iter = map.entrySet().iterator();\n            while (iter.hasNext()) {\n                Entry<SIGMA, ScaleSpaceCurve> entry = iter.next();\n                ScaleSpaceCurve dss = entry.getValue();\n                ImageIOHelper.addCurveToImage(dss, debugImg, 0, 0, 0, 255);\n            }\n            \n            ImageDisplayer.displayImage(\"scale space images\", debugImg);\n                            \n            int z = 1;\n            \n        } catch (IOException ex) {\n            throw new RuntimeException(\"ERROR: l548\" + ex.getMessage());\n        }\n    }\n\n    private void debugDisplayScaleSpace(ScaleSpaceCurve maxScaleSpace, \n        List<Integer> maxCandidateCornerIndexes, PolygonAndPointPlotter plotter, \n        float[] xc, float[] yc, SIGMA sigma, int edgeNumber, \n        int width, int height) {\n        \n        float[] tCornersForPlot = new float[xc.length];\n        float[] kCornersForPlot = new float[xc.length];\n        for (int ii = 0; ii < maxCandidateCornerIndexes.size(); ii++) {\n            int idx = maxCandidateCornerIndexes.get(ii);\n            tCornersForPlot[ii] = maxScaleSpace.getT()[idx];\n            kCornersForPlot[ii] = maxScaleSpace.getK(idx);\n            if (kCornersForPlot[ii] < 0) {\n                kCornersForPlot[ii] *= -1;\n            }\n        }\n        try {\n            float[] tmpX = maxScaleSpace.getT();\n            float[] k = maxScaleSpace.getK();\n            float[] tmpk = Arrays.copyOf(k, k.length);\n            for (int ii = 1; ii < tmpk.length; ii++) {\n                if (tmpk[ii] < 0) {\n                    tmpk[ii] *= -1;\n                }\n            }\n            \n            plotter.addPlot(0.0f, 1.f, 0, MiscMath.findMax(tmpk), \n                tmpX, tmpk, tCornersForPlot, kCornersForPlot,\n                \"k for sigma=\" + sigma.toString() \n                + \" edge=\" + edgeNumber);\n\n            String filePath = plotter.writeFile();\n\n            Image img3 = new Image(width, height);\n\n            ImageIOHelper.addCurveToImage(maxScaleSpace, img3, 0, 255, 255, \n                255);\n\n            debugAddCurveToImage(xc, yc, img3, 1, 255, 0, 0);\n\n            ImageDisplayer.displayImage(\n                \"corner candidates (maxSigma=\" + sigma.toString() \n                + \")\", img3);\n\n        } catch (Exception e) {\n            throw new RuntimeException(\"ERROR: l595\" + e.getMessage());\n        }                \n    }\n\n    private void debugDisplay(ScaleSpaceCurve scaleSpace, List<Integer> \n        candidateCornerIndexes, String label, int width, int height) \n        throws IOException {\n        \n        Image img2 = new Image(width, height);\n        \n        ImageIOHelper.addCurveToImage(scaleSpace, img2, 0, 255, 255, 255);\n      \n        for (Integer idx : candidateCornerIndexes) {\n            float x = scaleSpace.getX(idx.intValue());\n            float y = scaleSpace.getY(idx.intValue());\n            \n            img2.setRGB((int)x, (int)y, 255, 0, 0);\n            \/\/ make a plus symbol because the dot is too small\n            for (int d = -1; d < 2; d++) {\n                float xx = x + d;\n                if ((xx > -1) && (xx < (width - 1))) {\n                    img2.setRGB((int)xx, (int)y, 255, 0, 0);\n                }\n            }\n            for (int d = -1; d < 2; d++) {\n                float yy = y + d;\n                if ((yy > -1) && (yy < (height - 1))) {\n                    img2.setRGB((int)x, (int)yy, 255, 0, 0);\n                }\n            }\n        }\n        \n        ImageDisplayer.displayImage(label, img2);\n    }\n      \n    public double debugAreaUnderTheCurve(float[] x, float[] y) {\n        \n        \/\/ using trapezoidal rule\n        \n        if (x.length == 0) {\n            return 0;\n        } else if (x.length == 1) {\n            \/\/ this isn't correct, but is fine for the one case it's used for\n            return (y[0]);\n        }\n        \n        double sum = 0;\n        \n        for (int i = 0; i < (x.length - 1); i++) {\n            float yTerm = y[i + 1] + y[i];\n            float xLen = x[i + 1] - x[i];\n            sum += (yTerm * xLen);\n        }\n        \n        sum *= 0.5;\n        \n        return sum;\n    }\n    \n    private void debugDisplay(PairIntArray edge, PairIntArray corners,\n        String label, int width, int height) throws IOException {\n        \n        Image img2 = new Image(width, height);\n        \n        ImageIOHelper.addCurveToImage(edge, img2, 0, 255, 255, 255);\n        \n        ImageIOHelper.addCurveToImage(corners, img2, 1, 255, 0, 0);\n        \n        ImageDisplayer.displayImage(label, img2);\n     \n        int z = 1;\n    }\n    \n    private void plotHistogram0(HistogramHolder h, String label) {\n                \n        float[] xh = h.getXHist();\n        float[] yh = h.getYHistFloat();\n        \n        float yMin = MiscMath.findMin(yh);\n        int yMaxIdx = MiscMath.findYMaxIndex(yh);\n        float yMax = yh[yMaxIdx];\n        \n        float xMin = MiscMath.findMin(xh);\n        float xMax = MiscMath.findMax(xh);        \n        \n        log2.fine(\"MODE=\" + xh[yMaxIdx]);\n        \n        try {\n\n            PolygonAndPointPlotter plotter = new PolygonAndPointPlotter();\n            \n            plotter.addPlot(\n                xMin, xMax, yMin, yMax,\n                xh, yh, xh, yh, label);\n\n            String filePath = plotter.writeFile3();\n            \n            log2.fine(\"created histogram at \" + filePath);\n            \n        } catch (IOException e) {\n            e.printStackTrace(); \n            log2.severe(\"ERROR while plotting histogram: \" + e.getMessage());\n        }\n    }\n\n    private void plotHistogram(GreyscaleImage img, String label) throws \n    IOException {\n        \n        float[] v = new float[img.getWidth() * img.getHeight()];\n        float[] ve = new float[v.length];\n        \n        int count = 0;\n        for (int i = 0; i < img.getWidth(); i++) {\n            for (int j = 0; j < img.getHeight(); j++) {\n                v[count] = img.getValue(i, j);\n                ve[count] = (float)Math.sqrt(v[count]);\n                count++;\n            }\n        }\n        \n        HistogramHolder h = Histogram.createSimpleHistogram(v, ve);\n        \/\/HistogramHolder h = Histogram.defaultHistogramCreator(v, ve);\n        \n        float[] xh = h.getXHist();\n        float[] xhe = h.getXErrors();\n        float[] yh = h.getYHistFloat();\n        float[] yhe = h.getYErrors();\n        int firstZero = -1;\n        for (int i = (yh.length - 1); i > -1; i--) {\n            if (yh[i] > 0) {\n                break;\n            } else {\n                firstZero = i;\n            }\n        }\n        if (firstZero > -1) {\n            int n = xh.length - firstZero;\n            xh = Arrays.copyOf(xh, n);\n            xhe = Arrays.copyOf(xhe, n);\n            yh = Arrays.copyOf(yh, n);\n            yhe = Arrays.copyOf(yhe, n);\n        }\n        \n        float xMax = MiscMath.findMax(xh);\n        float yMax = MiscMath.findMax(yh);\n        \n        int yMaxIdx = MiscMath.findYMaxIndex(yh);\n        yMax = yh[yMaxIdx + 3];\n        \n        PolygonAndPointPlotter plotter2 = new PolygonAndPointPlotter();\n        \n        plotter2.addPlot(0, xMax, 0, yMax, xh, yh, xhe, yhe, label);\n        \n        String filePath = plotter2.writeFile3();\n        \n        log2.info(\"filePath=\" + filePath);\n    }\n\n    public void printContents(ScaleSpaceCurveImage spaceImage) {\n        StringBuilder sb = new StringBuilder();\n        for (int i = 0; i < spaceImage.getImageSigmas().length; i++) {\n            sb.append(\"sigma=\").append(spaceImage.getImageSigmas()[i]).append(\": \");\n            float[] t = spaceImage.getScaleSpaceImage()[i];\n            for (int j = 0; j < t.length; j++) {\n                sb.append(\"t=\").append(t[j]).append(\" \");\n            }\n            sb.append(\"\\n\");\n        }\n        log2.fine(sb.toString());\n    }\n   \n    public String printImage(ScaleSpaceCurveImage spaceImage, \n        PolygonAndPointPlotter plotterC, int fileNumber) {\n        \n        if (plotterC == null) {\n            return null;\n        }\n        int nTotalPoints = 0;\n        for (int i = 0; i < spaceImage.getImageSigmas().length; i++) {\n            float[] t = spaceImage.getScaleSpaceImage()[i];\n            nTotalPoints+= t.length;\n        }\n        \n        try {\n            int count = 0;\n            float[] x = new float[nTotalPoints];\n            float[] y = new float[x.length];\n            for (int i = 0; i < spaceImage.getImageSigmas().length; i++) {\n                float sigma = spaceImage.getImageSigmas()[i];\n                float[] t = spaceImage.getScaleSpaceImage()[i];\n                for (int j = 0; j < t.length; j++) {\n                    y[count] = sigma;\n                    x[count] = t[j];\n                    count++;\n                }\n            }\n            float xMin = 0;\n            float xMax = 1.0f;\n            float yMin = MiscMath.findMin(y);\n            if (yMin < 0) {\n                yMin *= 1.1;\n            } else {\n                yMin *= 0.9;\n            }\n            float yMax = MiscMath.findMax(y);\n\n            plotterC.addPlot(xMin, xMax,yMin, yMax, x, y, null, null,\n                \"\");\n\n            String filePathC = plotterC.writeFile(fileNumber);\n            \n            return filePathC;\n            \n        } catch(Exception e) {\n            log2.severe(e.getMessage());\n        }\n        \n        return null;\n    }\n}\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"24af7274bcb5e5a2635cc111c9dad7995ea64785","subject":"Fixing error-reporting pointcuts for plugin manager changes I just checked in.","message":"Fixing error-reporting pointcuts for plugin manager changes I just checked in.\n\ngit-svn-id: 2c527eb49caa05e19d6b2be874bf74fa9d7ea670@646544 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"josephw\/maven,barthel\/maven,karthikjaps\/maven,keith-turner\/maven,mizdebsk\/maven,vedmishr\/demo1,atanasenko\/maven,Distrotech\/maven,likaiwalkman\/maven,cstamas\/maven,changbai1980\/maven,dsyer\/maven,barthel\/maven,Distrotech\/maven,lbndev\/maven,wangyuesong0\/maven,barthel\/maven,vedmishr\/demo1,skitt\/maven,keith-turner\/maven,rogerchina\/maven,pkozelka\/maven,stephenc\/maven,changbai1980\/maven,likaiwalkman\/maven,njuneau\/maven,josephw\/maven,njuneau\/maven,changbai1980\/maven,gorcz\/maven,xasx\/maven,wangyuesong0\/maven,ChristianSchulte\/maven,keith-turner\/maven,dsyer\/maven,wangyuesong\/maven,karthikjaps\/maven,skitt\/maven,njuneau\/maven,trajano\/maven,ChristianSchulte\/maven,Tibor17\/maven,likaiwalkman\/maven,atanasenko\/maven,aheritier\/maven,Mounika-Chirukuri\/maven,pkozelka\/maven,skitt\/maven,ChristianSchulte\/maven,stephenc\/maven,wangyuesong0\/maven,stephenc\/maven,Mounika-Chirukuri\/maven,kidaa\/maven-1,olamy\/maven,trajano\/maven,josephw\/maven,Mounika-Chirukuri\/maven,lbndev\/maven,xasx\/maven,apache\/maven,olamy\/maven,apache\/maven,kidaa\/maven-1,pkozelka\/maven,olamy\/maven,lbndev\/maven,Tibor17\/maven,wangyuesong\/maven,kidaa\/maven-1,rogerchina\/maven,aheritier\/maven,karthikjaps\/maven,apache\/maven,atanasenko\/maven,dsyer\/maven,rogerchina\/maven,cstamas\/maven,trajano\/maven,gorcz\/maven,vedmishr\/demo1,mcculls\/maven,mcculls\/maven,mizdebsk\/maven,runepeter\/maven-deploy-plugin-2.8.1,cstamas\/maven,aheritier\/maven,gorcz\/maven,mcculls\/maven,mizdebsk\/maven,xasx\/maven,runepeter\/maven-deploy-plugin-2.8.1,wangyuesong\/maven","old_file":"maven-core\/src\/main\/aspect\/org\/apache\/maven\/errors\/LifecycleErrorReporterAspect.aj","new_file":"maven-core\/src\/main\/aspect\/org\/apache\/maven\/errors\/LifecycleErrorReporterAspect.aj","new_contents":"package org.apache.maven.errors;\n\nimport org.codehaus.plexus.logging.console.ConsoleLogger;\nimport org.codehaus.plexus.logging.Logger;\nimport org.codehaus.plexus.util.introspection.ReflectionValueExtractor;\nimport org.apache.maven.project.path.PathTranslator;\nimport org.apache.maven.plugin.MojoExecution;\nimport org.apache.maven.artifact.resolver.ArtifactResolutionException;\nimport org.apache.maven.artifact.resolver.MultipleArtifactsNotFoundException;\nimport org.apache.maven.plugin.PluginConfigurationException;\nimport org.apache.maven.plugin.descriptor.Parameter;\nimport org.apache.maven.plugin.loader.PluginLoaderException;\nimport org.apache.maven.plugin.loader.PluginLoader;\nimport org.apache.maven.plugin.PluginExecutionException;\nimport org.apache.maven.plugin.MojoExecutionException;\nimport org.apache.maven.plugin.InvalidPluginException;\nimport org.apache.maven.artifact.resolver.ArtifactNotFoundException;\nimport org.apache.maven.execution.MavenSession;\nimport org.apache.maven.lifecycle.plan.BuildPlanner;\nimport org.apache.maven.lifecycle.plan.BuildPlan;\nimport org.apache.maven.lifecycle.model.MojoBinding;\nimport org.apache.maven.lifecycle.statemgmt.StateManagementUtils;\nimport org.apache.maven.lifecycle.DefaultLifecycleExecutor;\nimport org.apache.maven.lifecycle.LifecycleExecutor;\nimport org.apache.maven.lifecycle.LifecycleLoaderException;\nimport org.apache.maven.lifecycle.LifecycleSpecificationException;\nimport org.apache.maven.lifecycle.plan.LifecyclePlannerException;\nimport org.apache.maven.project.DuplicateArtifactAttachmentException;\nimport org.apache.maven.project.MavenProject;\nimport org.apache.maven.plugin.DefaultPluginManager;\nimport org.apache.maven.plugin.PluginManager;\nimport org.apache.maven.plugin.PluginParameterExpressionEvaluator;\nimport org.apache.maven.plugin.PluginParameterException;\nimport org.apache.maven.plugin.Mojo;\nimport org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;\nimport org.codehaus.plexus.component.repository.exception.ComponentLookupException;\nimport org.codehaus.plexus.configuration.PlexusConfiguration;\nimport org.codehaus.plexus.PlexusContainer;\n\nimport java.util.List;\n\npublic privileged aspect LifecycleErrorReporterAspect\n    extends AbstractCoreReporterAspect\n{\n\n    private pointcut le_executeGoalAndHandleFailures( MojoBinding binding ):\n        execution( void DefaultLifecycleExecutor.executeGoalAndHandleFailures( MojoBinding, .. ) )\n        && args( binding, .. );\n\n    private pointcut le_executeGoalAndHandleFailures_withSession( MojoBinding binding,\n                                                                  MavenSession session ):\n        execution( void DefaultLifecycleExecutor.executeGoalAndHandleFailures( MojoBinding, MavenSession, .. ) )\n        && args( binding, session, .. );\n\n    private pointcut pm_executeMojo( MavenProject project ):\n        execution( void PluginManager+.executeMojo( MavenProject, .. ) )\n        && args( project, .. );\n\n    private pointcut within_pm_executeMojo( MavenProject project ):\n        withincode( void PluginManager+.executeMojo( MavenProject, .. ) )\n        && args( project, .. );\n\n    after( MojoBinding binding,\n           MavenProject project) throwing ( PluginLoaderException cause ):\n        ( cflow( le_executeGoalAndHandleFailures( MojoBinding ) )\n          || cflow( execution( * LifecycleExecutor+.isTaskValid( .. ) ) ) )\n        && execution( * PluginLoader+.loadPlugin( MojoBinding, MavenProject, .. ) )\n        && args( binding, project, .. )\n    {\n        getReporter().reportErrorLoadingPlugin( binding, project, cause );\n    }\n\n    after( String task,\n           MavenSession session,\n           MavenProject project) throwing ( InvalidPluginException cause ):\n        execution( private * DefaultLifecycleExecutor.getMojoDescriptorForDirectInvocation( String, MavenSession, MavenProject ) )\n        && args( task, session, project )\n    {\n        getReporter().reportInvalidPluginForDirectInvocation( task, session, project, cause );\n    }\n\n    after( MojoBinding binding,\n           MavenProject project) throwing ( DuplicateArtifactAttachmentException cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && call( void Mojo+.execute() )\n    {\n        getReporter().reportDuplicateAttachmentException( binding, project, cause );\n    }\n\n    after( MojoBinding binding,\n           MavenProject project) throwing ( MojoExecutionException cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && call( void Mojo+.execute() )\n    {\n        \/\/ this will be covered by the reportErrorLoadingPlugin(..) method.\n        if ( !StateManagementUtils.RESOLVE_LATE_BOUND_PLUGIN_GOAL.equals( binding.getGoal() ) )\n        {\n            getReporter().reportMojoExecutionException( binding, project, cause );\n        }\n    }\n\n    PluginExecutionException around( MojoBinding binding,\n                                     MavenProject project ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && call( PluginExecutionException.new( .., String ) )\n    {\n        PluginExecutionException cause = proceed( binding, project );\n        getReporter().reportInvalidPluginExecutionEnvironment( binding, project, cause );\n\n        return cause;\n    }\n\n    after( MojoBinding binding,\n           MavenProject project) throwing ( ComponentLookupException cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && withincode( Mojo DefaultPluginManager.getConfiguredMojo( .. ) )\n        && call( Object PlexusContainer+.lookup( .. ) )\n    {\n        getReporter().reportMojoLookupError( binding, project, cause );\n    }\n\n    Parameter currentParameter;\n\n    private pointcut paramGetName( Parameter parameter ):\n        call( String Parameter.getName() )\n        && target( parameter );\n\n    private pointcut pm_validatePomConfig():\n        execution( void DefaultPluginManager.validatePomConfiguration( .. ) );\n\n    private pointcut within_pm_validatePomConfig():\n        withincode( void DefaultPluginManager.validatePomConfiguration( .. ) );\n\n    private pointcut pm_checkRequiredParameters():\n        execution( void DefaultPluginManager.checkRequiredParameters( .. ) );\n\n    private pointcut within_pm_checkRequiredParameters():\n        withincode( void DefaultPluginManager.checkRequiredParameters( .. ) );\n\n    before( Parameter parameter ):\n        ( within_pm_validatePomConfig()\n          || within_pm_checkRequiredParameters() )\n        && paramGetName( parameter )\n    {\n        currentParameter = parameter;\n    }\n\n    after() returning:\n        pm_validatePomConfig() ||\n        pm_checkRequiredParameters()\n    {\n        currentParameter = null;\n    }\n\n    private pointcut pm_executeMojoWithSessionAndExec( MavenProject project,\n                                                       MojoExecution exec,\n                                                       MavenSession session,\n                                                       DefaultPluginManager manager ):\n        execution( void DefaultPluginManager.executeMojo( MavenProject, MojoExecution, MavenSession ) )\n        && args( project, exec, session )\n        && this( manager );\n\n    after( MojoBinding binding,\n           MavenProject project,\n           MojoExecution exec,\n           MavenSession session,\n           DefaultPluginManager manager) throwing( PluginConfigurationException cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojoWithSessionAndExec( project, exec, session, manager ) )\n        && pm_validatePomConfig()\n    {\n        PathTranslator translator = manager.pathTranslator;\n        Logger logger = new ConsoleLogger( Logger.LEVEL_INFO, \"error reporting\" );\n        getReporter().reportAttemptToOverrideUneditableMojoParameter( currentParameter,\n                                                                      binding,\n                                                                      project,\n                                                                      session,\n                                                                      exec,\n                                                                      translator,\n                                                                      logger,\n                                                                      cause );\n    }\n\n    PluginParameterException around( MojoBinding binding,\n                                     MavenProject project,\n                                     List invalidParameters ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && cflow( pm_checkRequiredParameters() )\n        && call( PluginParameterException.new( .., List ) )\n        && args( .., invalidParameters )\n    {\n        PluginParameterException err = proceed( binding, project, invalidParameters );\n\n        getReporter().reportMissingRequiredMojoParameter( binding, project, invalidParameters, err );\n\n        return err;\n    }\n\n    private pointcut ppee_evaluate( String expression ):\n        execution( Object PluginParameterExpressionEvaluator.evaluate( String ) )\n        && args( expression );\n\n    private pointcut within_ppee_evaluate( String expression ):\n        withincode( Object PluginParameterExpressionEvaluator.evaluate( String ) )\n        && args( expression );\n\n    before( MojoBinding binding,\n            MavenProject project,\n            String expression,\n            ExpressionEvaluationException err ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && cflow( pm_checkRequiredParameters() )\n        && cflow( ppee_evaluate( expression ) )\n        && execution( ExpressionEvaluationException.new( String ) )\n        && this( err )\n    {\n        getReporter().reportUseOfBannedMojoParameter( currentParameter,\n                                                      binding,\n                                                      project,\n                                                      expression,\n                                                      (String) PluginParameterExpressionEvaluator.BANNED_EXPRESSIONS.get( expression ),\n                                                      err );\n    }\n\n    after( MojoBinding binding,\n           MavenProject project,\n           String expression) throwing ( Exception cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && cflow( pm_checkRequiredParameters() )\n        && cflow( ppee_evaluate( expression ) )\n        && within( PluginParameterExpressionEvaluator )\n        && call( Object ReflectionValueExtractor.evaluate( String, Object ) )\n    {\n        getReporter().reportReflectionErrorWhileEvaluatingMojoParameter( currentParameter,\n                                                                         binding,\n                                                                         project,\n                                                                         expression,\n                                                                         cause );\n    }\n\n    after( MojoBinding binding,\n           MavenProject project,\n           PlexusConfiguration config) throwing( PluginConfigurationException cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && execution( void DefaultPluginManager.populatePluginFields( *, *, PlexusConfiguration, .. ) )\n        && args( *, *, config, .. )\n    {\n        getReporter().reportErrorApplyingMojoConfiguration( binding, project, config, cause );\n    }\n\n    private pointcut pm_resolveTransitiveDependencies( MavenProject project,\n                                                       String scope ):\n        execution( void DefaultPluginManager.resolveTransitiveDependencies( *, *, String, *, MavenProject, * ) )\n        && args( *, *, scope, *, project, * );\n\n    after( MavenProject project,\n           String scope) throwing( ArtifactNotFoundException cause ):\n        pm_resolveTransitiveDependencies( project, scope )\n    {\n        getReporter().reportProjectDependenciesNotFound( project, scope, cause );\n    }\n\n    after( MavenProject project,\n           String scope) throwing( ArtifactResolutionException cause ):\n        pm_resolveTransitiveDependencies( project, scope )\n    {\n        if ( cause instanceof MultipleArtifactsNotFoundException )\n        {\n            getReporter().reportProjectDependenciesNotFound( project,\n                                                             scope,\n                                                             (MultipleArtifactsNotFoundException) cause );\n        }\n        else\n        {\n            getReporter().reportProjectDependenciesUnresolvable( project, scope, cause );\n        }\n    }\n\n    private pointcut le_getLifecycleBindings( List tasks,\n                                              MavenProject configuringProject,\n                                              String targetDescription ):\n        execution( List DefaultLifecycleExecutor.getLifecycleBindings( List, MavenProject, *, String ) )\n        && args( tasks, configuringProject, *, targetDescription );\n\n    BuildPlan around( List tasks,\n                      MavenProject project,\n                      MavenSession session )\n        throws LifecycleLoaderException, LifecycleSpecificationException, LifecyclePlannerException:\n            cflow( execution( * DefaultLifecycleExecutor.*( .. ) ) )\n            && execution( BuildPlan BuildPlanner+.constructBuildPlan( List, MavenProject, MavenSession, * ) )\n            && args( tasks, project, session, * )\n    {\n        try\n        {\n            return proceed( tasks, project, session );\n        }\n        catch ( LifecycleLoaderException cause )\n        {\n            getReporter().reportErrorFormulatingBuildPlan( tasks, project, session, cause );\n            throw cause;\n        }\n        catch ( LifecyclePlannerException cause )\n        {\n            getReporter().reportErrorFormulatingBuildPlan( tasks, project, session, cause );\n            throw cause;\n        }\n        catch ( LifecycleSpecificationException cause )\n        {\n            getReporter().reportErrorFormulatingBuildPlan( tasks, project, session, cause );\n            throw cause;\n        }\n    }\n\n}\n","old_contents":"package org.apache.maven.errors;\n\nimport org.codehaus.plexus.logging.console.ConsoleLogger;\nimport org.codehaus.plexus.logging.Logger;\nimport org.codehaus.plexus.util.introspection.ReflectionValueExtractor;\nimport org.apache.maven.project.path.PathTranslator;\nimport org.apache.maven.plugin.MojoExecution;\nimport org.apache.maven.artifact.resolver.ArtifactResolutionException;\nimport org.apache.maven.artifact.resolver.MultipleArtifactsNotFoundException;\nimport org.apache.maven.plugin.PluginConfigurationException;\nimport org.apache.maven.plugin.descriptor.Parameter;\nimport org.apache.maven.plugin.loader.PluginLoaderException;\nimport org.apache.maven.plugin.loader.PluginLoader;\nimport org.apache.maven.plugin.PluginExecutionException;\nimport org.apache.maven.plugin.MojoExecutionException;\nimport org.apache.maven.plugin.InvalidPluginException;\nimport org.apache.maven.artifact.resolver.ArtifactNotFoundException;\nimport org.apache.maven.execution.MavenSession;\nimport org.apache.maven.lifecycle.plan.BuildPlanner;\nimport org.apache.maven.lifecycle.plan.BuildPlan;\nimport org.apache.maven.lifecycle.model.MojoBinding;\nimport org.apache.maven.lifecycle.statemgmt.StateManagementUtils;\nimport org.apache.maven.lifecycle.DefaultLifecycleExecutor;\nimport org.apache.maven.lifecycle.LifecycleExecutor;\nimport org.apache.maven.lifecycle.LifecycleLoaderException;\nimport org.apache.maven.lifecycle.LifecycleSpecificationException;\nimport org.apache.maven.lifecycle.plan.LifecyclePlannerException;\nimport org.apache.maven.project.DuplicateArtifactAttachmentException;\nimport org.apache.maven.project.MavenProject;\nimport org.apache.maven.plugin.DefaultPluginManager;\nimport org.apache.maven.plugin.PluginManager;\nimport org.apache.maven.plugin.PluginParameterExpressionEvaluator;\nimport org.apache.maven.plugin.PluginParameterException;\nimport org.apache.maven.plugin.Mojo;\nimport org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;\nimport org.codehaus.plexus.component.repository.exception.ComponentLookupException;\nimport org.codehaus.plexus.configuration.PlexusConfiguration;\nimport org.codehaus.plexus.PlexusContainer;\n\nimport java.util.List;\n\npublic privileged aspect LifecycleErrorReporterAspect\n    extends AbstractCoreReporterAspect\n{\n\n    private pointcut le_executeGoalAndHandleFailures( MojoBinding binding ):\n        execution( void DefaultLifecycleExecutor.executeGoalAndHandleFailures( MojoBinding, .. ) )\n        && args( binding, .. );\n\n    private pointcut le_executeGoalAndHandleFailures_withSession( MojoBinding binding,\n                                                                  MavenSession session ):\n        execution( void DefaultLifecycleExecutor.executeGoalAndHandleFailures( MojoBinding, MavenSession, .. ) )\n        && args( binding, session, .. );\n\n    private pointcut pm_executeMojo( MavenProject project ):\n        execution( void PluginManager+.executeMojo( MavenProject, .. ) )\n        && args( project, .. );\n\n    private pointcut within_pm_executeMojo( MavenProject project ):\n        withincode( void PluginManager+.executeMojo( MavenProject, .. ) )\n        && args( project, .. );\n\n    after( MojoBinding binding,\n           MavenProject project) throwing ( PluginLoaderException cause ):\n        ( cflow( le_executeGoalAndHandleFailures( MojoBinding ) )\n          || cflow( execution( * LifecycleExecutor+.isTaskValid( .. ) ) ) )\n        && execution( * PluginLoader+.loadPlugin( MojoBinding, MavenProject, .. ) )\n        && args( binding, project, .. )\n    {\n        getReporter().reportErrorLoadingPlugin( binding, project, cause );\n    }\n\n    after( String task,\n           MavenSession session,\n           MavenProject project) throwing ( InvalidPluginException cause ):\n        execution( private * DefaultLifecycleExecutor.getMojoDescriptorForDirectInvocation( String, MavenSession, MavenProject ) )\n        && args( task, session, project )\n    {\n        getReporter().reportInvalidPluginForDirectInvocation( task, session, project, cause );\n    }\n\n    after( MojoBinding binding,\n           MavenProject project) throwing ( DuplicateArtifactAttachmentException cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && call( void Mojo+.execute() )\n    {\n        getReporter().reportDuplicateAttachmentException( binding, project, cause );\n    }\n\n    after( MojoBinding binding,\n           MavenProject project) throwing ( MojoExecutionException cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && call( void Mojo+.execute() )\n    {\n        \/\/ this will be covered by the reportErrorLoadingPlugin(..) method.\n        if ( !StateManagementUtils.RESOLVE_LATE_BOUND_PLUGIN_GOAL.equals( binding.getGoal() ) )\n        {\n            getReporter().reportMojoExecutionException( binding, project, cause );\n        }\n    }\n\n    PluginExecutionException around( MojoBinding binding,\n                                     MavenProject project ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && call( PluginExecutionException.new( .., String ) )\n    {\n        PluginExecutionException cause = proceed( binding, project );\n        getReporter().reportInvalidPluginExecutionEnvironment( binding, project, cause );\n\n        return cause;\n    }\n\n    after( MojoBinding binding,\n           MavenProject project) throwing ( ComponentLookupException cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && withincode( Mojo DefaultPluginManager.getConfiguredMojo( .. ) )\n        && call( Object PlexusContainer+.lookup( .. ) )\n    {\n        getReporter().reportMojoLookupError( binding, project, cause );\n    }\n\n    Parameter currentParameter;\n\n    private pointcut paramGetName( Parameter parameter ):\n        call( String Parameter.getName() )\n        && target( parameter );\n\n    private pointcut pm_validatePomConfig():\n        execution( void DefaultPluginManager.validatePomConfiguration( .. ) );\n\n    private pointcut within_pm_validatePomConfig():\n        withincode( void DefaultPluginManager.validatePomConfiguration( .. ) );\n\n    private pointcut pm_checkRequiredParameters():\n        execution( void DefaultPluginManager.checkRequiredParameters( .. ) );\n\n    private pointcut within_pm_checkRequiredParameters():\n        withincode( void DefaultPluginManager.checkRequiredParameters( .. ) );\n\n    before( Parameter parameter ):\n        ( within_pm_validatePomConfig()\n          || within_pm_checkRequiredParameters() )\n        && paramGetName( parameter )\n    {\n        currentParameter = parameter;\n    }\n\n    after() returning:\n        pm_validatePomConfig() ||\n        pm_checkRequiredParameters()\n    {\n        currentParameter = null;\n    }\n\n    private pointcut pm_executeMojoWithSessionAndExec( MavenProject project,\n                                                       MojoExecution exec,\n                                                       MavenSession session,\n                                                       DefaultPluginManager manager ):\n        execution( void DefaultPluginManager.executeMojo( MavenProject, MojoExecution, MavenSession ) )\n        && args( project, exec, session )\n        && this( manager );\n\n    after( MojoBinding binding,\n           MavenProject project,\n           MojoExecution exec,\n           MavenSession session,\n           DefaultPluginManager manager) throwing( PluginConfigurationException cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojoWithSessionAndExec( project, exec, session, manager ) )\n        && pm_validatePomConfig()\n    {\n        PathTranslator translator = manager.pathTranslator;\n        Logger logger = new ConsoleLogger( Logger.LEVEL_INFO, \"error reporting\" );\n        getReporter().reportAttemptToOverrideUneditableMojoParameter( currentParameter,\n                                                                      binding,\n                                                                      project,\n                                                                      session,\n                                                                      exec,\n                                                                      translator,\n                                                                      logger,\n                                                                      cause );\n    }\n\n    PluginParameterException around( MojoBinding binding,\n                                     MavenProject project,\n                                     List invalidParameters ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && cflow( pm_checkRequiredParameters() )\n        && call( PluginParameterException.new( .., List ) )\n        && args( .., invalidParameters )\n    {\n        PluginParameterException err = proceed( binding, project, invalidParameters );\n\n        getReporter().reportMissingRequiredMojoParameter( binding, project, invalidParameters, err );\n\n        return err;\n    }\n\n    private pointcut ppee_evaluate( String expression ):\n        execution( Object PluginParameterExpressionEvaluator.evaluate( String ) )\n        && args( expression );\n\n    private pointcut within_ppee_evaluate( String expression ):\n        withincode( Object PluginParameterExpressionEvaluator.evaluate( String ) )\n        && args( expression );\n\n    before( MojoBinding binding,\n            MavenProject project,\n            String expression,\n            ExpressionEvaluationException err ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && cflow( pm_checkRequiredParameters() )\n        && cflow( ppee_evaluate( expression ) )\n        && execution( ExpressionEvaluationException.new( String ) )\n        && this( err )\n    {\n        getReporter().reportUseOfBannedMojoParameter( currentParameter,\n                                                      binding,\n                                                      project,\n                                                      expression,\n                                                      (String) PluginParameterExpressionEvaluator.BANNED_EXPRESSIONS.get( expression ),\n                                                      err );\n    }\n\n    after( MojoBinding binding,\n           MavenProject project,\n           String expression) throwing ( Exception cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && cflow( pm_checkRequiredParameters() )\n        && cflow( ppee_evaluate( expression ) )\n        && within( PluginParameterExpressionEvaluator )\n        && call( Object ReflectionValueExtractor.evaluate( String, Object ) )\n    {\n        getReporter().reportReflectionErrorWhileEvaluatingMojoParameter( currentParameter,\n                                                                         binding,\n                                                                         project,\n                                                                         expression,\n                                                                         cause );\n    }\n\n    after( MojoBinding binding,\n           MavenProject project,\n           PlexusConfiguration config) throwing( PluginConfigurationException cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && execution( void DefaultPluginManager.populatePluginFields( *, *, PlexusConfiguration, .. ) )\n        && args( *, *, config, .. )\n    {\n        getReporter().reportErrorApplyingMojoConfiguration( binding, project, config, cause );\n    }\n\n    private pointcut pm_resolveTransitiveDependencies( MavenProject project,\n                                                       String scope ):\n        execution( void DefaultPluginManager.resolveTransitiveDependencies( *, *, String, *, MavenProject ) )\n        && args( *, *, scope, *, project );\n\n    after( MavenProject project,\n           String scope) throwing( ArtifactNotFoundException cause ):\n        pm_resolveTransitiveDependencies( project, scope )\n    {\n        getReporter().reportProjectDependenciesNotFound( project, scope, cause );\n    }\n\n    after( MavenProject project,\n           String scope) throwing( ArtifactResolutionException cause ):\n        pm_resolveTransitiveDependencies( project, scope )\n    {\n        if ( cause instanceof MultipleArtifactsNotFoundException )\n        {\n            getReporter().reportProjectDependenciesNotFound( project,\n                                                             scope,\n                                                             (MultipleArtifactsNotFoundException) cause );\n        }\n        else\n        {\n            getReporter().reportProjectDependenciesUnresolvable( project, scope, cause );\n        }\n    }\n\n    private pointcut le_getLifecycleBindings( List tasks,\n                                              MavenProject configuringProject,\n                                              String targetDescription ):\n        execution( List DefaultLifecycleExecutor.getLifecycleBindings( List, MavenProject, *, String ) )\n        && args( tasks, configuringProject, *, targetDescription );\n\n    BuildPlan around( List tasks,\n                      MavenProject project,\n                      MavenSession session )\n        throws LifecycleLoaderException, LifecycleSpecificationException, LifecyclePlannerException:\n            cflow( execution( * DefaultLifecycleExecutor.*( .. ) ) )\n            && execution( BuildPlan BuildPlanner+.constructBuildPlan( List, MavenProject, MavenSession, * ) )\n            && args( tasks, project, session, * )\n    {\n        try\n        {\n            return proceed( tasks, project, session );\n        }\n        catch ( LifecycleLoaderException cause )\n        {\n            getReporter().reportErrorFormulatingBuildPlan( tasks, project, session, cause );\n            throw cause;\n        }\n        catch ( LifecyclePlannerException cause )\n        {\n            getReporter().reportErrorFormulatingBuildPlan( tasks, project, session, cause );\n            throw cause;\n        }\n        catch ( LifecycleSpecificationException cause )\n        {\n            getReporter().reportErrorFormulatingBuildPlan( tasks, project, session, cause );\n            throw cause;\n        }\n    }\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"8437d5647ae831197a3dc64e8b4d56b3aa2b12ef","subject":"change access method for LaunchImpl.jobInstance = > use getter...","message":"change access method for LaunchImpl.jobInstance = > use getter...\n","repos":"awltech\/org.parallelj,christophe-w\/parallelj.runtime","old_file":"parallelj-launching\/src\/main\/java\/org\/parallelj\/launching\/internal\/LaunchManagement.aj","new_file":"parallelj-launching\/src\/main\/java\/org\/parallelj\/launching\/internal\/LaunchManagement.aj","new_contents":"\/*\n *     ParallelJ, framework for parallel computing\n *\n *     Copyright (C) 2010, 2011, 2012 Atos Worldline or third-party contributors as\n *     indicated by the @author tags or express copyright attribution\n *     statements applied by the authors.\n *\n *     This library is free software; you can redistribute it and\/or\n *     modify it under the terms of the GNU Lesser General Public\n *     License as published by the Free Software Foundation; either\n *     version 2.1 of the License.\n *\n *     This library is distributed in the hope that it will be useful,\n *     but WITHOUT ANY WARRANTY; without even the implied warranty of\n *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n *     Lesser General Public License for more details.\n *\n *     You should have received a copy of the GNU Lesser General Public\n *     License along with this library; if not, write to the Free Software\n *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n *\/\npackage org.parallelj.launching.internal;\n\nimport java.util.Map;\nimport java.util.concurrent.ConcurrentHashMap;\nimport java.util.concurrent.ExecutorService;\n\nimport org.parallelj.Programs;\nimport org.parallelj.internal.conf.ConfigurationService;\nimport org.parallelj.internal.conf.ParalleljConfigurationManager;\nimport org.parallelj.internal.conf.pojos.CExecutor;\nimport org.parallelj.internal.conf.pojos.CExecutors;\nimport org.parallelj.internal.conf.pojos.ParalleljConfiguration;\nimport org.parallelj.internal.kernel.KProcessor;\nimport org.parallelj.internal.kernel.procedure.CallableProcedure.CallableCall.CallableCallRunnable;\nimport org.parallelj.internal.kernel.procedure.RunnableProcedure.RunnableCall.RunnableCallRunnable;\nimport org.parallelj.internal.kernel.procedure.SubProcessProcedure.SubProcessCall.SubProcessRunnable;\nimport org.parallelj.internal.reflect.ProcessHelperImpl;\nimport org.parallelj.internal.reflect.ProgramAdapter.Adapter;\nimport org.parallelj.launching.Launch;\nimport org.parallelj.launching.LaunchException;\nimport org.parallelj.launching.LaunchingMessageKind;\nimport org.parallelj.launching.ProgramReturnCodes;\nimport org.parallelj.mirror.ExecutorServiceKind;\nimport org.parallelj.mirror.ParallelJThreadFactory;\n\n\/**\n * Implements the synchLaunch(..) and aSynchLaunch(..) methods of Launch.\n * \n * \n *\/\nprivileged aspect LaunchManagement { \n\t\n\tprivate static Map<KProcessor, LaunchImpl> phl = new ConcurrentHashMap<>(); \n\t\n\tstatic privileged public aspect LaunchAdapter percflow(launchInstance() ) {\n\t\n\t\tdeclare precedence :\n\t\t\torg.parallelj.internal.kernel.Identifiers,\n\t\t\torg.parallelj.internal.reflect.ProgramAdapter,\n\t\t\torg.parallelj.internal.util.sm.impl.KStateMachines,\n\t\t\torg.parallelj.internal.util.sm.impl.KStateMachines.PerMachine,\n\t\t\torg.parallelj.Executables$PerExecutable,\n\t\t\torg.parallelj.internal.reflect.ProgramAdapter.PerProgram,\n\t\t\torg.parallelj.internal.log.Logs;\n\t\n\t\tpointcut launchInstance() : execution(* Launch+.*(..));\n\t\n\t\tinterface IKProcessorLaunch {}\n\t\tLaunchImpl IKProcessorLaunch.launch;\n\t\tdeclare parents: KProcessor implements IKProcessorLaunch;\n\t\t\n\t\tinterface ILaunchExecutors {}\n\t\tMap<String, ExecutorService> ILaunchExecutors.executors = new ConcurrentHashMap<>();\n\t\tExecutorService ILaunchExecutors.defaultExecutor = null;\n\t\tdeclare parents: LaunchImpl implements ILaunchExecutors;\n\t\t\n\t\tprivate LaunchingObservable observable = new LaunchingObservable();\n\t\t\n\t\tboolean stopExecutorServiceAfterExecution = false;\n\t\n\t\tprivate static class AsyncThread implements Runnable {\n\t\n\t\t\tprivate LaunchAdapter launchAdapter;\n\t\t\tprivate LaunchImpl<?> launch;\n\t\n\t\t\tpublic AsyncThread(LaunchImpl<?> launch, LaunchAdapter launchAdapter) {\n\t\t\t\tthis.launch = launch;\n\t\t\t\tthis.launchAdapter = launchAdapter;\n\t\t\t}\n\t\n\t\t\t@Override\n\t\t\tpublic void run() {\n\t\t\t\tthis.launchAdapter.internalSyncLaunch(this.launch);\n\t\t\t}\n\t\t}\n\t\t\n\t\t@SuppressWarnings({ \"rawtypes\", \"unchecked\" })\n\t\tLaunch around(LaunchImpl launch) throws LaunchException: \n\t\t\t\t\texecution(public Launch Launch+.synchLaunch(..) throws LaunchException)\n\t\t\t\t\t\t&& this(launch) {\n\t\t\tproceed(launch);\n\t\t\tlaunch.processHelper = Programs.as(launch.getJobInstance());\n\t\t\tlaunch.getLaunchResult().setStatusCode(ProgramReturnCodes.RUNNING);\n\t\t\tthis.observable.prepareLaunching(launch);\n\t\n\t\t\treturn internalSyncLaunch(launch);\n\t\t}\n\t\n\t\t@SuppressWarnings({ \"rawtypes\", \"unchecked\" })\n\t\tLaunch around(LaunchImpl launch) throws LaunchException: \n\t\t\t\t\texecution(public Launch Launch+.aSynchLaunch() throws LaunchException)\n\t\t\t\t\t\t&& this(launch) {\n\t\t\tproceed(launch);\n\t\t\tlaunch.processHelper = Programs.as(launch.getJobInstance());\n\t\t\tlaunch.getLaunchResult().setStatusCode(ProgramReturnCodes.RUNNING);\n\t\t\tthis.observable.prepareLaunching(launch);\n\t\t\tif (launch.getExecutorService()!=null) {\n\t\t\t\tlaunch.getExecutorService().execute(new AsyncThread(launch, this));\n\t\t\t} else {\n\t\t\t\tParallelJThreadFactory.getInstance().newThread(new AsyncThread(launch, this)).start();\n\t \t\t}\n\t\t\treturn launch;\n\t\t}\n\t\n\t\t@SuppressWarnings(\"rawtypes\")\n\t\tprivate Launch<?> internalSyncLaunch(LaunchImpl<?> launch) {\n\t\t\tLaunchingMessageKind.ILAUNCH0002.format(launch.getJobInstance()\n\t\t\t\t\t.getClass().getCanonicalName(), launch.getLaunchId());\n\t\t\tinitializeExecutors(launch);\n\t\t\tProcessHelperImpl processHelper = (ProcessHelperImpl)launch.getProcessHelper();\n\t\t\tKProcessor processor = processHelper.processor;\n\t\t\tif (processor == null) {\n\t\t\t\tif ( ((ILaunchExecutors)launch).defaultExecutor!=null) {\n\t\t\t\t\tprocessor = new KProcessor(((ILaunchExecutors)launch).defaultExecutor);\n\t\t\t\t} else {\n\t\t\t\t\tprocessor = new KProcessor(launch.getExecutorService());\n\t\t\t\t}\n\t\t\t\t((IKProcessorLaunch)processor).launch = launch;\n\t\t\t\tphl.put(processor, launch);\n\t\t\t}\n\t\t\tprocessor.execute(processHelper.process);\n\t\t\tlaunch.getProcessHelper().join();\n\t\t\tthis.observable.finalizeLaunching(launch);\n\t\t\tlaunch.complete();\n\t\t\tcleanExecutors(launch);\n\t\t\tphl.remove(processor);\n\t\t\t\n\t\t\tif (launch.getLaunchResult().getStatusCode()!=ProgramReturnCodes.FAILURE\n\t\t\t\t\t&&launch.getLaunchResult().getStatusCode()!=ProgramReturnCodes.ABORTED) {\n\t\t\t\tlaunch.getLaunchResult().setStatusCode(ProgramReturnCodes.SUCCESS);\n\t\t\t}\n\t\t\tLaunchingMessageKind.ILAUNCH0003.format(launch.getJobInstance()\n\t\t\t\t\t.getClass().getCanonicalName(), launch.getLaunchId(), launch\n\t\t\t\t\t.getLaunchResult().getStatusCode(), launch.getLaunchResult()\n\t\t\t\t\t.getReturnCode());\n\t\t\treturn launch;\n\t\t}\n\t\t\n\t\tprivate void initializeExecutors(LaunchImpl<?> launch) {\n\t\t\tParalleljConfiguration configuration = (ParalleljConfiguration) ConfigurationService\n\t\t\t\t\t.getConfigurationService().getConfigurationManager()\n\t\t\t\t\t.get(ParalleljConfigurationManager.class)\n\t\t\t\t\t.getConfiguration();\n\t\t\tMap<String, ExecutorService> executors = ((ILaunchExecutors) launch).executors;\n\t\t\tCExecutors cExecutors = configuration != null ? configuration\n\t\t\t\t\t.getExecutorServices() : null;\n\t\t\tif (cExecutors != null) {\n\t\t\t\tif (cExecutors.getDefaultServiceType() != null\n\t\t\t\t\t\t|| cExecutors.getDefaultPoolSize() != null\n\t\t\t\t\t\t|| cExecutors.getDefaultServiceClass() != null) {\n\t\t\t\t\ttry {\n\t\t\t\t\t\tint size = cExecutors.getDefaultPoolSize() != null ? cExecutors.getDefaultPoolSize().intValue() : 0;\n\t\t\t\t\t\tExecutorService defaultService = ExecutorServiceKind\n\t\t\t\t\t\t\t\t.valueOf(\n\t\t\t\t\t\t\t\t\t\tcExecutors.getDefaultServiceType()\n\t\t\t\t\t\t\t\t\t\t\t\t.value()).create(\n\t\t\t\t\t\t\t\t\t\tsize,\n\t\t\t\t\t\t\t\t\t\tcExecutors.getDefaultServiceClass());\n\t\t\t\t\t\t((ILaunchExecutors) launch).defaultExecutor = defaultService;\n\t\t\t\t\t} catch (Exception e) {\n\t\t\t\t\t\tLaunchingMessageKind.ELAUNCH0011.format(e);\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\tif (cExecutors.getExecutorService() != null) {\n\t\t\t\t\tfor (CExecutor cExecutor : cExecutors.getExecutorService()) {\n\t\t\t\t\t\tString[] names = cExecutor.getProgramName().split(\",\");\n\t\t\t\t\t\tboolean instanciate = false;\n\t\t\t\t\t\tfor (String name : names) {\n\t\t\t\t\t\t\tif (name.length() > 0 && name.trim().length() > 0) {\n\t\t\t\t\t\t\t\tinstanciate = true;\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t\tif (instanciate) {\n\t\t\t\t\t\t\tExecutorService executor = null;\n\t\t\t\t\t\t\tif (cExecutor.getServiceType() != null) {\n\t\t\t\t\t\t\t\tString type = cExecutor.getServiceType()\n\t\t\t\t\t\t\t\t\t\t.value();\n\t\t\t\t\t\t\t\ttry {\n\t\t\t\t\t\t\t\t\tint size = cExecutor.getPoolSize() != null ? cExecutor\n\t\t\t\t\t\t\t\t\t\t\t.getPoolSize().intValue() : 0;\n\t\t\t\t\t\t\t\t\texecutor = ExecutorServiceKind\n\t\t\t\t\t\t\t\t\t\t\t.valueOf(type)\n\t\t\t\t\t\t\t\t\t\t\t.create(size,\n\t\t\t\t\t\t\t\t\t\t\t\t\tcExecutor.getServiceClass());\n\t\t\t\t\t\t\t\t\tboolean foundProgram = false;\n\t\t\t\t\t\t\t\t\tfor (String name : names) {\n\t\t\t\t\t\t\t\t\t\tif (name.length() > 0 && name.trim().length() > 0) {\n\t\t\t\t\t\t\t\t\t\t\texecutors.put(\n\t\t\t\t\t\t\t\t\t\t\t\t\tname,\n\t\t\t\t\t\t\t\t\t\t\t\t\texecutor);\n\t\t\t\t\t\t\t\t\t\t\tfoundProgram = true;\n\t\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t\tif (!foundProgram) {\n\t\t\t\t\t\t\t\t\t\texecutor.shutdown();\n\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t} catch (Exception e) {\n\t\t\t\t\t\t\t\t\tLaunchingMessageKind.ELAUNCH0012.format(e);\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\n\t\tprivate void cleanExecutors(LaunchImpl<?> launch) {\n\t\t\tMap<String, ExecutorService> executors = ((ILaunchExecutors)launch).executors;\n\t\t\tfor (String key : executors.keySet()) {\n\t\t\t\texecutors.get(key).shutdown();\n\t\t\t\texecutors.remove(key);\n\t\t\t}\n\t\t\tif (((ILaunchExecutors)launch).defaultExecutor!=null) {\n\t\t\t\t((ILaunchExecutors)launch).defaultExecutor.shutdown();\n\t\t\t}\n\t\t}\n\t}\n\n\t@SuppressWarnings(\"rawtypes\")\n\tvoid around(KProcessor kProcessor, SubProcessRunnable runnable):execution(public void submit(..))\n\t\t&& args(runnable)\n\t\t&&this(kProcessor){\n\t\n\t\tAdapter context = (Adapter)runnable.getSubProcessCall().getProcess().getContext();\n\t\tLaunchImpl launch = phl.get(kProcessor);\n\t\tif (launch!=null) {\n\t\t\tExecutorService service = launch.executors.get(context.getClass().getCanonicalName());\n\t\t\tif (service!=null) {\n\t\t\t\tkProcessor.submit(runnable, service);\n\t\t\t} else {\n\t\t\t\tproceed(kProcessor, runnable);\n\t\t\t}\n\t\t} else {\n\t\t\tproceed(kProcessor, runnable);\n\t\t}\n}\n\n\t@SuppressWarnings(\"rawtypes\")\n\tvoid around(KProcessor kProcessor, CallableCallRunnable runnable):execution(public void submit(..))\n\t\t&& args(runnable)\n\t\t&&this(kProcessor){\n\t\t\n\t\tAdapter context = (Adapter)runnable.getCallableCall().getProcess().getContext();\n\t\tLaunchImpl launch = phl.get(kProcessor);\n\t\tif (launch!=null) {\n\t\t\tExecutorService service = launch.executors.get(context.getClass().getCanonicalName());\n\t\t\tif (service!=null) {\n\t\t\t\tkProcessor.submit(runnable, service);\n\t\t\t} else {\n\t\t\t\tproceed(kProcessor, runnable);\n\t\t\t}\n\t\t} else {\n\t\t\tproceed(kProcessor, runnable);\n\t\t}\n\t}\n\t\n\t@SuppressWarnings(\"rawtypes\")\n\tvoid around(KProcessor kProcessor, RunnableCallRunnable runnable):execution(public void submit(..))\n\t\t&& args(runnable)\n\t\t&&this(kProcessor) {\n\t\t\n\t\tAdapter context = (Adapter)runnable.getRunnableCall().getProcess().getContext();\n\t\tLaunchImpl launch = phl.get(kProcessor);\n\t\tif (launch!=null) {\n\t\t\tExecutorService service = launch.executors.get(context.getClass().getCanonicalName());\n\t\t\tif (service!=null) {\n\t\t\t\tkProcessor.submit(runnable, service);\n\t\t\t} else {\n\t\t\t\tproceed(kProcessor, runnable);\n\t\t\t}\n\t\t} else {\n\t\t\tproceed(kProcessor, runnable);\n\t\t}\n\t}\n}\n","old_contents":"\/*\n *     ParallelJ, framework for parallel computing\n *\n *     Copyright (C) 2010, 2011, 2012 Atos Worldline or third-party contributors as\n *     indicated by the @author tags or express copyright attribution\n *     statements applied by the authors.\n *\n *     This library is free software; you can redistribute it and\/or\n *     modify it under the terms of the GNU Lesser General Public\n *     License as published by the Free Software Foundation; either\n *     version 2.1 of the License.\n *\n *     This library is distributed in the hope that it will be useful,\n *     but WITHOUT ANY WARRANTY; without even the implied warranty of\n *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n *     Lesser General Public License for more details.\n *\n *     You should have received a copy of the GNU Lesser General Public\n *     License along with this library; if not, write to the Free Software\n *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n *\/\npackage org.parallelj.launching.internal;\n\nimport java.util.Map;\nimport java.util.concurrent.ConcurrentHashMap;\nimport java.util.concurrent.ExecutorService;\n\nimport org.parallelj.Programs;\nimport org.parallelj.internal.conf.ConfigurationService;\nimport org.parallelj.internal.conf.ParalleljConfigurationManager;\nimport org.parallelj.internal.conf.pojos.CExecutor;\nimport org.parallelj.internal.conf.pojos.CExecutors;\nimport org.parallelj.internal.conf.pojos.ParalleljConfiguration;\nimport org.parallelj.internal.kernel.KProcessor;\nimport org.parallelj.internal.kernel.procedure.CallableProcedure.CallableCall.CallableCallRunnable;\nimport org.parallelj.internal.kernel.procedure.RunnableProcedure.RunnableCall.RunnableCallRunnable;\nimport org.parallelj.internal.kernel.procedure.SubProcessProcedure.SubProcessCall.SubProcessRunnable;\nimport org.parallelj.internal.reflect.ProcessHelperImpl;\nimport org.parallelj.internal.reflect.ProgramAdapter.Adapter;\nimport org.parallelj.launching.Launch;\nimport org.parallelj.launching.LaunchException;\nimport org.parallelj.launching.LaunchingMessageKind;\nimport org.parallelj.launching.ProgramReturnCodes;\nimport org.parallelj.mirror.ExecutorServiceKind;\nimport org.parallelj.mirror.ParallelJThreadFactory;\n\n\/**\n * Implements the synchLaunch(..) and aSynchLaunch(..) methods of Launch.\n * \n * \n *\/\nprivileged aspect LaunchManagement { \n\t\n\tprivate static Map<KProcessor, LaunchImpl> phl = new ConcurrentHashMap<>(); \n\t\n\tstatic privileged public aspect LaunchAdapter percflow(launchInstance() ) {\n\t\n\t\tdeclare precedence :\n\t\t\torg.parallelj.internal.kernel.Identifiers,\n\t\t\torg.parallelj.internal.reflect.ProgramAdapter,\n\t\t\torg.parallelj.internal.util.sm.impl.KStateMachines,\n\t\t\torg.parallelj.internal.util.sm.impl.KStateMachines.PerMachine,\n\t\t\torg.parallelj.Executables$PerExecutable,\n\t\t\torg.parallelj.internal.reflect.ProgramAdapter.PerProgram,\n\t\t\torg.parallelj.internal.log.Logs;\n\t\n\t\tpointcut launchInstance() : execution(* Launch+.*(..));\n\t\n\t\tinterface IKProcessorLaunch {}\n\t\tLaunchImpl IKProcessorLaunch.launch;\n\t\tdeclare parents: KProcessor implements IKProcessorLaunch;\n\t\t\n\t\tinterface ILaunchExecutors {}\n\t\tMap<String, ExecutorService> ILaunchExecutors.executors = new ConcurrentHashMap<>();\n\t\tExecutorService ILaunchExecutors.defaultExecutor = null;\n\t\tdeclare parents: LaunchImpl implements ILaunchExecutors;\n\t\t\n\t\tprivate LaunchingObservable observable = new LaunchingObservable();\n\t\t\n\t\tboolean stopExecutorServiceAfterExecution = false;\n\t\n\t\tprivate static class AsyncThread implements Runnable {\n\t\n\t\t\tprivate LaunchAdapter launchAdapter;\n\t\t\tprivate LaunchImpl<?> launch;\n\t\n\t\t\tpublic AsyncThread(LaunchImpl<?> launch, LaunchAdapter launchAdapter) {\n\t\t\t\tthis.launch = launch;\n\t\t\t\tthis.launchAdapter = launchAdapter;\n\t\t\t}\n\t\n\t\t\t@Override\n\t\t\tpublic void run() {\n\t\t\t\tthis.launchAdapter.internalSyncLaunch(this.launch);\n\t\t\t}\n\t\t}\n\t\t\n\t\t@SuppressWarnings({ \"rawtypes\", \"unchecked\" })\n\t\tLaunch around(LaunchImpl launch) throws LaunchException: \n\t\t\t\t\texecution(public Launch Launch+.synchLaunch(..) throws LaunchException)\n\t\t\t\t\t\t&& this(launch) {\n\t\t\tproceed(launch);\n\t\t\tlaunch.processHelper = Programs.as(launch.jobInstance);\n\t\t\tlaunch.getLaunchResult().setStatusCode(ProgramReturnCodes.RUNNING);\n\t\t\tthis.observable.prepareLaunching(launch);\n\t\n\t\t\treturn internalSyncLaunch(launch);\n\t\t}\n\t\n\t\t@SuppressWarnings({ \"rawtypes\", \"unchecked\" })\n\t\tLaunch around(LaunchImpl launch) throws LaunchException: \n\t\t\t\t\texecution(public Launch Launch+.aSynchLaunch() throws LaunchException)\n\t\t\t\t\t\t&& this(launch) {\n\t\t\tproceed(launch);\n\t\t\tlaunch.processHelper = Programs.as(launch.getJobInstance());\n\t\t\tlaunch.getLaunchResult().setStatusCode(ProgramReturnCodes.RUNNING);\n\t\t\tthis.observable.prepareLaunching(launch);\n\t\t\tif (launch.getExecutorService()!=null) {\n\t\t\t\tlaunch.getExecutorService().execute(new AsyncThread(launch, this));\n\t\t\t} else {\n\t\t\t\tParallelJThreadFactory.getInstance().newThread(new AsyncThread(launch, this)).start();\n\t \t\t}\n\t\t\treturn launch;\n\t\t}\n\t\n\t\t@SuppressWarnings(\"rawtypes\")\n\t\tprivate Launch<?> internalSyncLaunch(LaunchImpl<?> launch) {\n\t\t\tLaunchingMessageKind.ILAUNCH0002.format(launch.getJobInstance()\n\t\t\t\t\t.getClass().getCanonicalName(), launch.getLaunchId());\n\t\t\tinitializeExecutors(launch);\n\t\t\tProcessHelperImpl processHelper = (ProcessHelperImpl)launch.getProcessHelper();\n\t\t\tKProcessor processor = processHelper.processor;\n\t\t\tif (processor == null) {\n\t\t\t\tif ( ((ILaunchExecutors)launch).defaultExecutor!=null) {\n\t\t\t\t\tprocessor = new KProcessor(((ILaunchExecutors)launch).defaultExecutor);\n\t\t\t\t} else {\n\t\t\t\t\tprocessor = new KProcessor(launch.getExecutorService());\n\t\t\t\t}\n\t\t\t\t((IKProcessorLaunch)processor).launch = launch;\n\t\t\t\tphl.put(processor, launch);\n\t\t\t}\n\t\t\tprocessor.execute(processHelper.process);\n\t\t\tlaunch.getProcessHelper().join();\n\t\t\tthis.observable.finalizeLaunching(launch);\n\t\t\tlaunch.complete();\n\t\t\tcleanExecutors(launch);\n\t\t\tphl.remove(processor);\n\t\t\t\n\t\t\tif (launch.getLaunchResult().getStatusCode()!=ProgramReturnCodes.FAILURE\n\t\t\t\t\t&&launch.getLaunchResult().getStatusCode()!=ProgramReturnCodes.ABORTED) {\n\t\t\t\tlaunch.getLaunchResult().setStatusCode(ProgramReturnCodes.SUCCESS);\n\t\t\t}\n\t\t\tLaunchingMessageKind.ILAUNCH0003.format(launch.getJobInstance()\n\t\t\t\t\t.getClass().getCanonicalName(), launch.getLaunchId(), launch\n\t\t\t\t\t.getLaunchResult().getStatusCode(), launch.getLaunchResult()\n\t\t\t\t\t.getReturnCode());\n\t\t\treturn launch;\n\t\t}\n\t\t\n\t\tprivate void initializeExecutors(LaunchImpl<?> launch) {\n\t\t\tParalleljConfiguration configuration = (ParalleljConfiguration) ConfigurationService\n\t\t\t\t\t.getConfigurationService().getConfigurationManager()\n\t\t\t\t\t.get(ParalleljConfigurationManager.class)\n\t\t\t\t\t.getConfiguration();\n\t\t\tMap<String, ExecutorService> executors = ((ILaunchExecutors) launch).executors;\n\t\t\tCExecutors cExecutors = configuration != null ? configuration\n\t\t\t\t\t.getExecutorServices() : null;\n\t\t\tif (cExecutors != null) {\n\t\t\t\tif (cExecutors.getDefaultServiceType() != null\n\t\t\t\t\t\t|| cExecutors.getDefaultPoolSize() != null\n\t\t\t\t\t\t|| cExecutors.getDefaultServiceClass() != null) {\n\t\t\t\t\ttry {\n\t\t\t\t\t\tint size = cExecutors.getDefaultPoolSize() != null ? cExecutors.getDefaultPoolSize().intValue() : 0;\n\t\t\t\t\t\tExecutorService defaultService = ExecutorServiceKind\n\t\t\t\t\t\t\t\t.valueOf(\n\t\t\t\t\t\t\t\t\t\tcExecutors.getDefaultServiceType()\n\t\t\t\t\t\t\t\t\t\t\t\t.value()).create(\n\t\t\t\t\t\t\t\t\t\tsize,\n\t\t\t\t\t\t\t\t\t\tcExecutors.getDefaultServiceClass());\n\t\t\t\t\t\t((ILaunchExecutors) launch).defaultExecutor = defaultService;\n\t\t\t\t\t} catch (Exception e) {\n\t\t\t\t\t\tLaunchingMessageKind.ELAUNCH0011.format(e);\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\tif (cExecutors.getExecutorService() != null) {\n\t\t\t\t\tfor (CExecutor cExecutor : cExecutors.getExecutorService()) {\n\t\t\t\t\t\tString[] names = cExecutor.getProgramName().split(\",\");\n\t\t\t\t\t\tboolean instanciate = false;\n\t\t\t\t\t\tfor (String name : names) {\n\t\t\t\t\t\t\tif (name.length() > 0 && name.trim().length() > 0) {\n\t\t\t\t\t\t\t\tinstanciate = true;\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t\tif (instanciate) {\n\t\t\t\t\t\t\tExecutorService executor = null;\n\t\t\t\t\t\t\tif (cExecutor.getServiceType() != null) {\n\t\t\t\t\t\t\t\tString type = cExecutor.getServiceType()\n\t\t\t\t\t\t\t\t\t\t.value();\n\t\t\t\t\t\t\t\ttry {\n\t\t\t\t\t\t\t\t\tint size = cExecutor.getPoolSize() != null ? cExecutor\n\t\t\t\t\t\t\t\t\t\t\t.getPoolSize().intValue() : 0;\n\t\t\t\t\t\t\t\t\texecutor = ExecutorServiceKind\n\t\t\t\t\t\t\t\t\t\t\t.valueOf(type)\n\t\t\t\t\t\t\t\t\t\t\t.create(size,\n\t\t\t\t\t\t\t\t\t\t\t\t\tcExecutor.getServiceClass());\n\t\t\t\t\t\t\t\t\tboolean foundProgram = false;\n\t\t\t\t\t\t\t\t\tfor (String name : names) {\n\t\t\t\t\t\t\t\t\t\tif (name.length() > 0 && name.trim().length() > 0) {\n\t\t\t\t\t\t\t\t\t\t\texecutors.put(\n\t\t\t\t\t\t\t\t\t\t\t\t\tname,\n\t\t\t\t\t\t\t\t\t\t\t\t\texecutor);\n\t\t\t\t\t\t\t\t\t\t\tfoundProgram = true;\n\t\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t\tif (!foundProgram) {\n\t\t\t\t\t\t\t\t\t\texecutor.shutdown();\n\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t} catch (Exception e) {\n\t\t\t\t\t\t\t\t\tLaunchingMessageKind.ELAUNCH0012.format(e);\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\n\t\tprivate void cleanExecutors(LaunchImpl<?> launch) {\n\t\t\tMap<String, ExecutorService> executors = ((ILaunchExecutors)launch).executors;\n\t\t\tfor (String key : executors.keySet()) {\n\t\t\t\texecutors.get(key).shutdown();\n\t\t\t\texecutors.remove(key);\n\t\t\t}\n\t\t\tif (((ILaunchExecutors)launch).defaultExecutor!=null) {\n\t\t\t\t((ILaunchExecutors)launch).defaultExecutor.shutdown();\n\t\t\t}\n\t\t}\n\t}\n\n\t@SuppressWarnings(\"rawtypes\")\n\tvoid around(KProcessor kProcessor, SubProcessRunnable runnable):execution(public void submit(..))\n\t\t&& args(runnable)\n\t\t&&this(kProcessor){\n\t\n\t\tAdapter context = (Adapter)runnable.getSubProcessCall().getProcess().getContext();\n\t\tLaunchImpl launch = phl.get(kProcessor);\n\t\tif (launch!=null) {\n\t\t\tExecutorService service = launch.executors.get(context.getClass().getCanonicalName());\n\t\t\tif (service!=null) {\n\t\t\t\tkProcessor.submit(runnable, service);\n\t\t\t} else {\n\t\t\t\tproceed(kProcessor, runnable);\n\t\t\t}\n\t\t} else {\n\t\t\tproceed(kProcessor, runnable);\n\t\t}\n}\n\n\t@SuppressWarnings(\"rawtypes\")\n\tvoid around(KProcessor kProcessor, CallableCallRunnable runnable):execution(public void submit(..))\n\t\t&& args(runnable)\n\t\t&&this(kProcessor){\n\t\t\n\t\tAdapter context = (Adapter)runnable.getCallableCall().getProcess().getContext();\n\t\tLaunchImpl launch = phl.get(kProcessor);\n\t\tif (launch!=null) {\n\t\t\tExecutorService service = launch.executors.get(context.getClass().getCanonicalName());\n\t\t\tif (service!=null) {\n\t\t\t\tkProcessor.submit(runnable, service);\n\t\t\t} else {\n\t\t\t\tproceed(kProcessor, runnable);\n\t\t\t}\n\t\t} else {\n\t\t\tproceed(kProcessor, runnable);\n\t\t}\n\t}\n\t\n\t@SuppressWarnings(\"rawtypes\")\n\tvoid around(KProcessor kProcessor, RunnableCallRunnable runnable):execution(public void submit(..))\n\t\t&& args(runnable)\n\t\t&&this(kProcessor) {\n\t\t\n\t\tAdapter context = (Adapter)runnable.getRunnableCall().getProcess().getContext();\n\t\tLaunchImpl launch = phl.get(kProcessor);\n\t\tif (launch!=null) {\n\t\t\tExecutorService service = launch.executors.get(context.getClass().getCanonicalName());\n\t\t\tif (service!=null) {\n\t\t\t\tkProcessor.submit(runnable, service);\n\t\t\t} else {\n\t\t\t\tproceed(kProcessor, runnable);\n\t\t\t}\n\t\t} else {\n\t\t\tproceed(kProcessor, runnable);\n\t\t}\n\t}\n}\n","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"3da51ba35a9480d643b868258b5fd0bd5539176a","subject":"Fix problem caused by Spring's ConfigurableDeserializationSupport marker interface being package-private.","message":"Fix problem caused by Spring's ConfigurableDeserializationSupport marker\ninterface being package-private.\n","repos":"archiecobbs\/jsimpledb,permazen\/permazen,archiecobbs\/jsimpledb,permazen\/permazen,tempbottle\/jsimpledb,tempbottle\/jsimpledb,tempbottle\/jsimpledb,archiecobbs\/jsimpledb,permazen\/permazen","old_file":"src\/java\/org\/dellroad\/stuff\/vaadin\/VaadinConfigurableAspect.aj","new_file":"src\/java\/org\/dellroad\/stuff\/vaadin\/VaadinConfigurableAspect.aj","new_contents":"\n\/*\n * Copyright (C) 2011 Archie L. Cobbs and other authors. All rights reserved.\n *\n * $Id: SpringContextApplication.java 160 2011-10-24 18:00:49Z archie.cobbs $\n *\/\n\npackage org.dellroad.stuff.vaadin;\n\nimport java.io.ObjectStreamException;\nimport java.io.Serializable;\n\nimport org.springframework.beans.factory.annotation.Configurable;\nimport org.springframework.beans.factory.aspectj.AbstractDependencyInjectionAspect;\nimport org.springframework.beans.factory.aspectj.ConfigurableObject;\n\n\/**\n * Aspect that autowires classes marked with the Spring's {@link Configurable @Configurable} annotation to a\n * {@link SpringContextApplication} application context.\n *\n * <p>\n * This aspect does the same thing that Spring's {@code AnnotationBeanConfigurerAspect} aspect does,\n * except that this aspect configures beans using the application context associated with the current\n * {@link SpringContextApplication} Vaadin application rather than the one associated with the overall\n * servlet context (i.e., its parent).\n * <\/p>\n *\n * <p>\n * As a result, objects so annotated will be configured for their specific {@link SpringContextApplication}\n * instance, and therefore can only be instantiated by threads associated with a current {@link SpringContextApplication}\n * (see {@link ContextApplication#get}). This will be the case when executing within a {@link SpringContextApplication}\n * Vaadin application HTTP request or an invocation of {@link ContextApplication#invoke} on same.\n * <\/p>\n *\n * <p>\n * This implementation is derived from Spring's {@code AnnotationBeanConfigurerAspect} implementation\n * and therefore shares its license (also Apache).\n * <\/p>\n *\n * @see SpringContextApplication\n * @see ContextApplication#get\n * @see Configurable\n *\/\npublic aspect VaadinConfigurableAspect extends AbstractDependencyInjectionAspect {\n\n\/\/ Stuff copied from AbstractInterfaceDrivenDependencyInjectionAspect.aj\n\n    public pointcut beanConstruction(Object bean) :\n        initialization(ConfigurableObject+.new(..)) && this(bean);\n\n    public pointcut beanDeserialization(Object bean) :\n        execution(Object ConfigurableDeserializationSupport+.readResolve()) &&\n        this(bean);\n\n    public pointcut leastSpecificSuperTypeConstruction() : initialization(ConfigurableObject.new(..));\n\n    static interface ConfigurableDeserializationSupport extends Serializable {\n    }\n\n    public Object ConfigurableDeserializationSupport.readResolve() throws ObjectStreamException {\n        return this;\n    }\n\n\/\/ Stuff copied from AnnotationBeanConfigurerAspect.aj\n\n    public pointcut inConfigurableBean() : @this(Configurable);\n\n    public pointcut preConstructionConfiguration() : preConstructionConfigurationSupport(*);\n\n    declare parents: @Configurable * implements ConfigurableObject;\n\n    private pointcut preConstructionConfigurationSupport(Configurable c) : @this(c) && if(c.preConstruction());\n\n\tdeclare parents: @Configurable Serializable+ implements ConfigurableDeserializationSupport;\n\n\/\/ Our implementation\n\n    @Override\n    public void configureBean(Object bean) {\n        SpringContextApplication.get().configureBean(bean);\n    }\n}\n\n","old_contents":"\n\/*\n * Copyright (C) 2011 Archie L. Cobbs. All rights reserved.\n *\n * $Id: SpringContextApplication.java 160 2011-10-24 18:00:49Z archie.cobbs $\n *\/\n\npackage org.dellroad.stuff.vaadin;\n\nimport org.springframework.beans.factory.annotation.Configurable;\nimport org.springframework.beans.factory.aspectj.AbstractInterfaceDrivenDependencyInjectionAspect;\nimport org.springframework.beans.factory.aspectj.ConfigurableObject;\n\n\/**\n * Aspect that autowires classes marked with the Spring's {@link Configurable @Configurable} annotation to a\n * {@link SpringContextApplication} application context.\n *\n * <p>\n * This aspect does the same thing that Spring's {@code AnnotationBeanConfigurerAspect} aspect does,\n * except that this aspect configures beans using the application context associated with the current\n * {@link SpringContextApplication} Vaadin application rather than the one associated with the overall\n * servlet context (i.e., its parent).\n * <\/p>\n *\n * <p>\n * As a result, objects so annotated will be configured for their specific {@link SpringContextApplication}\n * instance, and therefore can only be instantiated by threads associated with a current {@link SpringContextApplication}\n * (see {@link ContextApplication#get}). This will be the case when executing within a {@link SpringContextApplication}\n * Vaadin application HTTP request or an invocation of {@link ContextApplication#invoke} on same.\n * <\/p>\n *\n * <p>\n * This implementation is derived from Spring's {@code AnnotationBeanConfigurerAspect} implementation\n * and therefore shares its license (also Apache).\n * <\/p>\n *\n * @see SpringContextApplication\n * @see ContextApplication#get\n * @see Configurable\n *\/\npublic aspect VaadinConfigurableAspect extends AbstractInterfaceDrivenDependencyInjectionAspect {\n\n\tpublic pointcut inConfigurableBean() : @this(Configurable);\n\n\tpublic pointcut preConstructionConfiguration() : preConstructionConfigurationSupport(*); \n\n\tdeclare parents: @Configurable * implements ConfigurableObject;\n\n    @Override\n\tpublic void configureBean(Object bean) {\n        SpringContextApplication.get().configureBean(bean);\n    }\n\n\tprivate pointcut preConstructionConfigurationSupport(Configurable c) : @this(c) && if(c.preConstruction());\n}\n\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"fa3a81649cf323d31e924718bd4078e101106aeb","subject":"Small extension to test case.","message":"Small extension to test case.\n","repos":"cderoove\/damp.ekeko.aspectj","old_file":"TestCases\/AJ-LMP-ITD\/src\/cl\/pleiad\/ajlmp\/testITD\/FirstAspect.aj","new_file":"TestCases\/AJ-LMP-ITD\/src\/cl\/pleiad\/ajlmp\/testITD\/FirstAspect.aj","new_contents":"package cl.pleiad.ajlmp.testITD;\n\npublic aspect FirstAspect {\n\tbefore(): execution(* BaseClass.*1(..)) {\n\t\tBaseClass base = ((BaseClass)thisJoinPoint.getTarget());\n\t\tSystem.out.println(\"FirstAspect-BeforeCall-1\");\n\t\tbase.itdA();\n\t}\n\n\tpublic void BaseClass.itdA(){\n\t\tSystem.out.println(\"FirstAspect-ITD\");\n\t}\n\t\n\tvoid around(BaseClass base): execution(* Base*.*1(..)) && target(base){\n\t\tSystem.out.println(\"FirstAspect-BeforeCall-1\");\n\t\tbase.itdC();\n\t}\n\tpublic void BaseClass.itdC(){\n\t\tSystem.out.println(\"FirstAspect-ITD2\");\n\t}\n}\n","old_contents":"package cl.pleiad.ajlmp.testITD;\n\npublic aspect FirstAspect {\n\tbefore(): execution(* BaseClass.*1(..)) {\n\t\tBaseClass base = ((BaseClass)thisJoinPoint.getTarget());\n\t\tSystem.out.println(\"FirstAspect-BeforeCall-1\");\n\t\tbase.itdA();\n\t}\n\n\tpublic void BaseClass.itdA(){\n\t\tSystem.out.println(\"FirstAspect-ITD\");\n\t}\n\t\n}\n","returncode":0,"stderr":"","license":"epl-1.0","lang":"AspectJ"}
{"commit":"684041795747b38078b37b4835d0912614ae142c","subject":"Suppress save action clean ups other than code formatting (cherry picked from c135a51217511084c56f4b892604d25a6eb4f5fa)","message":"Suppress save action clean ups other than code formatting (cherry picked from c135a51217511084c56f4b892604d25a6eb4f5fa)\n","repos":"scala-ide\/scala-ide,Kwestor\/scala-ide,stephenh\/scala-ide,dragos\/scala-ide,Kwestor\/scala-ide,pilipolio\/scala-ide,aleksi-lukkarinen\/scala-ide,scala-ide\/scala-ide,Duhemm\/scala-ide,aleksi-lukkarinen\/scala-ide,romanowski\/scala-ide,romanowski\/scala-ide,mlangc\/scala-ide,dragos\/scala-ide,wpopielarski\/scala-ide,sschaef\/scala-ide,mlangc\/scala-ide,Duhemm\/scala-ide,stephenh\/scala-ide,stephenh\/scala-ide,romanowski\/scala-ide,mlangc\/scala-ide,aleksi-lukkarinen\/scala-ide,sschaef\/scala-ide,scala-ide\/scala-ide,wpopielarski\/scala-ide,andrey-ilinykh\/scala-ide,wpopielarski\/scala-ide,sschaef\/scala-ide,dragos\/scala-ide,aleksi-lukkarinen\/scala-ide,pilipolio\/scala-ide,wpopielarski\/scala-ide,mlangc\/scala-ide,andrey-ilinykh\/scala-ide,Duhemm\/scala-ide,andrey-ilinykh\/scala-ide,dragos\/scala-ide,romanowski\/scala-ide,pilipolio\/scala-ide,Kwestor\/scala-ide,Duhemm\/scala-ide,pilipolio\/scala-ide,stephenh\/scala-ide,Kwestor\/scala-ide,scala-ide\/scala-ide,sschaef\/scala-ide,andrey-ilinykh\/scala-ide","old_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/ui\/javaeditor\/formatter\/FormatterCleanUpRegistryAspect.aj","new_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/ui\/javaeditor\/formatter\/FormatterCleanUpRegistryAspect.aj","new_contents":"\/*\n * Copyright 2005-2010 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.ui.javaeditor.formatter;\nimport java.util.ArrayList;\nimport java.util.HashSet;\nimport java.util.List;\n\nimport org.eclipse.jdt.internal.corext.fix.CleanUpRefactoring;\nimport org.eclipse.jdt.internal.corext.fix.CleanUpRefactoring.CleanUpChange;\nimport org.eclipse.jdt.core.ICompilationUnit;\nimport org.eclipse.jdt.internal.corext.fix.CodeFormatFix;\nimport org.eclipse.jdt.internal.ui.fix.CodeFormatCleanUp;\nimport org.eclipse.jdt.ui.cleanup.CleanUpContext;\nimport org.eclipse.jdt.ui.cleanup.ICleanUp;\nimport org.eclipse.jdt.ui.cleanup.ICleanUpFix;\nimport org.eclipse.jface.text.IRegion;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect FormatterCleanUpRegistryAspect {\n\n\tpointcut calculateChange(CleanUpContext cleanUpContext, ICleanUp[] cleanUps, List undoneCleanUps, HashSet slowCleanUps) :\n\t\targs(cleanUpContext, cleanUps, undoneCleanUps, slowCleanUps) && \n\t   execution(CleanUpChange CleanUpRefactoring.calculateChange(CleanUpContext, ICleanUp[] , List , HashSet ));\n\t\t\n\t\n\tpointcut createCleanUp(ICompilationUnit cu, IRegion[] regions,\n\t\t\tboolean format, boolean removeTrailingWhitespacesAll,\n\t\t\tboolean removeTrailingWhitespacesIgnorEmpty,\n\t\t\tboolean correctIndentation) :\n\t args(cu, regions, format, removeTrailingWhitespacesAll, removeTrailingWhitespacesIgnorEmpty, correctIndentation) &&\n\t execution(ICleanUpFix CodeFormatFix.createCleanUp(ICompilationUnit , IRegion[] , boolean , boolean , boolean , boolean ));\n\t\n\tICleanUpFix around(ICompilationUnit cu, IRegion[] regions, boolean format,\n\t\t\tboolean removeTrailingWhitespacesAll,\n\t\t\tboolean removeTrailingWhitespacesIgnorEmpty,\n\t\t\tboolean correctIndentation) :\n\t\t\t\tcreateCleanUp(cu, regions, format, removeTrailingWhitespacesAll, removeTrailingWhitespacesIgnorEmpty, correctIndentation) {\n\t\tif (\"scala\".equals(cu.getResource().getFileExtension()))\n\t\t\tif (format)\n\t\t\t\tfor (IFormatterCleanUpProvider provider : FormatterCleanUpRegistry\n\t\t\t\t\t.getInstance().getProviders())\n\t\t\t\treturn provider.createCleanUp(cu);\n\t\treturn proceed(cu, regions, format, removeTrailingWhitespacesAll, removeTrailingWhitespacesIgnorEmpty, correctIndentation);\n\t}\n \n\t\/\/ Filter out CleanUps that aren't yet Scala compatible:\n\tCleanUpChange around(CleanUpContext cleanUpContext, ICleanUp[] cleanUps, List undoneCleanUps, HashSet slowCleanUps):\n\t\tcalculateChange(cleanUpContext, cleanUps, undoneCleanUps, slowCleanUps) {\n\t\tICleanUp[] newCleanUps;\n\t\tif (\"scala\".equals(cleanUpContext.getCompilationUnit().getResource().getFileExtension())) {\n    \t\tList<ICleanUp> newCleanUpList = new ArrayList<ICleanUp>();\n\t    \tfor (ICleanUp cleanUp : cleanUps) \n\t\t    \tif (cleanUp instanceof CodeFormatCleanUp)\n\t\t\t    \tnewCleanUpList.add(cleanUp);\n\t\t    newCleanUps = (ICleanUp[]) newCleanUpList.toArray(new ICleanUp[newCleanUpList.size()]);\n\t\t} else\n\t\t\tnewCleanUps = cleanUps;\n\t\treturn proceed(cleanUpContext, newCleanUps, undoneCleanUps, slowCleanUps);\n\t}\n\n\t\n}\n","old_contents":"\/*\n * Copyright 2005-2010 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.ui.javaeditor.formatter;\n\nimport org.eclipse.jdt.core.ICompilationUnit;\nimport org.eclipse.jdt.internal.corext.fix.CodeFormatFix;\nimport org.eclipse.jdt.ui.cleanup.ICleanUpFix;\nimport org.eclipse.jface.text.IRegion;\n\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect FormatterCleanUpRegistryAspect {\n\n\tpointcut createCleanUp(ICompilationUnit cu, IRegion[] regions,\n\t\t\tboolean format, boolean removeTrailingWhitespacesAll,\n\t\t\tboolean removeTrailingWhitespacesIgnorEmpty,\n\t\t\tboolean correctIndentation) :\n\t args(cu, regions, format, removeTrailingWhitespacesAll, removeTrailingWhitespacesIgnorEmpty, correctIndentation) &&\n\t execution(ICleanUpFix CodeFormatFix.createCleanUp(ICompilationUnit , IRegion[] , boolean , boolean , boolean , boolean ));\n\n\tICleanUpFix around(ICompilationUnit cu, IRegion[] regions, boolean format,\n\t\t\tboolean removeTrailingWhitespacesAll,\n\t\t\tboolean removeTrailingWhitespacesIgnorEmpty,\n\t\t\tboolean correctIndentation) :\n\t\t\t\tcreateCleanUp(cu, regions, format, removeTrailingWhitespacesAll, removeTrailingWhitespacesIgnorEmpty, correctIndentation) {\n\t\tif (\"scala\".equals(cu.getResource().getFileExtension()))\n\t\t\tif (format)\n\t\t\t\tfor (IFormatterCleanUpProvider provider : FormatterCleanUpRegistry\n\t\t\t\t\t.getInstance().getProviders())\n\t\t\t\t\treturn provider.createCleanUp(cu);\n\t\t\t\telse \n\t\t\t\t\treturn null;\n\t\treturn proceed(cu, regions, format, removeTrailingWhitespacesAll,\n\t\t\t\tremoveTrailingWhitespacesIgnorEmpty, correctIndentation);\n\t}\n\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"9250fbb644207b2cdd819fd4b0c525e325f8b1e1","subject":"[minor] Add missing closing parenthesis in some javadoc","message":"[minor] Add missing closing parenthesis in some javadoc\n","repos":"pbondoer\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,xwiki\/xwiki-platform","old_file":"xwiki-platform-core\/xwiki-platform-legacy\/xwiki-platform-legacy-oldcore\/src\/main\/aspect\/compatibility\/com\/xpn\/xwiki\/api\/UtilCompatibilityAspect.aj","new_file":"xwiki-platform-core\/xwiki-platform-legacy\/xwiki-platform-legacy-oldcore\/src\/main\/aspect\/compatibility\/com\/xpn\/xwiki\/api\/UtilCompatibilityAspect.aj","new_contents":"\/*\n * See the NOTICE file distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This is free software; you can redistribute it and\/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF site: http:\/\/www.fsf.org.\n *\/\npackage compatibility.com.xpn.xwiki.api;\n\nimport java.util.ArrayList;\nimport java.util.Collections;\nimport java.util.HashMap;\nimport java.util.LinkedHashMap;\nimport java.util.List;\nimport java.util.Map;\nimport java.util.TreeMap;\n\nimport com.xpn.xwiki.api.Util;\nimport com.xpn.xwiki.web.Utils;\n\n\/**\n * Add a backward compatibility layer to the {@link Util} class.\n * \n * @version $Id$\n *\/\npublic privileged aspect UtilCompatibilityAspect\n{\n    \/**\n     * Creates a {@link HashMap}, a generic map implementation optimized for performance. This is useful from Velocity\n     * since new objects cannot be created.\n     *\n     * @param <T> the type of keys maintained by this map\n     * @param <U> the type of mapped values\n     * @return a {@link HashMap} object\n     * @since 1.3 Milestone 2\n     * @deprecated use {@code $collectionstool.map} ({@link org.xwiki.velocity.tools.CollectionsTool#getMap()})\n     *\/\n    @Deprecated\n    public <T, U> Map<T, U> Util.getHashMap()\n    {\n        return new HashMap<T, U>();\n    }\n\n    \/**\n     * Creates a {@link TreeMap}, a map implementation which always maintains the natural order of the elements. This is\n     * useful from Velocity since new objects cannot be created.\n     *\n     * @param <T> the type of keys maintained by this map\n     * @param <U> the type of mapped values\n     * @return a {@link TreeMap} object\n     * @since 1.3 Milestone 2\n     * @deprecated use {@code $collectionstool.sortedMap}\n     *             ({@link org.xwiki.velocity.tools.CollectionsTool#getSortedMap()})\n     *\/\n    @Deprecated\n    public <T, U> Map<T, U> Util.getTreeMap()\n    {\n        return new TreeMap<T, U>();\n    }\n\n    \/**\n     * Creates a {@link LinkedHashMap}, a map implementation which preserves the order of insertion. This is useful from\n     * Velocity since new objects cannot be created.\n     *\n     * @param <T> the type of keys maintained by this map\n     * @param <U> the type of mapped values\n     * @return a {@link LinkedHashMap} object\n     * @since 2.2 Milestone 1\n     * @deprecated use {@code $collectionstool.orderedMap}\n     *             ({@link org.xwiki.velocity.tools.CollectionsTool#getOrderedMap()})\n     *\/\n    @Deprecated\n    public <T, U> Map<T, U> Util.getLinkedHashMap()\n    {\n        return new LinkedHashMap<T, U>();\n    }\n\n    \/**\n     * Creates an {@link ArrayList}. This is useful from Velocity since new objects cannot be created.\n     *\n     * @param T the type of the elements in the list\n     * @return an {@link ArrayList} object\n     * @since 1.3 Milestone 2\n     * @deprecated use {@code $collectionstool.arrayList}\n     *             ({@link org.xwiki.velocity.tools.CollectionsTool#getArrayList()})\n     *\/\n    @Deprecated\n    public <T> List<T> Util.getArrayList()\n    {\n        return new ArrayList<T>();\n    }\n\n    \/**\n     * Reverse the order of the elements within a list, so that the last element is moved to the beginning of the list,\n     * the next-to-last element to the second position, and so on. This is useful from Velocity since classes and their\n     * static methods cannot be accessed.\n     *\n     * @param list the list to reverse\n     * @return the reversed list\n     * @since 1.4 Milestone 1\n     * @deprecated use {@code $collectionstool.reverse($list}\n     *             ({@link org.xwiki.velocity.tools.CollectionsTool#reverse(List)})\n     *\/\n    @Deprecated\n    public <T> List<T> Util.reverseList(List<T> list)\n    {\n        Collections.reverse(list);\n        return list;\n    }\n\n\n    \/**\n     * Sort a list using a standard comparator. Elements need to be mutually comparable and implement the Comparable\n     * interface. This is useful from Velocity since classes and their static methods cannot be accessed.\n     *\n     * @param list the list to sort\n     * @return the sorted list (as the same object reference)\n     * @see {@link java.util.Collections#sort(java.util.List)}\n     * @since 1.3 Milestone 2\n     * @deprecated use {@code $collectionstool.sort($list} ({@link org.xwiki.velocity.tools.CollectionsTool#sort(List)})\n     *\/\n    @Deprecated\n    public <T extends Comparable<T>> List<T> Util.sort(List<T> list)\n    {\n        Collections.sort(list);\n        return list;\n    }\n\n    \/**\n     * Split a text into an array of texts, according to a list of separator characters.\n     *\n     * @param text the original text\n     * @param separator the separator characters\n     * @return an array containing the resulting text fragments\n     * @since 1.3 Milestone 2\n     * @deprecated use {@code $stringtool.split($string, $separators)}\n     *             ({@link org.apache.commons.lang3.StringUtils#split(String, String)})\n     *\/\n    @Deprecated\n    public String[] Util.split(String text, String separator)\n    {\n        return this.xwiki.split(text, separator);\n    }\n\n    \/**\n     * Convert an Object to a number and return {@code null} if the object is not a Number.\n     *\n     * @param object the object to convert\n     * @return the object as a {@link Number}, or {@code null}\n     * @since 1.3 Milestone 2\n     * @deprecated use {@code $mathtool.toNumber($string)}\n     *             ({@link org.apache.velocity.tools.generic.MathTool#toNumber(Object)})\n     *\/\n    @Deprecated\n    public Number Util.toNumber(java.lang.Object object)\n    {\n        try {\n            return new Long(object.toString());\n        } catch (Exception e) {\n            return null;\n        }\n    }\n\n    \/**\n     * Convert a {@code String} to a primitive {@code long}.\n     *\n     * @param str the String to convert to a long\n     * @return the parsed long or zero if the string is not a valid long number\n     * @since 1.3 Milestone 2\n     * @deprecated use {@code $mathtool.toNumber($string).longValue()}\n     *             ({@link org.apache.velocity.tools.generic.MathTool#toNumber(Object)})\n     *\/\n    @Deprecated\n    public long Util.parseLong(String str)\n    {\n        try {\n            return Long.parseLong(str);\n        } catch (Exception e) {\n            return 0;\n        }\n    }\n\n    \/**\n     * Convert a {@code String} to a primitive {@code int}.\n     *\n     * @param str the String to convert to an integer\n     * @return the parsed integer or zero if the string is not a valid integer number\n     * @since 1.3 Milestone 2\n     * @deprecated use {@code $mathtool.toInteger($string)}\n     *             ({@link org.apache.velocity.tools.generic.MathTool#toInteger(Object)})\n     *\/\n    @Deprecated\n    public int Util.parseInt(String str)\n    {\n        try {\n            return Integer.parseInt(str);\n        } catch (Exception e) {\n            return 0;\n        }\n    }\n\n    \/**\n     * Convert a {@code String} to an {@code Integer} object.\n     *\n     * @param str the String to convert to an Integer Object\n     * @return the parsed integer or zero if the string is not a valid integer number\n     * @since 1.3 Milestone 2\n     * @deprecated use {@code $mathtool.toInteger($string)}\n     *             ({@link org.apache.velocity.tools.generic.MathTool#toInteger(Object)})\n     *\/\n    @Deprecated\n    public Integer Util.parseInteger(String str)\n    {\n        return Integer.valueOf(parseInt(str));\n    }\n\n    \/**\n     * Convert a {@code String} to a primitive {@code float}.\n     *\n     * @param str the String to convert to a float\n     * @return the parsed float or zero if the string is not a valid float number\n     * @since 1.3 Milestone 2\n     * @deprecated use {@code $mathtool.toDouble($string).floatValue()}\n     *             ({@link org.apache.velocity.tools.generic.MathTool#toDouble(Object)})\n     *\/\n    @Deprecated\n    public float Util.parseFloat(String str)\n    {\n        try {\n            return Float.parseFloat(str);\n        } catch (Exception e) {\n            return 0;\n        }\n    }\n\n    \/**\n     * Convert a {@code String} to a primitive {@code double}.\n     *\n     * @param str the String to convert to a double\n     * @return the parsed double or zero if the string is not a valid double number\n     * @since 1.3 Milestone 2\n     * @deprecated use {@code $mathtool.toDouble($string)}\n     *             ({@link org.apache.velocity.tools.generic.MathTool#toDouble(Object)})\n     *\/\n    @Deprecated\n    public double Util.parseDouble(String str)\n    {\n        try {\n            return Double.parseDouble(str);\n        } catch (Exception e) {\n            return 0;\n        }\n    }\n\n    \/**\n     * Escape text so that it can be used in a HQL\/SQL query, in a like clause or in a test for equality clause. For\n     * example it escapes single quote characters.\n     *\n     * @param text the text to escape\n     * @return filtered text\n     * @since 1.3 Milestone 2\n     * @deprecated values should be passed as positional parameters, not concatenated in the query; see\n     *             {@link XWiki#searchDocuments(String, List)}; if escaping SQL is really needed, use {@code\n     *             $escapetool.sql($string)} ({@link org.xwiki.velocity.tools.EscapeTool#sql(Object)})\n     *\/\n    @Deprecated\n    public String Util.escapeSQL(String text)\n    {\n        return Utils.SQLFilter(text);\n    }\n\n    \/**\n     * Add two integer numbers. Useful in Velocity, since arithmetical operations are not always working.\n     *\n     * @param a the first number to add\n     * @param b the second number to add\n     * @return the sum of the two parameters\n     * @since 1.3 Milestone 2\n     * @deprecated use {@code $mathtool.add($n1, $n2)}\n     *             ({@link org.apache.velocity.tools.generic.MathTool#add(Object, Object)})\n     *\/\n    @Deprecated\n    public int Util.add(int a, int b)\n    {\n        return a + b;\n    }\n\n    \/**\n     * Add two long numbers. Useful in Velocity, since arithmetical operations are not always working.\n     *\n     * @param a the first number to add\n     * @param b the second number to add\n     * @return the sum of the two parameters\n     * @since 1.3 Milestone 2\n     * @deprecated use {@code $mathtool.add($n1, $n2)}\n     *             ({@link org.apache.velocity.tools.generic.MathTool#add(Object, Object)})\n     *\/\n    @Deprecated\n    public long Util.add(long a, long b)\n    {\n        return a + b;\n    }\n\n    \/**\n     * Add two numbers, specified as strings. Useful in Velocity, since arithmetical operations are not always working.\n     *\n     * @param a a string representing a number to add\n     * @param b a string representing a number to add\n     * @return the sum of the two parameters, as a String\n     * @since 1.3 Milestone 2\n     * @deprecated use {@code $mathtool.add} and {@code $mathtool.toNumber} to get the same result\n     *\/\n    @Deprecated\n    public String Util.add(String a, String b)\n    {\n        long c = Long.parseLong(a) + Long.parseLong(b);\n        return \"\" + c;\n    }\n\n    \/**\n     * Protect Text from Wiki transformation. This method is useful for preventing content generated with Velocity from\n     * being interpreted in the xwiki\/1.0 rendering engine, and should not be used in xwiki\/2.0 code. The result is\n     * valid only in HTML or XML documents.\n     *\n     * @param text the text to escape\n     * @return the escaped text\n     * @since 1.3 Milestone 2\n     * @deprecated this method only works for {@code xwiki\/1.0} wiki syntax, and it doesn't even escape all the syntax\n     *\/\n    @Deprecated\n    public String Util.escapeText(String text)\n    {\n        return com.xpn.xwiki.util.Util.escapeText(text);\n    }\n\n    \/**\n     * Protect URLs from Wiki transformation. This method is useful for preventing content generated with Velocity from\n     * being interpreted in the xwiki\/1.0 rendering engine, and should not be used in xwiki\/2.0 code. The result is\n     * valid only in HTML or XML documents.\n     *\n     * @param url the url to escape\n     * @return the encoded URL, which can be used in the HTML output\n     * @since 1.3 Milestone 2\n     * @deprecated this method only works for {@code xwiki\/1.0} wiki syntax when outputting HTML\n     *\/\n    @Deprecated\n    public String Util.escapeURL(String url)\n    {\n        return com.xpn.xwiki.util.Util.escapeURL(url);\n    }\n\n    \/**\n     * Translates a string into <code>application\/x-www-form-urlencoded<\/code> format, so that it can be safely used in\n     * a query string as a parameter value.\n     *\n     * @param text the non encoded text\n     * @return encoded text\n     * @since 1.3 Milestone 2\n     * @see #decodeURI(String)\n     * @deprecated use {@code $escapetool.url($string)} ({@link org.xwiki.velocity.tools.EscapeTool#url(Object)})\n     *\/\n    @Deprecated\n    public String Util.encodeURI(String text)\n    {\n        return com.xpn.xwiki.util.Util.encodeURI(text, this.context);\n    }\n}\n","old_contents":"\/*\n * See the NOTICE file distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This is free software; you can redistribute it and\/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF site: http:\/\/www.fsf.org.\n *\/\npackage compatibility.com.xpn.xwiki.api;\n\nimport java.util.ArrayList;\nimport java.util.Collections;\nimport java.util.HashMap;\nimport java.util.LinkedHashMap;\nimport java.util.List;\nimport java.util.Map;\nimport java.util.TreeMap;\n\nimport com.xpn.xwiki.api.Util;\nimport com.xpn.xwiki.web.Utils;\n\n\/**\n * Add a backward compatibility layer to the {@link Util} class.\n * \n * @version $Id$\n *\/\npublic privileged aspect UtilCompatibilityAspect\n{\n    \/**\n     * Creates a {@link HashMap}, a generic map implementation optimized for performance. This is useful from Velocity\n     * since new objects cannot be created.\n     *\n     * @param <T> the type of keys maintained by this map\n     * @param <U> the type of mapped values\n     * @return a {@link HashMap} object\n     * @since 1.3 Milestone 2\n     * @deprecated use {@code $collectionstool.map} ({@link org.xwiki.velocity.tools.CollectionsTool#getMap()})\n     *\/\n    @Deprecated\n    public <T, U> Map<T, U> Util.getHashMap()\n    {\n        return new HashMap<T, U>();\n    }\n\n    \/**\n     * Creates a {@link TreeMap}, a map implementation which always maintains the natural order of the elements. This is\n     * useful from Velocity since new objects cannot be created.\n     *\n     * @param <T> the type of keys maintained by this map\n     * @param <U> the type of mapped values\n     * @return a {@link TreeMap} object\n     * @since 1.3 Milestone 2\n     * @deprecated use {@code $collectionstool.sortedMap}\n     *             ({@link org.xwiki.velocity.tools.CollectionsTool#getSortedMap()})\n     *\/\n    @Deprecated\n    public <T, U> Map<T, U> Util.getTreeMap()\n    {\n        return new TreeMap<T, U>();\n    }\n\n    \/**\n     * Creates a {@link LinkedHashMap}, a map implementation which preserves the order of insertion. This is useful from\n     * Velocity since new objects cannot be created.\n     *\n     * @param <T> the type of keys maintained by this map\n     * @param <U> the type of mapped values\n     * @return a {@link LinkedHashMap} object\n     * @since 2.2 Milestone 1\n     * @deprecated use {@code $collectionstool.orderedMap}\n     *             ({@link org.xwiki.velocity.tools.CollectionsTool#getOrderedMap()})\n     *\/\n    @Deprecated\n    public <T, U> Map<T, U> Util.getLinkedHashMap()\n    {\n        return new LinkedHashMap<T, U>();\n    }\n\n    \/**\n     * Creates an {@link ArrayList}. This is useful from Velocity since new objects cannot be created.\n     *\n     * @param T the type of the elements in the list\n     * @return an {@link ArrayList} object\n     * @since 1.3 Milestone 2\n     * @deprecated use {@code $collectionstool.arrayList}\n     *             ({@link org.xwiki.velocity.tools.CollectionsTool#getArrayList()})\n     *\/\n    @Deprecated\n    public <T> List<T> Util.getArrayList()\n    {\n        return new ArrayList<T>();\n    }\n\n    \/**\n     * Reverse the order of the elements within a list, so that the last element is moved to the beginning of the list,\n     * the next-to-last element to the second position, and so on. This is useful from Velocity since classes and their\n     * static methods cannot be accessed.\n     *\n     * @param list the list to reverse\n     * @return the reversed list\n     * @since 1.4 Milestone 1\n     * @deprecated use {@code $collectionstool.reverse($list}\n     *             ({@link org.xwiki.velocity.tools.CollectionsTool#reverse(List)})\n     *\/\n    @Deprecated\n    public <T> List<T> Util.reverseList(List<T> list)\n    {\n        Collections.reverse(list);\n        return list;\n    }\n\n\n    \/**\n     * Sort a list using a standard comparator. Elements need to be mutually comparable and implement the Comparable\n     * interface. This is useful from Velocity since classes and their static methods cannot be accessed.\n     *\n     * @param list the list to sort\n     * @return the sorted list (as the same object reference)\n     * @see {@link java.util.Collections#sort(java.util.List)}\n     * @since 1.3 Milestone 2\n     * @deprecated use {@code $collectionstool.sort($list} ({@link org.xwiki.velocity.tools.CollectionsTool#sort(List)})\n     *\/\n    @Deprecated\n    public <T extends Comparable<T>> List<T> Util.sort(List<T> list)\n    {\n        Collections.sort(list);\n        return list;\n    }\n\n    \/**\n     * Split a text into an array of texts, according to a list of separator characters.\n     *\n     * @param text the original text\n     * @param separator the separator characters\n     * @return an array containing the resulting text fragments\n     * @since 1.3 Milestone 2\n     * @deprecated use {@code $stringtool.split($string, $separators)}\n     *             ({@link org.apache.commons.lang3.StringUtils#split(String, String)})\n     *\/\n    @Deprecated\n    public String[] Util.split(String text, String separator)\n    {\n        return this.xwiki.split(text, separator);\n    }\n\n    \/**\n     * Convert an Object to a number and return {@code null} if the object is not a Number.\n     *\n     * @param object the object to convert\n     * @return the object as a {@link Number}, or {@code null}\n     * @since 1.3 Milestone 2\n     * @deprecated use {@code $mathtool.toNumber($string)}\n     *             ({@link org.apache.velocity.tools.generic.MathTool#toNumber(Object)})\n     *\/\n    @Deprecated\n    public Number Util.toNumber(java.lang.Object object)\n    {\n        try {\n            return new Long(object.toString());\n        } catch (Exception e) {\n            return null;\n        }\n    }\n\n    \/**\n     * Convert a {@code String} to a primitive {@code long}.\n     *\n     * @param str the String to convert to a long\n     * @return the parsed long or zero if the string is not a valid long number\n     * @since 1.3 Milestone 2\n     * @deprecated use {@code $mathtool.toNumber($string).longValue()}\n     *             ({@link org.apache.velocity.tools.generic.MathTool#toNumber(Object)})\n     *\/\n    @Deprecated\n    public long Util.parseLong(String str)\n    {\n        try {\n            return Long.parseLong(str);\n        } catch (Exception e) {\n            return 0;\n        }\n    }\n\n    \/**\n     * Convert a {@code String} to a primitive {@code int}.\n     *\n     * @param str the String to convert to an integer\n     * @return the parsed integer or zero if the string is not a valid integer number\n     * @since 1.3 Milestone 2\n     * @deprecated use {@code $mathtool.toInteger($string}\n     *             ({@link org.apache.velocity.tools.generic.MathTool#toInteger(Object)})\n     *\/\n    @Deprecated\n    public int Util.parseInt(String str)\n    {\n        try {\n            return Integer.parseInt(str);\n        } catch (Exception e) {\n            return 0;\n        }\n    }\n\n    \/**\n     * Convert a {@code String} to an {@code Integer} object.\n     *\n     * @param str the String to convert to an Integer Object\n     * @return the parsed integer or zero if the string is not a valid integer number\n     * @since 1.3 Milestone 2\n     * @deprecated use {@code $mathtool.toInteger($string}\n     *             ({@link org.apache.velocity.tools.generic.MathTool#toInteger(Object)})\n     *\/\n    @Deprecated\n    public Integer Util.parseInteger(String str)\n    {\n        return Integer.valueOf(parseInt(str));\n    }\n\n    \/**\n     * Convert a {@code String} to a primitive {@code float}.\n     *\n     * @param str the String to convert to a float\n     * @return the parsed float or zero if the string is not a valid float number\n     * @since 1.3 Milestone 2\n     * @deprecated use {@code $mathtool.toDouble($string).floatValue()}\n     *             ({@link org.apache.velocity.tools.generic.MathTool#toDouble(Object)})\n     *\/\n    @Deprecated\n    public float Util.parseFloat(String str)\n    {\n        try {\n            return Float.parseFloat(str);\n        } catch (Exception e) {\n            return 0;\n        }\n    }\n\n    \/**\n     * Convert a {@code String} to a primitive {@code double}.\n     *\n     * @param str the String to convert to a double\n     * @return the parsed double or zero if the string is not a valid double number\n     * @since 1.3 Milestone 2\n     * @deprecated use {@code $mathtool.toDouble($string}\n     *             ({@link org.apache.velocity.tools.generic.MathTool#toDouble(Object)})\n     *\/\n    @Deprecated\n    public double Util.parseDouble(String str)\n    {\n        try {\n            return Double.parseDouble(str);\n        } catch (Exception e) {\n            return 0;\n        }\n    }\n\n    \/**\n     * Escape text so that it can be used in a HQL\/SQL query, in a like clause or in a test for equality clause. For\n     * example it escapes single quote characters.\n     *\n     * @param text the text to escape\n     * @return filtered text\n     * @since 1.3 Milestone 2\n     * @deprecated values should be passed as positional parameters, not concatenated in the query; see\n     *             {@link XWiki#searchDocuments(String, List)}; if escaping SQL is really needed, use {@code\n     *             $escapetool.sql($string} ({@link org.xwiki.velocity.tools.EscapeTool#sql(Object)})\n     *\/\n    @Deprecated\n    public String Util.escapeSQL(String text)\n    {\n        return Utils.SQLFilter(text);\n    }\n\n    \/**\n     * Add two integer numbers. Useful in Velocity, since arithmetical operations are not always working.\n     *\n     * @param a the first number to add\n     * @param b the second number to add\n     * @return the sum of the two parameters\n     * @since 1.3 Milestone 2\n     * @deprecated use {@code $mathtool.add($n1, $n2}\n     *             ({@link org.apache.velocity.tools.generic.MathTool#add(Object, Object)})\n     *\/\n    @Deprecated\n    public int Util.add(int a, int b)\n    {\n        return a + b;\n    }\n\n    \/**\n     * Add two long numbers. Useful in Velocity, since arithmetical operations are not always working.\n     *\n     * @param a the first number to add\n     * @param b the second number to add\n     * @return the sum of the two parameters\n     * @since 1.3 Milestone 2\n     * @deprecated use {@code $mathtool.add($n1, $n2}\n     *             ({@link org.apache.velocity.tools.generic.MathTool#add(Object, Object)})\n     *\/\n    @Deprecated\n    public long Util.add(long a, long b)\n    {\n        return a + b;\n    }\n\n    \/**\n     * Add two numbers, specified as strings. Useful in Velocity, since arithmetical operations are not always working.\n     *\n     * @param a a string representing a number to add\n     * @param b a string representing a number to add\n     * @return the sum of the two parameters, as a String\n     * @since 1.3 Milestone 2\n     * @deprecated use {@code $mathtool.add} and {@code $mathtool.toNumber} to get the same result\n     *\/\n    @Deprecated\n    public String Util.add(String a, String b)\n    {\n        long c = Long.parseLong(a) + Long.parseLong(b);\n        return \"\" + c;\n    }\n\n    \/**\n     * Protect Text from Wiki transformation. This method is useful for preventing content generated with Velocity from\n     * being interpreted in the xwiki\/1.0 rendering engine, and should not be used in xwiki\/2.0 code. The result is\n     * valid only in HTML or XML documents.\n     *\n     * @param text the text to escape\n     * @return the escaped text\n     * @since 1.3 Milestone 2\n     * @deprecated this method only works for {@code xwiki\/1.0} wiki syntax, and it doesn't even escape all the syntax\n     *\/\n    @Deprecated\n    public String Util.escapeText(String text)\n    {\n        return com.xpn.xwiki.util.Util.escapeText(text);\n    }\n\n    \/**\n     * Protect URLs from Wiki transformation. This method is useful for preventing content generated with Velocity from\n     * being interpreted in the xwiki\/1.0 rendering engine, and should not be used in xwiki\/2.0 code. The result is\n     * valid only in HTML or XML documents.\n     *\n     * @param url the url to escape\n     * @return the encoded URL, which can be used in the HTML output\n     * @since 1.3 Milestone 2\n     * @deprecated this method only works for {@code xwiki\/1.0} wiki syntax when outputting HTML\n     *\/\n    @Deprecated\n    public String Util.escapeURL(String url)\n    {\n        return com.xpn.xwiki.util.Util.escapeURL(url);\n    }\n\n    \/**\n     * Translates a string into <code>application\/x-www-form-urlencoded<\/code> format, so that it can be safely used in\n     * a query string as a parameter value.\n     *\n     * @param text the non encoded text\n     * @return encoded text\n     * @since 1.3 Milestone 2\n     * @see #decodeURI(String)\n     * @deprecated use {@code $escapetool.url($string)} ({@link org.xwiki.velocity.tools.EscapeTool#url(Object)})\n     *\/\n    @Deprecated\n    public String Util.encodeURI(String text)\n    {\n        return com.xpn.xwiki.util.Util.encodeURI(text, this.context);\n    }\n}\n","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"73d914177edaa6814014cf6586129908ff193907","subject":"Fixed broken last known location task behaviour","message":"Fixed broken last known location task behaviour\n","repos":"treejames\/ignition,Applied-Duality\/ignition,beni55\/ignition,mttkay\/ignition,hongnguyenpro\/ignition","old_file":"ignition-location\/ignition-location-lib\/src\/com\/github\/ignition\/location\/IgnitedLocationManager.aj","new_file":"ignition-location\/ignition-location-lib\/src\/com\/github\/ignition\/location\/IgnitedLocationManager.aj","new_contents":"\/*\n * Copyright 2011 Google Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * This code has been modified by Stefano Dacchille.\n *\/\n\npackage com.github.ignition.location;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\n\nimport android.app.Activity;\nimport android.app.PendingIntent;\nimport android.content.BroadcastReceiver;\nimport android.content.Context;\nimport android.content.Intent;\nimport android.content.IntentFilter;\nimport android.content.SharedPreferences;\nimport android.content.SharedPreferences.Editor;\nimport android.location.Criteria;\nimport android.location.Location;\nimport android.location.LocationListener;\nimport android.location.LocationManager;\nimport android.os.BatteryManager;\nimport android.os.Bundle;\nimport android.os.Handler;\nimport android.util.Log;\n\nimport com.github.ignition.location.annotations.IgnitedLocation;\nimport com.github.ignition.location.annotations.IgnitedLocationActivity;\nimport com.github.ignition.location.receivers.IgnitedLocationChangedReceiver;\nimport com.github.ignition.location.receivers.IgnitedPassiveLocationChangedReceiver;\nimport com.github.ignition.location.tasks.IgnitedLastKnownLocationAsyncTask;\nimport com.github.ignition.location.templates.ILastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLocationUpdateRequester;\nimport com.github.ignition.location.templates.OnIgnitedLocationChangedListener;\nimport com.github.ignition.location.utils.PlatformSpecificImplementationFactory;\nimport com.github.ignition.support.IgnitedDiagnostics;\n\n@SuppressAjWarnings\npublic aspect IgnitedLocationManager {\n    public static final String LOG_TAG = IgnitedLocationManager.class.getSimpleName();\n\n    declare parents : (@IgnitedLocationActivity *) implements OnIgnitedLocationChangedListener;\n\n    private Criteria defaultCriteria, lowPowerCriteria;\n    protected IgnitedAbstractLocationUpdateRequester locationUpdateRequester;\n    protected PendingIntent locationListenerPendingIntent, locationListenerPassivePendingIntent;\n    protected LocationManager locationManager;\n    protected IgnitedLocationListener bestInactiveLocationProviderListener;\n\n    private Context context;\n    private volatile Location currentLocation;\n\n    private IgnitedLastKnownLocationAsyncTask ignitedLastKnownLocationTask;\n    private SharedPreferences prefs;\n    private Handler handler;\n\n    private long locationUpdatesInterval, passiveLocationUpdatesInterval;\n    private int locationUpdatesDistanceDiff;\n    private int passiveLocationUpdatesDistanceDiff;\n    private boolean requestLocationUpdates;\n    private boolean locationUpdatesDisabled = true;\n\n    \/\/ Switch to another provider if gps doesn't return a location quickly enough.\n    private Runnable removeGpsUpdates = new Runnable() {\n        @Override\n        public void run() {\n            Log.d(LOG_TAG,\n                    \"It looks like GPS isn't available at this time (i.e.: maybe you're indoors). Removing GPS location updates and requesting network updates.\");\n\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, lowPowerCriteria());\n        }\n    };\n\n    \/**\n     * If the Location Provider we're using to receive location updates is disabled while the app is\n     * running, this Receiver will be notified, allowing us to re-register our Location Receivers\n     * using the best available Location Provider is still available.\n     *\/\n    protected BroadcastReceiver locationProviderDisabledReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            boolean providerDisabled = !intent.getBooleanExtra(\n                    LocationManager.KEY_PROVIDER_ENABLED, false);\n            \/\/ Re-register the location listeners using the best available\n            \/\/ Location Provider.\n            if (providerDisabled) {\n                disableLocationUpdates(false);\n                requestLocationUpdates(context, null);\n            }\n        }\n    };\n\n    \/**\n     * If the battery state is low disable the passive location update receiver.\n     *\/\n    protected BroadcastReceiver refreshLocationUpdatesReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, null);\n        }\n    };\n\n    after(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onCreate(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n\n        \/\/ Get a reference to the Context\n        this.context = context;\n        \/\/ Set pref file\n        prefs = context.getSharedPreferences(IgnitedLocationConstants.SHARED_PREFERENCE_FILE,\n                Context.MODE_PRIVATE);\n        \/\/ Get references to the managers\n        locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);\n        handler = new Handler();\n\n        \/\/ Specify the Criteria to use when requesting location updates while\n        \/\/ the application is Active\n        if (defaultCriteria == null) {\n            defaultCriteria = new Criteria();\n        }\n        \/\/ Use gps if it's enabled and if battery level is at least 15%\n        boolean useGps = prefs.getBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS,\n                IgnitedLocationConstants.USE_GPS_DEFAULT);\n        if (useGps) {\n            defaultCriteria.setAccuracy(Criteria.ACCURACY_FINE);\n        } else {\n            defaultCriteria.setPowerRequirement(Criteria.POWER_LOW);\n        }\n\n        \/\/ Setup the location update Pending Intent\n        Intent activeIntent = new Intent(IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_ACTION);\n        locationListenerPendingIntent = PendingIntent.getBroadcast(context, 0, activeIntent,\n                PendingIntent.FLAG_UPDATE_CURRENT);\n        \/\/ Setup the passive location update Pending Intent\n        Intent passiveIntent = new Intent(context, IgnitedPassiveLocationChangedReceiver.class);\n        locationListenerPassivePendingIntent = PendingIntent.getBroadcast(context, 0,\n                passiveIntent, PendingIntent.FLAG_UPDATE_CURRENT);\n\n        \/\/ Instantiate a Location Update Requester class based on the available\n        \/\/ platform version. This will be used to request location updates.\n        locationUpdateRequester = PlatformSpecificImplementationFactory\n                .getLocationUpdateRequester(context);\n    }\n\n    private boolean isBatteryOk() {\n        IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);\n        Intent intent = context.registerReceiver(null, filter);\n        double currentLevel = 100.0;\n        if (intent != null) {\n            currentLevel = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1);\n        }\n\n        return currentLevel >= prefs.getInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                IgnitedLocationConstants.MIN_BATTERY_LEVEL_FOR_GPS_DEFAULT);\n    }\n\n    before(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onResume(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n        \/\/ Get a reference to the Context if this context is null\n        if (this.context == null) {\n            this.context = context;\n        }\n\n        saveToPreferences(context, ignitedAnnotation);\n\n        Log.d(LOG_TAG, \"Retrieving last known location...\");\n        \/\/ Get the last known location. This isn't directly affecting the UI, so put it on a\n        \/\/ worker thread.\n        ignitedLastKnownLocationTask = new IgnitedLastKnownLocationAsyncTask(context,\n                locationUpdatesDistanceDiff, locationUpdatesInterval);\n        ignitedLastKnownLocationTask.execute();\n    }\n\n    \/**\n     * Save last settings to preferences.\n     * \n     * @param context\n     * @param locationAnnotation\n     *\/\n    private void saveToPreferences(Context context, IgnitedLocationActivity locationAnnotation) {\n        requestLocationUpdates = locationAnnotation.requestLocationUpdates();\n        locationUpdatesDistanceDiff = locationAnnotation.locationUpdatesDistanceDiff();\n        locationUpdatesInterval = locationAnnotation.locationUpdatesInterval();\n        passiveLocationUpdatesDistanceDiff = locationAnnotation\n                .passiveLocationUpdatesDistanceDiff();\n        passiveLocationUpdatesInterval = locationAnnotation.passiveLocationUpdatesInterval();\n        boolean enablePassiveLocationUpdates = locationAnnotation.enablePassiveUpdates();\n        boolean useGps = locationAnnotation.useGps();\n\n        Editor editor = prefs.edit();\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_LOCATION_UPDATES,\n                requestLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                enablePassiveLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS, useGps);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_DISTANCE_DIFF,\n                locationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_INTERVAL,\n                locationUpdatesInterval);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_DISTANCE_DIFF,\n                passiveLocationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_INTERVAL,\n                passiveLocationUpdatesInterval);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_RUN_ONCE, true);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                locationAnnotation.minBatteryLevelForGps());\n        editor.putLong(IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                locationAnnotation.waitForGpsFixInterval());\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                locationAnnotation.showWaitForLocationDialog());\n        editor.commit();\n\n    }\n\n    before(Activity activity, IgnitedLocationActivity ignitedAnnotation) : execution(* Activity.onPause(..)) \n        && @this(ignitedAnnotation) && this(activity) && within(@IgnitedLocationActivity *) {\n\n        if (ignitedAnnotation.requestLocationUpdates()) {\n            disableLocationUpdates(true);\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n\n        if (ignitedLastKnownLocationTask != null) {\n            ignitedLastKnownLocationTask.cancel(true);\n        }\n\n        boolean finishing = activity.isFinishing();\n        if (finishing) {\n            context = null;\n        }\n    }\n\n    Location around() : get(@IgnitedLocation Location *) {\n        return currentLocation;\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && within(IgnitedPassiveLocationChangedReceiver) && !adviceexecution() {\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, lng\/acc): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude() + \"\/\"\n                + currentLocation.getAccuracy());\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && (within(IgnitedLocationChangedReceiver) || within(IgnitedAbstractLastLocationFinder)\n                || within(IgnitedLastKnownLocationAsyncTask)) && !adviceexecution() {\n\n        if (context == null) {\n            return;\n        }\n        final Activity activity = (Activity) context;\n        boolean showWaitForLocationDialog = prefs.getBoolean(\n                IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                IgnitedLocationConstants.SHOW_WAIT_FOR_LOCATION_DIALOG_DEFAULT);\n        if (freshLocation == null) {\n            if (showWaitForLocationDialog) {\n                activity.showDialog(R.id.ign_loc_dialog_wait_for_fix);\n            }\n            return;\n        }\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, lng\/acc): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude() + \"\/\" + currentLocation.getAccuracy());\n        boolean keepRequestingLocationUpdates = ((OnIgnitedLocationChangedListener) context)\n                .onIgnitedLocationChanged(currentLocation);\n        Bundle extras = freshLocation.getExtras();\n        \/\/ a) If location updates shouldn't be requested anymore turn them off.\n        \/\/ b) Don't turn location updates on if last location is too old, since the single location\n        \/\/ update is running.\n        if (!keepRequestingLocationUpdates) {\n            disableLocationUpdates(true);\n            \/\/ PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            return;\n        } else if (requestLocationUpdates\n                && !extras.containsKey(ILastLocationFinder.LAST_LOCATION_TOO_OLD_OR_INACCURATE_EXTRA)) {\n            \/\/ If we requested location updates, turn them on here.\n            requestLocationUpdates(context, null);\n        }\n\n        \/\/ If gps is enabled location comes from gps, remove runnable that removes gps updates\n        boolean lastLocation = extras.containsKey(IgnitedLocationConstants.IGNITED_LAST_LOCATION_EXTRA);\n        if (!lastLocation && defaultCriteria.getAccuracy() == Criteria.ACCURACY_FINE\n                && currentLocation.getProvider().equals(LocationManager.GPS_PROVIDER)) {\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n    }\n\n    \/**\n     * Start listening for location updates.\n     *\/\n    protected void requestLocationUpdates(Context context, Criteria criteria) {\n        if (!locationUpdatesDisabled) {\n            return;\n        }\n        Criteria locationUpdateCriteria = criteria;\n        if (criteria == null) {\n            if (isBatteryOk()) {\n                locationUpdateCriteria = defaultCriteria;\n            } else {\n                locationUpdateCriteria = lowPowerCriteria();\n            }\n        }\n        Log.d(LOG_TAG, \"Disabling passive location updates\");\n        locationManager.removeUpdates(locationListenerPassivePendingIntent);\n\n        Log.d(LOG_TAG, \"Requesting location updates\");\n        \/\/ Normal updates while activity is visible.\n        locationUpdateRequester.requestLocationUpdates(locationUpdatesInterval,\n                locationUpdatesDistanceDiff, locationUpdateCriteria, locationListenerPendingIntent);\n\n        \/\/ Register a receiver that listens for when the provider I'm using has\n        \/\/ been disabled.\n        IntentFilter locationProviderDisabledIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_PROVIDER_DISABLED_ACTION);\n        context.registerReceiver(locationProviderDisabledReceiver,\n                locationProviderDisabledIntentFilter);\n\n        IntentFilter refreshLocationUpdatesIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.UPDATE_LOCATION_UPDATES_CRITERIA_ACTION);\n        context.registerReceiver(refreshLocationUpdatesReceiver, refreshLocationUpdatesIntentFilter);\n\n        \/\/ Register a receiver that listens for when a better provider than I'm\n        \/\/ using becomes available.\n        String bestProvider = locationManager.getBestProvider(locationUpdateCriteria, false);\n        String bestAvailableProvider = locationManager.getBestProvider(locationUpdateCriteria, true);\n        if (bestProvider != null && !bestProvider.equals(bestAvailableProvider)) {\n            bestInactiveLocationProviderListener = new IgnitedLocationListener(context);\n            locationManager.requestLocationUpdates(bestProvider, 0, 0,\n                    bestInactiveLocationProviderListener, context.getMainLooper());\n        }\n\n        if (bestAvailableProvider.equals(LocationManager.GPS_PROVIDER)) {\n            Log.d(LOG_TAG, \"Posting delayed remove GPS updates message\");\n            \/\/ Post a runnable that will remove gps updates if no gps location is returned after 1\n            \/\/ minute in order to avoid draining the battery.\n            handler.postDelayed(removeGpsUpdates, prefs.getLong(\n                    IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                    IgnitedLocationConstants.WAIT_FOR_GPS_FIX_INTERVAL_DEFAULT));\n        }\n\n        locationUpdatesDisabled = false;\n    }\n\n    \/**\n     * Stop listening for location updates\n     * \n     * @param enablePassiveLocationUpdates\n     *\/\n    protected void disableLocationUpdates(boolean requestPassiveLocationUpdates) {\n        if (locationUpdatesDisabled) {\n            return;\n        }\n\n        Log.d(LOG_TAG, \"Disabling location updates\");\n        context.unregisterReceiver(locationProviderDisabledReceiver);\n        context.unregisterReceiver(refreshLocationUpdatesReceiver);\n\n        locationUpdateRequester.removeLocationUpdates();\n        if (bestInactiveLocationProviderListener != null) {\n            locationManager.removeUpdates(bestInactiveLocationProviderListener);\n        }\n\n        boolean finishing = ((Activity) context).isFinishing();\n\n        if (requestPassiveLocationUpdates && !finishing) {\n            requestPassiveLocationUpdates();\n        }\n\n        locationUpdatesDisabled = true;\n    }\n\n    private void requestPassiveLocationUpdates() {\n        if (IgnitedDiagnostics.SUPPORTS_FROYO\n                && prefs.getBoolean(\n                        IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                        IgnitedLocationConstants.ENABLE_PASSIVE_LOCATION_UPDATES_DEFAULT)) {\n            Log.d(LOG_TAG, \"Requesting passive location updates\");\n            \/\/ Passive location updates from 3rd party apps when the Activity isn't\n            \/\/ visible. Only for Android 2.2+.\n            locationUpdateRequester.requestPassiveLocationUpdates(passiveLocationUpdatesInterval,\n                    passiveLocationUpdatesDistanceDiff, locationListenerPassivePendingIntent);\n        }\n    }\n\n    public boolean isLocationUpdatesDisabled() {\n        return locationUpdatesDisabled;\n    }\n\n    public Criteria lowPowerCriteria() {\n        if (lowPowerCriteria == null) {\n            lowPowerCriteria = new Criteria();\n            lowPowerCriteria.setPowerRequirement(Criteria.POWER_LOW);\n            lowPowerCriteria.setAccuracy(Criteria.NO_REQUIREMENT);\n        }\n        return lowPowerCriteria;\n    }\n\n    \/**\n     * If the best Location Provider (usually GPS) is not available when we request location\n     * updates, this listener will be notified if \/ when it becomes available. It calls\n     * requestLocationUpdates to re-register the location listeners using the better Location\n     * Provider.\n     *\/\n    private class IgnitedLocationListener implements LocationListener {\n        private Context context;\n\n        public IgnitedLocationListener(Context appContext) {\n            this.context = appContext;\n        }\n\n        @Override\n        public void onLocationChanged(Location l) {\n        }\n\n        @Override\n        public void onProviderDisabled(String provider) {\n        }\n\n        @Override\n        public void onStatusChanged(String provider, int status, Bundle extras) {\n        }\n\n        @Override\n        public void onProviderEnabled(String provider) {\n            \/\/ Re-register the location listeners using the better Location\n            \/\/ Provider.\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, null);\n        }\n    }\n\n}\n","old_contents":"\/*\n * Copyright 2011 Google Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * This code has been modified by Stefano Dacchille.\n *\/\n\npackage com.github.ignition.location;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\n\nimport android.app.Activity;\nimport android.app.PendingIntent;\nimport android.content.BroadcastReceiver;\nimport android.content.Context;\nimport android.content.Intent;\nimport android.content.IntentFilter;\nimport android.content.SharedPreferences;\nimport android.content.SharedPreferences.Editor;\nimport android.location.Criteria;\nimport android.location.Location;\nimport android.location.LocationListener;\nimport android.location.LocationManager;\nimport android.os.BatteryManager;\nimport android.os.Bundle;\nimport android.os.Handler;\nimport android.util.Log;\n\nimport com.github.ignition.location.annotations.IgnitedLocation;\nimport com.github.ignition.location.annotations.IgnitedLocationActivity;\nimport com.github.ignition.location.receivers.IgnitedLocationChangedReceiver;\nimport com.github.ignition.location.receivers.IgnitedPassiveLocationChangedReceiver;\nimport com.github.ignition.location.tasks.IgnitedLastKnownLocationAsyncTask;\nimport com.github.ignition.location.templates.ILastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLocationUpdateRequester;\nimport com.github.ignition.location.templates.OnIgnitedLocationChangedListener;\nimport com.github.ignition.location.utils.PlatformSpecificImplementationFactory;\nimport com.github.ignition.support.IgnitedDiagnostics;\n\n@SuppressAjWarnings\npublic aspect IgnitedLocationManager {\n    public static final String LOG_TAG = IgnitedLocationManager.class.getSimpleName();\n\n    declare parents : (@IgnitedLocationActivity *) implements OnIgnitedLocationChangedListener;\n\n    private Criteria defaultCriteria, lowPowerCriteria;\n    protected IgnitedAbstractLocationUpdateRequester locationUpdateRequester;\n    protected PendingIntent locationListenerPendingIntent, locationListenerPassivePendingIntent;\n    protected LocationManager locationManager;\n    protected IgnitedLocationListener bestInactiveLocationProviderListener;\n\n    private Context context;\n    private volatile Location currentLocation;\n\n    private IgnitedLastKnownLocationAsyncTask ignitedLastKnownLocationTask;\n    private SharedPreferences prefs;\n    private Handler handler;\n\n    private long locationUpdatesInterval, passiveLocationUpdatesInterval;\n    private int locationUpdatesDistanceDiff;\n    private int passiveLocationUpdatesDistanceDiff;\n    private boolean requestLocationUpdates;\n    private boolean locationUpdatesDisabled = true;\n\n    \/\/ Switch to another provider if gps doesn't return a location quickly enough.\n    private Runnable removeGpsUpdates = new Runnable() {\n        @Override\n        public void run() {\n            Log.d(LOG_TAG,\n                    \"It looks like GPS isn't available at this time (i.e.: maybe you're indoors). Removing GPS location updates and requesting network updates.\");\n\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, lowPowerCriteria());\n        }\n    };\n\n    \/**\n     * If the Location Provider we're using to receive location updates is disabled while the app is\n     * running, this Receiver will be notified, allowing us to re-register our Location Receivers\n     * using the best available Location Provider is still available.\n     *\/\n    protected BroadcastReceiver locationProviderDisabledReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            boolean providerDisabled = !intent.getBooleanExtra(\n                    LocationManager.KEY_PROVIDER_ENABLED, false);\n            \/\/ Re-register the location listeners using the best available\n            \/\/ Location Provider.\n            if (providerDisabled) {\n                disableLocationUpdates(false);\n                requestLocationUpdates(context, null);\n            }\n        }\n    };\n\n    \/**\n     * If the battery state is low disable the passive location update receiver.\n     *\/\n    protected BroadcastReceiver refreshLocationUpdatesReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, null);\n        }\n    };\n\n    after(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onCreate(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n\n        \/\/ Get a reference to the Context\n        this.context = context;\n        \/\/ Set pref file\n        prefs = context.getSharedPreferences(IgnitedLocationConstants.SHARED_PREFERENCE_FILE,\n                Context.MODE_PRIVATE);\n        \/\/ Get references to the managers\n        locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);\n        handler = new Handler();\n\n        \/\/ Specify the Criteria to use when requesting location updates while\n        \/\/ the application is Active\n        if (defaultCriteria == null) {\n            defaultCriteria = new Criteria();\n        }\n        \/\/ Use gps if it's enabled and if battery level is at least 15%\n        boolean useGps = prefs.getBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS,\n                IgnitedLocationConstants.USE_GPS_DEFAULT);\n        if (useGps) {\n            defaultCriteria.setAccuracy(Criteria.ACCURACY_FINE);\n        } else {\n            defaultCriteria.setPowerRequirement(Criteria.POWER_LOW);\n        }\n\n        \/\/ Setup the location update Pending Intent\n        Intent activeIntent = new Intent(IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_ACTION);\n        locationListenerPendingIntent = PendingIntent.getBroadcast(context, 0, activeIntent,\n                PendingIntent.FLAG_UPDATE_CURRENT);\n        \/\/ Setup the passive location update Pending Intent\n        Intent passiveIntent = new Intent(context, IgnitedPassiveLocationChangedReceiver.class);\n        locationListenerPassivePendingIntent = PendingIntent.getBroadcast(context, 0,\n                passiveIntent, PendingIntent.FLAG_UPDATE_CURRENT);\n\n        \/\/ Instantiate a Location Update Requester class based on the available\n        \/\/ platform version. This will be used to request location updates.\n        locationUpdateRequester = PlatformSpecificImplementationFactory\n                .getLocationUpdateRequester(context);\n    }\n\n    private boolean isBatteryOk() {\n        IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);\n        Intent intent = context.registerReceiver(null, filter);\n        double currentLevel = 100.0;\n        if (intent != null) {\n            currentLevel = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1);\n        }\n\n        return currentLevel >= prefs.getInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                IgnitedLocationConstants.MIN_BATTERY_LEVEL_FOR_GPS_DEFAULT);\n    }\n\n    before(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onResume(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n        \/\/ Get a reference to the Context if this context is null\n        if (this.context == null) {\n            this.context = context;\n        }\n\n        saveToPreferences(context, ignitedAnnotation);\n\n        Log.d(LOG_TAG, \"Retrieving last known location...\");\n        \/\/ Get the last known location. This isn't directly affecting the UI, so put it on a\n        \/\/ worker thread.\n        if (ignitedLastKnownLocationTask == null) {\n            ignitedLastKnownLocationTask = new IgnitedLastKnownLocationAsyncTask(context,\n                    locationUpdatesDistanceDiff, locationUpdatesInterval);\n            ignitedLastKnownLocationTask.execute();\n        }\n    }\n\n    \/**\n     * Save last settings to preferences.\n     * \n     * @param context\n     * @param locationAnnotation\n     *\/\n    private void saveToPreferences(Context context, IgnitedLocationActivity locationAnnotation) {\n        requestLocationUpdates = locationAnnotation.requestLocationUpdates();\n        locationUpdatesDistanceDiff = locationAnnotation.locationUpdatesDistanceDiff();\n        locationUpdatesInterval = locationAnnotation.locationUpdatesInterval();\n        passiveLocationUpdatesDistanceDiff = locationAnnotation\n                .passiveLocationUpdatesDistanceDiff();\n        passiveLocationUpdatesInterval = locationAnnotation.passiveLocationUpdatesInterval();\n        boolean enablePassiveLocationUpdates = locationAnnotation.enablePassiveUpdates();\n        boolean useGps = locationAnnotation.useGps();\n\n        Editor editor = prefs.edit();\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_LOCATION_UPDATES,\n                requestLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                enablePassiveLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS, useGps);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_DISTANCE_DIFF,\n                locationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_INTERVAL,\n                locationUpdatesInterval);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_DISTANCE_DIFF,\n                passiveLocationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_INTERVAL,\n                passiveLocationUpdatesInterval);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_RUN_ONCE, true);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                locationAnnotation.minBatteryLevelForGps());\n        editor.putLong(IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                locationAnnotation.waitForGpsFixInterval());\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                locationAnnotation.showWaitForLocationDialog());\n        editor.commit();\n\n    }\n\n    before(Activity activity, IgnitedLocationActivity ignitedAnnotation) : execution(* Activity.onPause(..)) \n        && @this(ignitedAnnotation) && this(activity) && within(@IgnitedLocationActivity *) {\n\n        if (ignitedAnnotation.requestLocationUpdates()) {\n            disableLocationUpdates(true);\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n\n        ignitedLastKnownLocationTask.getLastLocationFinder().cancel();\n\n        boolean finishing = activity.isFinishing();\n        if (finishing) {\n            if (ignitedLastKnownLocationTask != null) {\n                ignitedLastKnownLocationTask.cancel(true);\n                ignitedLastKnownLocationTask = null;\n            }\n            context = null;\n        }\n    }\n\n    Location around() : get(@IgnitedLocation Location *) {\n        return currentLocation;\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && within(IgnitedPassiveLocationChangedReceiver) && !adviceexecution() {\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, lng\/acc): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude() + \"\/\"\n                + currentLocation.getAccuracy());\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && (within(IgnitedLocationChangedReceiver) || within(IgnitedAbstractLastLocationFinder)\n                || within(IgnitedLastKnownLocationAsyncTask)) && !adviceexecution() {\n\n        if (context == null) {\n            return;\n        }\n        final Activity activity = (Activity) context;\n        boolean showWaitForLocationDialog = prefs.getBoolean(\n                IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                IgnitedLocationConstants.SHOW_WAIT_FOR_LOCATION_DIALOG_DEFAULT);\n        if (freshLocation == null) {\n            if (showWaitForLocationDialog) {\n                activity.showDialog(R.id.ign_loc_dialog_wait_for_fix);\n            }\n            return;\n        }\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, lng\/acc): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude() + \"\/\" + currentLocation.getAccuracy());\n        boolean keepRequestingLocationUpdates = ((OnIgnitedLocationChangedListener) context)\n                .onIgnitedLocationChanged(currentLocation);\n        Bundle extras = freshLocation.getExtras();\n        \/\/ a) If location updates shouldn't be requested anymore turn them off.\n        \/\/ b) Don't turn location updates on if last location is too old, since the single location\n        \/\/ update is running.\n        if (!keepRequestingLocationUpdates) {\n            disableLocationUpdates(true);\n            \/\/ PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            return;\n        } else if (requestLocationUpdates\n                && !extras.containsKey(ILastLocationFinder.LAST_LOCATION_TOO_OLD_OR_INACCURATE_EXTRA)) {\n            \/\/ If we requested location updates, turn them on here.\n            requestLocationUpdates(context, null);\n        }\n\n        \/\/ If gps is enabled location comes from gps, remove runnable that removes gps updates\n        boolean lastLocation = extras.containsKey(IgnitedLocationConstants.IGNITED_LAST_LOCATION_EXTRA);\n        if (!lastLocation && defaultCriteria.getAccuracy() == Criteria.ACCURACY_FINE\n                && currentLocation.getProvider().equals(LocationManager.GPS_PROVIDER)) {\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n    }\n\n    \/**\n     * Start listening for location updates.\n     *\/\n    protected void requestLocationUpdates(Context context, Criteria criteria) {\n        if (!locationUpdatesDisabled) {\n            return;\n        }\n        Criteria locationUpdateCriteria = criteria;\n        if (criteria == null) {\n            if (isBatteryOk()) {\n                locationUpdateCriteria = defaultCriteria;\n            } else {\n                locationUpdateCriteria = lowPowerCriteria();\n            }\n        }\n        Log.d(LOG_TAG, \"Disabling passive location updates\");\n        locationManager.removeUpdates(locationListenerPassivePendingIntent);\n\n        Log.d(LOG_TAG, \"Requesting location updates\");\n        \/\/ Normal updates while activity is visible.\n        locationUpdateRequester.requestLocationUpdates(locationUpdatesInterval,\n                locationUpdatesDistanceDiff, locationUpdateCriteria, locationListenerPendingIntent);\n\n        \/\/ Register a receiver that listens for when the provider I'm using has\n        \/\/ been disabled.\n        IntentFilter locationProviderDisabledIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_PROVIDER_DISABLED_ACTION);\n        context.registerReceiver(locationProviderDisabledReceiver,\n                locationProviderDisabledIntentFilter);\n\n        IntentFilter refreshLocationUpdatesIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.UPDATE_LOCATION_UPDATES_CRITERIA_ACTION);\n        context.registerReceiver(refreshLocationUpdatesReceiver, refreshLocationUpdatesIntentFilter);\n\n        \/\/ Register a receiver that listens for when a better provider than I'm\n        \/\/ using becomes available.\n        String bestProvider = locationManager.getBestProvider(locationUpdateCriteria, false);\n        String bestAvailableProvider = locationManager.getBestProvider(locationUpdateCriteria, true);\n        if (bestProvider != null && !bestProvider.equals(bestAvailableProvider)) {\n            bestInactiveLocationProviderListener = new IgnitedLocationListener(context);\n            locationManager.requestLocationUpdates(bestProvider, 0, 0,\n                    bestInactiveLocationProviderListener, context.getMainLooper());\n        }\n\n        if (bestAvailableProvider.equals(LocationManager.GPS_PROVIDER)) {\n            Log.d(LOG_TAG, \"Posting delayed remove GPS updates message\");\n            \/\/ Post a runnable that will remove gps updates if no gps location is returned after 1\n            \/\/ minute in order to avoid draining the battery.\n            handler.postDelayed(removeGpsUpdates, prefs.getLong(\n                    IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                    IgnitedLocationConstants.WAIT_FOR_GPS_FIX_INTERVAL_DEFAULT));\n        }\n\n        locationUpdatesDisabled = false;\n    }\n\n    \/**\n     * Stop listening for location updates\n     * \n     * @param enablePassiveLocationUpdates\n     *\/\n    protected void disableLocationUpdates(boolean requestPassiveLocationUpdates) {\n        if (locationUpdatesDisabled) {\n            return;\n        }\n\n        Log.d(LOG_TAG, \"Disabling location updates\");\n        context.unregisterReceiver(locationProviderDisabledReceiver);\n        context.unregisterReceiver(refreshLocationUpdatesReceiver);\n\n        locationUpdateRequester.removeLocationUpdates();\n        if (bestInactiveLocationProviderListener != null) {\n            locationManager.removeUpdates(bestInactiveLocationProviderListener);\n        }\n\n        boolean finishing = ((Activity) context).isFinishing();\n\n        if (requestPassiveLocationUpdates && !finishing) {\n            requestPassiveLocationUpdates();\n        }\n\n        locationUpdatesDisabled = true;\n    }\n\n    private void requestPassiveLocationUpdates() {\n        if (IgnitedDiagnostics.SUPPORTS_FROYO\n                && prefs.getBoolean(\n                        IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                        IgnitedLocationConstants.ENABLE_PASSIVE_LOCATION_UPDATES_DEFAULT)) {\n            Log.d(LOG_TAG, \"Requesting passive location updates\");\n            \/\/ Passive location updates from 3rd party apps when the Activity isn't\n            \/\/ visible. Only for Android 2.2+.\n            locationUpdateRequester.requestPassiveLocationUpdates(passiveLocationUpdatesInterval,\n                    passiveLocationUpdatesDistanceDiff, locationListenerPassivePendingIntent);\n        }\n    }\n\n    public boolean isLocationUpdatesDisabled() {\n        return locationUpdatesDisabled;\n    }\n\n    public Criteria lowPowerCriteria() {\n        if (lowPowerCriteria == null) {\n            lowPowerCriteria = new Criteria();\n            lowPowerCriteria.setPowerRequirement(Criteria.POWER_LOW);\n            lowPowerCriteria.setAccuracy(Criteria.NO_REQUIREMENT);\n        }\n        return lowPowerCriteria;\n    }\n\n    \/**\n     * If the best Location Provider (usually GPS) is not available when we request location\n     * updates, this listener will be notified if \/ when it becomes available. It calls\n     * requestLocationUpdates to re-register the location listeners using the better Location\n     * Provider.\n     *\/\n    private class IgnitedLocationListener implements LocationListener {\n        private Context context;\n\n        public IgnitedLocationListener(Context appContext) {\n            this.context = appContext;\n        }\n\n        @Override\n        public void onLocationChanged(Location l) {\n        }\n\n        @Override\n        public void onProviderDisabled(String provider) {\n        }\n\n        @Override\n        public void onStatusChanged(String provider, int status, Bundle extras) {\n        }\n\n        @Override\n        public void onProviderEnabled(String provider) {\n            \/\/ Re-register the location listeners using the better Location\n            \/\/ Provider.\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, null);\n        }\n    }\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"f2909c990c81335a428244ebf2be9f8245821109","subject":"Fix aspect","message":"Fix aspect\n","repos":"pbondoer\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,xwiki\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform","old_file":"xwiki-platform-core\/xwiki-platform-legacy\/xwiki-platform-legacy-oldcore\/src\/main\/aspect\/compatibility\/com\/xpn\/xwiki\/XWikiCompatibilityAspect.aj","new_file":"xwiki-platform-core\/xwiki-platform-legacy\/xwiki-platform-legacy-oldcore\/src\/main\/aspect\/compatibility\/com\/xpn\/xwiki\/XWikiCompatibilityAspect.aj","new_contents":"\/*\n * See the NOTICE file distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This is free software; you can redistribute it and\/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF site: http:\/\/www.fsf.org.\n *\/\npackage com.xpn.xwiki;\n\nimport java.io.UnsupportedEncodingException;\nimport java.io.File;\nimport java.net.URLEncoder;\nimport java.util.ArrayList;\nimport java.util.HashMap;\nimport java.util.List;\nimport java.util.Map;\n\nimport org.apache.commons.lang3.StringUtils;\nimport org.xwiki.context.Execution;\nimport org.xwiki.context.ExecutionContext;\nimport org.xwiki.rendering.syntax.Syntax;\nimport org.xwiki.xml.XMLUtils;\n\nimport com.xpn.xwiki.cache.api.XWikiCache;\nimport com.xpn.xwiki.cache.api.XWikiCacheService;\nimport com.xpn.xwiki.cache.api.internal.XWikiCacheServiceStub;\nimport com.xpn.xwiki.cache.api.internal.XWikiCacheStub;\nimport com.xpn.xwiki.doc.XWikiDocument;\nimport com.xpn.xwiki.notify.XWikiNotificationManager;\nimport com.xpn.xwiki.objects.BaseObject;\nimport com.xpn.xwiki.objects.classes.BaseClass;\nimport com.xpn.xwiki.objects.classes.PropertyClass;\nimport com.xpn.xwiki.plugin.query.QueryPlugin;\nimport com.xpn.xwiki.plugin.query.XWikiCriteria;\nimport com.xpn.xwiki.plugin.query.XWikiQuery;\nimport com.xpn.xwiki.util.Util;\nimport com.xpn.xwiki.web.Utils;\nimport com.xpn.xwiki.web.XWikiMessageTool;\n\n\/**\n * Add a backward compatibility layer to the {@link com.xpn.xwiki.XWiki} class.\n * \n * @version $Id$\n *\/\npublic privileged aspect XWikiCompatibilityAspect\n{\n    private static Map XWiki.threadMap = new HashMap();\n\n    private XWikiNotificationManager XWiki.notificationManager;\n\n    \/**\n     * Get XWiki context from execution context.\n     * \n     * @return the XWiki context for the current thread\n     *\/\n    private XWikiContext XWiki.getXWikiContext()\n    {\n        Execution execution = Utils.getComponent(Execution.class);\n\n        ExecutionContext ec = execution.getContext();\n\n        return ec != null ? (XWikiContext) ec.getProperty(\"xwikicontext\") : null;\n    }\n\n    \/**\n     * Transform a text in a URL compatible text\n     *\n     * @param content text to transform\n     * @return encoded result\n     * @deprecated replaced by Util#encodeURI since 1.3M2\n     *\/\n    @Deprecated\n    public String XWiki.getURLEncoded(String content)\n    {\n        try {\n            return URLEncoder.encode(content, this.getEncoding());            \n        } catch (UnsupportedEncodingException e) {\n            return content;\n        }\n    }\n    \n    \/**\n     * @return true for multi-wiki\/false for mono-wiki\n     * @deprecated replaced by {@link XWiki#isVirtualMode()} since 1.4M1.\n     *\/\n    @Deprecated\n    public boolean XWiki.isVirtual()\n    {\n        return this.isVirtualMode();\n    }\n\n    \/**\n     * @deprecated Removed since it isn't used; since 1.5M1.\n     *\/\n    @Deprecated\n    public static Map XWiki.getThreadMap()\n    {\n        return XWiki.threadMap;\n    }\n\n    \/**\n     * @deprecated Removed since it isn't used; since 1.5M1.\n     *\/\n    @Deprecated\n    public static void XWiki.setThreadMap(Map threadMap)\n    {\n        XWiki.threadMap = threadMap;\n    }\n\n    \/**\n     * @return the cache service.\n     * @deprecated replaced by {@link XWiki#getCacheFactory(XWikiContext)} or\n     *             {@link XWiki#getLocalCacheFactory(XWikiContext)} since 1.5M2.\n     *\/\n    @Deprecated\n    public XWikiCacheService XWiki.getCacheService()\n    {\n        return new XWikiCacheServiceStub(getCacheFactory(), getLocalCacheFactory());\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getVirtualWikiCache(XWikiContext)} since 1.5M2.\n     *\/\n    @Deprecated\n    public XWikiCache XWiki.getVirtualWikiMap()\n    {\n        return new XWikiCacheStub(this.virtualWikiMap);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpaceCopyright(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebCopyright(XWikiContext context)\n    {\n        return this.getSpaceCopyright(context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, String defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, String, String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, String space, String defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, space, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsLong(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public long XWiki.getWebPreferenceAsLong(String preference, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsLong(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsLong(String, long, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public long XWiki.getWebPreferenceAsLong(String preference, long defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsLong(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsInt(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.getWebPreferenceAsInt(String preference, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsInt(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsInt(String, int, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.getWebPreferenceAsInt(String preference, int defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsInt(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#copySpaceBetweenWikis(String, String, String, String, XWikiContext)} since\n     *             2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.copyWikiWeb(String space, String sourceWiki, String targetWiki, String language, XWikiContext context)\n        throws XWikiException\n    {\n        return this.copySpaceBetweenWikis(space, sourceWiki, targetWiki, language, context);\n    }\n\n    \/**\n     * @deprecated replaced by\n     *             {@link XWiki#copySpaceBetweenWikis(String, String, String, String, boolean, XWikiContext)} since\n     *             2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.copyWikiWeb(String space, String sourceWiki, String targetWiki, String language, boolean clean,\n        XWikiContext context) throws XWikiException\n    {\n        return this.copySpaceBetweenWikis(space, sourceWiki, targetWiki, language, clean, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getDefaultSpace(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getDefaultWeb(XWikiContext context)\n    {\n        return this.getDefaultSpace(context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#skipDefaultSpaceInURLs(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public boolean XWiki.useDefaultWeb(XWikiContext context)\n    {\n        return this.skipDefaultSpaceInURLs(context);\n    }\n\n    \/**\n     * @deprecated use {@link XWikiMessageTool#get(String, List)} instead. You can access message tool using\n     *             {@link XWikiContext#getMessageTool()}.\n     *\/\n    @Deprecated\n    public String XWiki.getMessage(String item, XWikiContext context)\n    {\n        XWikiMessageTool msg = context.getMessageTool();\n        if (msg == null) {\n            return item;\n        } else {\n            return msg.get(item);\n        }\n    }\n\n    \/**\n     * @deprecated Removed since it isn't used; since 3.1M2.\n     *\/\n    @Deprecated\n    public String XWiki.getHTMLArea(String content, XWikiContext context)\n    {\n        StringBuilder result = new StringBuilder();\n\n        String scontent = XMLUtils.escape(content);\n        scontent = scontent.replaceAll(\"\\r?+\\n\", \"<br class=\\\"htmlarea\\\"\/>\");\n\n        result.append(\"<textarea name=\\\"content\\\" id=\\\"content\\\" rows=\\\"25\\\" cols=\\\"80\\\">\");\n        result.append(scontent);\n        result.append(\"<\/textarea>\");\n\n        return result.toString();\n    }\n\n    @Deprecated\n    public XWikiNotificationManager XWiki.getNotificationManager()\n    {\n        if (this.notificationManager == null) {\n          this.notificationManager = new XWikiNotificationManager();\n        }\n\n        return this.notificationManager;\n    }\n\n    @Deprecated\n    public void XWiki.setNotificationManager(XWikiNotificationManager notificationManager)\n    {\n        this.notificationManager = notificationManager;\n    }\n    \n    @Deprecated\n    public String XWiki.displaySearch(String fieldname, String className, XWikiCriteria criteria, XWikiContext context)\n        throws XWikiException\n    {\n        return displaySearch(fieldname, className, \"\", criteria, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearch(String fieldname, String className, XWikiContext context) throws XWikiException\n    {\n        return displaySearch(fieldname, className, \"\", new XWikiCriteria(), context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearch(String fieldname, String className, String prefix, XWikiCriteria criteria,\n        XWikiContext context) throws XWikiException\n    {\n        BaseClass bclass = getDocument(className, context).getXClass();\n        PropertyClass pclass = (PropertyClass) bclass.get(fieldname);\n        if (criteria == null) {\n            criteria = new XWikiCriteria();\n        }\n\n        if (pclass == null) {\n            return \"\";\n        } else {\n            return pclass.displaySearch(fieldname, prefix + className + \"_\", criteria, context);\n        }\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchColumns(String className, XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        return displaySearchColumns(className, \"\", query, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchColumns(String className, String prefix, XWikiQuery query, XWikiContext context)\n        throws XWikiException\n    {\n        BaseClass bclass = getDocument(className, context).getXClass();\n\n        if (query == null) {\n            query = new XWikiQuery();\n        }\n\n        return bclass.displaySearchColumns(className + \"_\" + prefix, query, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchOrder(String className, XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        return displaySearchOrder(className, \"\", query, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchOrder(String className, String prefix, XWikiQuery query, XWikiContext context)\n        throws XWikiException\n    {\n        BaseClass bclass = getDocument(className, context).getXClass();\n\n        if (query == null) {\n            query = new XWikiQuery();\n        }\n\n        return bclass.displaySearchOrder(className + \"_\" + prefix, query, context);\n    }\n\n    @Deprecated\n    public <T> List<T> XWiki.search(XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        QueryPlugin qp = (QueryPlugin) getPlugin(\"query\", context);\n        if (qp == null) {\n            return null;\n        }\n\n        return qp.search(query);\n    }\n\n    @Deprecated\n    public XWikiQuery XWiki.createQueryFromRequest(String className, XWikiContext context) throws XWikiException\n    {\n        return new XWikiQuery(context.getRequest(), className, context);\n    }\n\n    @Deprecated\n    public String XWiki.searchAsTable(XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        QueryPlugin qp = (QueryPlugin) getPlugin(\"query\", context);\n        if (qp == null) {\n            return null;\n        }\n\n        List<String> list = qp.search(query);\n        String result = \"{table}\\r\\n\";\n        List<String> headerColumns = new ArrayList<String>();\n        List<String> displayProperties = query.getDisplayProperties();\n        for (String propname : displayProperties) {\n            PropertyClass pclass = getPropertyClassFromName(propname, context);\n            if (pclass != null) {\n                headerColumns.add(pclass.getPrettyName());\n            } else {\n                if (propname.startsWith(\"doc.\")) {\n                    propname = propname.substring(4);\n                    headerColumns.add(XWikiDocument.getInternalPropertyName(propname, context));\n                } else {\n                    headerColumns.add(propname);\n                }\n\n            }\n        }\n\n        result += StringUtils.join(headerColumns.toArray(), \" | \") + \"\\r\\n\";\n        for (String docname : list) {\n            List<String> rowColumns = new ArrayList<String>();\n            XWikiDocument doc = getDocument(docname, context);\n            for (String propname : displayProperties) {\n                PropertyClass pclass = getPropertyClassFromName(propname, context);\n                if (pclass == null) {\n                    if (propname.startsWith(\"doc.\")) {\n                        propname = propname.substring(4);\n                    }\n                    String value = doc.getInternalProperty(propname);\n                    rowColumns.add((value == null) ? \" \" : value);\n                } else {\n                    BaseObject bobj = doc.getObject(pclass.getObject().getName());\n                    rowColumns.add(doc.display(pclass.getName(), \"view\", bobj, context));\n                }\n            }\n            result += StringUtils.join(rowColumns.toArray(), \" | \") + \"\\r\\n\";\n        }\n\n        result += \"{table}\\r\\n\";\n\n        return result;\n    }\n\n    @Deprecated\n    public String XWiki.getDocLanguagePreference(XWikiContext context)\n    {\n        return getLanguagePreference(context);\n    }\n\n    @Deprecated\n    public void XWiki.flushCache()\n    {\n        flushCache(getXWikiContext());\n    }\n\n    \/**\n     * @deprecated use WikiManager plugin instead\n     *\/\n    @Deprecated\n    public int XWiki.createNewWiki(String wikiName, String wikiUrl, String wikiAdmin, String baseWikiName,\n        String description, String wikilanguage, boolean failOnExist, XWikiContext context) throws XWikiException\n    {\n        String database = context.getDatabase();\n        wikiName = wikiName.toLowerCase();\n\n        try {\n            XWikiDocument userdoc = getDocument(wikiAdmin, context);\n\n            \/\/ User does not exist\n            if (userdoc.isNew()) {\n                if (LOGGER.isErrorEnabled()) {\n                    LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"user does not exist\");\n                }\n                return -2;\n            }\n\n            \/\/ User is not active\n            if (!(userdoc.getIntValue(\"XWiki.XWikiUsers\", \"active\") == 1)) {\n                if (LOGGER.isErrorEnabled()) {\n                    LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"user is not active\");\n                }\n                return -3;\n            }\n\n            String wikiForbiddenList = Param(\"xwiki.virtual.reserved_wikis\");\n            if (Util.contains(wikiName, wikiForbiddenList, \", \")) {\n                if (LOGGER.isErrorEnabled()) {\n                    LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"wiki name is forbidden\");\n                }\n                return -4;\n            }\n\n            String wikiServerPage = \"XWikiServer\" + wikiName.substring(0, 1).toUpperCase() + wikiName.substring(1);\n            \/\/ Verify is server page already exist\n            XWikiDocument serverdoc = getDocument(SYSTEM_SPACE, wikiServerPage, context);\n            if (serverdoc.isNew()) {\n                \/\/ clear entry in virtual wiki cache\n                this.virtualWikiMap.remove(wikiUrl);\n\n                \/\/ Create Wiki Server page\n                serverdoc.setStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"server\", wikiUrl);\n                serverdoc.setStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"owner\", wikiAdmin);\n                if (description != null) {\n                    serverdoc.setLargeStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"description\", description);\n                }\n                if (wikilanguage != null) {\n                    serverdoc.setStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"language\", wikilanguage);\n                }\n                if (!getDefaultDocumentSyntax().equals(Syntax.XWIKI_1_0.toIdString())) {\n                    serverdoc.setContent(\"{{include document=\\\"XWiki.XWikiServerForm\\\"\/}}\\n\");\n                    serverdoc.setSyntax(Syntax.XWIKI_2_0);\n                } else {\n                    serverdoc.setContent(\"#includeForm(\\\"XWiki.XWikiServerForm\\\")\\n\");\n                    serverdoc.setSyntax(Syntax.XWIKI_1_0);\n                }\n                serverdoc.setParentReference(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE);\n                saveDocument(serverdoc, context);\n            } else {\n                \/\/ If we are not allowed to continue if server page already exists\n                if (failOnExist) {\n                    if (LOGGER.isErrorEnabled()) {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki server page already exists\");\n                    }\n                    return -5;\n                } else if (LOGGER.isWarnEnabled()) {\n                    LOGGER.warn(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"wiki server page already exists\");\n                }\n            }\n\n            \/\/ Create wiki database\n            try {\n                context.setDatabase(getDatabase());\n                getStore().createWiki(wikiName, context);\n            } catch (XWikiException e) {\n                if (LOGGER.isErrorEnabled()) {\n                    if (e.getCode() == 10010) {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki database already exists\");\n                    } else if (e.getCode() == 10011) {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki database creation failed\");\n                    } else {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki database creation threw exception\", e);\n                    }\n                }\n            } catch (Exception e) {\n                LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                    + \"wiki database creation threw exception\", e);\n            }\n\n            try {\n                updateDatabase(wikiName, true, false, context);\n            } catch (Exception e) {\n                LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                    + \"wiki database shema update threw exception\", e);\n                return -6;\n            }\n\n            \/\/ Copy base wiki\n            int nb = copyWiki(baseWikiName, wikiName, wikilanguage, context);\n            \/\/ Save the number of docs copied in the context\n            context.put(\"nbdocs\", Integer.valueOf(nb));\n\n            \/\/ Create user page in his wiki\n            \/\/ Let's not create it anymore.. this makes the creator loose\n            \/\/ super admin rights on his wiki\n            \/\/ copyDocument(wikiAdmin, getDatabase(), wikiName, wikilanguage, context);\n\n            \/\/ Modify rights in user wiki\n            context.setDatabase(wikiName);\n            \/*\n             * XWikiDocument wikiprefdoc = getDocument(\"XWiki.XWikiPreferences\", context);\n             * wikiprefdoc.setStringValue(\"XWiki.XWikiGlobalRights\", \"users\", wikiAdmin);\n             * wikiprefdoc.setStringValue(\"XWiki.XWikiGlobalRights\", \"levels\", \"admin, edit\");\n             * wikiprefdoc.setIntValue(\"XWiki.XWikiGlobalRights\", \"allow\", 1); saveDocument(wikiprefdoc, context);\n             *\/\n            return 1;\n        } catch (Exception e) {\n            LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                + \"wiki creation threw exception\", e);\n            return -10;\n        } finally {\n            context.setDatabase(database);\n        }\n    }\n\n    \/**\n     * Get the XWiki temporary filesystem directory (cleaned up automatically by XWiki).\n     *\n     * @param context\n     * @return temporary directory\n     * @since 1.1 Milestone 4\n     * @deprecated starting with 4.2M1 use {@link org.xwiki.environment.Environment#getTemporaryDirectory()}\n     *\/\n    @Deprecated\n    public File XWiki.getTempDirectory(XWikiContext context)\n    {\n        return this.environment.getTemporaryDirectory();\n    }\n\n    \/**\n     * Get a new directory in the xwiki work directory\n     *\n     * @param subdir desired directory name\n     * @param context\n     * @return work subdirectory\n     * @since 1.1 Milestone 4\n     * @deprecated starting with 4.2M1 use {@link org.xwiki.environment.Environment#getPermanentDirectory()}\n     *\/\n    @Deprecated\n    public File XWiki.getWorkSubdirectory(String subdir, XWikiContext context)\n    {\n        File fdir = new File(this.environment.getPermanentDirectory().getAbsolutePath(), subdir);\n        if (!fdir.exists()) {\n            fdir.mkdir();\n        }\n\n        return fdir;\n    }\n\n    \/**\n     * Get the XWiki work directory\n     *\n     * @param context\n     * @return work directory\n     * @since 1.1 Milestone 4\n     * @deprecated starting with 4.2M1 use {@link org.xwiki.environment.Environment#getPermanentDirectory()}\n     *\/\n    @Deprecated\n    public File XWiki.getWorkDirectory(XWikiContext context)\n    {\n        return this.environment.getPermanentDirectory();\n    }\n}\n","old_contents":"\/*\n * See the NOTICE file distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This is free software; you can redistribute it and\/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF site: http:\/\/www.fsf.org.\n *\/\npackage com.xpn.xwiki;\n\nimport java.io.UnsupportedEncodingException;\nimport java.io.File;\nimport java.net.URLEncoder;\nimport java.util.ArrayList;\nimport java.util.HashMap;\nimport java.util.List;\nimport java.util.Map;\n\nimport org.apache.commons.lang3.StringUtils;\nimport org.xwiki.rendering.syntax.Syntax;\nimport org.xwiki.xml.XMLUtils;\n\nimport com.xpn.xwiki.cache.api.XWikiCache;\nimport com.xpn.xwiki.cache.api.XWikiCacheService;\nimport com.xpn.xwiki.cache.api.internal.XWikiCacheServiceStub;\nimport com.xpn.xwiki.cache.api.internal.XWikiCacheStub;\nimport com.xpn.xwiki.doc.XWikiDocument;\nimport com.xpn.xwiki.notify.XWikiNotificationManager;\nimport com.xpn.xwiki.objects.BaseObject;\nimport com.xpn.xwiki.objects.classes.BaseClass;\nimport com.xpn.xwiki.objects.classes.PropertyClass;\nimport com.xpn.xwiki.plugin.query.QueryPlugin;\nimport com.xpn.xwiki.plugin.query.XWikiCriteria;\nimport com.xpn.xwiki.plugin.query.XWikiQuery;\nimport com.xpn.xwiki.util.Util;\nimport com.xpn.xwiki.web.XWikiMessageTool;\n\n\/**\n * Add a backward compatibility layer to the {@link com.xpn.xwiki.XWiki} class.\n * \n * @version $Id$\n *\/\npublic privileged aspect XWikiCompatibilityAspect\n{\n    private static Map XWiki.threadMap = new HashMap();\n\n    private XWikiNotificationManager XWiki.notificationManager;\n\n    \/**\n     * Transform a text in a URL compatible text\n     *\n     * @param content text to transform\n     * @return encoded result\n     * @deprecated replaced by Util#encodeURI since 1.3M2\n     *\/\n    @Deprecated\n    public String XWiki.getURLEncoded(String content)\n    {\n        try {\n            return URLEncoder.encode(content, this.getEncoding());            \n        } catch (UnsupportedEncodingException e) {\n            return content;\n        }\n    }\n    \n    \/**\n     * @return true for multi-wiki\/false for mono-wiki\n     * @deprecated replaced by {@link XWiki#isVirtualMode()} since 1.4M1.\n     *\/\n    @Deprecated\n    public boolean XWiki.isVirtual()\n    {\n        return this.isVirtualMode();\n    }\n\n    \/**\n     * @deprecated Removed since it isn't used; since 1.5M1.\n     *\/\n    @Deprecated\n    public static Map XWiki.getThreadMap()\n    {\n        return XWiki.threadMap;\n    }\n\n    \/**\n     * @deprecated Removed since it isn't used; since 1.5M1.\n     *\/\n    @Deprecated\n    public static void XWiki.setThreadMap(Map threadMap)\n    {\n        XWiki.threadMap = threadMap;\n    }\n\n    \/**\n     * @return the cache service.\n     * @deprecated replaced by {@link XWiki#getCacheFactory(XWikiContext)} or\n     *             {@link XWiki#getLocalCacheFactory(XWikiContext)} since 1.5M2.\n     *\/\n    @Deprecated\n    public XWikiCacheService XWiki.getCacheService()\n    {\n        return new XWikiCacheServiceStub(getCacheFactory(), getLocalCacheFactory());\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getVirtualWikiCache(XWikiContext)} since 1.5M2.\n     *\/\n    @Deprecated\n    public XWikiCache XWiki.getVirtualWikiMap()\n    {\n        return new XWikiCacheStub(this.virtualWikiMap);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpaceCopyright(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebCopyright(XWikiContext context)\n    {\n        return this.getSpaceCopyright(context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, String defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, String, String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, String space, String defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, space, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsLong(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public long XWiki.getWebPreferenceAsLong(String preference, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsLong(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsLong(String, long, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public long XWiki.getWebPreferenceAsLong(String preference, long defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsLong(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsInt(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.getWebPreferenceAsInt(String preference, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsInt(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsInt(String, int, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.getWebPreferenceAsInt(String preference, int defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsInt(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#copySpaceBetweenWikis(String, String, String, String, XWikiContext)} since\n     *             2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.copyWikiWeb(String space, String sourceWiki, String targetWiki, String language, XWikiContext context)\n        throws XWikiException\n    {\n        return this.copySpaceBetweenWikis(space, sourceWiki, targetWiki, language, context);\n    }\n\n    \/**\n     * @deprecated replaced by\n     *             {@link XWiki#copySpaceBetweenWikis(String, String, String, String, boolean, XWikiContext)} since\n     *             2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.copyWikiWeb(String space, String sourceWiki, String targetWiki, String language, boolean clean,\n        XWikiContext context) throws XWikiException\n    {\n        return this.copySpaceBetweenWikis(space, sourceWiki, targetWiki, language, clean, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getDefaultSpace(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getDefaultWeb(XWikiContext context)\n    {\n        return this.getDefaultSpace(context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#skipDefaultSpaceInURLs(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public boolean XWiki.useDefaultWeb(XWikiContext context)\n    {\n        return this.skipDefaultSpaceInURLs(context);\n    }\n\n    \/**\n     * @deprecated use {@link XWikiMessageTool#get(String, List)} instead. You can access message tool using\n     *             {@link XWikiContext#getMessageTool()}.\n     *\/\n    @Deprecated\n    public String XWiki.getMessage(String item, XWikiContext context)\n    {\n        XWikiMessageTool msg = context.getMessageTool();\n        if (msg == null) {\n            return item;\n        } else {\n            return msg.get(item);\n        }\n    }\n\n    \/**\n     * @deprecated Removed since it isn't used; since 3.1M2.\n     *\/\n    @Deprecated\n    public String XWiki.getHTMLArea(String content, XWikiContext context)\n    {\n        StringBuilder result = new StringBuilder();\n\n        String scontent = XMLUtils.escape(content);\n        scontent = scontent.replaceAll(\"\\r?+\\n\", \"<br class=\\\"htmlarea\\\"\/>\");\n\n        result.append(\"<textarea name=\\\"content\\\" id=\\\"content\\\" rows=\\\"25\\\" cols=\\\"80\\\">\");\n        result.append(scontent);\n        result.append(\"<\/textarea>\");\n\n        return result.toString();\n    }\n\n    @Deprecated\n    public XWikiNotificationManager XWiki.getNotificationManager()\n    {\n        if (this.notificationManager == null) {\n          this.notificationManager = new XWikiNotificationManager();\n        }\n\n        return this.notificationManager;\n    }\n\n    @Deprecated\n    public void XWiki.setNotificationManager(XWikiNotificationManager notificationManager)\n    {\n        this.notificationManager = notificationManager;\n    }\n    \n    @Deprecated\n    public String XWiki.displaySearch(String fieldname, String className, XWikiCriteria criteria, XWikiContext context)\n        throws XWikiException\n    {\n        return displaySearch(fieldname, className, \"\", criteria, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearch(String fieldname, String className, XWikiContext context) throws XWikiException\n    {\n        return displaySearch(fieldname, className, \"\", new XWikiCriteria(), context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearch(String fieldname, String className, String prefix, XWikiCriteria criteria,\n        XWikiContext context) throws XWikiException\n    {\n        BaseClass bclass = getDocument(className, context).getXClass();\n        PropertyClass pclass = (PropertyClass) bclass.get(fieldname);\n        if (criteria == null) {\n            criteria = new XWikiCriteria();\n        }\n\n        if (pclass == null) {\n            return \"\";\n        } else {\n            return pclass.displaySearch(fieldname, prefix + className + \"_\", criteria, context);\n        }\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchColumns(String className, XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        return displaySearchColumns(className, \"\", query, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchColumns(String className, String prefix, XWikiQuery query, XWikiContext context)\n        throws XWikiException\n    {\n        BaseClass bclass = getDocument(className, context).getXClass();\n\n        if (query == null) {\n            query = new XWikiQuery();\n        }\n\n        return bclass.displaySearchColumns(className + \"_\" + prefix, query, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchOrder(String className, XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        return displaySearchOrder(className, \"\", query, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchOrder(String className, String prefix, XWikiQuery query, XWikiContext context)\n        throws XWikiException\n    {\n        BaseClass bclass = getDocument(className, context).getXClass();\n\n        if (query == null) {\n            query = new XWikiQuery();\n        }\n\n        return bclass.displaySearchOrder(className + \"_\" + prefix, query, context);\n    }\n\n    @Deprecated\n    public <T> List<T> XWiki.search(XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        QueryPlugin qp = (QueryPlugin) getPlugin(\"query\", context);\n        if (qp == null) {\n            return null;\n        }\n\n        return qp.search(query);\n    }\n\n    @Deprecated\n    public XWikiQuery XWiki.createQueryFromRequest(String className, XWikiContext context) throws XWikiException\n    {\n        return new XWikiQuery(context.getRequest(), className, context);\n    }\n\n    @Deprecated\n    public String XWiki.searchAsTable(XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        QueryPlugin qp = (QueryPlugin) getPlugin(\"query\", context);\n        if (qp == null) {\n            return null;\n        }\n\n        List<String> list = qp.search(query);\n        String result = \"{table}\\r\\n\";\n        List<String> headerColumns = new ArrayList<String>();\n        List<String> displayProperties = query.getDisplayProperties();\n        for (String propname : displayProperties) {\n            PropertyClass pclass = getPropertyClassFromName(propname, context);\n            if (pclass != null) {\n                headerColumns.add(pclass.getPrettyName());\n            } else {\n                if (propname.startsWith(\"doc.\")) {\n                    propname = propname.substring(4);\n                    headerColumns.add(XWikiDocument.getInternalPropertyName(propname, context));\n                } else {\n                    headerColumns.add(propname);\n                }\n\n            }\n        }\n\n        result += StringUtils.join(headerColumns.toArray(), \" | \") + \"\\r\\n\";\n        for (String docname : list) {\n            List<String> rowColumns = new ArrayList<String>();\n            XWikiDocument doc = getDocument(docname, context);\n            for (String propname : displayProperties) {\n                PropertyClass pclass = getPropertyClassFromName(propname, context);\n                if (pclass == null) {\n                    if (propname.startsWith(\"doc.\")) {\n                        propname = propname.substring(4);\n                    }\n                    String value = doc.getInternalProperty(propname);\n                    rowColumns.add((value == null) ? \" \" : value);\n                } else {\n                    BaseObject bobj = doc.getObject(pclass.getObject().getName());\n                    rowColumns.add(doc.display(pclass.getName(), \"view\", bobj, context));\n                }\n            }\n            result += StringUtils.join(rowColumns.toArray(), \" | \") + \"\\r\\n\";\n        }\n\n        result += \"{table}\\r\\n\";\n\n        return result;\n    }\n\n    @Deprecated\n    public String XWiki.getDocLanguagePreference(XWikiContext context)\n    {\n        return getLanguagePreference(context);\n    }\n\n    @Deprecated\n    public void XWiki.flushCache()\n    {\n        flushCache(getXWikiContext());\n    }\n\n    \/**\n     * @deprecated use WikiManager plugin instead\n     *\/\n    @Deprecated\n    public int XWiki.createNewWiki(String wikiName, String wikiUrl, String wikiAdmin, String baseWikiName,\n        String description, String wikilanguage, boolean failOnExist, XWikiContext context) throws XWikiException\n    {\n        String database = context.getDatabase();\n        wikiName = wikiName.toLowerCase();\n\n        try {\n            XWikiDocument userdoc = getDocument(wikiAdmin, context);\n\n            \/\/ User does not exist\n            if (userdoc.isNew()) {\n                if (LOGGER.isErrorEnabled()) {\n                    LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"user does not exist\");\n                }\n                return -2;\n            }\n\n            \/\/ User is not active\n            if (!(userdoc.getIntValue(\"XWiki.XWikiUsers\", \"active\") == 1)) {\n                if (LOGGER.isErrorEnabled()) {\n                    LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"user is not active\");\n                }\n                return -3;\n            }\n\n            String wikiForbiddenList = Param(\"xwiki.virtual.reserved_wikis\");\n            if (Util.contains(wikiName, wikiForbiddenList, \", \")) {\n                if (LOGGER.isErrorEnabled()) {\n                    LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"wiki name is forbidden\");\n                }\n                return -4;\n            }\n\n            String wikiServerPage = \"XWikiServer\" + wikiName.substring(0, 1).toUpperCase() + wikiName.substring(1);\n            \/\/ Verify is server page already exist\n            XWikiDocument serverdoc = getDocument(SYSTEM_SPACE, wikiServerPage, context);\n            if (serverdoc.isNew()) {\n                \/\/ clear entry in virtual wiki cache\n                this.virtualWikiMap.remove(wikiUrl);\n\n                \/\/ Create Wiki Server page\n                serverdoc.setStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"server\", wikiUrl);\n                serverdoc.setStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"owner\", wikiAdmin);\n                if (description != null) {\n                    serverdoc.setLargeStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"description\", description);\n                }\n                if (wikilanguage != null) {\n                    serverdoc.setStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"language\", wikilanguage);\n                }\n                if (!getDefaultDocumentSyntax().equals(Syntax.XWIKI_1_0.toIdString())) {\n                    serverdoc.setContent(\"{{include document=\\\"XWiki.XWikiServerForm\\\"\/}}\\n\");\n                    serverdoc.setSyntax(Syntax.XWIKI_2_0);\n                } else {\n                    serverdoc.setContent(\"#includeForm(\\\"XWiki.XWikiServerForm\\\")\\n\");\n                    serverdoc.setSyntax(Syntax.XWIKI_1_0);\n                }\n                serverdoc.setParentReference(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE);\n                saveDocument(serverdoc, context);\n            } else {\n                \/\/ If we are not allowed to continue if server page already exists\n                if (failOnExist) {\n                    if (LOGGER.isErrorEnabled()) {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki server page already exists\");\n                    }\n                    return -5;\n                } else if (LOGGER.isWarnEnabled()) {\n                    LOGGER.warn(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"wiki server page already exists\");\n                }\n            }\n\n            \/\/ Create wiki database\n            try {\n                context.setDatabase(getDatabase());\n                getStore().createWiki(wikiName, context);\n            } catch (XWikiException e) {\n                if (LOGGER.isErrorEnabled()) {\n                    if (e.getCode() == 10010) {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki database already exists\");\n                    } else if (e.getCode() == 10011) {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki database creation failed\");\n                    } else {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki database creation threw exception\", e);\n                    }\n                }\n            } catch (Exception e) {\n                LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                    + \"wiki database creation threw exception\", e);\n            }\n\n            try {\n                updateDatabase(wikiName, true, false, context);\n            } catch (Exception e) {\n                LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                    + \"wiki database shema update threw exception\", e);\n                return -6;\n            }\n\n            \/\/ Copy base wiki\n            int nb = copyWiki(baseWikiName, wikiName, wikilanguage, context);\n            \/\/ Save the number of docs copied in the context\n            context.put(\"nbdocs\", Integer.valueOf(nb));\n\n            \/\/ Create user page in his wiki\n            \/\/ Let's not create it anymore.. this makes the creator loose\n            \/\/ super admin rights on his wiki\n            \/\/ copyDocument(wikiAdmin, getDatabase(), wikiName, wikilanguage, context);\n\n            \/\/ Modify rights in user wiki\n            context.setDatabase(wikiName);\n            \/*\n             * XWikiDocument wikiprefdoc = getDocument(\"XWiki.XWikiPreferences\", context);\n             * wikiprefdoc.setStringValue(\"XWiki.XWikiGlobalRights\", \"users\", wikiAdmin);\n             * wikiprefdoc.setStringValue(\"XWiki.XWikiGlobalRights\", \"levels\", \"admin, edit\");\n             * wikiprefdoc.setIntValue(\"XWiki.XWikiGlobalRights\", \"allow\", 1); saveDocument(wikiprefdoc, context);\n             *\/\n            return 1;\n        } catch (Exception e) {\n            LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                + \"wiki creation threw exception\", e);\n            return -10;\n        } finally {\n            context.setDatabase(database);\n        }\n    }\n\n    \/**\n     * Get the XWiki temporary filesystem directory (cleaned up automatically by XWiki).\n     *\n     * @param context\n     * @return temporary directory\n     * @since 1.1 Milestone 4\n     * @deprecated starting with 4.2M1 use {@link org.xwiki.environment.Environment#getTemporaryDirectory()}\n     *\/\n    @Deprecated\n    public File XWiki.getTempDirectory(XWikiContext context)\n    {\n        return this.environment.getTemporaryDirectory();\n    }\n\n    \/**\n     * Get a new directory in the xwiki work directory\n     *\n     * @param subdir desired directory name\n     * @param context\n     * @return work subdirectory\n     * @since 1.1 Milestone 4\n     * @deprecated starting with 4.2M1 use {@link org.xwiki.environment.Environment#getPermanentDirectory()}\n     *\/\n    @Deprecated\n    public File XWiki.getWorkSubdirectory(String subdir, XWikiContext context)\n    {\n        File fdir = new File(this.environment.getPermanentDirectory().getAbsolutePath(), subdir);\n        if (!fdir.exists()) {\n            fdir.mkdir();\n        }\n\n        return fdir;\n    }\n\n    \/**\n     * Get the XWiki work directory\n     *\n     * @param context\n     * @return work directory\n     * @since 1.1 Milestone 4\n     * @deprecated starting with 4.2M1 use {@link org.xwiki.environment.Environment#getPermanentDirectory()}\n     *\/\n    @Deprecated\n    public File XWiki.getWorkDirectory(XWikiContext context)\n    {\n        return this.environment.getPermanentDirectory();\n    }\n}\n","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"9a2f08b58adb9e1133a3e2cc151564bf357769ef","subject":"changes made by roo","message":"changes made by roo\n","repos":"datacite\/mds,ulbricht\/mds,ulbricht\/mds,ulbricht\/mds,datacite\/mds,ulbricht\/mds,datacite\/mds,datacite\/mds,datacite\/mds","old_file":"src\/main\/java\/org\/datacite\/mds\/web\/MetadataController_Roo_Controller.aj","new_file":"src\/main\/java\/org\/datacite\/mds\/web\/MetadataController_Roo_Controller.aj","new_contents":"\/\/ WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.\n\/\/ You may push code into the target .java compilation unit if you wish to edit any member(s).\n\npackage org.datacite.mds.web;\n\nimport java.io.UnsupportedEncodingException;\nimport java.lang.Long;\nimport java.lang.String;\nimport java.util.ArrayList;\nimport java.util.List;\nimport javax.servlet.http.HttpServletRequest;\nimport javax.validation.Valid;\nimport org.datacite.mds.domain.Dataset;\nimport org.datacite.mds.domain.Metadata;\nimport org.joda.time.format.DateTimeFormat;\nimport org.springframework.beans.factory.annotation.Autowired;\nimport org.springframework.context.i18n.LocaleContextHolder;\nimport org.springframework.core.convert.support.GenericConversionService;\nimport org.springframework.ui.Model;\nimport org.springframework.validation.BindingResult;\nimport org.springframework.web.bind.annotation.PathVariable;\nimport org.springframework.web.bind.annotation.RequestMapping;\nimport org.springframework.web.bind.annotation.RequestMethod;\nimport org.springframework.web.bind.annotation.RequestParam;\nimport org.springframework.web.util.UriUtils;\nimport org.springframework.web.util.WebUtils;\n\nprivileged aspect MetadataController_Roo_Controller {\n    \n    @Autowired\n    private GenericConversionService MetadataController.conversionService;\n    \n    @RequestMapping(method = RequestMethod.POST)\n    public String MetadataController.create(@Valid Metadata metadata, BindingResult result, Model model, HttpServletRequest request) {\n        if (result.hasErrors()) {\n            model.addAttribute(\"metadata\", metadata);\n            addDateTimeFormatPatterns(model);\n            return \"metadatas\/create\";\n        }\n        metadata.persist();\n        return \"redirect:\/metadatas\/\" + encodeUrlPathSegment(metadata.getId().toString(), request);\n    }\n    \n    @RequestMapping(params = \"form\", method = RequestMethod.GET)\n    public String MetadataController.createForm(Model model) {\n        model.addAttribute(\"metadata\", new Metadata());\n        addDateTimeFormatPatterns(model);\n        List dependencies = new ArrayList();\n        if (Dataset.countDatasets() == 0) {\n            dependencies.add(new String[]{\"dataset\", \"datasets\"});\n        }\n        model.addAttribute(\"dependencies\", dependencies);\n        return \"metadatas\/create\";\n    }\n    \n    @RequestMapping(value = \"\/{id}\", method = RequestMethod.GET)\n    public String MetadataController.show(@PathVariable(\"id\") Long id, Model model) {\n        addDateTimeFormatPatterns(model);\n        model.addAttribute(\"metadata\", Metadata.findMetadata(id));\n        model.addAttribute(\"itemId\", id);\n        return \"metadatas\/show\";\n    }\n    \n    @RequestMapping(method = RequestMethod.GET)\n    public String MetadataController.list(@RequestParam(value = \"page\", required = false) Integer page, @RequestParam(value = \"size\", required = false) Integer size, Model model) {\n        if (page != null || size != null) {\n            int sizeNo = size == null ? 10 : size.intValue();\n            model.addAttribute(\"metadatas\", Metadata.findMetadataEntries(page == null ? 0 : (page.intValue() - 1) * sizeNo, sizeNo));\n            float nrOfPages = (float) Metadata.countMetadatas() \/ sizeNo;\n            model.addAttribute(\"maxPages\", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));\n        } else {\n            model.addAttribute(\"metadatas\", Metadata.findAllMetadatas());\n        }\n        addDateTimeFormatPatterns(model);\n        return \"metadatas\/list\";\n    }\n    \n    @RequestMapping(params = { \"find=ByDataset\", \"form\" }, method = RequestMethod.GET)\n    public String MetadataController.findMetadatasByDatasetForm(Model model) {\n        model.addAttribute(\"datasets\", Dataset.findAllDatasets());\n        return \"metadatas\/findMetadatasByDataset\";\n    }\n    \n    @RequestMapping(params = \"find=ByDataset\", method = RequestMethod.GET)\n    public String MetadataController.findMetadatasByDataset(@RequestParam(\"dataset\") Dataset dataset, Model model) {\n        model.addAttribute(\"metadatas\", Metadata.findMetadatasByDataset(dataset).getResultList());\n        return \"metadatas\/list\";\n    }\n    \n    void MetadataController.addDateTimeFormatPatterns(Model model) {\n        model.addAttribute(\"metadata_created_date_format\", DateTimeFormat.patternForStyle(\"FF\", LocaleContextHolder.getLocale()));\n    }\n    \n    private String MetadataController.encodeUrlPathSegment(String pathSegment, HttpServletRequest request) {\n        String enc = request.getCharacterEncoding();\n        if (enc == null) {\n            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;\n        }\n        try {\n            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);\n        }\n        catch (UnsupportedEncodingException uee) {}\n        return pathSegment;\n    }\n    \n}\n","old_contents":"\/\/ WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.\n\/\/ You may push code into the target .java compilation unit if you wish to edit any member(s).\n\npackage org.datacite.mds.web;\n\nimport java.io.UnsupportedEncodingException;\nimport java.lang.Long;\nimport java.lang.String;\nimport java.util.ArrayList;\nimport java.util.List;\nimport javax.servlet.http.HttpServletRequest;\nimport javax.validation.Valid;\nimport org.datacite.mds.domain.Dataset;\nimport org.datacite.mds.domain.Metadata;\nimport org.joda.time.format.DateTimeFormat;\nimport org.springframework.beans.factory.annotation.Autowired;\nimport org.springframework.context.i18n.LocaleContextHolder;\nimport org.springframework.core.convert.support.GenericConversionService;\nimport org.springframework.ui.Model;\nimport org.springframework.validation.BindingResult;\nimport org.springframework.web.bind.annotation.PathVariable;\nimport org.springframework.web.bind.annotation.RequestMapping;\nimport org.springframework.web.bind.annotation.RequestMethod;\nimport org.springframework.web.bind.annotation.RequestParam;\nimport org.springframework.web.util.UriUtils;\nimport org.springframework.web.util.WebUtils;\n\nprivileged aspect MetadataController_Roo_Controller {\n    \n    @Autowired\n    private GenericConversionService MetadataController.conversionService;\n    \n    @RequestMapping(method = RequestMethod.POST)\n    public String MetadataController.create(@Valid Metadata metadata, BindingResult result, Model model, HttpServletRequest request) {\n        if (result.hasErrors()) {\n            model.addAttribute(\"metadata\", metadata);\n            addDateTimeFormatPatterns(model);\n            return \"metadatas\/create\";\n        }\n        metadata.persist();\n        return \"redirect:\/metadatas\/\" + encodeUrlPathSegment(metadata.getId().toString(), request);\n    }\n    \n    @RequestMapping(params = \"form\", method = RequestMethod.GET)\n    public String MetadataController.createForm(Model model) {\n        model.addAttribute(\"metadata\", new Metadata());\n        addDateTimeFormatPatterns(model);\n        List dependencies = new ArrayList();\n        if (Dataset.countDatasets() == 0) {\n            dependencies.add(new String[]{\"dataset\", \"datasets\"});\n        }\n        model.addAttribute(\"dependencies\", dependencies);\n        return \"metadatas\/create\";\n    }\n    \n    @RequestMapping(value = \"\/{id}\", method = RequestMethod.GET)\n    public String MetadataController.show(@PathVariable(\"id\") Long id, Model model) {\n        addDateTimeFormatPatterns(model);\n        model.addAttribute(\"metadata\", Metadata.findMetadata(id));\n        model.addAttribute(\"itemId\", id);\n        return \"metadatas\/show\";\n    }\n    \n    @RequestMapping(method = RequestMethod.GET)\n    public String MetadataController.list(@RequestParam(value = \"page\", required = false) Integer page, @RequestParam(value = \"size\", required = false) Integer size, Model model) {\n        if (page != null || size != null) {\n            int sizeNo = size == null ? 10 : size.intValue();\n            model.addAttribute(\"metadatas\", Metadata.findMetadataEntries(page == null ? 0 : (page.intValue() - 1) * sizeNo, sizeNo));\n            float nrOfPages = (float) Metadata.countMetadatas() \/ sizeNo;\n            model.addAttribute(\"maxPages\", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));\n        } else {\n            model.addAttribute(\"metadatas\", Metadata.findAllMetadatas());\n        }\n        addDateTimeFormatPatterns(model);\n        return \"metadatas\/list\";\n    }\n    \n    @RequestMapping(params = { \"find=ByDataset\", \"form\" }, method = RequestMethod.GET)\n    public String MetadataController.findMetadatasByDatasetForm(Model model) {\n        model.addAttribute(\"datasets\", Dataset.findAllDatasets());\n        return \"metadatas\/findMetadatasByDataset\";\n    }\n    \n    @RequestMapping(params = \"find=ByDataset\", method = RequestMethod.GET)\n    public String MetadataController.findMetadatasByDataset(@RequestParam(\"dataset\") Dataset dataset, Model model) {\n        model.addAttribute(\"metadatas\", Metadata.findMetadatasByDataset(dataset).getResultList());\n        return \"metadatas\/list\";\n    }\n    \n    void MetadataController.addDateTimeFormatPatterns(Model model) {\n        model.addAttribute(\"metadata_created_date_format\", DateTimeFormat.patternForStyle(\"S-\", LocaleContextHolder.getLocale()));\n    }\n    \n    private String MetadataController.encodeUrlPathSegment(String pathSegment, HttpServletRequest request) {\n        String enc = request.getCharacterEncoding();\n        if (enc == null) {\n            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;\n        }\n        try {\n            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);\n        }\n        catch (UnsupportedEncodingException uee) {}\n        return pathSegment;\n    }\n    \n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"9dd9b364cfb971837ba5a1472db9049d365642f7","subject":"HADOOP-6332 from https:\/\/issues.apache.org\/jira\/secure\/attachment\/12443668\/6332-phase2.fix1.patch   on top of https:\/\/issues.apache.org\/jira\/secure\/attachment\/12443539\/6332-phase2.patch   fixing the issue with FileSystem access from Herriot via RPC","message":"HADOOP-6332 from https:\/\/issues.apache.org\/jira\/secure\/attachment\/12443668\/6332-phase2.fix1.patch\n  on top of https:\/\/issues.apache.org\/jira\/secure\/attachment\/12443539\/6332-phase2.patch\n  fixing the issue with FileSystem access from Herriot via RPC\n","repos":"coderplay\/hadoop-common,coderplay\/hadoop-common,coderplay\/hadoop-common,coderplay\/hadoop-common,coderplay\/hadoop-common,coderplay\/hadoop-common,coderplay\/hadoop-common,coderplay\/hadoop-common,coderplay\/hadoop-common","old_file":"src\/test\/system\/aop\/org\/apache\/hadoop\/test\/system\/DaemonProtocolAspect.aj","new_file":"src\/test\/system\/aop\/org\/apache\/hadoop\/test\/system\/DaemonProtocolAspect.aj","new_contents":"\/**\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements.  See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership.  The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * \"License\"); you may not use this file except in compliance\n * with the License.  You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.apache.hadoop.test.system;\n\nimport java.io.File;\nimport java.io.IOException;\nimport java.security.PrivilegedExceptionAction;\nimport java.util.HashMap;\nimport java.util.List;\nimport java.util.ArrayList;\nimport java.util.Map;\nimport java.util.Properties;\nimport org.apache.commons.logging.Log;\nimport org.apache.commons.logging.LogFactory;\nimport org.apache.hadoop.io.Writable;\nimport org.apache.hadoop.security.UserGroupInformation;\nimport org.apache.hadoop.util.Shell.ShellCommandExecutor;\nimport org.apache.hadoop.fs.FileStatus;\nimport org.apache.hadoop.fs.FileSystem;\nimport org.apache.hadoop.fs.Path;\nimport org.apache.hadoop.conf.Configuration;\n\n\/**\n * Default DaemonProtocolAspect which is used to provide default implementation\n * for all the common daemon methods. If a daemon requires more specialized\n * version of method, it is responsibility of the DaemonClient to introduce the\n * same in woven classes.\n * \n *\/\npublic aspect DaemonProtocolAspect {\n\n  private boolean DaemonProtocol.ready;\n  \n  @SuppressWarnings(\"unchecked\")\n  private HashMap<Object, List<ControlAction>> DaemonProtocol.actions = \n    new HashMap<Object, List<ControlAction>>();\n  private static final Log LOG = LogFactory.getLog(\n      DaemonProtocolAspect.class.getName());\n  \/**\n   * Set if the daemon process is ready or not, concrete daemon protocol should\n   * implement pointcuts to determine when the daemon is ready and use the\n   * setter to set the ready state.\n   * \n   * @param ready\n   *          true if the Daemon is ready.\n   *\/\n  public void DaemonProtocol.setReady(boolean ready) {\n    this.ready = ready;\n  }\n\n  \/**\n   * Checks if the daemon process is alive or not.\n   * \n   * @throws IOException\n   *           if daemon is not alive.\n   *\/\n  public void DaemonProtocol.ping() throws IOException {\n  }\n\n  \/**\n   * Checks if the daemon process is ready to accepting RPC connections after it\n   * finishes initialization. <br\/>\n   * \n   * @return true if ready to accept connection.\n   * \n   * @throws IOException\n   *\/\n  public boolean DaemonProtocol.isReady() throws IOException {\n    return ready;\n  }\n\n  \/**\n   * Returns the process related information regarding the daemon process. <br\/>\n   * \n   * @return process information.\n   * @throws IOException\n   *\/\n  public ProcessInfo DaemonProtocol.getProcessInfo() throws IOException {\n    int activeThreadCount = Thread.activeCount();\n    long currentTime = System.currentTimeMillis();\n    long maxmem = Runtime.getRuntime().maxMemory();\n    long freemem = Runtime.getRuntime().freeMemory();\n    long totalmem = Runtime.getRuntime().totalMemory();\n    Map<String, String> envMap = System.getenv();\n    Properties sysProps = System.getProperties();\n    Map<String, String> props = new HashMap<String, String>();\n    for (Map.Entry entry : sysProps.entrySet()) {\n      props.put((String) entry.getKey(), (String) entry.getValue());\n    }\n    ProcessInfo info = new ProcessInfoImpl(activeThreadCount, currentTime,\n        freemem, maxmem, totalmem, envMap, props);\n    return info;\n  }\n\n  public void DaemonProtocol.enable(List<Enum<?>> faults) throws IOException {\n  }\n\n  public void DaemonProtocol.disableAll() throws IOException {\n  }\n\n  public abstract Configuration DaemonProtocol.getDaemonConf()\n    throws IOException;\n\n  public FileStatus DaemonProtocol.getFileStatus(String path, boolean local) \n    throws IOException {\n    Path p = new Path(path);\n    FileSystem fs = getFS(p, local);\n    p.makeQualified(fs);\n    FileStatus fileStatus = fs.getFileStatus(p);\n    return cloneFileStatus(fileStatus);\n  }\n\n  public FileStatus[] DaemonProtocol.listStatus(String path, boolean local) \n    throws IOException {\n    Path p = new Path(path);\n    FileSystem fs = getFS(p, local);\n    FileStatus[] status = fs.listStatus(p);\n    if (status != null) {\n      FileStatus[] result = new FileStatus[status.length];\n      int i = 0;\n      for (FileStatus fileStatus : status) {\n        result[i++] = cloneFileStatus(fileStatus);\n      }\n      return result;\n    }\n    return status;\n  }\n\n  \/**\n   * FileStatus object may not be serializable. Clone it into raw FileStatus \n   * object.\n   *\/\n  private FileStatus DaemonProtocol.cloneFileStatus(FileStatus fileStatus) {\n    return new FileStatus(fileStatus.getLen(),\n        fileStatus.isDir(),\n        fileStatus.getReplication(),\n        fileStatus.getBlockSize(),\n        fileStatus.getModificationTime(),\n        fileStatus.getAccessTime(),\n        fileStatus.getPermission(),\n        fileStatus.getOwner(),\n        fileStatus.getGroup(),\n        fileStatus.getPath());\n  }\n\n  private FileSystem DaemonProtocol.getFS(final Path path, final boolean local)\n      throws IOException {\n    FileSystem ret = null;\n    try {\n      ret = UserGroupInformation.getLoginUser().doAs (\n          new PrivilegedExceptionAction<FileSystem>() {\n            public FileSystem run() throws IOException {\n              FileSystem fs = null;\n              if (local) {\n                fs = FileSystem.getLocal(getDaemonConf());\n              } else {\n                fs = path.getFileSystem(getDaemonConf());\n              }\n              return fs;\n            }\n          });\n    } catch (InterruptedException ie) {\n    }\n    return ret;\n  }\n  \n  @SuppressWarnings(\"unchecked\")\n  public ControlAction[] DaemonProtocol.getActions(Writable key) \n    throws IOException {\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(key);\n      if(actionList == null) {\n        return new ControlAction[0];\n      } else {\n        return (ControlAction[]) actionList.toArray(new ControlAction[actionList\n                                                                      .size()]);\n      }\n    }\n  }\n\n\n  @SuppressWarnings(\"unchecked\")\n  public void DaemonProtocol.sendAction(ControlAction action) \n      throws IOException {\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(action.getTarget());\n      if(actionList == null) {\n        actionList = new ArrayList<ControlAction>();\n        actions.put(action.getTarget(), actionList);\n      }\n      actionList.add(action);\n    } \n  }\n \n  @SuppressWarnings(\"unchecked\")\n  public boolean DaemonProtocol.isActionPending(ControlAction action) \n    throws IOException{\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(action.getTarget());\n      if(actionList == null) {\n        return false;\n      } else {\n        return actionList.contains(action);\n      }\n    }\n  }\n  \n  \n  @SuppressWarnings(\"unchecked\")\n  public void DaemonProtocol.removeAction(ControlAction action) \n    throws IOException {\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(action.getTarget());\n      if(actionList == null) {\n        return;\n      } else {\n        actionList.remove(action);\n      }\n    }\n  }\n  \n  public void DaemonProtocol.clearActions() throws IOException {\n    synchronized (actions) {\n      actions.clear();\n    }\n  }\n\n  public String DaemonProtocol.getFilePattern() {\n    \/\/We use the environment variable HADOOP_LOGFILE to get the\n    \/\/pattern to use in the search.\n    String logDir = System.getenv(\"HADOOP_LOG_DIR\");\n    String daemonLogPattern = System.getenv(\"HADOOP_LOGFILE\");\n    if(daemonLogPattern == null && daemonLogPattern.isEmpty()) {\n      return \"*\";\n    }\n    return  logDir+File.separator+daemonLogPattern+\"*\";\n  }\n\n  public int DaemonProtocol.getNumberOfMatchesInLogFile(String pattern,\n      String[] list) throws IOException {\n    StringBuffer filePattern = new StringBuffer(getFilePattern());    \n    if(list != null){\n      for(int i =0; i < list.length; ++i)\n      {\n        filePattern.append(\" | grep -v \" + list[i] );\n      }\n    }  \n    String[] cmd =\n        new String[] {\n            \"bash\",\n            \"-c\",\n            \"grep -c \"\n                + pattern + \" \" + filePattern\n                + \" | awk -F: '{s+=$2} END {print s}'\" };    \n    ShellCommandExecutor shexec = new ShellCommandExecutor(cmd);\n    shexec.execute();\n    String output = shexec.getOutput();\n    return Integer.parseInt(output.replaceAll(\"\\n\", \"\").trim());\n  }\n\n  private String DaemonProtocol.user = null;\n  \n  public String DaemonProtocol.getDaemonUser() {\n    return user;\n  }\n  \n  public void DaemonProtocol.setUser(String user) {\n    this.user = user;\n  }\n}\n\n","old_contents":"\/**\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements.  See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership.  The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * \"License\"); you may not use this file except in compliance\n * with the License.  You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.apache.hadoop.test.system;\n\nimport java.io.File;\nimport java.io.IOException;\nimport java.util.HashMap;\nimport java.util.List;\nimport java.util.ArrayList;\nimport java.util.Map;\nimport java.util.Properties;\nimport org.apache.commons.logging.Log;\nimport org.apache.commons.logging.LogFactory;\nimport org.apache.hadoop.io.Writable;\nimport org.apache.hadoop.util.Shell.ShellCommandExecutor;\nimport org.apache.hadoop.fs.FileStatus;\nimport org.apache.hadoop.fs.FileSystem;\nimport org.apache.hadoop.fs.Path;\nimport org.apache.hadoop.conf.Configuration;\n\n\/**\n * Default DaemonProtocolAspect which is used to provide default implementation\n * for all the common daemon methods. If a daemon requires more specialized\n * version of method, it is responsibility of the DaemonClient to introduce the\n * same in woven classes.\n * \n *\/\npublic aspect DaemonProtocolAspect {\n\n  private boolean DaemonProtocol.ready;\n  \n  @SuppressWarnings(\"unchecked\")\n  private HashMap<Object, List<ControlAction>> DaemonProtocol.actions = \n    new HashMap<Object, List<ControlAction>>();\n  private static final Log LOG = LogFactory.getLog(\n      DaemonProtocolAspect.class.getName());\n  \/**\n   * Set if the daemon process is ready or not, concrete daemon protocol should\n   * implement pointcuts to determine when the daemon is ready and use the\n   * setter to set the ready state.\n   * \n   * @param ready\n   *          true if the Daemon is ready.\n   *\/\n  public void DaemonProtocol.setReady(boolean ready) {\n    this.ready = ready;\n  }\n\n  \/**\n   * Checks if the daemon process is alive or not.\n   * \n   * @throws IOException\n   *           if daemon is not alive.\n   *\/\n  public void DaemonProtocol.ping() throws IOException {\n  }\n\n  \/**\n   * Checks if the daemon process is ready to accepting RPC connections after it\n   * finishes initialization. <br\/>\n   * \n   * @return true if ready to accept connection.\n   * \n   * @throws IOException\n   *\/\n  public boolean DaemonProtocol.isReady() throws IOException {\n    return ready;\n  }\n\n  \/**\n   * Returns the process related information regarding the daemon process. <br\/>\n   * \n   * @return process information.\n   * @throws IOException\n   *\/\n  public ProcessInfo DaemonProtocol.getProcessInfo() throws IOException {\n    int activeThreadCount = Thread.activeCount();\n    long currentTime = System.currentTimeMillis();\n    long maxmem = Runtime.getRuntime().maxMemory();\n    long freemem = Runtime.getRuntime().freeMemory();\n    long totalmem = Runtime.getRuntime().totalMemory();\n    Map<String, String> envMap = System.getenv();\n    Properties sysProps = System.getProperties();\n    Map<String, String> props = new HashMap<String, String>();\n    for (Map.Entry entry : sysProps.entrySet()) {\n      props.put((String) entry.getKey(), (String) entry.getValue());\n    }\n    ProcessInfo info = new ProcessInfoImpl(activeThreadCount, currentTime,\n        freemem, maxmem, totalmem, envMap, props);\n    return info;\n  }\n\n  public void DaemonProtocol.enable(List<Enum<?>> faults) throws IOException {\n  }\n\n  public void DaemonProtocol.disableAll() throws IOException {\n  }\n\n  public abstract Configuration DaemonProtocol.getDaemonConf()\n    throws IOException;\n\n  public FileStatus DaemonProtocol.getFileStatus(String path, boolean local) \n    throws IOException {\n    Path p = new Path(path);\n    FileSystem fs = getFS(p, local);\n    p.makeQualified(fs);\n    FileStatus fileStatus = fs.getFileStatus(p);\n    return cloneFileStatus(fileStatus);\n  }\n\n  public FileStatus[] DaemonProtocol.listStatus(String path, boolean local) \n    throws IOException {\n    Path p = new Path(path);\n    FileSystem fs = getFS(p, local);\n    FileStatus[] status = fs.listStatus(p);\n    if (status != null) {\n      FileStatus[] result = new FileStatus[status.length];\n      int i = 0;\n      for (FileStatus fileStatus : status) {\n        result[i++] = cloneFileStatus(fileStatus);\n      }\n      return result;\n    }\n    return status;\n  }\n\n  \/**\n   * FileStatus object may not be serializable. Clone it into raw FileStatus \n   * object.\n   *\/\n  private FileStatus DaemonProtocol.cloneFileStatus(FileStatus fileStatus) {\n    return new FileStatus(fileStatus.getLen(),\n        fileStatus.isDir(),\n        fileStatus.getReplication(),\n        fileStatus.getBlockSize(),\n        fileStatus.getModificationTime(),\n        fileStatus.getAccessTime(),\n        fileStatus.getPermission(),\n        fileStatus.getOwner(),\n        fileStatus.getGroup(),\n        fileStatus.getPath());\n  }\n\n  private FileSystem DaemonProtocol.getFS(Path path, boolean local) \n    throws IOException {\n    FileSystem fs = null;\n    if (local) {\n      fs = FileSystem.getLocal(getDaemonConf());\n    } else {\n      fs = path.getFileSystem(getDaemonConf());\n    }\n    return fs;\n  }\n  \n  \n  @SuppressWarnings(\"unchecked\")\n  public ControlAction[] DaemonProtocol.getActions(Writable key) \n    throws IOException {\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(key);\n      if(actionList == null) {\n        return new ControlAction[0];\n      } else {\n        return (ControlAction[]) actionList.toArray(new ControlAction[actionList\n                                                                      .size()]);\n      }\n    }\n  }\n\n\n  @SuppressWarnings(\"unchecked\")\n  public void DaemonProtocol.sendAction(ControlAction action) \n      throws IOException {\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(action.getTarget());\n      if(actionList == null) {\n        actionList = new ArrayList<ControlAction>();\n        actions.put(action.getTarget(), actionList);\n      }\n      actionList.add(action);\n    } \n  }\n \n  @SuppressWarnings(\"unchecked\")\n  public boolean DaemonProtocol.isActionPending(ControlAction action) \n    throws IOException{\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(action.getTarget());\n      if(actionList == null) {\n        return false;\n      } else {\n        return actionList.contains(action);\n      }\n    }\n  }\n  \n  \n  @SuppressWarnings(\"unchecked\")\n  public void DaemonProtocol.removeAction(ControlAction action) \n    throws IOException {\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(action.getTarget());\n      if(actionList == null) {\n        return;\n      } else {\n        actionList.remove(action);\n      }\n    }\n  }\n  \n  public void DaemonProtocol.clearActions() throws IOException {\n    synchronized (actions) {\n      actions.clear();\n    }\n  }\n\n  public String DaemonProtocol.getFilePattern() {\n    \/\/We use the environment variable HADOOP_LOGFILE to get the\n    \/\/pattern to use in the search.\n    String logDir = System.getenv(\"HADOOP_LOG_DIR\");\n    String daemonLogPattern = System.getenv(\"HADOOP_LOGFILE\");\n    if(daemonLogPattern == null && daemonLogPattern.isEmpty()) {\n      return \"*\";\n    }\n    return  logDir+File.separator+daemonLogPattern+\"*\";\n  }\n\n  public int DaemonProtocol.getNumberOfMatchesInLogFile(String pattern,\n      String[] list) throws IOException {\n    StringBuffer filePattern = new StringBuffer(getFilePattern());    \n    if(list != null){\n      for(int i =0; i < list.length; ++i)\n      {\n        filePattern.append(\" | grep -v \" + list[i] );\n      }\n    }  \n    String[] cmd =\n        new String[] {\n            \"bash\",\n            \"-c\",\n            \"grep -c \"\n                + pattern + \" \" + filePattern\n                + \" | awk -F: '{s+=$2} END {print s}'\" };    \n    ShellCommandExecutor shexec = new ShellCommandExecutor(cmd);\n    shexec.execute();\n    String output = shexec.getOutput();\n    return Integer.parseInt(output.replaceAll(\"\\n\", \"\").trim());\n  }\n\n  private String DaemonProtocol.user = null;\n  \n  public String DaemonProtocol.getDaemonUser() {\n    return user;\n  }\n  \n  public void DaemonProtocol.setUser(String user) {\n    this.user = user;\n  }\n}\n\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"09cff2b8f18ea68c4c314c92d969f97e211a5576","subject":"commit 6231ae49df45df5c47e8c9561ef5be03d8d7792f Author: Vinay Kumar Thota <vinayt@yahoo-inc.com> Date:   Wed Jun 16 09:54:29 2010 +0000","message":"commit 6231ae49df45df5c47e8c9561ef5be03d8d7792f\nAuthor: Vinay Kumar Thota <vinayt@yahoo-inc.com>\nDate:   Wed Jun 16 09:54:29 2010 +0000\n\n    HADOOP:6819 from https:\/\/issues.apache.org\/jira\/secure\/attachment\/12446837\/6819-ydist-security.patch\n\n\ngit-svn-id: 7e7a2d564dde2945c3a26e08d1235fcc0cb7aba1@1077506 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"awylie\/hadoop,awylie\/hadoop,awylie\/hadoop,awylie\/hadoop,awylie\/hadoop,awylie\/hadoop,awylie\/hadoop,awylie\/hadoop,awylie\/hadoop,awylie\/hadoop","old_file":"src\/test\/system\/aop\/org\/apache\/hadoop\/test\/system\/DaemonProtocolAspect.aj","new_file":"src\/test\/system\/aop\/org\/apache\/hadoop\/test\/system\/DaemonProtocolAspect.aj","new_contents":"\/**\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements.  See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership.  The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * \"License\"); you may not use this file except in compliance\n * with the License.  You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.apache.hadoop.test.system;\n\nimport java.io.File;\nimport java.io.IOException;\nimport java.security.PrivilegedExceptionAction;\nimport java.util.HashMap;\nimport java.util.List;\nimport java.util.ArrayList;\nimport java.util.Map;\nimport java.util.Properties;\nimport org.apache.commons.logging.Log;\nimport org.apache.commons.logging.LogFactory;\nimport org.apache.hadoop.io.Writable;\nimport org.apache.hadoop.security.UserGroupInformation;\nimport org.apache.hadoop.util.Shell.ShellCommandExecutor;\nimport org.apache.hadoop.util.Shell;\nimport org.apache.hadoop.fs.FileStatus;\nimport org.apache.hadoop.fs.FileSystem;\nimport org.apache.hadoop.fs.Path;\nimport org.apache.hadoop.conf.Configuration;\n\n\/**\n * Default DaemonProtocolAspect which is used to provide default implementation\n * for all the common daemon methods. If a daemon requires more specialized\n * version of method, it is responsibility of the DaemonClient to introduce the\n * same in woven classes.\n * \n *\/\npublic aspect DaemonProtocolAspect {\n\n  private boolean DaemonProtocol.ready;\n  \n  @SuppressWarnings(\"unchecked\")\n  private HashMap<Object, List<ControlAction>> DaemonProtocol.actions = \n    new HashMap<Object, List<ControlAction>>();\n  private static final Log LOG = LogFactory.getLog(\n      DaemonProtocolAspect.class.getName());\n  \/**\n   * Set if the daemon process is ready or not, concrete daemon protocol should\n   * implement pointcuts to determine when the daemon is ready and use the\n   * setter to set the ready state.\n   * \n   * @param ready\n   *          true if the Daemon is ready.\n   *\/\n  public void DaemonProtocol.setReady(boolean ready) {\n    this.ready = ready;\n  }\n\n  \/**\n   * Checks if the daemon process is alive or not.\n   * \n   * @throws IOException\n   *           if daemon is not alive.\n   *\/\n  public void DaemonProtocol.ping() throws IOException {\n  }\n\n  \/**\n   * Checks if the daemon process is ready to accepting RPC connections after it\n   * finishes initialization. <br\/>\n   * \n   * @return true if ready to accept connection.\n   * \n   * @throws IOException\n   *\/\n  public boolean DaemonProtocol.isReady() throws IOException {\n    return ready;\n  }\n\n  \/**\n   * Returns the process related information regarding the daemon process. <br\/>\n   * \n   * @return process information.\n   * @throws IOException\n   *\/\n  public ProcessInfo DaemonProtocol.getProcessInfo() throws IOException {\n    int activeThreadCount = Thread.activeCount();\n    long currentTime = System.currentTimeMillis();\n    long maxmem = Runtime.getRuntime().maxMemory();\n    long freemem = Runtime.getRuntime().freeMemory();\n    long totalmem = Runtime.getRuntime().totalMemory();\n    Map<String, String> envMap = System.getenv();\n    Properties sysProps = System.getProperties();\n    Map<String, String> props = new HashMap<String, String>();\n    for (Map.Entry entry : sysProps.entrySet()) {\n      props.put((String) entry.getKey(), (String) entry.getValue());\n    }\n    ProcessInfo info = new ProcessInfoImpl(activeThreadCount, currentTime,\n        freemem, maxmem, totalmem, envMap, props);\n    return info;\n  }\n\n  public void DaemonProtocol.enable(List<Enum<?>> faults) throws IOException {\n  }\n\n  public void DaemonProtocol.disableAll() throws IOException {\n  }\n\n  public abstract Configuration DaemonProtocol.getDaemonConf()\n    throws IOException;\n\n  public FileStatus DaemonProtocol.getFileStatus(String path, boolean local) \n    throws IOException {\n    Path p = new Path(path);\n    FileSystem fs = getFS(p, local);\n    p.makeQualified(fs);\n    FileStatus fileStatus = fs.getFileStatus(p);\n    return cloneFileStatus(fileStatus);\n  }\n\n  public FileStatus[] DaemonProtocol.listStatus(String path, boolean local) \n    throws IOException {\n    Path p = new Path(path);\n    FileSystem fs = getFS(p, local);\n    FileStatus[] status = fs.listStatus(p);\n    if (status != null) {\n      FileStatus[] result = new FileStatus[status.length];\n      int i = 0;\n      for (FileStatus fileStatus : status) {\n        result[i++] = cloneFileStatus(fileStatus);\n      }\n      return result;\n    }\n    return status;\n  }\n\n  \/**\n   * FileStatus object may not be serializable. Clone it into raw FileStatus \n   * object.\n   *\/\n  private FileStatus DaemonProtocol.cloneFileStatus(FileStatus fileStatus) {\n    return new FileStatus(fileStatus.getLen(),\n        fileStatus.isDir(),\n        fileStatus.getReplication(),\n        fileStatus.getBlockSize(),\n        fileStatus.getModificationTime(),\n        fileStatus.getAccessTime(),\n        fileStatus.getPermission(),\n        fileStatus.getOwner(),\n        fileStatus.getGroup(),\n        fileStatus.getPath());\n  }\n\n  private FileSystem DaemonProtocol.getFS(final Path path, final boolean local)\n      throws IOException {\n    FileSystem ret = null;\n    try {\n      ret = UserGroupInformation.getLoginUser().doAs (\n          new PrivilegedExceptionAction<FileSystem>() {\n            public FileSystem run() throws IOException {\n              FileSystem fs = null;\n              if (local) {\n                fs = FileSystem.getLocal(getDaemonConf());\n              } else {\n                fs = path.getFileSystem(getDaemonConf());\n              }\n              return fs;\n            }\n          });\n    } catch (InterruptedException ie) {\n    }\n    return ret;\n  }\n  \n  @SuppressWarnings(\"unchecked\")\n  public ControlAction[] DaemonProtocol.getActions(Writable key) \n    throws IOException {\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(key);\n      if(actionList == null) {\n        return new ControlAction[0];\n      } else {\n        return (ControlAction[]) actionList.toArray(new ControlAction[actionList\n                                                                      .size()]);\n      }\n    }\n  }\n\n\n  @SuppressWarnings(\"unchecked\")\n  public void DaemonProtocol.sendAction(ControlAction action) \n      throws IOException {\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(action.getTarget());\n      if(actionList == null) {\n        actionList = new ArrayList<ControlAction>();\n        actions.put(action.getTarget(), actionList);\n      }\n      actionList.add(action);\n    } \n  }\n \n  @SuppressWarnings(\"unchecked\")\n  public boolean DaemonProtocol.isActionPending(ControlAction action) \n    throws IOException{\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(action.getTarget());\n      if(actionList == null) {\n        return false;\n      } else {\n        return actionList.contains(action);\n      }\n    }\n  }\n  \n  \n  @SuppressWarnings(\"unchecked\")\n  public void DaemonProtocol.removeAction(ControlAction action) \n    throws IOException {\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(action.getTarget());\n      if(actionList == null) {\n        return;\n      } else {\n        actionList.remove(action);\n      }\n    }\n  }\n  \n  public void DaemonProtocol.clearActions() throws IOException {\n    synchronized (actions) {\n      actions.clear();\n    }\n  }\n\n  public String DaemonProtocol.getFilePattern() {\n    \/\/We use the environment variable HADOOP_LOGFILE to get the\n    \/\/pattern to use in the search.\n    String logDir = System.getenv(\"HADOOP_LOG_DIR\");\n    String daemonLogPattern = System.getenv(\"HADOOP_LOGFILE\");\n    if(daemonLogPattern == null && daemonLogPattern.isEmpty()) {\n      return \"*\";\n    }\n    return  logDir+File.separator+daemonLogPattern+\"*\";\n  }\n\n  public int DaemonProtocol.getNumberOfMatchesInLogFile(String pattern,\n      String[] list) throws IOException {\n    StringBuffer filePattern = new StringBuffer(getFilePattern());    \n    String[] cmd = null;\n    if (list != null) {\n      StringBuffer filterExpPattern = new StringBuffer();\n      int index=0;\n      for (String excludeExp : list) {\n        if (index++ < list.length -1) {\n           filterExpPattern.append(\"grep -v \" + excludeExp + \" | \");\n        } else {\n           filterExpPattern.append(\"grep -v \" + excludeExp + \" | wc -l\");\n        }\n      }\n      cmd = new String[] {\n                \"bash\",\n                \"-c\",\n                \"grep \"\n                + pattern + \" \" + filePattern + \" | \"\n                + filterExpPattern};\n    } else {\n      cmd = new String[] {\n                \"bash\",\n                \"-c\",\n                \"grep -c \"\n                + pattern + \" \" + filePattern\n                + \" | awk -F: '{s+=$2} END {print s}'\" };    \n    }\n    ShellCommandExecutor shexec = new ShellCommandExecutor(cmd);\n    shexec.execute();\n    String output = shexec.getOutput();\n    return Integer.parseInt(output.replaceAll(\"\\n\", \"\").trim());\n  }\n  \n  \/**\n   * This method is used for suspending the process.\n   * @param pid process id\n   * @throws IOException if an I\/O error occurs.\n   * @return true if process is suspended otherwise false.\n   *\/\n  public boolean DaemonProtocol.suspendProcess(String pid) throws IOException {\n    String suspendCmd = getDaemonConf().get(\"test.system.hdrc.suspend.cmd\",\n        \"kill -SIGSTOP\");\n    String [] command = {\"bash\", \"-c\", suspendCmd + \" \" + pid};\n    ShellCommandExecutor shexec = new ShellCommandExecutor(command);\n    try {\n      shexec.execute();\n    } catch (Shell.ExitCodeException e) {\n      LOG.warn(\"suspended process throws an exitcode \"\n          + \"exception for not being suspended the given process id.\");\n      return false;\n    }\n    LOG.info(\"The suspend process command is :\"\n        + shexec.toString()\n        + \" and the output for the command is \"\n        + shexec.getOutput());\n    return true;\n  }\n\n  \/**\n   * This method is used for resuming the process\n   * @param pid process id of suspended process.\n   * @throws IOException if an I\/O error occurs.\n   * @return true if suspeneded process is resumed otherwise false.\n   *\/\n  public boolean DaemonProtocol.resumeProcess(String pid) throws IOException {\n    String resumeCmd = getDaemonConf().get(\"test.system.hdrc.resume.cmd\",\n        \"kill -SIGCONT\");\n    String [] command = {\"bash\", \"-c\", resumeCmd + \" \" + pid};\n    ShellCommandExecutor shexec = new ShellCommandExecutor(command);\n    try {\n      shexec.execute();\n    } catch(Shell.ExitCodeException e) {\n        LOG.warn(\"Resume process throws an exitcode \"\n          + \"exception for not being resumed the given process id.\");\n      return false;\n    }\n    LOG.info(\"The resume process command is :\"\n        + shexec.toString()\n        + \" and the output for the command is \"\n        + shexec.getOutput());\n    return true;\n  }\n\n  private String DaemonProtocol.user = null;\n  \n  public String DaemonProtocol.getDaemonUser() {\n    return user;\n  }\n  \n  public void DaemonProtocol.setUser(String user) {\n    this.user = user;\n  }\n}\n","old_contents":"\/**\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements.  See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership.  The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * \"License\"); you may not use this file except in compliance\n * with the License.  You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.apache.hadoop.test.system;\n\nimport java.io.File;\nimport java.io.IOException;\nimport java.security.PrivilegedExceptionAction;\nimport java.util.HashMap;\nimport java.util.List;\nimport java.util.ArrayList;\nimport java.util.Map;\nimport java.util.Properties;\nimport org.apache.commons.logging.Log;\nimport org.apache.commons.logging.LogFactory;\nimport org.apache.hadoop.io.Writable;\nimport org.apache.hadoop.security.UserGroupInformation;\nimport org.apache.hadoop.util.Shell.ShellCommandExecutor;\nimport org.apache.hadoop.util.Shell;\nimport org.apache.hadoop.fs.FileStatus;\nimport org.apache.hadoop.fs.FileSystem;\nimport org.apache.hadoop.fs.Path;\nimport org.apache.hadoop.conf.Configuration;\n\n\/**\n * Default DaemonProtocolAspect which is used to provide default implementation\n * for all the common daemon methods. If a daemon requires more specialized\n * version of method, it is responsibility of the DaemonClient to introduce the\n * same in woven classes.\n * \n *\/\npublic aspect DaemonProtocolAspect {\n\n  private boolean DaemonProtocol.ready;\n  \n  @SuppressWarnings(\"unchecked\")\n  private HashMap<Object, List<ControlAction>> DaemonProtocol.actions = \n    new HashMap<Object, List<ControlAction>>();\n  private static final Log LOG = LogFactory.getLog(\n      DaemonProtocolAspect.class.getName());\n  \/**\n   * Set if the daemon process is ready or not, concrete daemon protocol should\n   * implement pointcuts to determine when the daemon is ready and use the\n   * setter to set the ready state.\n   * \n   * @param ready\n   *          true if the Daemon is ready.\n   *\/\n  public void DaemonProtocol.setReady(boolean ready) {\n    this.ready = ready;\n  }\n\n  \/**\n   * Checks if the daemon process is alive or not.\n   * \n   * @throws IOException\n   *           if daemon is not alive.\n   *\/\n  public void DaemonProtocol.ping() throws IOException {\n  }\n\n  \/**\n   * Checks if the daemon process is ready to accepting RPC connections after it\n   * finishes initialization. <br\/>\n   * \n   * @return true if ready to accept connection.\n   * \n   * @throws IOException\n   *\/\n  public boolean DaemonProtocol.isReady() throws IOException {\n    return ready;\n  }\n\n  \/**\n   * Returns the process related information regarding the daemon process. <br\/>\n   * \n   * @return process information.\n   * @throws IOException\n   *\/\n  public ProcessInfo DaemonProtocol.getProcessInfo() throws IOException {\n    int activeThreadCount = Thread.activeCount();\n    long currentTime = System.currentTimeMillis();\n    long maxmem = Runtime.getRuntime().maxMemory();\n    long freemem = Runtime.getRuntime().freeMemory();\n    long totalmem = Runtime.getRuntime().totalMemory();\n    Map<String, String> envMap = System.getenv();\n    Properties sysProps = System.getProperties();\n    Map<String, String> props = new HashMap<String, String>();\n    for (Map.Entry entry : sysProps.entrySet()) {\n      props.put((String) entry.getKey(), (String) entry.getValue());\n    }\n    ProcessInfo info = new ProcessInfoImpl(activeThreadCount, currentTime,\n        freemem, maxmem, totalmem, envMap, props);\n    return info;\n  }\n\n  public void DaemonProtocol.enable(List<Enum<?>> faults) throws IOException {\n  }\n\n  public void DaemonProtocol.disableAll() throws IOException {\n  }\n\n  public abstract Configuration DaemonProtocol.getDaemonConf()\n    throws IOException;\n\n  public FileStatus DaemonProtocol.getFileStatus(String path, boolean local) \n    throws IOException {\n    Path p = new Path(path);\n    FileSystem fs = getFS(p, local);\n    p.makeQualified(fs);\n    FileStatus fileStatus = fs.getFileStatus(p);\n    return cloneFileStatus(fileStatus);\n  }\n\n  public FileStatus[] DaemonProtocol.listStatus(String path, boolean local) \n    throws IOException {\n    Path p = new Path(path);\n    FileSystem fs = getFS(p, local);\n    FileStatus[] status = fs.listStatus(p);\n    if (status != null) {\n      FileStatus[] result = new FileStatus[status.length];\n      int i = 0;\n      for (FileStatus fileStatus : status) {\n        result[i++] = cloneFileStatus(fileStatus);\n      }\n      return result;\n    }\n    return status;\n  }\n\n  \/**\n   * FileStatus object may not be serializable. Clone it into raw FileStatus \n   * object.\n   *\/\n  private FileStatus DaemonProtocol.cloneFileStatus(FileStatus fileStatus) {\n    return new FileStatus(fileStatus.getLen(),\n        fileStatus.isDir(),\n        fileStatus.getReplication(),\n        fileStatus.getBlockSize(),\n        fileStatus.getModificationTime(),\n        fileStatus.getAccessTime(),\n        fileStatus.getPermission(),\n        fileStatus.getOwner(),\n        fileStatus.getGroup(),\n        fileStatus.getPath());\n  }\n\n  private FileSystem DaemonProtocol.getFS(final Path path, final boolean local)\n      throws IOException {\n    FileSystem ret = null;\n    try {\n      ret = UserGroupInformation.getLoginUser().doAs (\n          new PrivilegedExceptionAction<FileSystem>() {\n            public FileSystem run() throws IOException {\n              FileSystem fs = null;\n              if (local) {\n                fs = FileSystem.getLocal(getDaemonConf());\n              } else {\n                fs = path.getFileSystem(getDaemonConf());\n              }\n              return fs;\n            }\n          });\n    } catch (InterruptedException ie) {\n    }\n    return ret;\n  }\n  \n  @SuppressWarnings(\"unchecked\")\n  public ControlAction[] DaemonProtocol.getActions(Writable key) \n    throws IOException {\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(key);\n      if(actionList == null) {\n        return new ControlAction[0];\n      } else {\n        return (ControlAction[]) actionList.toArray(new ControlAction[actionList\n                                                                      .size()]);\n      }\n    }\n  }\n\n\n  @SuppressWarnings(\"unchecked\")\n  public void DaemonProtocol.sendAction(ControlAction action) \n      throws IOException {\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(action.getTarget());\n      if(actionList == null) {\n        actionList = new ArrayList<ControlAction>();\n        actions.put(action.getTarget(), actionList);\n      }\n      actionList.add(action);\n    } \n  }\n \n  @SuppressWarnings(\"unchecked\")\n  public boolean DaemonProtocol.isActionPending(ControlAction action) \n    throws IOException{\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(action.getTarget());\n      if(actionList == null) {\n        return false;\n      } else {\n        return actionList.contains(action);\n      }\n    }\n  }\n  \n  \n  @SuppressWarnings(\"unchecked\")\n  public void DaemonProtocol.removeAction(ControlAction action) \n    throws IOException {\n    synchronized (actions) {\n      List<ControlAction> actionList = actions.get(action.getTarget());\n      if(actionList == null) {\n        return;\n      } else {\n        actionList.remove(action);\n      }\n    }\n  }\n  \n  public void DaemonProtocol.clearActions() throws IOException {\n    synchronized (actions) {\n      actions.clear();\n    }\n  }\n\n  public String DaemonProtocol.getFilePattern() {\n    \/\/We use the environment variable HADOOP_LOGFILE to get the\n    \/\/pattern to use in the search.\n    String logDir = System.getenv(\"HADOOP_LOG_DIR\");\n    String daemonLogPattern = System.getenv(\"HADOOP_LOGFILE\");\n    if(daemonLogPattern == null && daemonLogPattern.isEmpty()) {\n      return \"*\";\n    }\n    return  logDir+File.separator+daemonLogPattern+\"*\";\n  }\n\n  public int DaemonProtocol.getNumberOfMatchesInLogFile(String pattern,\n      String[] list) throws IOException {\n    StringBuffer filePattern = new StringBuffer(getFilePattern());    \n    String[] cmd = null;\n    if (list != null) {\n      StringBuffer filterExpPattern = new StringBuffer();\n      int index=0;\n      for (String excludeExp : list) {\n        if (index++ < list.length -1) {\n           filterExpPattern.append(\"grep -v \" + excludeExp + \" | \");\n        } else {\n           filterExpPattern.append(\"grep -vc \" + excludeExp);\n        }\n      }\n      cmd = new String[] {\n                \"bash\",\n                \"-c\",\n                \"grep \"\n                + pattern + \" \" + filePattern + \" | \"\n                + filterExpPattern};\n    } else {\n      cmd = new String[] {\n                \"bash\",\n                \"-c\",\n                \"grep -c \"\n                + pattern + \" \" + filePattern\n                + \" | awk -F: '{s+=$2} END {print s}'\" };    \n    }\n    ShellCommandExecutor shexec = new ShellCommandExecutor(cmd);\n    shexec.execute();\n    String output = shexec.getOutput();\n    return Integer.parseInt(output.replaceAll(\"\\n\", \"\").trim());\n  }\n  \n  \/**\n   * This method is used for suspending the process.\n   * @param pid process id\n   * @throws IOException if an I\/O error occurs.\n   * @return true if process is suspended otherwise false.\n   *\/\n  public boolean DaemonProtocol.suspendProcess(String pid) throws IOException {\n    String suspendCmd = getDaemonConf().get(\"test.system.hdrc.suspend.cmd\",\n        \"kill -SIGSTOP\");\n    String [] command = {\"bash\", \"-c\", suspendCmd + \" \" + pid};\n    ShellCommandExecutor shexec = new ShellCommandExecutor(command);\n    try {\n      shexec.execute();\n    } catch (Shell.ExitCodeException e) {\n      LOG.warn(\"suspended process throws an exitcode \"\n          + \"exception for not being suspended the given process id.\");\n      return false;\n    }\n    LOG.info(\"The suspend process command is :\"\n        + shexec.toString()\n        + \" and the output for the command is \"\n        + shexec.getOutput());\n    return true;\n  }\n\n  \/**\n   * This method is used for resuming the process\n   * @param pid process id of suspended process.\n   * @throws IOException if an I\/O error occurs.\n   * @return true if suspeneded process is resumed otherwise false.\n   *\/\n  public boolean DaemonProtocol.resumeProcess(String pid) throws IOException {\n    String resumeCmd = getDaemonConf().get(\"test.system.hdrc.resume.cmd\",\n        \"kill -SIGCONT\");\n    String [] command = {\"bash\", \"-c\", resumeCmd + \" \" + pid};\n    ShellCommandExecutor shexec = new ShellCommandExecutor(command);\n    try {\n      shexec.execute();\n    } catch(Shell.ExitCodeException e) {\n        LOG.warn(\"Resume process throws an exitcode \"\n          + \"exception for not being resumed the given process id.\");\n      return false;\n    }\n    LOG.info(\"The resume process command is :\"\n        + shexec.toString()\n        + \" and the output for the command is \"\n        + shexec.getOutput());\n    return true;\n  }\n\n  private String DaemonProtocol.user = null;\n  \n  public String DaemonProtocol.getDaemonUser() {\n    return user;\n  }\n  \n  public void DaemonProtocol.setUser(String user) {\n    this.user = user;\n  }\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"a7bb4a694c2ea38543c51473a29748f6992c282c","subject":"remo\u00e7\u00e3o do perthis, pois em breve ser\u00e1 necess\u00e1rio controlar aspectos em c\u00f3digo static (que n\u00e3o tem this, logo n\u00e3o \u00e9 aspect\u00e1vel com perthis)","message":"remo\u00e7\u00e3o do perthis, pois em breve ser\u00e1 necess\u00e1rio controlar aspectos em c\u00f3digo static (que n\u00e3o tem this, logo n\u00e3o \u00e9 aspect\u00e1vel com perthis)\n","repos":"rslemos\/former-nlp","old_file":"brillevents\/src\/main\/java\/br\/eti\/rslemos\/brill\/events\/RuleBasedTaggerObserver.aj","new_file":"brillevents\/src\/main\/java\/br\/eti\/rslemos\/brill\/events\/RuleBasedTaggerObserver.aj","new_contents":"package br.eti.rslemos.brill.events;\n\nimport java.lang.reflect.InvocationTargetException;\nimport java.lang.reflect.Method;\nimport java.util.ArrayList;\nimport java.util.List;\n\nimport br.eti.rslemos.brill.Rule;\nimport br.eti.rslemos.brill.RuleBasedTagger;\nimport br.eti.rslemos.tagger.Sentence;\n\n@SuppressWarnings(\"unchecked\")\npublic aspect RuleBasedTaggerObserver extends RuleBasedTaggerEvents {\n\t\n\tprivate List<RuleBasedTaggerListener> RuleBasedTagger.listeners = new ArrayList<RuleBasedTaggerListener>();\n\t\n\tpublic void RuleBasedTagger.addRuleBasedTaggerListener(RuleBasedTaggerListener listener) {\n\t\tlisteners.add(listener);\n\t}\n\t\n\tpublic void RuleBasedTagger.removeRuleBasedTaggerListener(RuleBasedTaggerListener listener) {\n\t\tlisteners.remove(listener);\n\t}\n\n\tprivate void RuleBasedTagger.fireNotification(Method method, RuleBasedTaggerEvent prototype) {\n\t\tfor (RuleBasedTaggerListener listener : listeners) {\n\t\t\tRuleBasedTaggerEvent event = (RuleBasedTaggerEvent) prototype.clone();\n\t\t\ttry {\n\t\t\t\tmethod.invoke(listener, event);\n\t\t\t} catch (InvocationTargetException e) {\n\t\t\t\t\/\/ swallow\n\t\t\t} catch (Exception e) {\n\t\t\t\tthrow (Error)(new LinkageError().initCause(e));\n\t\t\t}\n\t\t}\n\t}\n\t\n\tprivate static final Method TAGGINGSENTENCE;\n\tprivate static final Method SENTENCETAGGED;\n\tprivate static final Method BEFOREBASETAGGER;\n\tprivate static final Method AFTERBASETAGGER;\n\tprivate static final Method BEFORERULEAPPLICATION;\n\tprivate static final Method AFTERRULEAPPLICATION;\n\t\n\tstatic {\n\t\tClass<RuleBasedTaggerListener> clazz = RuleBasedTaggerListener.class;\n\t\tClass[] args = new Class[] {RuleBasedTaggerEvent.class};\n\t\t\n\t\ttry {\n\t\t\tTAGGINGSENTENCE = clazz.getMethod(\"taggingSentence\", args);\n\t\t\tSENTENCETAGGED = clazz.getMethod(\"sentenceTagged\", args);\n\t\t\tBEFOREBASETAGGER = clazz.getMethod(\"beforeBaseTagger\", args);\n\t\t\tAFTERBASETAGGER = clazz.getMethod(\"afterBaseTagger\", args);\n\t\t\tBEFORERULEAPPLICATION = clazz.getMethod(\"beforeRuleApplication\", args);\n\t\t\tAFTERRULEAPPLICATION = clazz.getMethod(\"afterRuleApplication\", args);\n\t\t} catch (Exception e) {\n\t\t\tthrow (Error)(new LinkageError().initCause(e));\n\t\t}\n\t}\n\t\n\tbefore(RuleBasedTagger tagger, Sentence sentence): onTagSentence(tagger, sentence) {\n\t\tRuleBasedTaggerEvent prototype = new RuleBasedTaggerEvent(tagger);\n\t\tprototype.setOnSentence(sentence);\n\t\t\n\t\ttagger.fireNotification(TAGGINGSENTENCE, prototype);\n\t}\n\n\tafter(RuleBasedTagger tagger, Sentence sentence) returning: onTagSentence(tagger, sentence) {\n\t\tRuleBasedTaggerEvent prototype = new RuleBasedTaggerEvent(tagger);\n\t\tprototype.setOnSentence(sentence);\n\t\n\t\ttagger.fireNotification(SENTENCETAGGED, prototype);\n\t}\n\n\tbefore(RuleBasedTagger tagger, Sentence sentence): onBaseTagger(tagger, *, sentence) {\n\t\tRuleBasedTaggerEvent prototype = new RuleBasedTaggerEvent(tagger);\n\t\tprototype.setOnSentence(sentence);\n\t\n\t\ttagger.fireNotification(BEFOREBASETAGGER, prototype);\n\t}\n\n\tafter(RuleBasedTagger tagger, Sentence sentence) returning: onBaseTagger(tagger, *, sentence) {\n\t\tRuleBasedTaggerEvent prototype = new RuleBasedTaggerEvent(tagger);\n\t\tprototype.setOnSentence(sentence);\n\t\n\t\ttagger.fireNotification(AFTERBASETAGGER, prototype);\n\t}\n\n\tbefore(RuleBasedTagger tagger, Rule rule, Sentence sentence): onRuleApplication(tagger, rule, sentence) {\n\t\tRuleBasedTaggerEvent prototype = new RuleBasedTaggerEvent(tagger);\n\t\tprototype.setOnSentence(sentence);\n\t\tprototype.setActingRule(rule);\n\n\t\ttagger.fireNotification(BEFORERULEAPPLICATION, prototype);\n\t}\n\n\tafter(RuleBasedTagger tagger, Rule rule, Sentence sentence) returning: onRuleApplication(tagger, rule, sentence) {\n\t\tRuleBasedTaggerEvent prototype = new RuleBasedTaggerEvent(tagger);\n\t\tprototype.setOnSentence(sentence);\n\t\tprototype.setActingRule(rule);\n\n\t\ttagger.fireNotification(AFTERRULEAPPLICATION, prototype);\n\t}\n\n}\n","old_contents":"package br.eti.rslemos.brill.events;\n\nimport java.lang.reflect.InvocationTargetException;\nimport java.lang.reflect.Method;\nimport java.util.ArrayList;\nimport java.util.List;\n\nimport br.eti.rslemos.brill.Rule;\nimport br.eti.rslemos.brill.RuleBasedTagger;\nimport br.eti.rslemos.tagger.Sentence;\n\n@SuppressWarnings(\"unchecked\")\npublic aspect RuleBasedTaggerObserver extends RuleBasedTaggerEvents perthis(this(RuleBasedTagger+)) {\n\t\n\tprivate List<RuleBasedTaggerListener> listeners = new ArrayList<RuleBasedTaggerListener>();\n\t\n\tpublic void RuleBasedTagger.addRuleBasedTaggerListener(RuleBasedTaggerListener listener) {\n\t\taspectOf(this).listeners.add(listener);\n\t}\n\t\n\tpublic void RuleBasedTagger.removeRuleBasedTaggerListener(RuleBasedTaggerListener listener) {\n\t\taspectOf(this).listeners.remove(listener);\n\t}\n\n\tprivate void fireNotification(Method method, RuleBasedTaggerEvent prototype) {\n\t\tfor (RuleBasedTaggerListener listener : listeners) {\n\t\t\tRuleBasedTaggerEvent event = (RuleBasedTaggerEvent) prototype.clone();\n\t\t\ttry {\n\t\t\t\tmethod.invoke(listener, event);\n\t\t\t} catch (InvocationTargetException e) {\n\t\t\t\t\/\/ swallow\n\t\t\t} catch (Exception e) {\n\t\t\t\tthrow (Error)(new LinkageError().initCause(e));\n\t\t\t}\n\t\t}\n\t}\n\t\n\tprivate static final Method TAGGINGSENTENCE;\n\tprivate static final Method SENTENCETAGGED;\n\tprivate static final Method BEFOREBASETAGGER;\n\tprivate static final Method AFTERBASETAGGER;\n\tprivate static final Method BEFORERULEAPPLICATION;\n\tprivate static final Method AFTERRULEAPPLICATION;\n\t\n\tstatic {\n\t\tClass<RuleBasedTaggerListener> clazz = RuleBasedTaggerListener.class;\n\t\tClass[] args = new Class[] {RuleBasedTaggerEvent.class};\n\t\t\n\t\ttry {\n\t\t\tTAGGINGSENTENCE = clazz.getMethod(\"taggingSentence\", args);\n\t\t\tSENTENCETAGGED = clazz.getMethod(\"sentenceTagged\", args);\n\t\t\tBEFOREBASETAGGER = clazz.getMethod(\"beforeBaseTagger\", args);\n\t\t\tAFTERBASETAGGER = clazz.getMethod(\"afterBaseTagger\", args);\n\t\t\tBEFORERULEAPPLICATION = clazz.getMethod(\"beforeRuleApplication\", args);\n\t\t\tAFTERRULEAPPLICATION = clazz.getMethod(\"afterRuleApplication\", args);\n\t\t} catch (Exception e) {\n\t\t\tthrow (Error)(new LinkageError().initCause(e));\n\t\t}\n\t}\n\t\n\tbefore(RuleBasedTagger tagger, Sentence sentence): onTagSentence(tagger, sentence) {\n\t\tRuleBasedTaggerEvent prototype = new RuleBasedTaggerEvent(tagger);\n\t\tprototype.setOnSentence(sentence);\n\t\t\n\t\tfireNotification(TAGGINGSENTENCE, prototype);\n\t}\n\n\tafter(RuleBasedTagger tagger, Sentence sentence) returning: onTagSentence(tagger, sentence) {\n\t\tRuleBasedTaggerEvent prototype = new RuleBasedTaggerEvent(tagger);\n\t\tprototype.setOnSentence(sentence);\n\t\n\t\tfireNotification(SENTENCETAGGED, prototype);\n\t}\n\n\tbefore(RuleBasedTagger tagger, Sentence sentence): onBaseTagger(tagger, *, sentence) {\n\t\tRuleBasedTaggerEvent prototype = new RuleBasedTaggerEvent(tagger);\n\t\tprototype.setOnSentence(sentence);\n\t\n\t\tfireNotification(BEFOREBASETAGGER, prototype);\n\t}\n\n\tafter(RuleBasedTagger tagger, Sentence sentence) returning: onBaseTagger(tagger, *, sentence) {\n\t\tRuleBasedTaggerEvent prototype = new RuleBasedTaggerEvent(tagger);\n\t\tprototype.setOnSentence(sentence);\n\t\n\t\tfireNotification(AFTERBASETAGGER, prototype);\n\t}\n\n\tbefore(RuleBasedTagger tagger, Rule rule, Sentence sentence): onRuleApplication(tagger, rule, sentence) {\n\t\tRuleBasedTaggerEvent prototype = new RuleBasedTaggerEvent(tagger);\n\t\tprototype.setOnSentence(sentence);\n\t\tprototype.setActingRule(rule);\n\n\t\tfireNotification(BEFORERULEAPPLICATION, prototype);\n\t}\n\n\tafter(RuleBasedTagger tagger, Rule rule, Sentence sentence) returning: onRuleApplication(tagger, rule, sentence) {\n\t\tRuleBasedTaggerEvent prototype = new RuleBasedTaggerEvent(tagger);\n\t\tprototype.setOnSentence(sentence);\n\t\tprototype.setActingRule(rule);\n\n\t\tfireNotification(AFTERRULEAPPLICATION, prototype);\n\t}\n\n}\n","returncode":0,"stderr":"","license":"agpl-3.0","lang":"AspectJ"}
{"commit":"48db18c81b3b3215e41dfaa79b3871adcc510a37","subject":"Cleanup on pointcuts to make them slightly more efficient.","message":"Cleanup on pointcuts to make them slightly more efficient.\n\ngit-svn-id: 2c527eb49caa05e19d6b2be874bf74fa9d7ea670@614756 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"josephw\/maven,njuneau\/maven,vedmishr\/demo1,karthikjaps\/maven,keith-turner\/maven,wangyuesong\/maven,wangyuesong\/maven,pkozelka\/maven,changbai1980\/maven,gorcz\/maven,olamy\/maven,mizdebsk\/maven,skitt\/maven,barthel\/maven,atanasenko\/maven,mcculls\/maven,Distrotech\/maven,lbndev\/maven,olamy\/maven,xasx\/maven,aheritier\/maven,changbai1980\/maven,skitt\/maven,stephenc\/maven,xasx\/maven,rogerchina\/maven,mizdebsk\/maven,josephw\/maven,stephenc\/maven,cstamas\/maven,keith-turner\/maven,runepeter\/maven-deploy-plugin-2.8.1,barthel\/maven,Tibor17\/maven,mcculls\/maven,vedmishr\/demo1,Tibor17\/maven,dsyer\/maven,wangyuesong0\/maven,karthikjaps\/maven,atanasenko\/maven,likaiwalkman\/maven,skitt\/maven,vedmishr\/demo1,rogerchina\/maven,cstamas\/maven,apache\/maven,trajano\/maven,wangyuesong0\/maven,ChristianSchulte\/maven,njuneau\/maven,barthel\/maven,dsyer\/maven,njuneau\/maven,kidaa\/maven-1,runepeter\/maven-deploy-plugin-2.8.1,ChristianSchulte\/maven,apache\/maven,dsyer\/maven,atanasenko\/maven,rogerchina\/maven,wangyuesong\/maven,trajano\/maven,Distrotech\/maven,karthikjaps\/maven,cstamas\/maven,kidaa\/maven-1,olamy\/maven,ChristianSchulte\/maven,stephenc\/maven,xasx\/maven,wangyuesong0\/maven,Mounika-Chirukuri\/maven,pkozelka\/maven,lbndev\/maven,apache\/maven,trajano\/maven,aheritier\/maven,likaiwalkman\/maven,lbndev\/maven,mcculls\/maven,kidaa\/maven-1,gorcz\/maven,likaiwalkman\/maven,Mounika-Chirukuri\/maven,changbai1980\/maven,josephw\/maven,pkozelka\/maven,Mounika-Chirukuri\/maven,gorcz\/maven,mizdebsk\/maven,keith-turner\/maven,aheritier\/maven","old_file":"maven-core\/src\/main\/aspect\/org\/apache\/maven\/errors\/LifecycleErrorReporterAspect.aj","new_file":"maven-core\/src\/main\/aspect\/org\/apache\/maven\/errors\/LifecycleErrorReporterAspect.aj","new_contents":"package org.apache.maven.errors;\n\nimport org.codehaus.plexus.logging.console.ConsoleLogger;\nimport org.codehaus.plexus.logging.Logger;\nimport org.codehaus.plexus.util.introspection.ReflectionValueExtractor;\nimport org.apache.maven.project.path.PathTranslator;\nimport org.apache.maven.plugin.MojoExecution;\nimport org.apache.maven.artifact.resolver.ArtifactResolutionException;\nimport org.apache.maven.artifact.resolver.MultipleArtifactsNotFoundException;\nimport org.apache.maven.plugin.PluginConfigurationException;\nimport org.apache.maven.plugin.descriptor.Parameter;\nimport org.apache.maven.plugin.loader.PluginLoaderException;\nimport org.apache.maven.plugin.loader.PluginLoader;\nimport org.apache.maven.plugin.PluginExecutionException;\nimport org.apache.maven.plugin.MojoExecutionException;\nimport org.apache.maven.plugin.InvalidPluginException;\nimport org.apache.maven.artifact.resolver.ArtifactNotFoundException;\nimport org.apache.maven.execution.MavenSession;\nimport org.apache.maven.lifecycle.model.MojoBinding;\nimport org.apache.maven.lifecycle.statemgmt.StateManagementUtils;\nimport org.apache.maven.lifecycle.DefaultLifecycleExecutor;\nimport org.apache.maven.lifecycle.LifecycleExecutor;\nimport org.apache.maven.lifecycle.LifecycleException;\nimport org.apache.maven.lifecycle.LifecycleExecutionException;\nimport org.apache.maven.project.MavenProject;\nimport org.apache.maven.plugin.DefaultPluginManager;\nimport org.apache.maven.plugin.PluginManager;\nimport org.apache.maven.plugin.PluginParameterExpressionEvaluator;\nimport org.apache.maven.plugin.PluginParameterException;\nimport org.apache.maven.plugin.Mojo;\nimport org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;\nimport org.codehaus.plexus.component.repository.exception.ComponentLookupException;\nimport org.codehaus.plexus.configuration.PlexusConfiguration;\nimport org.codehaus.plexus.PlexusContainer;\nimport org.codehaus.plexus.util.introspection.ReflectionValueExtractor;\n\nimport java.util.List;\n\npublic privileged aspect LifecycleErrorReporterAspect\n    extends AbstractCoreReporterAspect\n{\n\n    private pointcut le_executeGoalAndHandleFailures( MojoBinding binding ):\n        execution( void DefaultLifecycleExecutor.executeGoalAndHandleFailures( MojoBinding, .. ) )\n        && args( binding, .. );\n\n    private pointcut le_executeGoalAndHandleFailures_withSession( MojoBinding binding, MavenSession session ):\n        execution( void DefaultLifecycleExecutor.executeGoalAndHandleFailures( MojoBinding, MavenSession, .. ) )\n        && args( binding, session, .. );\n\n    private pointcut pm_executeMojo( MavenProject project ):\n        execution( void PluginManager+.executeMojo( MavenProject, .. ) )\n        && args( project, .. );\n\n    private pointcut within_pm_executeMojo( MavenProject project ):\n        withincode( void PluginManager+.executeMojo( MavenProject, .. ) )\n        && args( project, .. );\n\n    after( MojoBinding binding, MavenProject project ) throwing ( PluginLoaderException cause ):\n        ( cflow( le_executeGoalAndHandleFailures( MojoBinding ) )\n          || cflow( execution( * LifecycleExecutor+.isTaskValid( .. ) ) ) )\n        && execution( * PluginLoader+.loadPlugin( MojoBinding, MavenProject, .. ) )\n        && args( binding, project, .. )\n    {\n        getReporter().reportErrorLoadingPlugin( binding, project, cause );\n    }\n\n    after( String task, MavenSession session, MavenProject project ) throwing ( InvalidPluginException cause ):\n        execution( private * DefaultLifecycleExecutor.getMojoDescriptorForDirectInvocation( String, MavenSession, MavenProject ) )\n        && args( task, session, project )\n    {\n        getReporter().reportInvalidPluginForDirectInvocation( task, session, project, cause );\n    }\n\n    after( MojoBinding binding, MavenProject project ) throwing ( MojoExecutionException cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && call( void Mojo+.execute() )\n    {\n        \/\/ this will be covered by the reportErrorLoadingPlugin(..) method.\n        if ( !StateManagementUtils.RESOLVE_LATE_BOUND_PLUGIN_GOAL.equals( binding.getGoal() ) )\n        {\n            getReporter().reportMojoExecutionException( binding, project, cause );\n        }\n    }\n\n    PluginExecutionException around( MojoBinding binding, MavenProject project ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && call( PluginExecutionException.new( .., String ) )\n    {\n        PluginExecutionException cause = proceed( binding, project );\n        getReporter().reportInvalidPluginExecutionEnvironment( binding, project, cause );\n\n        return cause;\n    }\n\n    after( MojoBinding binding, MavenProject project ) throwing ( ComponentLookupException cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && withincode( Mojo DefaultPluginManager.getConfiguredMojo( .. ) )\n        && call( Object PlexusContainer+.lookup( .. ) )\n    {\n        getReporter().reportMojoLookupError( binding, project, cause );\n    }\n\n    Parameter currentParameter;\n\n    private pointcut paramGetName( Parameter parameter ):\n        call( String Parameter.getName() )\n        && target( parameter );\n\n    private pointcut pm_validatePomConfig():\n        execution( void DefaultPluginManager.validatePomConfiguration( .. ) );\n\n    private pointcut within_pm_validatePomConfig():\n        withincode( void DefaultPluginManager.validatePomConfiguration( .. ) );\n\n    private pointcut pm_checkRequiredParameters():\n        execution( void DefaultPluginManager.checkRequiredParameters( .. ) );\n\n    private pointcut within_pm_checkRequiredParameters():\n        withincode( void DefaultPluginManager.checkRequiredParameters( .. ) );\n\n    before( Parameter parameter ):\n        ( within_pm_validatePomConfig()\n          || within_pm_checkRequiredParameters() )\n        && paramGetName( parameter )\n    {\n        currentParameter = parameter;\n    }\n\n    after() returning:\n        pm_validatePomConfig() ||\n        pm_checkRequiredParameters()\n    {\n        currentParameter = null;\n    }\n\n    private pointcut pm_executeMojoWithSessionAndExec( MavenProject project, MojoExecution exec, MavenSession session, DefaultPluginManager manager ):\n        execution( void DefaultPluginManager.executeMojo( MavenProject, MojoExecution, MavenSession ) )\n        && args( project, exec, session )\n        && this( manager );\n\n    after( MojoBinding binding, MavenProject project, MojoExecution exec, MavenSession session, DefaultPluginManager manager ) throwing( PluginConfigurationException cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojoWithSessionAndExec( project, exec, session, manager ) )\n        && pm_validatePomConfig()\n    {\n        PathTranslator translator = manager.pathTranslator;\n        Logger logger = new ConsoleLogger( Logger.LEVEL_INFO, \"error reporting\" );\n        getReporter().reportAttemptToOverrideUneditableMojoParameter( currentParameter, binding, project, session, exec, translator, logger, cause );\n    }\n\n    PluginParameterException around( MojoBinding binding, MavenProject project, List invalidParameters ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && cflow( pm_checkRequiredParameters() )\n        && call( PluginParameterException.new( .., List ) )\n        && args( .., invalidParameters )\n    {\n        PluginParameterException err = proceed( binding, project, invalidParameters );\n\n        getReporter().reportMissingRequiredMojoParameter( binding, project, invalidParameters, err );\n\n        return err;\n    }\n\n    private pointcut ppee_evaluate( String expression ):\n        execution( Object PluginParameterExpressionEvaluator.evaluate( String ) )\n        && args( expression );\n\n    private pointcut within_ppee_evaluate( String expression ):\n        withincode( Object PluginParameterExpressionEvaluator.evaluate( String ) )\n        && args( expression );\n\n    before( MojoBinding binding, MavenProject project, String expression, ExpressionEvaluationException err ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && cflow( pm_checkRequiredParameters() )\n        && cflow( ppee_evaluate( expression ) )\n        && execution( ExpressionEvaluationException.new( String ) )\n        && this( err )\n    {\n        getReporter().reportUseOfBannedMojoParameter( currentParameter,\n                                                      binding,\n                                                      project,\n                                                      expression,\n                                                      (String) PluginParameterExpressionEvaluator.BANNED_EXPRESSIONS.get( expression ),\n                                                      err );\n    }\n\n    after( MojoBinding binding, MavenProject project, String expression ) throwing ( Exception cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && cflow( pm_checkRequiredParameters() )\n        && cflow( ppee_evaluate( expression ) )\n        && within( PluginParameterExpressionEvaluator )\n        && call( Object ReflectionValueExtractor.evaluate( String, Object ) )\n    {\n        getReporter().reportReflectionErrorWhileEvaluatingMojoParameter( currentParameter,\n                                                      binding,\n                                                      project,\n                                                      expression,\n                                                      cause );\n    }\n\n    after( MojoBinding binding, MavenProject project, PlexusConfiguration config ) throwing( PluginConfigurationException cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && execution( void DefaultPluginManager.populatePluginFields( *, *, PlexusConfiguration, .. ) )\n        && args( *, *, config, .. )\n    {\n        getReporter().reportErrorApplyingMojoConfiguration( binding, project, config, cause );\n    }\n\n    private pointcut pm_resolveTransitiveDependencies( MavenProject project, String scope ):\n        execution( void DefaultPluginManager.resolveTransitiveDependencies( *, *, String, *, MavenProject ) )\n        && args( *, *, scope, *, project );\n\n    after( MavenProject project, String scope ) throwing( ArtifactNotFoundException cause ):\n        pm_resolveTransitiveDependencies( project, scope )\n    {\n        getReporter().reportProjectDependenciesNotFound( project, scope, cause );\n    }\n\n    after( MavenProject project, String scope ) throwing( ArtifactResolutionException cause ):\n        pm_resolveTransitiveDependencies( project, scope )\n    {\n        if ( cause instanceof MultipleArtifactsNotFoundException )\n        {\n            getReporter().reportProjectDependenciesNotFound( project, scope, (MultipleArtifactsNotFoundException) cause );\n        }\n        else\n        {\n            getReporter().reportProjectDependenciesUnresolvable( project, scope, cause );\n        }\n    }\n\n    private pointcut le_getLifecycleBindings( List tasks, MavenProject configuringProject, String targetDescription ):\n        execution( List DefaultLifecycleExecutor.getLifecycleBindings( List, MavenProject, *, String ) )\n        && args( tasks, configuringProject, *, targetDescription );\n\n    before( List tasks, MavenProject configuringProject, String targetDescription, LifecycleException cause ):\n        cflow( le_getLifecycleBindings( tasks, configuringProject, targetDescription ) )\n        && call( LifecycleExecutionException.new( .., LifecycleException ) )\n        && args( .., cause )\n    {\n        getReporter().reportErrorFormulatingBuildPlan( tasks, configuringProject, targetDescription, cause );\n    }\n\n}\n","old_contents":"package org.apache.maven.errors;\n\nimport org.codehaus.plexus.logging.console.ConsoleLogger;\nimport org.codehaus.plexus.logging.Logger;\nimport org.codehaus.plexus.util.introspection.ReflectionValueExtractor;\nimport org.apache.maven.project.path.PathTranslator;\nimport org.apache.maven.plugin.MojoExecution;\nimport org.apache.maven.artifact.resolver.ArtifactResolutionException;\nimport org.apache.maven.artifact.resolver.MultipleArtifactsNotFoundException;\nimport org.apache.maven.plugin.PluginConfigurationException;\nimport org.apache.maven.plugin.descriptor.Parameter;\nimport org.apache.maven.plugin.loader.PluginLoaderException;\nimport org.apache.maven.plugin.loader.PluginLoader;\nimport org.apache.maven.plugin.PluginExecutionException;\nimport org.apache.maven.plugin.MojoExecutionException;\nimport org.apache.maven.plugin.InvalidPluginException;\nimport org.apache.maven.artifact.resolver.ArtifactNotFoundException;\nimport org.apache.maven.execution.MavenSession;\nimport org.apache.maven.lifecycle.model.MojoBinding;\nimport org.apache.maven.lifecycle.statemgmt.StateManagementUtils;\nimport org.apache.maven.lifecycle.DefaultLifecycleExecutor;\nimport org.apache.maven.lifecycle.LifecycleExecutor;\nimport org.apache.maven.lifecycle.LifecycleException;\nimport org.apache.maven.lifecycle.LifecycleExecutionException;\nimport org.apache.maven.project.MavenProject;\nimport org.apache.maven.plugin.DefaultPluginManager;\nimport org.apache.maven.plugin.PluginManager;\nimport org.apache.maven.plugin.PluginParameterExpressionEvaluator;\nimport org.apache.maven.plugin.PluginParameterException;\nimport org.apache.maven.plugin.Mojo;\nimport org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;\nimport org.codehaus.plexus.component.repository.exception.ComponentLookupException;\nimport org.codehaus.plexus.configuration.PlexusConfiguration;\nimport org.codehaus.plexus.PlexusContainer;\nimport org.codehaus.plexus.util.introspection.ReflectionValueExtractor;\n\nimport java.util.List;\n\npublic privileged aspect LifecycleErrorReporterAspect\n    extends AbstractCoreReporterAspect\n{\n\n    private pointcut le_executeGoalAndHandleFailures( MojoBinding binding ):\n        execution( void DefaultLifecycleExecutor.executeGoalAndHandleFailures( MojoBinding, .. ) )\n        && args( binding, .. );\n\n    private pointcut le_executeGoalAndHandleFailures_withSession( MojoBinding binding, MavenSession session ):\n        execution( void DefaultLifecycleExecutor.executeGoalAndHandleFailures( MojoBinding, MavenSession, .. ) )\n        && args( binding, session, .. );\n\n    private pointcut pm_executeMojo( MavenProject project ):\n        execution( void PluginManager+.executeMojo( MavenProject, .. ) )\n        && args( project, .. );\n\n    private pointcut within_pm_executeMojo( MavenProject project ):\n        withincode( void PluginManager+.executeMojo( MavenProject, .. ) )\n        && args( project, .. );\n\n    after( MojoBinding binding, MavenProject project ) throwing ( PluginLoaderException cause ):\n        ( cflow( le_executeGoalAndHandleFailures( MojoBinding ) )\n          || cflow( execution( * LifecycleExecutor+.isTaskValid( .. ) ) ) )\n        && call( * PluginLoader+.loadPlugin( MojoBinding, MavenProject, .. ) )\n        && args( binding, project, .. )\n    {\n        getReporter().reportErrorLoadingPlugin( binding, project, cause );\n    }\n\n    after( String task, MavenSession session, MavenProject project ) throwing ( InvalidPluginException cause ):\n        call( private * DefaultLifecycleExecutor.getMojoDescriptorForDirectInvocation( String, MavenSession, MavenProject ) )\n        && args( task, session, project )\n    {\n        getReporter().reportInvalidPluginForDirectInvocation( task, session, project, cause );\n    }\n\n    after( MojoBinding binding, MavenProject project ) throwing ( MojoExecutionException cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && call( void Mojo+.execute() )\n    {\n        \/\/ this will be covered by the reportErrorLoadingPlugin(..) method.\n        if ( !StateManagementUtils.RESOLVE_LATE_BOUND_PLUGIN_GOAL.equals( binding.getGoal() ) )\n        {\n            getReporter().reportMojoExecutionException( binding, project, cause );\n        }\n    }\n\n    PluginExecutionException around( MojoBinding binding, MavenProject project ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && call( PluginExecutionException.new( .., String ) )\n    {\n        PluginExecutionException cause = proceed( binding, project );\n        getReporter().reportInvalidPluginExecutionEnvironment( binding, project, cause );\n\n        return cause;\n    }\n\n    after( MojoBinding binding, MavenProject project ) throwing ( ComponentLookupException cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && withincode( Mojo DefaultPluginManager.getConfiguredMojo( .. ) )\n        && call( Object PlexusContainer+.lookup( .. ) )\n    {\n        getReporter().reportMojoLookupError( binding, project, cause );\n    }\n\n    Parameter currentParameter;\n\n    private pointcut paramGetName( Parameter parameter ):\n        call( String Parameter.getName() )\n        && target( parameter );\n\n    private pointcut pm_validatePomConfig():\n        execution( void DefaultPluginManager.validatePomConfiguration( .. ) );\n\n    private pointcut within_pm_validatePomConfig():\n        withincode( void DefaultPluginManager.validatePomConfiguration( .. ) );\n\n    private pointcut pm_checkRequiredParameters():\n        execution( void DefaultPluginManager.checkRequiredParameters( .. ) );\n\n    private pointcut within_pm_checkRequiredParameters():\n        withincode( void DefaultPluginManager.checkRequiredParameters( .. ) );\n\n    before( Parameter parameter ):\n        ( within_pm_validatePomConfig()\n          || within_pm_checkRequiredParameters() )\n        && paramGetName( parameter )\n    {\n        currentParameter = parameter;\n    }\n\n    after() returning:\n        pm_validatePomConfig() ||\n        pm_checkRequiredParameters()\n    {\n        currentParameter = null;\n    }\n\n    private pointcut pm_executeMojoWithSessionAndExec( MavenProject project, MojoExecution exec, MavenSession session, DefaultPluginManager manager ):\n        execution( void DefaultPluginManager.executeMojo( MavenProject, MojoExecution, MavenSession ) )\n        && args( project, exec, session )\n        && this( manager );\n\n    after( MojoBinding binding, MavenProject project, MojoExecution exec, MavenSession session, DefaultPluginManager manager ) throwing( PluginConfigurationException cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojoWithSessionAndExec( project, exec, session, manager ) )\n        && pm_validatePomConfig()\n    {\n        PathTranslator translator = manager.pathTranslator;\n        Logger logger = new ConsoleLogger( Logger.LEVEL_INFO, \"error reporting\" );\n        getReporter().reportAttemptToOverrideUneditableMojoParameter( currentParameter, binding, project, session, exec, translator, logger, cause );\n    }\n\n    PluginParameterException around( MojoBinding binding, MavenProject project, List invalidParameters ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && cflow( pm_checkRequiredParameters() )\n        && call( PluginParameterException.new( .., List ) )\n        && args( .., invalidParameters )\n    {\n        PluginParameterException err = proceed( binding, project, invalidParameters );\n\n        getReporter().reportMissingRequiredMojoParameter( binding, project, invalidParameters, err );\n\n        return err;\n    }\n\n    private pointcut ppee_evaluate( String expression ):\n        execution( Object PluginParameterExpressionEvaluator.evaluate( String ) )\n        && args( expression );\n\n    private pointcut within_ppee_evaluate( String expression ):\n        withincode( Object PluginParameterExpressionEvaluator.evaluate( String ) )\n        && args( expression );\n\n    before( MojoBinding binding, MavenProject project, String expression, ExpressionEvaluationException err ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && cflow( pm_checkRequiredParameters() )\n        && cflow( ppee_evaluate( expression ) )\n        && execution( ExpressionEvaluationException.new( String ) )\n        && this( err )\n    {\n        getReporter().reportUseOfBannedMojoParameter( currentParameter,\n                                                      binding,\n                                                      project,\n                                                      expression,\n                                                      (String) PluginParameterExpressionEvaluator.BANNED_EXPRESSIONS.get( expression ),\n                                                      err );\n    }\n\n    after( MojoBinding binding, MavenProject project, String expression ) throwing ( Exception cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && cflow( pm_checkRequiredParameters() )\n        && cflow( ppee_evaluate( expression ) )\n        && within( PluginParameterExpressionEvaluator )\n        && call( Object ReflectionValueExtractor.evaluate( String, Object ) )\n    {\n        getReporter().reportReflectionErrorWhileEvaluatingMojoParameter( currentParameter,\n                                                      binding,\n                                                      project,\n                                                      expression,\n                                                      cause );\n    }\n\n    after( MojoBinding binding, MavenProject project, PlexusConfiguration config ) throwing( PluginConfigurationException cause ):\n        cflow( le_executeGoalAndHandleFailures( binding ) )\n        && cflow( pm_executeMojo( project ) )\n        && execution( void DefaultPluginManager.populatePluginFields( *, *, PlexusConfiguration, .. ) )\n        && args( *, *, config, .. )\n    {\n        getReporter().reportErrorApplyingMojoConfiguration( binding, project, config, cause );\n    }\n\n    private pointcut pm_resolveTransitiveDependencies( MavenProject project, String scope ):\n        execution( void DefaultPluginManager.resolveTransitiveDependencies( *, *, String, *, MavenProject ) )\n        && args( *, *, scope, *, project );\n\n    after( MavenProject project, String scope ) throwing( ArtifactNotFoundException cause ):\n        pm_resolveTransitiveDependencies( project, scope )\n    {\n        getReporter().reportProjectDependenciesNotFound( project, scope, cause );\n    }\n\n    after( MavenProject project, String scope ) throwing( ArtifactResolutionException cause ):\n        pm_resolveTransitiveDependencies( project, scope )\n    {\n        if ( cause instanceof MultipleArtifactsNotFoundException )\n        {\n            getReporter().reportProjectDependenciesNotFound( project, scope, (MultipleArtifactsNotFoundException) cause );\n        }\n        else\n        {\n            getReporter().reportProjectDependenciesUnresolvable( project, scope, cause );\n        }\n    }\n\n    private pointcut le_getLifecycleBindings( List tasks, MavenProject configuringProject, String targetDescription ):\n        execution( List DefaultLifecycleExecutor.getLifecycleBindings( List, MavenProject, *, String ) )\n        && args( tasks, configuringProject, *, targetDescription );\n\n    before( List tasks, MavenProject configuringProject, String targetDescription, LifecycleException cause ):\n        cflow( le_getLifecycleBindings( tasks, configuringProject, targetDescription ) )\n        && call( LifecycleExecutionException.new( .., LifecycleException ) )\n        && args( .., cause )\n    {\n        getReporter().reportErrorFormulatingBuildPlan( tasks, configuringProject, targetDescription, cause );\n    }\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"759c1789ee145488dc6f4eea791487e9e45ba778","subject":"call run replaced by execution run","message":"call run replaced by execution run","repos":"selig\/qea","old_file":"code\/qea\/src\/benchmark\/competition\/java\/jUnitRV_MMT\/monitoring\/JUnitRV_MMTThreeAspect.aj","new_file":"code\/qea\/src\/benchmark\/competition\/java\/jUnitRV_MMT\/monitoring\/JUnitRV_MMTThreeAspect.aj","new_contents":"package benchmark.competition.java.jUnitRV_MMT.monitoring;\r\n\r\nimport monitoring.impl.MonitorFactory;\r\nimport monitoring.intf.Monitor;\r\nimport properties.Property;\r\nimport properties.competition.JavaRV_mmt;\r\nimport structure.impl.other.Verdict;\r\nimport structure.intf.QEA;\r\nimport benchmark.competition.java.jUnitRV_MMT.ExampleLocking;\r\n\r\npublic aspect JUnitRV_MMTThreeAspect {\r\n\r\n\tprivate final Monitor monitor;\r\n\r\n\tprivate final int RUN = 1;\r\n\tprivate final int LOCK_TRUE = 2;\r\n\tprivate final int UNLOCK = 3;\r\n\tprivate final int ACTION = 4;\r\n\r\n\tpublic JUnitRV_MMTThreeAspect() {\r\n\t\tQEA qea = new JavaRV_mmt().make(Property.JAVARV_MMT_THREE);\r\n\t\tmonitor = MonitorFactory.create(qea);\r\n\t}\r\n\r\n\tpointcut run(ExampleLocking t) : execution(void ExampleLocking.run())\r\n\t\t&& target(t);\r\n\r\n\tpointcut lockEvent(ExampleLocking t) : call(boolean ExampleLocking.lock())\r\n\t\t&& target(t);\r\n\r\n\tpointcut unlockEvent(ExampleLocking t) :\r\n\t\tcall(void ExampleLocking.unlock()) && target(t);\r\n\r\n\tpointcut action(ExampleLocking t) : call(void ExampleLocking.action())\r\n\t\t&& target(t);\r\n\r\n\tbefore(ExampleLocking t) : run(t) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(RUN, t.getId());\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [id=\"\r\n\t\t\t\t\t\t\t+ t.getId()\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n\tafter(ExampleLocking t) returning(boolean result) : lockEvent(t) {\r\n\t\tif (result) {\r\n\t\t\tVerdict verdict = null;\r\n\t\t\tsynchronized (monitor) {\r\n\t\t\t\tverdict = monitor.step(LOCK_TRUE, t.getId());\r\n\t\t\t}\r\n\t\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\t\tSystem.err\r\n\t\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [id=\"\r\n\t\t\t\t\t\t\t\t+ t.getId()\r\n\t\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t\t}\r\n\t\t}\r\n\t};\r\n\r\n\tbefore(ExampleLocking t) : unlockEvent(t) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(UNLOCK, t.getId());\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [id=\"\r\n\t\t\t\t\t\t\t+ t.getId()\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n\tbefore(ExampleLocking t) : action(t) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(ACTION, t.getId());\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [id=\"\r\n\t\t\t\t\t\t\t+ t.getId()\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n}\r\n","old_contents":"package benchmark.competition.java.jUnitRV_MMT.monitoring;\r\n\r\nimport monitoring.impl.MonitorFactory;\r\nimport monitoring.intf.Monitor;\r\nimport properties.Property;\r\nimport properties.competition.JavaRV_mmt;\r\nimport structure.impl.other.Verdict;\r\nimport structure.intf.QEA;\r\nimport benchmark.competition.java.jUnitRV_MMT.ExampleLocking;\r\n\r\npublic aspect JUnitRV_MMTThreeAspect {\r\n\r\n\tprivate final Monitor monitor;\r\n\r\n\tprivate final int RUN = 1;\r\n\tprivate final int LOCK_TRUE = 2;\r\n\tprivate final int UNLOCK = 3;\r\n\tprivate final int ACTION = 4;\r\n\r\n\tpublic JUnitRV_MMTThreeAspect() {\r\n\t\tQEA qea = new JavaRV_mmt().make(Property.JAVARV_MMT_THREE);\r\n\t\tmonitor = MonitorFactory.create(qea);\r\n\t}\r\n\r\n\tpointcut run(ExampleLocking t) : call(void *.run())\r\n\t\t&& target(t);\r\n\r\n\tpointcut lockEvent(ExampleLocking t) : call(boolean ExampleLocking.lock())\r\n\t\t&& target(t);\r\n\r\n\tpointcut unlockEvent(ExampleLocking t) :\r\n\t\tcall(void ExampleLocking.unlock()) && target(t);\r\n\r\n\tpointcut action(ExampleLocking t) : call(void ExampleLocking.action())\r\n\t\t&& target(t);\r\n\r\n\tbefore(ExampleLocking t) : run(t) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(RUN, t.getId());\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [id=\"\r\n\t\t\t\t\t\t\t+ t.getId()\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n\tafter(ExampleLocking t) returning(boolean result) : lockEvent(t) {\r\n\t\tif (result) {\r\n\t\t\tVerdict verdict = null;\r\n\t\t\tsynchronized (monitor) {\r\n\t\t\t\tverdict = monitor.step(LOCK_TRUE, t.getId());\r\n\t\t\t}\r\n\t\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\t\tSystem.err\r\n\t\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [id=\"\r\n\t\t\t\t\t\t\t\t+ t.getId()\r\n\t\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t\t}\r\n\t\t}\r\n\t};\r\n\r\n\tbefore(ExampleLocking t) : unlockEvent(t) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(UNLOCK, t.getId());\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [id=\"\r\n\t\t\t\t\t\t\t+ t.getId()\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n\tbefore(ExampleLocking t) : action(t) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(ACTION, t.getId());\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [id=\"\r\n\t\t\t\t\t\t\t+ t.getId()\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n}\r\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"82562a03f459878dc1f0bf2e6d6c4d68c4632941","subject":"Fixed crash if location comes back as null","message":"Fixed crash if location comes back as null\n","repos":"mttkay\/ignition,hongnguyenpro\/ignition,treejames\/ignition,beni55\/ignition,Applied-Duality\/ignition","old_file":"ignition-location\/ignition-location-lib\/src\/com\/github\/ignition\/location\/IgnitedLocationManager.aj","new_file":"ignition-location\/ignition-location-lib\/src\/com\/github\/ignition\/location\/IgnitedLocationManager.aj","new_contents":"\/*\n * Copyright 2011 Google Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * This code has been modified by Stefano Dacchille.\n *\/\n\npackage com.github.ignition.location;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\n\nimport android.app.Activity;\nimport android.app.PendingIntent;\nimport android.content.BroadcastReceiver;\nimport android.content.Context;\nimport android.content.Intent;\nimport android.content.IntentFilter;\nimport android.content.SharedPreferences;\nimport android.content.SharedPreferences.Editor;\nimport android.location.Criteria;\nimport android.location.Location;\nimport android.location.LocationListener;\nimport android.location.LocationManager;\nimport android.os.AsyncTask;\nimport android.os.BatteryManager;\nimport android.os.Bundle;\nimport android.os.Handler;\nimport android.util.Log;\n\nimport com.github.ignition.location.annotations.IgnitedLocation;\nimport com.github.ignition.location.annotations.IgnitedLocationActivity;\nimport com.github.ignition.location.receivers.IgnitedLocationChangedReceiver;\nimport com.github.ignition.location.receivers.IgnitedPassiveLocationChangedReceiver;\nimport com.github.ignition.location.tasks.IgnitedLastKnownLocationAsyncTask;\nimport com.github.ignition.location.templates.ILastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLocationUpdateRequester;\nimport com.github.ignition.location.templates.OnIgnitedLocationChangedListener;\nimport com.github.ignition.location.utils.PlatformSpecificImplementationFactory;\nimport com.github.ignition.support.IgnitedDiagnostics;\n\n@SuppressAjWarnings\npublic aspect IgnitedLocationManager {\n    public static final String LOG_TAG = IgnitedLocationManager.class.getSimpleName();\n\n    declare parents : (@IgnitedLocationActivity *) implements OnIgnitedLocationChangedListener;\n\n    private Criteria defaultCriteria, lowPowerCriteria;\n    protected IgnitedAbstractLocationUpdateRequester locationUpdateRequester;\n    protected PendingIntent locationListenerPendingIntent, locationListenerPassivePendingIntent;\n    protected LocationManager locationManager;\n    protected IgnitedLocationListener bestInactiveLocationProviderListener;\n\n    private Context context;\n    private volatile Location currentLocation;\n\n    private AsyncTask<Void, Void, Location> ignitedLastKnownLocationTask;\n    private SharedPreferences prefs;\n    private Handler handler;\n\n    private long locationUpdatesInterval, passiveLocationUpdatesInterval;\n    private int locationUpdatesDistanceDiff;\n    private int passiveLocationUpdatesDistanceDiff;\n    private boolean requestLocationUpdates;\n    private boolean locationUpdatesDisabled = true;\n    \n    \/\/ Switch to another provider if gps doesn't return a location quickly enough.\n    private Runnable removeGpsUpdates = new Runnable() {\n        @Override\n        public void run() {\n            Log.d(LOG_TAG,\n                    \"It looks like GPS isn't available at this time (i.e.: maybe you're indoors). Removing GPS location updates and requesting network updates.\");\n\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, lowPowerCriteria());\n        }\n    };\n\n    \/**\n     * If the Location Provider we're using to receive location updates is disabled while the app is\n     * running, this Receiver will be notified, allowing us to re-register our Location Receivers\n     * using the best available Location Provider is still available.\n     *\/\n    protected BroadcastReceiver locationProviderDisabledReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            boolean providerDisabled = !intent.getBooleanExtra(\n                    LocationManager.KEY_PROVIDER_ENABLED, false);\n            \/\/ Re-register the location listeners using the best available\n            \/\/ Location Provider.\n            if (providerDisabled) {\n                disableLocationUpdates(false);\n                requestLocationUpdates(context, null);\n            }\n        }\n    };\n\n    \/**\n     * If the battery state is low disable the passive location update receiver.\n     *\/\n    protected BroadcastReceiver refreshLocationUpdatesReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, null);\n        }\n    };\n\n    after(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onCreate(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n\n        \/\/ Get a reference to the Context\n        this.context = context;\n        \/\/ Set pref file\n        prefs = context.getSharedPreferences(IgnitedLocationConstants.SHARED_PREFERENCE_FILE,\n                Context.MODE_PRIVATE);\n        \/\/ Get references to the managers\n        locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);\n        handler = new Handler();\n\n        \/\/ Specify the Criteria to use when requesting location updates while\n        \/\/ the application is Active\n        if (defaultCriteria == null) {\n            defaultCriteria = new Criteria();\n        }\n        \/\/ Use gps if it's enabled and if battery level is at least 15%\n        boolean useGps = prefs.getBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS,\n                IgnitedLocationConstants.USE_GPS_DEFAULT);\n        if (useGps) {\n            defaultCriteria.setAccuracy(Criteria.ACCURACY_FINE);\n        } else {\n            defaultCriteria.setPowerRequirement(Criteria.POWER_LOW);\n        }\n\n        \/\/ Setup the location update Pending Intent\n        Intent activeIntent = new Intent(IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_ACTION);\n        locationListenerPendingIntent = PendingIntent.getBroadcast(context, 0, activeIntent,\n                PendingIntent.FLAG_UPDATE_CURRENT);\n        \/\/ Setup the passive location update Pending Intent\n        Intent passiveIntent = new Intent(context, IgnitedPassiveLocationChangedReceiver.class);\n        locationListenerPassivePendingIntent = PendingIntent.getBroadcast(context, 0,\n                passiveIntent, PendingIntent.FLAG_UPDATE_CURRENT);\n\n        \/\/ Instantiate a Location Update Requester class based on the available\n        \/\/ platform version. This will be used to request location updates.\n        locationUpdateRequester = PlatformSpecificImplementationFactory\n                .getLocationUpdateRequester(context);\n    }\n\n    private boolean isBatteryOk() {\n        IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);\n        Intent intent = context.registerReceiver(null, filter);\n        double currentLevel = 100.0;\n        if (intent != null) {\n            currentLevel = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1);\n        }\n\n        return currentLevel >= prefs.getInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                IgnitedLocationConstants.MIN_BATTERY_LEVEL_FOR_GPS_DEFAULT);\n    }\n\n    before(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onResume(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n        \/\/ Get a reference to the Context if this context is null\n        if (this.context == null) {\n            this.context = context;\n        }\n\n        saveToPreferences(context, ignitedAnnotation);\n\n        Log.d(LOG_TAG, \"Retrieving last known location...\");\n        \/\/ Get the last known location. This isn't directly affecting the UI, so put it on a\n        \/\/ worker thread.\n        ignitedLastKnownLocationTask = new IgnitedLastKnownLocationAsyncTask(\n                context, locationUpdatesDistanceDiff, locationUpdatesInterval);\n        ignitedLastKnownLocationTask.execute();\n    }\n\n    \/**\n     * Save last settings to preferences.\n     * \n     * @param context\n     * @param locationAnnotation\n     *\/\n    private void saveToPreferences(Context context, IgnitedLocationActivity locationAnnotation) {\n        requestLocationUpdates = locationAnnotation.requestLocationUpdates();\n        locationUpdatesDistanceDiff = locationAnnotation.locationUpdatesDistanceDiff();\n        locationUpdatesInterval = locationAnnotation.locationUpdatesInterval();\n        passiveLocationUpdatesDistanceDiff = locationAnnotation\n                .passiveLocationUpdatesDistanceDiff();\n        passiveLocationUpdatesInterval = locationAnnotation.passiveLocationUpdatesInterval();\n        boolean enablePassiveLocationUpdates = locationAnnotation.enablePassiveUpdates();\n        boolean useGps = locationAnnotation.useGps();\n\n        Editor editor = prefs.edit();\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_LOCATION_UPDATES,\n                requestLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                enablePassiveLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS, useGps);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_DISTANCE_DIFF,\n                locationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_INTERVAL,\n                locationUpdatesInterval);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_DISTANCE_DIFF,\n                passiveLocationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_INTERVAL,\n                passiveLocationUpdatesInterval);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_RUN_ONCE, true);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                locationAnnotation.minBatteryLevelForGps());\n        editor.putLong(IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                locationAnnotation.waitForGpsFixInterval());\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                locationAnnotation.showWaitForLocationDialog());\n        editor.commit();\n\n    }\n\n    before(Activity activity, IgnitedLocationActivity ignitedAnnotation) : execution(* Activity.onPause(..)) \n        && @this(ignitedAnnotation) && this(activity)\n        && within(@IgnitedLocationActivity *) && if (ignitedAnnotation.requestLocationUpdates()) {\n\n        disableLocationUpdates(true);\n\n        handler.removeCallbacks(removeGpsUpdates);\n\n        boolean finishing = activity.isFinishing();\n        if (finishing) {\n            if (ignitedLastKnownLocationTask != null && ignitedLastKnownLocationTask.getStatus() != AsyncTask.Status.FINISHED) {\n                ignitedLastKnownLocationTask.cancel(true);\n            } else {\n                PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            }\n\n            context = null;\n        }\n    }\n\n    \/\/ after() : execution(* Activity.onDestroy(..)) && @this(IgnitedLocationActivity)\n    \/\/ && within(@IgnitedLocationActivity *) {\n    \/\/ }\n\n    Location around() : get(@IgnitedLocation Location *) {\n        return currentLocation;\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && within(IgnitedPassiveLocationChangedReceiver) && !adviceexecution() {\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, lng\/acc): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude() + \"\/\" + currentLocation.getAccuracy());\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && (within(IgnitedLocationChangedReceiver) || within(IgnitedAbstractLastLocationFinder)\n                || within(IgnitedLastKnownLocationAsyncTask)) && !adviceexecution() {\n\n        if (context == null) {\n            return;\n        }\n        final Activity activity = (Activity) context;\n        boolean showWaitForLocationDialog = prefs.getBoolean(\n                IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                IgnitedLocationConstants.SHOW_WAIT_FOR_LOCATION_DIALOG_DEFAULT);\n        if (freshLocation == null) {\n            if (showWaitForLocationDialog) {\n                activity.showDialog(R.id.ign_loc_dialog_wait_for_fix);\n            }\n            return;\n        }\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, lng\/acc): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude() + \"\/\" + currentLocation.getAccuracy());\n        boolean keepRequestingLocationUpdates = ((OnIgnitedLocationChangedListener) context)\n                .onIgnitedLocationChanged(currentLocation);\n        Bundle extras = freshLocation.getExtras();\n        \/\/ a) If location updates shouldn't be requested anymore turn them off.\n        \/\/ b) Don't turn location updates on if last location is too old, since the single location\n        \/\/ update is running.\n        if (!keepRequestingLocationUpdates) {\n            disableLocationUpdates(true);\n            \/\/ PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            return;\n        } else if (requestLocationUpdates\n                && !extras.containsKey(ILastLocationFinder.LAST_LOCATION_TOO_OLD_OR_INACCURATE_EXTRA)) {\n            \/\/ If we requested location updates, turn them on here.\n            requestLocationUpdates(context, null);\n        }\n\n        \/\/ If gps is enabled location comes from gps, remove runnable that removes gps updates\n        boolean lastLocation = extras.containsKey(IgnitedLocationConstants.IGNITED_LAST_LOCATION_EXTRA);\n        if (!lastLocation && defaultCriteria.getAccuracy() == Criteria.ACCURACY_FINE\n                && currentLocation.getProvider().equals(LocationManager.GPS_PROVIDER)) {\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n    }\n\n    \/**\n     * Start listening for location updates.\n     *\/\n    protected void requestLocationUpdates(Context context, Criteria criteria) {\n        if (!locationUpdatesDisabled) {\n            return;\n        }\n        Criteria locationUpdateCriteria = criteria;\n        if (criteria == null) {\n            if (isBatteryOk()) {\n                locationUpdateCriteria = defaultCriteria;\n            } else {\n                locationUpdateCriteria = lowPowerCriteria();\n            }\n        }\n        Log.d(LOG_TAG, \"Disabling passive location updates\");\n        locationManager.removeUpdates(locationListenerPassivePendingIntent);\n\n        Log.d(LOG_TAG, \"Requesting location updates\");\n        \/\/ Normal updates while activity is visible.\n        locationUpdateRequester.requestLocationUpdates(locationUpdatesInterval,\n                locationUpdatesDistanceDiff, locationUpdateCriteria, locationListenerPendingIntent);\n\n        \/\/ Register a receiver that listens for when the provider I'm using has\n        \/\/ been disabled.\n        IntentFilter locationProviderDisabledIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_PROVIDER_DISABLED_ACTION);\n        context.registerReceiver(locationProviderDisabledReceiver,\n                locationProviderDisabledIntentFilter);\n\n        IntentFilter refreshLocationUpdatesIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.UPDATE_LOCATION_UPDATES_CRITERIA_ACTION);\n        context.registerReceiver(refreshLocationUpdatesReceiver, refreshLocationUpdatesIntentFilter);\n\n        \/\/ Register a receiver that listens for when a better provider than I'm\n        \/\/ using becomes available.\n        String bestProvider = locationManager.getBestProvider(locationUpdateCriteria, false);\n        String bestAvailableProvider = locationManager.getBestProvider(locationUpdateCriteria, true);\n        if (bestProvider != null && !bestProvider.equals(bestAvailableProvider)) {\n            bestInactiveLocationProviderListener = new IgnitedLocationListener(context);\n            locationManager.requestLocationUpdates(bestProvider, 0, 0,\n                    bestInactiveLocationProviderListener, context.getMainLooper());\n        }\n\n        if (bestAvailableProvider.equals(LocationManager.GPS_PROVIDER)) {\n            Log.d(LOG_TAG, \"Posting delayed remove GPS updates message\");\n            \/\/ Post a runnable that will remove gps updates if no gps location is returned after 1\n            \/\/ minute in order to avoid draining the battery.\n            handler.postDelayed(removeGpsUpdates, prefs.getLong(\n                    IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                    IgnitedLocationConstants.WAIT_FOR_GPS_FIX_INTERVAL_DEFAULT));\n        }\n\n        locationUpdatesDisabled = false;\n    }\n\n    \/**\n     * Stop listening for location updates\n     * \n     * @param enablePassiveLocationUpdates\n     *\/\n    protected void disableLocationUpdates(boolean requestPassiveLocationUpdates) {\n        if (locationUpdatesDisabled) {\n            return;\n        }\n\n        Log.d(LOG_TAG, \"Disabling location updates\");\n        context.unregisterReceiver(locationProviderDisabledReceiver);\n        context.unregisterReceiver(refreshLocationUpdatesReceiver);\n\n        locationUpdateRequester.removeLocationUpdates();\n        if (bestInactiveLocationProviderListener != null) {\n            locationManager.removeUpdates(bestInactiveLocationProviderListener);\n        }\n\n        boolean finishing = ((Activity) context).isFinishing();\n\n        if (requestPassiveLocationUpdates && !finishing) {\n            requestPassiveLocationUpdates();\n        }\n\n        locationUpdatesDisabled = true;\n    }\n\n    private void requestPassiveLocationUpdates() {\n        if (IgnitedDiagnostics.SUPPORTS_FROYO\n                && prefs.getBoolean(\n                        IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                        IgnitedLocationConstants.ENABLE_PASSIVE_LOCATION_UPDATES_DEFAULT)) {\n            Log.d(LOG_TAG, \"Requesting passive location updates\");\n            \/\/ Passive location updates from 3rd party apps when the Activity isn't\n            \/\/ visible. Only for Android 2.2+.\n            locationUpdateRequester.requestPassiveLocationUpdates(passiveLocationUpdatesInterval,\n                    passiveLocationUpdatesDistanceDiff, locationListenerPassivePendingIntent);\n        }\n    }\n\n    public boolean isLocationUpdatesDisabled() {\n        return locationUpdatesDisabled;\n    }\n\n    public Criteria lowPowerCriteria() {\n        if (lowPowerCriteria == null) {\n            lowPowerCriteria = new Criteria();\n            lowPowerCriteria.setPowerRequirement(Criteria.POWER_LOW);\n            lowPowerCriteria.setAccuracy(Criteria.NO_REQUIREMENT);\n        }\n        return lowPowerCriteria;\n    }\n\n    \/**\n     * If the best Location Provider (usually GPS) is not available when we request location\n     * updates, this listener will be notified if \/ when it becomes available. It calls\n     * requestLocationUpdates to re-register the location listeners using the better Location\n     * Provider.\n     *\/\n    private class IgnitedLocationListener implements LocationListener {\n        private Context context;\n\n        public IgnitedLocationListener(Context appContext) {\n            this.context = appContext;\n        }\n\n        @Override\n        public void onLocationChanged(Location l) {\n        }\n\n        @Override\n        public void onProviderDisabled(String provider) {\n        }\n\n        @Override\n        public void onStatusChanged(String provider, int status, Bundle extras) {\n        }\n\n        @Override\n        public void onProviderEnabled(String provider) {\n            \/\/ Re-register the location listeners using the better Location\n            \/\/ Provider.\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, null);\n        }\n    }\n\n}\n","old_contents":"\/*\n * Copyright 2011 Google Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * This code has been modified by Stefano Dacchille.\n *\/\n\npackage com.github.ignition.location;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\n\nimport android.app.Activity;\nimport android.app.PendingIntent;\nimport android.content.BroadcastReceiver;\nimport android.content.Context;\nimport android.content.Intent;\nimport android.content.IntentFilter;\nimport android.content.SharedPreferences;\nimport android.content.SharedPreferences.Editor;\nimport android.location.Criteria;\nimport android.location.Location;\nimport android.location.LocationListener;\nimport android.location.LocationManager;\nimport android.os.AsyncTask;\nimport android.os.BatteryManager;\nimport android.os.Bundle;\nimport android.os.Handler;\nimport android.util.Log;\n\nimport com.github.ignition.location.annotations.IgnitedLocation;\nimport com.github.ignition.location.annotations.IgnitedLocationActivity;\nimport com.github.ignition.location.receivers.IgnitedLocationChangedReceiver;\nimport com.github.ignition.location.receivers.IgnitedPassiveLocationChangedReceiver;\nimport com.github.ignition.location.tasks.IgnitedLastKnownLocationAsyncTask;\nimport com.github.ignition.location.templates.ILastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLocationUpdateRequester;\nimport com.github.ignition.location.templates.OnIgnitedLocationChangedListener;\nimport com.github.ignition.location.utils.PlatformSpecificImplementationFactory;\nimport com.github.ignition.support.IgnitedDiagnostics;\n\n@SuppressAjWarnings\npublic aspect IgnitedLocationManager {\n    public static final String LOG_TAG = IgnitedLocationManager.class.getSimpleName();\n\n    declare parents : (@IgnitedLocationActivity *) implements OnIgnitedLocationChangedListener;\n\n    private Criteria defaultCriteria, lowPowerCriteria;\n    protected IgnitedAbstractLocationUpdateRequester locationUpdateRequester;\n    protected PendingIntent locationListenerPendingIntent, locationListenerPassivePendingIntent;\n    protected LocationManager locationManager;\n    protected IgnitedLocationListener bestInactiveLocationProviderListener;\n\n    private Context context;\n    private volatile Location currentLocation;\n\n    private AsyncTask<Void, Void, Location> ignitedLastKnownLocationTask;\n    private SharedPreferences prefs;\n    private Handler handler;\n\n    private long locationUpdatesInterval, passiveLocationUpdatesInterval;\n    private int locationUpdatesDistanceDiff;\n    private int passiveLocationUpdatesDistanceDiff;\n    private boolean requestLocationUpdates;\n    private boolean locationUpdatesDisabled = true;\n    \n    \/\/ Switch to another provider if gps doesn't return a location quickly enough.\n    private Runnable removeGpsUpdates = new Runnable() {\n        @Override\n        public void run() {\n            Log.d(LOG_TAG,\n                    \"It looks like GPS isn't available at this time (i.e.: maybe you're indoors). Removing GPS location updates and requesting network updates.\");\n\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, lowPowerCriteria());\n        }\n    };\n\n    \/**\n     * If the Location Provider we're using to receive location updates is disabled while the app is\n     * running, this Receiver will be notified, allowing us to re-register our Location Receivers\n     * using the best available Location Provider is still available.\n     *\/\n    protected BroadcastReceiver locationProviderDisabledReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            boolean providerDisabled = !intent.getBooleanExtra(\n                    LocationManager.KEY_PROVIDER_ENABLED, false);\n            \/\/ Re-register the location listeners using the best available\n            \/\/ Location Provider.\n            if (providerDisabled) {\n                disableLocationUpdates(false);\n                requestLocationUpdates(context, null);\n            }\n        }\n    };\n\n    \/**\n     * If the battery state is low disable the passive location update receiver.\n     *\/\n    protected BroadcastReceiver refreshLocationUpdatesReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, null);\n        }\n    };\n\n    after(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onCreate(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n\n        \/\/ Get a reference to the Context\n        this.context = context;\n        \/\/ Set pref file\n        prefs = context.getSharedPreferences(IgnitedLocationConstants.SHARED_PREFERENCE_FILE,\n                Context.MODE_PRIVATE);\n        \/\/ Get references to the managers\n        locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);\n        handler = new Handler();\n\n        \/\/ Specify the Criteria to use when requesting location updates while\n        \/\/ the application is Active\n        if (defaultCriteria == null) {\n            defaultCriteria = new Criteria();\n        }\n        \/\/ Use gps if it's enabled and if battery level is at least 15%\n        boolean useGps = prefs.getBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS,\n                IgnitedLocationConstants.USE_GPS_DEFAULT);\n        if (useGps) {\n            defaultCriteria.setAccuracy(Criteria.ACCURACY_FINE);\n        } else {\n            defaultCriteria.setPowerRequirement(Criteria.POWER_LOW);\n        }\n\n        \/\/ Setup the location update Pending Intent\n        Intent activeIntent = new Intent(IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_ACTION);\n        locationListenerPendingIntent = PendingIntent.getBroadcast(context, 0, activeIntent,\n                PendingIntent.FLAG_UPDATE_CURRENT);\n        \/\/ Setup the passive location update Pending Intent\n        Intent passiveIntent = new Intent(context, IgnitedPassiveLocationChangedReceiver.class);\n        locationListenerPassivePendingIntent = PendingIntent.getBroadcast(context, 0,\n                passiveIntent, PendingIntent.FLAG_UPDATE_CURRENT);\n\n        \/\/ Instantiate a Location Update Requester class based on the available\n        \/\/ platform version. This will be used to request location updates.\n        locationUpdateRequester = PlatformSpecificImplementationFactory\n                .getLocationUpdateRequester(context);\n    }\n\n    private boolean isBatteryOk() {\n        IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);\n        Intent intent = context.registerReceiver(null, filter);\n        double currentLevel = 100.0;\n        if (intent != null) {\n            currentLevel = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1);\n        }\n\n        return currentLevel >= prefs.getInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                IgnitedLocationConstants.MIN_BATTERY_LEVEL_FOR_GPS_DEFAULT);\n    }\n\n    before(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onResume(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n        \/\/ Get a reference to the Context if this context is null\n        if (this.context == null) {\n            this.context = context;\n        }\n\n        saveToPreferences(context, ignitedAnnotation);\n\n        Log.d(LOG_TAG, \"Retrieving last known location...\");\n        \/\/ Get the last known location. This isn't directly affecting the UI, so put it on a\n        \/\/ worker thread.\n        ignitedLastKnownLocationTask = new IgnitedLastKnownLocationAsyncTask(\n                context, locationUpdatesDistanceDiff, locationUpdatesInterval);\n        ignitedLastKnownLocationTask.execute();\n    }\n\n    \/**\n     * Save last settings to preferences.\n     * \n     * @param context\n     * @param locationAnnotation\n     *\/\n    private void saveToPreferences(Context context, IgnitedLocationActivity locationAnnotation) {\n        requestLocationUpdates = locationAnnotation.requestLocationUpdates();\n        locationUpdatesDistanceDiff = locationAnnotation.locationUpdatesDistanceDiff();\n        locationUpdatesInterval = locationAnnotation.locationUpdatesInterval();\n        passiveLocationUpdatesDistanceDiff = locationAnnotation\n                .passiveLocationUpdatesDistanceDiff();\n        passiveLocationUpdatesInterval = locationAnnotation.passiveLocationUpdatesInterval();\n        boolean enablePassiveLocationUpdates = locationAnnotation.enablePassiveUpdates();\n        boolean useGps = locationAnnotation.useGps();\n\n        Editor editor = prefs.edit();\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_LOCATION_UPDATES,\n                requestLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                enablePassiveLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS, useGps);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_DISTANCE_DIFF,\n                locationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_INTERVAL,\n                locationUpdatesInterval);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_DISTANCE_DIFF,\n                passiveLocationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_INTERVAL,\n                passiveLocationUpdatesInterval);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_RUN_ONCE, true);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                locationAnnotation.minBatteryLevelForGps());\n        editor.putLong(IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                locationAnnotation.waitForGpsFixInterval());\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                locationAnnotation.showWaitForLocationDialog());\n        editor.commit();\n\n    }\n\n    before(Activity activity, IgnitedLocationActivity ignitedAnnotation) : execution(* Activity.onPause(..)) \n        && @this(ignitedAnnotation) && this(activity)\n        && within(@IgnitedLocationActivity *) && if (ignitedAnnotation.requestLocationUpdates()) {\n\n        disableLocationUpdates(true);\n\n        handler.removeCallbacks(removeGpsUpdates);\n\n        boolean finishing = activity.isFinishing();\n        if (finishing) {\n            if (ignitedLastKnownLocationTask != null && ignitedLastKnownLocationTask.getStatus() != AsyncTask.Status.FINISHED) {\n                ignitedLastKnownLocationTask.cancel(true);\n            } else {\n                PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            }\n\n            context = null;\n        }\n    }\n\n    \/\/ after() : execution(* Activity.onDestroy(..)) && @this(IgnitedLocationActivity)\n    \/\/ && within(@IgnitedLocationActivity *) {\n    \/\/ }\n\n    Location around() : get(@IgnitedLocation Location *) {\n        return currentLocation;\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && within(IgnitedPassiveLocationChangedReceiver) && !adviceexecution() {\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, lng\/acc): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude() + \"\/\" + currentLocation.getAccuracy());\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && (within(IgnitedLocationChangedReceiver) || within(IgnitedAbstractLastLocationFinder)\n                || within(IgnitedLastKnownLocationAsyncTask)) && !adviceexecution() {\n\n        if (context == null) {\n            return;\n        }\n        final Activity activity = (Activity) context;\n        boolean showWaitForLocationDialog = prefs.getBoolean(\n                IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                IgnitedLocationConstants.SHOW_WAIT_FOR_LOCATION_DIALOG_DEFAULT);\n        if (freshLocation == null && showWaitForLocationDialog) {\n            activity.showDialog(R.id.ign_loc_dialog_wait_for_fix);\n            return;\n        }\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, lng\/acc): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude() + \"\/\" + currentLocation.getAccuracy());\n        boolean keepRequestingLocationUpdates = ((OnIgnitedLocationChangedListener) context)\n                .onIgnitedLocationChanged(currentLocation);\n        Bundle extras = freshLocation.getExtras();\n        \/\/ a) If location updates shouldn't be requested anymore turn them off.\n        \/\/ b) Don't turn location updates on if last location is too old, since the single location\n        \/\/ update is running.\n        if (!keepRequestingLocationUpdates) {\n            disableLocationUpdates(true);\n            \/\/ PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            return;\n        } else if (requestLocationUpdates\n                && !extras.containsKey(ILastLocationFinder.LAST_LOCATION_TOO_OLD_OR_INACCURATE_EXTRA)) {\n            \/\/ If we requested location updates, turn them on here.\n            requestLocationUpdates(context, null);\n        }\n\n        \/\/ If gps is enabled location comes from gps, remove runnable that removes gps updates\n        boolean lastLocation = extras.containsKey(IgnitedLocationConstants.IGNITED_LAST_LOCATION_EXTRA);\n        if (!lastLocation && defaultCriteria.getAccuracy() == Criteria.ACCURACY_FINE\n                && currentLocation.getProvider().equals(LocationManager.GPS_PROVIDER)) {\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n    }\n\n    \/**\n     * Start listening for location updates.\n     *\/\n    protected void requestLocationUpdates(Context context, Criteria criteria) {\n        if (!locationUpdatesDisabled) {\n            return;\n        }\n        Criteria locationUpdateCriteria = criteria;\n        if (criteria == null) {\n            if (isBatteryOk()) {\n                locationUpdateCriteria = defaultCriteria;\n            } else {\n                locationUpdateCriteria = lowPowerCriteria();\n            }\n        }\n        Log.d(LOG_TAG, \"Disabling passive location updates\");\n        locationManager.removeUpdates(locationListenerPassivePendingIntent);\n\n        Log.d(LOG_TAG, \"Requesting location updates\");\n        \/\/ Normal updates while activity is visible.\n        locationUpdateRequester.requestLocationUpdates(locationUpdatesInterval,\n                locationUpdatesDistanceDiff, locationUpdateCriteria, locationListenerPendingIntent);\n\n        \/\/ Register a receiver that listens for when the provider I'm using has\n        \/\/ been disabled.\n        IntentFilter locationProviderDisabledIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_PROVIDER_DISABLED_ACTION);\n        context.registerReceiver(locationProviderDisabledReceiver,\n                locationProviderDisabledIntentFilter);\n\n        IntentFilter refreshLocationUpdatesIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.UPDATE_LOCATION_UPDATES_CRITERIA_ACTION);\n        context.registerReceiver(refreshLocationUpdatesReceiver, refreshLocationUpdatesIntentFilter);\n\n        \/\/ Register a receiver that listens for when a better provider than I'm\n        \/\/ using becomes available.\n        String bestProvider = locationManager.getBestProvider(locationUpdateCriteria, false);\n        String bestAvailableProvider = locationManager.getBestProvider(locationUpdateCriteria, true);\n        if (bestProvider != null && !bestProvider.equals(bestAvailableProvider)) {\n            bestInactiveLocationProviderListener = new IgnitedLocationListener(context);\n            locationManager.requestLocationUpdates(bestProvider, 0, 0,\n                    bestInactiveLocationProviderListener, context.getMainLooper());\n        }\n\n        if (bestAvailableProvider.equals(LocationManager.GPS_PROVIDER)) {\n            Log.d(LOG_TAG, \"Posting delayed remove GPS updates message\");\n            \/\/ Post a runnable that will remove gps updates if no gps location is returned after 1\n            \/\/ minute in order to avoid draining the battery.\n            handler.postDelayed(removeGpsUpdates, prefs.getLong(\n                    IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                    IgnitedLocationConstants.WAIT_FOR_GPS_FIX_INTERVAL_DEFAULT));\n        }\n\n        locationUpdatesDisabled = false;\n    }\n\n    \/**\n     * Stop listening for location updates\n     * \n     * @param enablePassiveLocationUpdates\n     *\/\n    protected void disableLocationUpdates(boolean requestPassiveLocationUpdates) {\n        if (locationUpdatesDisabled) {\n            return;\n        }\n\n        Log.d(LOG_TAG, \"Disabling location updates\");\n        context.unregisterReceiver(locationProviderDisabledReceiver);\n        context.unregisterReceiver(refreshLocationUpdatesReceiver);\n\n        locationUpdateRequester.removeLocationUpdates();\n        if (bestInactiveLocationProviderListener != null) {\n            locationManager.removeUpdates(bestInactiveLocationProviderListener);\n        }\n\n        boolean finishing = ((Activity) context).isFinishing();\n\n        if (requestPassiveLocationUpdates && !finishing) {\n            requestPassiveLocationUpdates();\n        }\n\n        locationUpdatesDisabled = true;\n    }\n\n    private void requestPassiveLocationUpdates() {\n        if (IgnitedDiagnostics.SUPPORTS_FROYO\n                && prefs.getBoolean(\n                        IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                        IgnitedLocationConstants.ENABLE_PASSIVE_LOCATION_UPDATES_DEFAULT)) {\n            Log.d(LOG_TAG, \"Requesting passive location updates\");\n            \/\/ Passive location updates from 3rd party apps when the Activity isn't\n            \/\/ visible. Only for Android 2.2+.\n            locationUpdateRequester.requestPassiveLocationUpdates(passiveLocationUpdatesInterval,\n                    passiveLocationUpdatesDistanceDiff, locationListenerPassivePendingIntent);\n        }\n    }\n\n    public boolean isLocationUpdatesDisabled() {\n        return locationUpdatesDisabled;\n    }\n\n    public Criteria lowPowerCriteria() {\n        if (lowPowerCriteria == null) {\n            lowPowerCriteria = new Criteria();\n            lowPowerCriteria.setPowerRequirement(Criteria.POWER_LOW);\n            lowPowerCriteria.setAccuracy(Criteria.NO_REQUIREMENT);\n        }\n        return lowPowerCriteria;\n    }\n\n    \/**\n     * If the best Location Provider (usually GPS) is not available when we request location\n     * updates, this listener will be notified if \/ when it becomes available. It calls\n     * requestLocationUpdates to re-register the location listeners using the better Location\n     * Provider.\n     *\/\n    private class IgnitedLocationListener implements LocationListener {\n        private Context context;\n\n        public IgnitedLocationListener(Context appContext) {\n            this.context = appContext;\n        }\n\n        @Override\n        public void onLocationChanged(Location l) {\n        }\n\n        @Override\n        public void onProviderDisabled(String provider) {\n        }\n\n        @Override\n        public void onStatusChanged(String provider, int status, Bundle extras) {\n        }\n\n        @Override\n        public void onProviderEnabled(String provider) {\n            \/\/ Re-register the location listeners using the better Location\n            \/\/ Provider.\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, null);\n        }\n    }\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"3a21b5bc8b174466e3ed7b2151ba2cd553561b8a","subject":"[misc] Move deprecated methods to legacy","message":"[misc] Move deprecated methods to legacy\n","repos":"xwiki\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform,pbondoer\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform","old_file":"xwiki-platform-core\/xwiki-platform-legacy\/xwiki-platform-legacy-oldcore\/src\/main\/aspect\/compatibility\/com\/xpn\/xwiki\/doc\/XWikiDocumentCompatibilityAspect.aj","new_file":"xwiki-platform-core\/xwiki-platform-legacy\/xwiki-platform-legacy-oldcore\/src\/main\/aspect\/compatibility\/com\/xpn\/xwiki\/doc\/XWikiDocumentCompatibilityAspect.aj","new_contents":"\/*\n * See the NOTICE file distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This is free software; you can redistribute it and\/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF site: http:\/\/www.fsf.org.\n *\/\npackage com.xpn.xwiki.doc;\n\nimport java.io.ByteArrayOutputStream;\nimport java.io.IOException;\nimport java.io.OutputStream;\nimport java.util.ArrayList;\nimport java.util.Collections;\nimport java.util.LinkedHashMap;\nimport java.util.List;\nimport java.util.Map;\nimport java.util.Vector;\nimport java.util.regex.Matcher;\nimport java.util.regex.Pattern;\n\nimport org.dom4j.Document;\nimport org.dom4j.io.OutputFormat;\nimport org.xwiki.model.reference.DocumentReference;\nimport org.xwiki.rendering.block.Block;\nimport org.xwiki.rendering.block.HeaderBlock;\nimport org.xwiki.rendering.block.XDOM;\nimport org.xwiki.rendering.block.match.ClassBlockMatcher;\nimport org.xwiki.rendering.listener.HeaderLevel;\nimport org.xwiki.rendering.syntax.Syntax;\nimport org.xwiki.rendering.transformation.TransformationContext;\nimport org.xwiki.rendering.transformation.TransformationManager;\n\nimport com.xpn.xwiki.XWikiContext;\nimport com.xpn.xwiki.XWikiException;\nimport com.xpn.xwiki.api.DocumentSection;\nimport com.xpn.xwiki.internal.xml.XMLWriter;\nimport com.xpn.xwiki.objects.BaseObject;\nimport com.xpn.xwiki.objects.classes.BaseClass;\nimport com.xpn.xwiki.objects.classes.PropertyClass;\nimport com.xpn.xwiki.plugin.query.XWikiCriteria;\nimport com.xpn.xwiki.web.Utils;\n\n\/**\n * Add a backward compatibility layer to the {@link com.xpn.xwiki.doc.XWikiDocument} class.\n *\n * @version $Id$\n *\/\npublic aspect XWikiDocumentCompatibilityAspect\n{   \n    \/**\n     * @deprecated since 3.0M3 use {@code Syntax.XWIKI_1_0} instead\n     *\/\n    @Deprecated\n    public static final String XWikiDocument.XWIKI10_SYNTAXID = Syntax.XWIKI_1_0.toIdString();\n\n    \/**\n     * @deprecated since 3.0M3 use {@code Syntax.XWIKI_2_0} instead\n     *\/\n    @Deprecated\n    public static final String XWikiDocument.XWIKI20_SYNTAXID = Syntax.XWIKI_2_0.toIdString();\n\n    \/**\n     * @deprecated use setStringListValue or setDBStringListProperty\n     *\/\n    @Deprecated\n    public void XWikiDocument.setListValue(String className, String fieldName, List value)\n    {\n        BaseObject bobject = getObject(className);\n        if (bobject == null) {\n            bobject = new BaseObject();\n            addObject(className, bobject);\n        }\n        bobject.setName(getFullName());\n        bobject.setClassName(className);\n        bobject.setListValue(fieldName, value);\n        setContentDirty(true);\n    }\n    \n    \/**\n     * This method to split section according to title.\n     * \n     * @return the sections in the current document\n     * @throws XWikiException\n     * @deprecated use {@link #getSections()} instead, since 1.6M1\n     *\/\n    @Deprecated\n    public List<DocumentSection> XWikiDocument.getSplitSectionsAccordingToTitle() throws XWikiException\n    {\n        return getSections();\n    }\n    \n    \/**\n     * @deprecated use {@link #getUniqueLinkedPages(XWikiContext)}\n     *\/\n    @Deprecated\n    public List<String> XWikiDocument.getLinkedPages(XWikiContext context)\n    {\n        return new ArrayList<String>(getUniqueLinkedPages(context));\n    }\n    \n    \/**\n     * @deprecated use {@link #getUniqueWikiLinkedPages(XWikiContext)} instead\n     *\/\n    @Deprecated\n    public List<XWikiLink> XWikiDocument.getLinks(XWikiContext context) throws XWikiException\n    {\n        return getWikiLinkedPages(context);\n    }\n\n    \/**\n     * @deprecated use {@link #getUniqueWikiLinkedPages(XWikiContext)} instead\n     *\/\n    @Deprecated\n    public List<XWikiLink> XWikiDocument.getWikiLinkedPages(XWikiContext context) throws XWikiException\n    {\n        return new ArrayList<XWikiLink>(getUniqueWikiLinkedPages(context));\n    }\n    \n    \/**\n     * @deprecated use {@link #getBackLinkedPages(XWikiContext)} instead\n     *\/\n    @Deprecated\n    public List<String> XWikiDocument.getBacklinks(XWikiContext context) throws XWikiException\n    {\n        return getBackLinkedPages(context);\n    }\n    \n    \/**\n     * @param text the text to render\n     * @param context the XWiki Context object\n     * @return the given text rendered in the context of this document\n     * @deprecated since 1.6M1 use {@link #getRenderedContent(String, String, com.xpn.xwiki.XWikiContext)}\n     *\/\n    @Deprecated\n    public String XWikiDocument.getRenderedContent(String text, XWikiContext context)\n    {\n        return getRenderedContent(text, Syntax.XWIKI_1_0.toIdString(), context);\n    }\n\n    @Deprecated\n    public String XWikiDocument.displaySearch(PropertyClass pclass, String prefix, XWikiCriteria criteria, XWikiContext context)\n    {\n        return (pclass == null) ? \"\" : pclass.displaySearch(pclass.getName(), prefix, criteria, context);\n    }\n\n    \/**\n     * @param context the XWiki context used to get access to the com.xpn.xwiki.render.XWikiRenderingEngine object\n     * @return the document title. If a title has not been provided, look for a section title in the document's content\n     *         and if not found return the page name. The returned title is also interpreted which means it's allowed to\n     *         use Velocity, Groovy, etc syntax within a title.\n     * @deprecated use {@link #getRenderedTitle(Syntax, XWikiContext)} instead\n     *\/\n    @Deprecated\n    public String XWikiDocument.getDisplayTitle(XWikiContext context)\n    {\n        return getRenderedTitle(Syntax.XHTML_1_0, context);\n    }\n\n    \/**\n     * @deprecated since 2.2M1, use {@link #getXClass()} instead\n     *\/\n    @Deprecated\n    public BaseClass XWikiDocument.getxWikiClass()\n    {\n        return getXClass();\n    }\n\n    \/**\n     * @deprecated since 2.2M2 use {@link #addXObjectFromRequest(XWikiContext)}\n     *\/\n    @Deprecated\n    public BaseObject XWikiDocument.addObjectFromRequest(XWikiContext context) throws XWikiException\n    {\n        return addXObjectFromRequest(context);\n    }\n\n    \/**\n     * @deprecated since 2.2M2 use {@link #setXObjectsToRemove(List)} instead\n     *\/\n    @Deprecated\n    public void XWikiDocument.setObjectsToRemove(ArrayList<BaseObject> objectsToRemove)\n    {\n        setXObjectsToRemove(objectsToRemove);\n    }\n\n    \/**\n     * @deprecated since 2.2M1, use {@link #setXClass(BaseClass)} instead\n     *\/\n    @Deprecated\n    public void XWikiDocument.setxWikiClass(BaseClass xwikiClass)\n    {\n        setXClass(xwikiClass);\n    }\n\n    \/**\n     * @deprecated since 2.2M1 use {@link #getXObjects()} instead. Warning: if you used to modify the returned Map note\n     *             that since 2.2M1 this will no longer work and you'll need to call the setXObject methods instead (or\n     *             setxWikiObjects()). Obviously the best is to move to the new API.\n     *\/\n    @Deprecated\n    public Map<String, Vector<BaseObject>> XWikiDocument.getxWikiObjects()\n    {\n        \/\/ Use a liked hash map to ensure we keep the order stored from the internal objects map.\n        Map<String, Vector<BaseObject>> objects = new LinkedHashMap<String, Vector<BaseObject>>();\n\n        for (Map.Entry<DocumentReference, List<BaseObject>> entry : getXObjects().entrySet()) {\n            objects.put(this.compactWikiEntityReferenceSerializer.serialize(entry.getKey()), new Vector<BaseObject>(\n                entry.getValue()));\n        }\n\n        return objects;\n    }\n\n    \/**\n     * @deprecated since 2.2M1 use {@link #setXObjects(Map)} instead\n     *\/\n    @Deprecated\n    public void XWikiDocument.setxWikiObjects(Map<String, Vector<BaseObject>> objects)\n    {\n        \/\/ Use a liked hash map to ensure we keep the order stored from the internal objects map.\n        Map<DocumentReference, List<BaseObject>> newObjects = new LinkedHashMap<DocumentReference, List<BaseObject>>();\n\n        for (Map.Entry<String, Vector<BaseObject>> entry : objects.entrySet()) {\n            newObjects.put(resolveClassReference(entry.getKey()), new ArrayList<BaseObject>(entry.getValue()));\n        }\n\n        setXObjects(newObjects);\n    }\n\n    \/**\n     * @deprecated since 2.2M1 use {@link #getXClasses(XWikiContext)} instead\n     *\/\n    @Deprecated\n    public List<BaseClass> XWikiDocument.getxWikiClasses(XWikiContext context)\n    {\n        return getXClasses(context);\n    }\n\n    \/**\n     * @deprecated since 2.2M1 use {@link #setXObjects(DocumentReference, List)} instead\n     *\/\n    @Deprecated\n    public void XWikiDocument.setObjects(String className, Vector<BaseObject> objects)\n    {\n        setXObjects(resolveClassReference(className), new ArrayList<BaseObject>(objects));\n    }\n\n    \/**\n     * @deprecated since 3.2M3, use {@link #getRenderedTitle(Syntax, XWikiContext)} instead\n     *\/\n    @Deprecated\n    public String XWikiDocument.extractTitle()\n    {\n        String title = \"\";\n\n        try {\n            if (is10Syntax()) {\n                title = extractTitle10();\n            } else {\n                List<HeaderBlock> blocks =\n                    getXDOM().getBlocks(new ClassBlockMatcher(HeaderBlock.class), Block.Axes.DESCENDANT);\n                if (!blocks.isEmpty()) {\n                    HeaderBlock header = blocks.get(0);\n                    if (header.getLevel().compareTo(HeaderLevel.LEVEL2) <= 0) {\n                        XDOM headerXDOM = new XDOM(Collections.<Block> singletonList(header));\n\n                        \/\/ transform\n                        TransformationContext context = new TransformationContext(headerXDOM, getSyntax());\n                        Utils.getComponent(TransformationManager.class).performTransformations(headerXDOM, context);\n\n                        \/\/ render\n                        Block headerBlock = headerXDOM.getChildren().get(0);\n                        if (headerBlock instanceof HeaderBlock) {\n                            title = renderXDOM(new XDOM(headerBlock.getChildren()), Syntax.XHTML_1_0);\n                        }\n                    }\n                }\n            }\n        } catch (Exception e) {\n            \/\/ Don't stop when there's a problem rendering the title.\n        }\n\n        return title;\n    }\n\n    \/**\n     * Regex for finding the first level 1 or 2 heading in the document title, to be used as the document title.\n     * \n     * @deprecated since 3.2M3\n     **\/\n    @Deprecated\n    private static final Pattern HEADING_PATTERN_10 = Pattern.compile(\"^\\\\s*+1(?:\\\\.1)?\\\\s++(.++)$\", Pattern.MULTILINE);\n\n    \/**\n     * @return the first level 1 or level 1.1 title text in the document's content or \"\" if none are found\n     * @deprecated since 3.2M3\n     *\/\n    @Deprecated\n    private String XWikiDocument.extractTitle10()\n    {\n        String content = getContent();\n        Matcher m = HEADING_PATTERN_10.matcher(content);\n        if (m.find()) {\n            return m.group(1).trim();\n        }\n\n        return \"\";\n    }\n\n    \/**\n     * Convert a {@link Document} into an XML string. You should prefer\n     * {@link #toXML(OutputStream, boolean, boolean, boolean, boolean, XWikiContext)} or\n     * {@link #toXML(com.xpn.xwiki.internal.xml.XMLWriter, boolean, boolean, boolean, boolean, XWikiContext)} when\n     * possible to avoid memory load.\n     * \n     * @param doc the {@link Document} to convert to a String\n     * @param context current XWikiContext\n     * @return an XML representation of the {@link Document}\n     * @deprecated this method has nothing to do here and is apparently unused\n     *\/\n    @Deprecated\n    public String XWikiDocument.toXML(Document doc, XWikiContext context)\n    {\n        String encoding = context.getWiki().getEncoding();\n\n        ByteArrayOutputStream os = new ByteArrayOutputStream();\n        try {\n            XMLWriter wr = new XMLWriter(os, new OutputFormat(\"\", true, encoding));\n            wr.write(doc);\n            return os.toString(encoding);\n        } catch (IOException e) {\n            LOGGER.error(\"Exception while doc.toXML\", e);\n            return \"\";\n        }\n    }\n\n    \/**\n     * @deprecated since 2.2M1 use {@link #cloneXObjects(XWikiDocument)} instead\n     *\/\n    @Deprecated\n    public void XWikiDocument.clonexWikiObjects(XWikiDocument templatedoc)\n    {\n        cloneXObjects(templatedoc);\n    }\n    \n    \/**\n     * @deprecated since 5.2M1 use {@link #removeAttachment(XWikiAttachment)} instead\n     *\/\n    @Deprecated\n    public void XWikiDocument.deleteAttachment(XWikiAttachment attachment, XWikiContext context) throws XWikiException\n    {\n        deleteAttachment(attachment, true, context);\n    }\n\n    \/**\n     * @deprecated since 5.2M1 use {@link #removeAttachment(XWikiAttachment)} instead\n     *\/\n    @Deprecated\n    public void XWikiDocument.deleteAttachment(XWikiAttachment attachment, boolean toRecycleBin, XWikiContext context)\n        throws XWikiException\n    {\n        deleteAttachment(attachment, true, toRecycleBin, context);\n    }\n\n    \/**\n     * @deprecated since 5.2M1 use {@link #removeAttachment(XWikiAttachment)} instead\n     *\/\n    @Deprecated\n    private void XWikiDocument.deleteAttachment(XWikiAttachment attachment, boolean saveDocument, boolean toRecycleBin,\n        XWikiContext context) throws XWikiException\n    {\n        removeAttachment(attachment, toRecycleBin);\n\n        if (saveDocument) {\n            \/\/ Save the document\n            context.getWiki().saveDocument(this, \"Deleted attachment [\" + attachment.getFilename() + \"]\", context);\n        }\n    }\n}\n","old_contents":"\/*\n * See the NOTICE file distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This is free software; you can redistribute it and\/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF site: http:\/\/www.fsf.org.\n *\/\npackage com.xpn.xwiki.doc;\n\nimport java.io.ByteArrayOutputStream;\nimport java.io.IOException;\nimport java.io.OutputStream;\nimport java.util.ArrayList;\nimport java.util.Collections;\nimport java.util.LinkedHashMap;\nimport java.util.List;\nimport java.util.Map;\nimport java.util.Vector;\nimport java.util.regex.Matcher;\nimport java.util.regex.Pattern;\n\nimport org.dom4j.Document;\nimport org.dom4j.io.OutputFormat;\nimport org.xwiki.model.reference.DocumentReference;\nimport org.xwiki.rendering.block.Block;\nimport org.xwiki.rendering.block.HeaderBlock;\nimport org.xwiki.rendering.block.XDOM;\nimport org.xwiki.rendering.block.match.ClassBlockMatcher;\nimport org.xwiki.rendering.listener.HeaderLevel;\nimport org.xwiki.rendering.syntax.Syntax;\nimport org.xwiki.rendering.transformation.TransformationContext;\nimport org.xwiki.rendering.transformation.TransformationManager;\n\nimport com.xpn.xwiki.XWikiContext;\nimport com.xpn.xwiki.XWikiException;\nimport com.xpn.xwiki.api.DocumentSection;\nimport com.xpn.xwiki.internal.xml.XMLWriter;\nimport com.xpn.xwiki.objects.BaseObject;\nimport com.xpn.xwiki.objects.classes.BaseClass;\nimport com.xpn.xwiki.objects.classes.PropertyClass;\nimport com.xpn.xwiki.plugin.query.XWikiCriteria;\nimport com.xpn.xwiki.web.Utils;\n\n\/**\n * Add a backward compatibility layer to the {@link com.xpn.xwiki.doc.XWikiDocument} class.\n *\n * @version $Id$\n *\/\npublic aspect XWikiDocumentCompatibilityAspect\n{   \n    \/**\n     * @deprecated since 3.0M3 use {@code Syntax.XWIKI_1_0} instead\n     *\/\n    @Deprecated\n    public static final String XWikiDocument.XWIKI10_SYNTAXID = Syntax.XWIKI_1_0.toIdString();\n\n    \/**\n     * @deprecated since 3.0M3 use {@code Syntax.XWIKI_2_0} instead\n     *\/\n    @Deprecated\n    public static final String XWikiDocument.XWIKI20_SYNTAXID = Syntax.XWIKI_2_0.toIdString();\n\n    \/**\n     * @deprecated use setStringListValue or setDBStringListProperty\n     *\/\n    @Deprecated\n    public void XWikiDocument.setListValue(String className, String fieldName, List value)\n    {\n        BaseObject bobject = getObject(className);\n        if (bobject == null) {\n            bobject = new BaseObject();\n            addObject(className, bobject);\n        }\n        bobject.setName(getFullName());\n        bobject.setClassName(className);\n        bobject.setListValue(fieldName, value);\n        setContentDirty(true);\n    }\n    \n    \/**\n     * This method to split section according to title.\n     * \n     * @return the sections in the current document\n     * @throws XWikiException\n     * @deprecated use {@link #getSections()} instead, since 1.6M1\n     *\/\n    @Deprecated\n    public List<DocumentSection> XWikiDocument.getSplitSectionsAccordingToTitle() throws XWikiException\n    {\n        return getSections();\n    }\n    \n    \/**\n     * @deprecated use {@link #getUniqueLinkedPages(XWikiContext)}\n     *\/\n    @Deprecated\n    public List<String> XWikiDocument.getLinkedPages(XWikiContext context)\n    {\n        return new ArrayList<String>(getUniqueLinkedPages(context));\n    }\n    \n    \/**\n     * @deprecated use {@link #getUniqueWikiLinkedPages(XWikiContext)} instead\n     *\/\n    @Deprecated\n    public List<XWikiLink> XWikiDocument.getLinks(XWikiContext context) throws XWikiException\n    {\n        return getWikiLinkedPages(context);\n    }\n\n    \/**\n     * @deprecated use {@link #getUniqueWikiLinkedPages(XWikiContext)} instead\n     *\/\n    @Deprecated\n    public List<XWikiLink> XWikiDocument.getWikiLinkedPages(XWikiContext context) throws XWikiException\n    {\n        return new ArrayList<XWikiLink>(getUniqueWikiLinkedPages(context));\n    }\n    \n    \/**\n     * @deprecated use {@link #getBackLinkedPages(XWikiContext)} instead\n     *\/\n    @Deprecated\n    public List<String> XWikiDocument.getBacklinks(XWikiContext context) throws XWikiException\n    {\n        return getBackLinkedPages(context);\n    }\n    \n    \/**\n     * @param text the text to render\n     * @param context the XWiki Context object\n     * @return the given text rendered in the context of this document\n     * @deprecated since 1.6M1 use {@link #getRenderedContent(String, String, com.xpn.xwiki.XWikiContext)}\n     *\/\n    @Deprecated\n    public String XWikiDocument.getRenderedContent(String text, XWikiContext context)\n    {\n        return getRenderedContent(text, Syntax.XWIKI_1_0.toIdString(), context);\n    }\n\n    @Deprecated\n    public String XWikiDocument.displaySearch(PropertyClass pclass, String prefix, XWikiCriteria criteria, XWikiContext context)\n    {\n        return (pclass == null) ? \"\" : pclass.displaySearch(pclass.getName(), prefix, criteria, context);\n    }\n\n    \/**\n     * @param context the XWiki context used to get access to the com.xpn.xwiki.render.XWikiRenderingEngine object\n     * @return the document title. If a title has not been provided, look for a section title in the document's content\n     *         and if not found return the page name. The returned title is also interpreted which means it's allowed to\n     *         use Velocity, Groovy, etc syntax within a title.\n     * @deprecated use {@link #getRenderedTitle(Syntax, XWikiContext)} instead\n     *\/\n    @Deprecated\n    public String XWikiDocument.getDisplayTitle(XWikiContext context)\n    {\n        return getRenderedTitle(Syntax.XHTML_1_0, context);\n    }\n\n    \/**\n     * @deprecated since 2.2M1, use {@link #getXClass()} instead\n     *\/\n    @Deprecated\n    public BaseClass XWikiDocument.getxWikiClass()\n    {\n        return getXClass();\n    }\n\n    \/**\n     * @deprecated since 2.2M2 use {@link #addXObjectFromRequest(XWikiContext)}\n     *\/\n    @Deprecated\n    public BaseObject XWikiDocument.addObjectFromRequest(XWikiContext context) throws XWikiException\n    {\n        return addXObjectFromRequest(context);\n    }\n\n    \/**\n     * @deprecated since 2.2M2 use {@link #setXObjectsToRemove(List)} instead\n     *\/\n    @Deprecated\n    public void XWikiDocument.setObjectsToRemove(ArrayList<BaseObject> objectsToRemove)\n    {\n        setXObjectsToRemove(objectsToRemove);\n    }\n\n    \/**\n     * @deprecated since 2.2M1, use {@link #setXClass(BaseClass)} instead\n     *\/\n    @Deprecated\n    public void XWikiDocument.setxWikiClass(BaseClass xwikiClass)\n    {\n        setXClass(xwikiClass);\n    }\n\n    \/**\n     * @deprecated since 2.2M1 use {@link #getXObjects()} instead. Warning: if you used to modify the returned Map note\n     *             that since 2.2M1 this will no longer work and you'll need to call the setXObject methods instead (or\n     *             setxWikiObjects()). Obviously the best is to move to the new API.\n     *\/\n    @Deprecated\n    public Map<String, Vector<BaseObject>> XWikiDocument.getxWikiObjects()\n    {\n        \/\/ Use a liked hash map to ensure we keep the order stored from the internal objects map.\n        Map<String, Vector<BaseObject>> objects = new LinkedHashMap<String, Vector<BaseObject>>();\n\n        for (Map.Entry<DocumentReference, List<BaseObject>> entry : getXObjects().entrySet()) {\n            objects.put(this.compactWikiEntityReferenceSerializer.serialize(entry.getKey()), new Vector<BaseObject>(\n                entry.getValue()));\n        }\n\n        return objects;\n    }\n\n    \/**\n     * @deprecated since 2.2M1 use {@link #setXObjects(Map)} instead\n     *\/\n    @Deprecated\n    public void XWikiDocument.setxWikiObjects(Map<String, Vector<BaseObject>> objects)\n    {\n        \/\/ Use a liked hash map to ensure we keep the order stored from the internal objects map.\n        Map<DocumentReference, List<BaseObject>> newObjects = new LinkedHashMap<DocumentReference, List<BaseObject>>();\n\n        for (Map.Entry<String, Vector<BaseObject>> entry : objects.entrySet()) {\n            newObjects.put(resolveClassReference(entry.getKey()), new ArrayList<BaseObject>(entry.getValue()));\n        }\n\n        setXObjects(newObjects);\n    }\n\n    \/**\n     * @deprecated since 2.2M1 use {@link #getXClasses(XWikiContext)} instead\n     *\/\n    @Deprecated\n    public List<BaseClass> XWikiDocument.getxWikiClasses(XWikiContext context)\n    {\n        return getXClasses(context);\n    }\n\n    \/**\n     * @deprecated since 2.2M1 use {@link #setXObjects(DocumentReference, List)} instead\n     *\/\n    @Deprecated\n    public void XWikiDocument.setObjects(String className, Vector<BaseObject> objects)\n    {\n        setXObjects(resolveClassReference(className), new ArrayList<BaseObject>(objects));\n    }\n\n    \/**\n     * @deprecated since 3.2M3, use {@link #getRenderedTitle(Syntax, XWikiContext)} instead\n     *\/\n    @Deprecated\n    public String XWikiDocument.extractTitle()\n    {\n        String title = \"\";\n\n        try {\n            if (is10Syntax()) {\n                title = extractTitle10();\n            } else {\n                List<HeaderBlock> blocks =\n                    getXDOM().getBlocks(new ClassBlockMatcher(HeaderBlock.class), Block.Axes.DESCENDANT);\n                if (!blocks.isEmpty()) {\n                    HeaderBlock header = blocks.get(0);\n                    if (header.getLevel().compareTo(HeaderLevel.LEVEL2) <= 0) {\n                        XDOM headerXDOM = new XDOM(Collections.<Block> singletonList(header));\n\n                        \/\/ transform\n                        TransformationContext context = new TransformationContext(headerXDOM, getSyntax());\n                        Utils.getComponent(TransformationManager.class).performTransformations(headerXDOM, context);\n\n                        \/\/ render\n                        Block headerBlock = headerXDOM.getChildren().get(0);\n                        if (headerBlock instanceof HeaderBlock) {\n                            title = renderXDOM(new XDOM(headerBlock.getChildren()), Syntax.XHTML_1_0);\n                        }\n                    }\n                }\n            }\n        } catch (Exception e) {\n            \/\/ Don't stop when there's a problem rendering the title.\n        }\n\n        return title;\n    }\n\n    \/**\n     * Regex for finding the first level 1 or 2 heading in the document title, to be used as the document title.\n     * \n     * @deprecated since 3.2M3\n     **\/\n    @Deprecated\n    private static final Pattern HEADING_PATTERN_10 = Pattern.compile(\"^\\\\s*+1(?:\\\\.1)?\\\\s++(.++)$\", Pattern.MULTILINE);\n\n    \/**\n     * @return the first level 1 or level 1.1 title text in the document's content or \"\" if none are found\n     * @deprecated since 3.2M3\n     *\/\n    @Deprecated\n    private String XWikiDocument.extractTitle10()\n    {\n        String content = getContent();\n        Matcher m = HEADING_PATTERN_10.matcher(content);\n        if (m.find()) {\n            return m.group(1).trim();\n        }\n\n        return \"\";\n    }\n\n    \/**\n     * Convert a {@link Document} into an XML string. You should prefer\n     * {@link #toXML(OutputStream, boolean, boolean, boolean, boolean, XWikiContext)} or\n     * {@link #toXML(com.xpn.xwiki.internal.xml.XMLWriter, boolean, boolean, boolean, boolean, XWikiContext)} when\n     * possible to avoid memory load.\n     * \n     * @param doc the {@link Document} to convert to a String\n     * @param context current XWikiContext\n     * @return an XML representation of the {@link Document}\n     * @deprecated this method has nothing to do here and is apparently unused\n     *\/\n    @Deprecated\n    public String XWikiDocument.toXML(Document doc, XWikiContext context)\n    {\n        String encoding = context.getWiki().getEncoding();\n\n        ByteArrayOutputStream os = new ByteArrayOutputStream();\n        try {\n            XMLWriter wr = new XMLWriter(os, new OutputFormat(\"\", true, encoding));\n            wr.write(doc);\n            return os.toString(encoding);\n        } catch (IOException e) {\n            LOGGER.error(\"Exception while doc.toXML\", e);\n            return \"\";\n        }\n    }\n\n    \/**\n     * @deprecated since 2.2M1 use {@link #cloneXObjects(XWikiDocument)} instead\n     *\/\n    @Deprecated\n    public void XWikiDocument.clonexWikiObjects(XWikiDocument templatedoc)\n    {\n        cloneXObjects(templatedoc);\n    }\n}\n","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"8075165d2efa0fdb46b648c2ecbafb0430f885ab","subject":"removed unused import","message":"removed unused import\n","repos":"kjozsa\/org.ctbs.injector","old_file":"src\/main\/java\/org\/ctbs\/injector\/Injector.aj","new_file":"src\/main\/java\/org\/ctbs\/injector\/Injector.aj","new_contents":"\/**\n * \n *\/\npackage org.ctbs.injector;\n\nimport java.lang.annotation.Documented;\nimport java.lang.annotation.ElementType;\nimport java.lang.annotation.Retention;\nimport java.lang.annotation.RetentionPolicy;\nimport java.lang.annotation.Target;\nimport java.lang.reflect.Field;\nimport java.util.Map;\nimport java.util.concurrent.ConcurrentHashMap;\n\nimport org.aspectj.lang.reflect.FieldSignature;\n\n\n\/**\n * primitive dependency injection mechanism for trivial use cases\n * \n * @author kjozsa\n *\/\npublic aspect Injector {\n\tprivate Map<Class<?>, Object> instances = new ConcurrentHashMap<Class<?>, Object>();\n\n\t\/**\n\t * attach this to fields to get a @Managed type injected\n\t *\/\n\t@Documented\n\t@Target(ElementType.FIELD)\n\t@Retention(RetentionPolicy.RUNTIME)\n\tpublic static @interface Injected {\n\t}\n\n\t\/**\n\t * attach this to a class to get it injectable\n\t *\/\n\t@Documented\n\t@Target(ElementType.TYPE)\n\t@Retention(RetentionPolicy.RUNTIME)\n\tpublic static @interface Managed {\n\t}\n\n\tdeclare error : call((@Managed *).new(..)) : \"do not instantiate a @Managed bean directly\";\n\tdeclare error : get(@Injected (!@Managed *) *) : \"you can only inject @Managed beans\";\n\n\tpointcut get_injected() :\n\t\tget(@Injected (@Managed *) *);\n\n\n\tObject around() : get_injected() {\n\t\t\/\/ return local field cache if any\n\t\tObject result = proceed();\n\t\tif (result != null) {\n\t\t\treturn result;\n\t\t}\n\t\t\n\t\t\/\/ get cached value for field type\n\t\tFieldSignature fieldSignature = (FieldSignature) thisJoinPoint.getSignature();\n\t\tClass<?> clazz = fieldSignature.getFieldType();\n\t\tresult = instances.get(clazz);\n\n\t\t\/\/ create cached value\n\t\tif (result == null) {\n\t\t\tresult = register(clazz);\n\t\t}\n\n\t\t\/\/ write target object field value for local caching\n\t\tif (fieldSignature.getField().isAccessible()) {\n\t\t\twriteField(fieldSignature.getField(), thisJoinPoint.getTarget(), result);\n\t\t}\n\t\treturn result;\n\t}\n\n\t\/**\n\t * @param field to set\n\t * @param target can be null for static fields\n\t * @param value to set\n\t *\/\n\tprivate void writeField(Field field, Object target, Object value) {\n\t\ttry {\n\t\t\tfield.set(target, value);\t\n\t\t} catch (Exception e) {\n\t\t\tthrow new RuntimeException(\"failed to set field value\", e);\n\t\t}\n\t}\n\t\n\tprivate Object register(Class<?> clazz) {\n\t\ttry {\n\t\t\tObject result = clazz.newInstance();\n\t\t\tinstances.put(clazz, result);\n\t\t\treturn result;\n\t\t} catch (Exception e) {\n\t\t\tthrow new RuntimeException(e);\n\t\t}\n\t}\n}\n","old_contents":"\/**\n * \n *\/\npackage org.ctbs.injector;\n\nimport java.lang.annotation.Documented;\nimport java.lang.annotation.ElementType;\nimport java.lang.annotation.Retention;\nimport java.lang.annotation.RetentionPolicy;\nimport java.lang.annotation.Target;\nimport java.lang.reflect.Field;\nimport java.util.Map;\nimport java.util.concurrent.ConcurrentHashMap;\n\nimport org.aspectj.ajdt.internal.compiler.ast.Proceed;\nimport org.aspectj.lang.reflect.FieldSignature;\n\n\n\/**\n * primitive dependency injection mechanism for trivial use cases\n * \n * @author kjozsa\n *\/\npublic aspect Injector {\n\tprivate Map<Class<?>, Object> instances = new ConcurrentHashMap<Class<?>, Object>();\n\n\t\/**\n\t * attach this to fields to get a @Managed type injected\n\t *\/\n\t@Documented\n\t@Target(ElementType.FIELD)\n\t@Retention(RetentionPolicy.RUNTIME)\n\tpublic static @interface Injected {\n\t}\n\n\t\/**\n\t * attach this to a class to get it injectable\n\t *\/\n\t@Documented\n\t@Target(ElementType.TYPE)\n\t@Retention(RetentionPolicy.RUNTIME)\n\tpublic static @interface Managed {\n\t}\n\n\tdeclare error : call((@Managed *).new(..)) : \"do not instantiate a @Managed bean directly\";\n\tdeclare error : get(@Injected (!@Managed *) *) : \"you can only inject @Managed beans\";\n\n\tpointcut get_injected() :\n\t\tget(@Injected (@Managed *) *);\n\n\n\tObject around() : get_injected() {\n\t\t\/\/ return local field cache if any\n\t\tObject result = proceed();\n\t\tif (result != null) {\n\t\t\treturn result;\n\t\t}\n\t\t\n\t\t\/\/ get cached value for field type\n\t\tFieldSignature fieldSignature = (FieldSignature) thisJoinPoint.getSignature();\n\t\tClass<?> clazz = fieldSignature.getFieldType();\n\t\tresult = instances.get(clazz);\n\n\t\t\/\/ create cached value\n\t\tif (result == null) {\n\t\t\tresult = register(clazz);\n\t\t}\n\n\t\t\/\/ write target object field value for local caching\n\t\tif (fieldSignature.getField().isAccessible()) {\n\t\t\twriteField(fieldSignature.getField(), thisJoinPoint.getTarget(), result);\n\t\t}\n\t\treturn result;\n\t}\n\n\t\/**\n\t * @param field to set\n\t * @param target can be null for static fields\n\t * @param value to set\n\t *\/\n\tprivate void writeField(Field field, Object target, Object value) {\n\t\ttry {\n\t\t\tfield.set(target, value);\t\n\t\t} catch (Exception e) {\n\t\t\tthrow new RuntimeException(\"failed to set field value\", e);\n\t\t}\n\t}\n\t\n\tprivate Object register(Class<?> clazz) {\n\t\ttry {\n\t\t\tObject result = clazz.newInstance();\n\t\t\tinstances.put(clazz, result);\n\t\t\treturn result;\n\t\t} catch (Exception e) {\n\t\t\tthrow new RuntimeException(e);\n\t\t}\n\t}\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"e93c7373249f3e3b1755f7fe4290cb9c8a137dc8","subject":"feature - changed aspect to privileged one.","message":"feature - changed aspect to privileged one.","repos":"appbakers\/automon_example,stevensouza\/automon,appbakers\/automon_example,appbakers\/automon_example,appbakers\/automon_example","old_file":"automon\/src\/main\/java\/org\/automon\/aspects\/AutomonAspect.aj","new_file":"automon\/src\/main\/java\/org\/automon\/aspects\/AutomonAspect.aj","new_contents":"package org.automon.aspects;\n\nimport org.automon.implementations.NullImp;\nimport org.automon.implementations.OpenMon;\nimport org.automon.implementations.OpenMonFactory;\nimport org.automon.utils.AutomonPropertiesLoader;\nimport org.automon.utils.Utils;\n\nimport java.util.Properties;\n\n\n\n\/**\n * <p>Aspect that advises the {@link org.aspectj.lang.annotation.Around} and {@link org.aspectj.lang.annotation.AfterThrowing} annotations.\n * The appropriate methods on {@link org.automon.implementations.OpenMon} methods are called. The advice typically times methods\n * and counts any exceptions  thrown, however other behavior such as logging is also possible.<\/p>\n *\n * <p>Note a developer should implement and provide any methods for this class or {@link org.automon.aspects.AspectJBase} or\n * {@link org.automon.aspects.SpringBase}.<\/p>\n *\n * <p>Note: I used native aspect style instead of the @AspectJ style because @Around in @AspectJ style doesn't seem to allow for the\n * more performant use of the static part of the JoinPoint. The static part only seems to be available without first\n * creating the dynamic JoinPoint in native aspects. Native style aspects are more powerful and can later be extended by developers\n * with @AspectJ style, so it is probably the best option anyway.  <\/p>\n *\/\nprivileged public abstract aspect AutomonAspect {\n    private OpenMonFactory factory = new OpenMonFactory(new NullImp());\n    private OpenMon openMon = new NullImp();\n    private AutomonMXBean automonJmx = new Automon(this);\n\n    public AutomonAspect() {\n        \/\/ Use OpenMon the user selects and register the aspect with jmx\n        initOpenMon();\n        Utils.registerWithJmx(this, automonJmx);\n    }\n\n    private void initOpenMon() {\n        Properties properties = new AutomonPropertiesLoader().getProperties();\n        String openMonStr = properties.getProperty(AutomonPropertiesLoader.CONFIGURED_OPEN_MON);\n        \/\/ if the openMonString is a fully qualified classname then also register it in the factory i.e. com.mygreatcompany.MyOpenMon\n        if (Utils.hasPackageName(openMonStr)) {\n            factory.add(openMonStr);\n        }\n        setOpenMon(openMonStr);\n    }\n\n    \/**\n     * _monitor() advice - Wraps the given pointcut and calls the appropriate {@link org.automon.implementations.OpenMon} method\n     * at the beginning and end of the method call.\n     *\n     * @return The advised methods value or void.\n     * @throws Throwable If the method throws a {@link java.lang.Throwable} the advice will rethrow it.\n     *\/\n    Object around() throws Throwable : _monitor()  {\n        \/\/ Note: context is typically a Timer\/Monitor object returned by the monitoring implementation (Jamon, JavaSimon, Metrics,...)\n        \/\/ though to this advice it is simply an object and the advice doesn't care what the intent of the context\/object is.\n        Object context = openMon.start(thisJoinPointStaticPart);\n        try {\n            Object retVal = proceed();\n            openMon.stop(context);\n            return retVal;\n        } catch (Throwable throwable) {\n            openMon.stop(context, throwable);\n            throw throwable;\n        }\n    }\n\n    \/**\n     * exceptions() advice - Takes action on any Exception thrown.  It typically Tracks\/Counts any exceptions thrown by the pointcut.\n     * Note arguments are passed on to {@link org.automon.implementations.OpenMon#exception(org.aspectj.lang.JoinPoint, Throwable)}\n     *\/\n    after() throwing(Throwable throwable): exceptions() {\n        openMon.exception(thisJoinPoint, throwable);\n    }\n\n    \/** pointcut that determines what is monitored for performance\/time *\/\n    public pointcut _monitor() : user_monitor() && _sys_monitor();\n\n    \/** User should implement this pointcut to determine what should be monitored for performance\/time *\/\n    public abstract pointcut user_monitor();\n\n    \/** reserved pointcut for Automon team *\/\n    public pointcut _sys_monitor();\n\n\n    \/** pointcut that determines what is monitored for exceptions.  It can be the same as the {@link #_monitor()} poincut *\/\n    public pointcut exceptions() : user_exceptions() && _sys_exceptions();\n\n    \/** User should implement this pointcut to determine what should be monitored for performance\/time *\/\n    public abstract pointcut user_exceptions();\n\n    \/** reserved pointcut for Automon team *\/\n    public  pointcut _sys_exceptions();\n\n\n    \/* methods *\/\n    public boolean isEnabled() {\n        return !(openMon instanceof NullImp);\n    }\n\n    \/** Retrieve monitoring implementation *\/\n    public OpenMon getOpenMon() {\n        return openMon;\n    }\n\n    \/** Set monitoring implementation such as JAMon, Metrics, or JavaSimon *\/\n    public void setOpenMon(OpenMon openMon) {\n        this.openMon = openMon;\n    }\n\n    \/**\n     * Take the string of any {@link org.automon.implementations.OpenMon} registered within this classes\n     * {@link org.automon.implementations.OpenMonFactory}, instantiate it and make it the current OpenMon.  If null is passed\n     * in then use the default of iterating each of the preinstalled OpenMon types attempting to create them until one succeeds.\n     * If one doesn't succeed then it would mean the proper jar is not available. If all of these fail then simply disable.\n     *\n     * @param openMonKey Something like jamon, metrics, javasimon\n     *\/\n    public void setOpenMon(String openMonKey) {\n        if (openMonKey==null || openMonKey.trim().equals(\"\")) {\n            this.openMon = factory.getFirstInstance();\n        } else {\n            this.openMon = factory.getInstance(openMonKey);\n        }\n    }\n\n    public OpenMonFactory getOpenMonFactory() {\n        return factory;\n    }\n\n\n\n    \/\/ Note the mxbean was done as an inner class due to compilation order and AutomAspect.aj not being compiled and so\n    \/\/ not available to Automon if it was an external class.  These mehtods are visible via the jconsole jmx console.\n    public static class Automon implements AutomonMXBean {\n        private AutomonAspect automonAspect;\n\n        public Automon(AutomonAspect automonAspect) {\n            this.automonAspect = automonAspect;\n        }\n\n        @Override\n        public boolean isEnabled() {\n            return automonAspect.isEnabled();\n        }\n\n        @Override\n        public void setOpenMon(String openMonKey) {\n            automonAspect.setOpenMon(openMonKey);\n        }\n\n        @Override\n        public String getOpenMon() {\n            return automonAspect.getOpenMon().toString();\n        }\n\n        @Override\n        public String getValidOpenMons() {\n            return automonAspect.getOpenMonFactory().toString();\n        }\n    }\n\n}\n","old_contents":"package org.automon.aspects;\n\nimport org.automon.implementations.NullImp;\nimport org.automon.implementations.OpenMon;\nimport org.automon.implementations.OpenMonFactory;\nimport org.automon.utils.AutomonPropertiesLoader;\nimport org.automon.utils.Utils;\n\nimport java.util.Properties;\n\n\n\n\/**\n * <p>Aspect that advises the {@link org.aspectj.lang.annotation.Around} and {@link org.aspectj.lang.annotation.AfterThrowing} annotations.\n * The appropriate methods on {@link org.automon.implementations.OpenMon} methods are called. The advice typically times methods\n * and counts any exceptions  thrown, however other behavior such as logging is also possible.<\/p>\n *\n * <p>Note a developer should implement and provide any methods for this class or {@link org.automon.aspects.AspectJBase} or\n * {@link org.automon.aspects.SpringBase}.<\/p>\n *\n * <p>Note: I used native aspect style instead of the @AspectJ style because @Around in @AspectJ style doesn't seem to allow for the\n * more performant use of the static part of the JoinPoint. The static part only seems to be available without first\n * creating the dynamic JoinPoint in native aspects. Native style aspects are more powerful and can later be extended by developers\n * with @AspectJ style, so it is probably the best option anyway.  <\/p>\n *\/\npublic abstract aspect AutomonAspect {\n    private OpenMonFactory factory = new OpenMonFactory(new NullImp());\n    private OpenMon openMon = new NullImp();\n    private AutomonMXBean automonJmx = new Automon(this);\n\n    public AutomonAspect() {\n        \/\/ Use OpenMon the user selects and register the aspect with jmx\n        initOpenMon();\n        Utils.registerWithJmx(this, automonJmx);\n    }\n\n    private void initOpenMon() {\n        Properties properties = new AutomonPropertiesLoader().getProperties();\n        String openMonStr = properties.getProperty(AutomonPropertiesLoader.CONFIGURED_OPEN_MON);\n        \/\/ if the openMonString is a fully qualified classname then also register it in the factory i.e. com.mygreatcompany.MyOpenMon\n        if (Utils.hasPackageName(openMonStr)) {\n            factory.add(openMonStr);\n        }\n        setOpenMon(openMonStr);\n    }\n\n    \/**\n     * _monitor() advice - Wraps the given pointcut and calls the appropriate {@link org.automon.implementations.OpenMon} method\n     * at the beginning and end of the method call.\n     *\n     * @return The advised methods value or void.\n     * @throws Throwable If the method throws a {@link java.lang.Throwable} the advice will rethrow it.\n     *\/\n    Object around() throws Throwable : _monitor()  {\n        \/\/ Note: context is typically a Timer\/Monitor object returned by the monitoring implementation (Jamon, JavaSimon, Metrics,...)\n        \/\/ though to this advice it is simply an object and the advice doesn't care what the intent of the context\/object is.\n        Object context = openMon.start(thisJoinPointStaticPart);\n        try {\n            Object retVal = proceed();\n            openMon.stop(context);\n            return retVal;\n        } catch (Throwable throwable) {\n            openMon.stop(context, throwable);\n            throw throwable;\n        }\n    }\n\n    \/**\n     * exceptions() advice - Takes action on any Exception thrown.  It typically Tracks\/Counts any exceptions thrown by the pointcut.\n     * Note arguments are passed on to {@link org.automon.implementations.OpenMon#exception(org.aspectj.lang.JoinPoint, Throwable)}\n     *\/\n    after() throwing(Throwable throwable): exceptions() {\n        openMon.exception(thisJoinPoint, throwable);\n    }\n\n    \/** pointcut that determines what is monitored for performance\/time *\/\n    public pointcut _monitor() : user_monitor() && _sys_monitor();\n\n    \/** User should implement this pointcut to determine what should be monitored for performance\/time *\/\n    public abstract pointcut user_monitor();\n\n    \/** reserved pointcut for Automon team *\/\n    public pointcut _sys_monitor();\n\n\n    \/** pointcut that determines what is monitored for exceptions.  It can be the same as the {@link #_monitor()} poincut *\/\n    public pointcut exceptions() : user_exceptions() && _sys_exceptions();\n\n    \/** User should implement this pointcut to determine what should be monitored for performance\/time *\/\n    public abstract pointcut user_exceptions();\n\n    \/** reserved pointcut for Automon team *\/\n    public  pointcut _sys_exceptions();\n\n\n    \/* methods *\/\n    public boolean isEnabled() {\n        return !(openMon instanceof NullImp);\n    }\n\n    \/** Retrieve monitoring implementation *\/\n    public OpenMon getOpenMon() {\n        return openMon;\n    }\n\n    \/** Set monitoring implementation such as JAMon, Metrics, or JavaSimon *\/\n    public void setOpenMon(OpenMon openMon) {\n        this.openMon = openMon;\n    }\n\n    \/**\n     * Take the string of any {@link org.automon.implementations.OpenMon} registered within this classes\n     * {@link org.automon.implementations.OpenMonFactory}, instantiate it and make it the current OpenMon.  If null is passed\n     * in then use the default of iterating each of the preinstalled OpenMon types attempting to create them until one succeeds.\n     * If one doesn't succeed then it would mean the proper jar is not available. If all of these fail then simply disable.\n     *\n     * @param openMonKey Something like jamon, metrics, javasimon\n     *\/\n    public void setOpenMon(String openMonKey) {\n        if (openMonKey==null || openMonKey.trim().equals(\"\")) {\n            this.openMon = factory.getFirstInstance();\n        } else {\n            this.openMon = factory.getInstance(openMonKey);\n        }\n    }\n\n    public OpenMonFactory getOpenMonFactory() {\n        return factory;\n    }\n\n\n\n    \/\/ Note the mxbean was done as an inner class due to compilation order and AutomAspect.aj not being compiled and so\n    \/\/ not available to Automon if it was an external class.  These mehtods are visible via the jconsole jmx console.\n    public static class Automon implements AutomonMXBean {\n        private AutomonAspect automonAspect;\n\n        public Automon(AutomonAspect automonAspect) {\n            this.automonAspect = automonAspect;\n        }\n\n        @Override\n        public boolean isEnabled() {\n            return automonAspect.isEnabled();\n        }\n\n        @Override\n        public void setOpenMon(String openMonKey) {\n            automonAspect.setOpenMon(openMonKey);\n        }\n\n        @Override\n        public String getOpenMon() {\n            return automonAspect.getOpenMon().toString();\n        }\n\n        @Override\n        public String getValidOpenMons() {\n            return automonAspect.getOpenMonFactory().toString();\n        }\n    }\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"faa738043954c26956c2f17ddba6546eede42473","subject":"removed \"throws Exception\" from AbstractUserTransactionAspect","message":"removed \"throws Exception\" from AbstractUserTransactionAspect\n","repos":"palava\/palava-jta","old_file":"src\/main\/java\/de\/cosmocode\/palava\/jta\/AbstractUserTransactionAspect.aj","new_file":"src\/main\/java\/de\/cosmocode\/palava\/jta\/AbstractUserTransactionAspect.aj","new_contents":"\/**\n * palava - a java-php-bridge\n * Copyright (C) 2007-2010  CosmoCode GmbH\n *\n * This program is free software; you can redistribute it and\/or\n * modify it under the terms of the GNU General Public License\n * as published by the Free Software Foundation; either version 2\n * of the License, or (at your option) any later version.\n *\n * This program is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n * along with this program; if not, write to the Free Software\n * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n * MA  02110-1301, USA.\n *\/\n\npackage de.cosmocode.palava.jta;\n\nimport javax.transaction.NotSupportedException;\nimport javax.transaction.Status;\nimport javax.transaction.SystemException;\nimport javax.transaction.UserTransaction;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\n\npublic abstract aspect AbstractUserTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(AbstractUserTransactionAspect.class);\n\n    private Provider<UserTransaction> provider;\n    \n    @Inject\n    void setProvider(Provider<UserTransaction> provider) {\n        this.provider = Preconditions.checkNotNull(provider, \"Provider\");\n    }\n    \n    protected abstract pointcut transactional();\n    \n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        final UserTransaction tx = provider.get();\n        LOG.trace(\"Using transaction {}\", tx);\n        \n        final boolean localTx;\n        \n        try {\n            localTx = tx.getStatus() == Status.STATUS_NO_TRANSACTION;\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        if (localTx) {\n            LOG.trace(\"Beginning automatic transaction\");\n            try {\n                tx.begin();\n            } catch (NotSupportedException e) {\n                throw new IllegalStateException(e);\n            } catch (SystemException e) {\n                throw new IllegalStateException(e);\n            }\n        } else {\n            LOG.trace(\"Transaction already active\");\n        }\n\n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (RuntimeException e) {\n            LOG.error(\"Exception inside automatic transaction context\", e);\n            try {\n                tx.rollback();\n            } catch (SystemException inner) {\n                throw new IllegalStateException(inner);\n            }\n            throw e;\n        }\n        \n        try {\n            if (localTx && tx.getStatus() == Status.STATUS_ACTIVE) {\n                tx.commit();\n                LOG.trace(\"Committed automatic transaction\");\n            }\n            return returnValue;\n        } catch (Exception e) {\n            LOG.error(\"Commit in automatic transaction context failed\", e);\n            try {\n                tx.rollback();\n            } catch (SystemException inner) {\n                throw new IllegalStateException(inner);\n            }\n            throw new IllegalStateException(e);\n        }\n    }\n    \n}\n","old_contents":"\/**\n * palava - a java-php-bridge\n * Copyright (C) 2007-2010  CosmoCode GmbH\n *\n * This program is free software; you can redistribute it and\/or\n * modify it under the terms of the GNU General Public License\n * as published by the Free Software Foundation; either version 2\n * of the License, or (at your option) any later version.\n *\n * This program is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n * along with this program; if not, write to the Free Software\n * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n * MA  02110-1301, USA.\n *\/\n\npackage de.cosmocode.palava.jta;\n\nimport javax.transaction.Status;\nimport javax.transaction.UserTransaction;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\n\npublic abstract aspect AbstractUserTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(AbstractUserTransactionAspect.class);\n\n    private Provider<UserTransaction> provider;\n    \n    @Inject\n    void setProvider(Provider<UserTransaction> provider) {\n        this.provider = Preconditions.checkNotNull(provider, \"Provider\");\n    }\n    \n    protected abstract pointcut transactional();\n    \n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around() throws Exception: transactional() {\n        final UserTransaction tx = provider.get();\n        LOG.trace(\"Using transaction {}\", tx);\n        final boolean localTx = tx.getStatus() == Status.STATUS_NO_TRANSACTION;\n\n        if (localTx) {\n            LOG.trace(\"Beginning automatic transaction\");\n            tx.begin();\n        } else {\n            LOG.trace(\"Transaction already active\");\n        }\n\n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (RuntimeException e) {\n            LOG.error(\"Exception inside automatic transaction context\", e);\n            tx.rollback();\n            throw e;\n        }\n        \n        try {\n            if (localTx && tx.getStatus() == Status.STATUS_ACTIVE) {\n                tx.commit();\n                LOG.trace(\"Committed automatic transaction\");\n            }\n            return returnValue;\n        } catch (Exception e) {\n            LOG.error(\"Commit in automatic transaction context failed\", e);\n            tx.rollback();\n            throw e;\n        }\n    }\n    \n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"feeecd203f3736eb37fa95b40e085fd67527bb58","subject":"add ChainTask for AsyncBackupAspect.aj","message":"add ChainTask for AsyncBackupAspect.aj\n","repos":"AlanJinTS\/zstack,AlanJinTS\/zstack,MatheMatrix\/zstack,AlanJager\/zstack,zstackorg\/zstack,MatheMatrix\/zstack,MatheMatrix\/zstack,AlanJager\/zstack,camilesing\/zstack,AlanJager\/zstack,camilesing\/zstack,camilesing\/zstack,zstackio\/zstack,zstackorg\/zstack,AlanJinTS\/zstack,zstackio\/zstack,zstackio\/zstack","old_file":"core\/src\/main\/java\/org\/zstack\/core\/aspect\/AsyncBackupAspect.aj","new_file":"core\/src\/main\/java\/org\/zstack\/core\/aspect\/AsyncBackupAspect.aj","new_contents":"package org.zstack.core.aspect;\r\n\r\nimport org.springframework.beans.factory.annotation.Autowired;\r\nimport org.zstack.core.cloudbus.CloudBus;\r\nimport org.zstack.core.errorcode.ErrorFacade;\r\nimport org.zstack.header.core.workflow.FlowRollback;\r\nimport org.zstack.header.errorcode.OperationFailureException;\r\nimport org.zstack.core.thread.ChainTask;\r\nimport org.zstack.core.thread.SyncTaskChain;\r\nimport org.zstack.header.core.workflow.FlowTrigger;\r\nimport org.zstack.header.core.*;\r\nimport org.zstack.header.errorcode.ErrorCode;\r\nimport org.zstack.header.exception.CloudRuntimeException;\r\nimport org.zstack.header.message.Message;\r\nimport org.zstack.utils.DebugUtils;\r\nimport org.zstack.utils.Utils;\r\nimport org.zstack.utils.logging.CLogger;\r\n\r\nimport java.util.List;\r\n\r\npublic aspect AsyncBackupAspect {\r\n    private final CLogger logger = Utils.getLogger(AsyncBackupAspect.class);\r\n\r\n    @Autowired\r\n    private CloudBus bus;\r\n    @Autowired\r\n    private ErrorFacade errf;\r\n\r\n    private boolean isAsyncBackup(Object backup) {\r\n        return backup instanceof Message\r\n                || backup instanceof Completion\r\n                || backup instanceof ReturnValueCompletion\r\n                || backup instanceof AsyncLatch\r\n                || backup instanceof FlowTrigger\r\n                || backup instanceof SyncTaskChain\r\n                || backup instanceof NoErrorCompletion\r\n                || backup instanceof FlowRollback\r\n                || backup instanceof ChainTask;\r\n    }\r\n\r\n\r\n    private void backup(List<AsyncBackup> ancestors, Throwable t, boolean flipThrowable) {\r\n        if (ancestors == null || ancestors.isEmpty()) {\r\n            \/\/ throw original exception out if no backup specified\r\n            if (t instanceof RuntimeException) {\r\n                throw (RuntimeException)t;\r\n            } else if (t instanceof Error) {\r\n                throw (Error)t;\r\n            } else {\r\n                throw new CloudRuntimeException(t);\r\n            }\r\n        }\r\n\r\n        for (AsyncBackup ancestor : ancestors) {\r\n            if (!isAsyncBackup(ancestor)) {\r\n                String info = String.format(\"%s is not a known AsyncBackup. Someone added this type but forgot changing AsyncBackupAspect, please file bug\", ancestor.getClass().getName());\r\n                DebugUtils.dumpStackTrace(info);\r\n                return;\r\n            }\r\n\r\n            ErrorCode err = t instanceof OperationFailureException ? ((OperationFailureException) t).getErrorCode() : errf.throwableToInternalError(t);\r\n            if (ancestor instanceof Completion) {\r\n                ((Completion)ancestor).fail(err);\r\n            } else if (ancestor instanceof ReturnValueCompletion) {\r\n                ((ReturnValueCompletion)ancestor).fail(err);\r\n            } else if (ancestor instanceof AsyncLatch) {\r\n                ((AsyncLatch) ancestor).ack();\r\n            } else if (ancestor instanceof FlowTrigger) {\r\n                ((FlowTrigger) ancestor).fail(err);\r\n            } else if (ancestor instanceof FlowRollback) {\r\n                ((FlowRollback) ancestor).rollback();\r\n            } else if (ancestor instanceof  SyncTaskChain) {\r\n                ((SyncTaskChain) ancestor).next();\r\n            } else if (ancestor instanceof NoErrorCompletion) {\r\n                ((NoErrorCompletion) ancestor).done();\r\n            } else if (ancestor instanceof Message) {\r\n                bus.logExceptionWithMessageDump((Message) ancestor, t);\r\n                bus.replyErrorByMessageType((Message) ancestor, err);\r\n            } else {\r\n                throw new CloudRuntimeException(\"should not be here\");\r\n            }\r\n        }\r\n\r\n        if (flipThrowable && t instanceof RuntimeException) {\r\n            throw (RuntimeException)t;\r\n        } else {\r\n            logger.warn(\"unhandled exception happened\", t);\r\n        }\r\n    }\r\n\r\n    private void backup(List<AsyncBackup> ancestors, Throwable t) {\r\n        backup(ancestors, t, false);\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.core.Completion+.success()) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.core.Completion+.fail(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.core.ReturnValueCompletion+.success(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.core.ReturnValueCompletion+.fail(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.core.NoErrorCompletion+.done()) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.core.NopeCompletion+.success()) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.core.NopeCompletion+.fail(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.core.cloudbus.CloudBusCallBack+.run(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.core.cloudbus.CloudBusListCallBack+.run(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.core.thread.ChainTask+.run(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t, true);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.rest.AsyncRESTCallback+.timeout(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.rest.AsyncRESTCallback+.success(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.rest.AsyncRESTCallback+.fail(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.core.workflow.FlowDoneHandler+.handle(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.core.workflow.FlowErrorHandler+.handle(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.core.workflow.FlowFinallyHandler+.Finally(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n}\r\n","old_contents":"package org.zstack.core.aspect;\r\n\r\nimport org.springframework.beans.factory.annotation.Autowired;\r\nimport org.zstack.core.cloudbus.CloudBus;\r\nimport org.zstack.core.errorcode.ErrorFacade;\r\nimport org.zstack.header.core.workflow.FlowRollback;\r\nimport org.zstack.header.errorcode.OperationFailureException;\r\nimport org.zstack.core.thread.SyncTaskChain;\r\nimport org.zstack.header.core.workflow.FlowTrigger;\r\nimport org.zstack.header.core.*;\r\nimport org.zstack.header.errorcode.ErrorCode;\r\nimport org.zstack.header.exception.CloudRuntimeException;\r\nimport org.zstack.header.message.Message;\r\nimport org.zstack.utils.DebugUtils;\r\nimport org.zstack.utils.Utils;\r\nimport org.zstack.utils.logging.CLogger;\r\n\r\nimport java.util.List;\r\n\r\npublic aspect AsyncBackupAspect {\r\n    private final CLogger logger = Utils.getLogger(AsyncBackupAspect.class);\r\n\r\n    @Autowired\r\n    private CloudBus bus;\r\n    @Autowired\r\n    private ErrorFacade errf;\r\n\r\n    private boolean isAsyncBackup(Object backup) {\r\n        return backup instanceof Message || backup instanceof Completion || backup instanceof ReturnValueCompletion\r\n                || backup instanceof AsyncLatch\r\n                || backup instanceof FlowTrigger || backup instanceof SyncTaskChain\r\n                || backup instanceof NoErrorCompletion || backup instanceof FlowRollback;\r\n    }\r\n\r\n\r\n    private void backup(List<AsyncBackup> ancestors, Throwable t, boolean flipThrowable) {\r\n        if (ancestors == null || ancestors.isEmpty()) {\r\n            \/\/ throw original exception out if no backup specified\r\n            if (t instanceof RuntimeException) {\r\n                throw (RuntimeException)t;\r\n            } else if (t instanceof Error) {\r\n                throw (Error)t;\r\n            } else {\r\n                throw new CloudRuntimeException(t);\r\n            }\r\n        }\r\n\r\n        for (AsyncBackup ancestor : ancestors) {\r\n            if (!isAsyncBackup(ancestor)) {\r\n                String info = String.format(\"%s is not a known AsyncBackup. Someone added this type but forgot changing AsyncBackupAspect, please file bug\", ancestor.getClass().getName());\r\n                DebugUtils.dumpStackTrace(info);\r\n                return;\r\n            }\r\n\r\n            ErrorCode err = t instanceof OperationFailureException ? ((OperationFailureException) t).getErrorCode() : errf.throwableToInternalError(t);\r\n            if (ancestor instanceof Completion) {\r\n                ((Completion)ancestor).fail(err);\r\n            } else if (ancestor instanceof ReturnValueCompletion) {\r\n                ((ReturnValueCompletion)ancestor).fail(err);\r\n            } else if (ancestor instanceof AsyncLatch) {\r\n                ((AsyncLatch) ancestor).ack();\r\n            } else if (ancestor instanceof FlowTrigger) {\r\n                ((FlowTrigger) ancestor).fail(err);\r\n            } else if (ancestor instanceof FlowRollback) {\r\n                ((FlowRollback) ancestor).rollback();\r\n            } else if (ancestor instanceof  SyncTaskChain) {\r\n                ((SyncTaskChain) ancestor).next();\r\n            } else if (ancestor instanceof NoErrorCompletion) {\r\n                ((NoErrorCompletion) ancestor).done();\r\n            } else if (ancestor instanceof Message) {\r\n                bus.logExceptionWithMessageDump((Message) ancestor, t);\r\n                bus.replyErrorByMessageType((Message) ancestor, err);\r\n            } else {\r\n                throw new CloudRuntimeException(\"should not be here\");\r\n            }\r\n        }\r\n\r\n        if (flipThrowable && t instanceof RuntimeException) {\r\n            throw (RuntimeException)t;\r\n        } else {\r\n            logger.warn(\"unhandled exception happened\", t);\r\n        }\r\n    }\r\n\r\n    private void backup(List<AsyncBackup> ancestors, Throwable t) {\r\n        backup(ancestors, t, false);\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.core.Completion+.success()) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.core.Completion+.fail(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.core.ReturnValueCompletion+.success(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.core.ReturnValueCompletion+.fail(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.core.NoErrorCompletion+.done()) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.core.NopeCompletion+.success()) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.core.NopeCompletion+.fail(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.core.cloudbus.CloudBusCallBack+.run(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.core.cloudbus.CloudBusListCallBack+.run(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.core.thread.ChainTask+.run(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t, true);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.rest.AsyncRESTCallback+.timeout(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.rest.AsyncRESTCallback+.success(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.rest.AsyncRESTCallback+.fail(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.core.workflow.FlowDoneHandler+.handle(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.core.workflow.FlowErrorHandler+.handle(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n\r\n    void around(org.zstack.header.core.AbstractCompletion completion) : this(completion) && execution(void org.zstack.header.core.workflow.FlowFinallyHandler+.Finally(..)) {\r\n        try {\r\n            proceed(completion);\r\n        } catch (Throwable  t) {\r\n            backup(completion.getBackups(), t);\r\n        }\r\n    }\r\n}\r\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"bc1b8218537201b0491aafc6107947833f641df3","subject":"- Remove pointcut to deleted interface - Reflect new .fp package in pointcut","message":"- Remove pointcut to deleted interface\n- Reflect new .fp package in pointcut","repos":"lemmy\/tlaplus,lemmy\/tlaplus,tlaplus\/tlaplus,tlaplus\/tlaplus,tlaplus\/tlaplus,lemmy\/tlaplus,lemmy\/tlaplus,tlaplus\/tlaplus","old_file":"tlatools\/src-aj\/tlc2\/tool\/distributed\/RMIMethodMonitorAspect.aj","new_file":"tlatools\/src-aj\/tlc2\/tool\/distributed\/RMIMethodMonitorAspect.aj","new_contents":"package tlc2.tool.distributed;\n\npublic aspect RMIMethodMonitorAspect {\n\t\n\t\/\/ catch all method calls to RMI methods\n\tpointcut callToRemoteMethod() : \n\t\t   execution(* tlc2.tool.distributed.InternRMI.*(..))\n\t\t|| execution(* tlc2.tool.distributed.TLCServerRMI.*(..))\n\t\t|| execution(* tlc2.tool.distributed.TLCWorkerRMI.*(..))\n\t\t|| execution(* tlc2.tool.distributed.fp.FPSetRMI.*(..))\n\t\n\tbefore(): (callToRemoteMethod()) {\n\t\tRMIMethodMonitor.entering(thisJoinPoint);\n\t}\n}\n","old_contents":"package tlc2.tool.distributed;\n\npublic aspect RMIMethodMonitorAspect {\n\t\n\t\/\/ catch all method calls to RMI methods\n\tpointcut callToRemoteMethod() : \n\t\t   execution(* tlc2.tool.distributed.InternRMI.*(..))\n\t\t|| execution(* tlc2.tool.distributed.TLCServerRMI.*(..))\n\t\t|| execution(* tlc2.tool.distributed.TLCWorkerRMI.*(..))\n\t\t|| execution(* tlc2.tool.distributed.FPSetRMI.*(..))\n\t\t|| execution(* tlc2.tool.distributed.FPIntSetRMI.*(..));\n\t\n\tbefore(): (callToRemoteMethod()) {\n\t\tRMIMethodMonitor.entering(thisJoinPoint);\n\t}\n}\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"3c85697430ba02a12639c912284adff5c51f017e","subject":"warning fixes","message":"warning fixes\n\nSigned-off-by: Ketoth Xupack <2ff7bd69a79a23dbf64ebd5846a612566f93fbf7@gmail.com>\n","repos":"KetothXupack\/jsr305-aspectj-validation","old_file":"src\/main\/java\/org\/nohope\/validation\/NotNullAspect.aj","new_file":"src\/main\/java\/org\/nohope\/validation\/NotNullAspect.aj","new_contents":"package org.nohope.validation;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.aspectj.lang.reflect.MethodSignature;\n\nimport javax.annotation.Nonnull;\nimport javax.annotation.meta.When;\nimport java.lang.annotation.Annotation;\nimport java.lang.reflect.Method;\n\n@SuppressWarnings({\n        \"StringBufferReplaceableByString\",\n        \"UtilityClassWithoutPrivateConstructor\"\n})\npublic final aspect NotNullAspect {\n\n    \/\/ searches for all methods have at last one parameter annotated with @Nonnull\n    pointcut nonNullParameter():\n            execution(* *.*(.., @javax.annotation.Nonnull (*), ..));\n\n    \/\/ searches for all methods which returns any reference type and annotated with @Nonnull\n    pointcut validatedReturnValue():\n            execution(@javax.annotation.Nonnull Object+ *.*(..));\n\n    @SuppressAjWarnings\n    after() returning(final Object ret): validatedReturnValue() {\n        final MethodSignature sig = (MethodSignature) thisJoinPoint.getSignature();\n        if (ret == null) {\n            throw new IllegalStateException(new StringBuilder(\"@Nonnull method \")\n                    .append(toString(sig))\n                    .append(\" must not return null\")\n                    .toString()\n            );\n        }\n    }\n\n    @SuppressAjWarnings\n    before(): nonNullParameter() {\n        final MethodSignature sig = (MethodSignature) thisJoinPoint.getSignature();\n        final Method method = sig.getMethod();\n        final Annotation[][] annotations = method.getParameterAnnotations();\n\n        int i = 1;\n        for (final Object obj : thisJoinPoint.getArgs()) {\n            Nonnull a = null;\n            for (Annotation annotation : annotations[i - 1]) {\n                if (annotation instanceof Nonnull) {\n                    a = (Nonnull) annotation;\n                    break;\n                }\n            }\n\n            if (obj == null && a != null && a.when() == When.ALWAYS) {\n                throw new IllegalArgumentException(new StringBuilder(\"Argument \")\n                        .append(i)\n                        .append(\" for @Nonnull parameter of \")\n                        .append(toString(sig))\n                        .append(\" must not be null\")\n                        .toString()\n                );\n            }\n            i++;\n        }\n    }\n\n    private static StringBuilder toString(final MethodSignature sig) {\n        final Method method = sig.getMethod();\n        final Class[] args = method.getParameterTypes();\n        final StringBuilder builder = new StringBuilder();\n        builder.append('\\'')\n               .append(method.getReturnType().getSimpleName())\n               .append(\" \")\n               .append(sig.getDeclaringType().getCanonicalName())\n               .append('.')\n               .append(method.getName())\n               .append('(');\n        boolean started = true;\n        for (final Class arg : args) {\n            if (!started) {\n                builder.append(\", \");\n            } else {\n                started = false;\n            }\n            builder.append(arg.getCanonicalName());\n        }\n        builder.append(\")'\");\n        return builder;\n    }\n}\n","old_contents":"package org.nohope.validation;\n\nimport org.aspectj.lang.reflect.MethodSignature;\n\nimport javax.annotation.Nonnull;\nimport javax.annotation.meta.When;\nimport java.lang.annotation.Annotation;\nimport java.lang.reflect.Method;\n\n@SuppressWarnings({\n        \"StringBufferReplaceableByString\",\n        \"UtilityClassWithoutPrivateConstructor\"\n})\npublic final aspect NotNullAspect {\n\n    \/\/ searches for all methods have at last one parameter annotated with @Nonnull\n    pointcut nonNullParameter():\n            execution(* *.*(.., @javax.annotation.Nonnull (*), ..));\n\n    \/\/ searches for all methods which returns any reference type and annotated with @Nonnull\n    pointcut validatedReturnValue():\n            execution(@javax.annotation.Nonnull Object+ *.*(..));\n\n    after() returning(final Object ret): validatedReturnValue() {\n        final MethodSignature sig = (MethodSignature) thisJoinPoint.getSignature();\n        if (ret == null) {\n            throw new IllegalStateException(new StringBuilder(\"@Nonnull method \")\n                    .append(toString(sig))\n                    .append(\" must not return null\")\n                    .toString()\n            );\n        }\n    }\n\n    before(): nonNullParameter() {\n        final MethodSignature sig = (MethodSignature) thisJoinPoint.getSignature();\n        final Method method = sig.getMethod();\n        final Annotation[][] annotations = method.getParameterAnnotations();\n\n        int i = 1;\n        for (final Object obj : thisJoinPoint.getArgs()) {\n            Nonnull a = null;\n            for (Annotation annotation : annotations[i - 1]) {\n                if (annotation instanceof Nonnull) {\n                    a = (Nonnull) annotation;\n                    break;\n                }\n            }\n\n            if (obj == null && a != null && a.when() == When.ALWAYS) {\n                throw new IllegalArgumentException(new StringBuilder(\"Argument \")\n                        .append(i)\n                        .append(\" for @Nonnull parameter of \")\n                        .append(toString(sig))\n                        .append(\" must not be null\")\n                        .toString()\n                );\n            }\n            i++;\n        }\n    }\n\n    private static StringBuilder toString(final MethodSignature sig) {\n        final Method method = sig.getMethod();\n        final Class[] args = method.getParameterTypes();\n        final StringBuilder builder = new StringBuilder();\n        builder.append('\\'')\n               .append(method.getReturnType().getSimpleName())\n               .append(\" \")\n               .append(sig.getDeclaringType().getCanonicalName())\n               .append('.')\n               .append(method.getName())\n               .append('(');\n        boolean started = true;\n        for (final Class arg : args) {\n            if (!started) {\n                builder.append(\", \");\n            } else {\n                started = false;\n            }\n            builder.append(arg.getCanonicalName());\n        }\n        builder.append(\")'\");\n        return builder;\n    }\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"e8476d6c641e192622298955f46943d2042ae2c1","subject":"added more meaningful log messages","message":"added more meaningful log messages\n","repos":"palava\/palava-jta","old_file":"src\/main\/java\/de\/cosmocode\/palava\/jta\/AbstractUserTransactionAspect.aj","new_file":"src\/main\/java\/de\/cosmocode\/palava\/jta\/AbstractUserTransactionAspect.aj","new_contents":"\/**\n * palava - a java-php-bridge\n * Copyright (C) 2007-2010  CosmoCode GmbH\n *\n * This program is free software; you can redistribute it and\/or\n * modify it under the terms of the GNU General Public License\n * as published by the Free Software Foundation; either version 2\n * of the License, or (at your option) any later version.\n *\n * This program is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n * along with this program; if not, write to the Free Software\n * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n * MA  02110-1301, USA.\n *\/\n\npackage de.cosmocode.palava.jta;\n\nimport javax.transaction.NotSupportedException;\nimport javax.transaction.Status;\nimport javax.transaction.SystemException;\nimport javax.transaction.UserTransaction;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\n\npublic abstract aspect AbstractUserTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(AbstractUserTransactionAspect.class);\n\n    private Provider<UserTransaction> provider;\n    \n    @Inject\n    void setProvider(Provider<UserTransaction> provider) {\n        this.provider = Preconditions.checkNotNull(provider, \"Provider\");\n    }\n    \n    protected abstract pointcut transactional();\n    \n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        final UserTransaction tx = provider.get();\n        LOG.trace(\"Using transaction {}\", tx);\n        \n        final boolean local;\n        \n        try {\n            local = tx.getStatus() == Status.STATUS_NO_TRANSACTION;\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        if (local) {\n            LOG.trace(\"Beginning automatic transaction {}\", tx);\n            try {\n                tx.begin();\n            } catch (NotSupportedException e) {\n                throw new IllegalStateException(e);\n            } catch (SystemException e) {\n                throw new IllegalStateException(e);\n            }\n        } else {\n            LOG.trace(\"Transaction {} already active\", tx);\n        }\n\n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (Exception e) {\n            LOG.error(\"Exception inside automatic transaction context\", e);\n            try {\n                if (local && tx.getStatus() == Status.STATUS_ACTIVE) {\n                    LOG.info(\"Rolling back local\/active transaction {}\", tx);\n                    tx.rollback();\n                } else {\n                    LOG.debug(\"Setting transaction {} as rollback only\", tx);\n                    tx.setRollbackOnly();\n                }\n            } catch (SystemException inner) {\n                throw new IllegalStateException(inner);\n            }\n            throw new IllegalStateException(e);\n        }\n        \n        final int status;\n        \n        try {\n            status = tx.getStatus();\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n        \n        if (local) {\n            if (status == Status.STATUS_MARKED_ROLLBACK) {\n                try {\n                    LOG.trace(\"Rolling back marked transaction {}\", tx);\n                    tx.rollback();\n                } catch (SystemException e) {\n                    throw new IllegalStateException(e);\n                }\n            } else {\n                try {\n                    tx.commit();\n                    LOG.trace(\"Committed automatic transaction {}\", tx);\n                } catch (Exception e) {\n                    LOG.error(\"Commit in automatic transaction context failed\", e);\n                    try {\n                        LOG.info(\"Rolling back transaction {}\", tx);\n                        tx.rollback();\n                    } catch (SystemException inner) {\n                        throw new IllegalStateException(inner);\n                    }\n                    throw new IllegalStateException(e);\n                }\n            }\n        }\n        \n        return returnValue;\n    }\n    \n}\n","old_contents":"\/**\n * palava - a java-php-bridge\n * Copyright (C) 2007-2010  CosmoCode GmbH\n *\n * This program is free software; you can redistribute it and\/or\n * modify it under the terms of the GNU General Public License\n * as published by the Free Software Foundation; either version 2\n * of the License, or (at your option) any later version.\n *\n * This program is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n * along with this program; if not, write to the Free Software\n * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n * MA  02110-1301, USA.\n *\/\n\npackage de.cosmocode.palava.jta;\n\nimport javax.transaction.NotSupportedException;\nimport javax.transaction.Status;\nimport javax.transaction.SystemException;\nimport javax.transaction.UserTransaction;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\n\npublic abstract aspect AbstractUserTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(AbstractUserTransactionAspect.class);\n\n    private Provider<UserTransaction> provider;\n    \n    @Inject\n    void setProvider(Provider<UserTransaction> provider) {\n        this.provider = Preconditions.checkNotNull(provider, \"Provider\");\n    }\n    \n    protected abstract pointcut transactional();\n    \n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        final UserTransaction tx = provider.get();\n        LOG.trace(\"Using transaction {}\", tx);\n        \n        final boolean local;\n        \n        try {\n            local = tx.getStatus() == Status.STATUS_NO_TRANSACTION;\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        if (local) {\n            LOG.trace(\"Beginning automatic transaction\");\n            try {\n                tx.begin();\n            } catch (NotSupportedException e) {\n                throw new IllegalStateException(e);\n            } catch (SystemException e) {\n                throw new IllegalStateException(e);\n            }\n        } else {\n            LOG.trace(\"Transaction already active\");\n        }\n\n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (Exception e) {\n            LOG.error(\"Exception inside automatic transaction context\", e);\n            try {\n                if (local && tx.getStatus() == Status.STATUS_ACTIVE) {\n                    tx.rollback();\n                } else {\n                    tx.setRollbackOnly();\n                }\n            } catch (SystemException inner) {\n                throw new IllegalStateException(inner);\n            }\n            throw new IllegalStateException(e);\n        }\n        \n        final int status;\n        \n        try {\n            status = tx.getStatus();\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n        \n        if (local) {\n            if (status == Status.STATUS_MARKED_ROLLBACK) {\n                try {\n                    tx.rollback();\n                } catch (SystemException e) {\n                    throw new IllegalStateException(e);\n                }\n            } else {\n                try {\n                    tx.commit();\n                    LOG.trace(\"Committed automatic transaction\");\n                } catch (Exception e) {\n                    LOG.error(\"Commit in automatic transaction context failed\", e);\n                    try {\n                        tx.rollback();\n                    } catch (SystemException inner) {\n                        throw new IllegalStateException(inner);\n                    }\n                    throw new IllegalStateException(e);\n                }\n            }\n        }\n        \n        return returnValue;\n    }\n    \n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"fdb928d1741f72da99066edb113b78881897f51c","subject":"static","message":"static\n","repos":"eigengo\/monitor,DataDog\/monitor,DataDog\/monitor,eigengo\/monitor","old_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/Pointcuts.aj","new_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/Pointcuts.aj","new_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.actor.ActorCell;\nimport akka.actor.ActorRef;\nimport akka.actor.Props;\n\n\/**\n * Centralises the pointcuts\n *\/\nabstract aspect Pointcuts {\n\n    \/**\n     * Pointcut for {@code ActorCell.receiveMessage(msg)}, extracting the {@code ActorCell} and the message being received\n     *\/\n    static pointcut actorCellReceiveMessage(ActorCell actorCell, Object msg) : target(actorCell) &&\n            call(* akka.actor.ActorCell.receiveMessage(..)) && args(msg);\n\n    \/**\n     * Pointcut for {@code ActorCell.handleInvokeFailure(_, failure)}, extracting the {@code ActorCell} and the\n     * cause of the failure\n     *\/\n    static pointcut actorCellHandleInvokeFailure(ActorCell actorCell, Throwable failure) : target(actorCell) &&\n            execution(* akka.actor.ActorCell.handleInvokeFailure(..)) && args(*, failure);\n\n    \/**\n     * Pointcut for the {@code EventStream.publish(event)} method, extracting just the event\n     *\/\n    static pointcut eventStreamPublish(Object event) :\n            execution(* akka.event.EventStream.publish(..)) && args(event);\n\n    \/**\n     * Pointcut for the {@code actorOf} method in {@code ActorRefFactory} implementations. You would typically use\n     * it in the {@code after returning()} advices.\n     *\/\n    private static pointcut unnamedActorOf(Props props) : execution(* akka.actor.ActorRefFactory+.actorOf(*)) && args(props);\n    \/**\n     * Pointcut for the {@code actorOf} method in {@code ActorRefFactory} implementations where actor is named on creation\n     *\/\n    private static pointcut namedActorOf(Props props) : execution(* akka.actor.ActorRefFactory+.actorOf(*,*)) && args(props, *);\n    \/**\n     * Public pointcut for retrieving Props instance used by {@code actorOf} method in {@code ActorRefFactory}\n     *\/\n    static pointcut anyActorOf(Props props) : namedActorOf(props) || unnamedActorOf(props);\n\n\n\n\n    \/**\n     * Pointcut for {@code ActorCell.stop(actor)} method, extracting the {@code ActorRef}\n     *\/\n    static pointcut actorCellStop(ActorRef actor) : execution(* akka.actor.ActorCell.stop(..)) && args(actor);\n\n    \/**\n     * Pointcut for {@code ActorCell.stop()} method, extracting the targeted {@code ActorCell}\n     *\/\n    static pointcut actorCellInternalStop(ActorCell actorCell) : target(actorCell) && execution(* akka.actor.ActorCell.stop());\n}\n","old_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.actor.ActorCell;\nimport akka.actor.ActorRef;\nimport akka.actor.Props;\n\n\/**\n * Centralises the pointcuts\n *\/\nabstract aspect Pointcuts {\n\n    \/**\n     * Pointcut for {@code ActorCell.receiveMessage(msg)}, extracting the {@code ActorCell} and the message being received\n     *\/\n    static pointcut actorCellReceiveMessage(ActorCell actorCell, Object msg) : target(actorCell) &&\n            call(* akka.actor.ActorCell.receiveMessage(..)) && args(msg);\n\n    \/**\n     * Pointcut for {@code ActorCell.handleInvokeFailure(_, failure)}, extracting the {@code ActorCell} and the\n     * cause of the failure\n     *\/\n    static pointcut actorCellHandleInvokeFailure(ActorCell actorCell, Throwable failure) : target(actorCell) &&\n            execution(* akka.actor.ActorCell.handleInvokeFailure(..)) && args(*, failure);\n\n    \/**\n     * Pointcut for the {@code EventStream.publish(event)} method, extracting just the event\n     *\/\n    static pointcut eventStreamPublish(Object event) :\n            execution(* akka.event.EventStream.publish(..)) && args(event);\n\n    \/**\n     * Pointcut for the {@code actorOf} method in {@code ActorRefFactory} implementations. You would typically use\n     * it in the {@code after returning()} advices.\n     *\/\n    private pointcut unnamedActorOf(Props props) : execution(* akka.actor.ActorRefFactory+.actorOf(*)) && args(props);\n    \/**\n     * Pointcut for the {@code actorOf} method in {@code ActorRefFactory} implementations where actor is named on creation\n     *\/\n    private pointcut namedActorOf(Props props) : execution(* akka.actor.ActorRefFactory+.actorOf(*,*)) && args(props, *);\n    \/**\n     * Public pointcut for retrieving Props instance used by {@code actorOf} method in {@code ActorRefFactory}\n     *\/\n    pointcut anyActorOf(Props props) : namedActorOf(props) || unnamedActorOf(props);\n\n\n\n\n    \/**\n     * Pointcut for {@code ActorCell.stop(actor)} method, extracting the {@code ActorRef}\n     *\/\n    static pointcut actorCellStop(ActorRef actor) : execution(* akka.actor.ActorCell.stop(..)) && args(actor);\n\n    \/**\n     * Pointcut for {@code ActorCell.stop()} method, extracting the targeted {@code ActorCell}\n     *\/\n    static pointcut actorCellInternalStop(ActorCell actorCell) : target(actorCell) && execution(* akka.actor.ActorCell.stop());\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"46e4f9396f36dd2978849da7915be41d623096eb","subject":"Fix job submission when running against an insecure cluster.","message":"Fix job submission when running against an insecure cluster.\n","repos":"pratikmallya\/hue,lumig242\/Hue-Integration-with-CDAP,xq262144\/hue,kawamon\/hue,jounex\/hue,erickt\/hue,abhishek-ch\/hue,javachengwc\/hue,xq262144\/hue,GitHublong\/hue,vmax-feihu\/hue,pratikmallya\/hue,kawamon\/hue,nvoron23\/hue,nvoron23\/hue,hdinsight\/hue,ahmed-mahran\/hue,ahmed-mahran\/hue,MobinRanjbar\/hue,yongshengwang\/hue,dulems\/hue,Peddle\/hue,vitan\/hue,azureplus\/hue,javachengwc\/hue,javachengwc\/hue,abhishek-ch\/hue,yoer\/hue,yoer\/hue,xq262144\/hue,todaychi\/hue,javachengwc\/hue,sanjeevtripurari\/hue,yongshengwang\/hue,nvoron23\/hue,GitHublong\/hue,fangxingli\/hue,vmax-feihu\/hue,ahmed-mahran\/hue,ahmed-mahran\/hue,azureplus\/hue,mapr\/hue,jayceyxc\/hue,dulems\/hue,fangxingli\/hue,mapr\/hue,fangxingli\/hue,vmax-feihu\/hue,xiangel\/hue,todaychi\/hue,cloudera\/hue,vitan\/hue,xiangel\/hue,ChenJunor\/hue,pwong-mapr\/private-hue,cloudera\/hue,x303597316\/hue,cloudera\/hue,cloudera\/hue,epssy\/hue,x303597316\/hue,abhishek-ch\/hue,MobinRanjbar\/hue,xiangel\/hue,x303597316\/hue,vmax-feihu\/hue,fangxingli\/hue,jounex\/hue,cloudera\/hue,fangxingli\/hue,x303597316\/hue,sanjeevtripurari\/hue,pwong-mapr\/private-hue,x303597316\/hue,cloudera\/hue,ChenJunor\/hue,MobinRanjbar\/hue,Peddle\/hue,pratikmallya\/hue,jounex\/hue,epssy\/hue,pwong-mapr\/private-hue,todaychi\/hue,Peddle\/hue,sanjeevtripurari\/hue,lumig242\/Hue-Integration-with-CDAP,yongshengwang\/hue,abhishek-ch\/hue,kawamon\/hue,yoer\/hue,yoer\/hue,jjmleiro\/hue,mapr\/hue,jayceyxc\/hue,kawamon\/hue,azureplus\/hue,epssy\/hue,rahul67\/hue,hdinsight\/hue,rahul67\/hue,abhishek-ch\/hue,hdinsight\/hue,jjmleiro\/hue,hdinsight\/hue,ahmed-mahran\/hue,dulems\/hue,jounex\/hue,todaychi\/hue,lumig242\/Hue-Integration-with-CDAP,MobinRanjbar\/hue,rahul67\/hue,epssy\/hue,nvoron23\/hue,fangxingli\/hue,mapr\/hue,pwong-mapr\/private-hue,vitan\/hue,pratikmallya\/hue,jjmleiro\/hue,yongshengwang\/hue,javachengwc\/hue,mapr\/hue,GitHublong\/hue,nvoron23\/hue,yongshengwang\/hue,vitan\/hue,epssy\/hue,rahul67\/hue,hdinsight\/hue,xiangel\/hue,dulems\/hue,xq262144\/hue,xiangel\/hue,Peddle\/hue,kawamon\/hue,kawamon\/hue,xq262144\/hue,cloudera\/hue,jjmleiro\/hue,abhishek-ch\/hue,lumig242\/Hue-Integration-with-CDAP,epssy\/hue,erickt\/hue,kawamon\/hue,cloudera\/hue,cloudera\/hue,xq262144\/hue,azureplus\/hue,pratikmallya\/hue,vitan\/hue,xq262144\/hue,epssy\/hue,azureplus\/hue,ahmed-mahran\/hue,Peddle\/hue,ChenJunor\/hue,ChenJunor\/hue,kawamon\/hue,kawamon\/hue,cloudera\/hue,yoer\/hue,vmax-feihu\/hue,jounex\/hue,jayceyxc\/hue,yoer\/hue,kawamon\/hue,MobinRanjbar\/hue,jjmleiro\/hue,xq262144\/hue,cloudera\/hue,jjmleiro\/hue,cloudera\/hue,GitHublong\/hue,dulems\/hue,mapr\/hue,ChenJunor\/hue,rahul67\/hue,todaychi\/hue,jayceyxc\/hue,Peddle\/hue,hdinsight\/hue,todaychi\/hue,xiangel\/hue,pratikmallya\/hue,dulems\/hue,vitan\/hue,MobinRanjbar\/hue,xiangel\/hue,erickt\/hue,kawamon\/hue,azureplus\/hue,nvoron23\/hue,pratikmallya\/hue,lumig242\/Hue-Integration-with-CDAP,kawamon\/hue,fangxingli\/hue,jayceyxc\/hue,yongshengwang\/hue,vmax-feihu\/hue,Peddle\/hue,ahmed-mahran\/hue,yoer\/hue,rahul67\/hue,javachengwc\/hue,lumig242\/Hue-Integration-with-CDAP,jounex\/hue,ahmed-mahran\/hue,cloudera\/hue,Peddle\/hue,todaychi\/hue,MobinRanjbar\/hue,cloudera\/hue,todaychi\/hue,yoer\/hue,pwong-mapr\/private-hue,erickt\/hue,todaychi\/hue,x303597316\/hue,jjmleiro\/hue,vmax-feihu\/hue,pratikmallya\/hue,cloudera\/hue,dulems\/hue,cloudera\/hue,yongshengwang\/hue,azureplus\/hue,jjmleiro\/hue,dulems\/hue,pwong-mapr\/private-hue,MobinRanjbar\/hue,lumig242\/Hue-Integration-with-CDAP,vitan\/hue,yongshengwang\/hue,ChenJunor\/hue,javachengwc\/hue,jayceyxc\/hue,kawamon\/hue,Peddle\/hue,jayceyxc\/hue,kawamon\/hue,pwong-mapr\/private-hue,erickt\/hue,lumig242\/Hue-Integration-with-CDAP,GitHublong\/hue,epssy\/hue,ChenJunor\/hue,hdinsight\/hue,GitHublong\/hue,rahul67\/hue,abhishek-ch\/hue,ChenJunor\/hue,kawamon\/hue,jayceyxc\/hue,xiangel\/hue,jayceyxc\/hue,nvoron23\/hue,erickt\/hue,kawamon\/hue,cloudera\/hue,xq262144\/hue,GitHublong\/hue,erickt\/hue,jjmleiro\/hue,javachengwc\/hue,vmax-feihu\/hue,azureplus\/hue,abhishek-ch\/hue,sanjeevtripurari\/hue,cloudera\/hue,hdinsight\/hue,erickt\/hue,GitHublong\/hue,vitan\/hue,nvoron23\/hue,rahul67\/hue,lumig242\/Hue-Integration-with-CDAP,jounex\/hue,kawamon\/hue,sanjeevtripurari\/hue,fangxingli\/hue,jounex\/hue,x303597316\/hue,sanjeevtripurari\/hue,sanjeevtripurari\/hue,x303597316\/hue,mapr\/hue,sanjeevtripurari\/hue,kawamon\/hue","old_file":"apps\/jobsub\/src\/jobsub\/java\/src\/org\/apache\/hadoop\/security\/JobClientTrace.aj","new_file":"apps\/jobsub\/src\/jobsub\/java\/src\/org\/apache\/hadoop\/security\/JobClientTrace.aj","new_contents":"\/\/ Licensed to Cloudera, Inc. under one\n\/\/ or more contributor license agreements.  See the NOTICE file\n\/\/ distributed with this work for additional information\n\/\/ regarding copyright ownership.  Cloudera, Inc. licenses this file\n\/\/ to you under the Apache License, Version 2.0 (the\n\/\/ \"License\"); you may not use this file except in compliance\n\/\/ with the License.  You may obtain a copy of the License at\n\/\/\n\/\/     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n\/\/\n\/\/ Unless required by applicable law or agreed to in writing, software\n\/\/ distributed under the License is distributed on an \"AS IS\" BASIS,\n\/\/ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n\/\/ See the License for the specific language governing permissions and\n\/\/ limitations under the License.\npackage org.apache.hadoop.security;\n\nimport org.apache.hadoop.conf.Configuration;\nimport org.apache.hadoop.mapred.*;\nimport org.apache.hadoop.security.Credentials;\nimport org.apache.commons.logging.Log;\nimport org.apache.commons.logging.LogFactory;\n\npublic aspect JobClientTrace {\n  private static final Log LOG = LogFactory.getLog(JobClientTracer.class);\n\n  JobClientTrace() {\n    LOG.info(\"Hue job submission aspect loaded.\");\n  }\n\n  RunningJob around(JobConf conf):\n    call(RunningJob JobClient.submitJobInternal(JobConf)) && args(conf) {\n    RunningJob ret = proceed(conf);\n    JobClientTracer.getInstance().submittedJob(ret);\n    return ret;\n  }\n\n  \/**\n   * The JobClient assumes that the user is authenticated via kerberos for the\n   * purpose of job submission, and thus that delegation tokens for the NN(s)\n   * can be retrieved. This doesn't work, however, in the case that the job is\n   * actually being submitted to the JT via an MR delegation token, because new\n   * delegation tokens can't be retrieved if one is only authenticated via\n   * delegation tokens. The work-around here is to pre-fetch NN delegation\n   * tokens from jobsubd, and pass them in. We set the\n   * <code>mapreduce.job.credentials.binary<\/code> here because this happens\n   * immediately before we try to fill the token cache with delegation tokens\n   * from the NN(s).\n   *\/\n  void around(Configuration conf, Credentials credentials):\n    call(void JobClient.readTokensFromFiles(Configuration, Credentials)) && args(conf, credentials) {\n\n    String hadoopTokenFileLocation = System.getenv(\"HADOOP_TOKEN_FILE_LOCATION\");\n    if (hadoopTokenFileLocation != null) {\n      conf.set(\"mapreduce.job.credentials.binary\", System.getenv(\"HADOOP_TOKEN_FILE_LOCATION\"));\n      conf.setBoolean(\"mapreduce.job.complete.cancel.delegation.tokens\", false);\n    }\n    proceed(conf, credentials);\n  }\n}\n","old_contents":"\/\/ Licensed to Cloudera, Inc. under one\n\/\/ or more contributor license agreements.  See the NOTICE file\n\/\/ distributed with this work for additional information\n\/\/ regarding copyright ownership.  Cloudera, Inc. licenses this file\n\/\/ to you under the Apache License, Version 2.0 (the\n\/\/ \"License\"); you may not use this file except in compliance\n\/\/ with the License.  You may obtain a copy of the License at\n\/\/\n\/\/     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n\/\/\n\/\/ Unless required by applicable law or agreed to in writing, software\n\/\/ distributed under the License is distributed on an \"AS IS\" BASIS,\n\/\/ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n\/\/ See the License for the specific language governing permissions and\n\/\/ limitations under the License.\npackage org.apache.hadoop.security;\n\nimport org.apache.hadoop.conf.Configuration;\nimport org.apache.hadoop.mapred.*;\nimport org.apache.hadoop.security.Credentials;\nimport org.apache.commons.logging.Log;\nimport org.apache.commons.logging.LogFactory;\n\npublic aspect JobClientTrace {\n  private static final Log LOG = LogFactory.getLog(JobClientTracer.class);\n\n  JobClientTrace() {\n    LOG.info(\"Hue job submission aspect loaded.\");\n  }\n\n  RunningJob around(JobConf conf):\n    call(RunningJob JobClient.submitJobInternal(JobConf)) && args(conf) {\n    RunningJob ret = proceed(conf);\n    JobClientTracer.getInstance().submittedJob(ret);\n    return ret;\n  }\n\n  \/**\n   * The JobClient assumes that the user is authenticated via kerberos for the\n   * purpose of job submission, and thus that delegation tokens for the NN(s)\n   * can be retrieved. This doesn't work, however, in the case that the job is\n   * actually being submitted to the JT via an MR delegation token, because new\n   * delegation tokens can't be retrieved if one is only authenticated via\n   * delegation tokens. The work-around here is to pre-fetch NN delegation\n   * tokens from jobsubd, and pass them in. We set the\n   * <code>mapreduce.job.credentials.binary<\/code> here because this happens\n   * immediately before we try to fill the token cache with delegation tokens\n   * from the NN(s).\n   *\/\n  void around(Configuration conf, Credentials credentials):\n    call(void JobClient.readTokensFromFiles(Configuration, Credentials)) && args(conf, credentials) {\n    conf.set(\"mapreduce.job.credentials.binary\", System.getenv(\"HADOOP_TOKEN_FILE_LOCATION\"));\n    conf.setBoolean(\"mapreduce.job.complete.cancel.delegation.tokens\", false);\n    proceed(conf, credentials);\n  }\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"ae79b9fbf6d7a8022277d3ded6fc11ec7e216d2a","subject":"Remove stale HierarchyResolver.remember around advice.","message":"Remove stale HierarchyResolver.remember around advice.\n\nThe around code currently breaks running JUnit tests in Java projects that use\nlambdas. This is because the cast to SourceTypeBinding fails on lambda bindings.\nEclipse suppresses the ClassCastException and tests just do not run.\n\nAs far as I can tell, there is actually no Scala IDE-specific code in this\n\"remember\" advice anyway. It was added in 2009 by Miles, and looks exactly like\nthe code it's replacing in older releases of Eclipse:\n\nhttps:\/\/github.com\/eclipse\/eclipse.jdt.core\/blob\/R3_2_maintenance\/org.eclipse.jdt.core\/model\/org\/eclipse\/jdt\/internal\/core\/hierarchy\/HierarchyResolver.java#L347\n\n(E.g. unlike most advice, it was not calling proceed\/etc., but instead was just\na raw copy\/paste of the original code. Probably well intentioned while trying\nto get things to work.)\n\nHowever, newer versions of Eclipse have added an instanceof check to handle lambads:\n\nhttps:\/\/github.com\/eclipse\/eclipse.jdt.core\/blob\/master\/org.eclipse.jdt.core\/model\/org\/eclipse\/jdt\/internal\/core\/hierarchy\/HierarchyResolver.java#L413\n\nWhich means this copy\/paste of the code is now stale.\n\nInstead of updating this code to match newer version of Eclipse, given\nit looks unneeded, I've just removed it.\n","repos":"mlangc\/scala-ide,scala-ide\/scala-ide,romanowski\/scala-ide,wpopielarski\/scala-ide,aleksi-lukkarinen\/scala-ide,dragos\/scala-ide,andrey-ilinykh\/scala-ide,sschaef\/scala-ide,sschaef\/scala-ide,andrey-ilinykh\/scala-ide,pilipolio\/scala-ide,dragos\/scala-ide,pilipolio\/scala-ide,aleksi-lukkarinen\/scala-ide,sschaef\/scala-ide,mlangc\/scala-ide,romanowski\/scala-ide,Duhemm\/scala-ide,romanowski\/scala-ide,stephenh\/scala-ide,wpopielarski\/scala-ide,aleksi-lukkarinen\/scala-ide,pilipolio\/scala-ide,wpopielarski\/scala-ide,wpopielarski\/scala-ide,andrey-ilinykh\/scala-ide,scala-ide\/scala-ide,Duhemm\/scala-ide,sschaef\/scala-ide,dragos\/scala-ide,Duhemm\/scala-ide,Duhemm\/scala-ide,pilipolio\/scala-ide,dragos\/scala-ide,stephenh\/scala-ide,andrey-ilinykh\/scala-ide,romanowski\/scala-ide,scala-ide\/scala-ide,mlangc\/scala-ide,scala-ide\/scala-ide,stephenh\/scala-ide,mlangc\/scala-ide,aleksi-lukkarinen\/scala-ide,stephenh\/scala-ide","old_file":"org.scala-ide.sdt.aspects\/src-luna\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/cfprovider\/ClassFileProviderAspect.aj","new_file":"org.scala-ide.sdt.aspects\/src-luna\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/cfprovider\/ClassFileProviderAspect.aj","new_contents":"\/*\n * Copyright 2005-2010 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.cfprovider;\n\nimport java.util.HashSet;\n\nimport org.eclipse.core.filebuffers.FileBuffers;\nimport org.eclipse.core.filebuffers.ITextFileBuffer;\nimport org.eclipse.core.filebuffers.ITextFileBufferManager;\nimport org.eclipse.core.filebuffers.LocationKind;\nimport org.eclipse.core.resources.IResource;\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.core.IBuffer;\nimport org.eclipse.jdt.core.IClassFile;\nimport org.eclipse.jdt.core.IImportDeclaration;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IOpenable;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.ITypeRoot;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.core.dom.CompilationUnit;\nimport org.eclipse.jdt.core.search.TypeNameMatch;\nimport org.eclipse.jdt.internal.compiler.CompilationResult;\nimport org.eclipse.jdt.internal.compiler.ast.ASTNode;\nimport org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.ImportReference;\nimport org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.TypeReference;\nimport org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;\nimport org.eclipse.jdt.internal.compiler.env.IBinaryType;\nimport org.eclipse.jdt.internal.compiler.env.ICompilationUnit;\nimport org.eclipse.jdt.internal.compiler.env.IGenericType;\nimport org.eclipse.jdt.internal.compiler.env.ISourceImport;\nimport org.eclipse.jdt.internal.compiler.env.ISourceType;\nimport org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer;\nimport org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding;\nimport org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding;\nimport org.eclipse.jdt.internal.compiler.parser.Parser;\nimport org.eclipse.jdt.internal.compiler.parser.SourceTypeConverter;\nimport org.eclipse.jdt.internal.core.BinaryType;\nimport org.eclipse.jdt.internal.core.ClassFile;\nimport org.eclipse.jdt.internal.core.CompilationUnitElementInfo;\nimport org.eclipse.jdt.internal.core.ImportDeclaration;\nimport org.eclipse.jdt.internal.core.JavaElement;\nimport org.eclipse.jdt.internal.core.BufferManager;\nimport org.eclipse.jdt.internal.core.NameLookup;\nimport org.eclipse.jdt.internal.core.Openable;\nimport org.eclipse.jdt.internal.core.PackageFragment;\nimport org.eclipse.jdt.internal.core.SearchableEnvironment;\nimport org.eclipse.jdt.internal.core.SourceMapper;\nimport org.eclipse.jdt.internal.core.SourceType;\nimport org.eclipse.jdt.internal.core.SourceTypeElementInfo;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyResolver;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyType;\nimport org.eclipse.jdt.internal.core.util.Util;\nimport org.eclipse.jdt.internal.corext.util.OpenTypeHistory;\nimport org.eclipse.jdt.internal.ui.filters.InnerClassFilesFilter;\nimport org.eclipse.jdt.ui.SharedASTProvider;\nimport org.eclipse.jface.viewers.Viewer;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaClassFile;\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaElement;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect ClassFileProviderAspect {\n\n  pointcut classFileCreations(PackageFragment parent, String name) : \n    call(protected ClassFile.new(PackageFragment, String)) &&\n    within(org.eclipse.jdt..*) &&\n    args(parent, name);\n  \n  pointcut getTypeName(ClassFile cf) :\n    execution(public String ClassFile.getTypeName()) &&\n    target(cf);\n\n  \/\/ For 3.6\n  pointcut mapSource(ClassFile cf, SourceMapper mapper, IBinaryType info, IClassFile owner) :\n    execution(IBuffer ClassFile.mapSource(SourceMapper, IBinaryType, IClassFile)) &&\n    target(cf) &&\n    target(IScalaClassFile) &&\n    args(mapper, info, owner);\n\n  \/\/ For 3.5\n  pointcut mapSource2(ClassFile cf, SourceMapper mapper, IBinaryType info) :\n    execution(IBuffer ClassFile.mapSource(SourceMapper, IBinaryType)) &&\n    target(cf) &&\n    target(IScalaClassFile) &&\n    args(mapper, info);\n\n  pointcut getSourceFileName(BinaryType bt) :\n    execution(String BinaryType.getSourceFileName(IBinaryType)) &&\n    target(bt);\n  \n  pointcut select(Viewer viewer, Object parentElement, Object element) :\n    execution(boolean InnerClassFilesFilter.select(Viewer, Object, Object)) &&\n    args(viewer, parentElement, element);\n  \n  pointcut getChildren(BinaryType bt) :\n    execution(IJavaElement[] BinaryType.getChildren()) &&\n    target(bt);\n  \n  pointcut getAST(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) : \n    execution(CompilationUnit SharedASTProvider.getAST(ITypeRoot, SharedASTProvider.WAIT_FLAG, IProgressMonitor)) &&\n    args(element, waitFlag, progressMonitor);\n  \n  pointcut resolve(HierarchyResolver hr, IGenericType suppliedType) :\n    execution(void HierarchyResolver.resolve(IGenericType)) &&\n    target(hr) &&\n    args(suppliedType);\n  \n  pointcut acceptType(IType type, int acceptFlags, boolean isSourceType) :\n    execution(boolean NameLookup.acceptType(IType, int, boolean)) &&\n    args(type, acceptFlags, isSourceType);\n  \n  pointcut find(SearchableEnvironment se, String typeName, String packageName) :\n    execution(NameEnvironmentAnswer find(String, String)) &&\n    target(se) &&\n    args(typeName, packageName);\n  \n  pointcut convert(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) :\n    execution(CompilationUnitDeclaration SourceTypeConverter.convert(ISourceType[], CompilationResult)) &&\n    target(stc) &&\n    args(sourceTypes, compilationResult);\n  \n  pointcut getAncestor(JavaElement je, int ancestorType) :\n    execution(IJavaElement JavaElement.getAncestor(int)) &&\n    target(je) &&\n    args(ancestorType);\n  \n  pointcut isContainerDirty(TypeNameMatch match) :\n    execution(boolean OpenTypeHistory.isContainerDirty(TypeNameMatch)) &&\n    args(match);\n  \n  ClassFile around(PackageFragment parent, String name) : \n    classFileCreations(parent, name) {\n\n    ClassFile javaClassFile = proceed(parent, name);\n    byte[] bytes;\n    \n    try {\n        for (IClassFileProvider provider : ClassFileProviderRegistry.getInstance().getProviders()) {\n          if (provider.isInteresting(javaClassFile)) {\n            bytes = javaClassFile.getBytes();\n            ClassFile cf = provider.create(bytes, parent, name);\n            if (cf != null)\n              return cf;\n          }\n        }\n    } catch(Throwable t) {\n      return javaClassFile; \n    }\n    \n    return javaClassFile;\n  }\n  \n  IBuffer around(ClassFile cf, SourceMapper mapper, IBinaryType info, IClassFile owner) :\n    mapSource(cf, mapper, info, owner) {\n    return mapSourceSubst(cf, mapper, info);\n  }\n\n  IBuffer around(ClassFile cf, SourceMapper mapper, IBinaryType info) :\n    mapSource2(cf, mapper, info) {\n    return mapSourceSubst(cf, mapper, info);\n  }\n\n  IBuffer mapSourceSubst(ClassFile cf, SourceMapper mapper, IBinaryType info) {\n    char[] contents = mapper.findSource(cf.getType(), info);\n    IBuffer buffer;\n    if (contents != null) {\n      buffer = BufferManager.createBuffer(cf);\n      buffer.setContents(contents);\n    } else {\n      buffer = BufferManager.createNullBuffer(cf);\n    }\n    BufferManager bufManager = cf.getBufferManager();\n    bufManager.addBuffer(buffer);\n    buffer.addBufferChangedListener(cf);\n    return buffer;\n  }\n\n  String around(ClassFile cf) :\n    getTypeName(cf) {\n    if(cf instanceof IScalaClassFile) {\n      int lastDollar = cf.name.lastIndexOf('$');\n      return (lastDollar == -1 || lastDollar == cf.name.length()-1) ? cf.name : Util.localTypeName(cf.name, lastDollar, cf.name.length());\n    } else\n      return proceed(cf);\n  }\n  \n  boolean around(Viewer viewer, Object parentElement, Object element) :\n    select(viewer, parentElement, element) {\n    if (element instanceof IScalaClassFile) {\n      IClassFile classFile = (IClassFile) element;\n      String name = classFile.getElementName(); \n      int dollarIndex = name.indexOf('$');\n      return dollarIndex == -1 || dollarIndex == name.length()-7; \/\/ Trailing '$' implies object rather than inner class \n    }\n    return proceed(viewer, parentElement, element);\n  }\n  \n  IJavaElement[] around(BinaryType bt) throws JavaModelException :\n    getChildren(bt) && \n    target(BinaryType) {\n    ClassFile cf = (ClassFile)bt.parent;\n    if (cf instanceof IScalaClassFile)\n      return cf.getChildren();\n    else\n      return proceed(bt);\n  }\n  \n  CompilationUnit around(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) :\n    getAST(element, waitFlag, progressMonitor) {\n      if (element instanceof IScalaElement)\n        return null;\n      else\n        return proceed(element, waitFlag, progressMonitor);\n  }\n  \n  void around(HierarchyResolver hr, IGenericType suppliedType) :\n    resolve(hr, suppliedType) {\n    if (!suppliedType.isBinaryType()) {\n      IType tpe = ((SourceTypeElementInfo)suppliedType).getHandle();\n      IClassFile cf = tpe.getClassFile();\n      if (cf instanceof IScalaClassFile) {\n        hr.resolve(new Openable[]{(Openable)cf}, new HashSet(), null);\n        return;\n      }\n    }\n      \n    proceed(hr, suppliedType);\n  }\n  \n  String around(BinaryType bt) :\n    getSourceFileName(bt) {\n    IJavaElement parent = bt.getTypeRoot(); \n    if (parent instanceof IScalaClassFile) {\n      return ((IScalaClassFile)parent).getSourceFileName();\n    }\n    else\n      return proceed(bt);\n  }\n  \n  boolean around(IType type, int acceptFlags, boolean isSourceType) :\n    acceptType(type, acceptFlags, isSourceType) {\n    if (!isSourceType && (type instanceof SourceType)) {\n      IJavaElement parent = type.getParent(); \n      if (parent instanceof IScalaClassFile)\n        return proceed(type, acceptFlags, true);\n    }\n    \n    return proceed(type, acceptFlags, isSourceType);\n  }\n  \n  CompilationUnitDeclaration around(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) throws JavaModelException :\n    convert(stc, sourceTypes, compilationResult) {\n    stc.unit = new CompilationUnitDeclaration(stc.problemReporter, compilationResult, 0);\n    \/\/ not filled at this point\n\n    if (sourceTypes.length == 0 || sourceTypes[0] == null) return stc.unit;\n    SourceTypeElementInfo topLevelTypeInfo = (SourceTypeElementInfo) sourceTypes[0];\n    org.eclipse.jdt.core.ICompilationUnit cuHandle = topLevelTypeInfo.getHandle().getCompilationUnit();\n    stc.cu = (ICompilationUnit) cuHandle;\n\n    CompilationUnitElementInfo cuei = null;\n    Object info = ((JavaElement)stc.cu).getElementInfo();\n    if (info instanceof CompilationUnitElementInfo)\n      cuei = (CompilationUnitElementInfo)info;\n    \n    \n    if (stc.has1_5Compliance && cuei != null && cuei.annotationNumber > 10) { \/\/ experimental value\n      \/\/ if more than 10 annotations, diet parse as this is faster\n      return new Parser(stc.problemReporter, true).dietParse(stc.cu, compilationResult);\n    }\n\n    \/* only positions available *\/\n    int start = topLevelTypeInfo.getNameSourceStart();\n    int end = topLevelTypeInfo.getNameSourceEnd();\n\n    \/* convert package and imports *\/\n    String[] packageName = ((PackageFragment) cuHandle.getParent()).names;\n    if (packageName.length > 0)\n      \/\/ if its null then it is defined in the default package\n      stc.unit.currentPackage =\n        stc.createImportReference(packageName, start, end, false, ClassFileConstants.AccDefault);\n    IImportDeclaration[] importDeclarations = topLevelTypeInfo.getHandle().getCompilationUnit().getImports();\n    int importCount = importDeclarations.length;\n    stc.unit.imports = new ImportReference[importCount];\n    for (int i = 0; i < importCount; i++) {\n      ImportDeclaration importDeclaration = (ImportDeclaration) importDeclarations[i];\n      ISourceImport sourceImport = (ISourceImport) importDeclaration.getElementInfo();\n      String nameWithoutStar = importDeclaration.getNameWithoutStar();\n      stc.unit.imports[i] = stc.createImportReference(\n        Util.splitOn('.', nameWithoutStar, 0, nameWithoutStar.length()),\n        sourceImport.getDeclarationSourceStart(),\n        sourceImport.getDeclarationSourceEnd(),\n        importDeclaration.isOnDemand(),\n        sourceImport.getModifiers());\n    }\n    \/* convert type(s) *\/\n    try {\n      int typeCount = sourceTypes.length;\n      final TypeDeclaration[] types = new TypeDeclaration[typeCount];\n      \/*\n       * We used a temporary types collection to prevent this.unit.types from being null during a call to\n       * convert(...) when the source is syntactically incorrect and the parser is flushing the unit's types.\n       * See https:\/\/bugs.eclipse.org\/bugs\/show_bug.cgi?id=97466\n       *\/\n      for (int i = 0; i < typeCount; i++) {\n        SourceTypeElementInfo typeInfo = (SourceTypeElementInfo) sourceTypes[i];\n        types[i] = stc.convert((SourceType) typeInfo.getHandle(), compilationResult);\n      }\n      stc.unit.types = types;\n      return stc.unit;\n    } catch (SourceTypeConverter.AnonymousMemberFound e) {\n      return new Parser(stc.problemReporter, true).parse(stc.cu, compilationResult);\n    }\n  }\n  \n  IJavaElement around(JavaElement je, int ancestorType) :\n    getAncestor(je, ancestorType) {\n    IJavaElement element = je;\n    while (element != null) {\n      if (element.getElementType() == ancestorType)\n        return element;\n      else if (element instanceof IScalaClassFile && ancestorType == IJavaElement.COMPILATION_UNIT)\n        return ((JavaElement)element).getCompilationUnit();\n      element= element.getParent();\n    }\n    return null;\n  }\n\n  boolean around(TypeNameMatch match) :\n    isContainerDirty(match) {\n    org.eclipse.jdt.core.ICompilationUnit cu = match.getType().getCompilationUnit();\n    if (cu == null) {\n      return false;\n    }\n    IResource resource= cu.getResource();\n    if (resource == null)\n      return false;\n    \n    ITextFileBufferManager manager= FileBuffers.getTextFileBufferManager();\n    ITextFileBuffer textFileBuffer= manager.getTextFileBuffer(resource.getFullPath(), LocationKind.IFILE);\n    if (textFileBuffer != null) {\n      return textFileBuffer.isDirty();\n    }\n    return false;\n  }\n}\n","old_contents":"\/*\n * Copyright 2005-2010 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.cfprovider;\n\nimport java.util.HashSet;\n\nimport org.eclipse.core.filebuffers.FileBuffers;\nimport org.eclipse.core.filebuffers.ITextFileBuffer;\nimport org.eclipse.core.filebuffers.ITextFileBufferManager;\nimport org.eclipse.core.filebuffers.LocationKind;\nimport org.eclipse.core.resources.IResource;\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.core.IBuffer;\nimport org.eclipse.jdt.core.IClassFile;\nimport org.eclipse.jdt.core.IImportDeclaration;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IOpenable;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.ITypeRoot;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.core.dom.CompilationUnit;\nimport org.eclipse.jdt.core.search.TypeNameMatch;\nimport org.eclipse.jdt.internal.compiler.CompilationResult;\nimport org.eclipse.jdt.internal.compiler.ast.ASTNode;\nimport org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.ImportReference;\nimport org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.TypeReference;\nimport org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;\nimport org.eclipse.jdt.internal.compiler.env.IBinaryType;\nimport org.eclipse.jdt.internal.compiler.env.ICompilationUnit;\nimport org.eclipse.jdt.internal.compiler.env.IGenericType;\nimport org.eclipse.jdt.internal.compiler.env.ISourceImport;\nimport org.eclipse.jdt.internal.compiler.env.ISourceType;\nimport org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer;\nimport org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding;\nimport org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding;\nimport org.eclipse.jdt.internal.compiler.parser.Parser;\nimport org.eclipse.jdt.internal.compiler.parser.SourceTypeConverter;\nimport org.eclipse.jdt.internal.core.BinaryType;\nimport org.eclipse.jdt.internal.core.ClassFile;\nimport org.eclipse.jdt.internal.core.CompilationUnitElementInfo;\nimport org.eclipse.jdt.internal.core.ImportDeclaration;\nimport org.eclipse.jdt.internal.core.JavaElement;\nimport org.eclipse.jdt.internal.core.BufferManager;\nimport org.eclipse.jdt.internal.core.NameLookup;\nimport org.eclipse.jdt.internal.core.Openable;\nimport org.eclipse.jdt.internal.core.PackageFragment;\nimport org.eclipse.jdt.internal.core.SearchableEnvironment;\nimport org.eclipse.jdt.internal.core.SourceMapper;\nimport org.eclipse.jdt.internal.core.SourceType;\nimport org.eclipse.jdt.internal.core.SourceTypeElementInfo;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyResolver;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyType;\nimport org.eclipse.jdt.internal.core.util.Util;\nimport org.eclipse.jdt.internal.corext.util.OpenTypeHistory;\nimport org.eclipse.jdt.internal.ui.filters.InnerClassFilesFilter;\nimport org.eclipse.jdt.ui.SharedASTProvider;\nimport org.eclipse.jface.viewers.Viewer;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaClassFile;\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaElement;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect ClassFileProviderAspect {\n\n  pointcut classFileCreations(PackageFragment parent, String name) : \n    call(protected ClassFile.new(PackageFragment, String)) &&\n    within(org.eclipse.jdt..*) &&\n    args(parent, name);\n  \n  pointcut getTypeName(ClassFile cf) :\n    execution(public String ClassFile.getTypeName()) &&\n    target(cf);\n\n  \/\/ For 3.6\n  pointcut mapSource(ClassFile cf, SourceMapper mapper, IBinaryType info, IClassFile owner) :\n    execution(IBuffer ClassFile.mapSource(SourceMapper, IBinaryType, IClassFile)) &&\n    target(cf) &&\n    target(IScalaClassFile) &&\n    args(mapper, info, owner);\n\n  \/\/ For 3.5\n  pointcut mapSource2(ClassFile cf, SourceMapper mapper, IBinaryType info) :\n    execution(IBuffer ClassFile.mapSource(SourceMapper, IBinaryType)) &&\n    target(cf) &&\n    target(IScalaClassFile) &&\n    args(mapper, info);\n\n  pointcut getSourceFileName(BinaryType bt) :\n    execution(String BinaryType.getSourceFileName(IBinaryType)) &&\n    target(bt);\n  \n  pointcut select(Viewer viewer, Object parentElement, Object element) :\n    execution(boolean InnerClassFilesFilter.select(Viewer, Object, Object)) &&\n    args(viewer, parentElement, element);\n  \n  pointcut getChildren(BinaryType bt) :\n    execution(IJavaElement[] BinaryType.getChildren()) &&\n    target(bt);\n  \n  pointcut getAST(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) : \n    execution(CompilationUnit SharedASTProvider.getAST(ITypeRoot, SharedASTProvider.WAIT_FLAG, IProgressMonitor)) &&\n    args(element, waitFlag, progressMonitor);\n  \n  pointcut resolve(HierarchyResolver hr, IGenericType suppliedType) :\n    execution(void HierarchyResolver.resolve(IGenericType)) &&\n    target(hr) &&\n    args(suppliedType);\n  \n  pointcut remember(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    execution(void HierarchyResolver.remember(IType, ReferenceBinding)) &&\n    target(hr) &&\n    args(type, typeBinding);\n  \n  pointcut acceptType(IType type, int acceptFlags, boolean isSourceType) :\n    execution(boolean NameLookup.acceptType(IType, int, boolean)) &&\n    args(type, acceptFlags, isSourceType);\n  \n  pointcut find(SearchableEnvironment se, String typeName, String packageName) :\n    execution(NameEnvironmentAnswer find(String, String)) &&\n    target(se) &&\n    args(typeName, packageName);\n  \n  pointcut convert(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) :\n    execution(CompilationUnitDeclaration SourceTypeConverter.convert(ISourceType[], CompilationResult)) &&\n    target(stc) &&\n    args(sourceTypes, compilationResult);\n  \n  pointcut getAncestor(JavaElement je, int ancestorType) :\n    execution(IJavaElement JavaElement.getAncestor(int)) &&\n    target(je) &&\n    args(ancestorType);\n  \n  pointcut isContainerDirty(TypeNameMatch match) :\n    execution(boolean OpenTypeHistory.isContainerDirty(TypeNameMatch)) &&\n    args(match);\n  \n  ClassFile around(PackageFragment parent, String name) : \n    classFileCreations(parent, name) {\n\n    ClassFile javaClassFile = proceed(parent, name);\n    byte[] bytes;\n    \n    try {\n        for (IClassFileProvider provider : ClassFileProviderRegistry.getInstance().getProviders()) {\n          if (provider.isInteresting(javaClassFile)) {\n            bytes = javaClassFile.getBytes();\n            ClassFile cf = provider.create(bytes, parent, name);\n            if (cf != null)\n              return cf;\n          }\n        }\n    } catch(Throwable t) {\n      return javaClassFile; \n    }\n    \n    return javaClassFile;\n  }\n  \n  IBuffer around(ClassFile cf, SourceMapper mapper, IBinaryType info, IClassFile owner) :\n    mapSource(cf, mapper, info, owner) {\n    return mapSourceSubst(cf, mapper, info);\n  }\n\n  IBuffer around(ClassFile cf, SourceMapper mapper, IBinaryType info) :\n    mapSource2(cf, mapper, info) {\n    return mapSourceSubst(cf, mapper, info);\n  }\n\n  IBuffer mapSourceSubst(ClassFile cf, SourceMapper mapper, IBinaryType info) {\n    char[] contents = mapper.findSource(cf.getType(), info);\n    IBuffer buffer;\n    if (contents != null) {\n      buffer = BufferManager.createBuffer(cf);\n      buffer.setContents(contents);\n    } else {\n      buffer = BufferManager.createNullBuffer(cf);\n    }\n    BufferManager bufManager = cf.getBufferManager();\n    bufManager.addBuffer(buffer);\n    buffer.addBufferChangedListener(cf);\n    return buffer;\n  }\n\n  String around(ClassFile cf) :\n    getTypeName(cf) {\n    if(cf instanceof IScalaClassFile) {\n      int lastDollar = cf.name.lastIndexOf('$');\n      return (lastDollar == -1 || lastDollar == cf.name.length()-1) ? cf.name : Util.localTypeName(cf.name, lastDollar, cf.name.length());\n    } else\n      return proceed(cf);\n  }\n  \n  boolean around(Viewer viewer, Object parentElement, Object element) :\n    select(viewer, parentElement, element) {\n    if (element instanceof IScalaClassFile) {\n      IClassFile classFile = (IClassFile) element;\n      String name = classFile.getElementName(); \n      int dollarIndex = name.indexOf('$');\n      return dollarIndex == -1 || dollarIndex == name.length()-7; \/\/ Trailing '$' implies object rather than inner class \n    }\n    return proceed(viewer, parentElement, element);\n  }\n  \n  IJavaElement[] around(BinaryType bt) throws JavaModelException :\n    getChildren(bt) && \n    target(BinaryType) {\n    ClassFile cf = (ClassFile)bt.parent;\n    if (cf instanceof IScalaClassFile)\n      return cf.getChildren();\n    else\n      return proceed(bt);\n  }\n  \n  CompilationUnit around(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) :\n    getAST(element, waitFlag, progressMonitor) {\n      if (element instanceof IScalaElement)\n        return null;\n      else\n        return proceed(element, waitFlag, progressMonitor);\n  }\n  \n  void around(HierarchyResolver hr, IGenericType suppliedType) :\n    resolve(hr, suppliedType) {\n    if (!suppliedType.isBinaryType()) {\n      IType tpe = ((SourceTypeElementInfo)suppliedType).getHandle();\n      IClassFile cf = tpe.getClassFile();\n      if (cf instanceof IScalaClassFile) {\n        hr.resolve(new Openable[]{(Openable)cf}, new HashSet(), null);\n        return;\n      }\n    }\n      \n    proceed(hr, suppliedType);\n  }\n  \n  void around(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    remember(hr, type, typeBinding) {\n    if (((IOpenable)type.getCompilationUnit()).isOpen()) {\n      try {\n        IGenericType genericType = (IGenericType)((JavaElement)type).getElementInfo();\n        hr.remember(genericType, typeBinding);\n      } catch (JavaModelException e) {\n        \/\/ cannot happen since element is open\n        return;\n      }\n    } else {\n      if (typeBinding == null) return;\n\n      TypeDeclaration typeDeclaration = ((SourceTypeBinding)typeBinding).scope.referenceType();\n\n      \/\/ simple super class name\n      char[] superclassName = null;\n      TypeReference superclass;\n      boolean anonymous;\n      if ((typeDeclaration.bits & ASTNode.IsAnonymousType) != 0) {\n        superclass = typeDeclaration.allocation.type;\n        anonymous = true;\n      } else {\n        superclass = typeDeclaration.superclass;\n        anonymous = false;\n      }\n      if (superclass != null) {\n        char[][] typeName = superclass.getTypeName();\n        superclassName = typeName == null ? null : typeName[typeName.length-1];\n      }\n\n      \/\/ simple super interface names\n      char[][] superInterfaceNames = null;\n      TypeReference[] superInterfaces = typeDeclaration.superInterfaces;\n      if (superInterfaces != null) {\n        int length = superInterfaces.length;\n        superInterfaceNames = new char[length][];\n        for (int i = 0; i < length; i++) {\n          TypeReference superInterface = superInterfaces[i];\n          char[][] typeName = superInterface.getTypeName();\n          superInterfaceNames[i] = typeName[typeName.length-1];\n        }\n      }\n\n      HierarchyType hierarchyType = new HierarchyType(\n        type,\n        typeDeclaration.name,\n        typeDeclaration.binding.modifiers,\n        superclassName,\n        superInterfaceNames,\n        anonymous);\n      hr.remember(hierarchyType, typeDeclaration.binding);\n    }\n  }\n  \n  String around(BinaryType bt) :\n    getSourceFileName(bt) {\n    IJavaElement parent = bt.getTypeRoot(); \n    if (parent instanceof IScalaClassFile) {\n      return ((IScalaClassFile)parent).getSourceFileName();\n    }\n    else\n      return proceed(bt);\n  }\n  \n  boolean around(IType type, int acceptFlags, boolean isSourceType) :\n    acceptType(type, acceptFlags, isSourceType) {\n    if (!isSourceType && (type instanceof SourceType)) {\n      IJavaElement parent = type.getParent(); \n      if (parent instanceof IScalaClassFile)\n        return proceed(type, acceptFlags, true);\n    }\n    \n    return proceed(type, acceptFlags, isSourceType);\n  }\n  \n  CompilationUnitDeclaration around(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) throws JavaModelException :\n    convert(stc, sourceTypes, compilationResult) {\n    stc.unit = new CompilationUnitDeclaration(stc.problemReporter, compilationResult, 0);\n    \/\/ not filled at this point\n\n    if (sourceTypes.length == 0 || sourceTypes[0] == null) return stc.unit;\n    SourceTypeElementInfo topLevelTypeInfo = (SourceTypeElementInfo) sourceTypes[0];\n    org.eclipse.jdt.core.ICompilationUnit cuHandle = topLevelTypeInfo.getHandle().getCompilationUnit();\n    stc.cu = (ICompilationUnit) cuHandle;\n\n    CompilationUnitElementInfo cuei = null;\n    Object info = ((JavaElement)stc.cu).getElementInfo();\n    if (info instanceof CompilationUnitElementInfo)\n      cuei = (CompilationUnitElementInfo)info;\n    \n    \n    if (stc.has1_5Compliance && cuei != null && cuei.annotationNumber > 10) { \/\/ experimental value\n      \/\/ if more than 10 annotations, diet parse as this is faster\n      return new Parser(stc.problemReporter, true).dietParse(stc.cu, compilationResult);\n    }\n\n    \/* only positions available *\/\n    int start = topLevelTypeInfo.getNameSourceStart();\n    int end = topLevelTypeInfo.getNameSourceEnd();\n\n    \/* convert package and imports *\/\n    String[] packageName = ((PackageFragment) cuHandle.getParent()).names;\n    if (packageName.length > 0)\n      \/\/ if its null then it is defined in the default package\n      stc.unit.currentPackage =\n        stc.createImportReference(packageName, start, end, false, ClassFileConstants.AccDefault);\n    IImportDeclaration[] importDeclarations = topLevelTypeInfo.getHandle().getCompilationUnit().getImports();\n    int importCount = importDeclarations.length;\n    stc.unit.imports = new ImportReference[importCount];\n    for (int i = 0; i < importCount; i++) {\n      ImportDeclaration importDeclaration = (ImportDeclaration) importDeclarations[i];\n      ISourceImport sourceImport = (ISourceImport) importDeclaration.getElementInfo();\n      String nameWithoutStar = importDeclaration.getNameWithoutStar();\n      stc.unit.imports[i] = stc.createImportReference(\n        Util.splitOn('.', nameWithoutStar, 0, nameWithoutStar.length()),\n        sourceImport.getDeclarationSourceStart(),\n        sourceImport.getDeclarationSourceEnd(),\n        importDeclaration.isOnDemand(),\n        sourceImport.getModifiers());\n    }\n    \/* convert type(s) *\/\n    try {\n      int typeCount = sourceTypes.length;\n      final TypeDeclaration[] types = new TypeDeclaration[typeCount];\n      \/*\n       * We used a temporary types collection to prevent this.unit.types from being null during a call to\n       * convert(...) when the source is syntactically incorrect and the parser is flushing the unit's types.\n       * See https:\/\/bugs.eclipse.org\/bugs\/show_bug.cgi?id=97466\n       *\/\n      for (int i = 0; i < typeCount; i++) {\n        SourceTypeElementInfo typeInfo = (SourceTypeElementInfo) sourceTypes[i];\n        types[i] = stc.convert((SourceType) typeInfo.getHandle(), compilationResult);\n      }\n      stc.unit.types = types;\n      return stc.unit;\n    } catch (SourceTypeConverter.AnonymousMemberFound e) {\n      return new Parser(stc.problemReporter, true).parse(stc.cu, compilationResult);\n    }\n  }\n  \n  IJavaElement around(JavaElement je, int ancestorType) :\n    getAncestor(je, ancestorType) {\n    IJavaElement element = je;\n    while (element != null) {\n      if (element.getElementType() == ancestorType)\n        return element;\n      else if (element instanceof IScalaClassFile && ancestorType == IJavaElement.COMPILATION_UNIT)\n        return ((JavaElement)element).getCompilationUnit();\n      element= element.getParent();\n    }\n    return null;\n  }\n\n  boolean around(TypeNameMatch match) :\n    isContainerDirty(match) {\n    org.eclipse.jdt.core.ICompilationUnit cu = match.getType().getCompilationUnit();\n    if (cu == null) {\n      return false;\n    }\n    IResource resource= cu.getResource();\n    if (resource == null)\n      return false;\n    \n    ITextFileBufferManager manager= FileBuffers.getTextFileBufferManager();\n    ITextFileBuffer textFileBuffer= manager.getTextFileBuffer(resource.getFullPath(), LocationKind.IFILE);\n    if (textFileBuffer != null) {\n      return textFileBuffer.isDirty();\n    }\n    return false;\n  }\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"18b0d10bd0993a4595a0a6a72607a8401d42618c","subject":"add ConcurrentHashMap","message":"add ConcurrentHashMap\n","repos":"mebigfatguy\/hashshmash","old_file":"aj\/com\/mebigfatguy\/hashshmash\/HashCollector.aj","new_file":"aj\/com\/mebigfatguy\/hashshmash\/HashCollector.aj","new_contents":"\/*\n * hashshmash - An aspect to record HashMap\/Set allocations\n * Copyright 2013 MeBigFatGuy.com\n * Copyright 2013 Dave Brosius\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *    http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing,\n * software distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and limitations\n * under the License.\n *\/\npackage com.mebigfatguy.hashshmash;\n\nimport java.io.BufferedWriter;\nimport java.io.File;\nimport java.io.FileOutputStream;\nimport java.io.OutputStreamWriter;\nimport java.io.PrintWriter;\nimport java.lang.reflect.Field;\nimport java.text.SimpleDateFormat;\nimport java.util.Date;\nimport java.util.HashMap;\nimport java.util.HashSet;\nimport java.util.LinkedHashMap;\nimport java.util.LinkedHashSet;\nimport java.util.Map;\nimport java.util.Map.Entry;\nimport java.util.Set;\nimport java.util.concurrent.ConcurrentHashMap;\n\npublic aspect HashCollector {\n    \n    private static final Journaller journaller = new Journaller();\n\n    after() returning (Map<?,?> m): call(HashMap.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashMapDetails details = new HashMapDetails(m, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    after() returning (Map<?,?> m): call(LinkedHashMap.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashMapDetails details = new LinkedHashMapDetails(m, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    after() returning (Map<?,?> m): call(ConcurrentHashMapMap.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashMapDetails details = new ConcurrentHashMapDetails(m, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    after() returning (Set<?> s): call(HashSet.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashSetDetails details = new HashSetDetails(s, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    after() returning (Set<?> s): call(LinkedHashSet.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashSetDetails details = new LinkedHashSetDetails(s, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    before(): execution(public static void *.main(String[])) {\n        Class<?> c = HashCollector.class;\n    }\n}\n\nfinal class Journaller implements Runnable {\n    \n    private static final int SLEEP_TIME = 5 * 1000;\n    \n    private Field tableField;\n    private ConcurrentHashMap<HashDetails, HashDetails> hDetails = new ConcurrentHashMap<HashDetails, HashDetails>();\n    private PrintWriter writer;\n    private boolean operational = false;\n\n    public Journaller() {\n        try {\n            System.out.println(\"*************************\");\n            System.out.println(\"HASHSHMASH ASPECT ENABLED\");\n            System.out.println(\"*************************\");\n            \n            tableField = HashMap.class.getDeclaredField(\"table\");\n            tableField.setAccessible(true);\n              \n            File dir = new File(System.getProperty(\"user.home\"), \".hashshmash\");\n            dir.mkdirs();  \n            \n            writer = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(new File(dir, new Date().toString() + \".txt\")))));\n            \n            Thread t = new Thread(this);\n            t.setDaemon(true);\n            operational = true;\n            t.start();\n        } catch (Exception e) {\n        }\n    }\n    \n    public void add(HashDetails details) {\n        if (operational)\n            hDetails.put(details,  details);\n    }\n    \n    public void run() {\n        try {\n            while (!Thread.interrupted()) {\n                Thread.sleep(SLEEP_TIME);\n                \n                for (HashDetails details : hDetails.keySet()) {\n                    try {\n                        Map<?, ?> map = details.getMap();\n                        if (map != null) {\n                            int newSize = details.getMap().size();\n                            if (newSize == details.size) {\n                                Entry<?, ?>[] table = (Entry<?, ?>[])tableField.get(map);\n                                details.totalSlots = table.length;\n                                for (Entry<?, ?> e : table) {\n                                    if (e != null) {\n                                        details.usedSlots++;\n                                    }\n                                }\n                                writer.println(details);\n                                hDetails.remove(details);\n                            } else\n                                details.size = newSize;\n                        } else {\n                            hDetails.remove(details);\n                        }\n                    } catch (Exception e) {\n                        \/\/might get ConcurrentModificationException or such, just ignore\n                    }\n                }\n                writer.flush();\n            }\n        } catch (InterruptedException ie) {    \n        }\n    }\n}\n\nabstract class HashDetails {\n    private static SimpleDateFormat FORMATTER = new SimpleDateFormat(\"MM\/dd\/yyyy HH:mm:ss-SSS\");\n    \n    public Date allocTime;\n    public String caller;\n    public int size;\n    public int usedSlots;\n    public int totalSlots;\n    \n    public abstract Map<?,?> getMap();\n    \n    public abstract String getDetailType();\n    \n    public String toString() {\n        return getDetailType() + \"\\t\" + FORMATTER.format(allocTime) + \"\\t\" + caller + \"\\t\" + getMap().size() + \"\\t\" + totalSlots + \"\\t\" + usedSlots;\n    }\n}\n\nclass HashMapDetails extends HashDetails {\n    public Map<?, ?> map;\n\n    public HashMapDetails(Map<?, ?> m, Date d, String c) {\n        map = m;\n        allocTime = d;\n        caller = c;\n        size = map.size();\n    }\n    \n    public Map<?,?> getMap() {\n        return map;\n    }\n    \n    public String getDetailType() {\n        return map.getClass().getSimpleName();\n    }\n}\n\nclass LinkedHashMapDetails extends HashMapDetails {\n    public Map<?, ?> map;\n\n    public LinkedHashMapDetails(Map<?, ?> m, Date d, String c) {\n       super(m, d, c);\n    }\n    \n    public String getDetailType() {\n        return map.getClass().getSimpleName();\n    }\n}\n\nclass ConcurrentHashMapDetails extends HashMapDetails {\n    public Map<?, ?> map;\n    \n        public ConcurrentHashMapDetails(Map<?, ?> m, Date d, String c) {\n           super(m, d, c);\n        }\n        \n        public String getDetailType() {\n            return map.getClass().getSimpleName();\n        }\n}\n\nclass HashSetDetails extends HashDetails {\n    private static Field MAP_FIELD;\n    static {\n        try {\n            MAP_FIELD = HashSet.class.getDeclaredField(\"map\");\n            MAP_FIELD.setAccessible(true);\n        } catch (Exception e) {\n            MAP_FIELD = null;\n        }\n    }\n    \n    public Set<?> set;\n\n    public HashSetDetails(Set<?> s, Date d, String c) {\n        set = s;\n        allocTime = d;\n        caller = c;\n        size = set.size();\n    }\n    \n    public Map<?,?> getMap() {\n        try {\n            if (MAP_FIELD == null)\n                return null;\n            \n            return (Map<?,?>) MAP_FIELD.get(set);\n        } catch (Exception e) {\n            return null;\n        }\n    }\n    \n    public String getDetailType() {\n        return set.getClass().getSimpleName();\n    }\n}\n\nclass LinkedHashSetDetails extends HashSetDetails {\n    public Map<?, ?> map;\n\n    public LinkedHashSetDetails(Set<?> s, Date d, String c) {\n       super(s, d, c);\n    }\n    \n    public String getDetailType() {\n        return map.getClass().getSimpleName();\n    }\n}\n","old_contents":"\/*\n * hashshmash - An aspect to record HashMap\/Set allocations\n * Copyright 2013 MeBigFatGuy.com\n * Copyright 2013 Dave Brosius\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *    http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing,\n * software distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and limitations\n * under the License.\n *\/\npackage com.mebigfatguy.hashshmash;\n\nimport java.io.BufferedWriter;\nimport java.io.File;\nimport java.io.FileOutputStream;\nimport java.io.OutputStreamWriter;\nimport java.io.PrintWriter;\nimport java.lang.reflect.Field;\nimport java.text.SimpleDateFormat;\nimport java.util.Date;\nimport java.util.HashMap;\nimport java.util.HashSet;\nimport java.util.LinkedHashMap;\nimport java.util.LinkedHashSet;\nimport java.util.Map;\nimport java.util.Map.Entry;\nimport java.util.Set;\nimport java.util.concurrent.ConcurrentHashMap;\n\npublic aspect HashCollector {\n    \n    private static final Journaller journaller = new Journaller();\n\n    after() returning (Map<?,?> m): call(HashMap.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashMapDetails details = new HashMapDetails(m, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    after() returning (Map<?,?> m): call(LinkedHashMap.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashMapDetails details = new LinkedHashMapDetails(m, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    after() returning (Set<?> s): call(HashSet.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashSetDetails details = new HashSetDetails(s, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    after() returning (Set<?> s): call(LinkedHashSet.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashSetDetails details = new LinkedHashSetDetails(s, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    before(): execution(public static void *.main(String[])) {\n        Class<?> c = HashCollector.class;\n    }\n}\n\nfinal class Journaller implements Runnable {\n    \n    private static final int SLEEP_TIME = 5 * 1000;\n    \n    private Field tableField;\n    private ConcurrentHashMap<HashDetails, HashDetails> hDetails = new ConcurrentHashMap<HashDetails, HashDetails>();\n    private PrintWriter writer;\n    private boolean operational = false;\n\n    public Journaller() {\n        try {\n            System.out.println(\"*************************\");\n            System.out.println(\"HASHSHMASH ASPECT ENABLED\");\n            System.out.println(\"*************************\");\n            \n            tableField = HashMap.class.getDeclaredField(\"table\");\n            tableField.setAccessible(true);\n              \n            File dir = new File(System.getProperty(\"user.home\"), \".hashshmash\");\n            dir.mkdirs();  \n            \n            writer = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(new File(dir, new Date().toString() + \".txt\")))));\n            \n            Thread t = new Thread(this);\n            t.setDaemon(true);\n            operational = true;\n            t.start();\n        } catch (Exception e) {\n        }\n    }\n    \n    public void add(HashDetails details) {\n        if (operational)\n            hDetails.put(details,  details);\n    }\n    \n    public void run() {\n        try {\n            while (!Thread.interrupted()) {\n                Thread.sleep(SLEEP_TIME);\n                \n                for (HashDetails details : hDetails.keySet()) {\n                    try {\n                        Map<?, ?> map = details.getMap();\n                        if (map != null) {\n                            int newSize = details.getMap().size();\n                            if (newSize == details.size) {\n                                Entry<?, ?>[] table = (Entry<?, ?>[])tableField.get(map);\n                                details.totalSlots = table.length;\n                                for (Entry<?, ?> e : table) {\n                                    if (e != null) {\n                                        details.usedSlots++;\n                                    }\n                                }\n                                writer.println(details);\n                                hDetails.remove(details);\n                            } else\n                                details.size = newSize;\n                        } else {\n                            hDetails.remove(details);\n                        }\n                    } catch (Exception e) {\n                        \/\/might get ConcurrentModificationException or such, just ignore\n                    }\n                }\n                writer.flush();\n            }\n        } catch (InterruptedException ie) {    \n        }\n    }\n}\n\nabstract class HashDetails {\n    private static SimpleDateFormat FORMATTER = new SimpleDateFormat(\"MM\/dd\/yyyy HH:mm:ss-SSS\");\n    \n    public Date allocTime;\n    public String caller;\n    public int size;\n    public int usedSlots;\n    public int totalSlots;\n    \n    public abstract Map<?,?> getMap();\n    \n    public abstract String getDetailType();\n    \n    public String toString() {\n        return getDetailType() + \"\\t\" + FORMATTER.format(allocTime) + \"\\t\" + caller + \"\\t\" + getMap().size() + \"\\t\" + totalSlots + \"\\t\" + usedSlots;\n    }\n}\n\nclass HashMapDetails extends HashDetails {\n    public Map<?, ?> map;\n\n    public HashMapDetails(Map<?, ?> m, Date d, String c) {\n        map = m;\n        allocTime = d;\n        caller = c;\n        size = map.size();\n    }\n    \n    public Map<?,?> getMap() {\n        return map;\n    }\n    \n    public String getDetailType() {\n        return map.getClass().getSimpleName();\n    }\n}\n\nclass LinkedHashMapDetails extends HashMapDetails {\n    public Map<?, ?> map;\n\n    public LinkedHashMapDetails(Map<?, ?> m, Date d, String c) {\n       super(m, d, c);\n    }\n    \n    public String getDetailType() {\n        return map.getClass().getSimpleName();\n    }\n}\n\nclass HashSetDetails extends HashDetails {\n    private static Field MAP_FIELD;\n    static {\n        try {\n            MAP_FIELD = HashSet.class.getDeclaredField(\"map\");\n            MAP_FIELD.setAccessible(true);\n        } catch (Exception e) {\n            MAP_FIELD = null;\n        }\n    }\n    \n    public Set<?> set;\n\n    public HashSetDetails(Set<?> s, Date d, String c) {\n        set = s;\n        allocTime = d;\n        caller = c;\n        size = set.size();\n    }\n    \n    public Map<?,?> getMap() {\n        try {\n            if (MAP_FIELD == null)\n                return null;\n            \n            return (Map<?,?>) MAP_FIELD.get(set);\n        } catch (Exception e) {\n            return null;\n        }\n    }\n    \n    public String getDetailType() {\n        return set.getClass().getSimpleName();\n    }\n}\n\nclass LinkedHashSetDetails extends HashSetDetails {\n    public Map<?, ?> map;\n\n    public LinkedHashSetDetails(Set<?> s, Date d, String c) {\n       super(s, d, c);\n    }\n    \n    public String getDetailType() {\n        return map.getClass().getSimpleName();\n    }\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"c11044f06a1ef23eb4547fb258fd360ae6f6717c","subject":"Changing pdf statistics export to new version.","message":"Changing pdf statistics export to new version.\n\nThis changes the export in pdf statistics to the new version,\nJulian created.\n","repos":"stieglma\/Schafkopfauswerter","old_file":"src\/StatisticsExport.aj","new_file":"src\/StatisticsExport.aj","new_contents":"import java.io.IOException;\n\nimport org.apache.pdfbox.pdmodel.PDDocument;\nimport org.apache.pdfbox.pdmodel.PDPage;\nimport org.apache.pdfbox.pdmodel.edit.PDPageContentStream;\nimport org.apache.pdfbox.pdmodel.font.PDType1Font;\n\nimport view.GUI;\n\npublic privileged aspect StatisticsExport {\n\t\n\tprivate GUI gui;\n\n    \/**\n     * catch constructor call, so that we have the correct gui, to refer to everywhere\n     *\/\n    after() returning(GUI gui): call(GUI.new(*)) {\n        this.gui = gui;\n    }\n    \n    \/**\n     * Catch the call on {@link PDFReportListener.drawTable(PDDocument)} to get the pdf\n     * creator object.\n     * \n     * @param document\n     * @throws IOException\n     *\/\n\tvoid around(PDDocument document) throws IOException\n\t\t: execution (* PDFReportListener.drawTable(PDDocument))\n\t\t&& args(document) {\n\t\tPDPage page = new PDPage();\n\t\tdocument.addPage(page);\n\t\tPDPageContentStream contentStream = new PDPageContentStream(document, page);\n\t\tcontentStream.setFont(PDType1Font.HELVETICA_BOLD, 10);\n\t\tcontentStream.beginText();\n\t\tcreateContent(contentStream);\n\t\tcontentStream.endText();\n\t\tcontentStream.close();\n\t}\n\t\n\t\/**\n\t * Write statistics to given <code>contentStream<\/code> of a pdf page.\n\t * \n\t * @param contentStream The <code>contentStream<\/code> of the pdf page to write on.\n\t * @throws IOException\n\t *\/\n\tprivate void createContent(PDPageContentStream contentStream) throws IOException {\n\t\tOverallStatistics data = gui.model.gameDB.getOverallStatistics();\n\n        contentStream.moveTextPositionByAmount(50, 650);\n        contentStream.drawString(\"#Spiele (ohne weiter): \" + data.getAnzahlSpieleGesamt()\n        \t\t+ \" (gewonnen: \"\n        \t\t+ String.format(\"%.2f\", data.getGesamtWinPerc()) + \"%)\");\n        \n        contentStream.moveTextPositionByAmount(0, -20);\n        contentStream.drawString(\"#Rufspiele: \" + data.getAnzahlRufspiele() + \" (gewonnen: \"\n        \t\t+ String.format(\"%.2f\", data.getRufspieleWinPerc()) + \"%)\");\n        \n        contentStream.moveTextPositionByAmount(50, -20);\n        contentStream.drawString(\"-> teurstes Rufspiel: \"\n        + data.getTeuerstesRufspiel());\n        \n        contentStream.moveTextPositionByAmount(-50, -20);\n        contentStream.drawString(\"#Soli gesamt: \"\n        \t\t+ data.getAnzahlSoliGesamt() + \" (gewonnen: \"\n        \t\t+ String.format(\"%.2f\", data.getSoliGesamtWinPerc())\n        \t\t+ \"%)\");\n        \n        contentStream.moveTextPositionByAmount(0, -20);\n        contentStream.drawString(\"#Soli normal: \" + data.getAnzahlSoli()\n        \t\t+ \" (gewonnen: \"\n        \t\t+ String.format(\"%.2f\", data.getSoliNormalWinPerc()) + \"%)\");\n        \n        contentStream.moveTextPositionByAmount(50, -20);\n        contentStream.drawString(\"-> teurstes Solo: \" + data.getTeuerstesSolo());\n        \n        contentStream.moveTextPositionByAmount(-50, -20);\n        contentStream.drawString(\"#Solo Tout: \" + data.getAnzahlSoliTout()\n        \t\t+ \" (gewonnen: \"\n        \t\t+ String.format(\"%.2f\", data.getSoliToutWinPerc()) + \"%)\");\n        \n        contentStream.moveTextPositionByAmount(50, -20);\n        contentStream.drawString(\"-> teurstes Solo Tout: \"\n        \t\t+ data.getTeuerstesSoloTout());\n        \n        contentStream.moveTextPositionByAmount(-50, -20);\n        contentStream.drawString(\"#Solo Sie: \" + data.getAnzahlSoliSie());\n        \n        contentStream.moveTextPositionByAmount(50, -20);\n        contentStream.drawString(\"-> teurstes Solo Sie: \" + data.getTeuerstesSoloSie());\n        \n        contentStream.moveTextPositionByAmount(-50, -20);\n        contentStream.drawString(\"#Weiter: \" + data.getAnzahlWeiter());\n\t}\n}\n","old_contents":"import java.io.IOException;\n\nimport org.apache.pdfbox.pdmodel.PDDocument;\nimport org.apache.pdfbox.pdmodel.PDPage;\nimport org.apache.pdfbox.pdmodel.edit.PDPageContentStream;\nimport org.apache.pdfbox.pdmodel.font.PDType1Font;\n\nimport view.GUI;\n\npublic privileged aspect StatisticsExport {\n\t\n\tprivate GUI gui;\n\n    \/**\n     * catch constructor call, so that we have the correct gui, to refer to everywhere\n     *\/\n    after() returning(GUI gui): call(GUI.new(*)) {\n        this.gui = gui;\n    }\n    \n    \/**\n     * Catch the call on {@link PDFReportListener.drawTable(PDDocument)} to get the pdf\n     * creator object.\n     * \n     * @param document\n     * @throws IOException\n     *\/\n\tvoid around(PDDocument document) throws IOException\n\t\t: execution (* PDFReportListener.drawTable(PDDocument))\n\t\t&& args(document) {\n\t\tPDPage page = new PDPage();\n\t\tdocument.addPage(page);\n\t\tPDPageContentStream contentStream = new PDPageContentStream(document, page);\n\t\tcontentStream.setFont(PDType1Font.HELVETICA_BOLD, 10);\n\t\tcontentStream.beginText();\n\t\tcreateContent(contentStream);\n\t\tcontentStream.endText();\n\t\tcontentStream.close();\n\t}\n\t\n\t\/**\n\t * Write statistics to given <code>contentStream<\/code> of a pdf page.\n\t * \n\t * @param contentStream The <code>contentStream<\/code> of the pdf page to write on.\n\t * @throws IOException\n\t *\/\n\tprivate void createContent(PDPageContentStream contentStream) throws IOException {\n\t\tOverallStatistics data = gui.model.gameDB.getOverallStatistics();\n\t\t\n\t\tint anzahlSpieleGesamt = data.getAnzahlSpieleGesamt();\n        int anzahlSpieleGesamtGewonnen = data.getAnzahlSpieleGesamtGewonnen();\n        int teuerstesRufspiel = data.getTeuerstesRufspiel();\n        int teuerstesSolo = data.getTeuerstesSolo();\n        int teuerstesSoloTout = data.getTeuerstesSoloTout();\n        int teuerstesSoloSie = data.getTeuerstesSoloSie();\n        int anzahlRufspiele = data.getAnzahlRufspiele();\n        int anzahlSoli = data.getAnzahlSoli();\n        int anzahlSoliTout = data.getAnzahlSoliTout();\n        int anzahlSoliSie = data.getAnzahlSoliSie();\n        int anzahlSoliGesamt = data.getAnzahlSoliGesamt();\n        int anzahlGewonneneSoliGesamt = data.getAnzahlGewonneneSoliGesamt();\n        int anzahlGewonneneRufspiele = data.getAnzahlGewonneneRufspiele();\n        int anzahlGewonneneSoli = data.getAnzahlGewonneneSoli();\n        int anzahlGewonneneSoliTout = data.getAnzahlGewonneneSoliTout();\n        int anzahlGewonneneSoliSie = data.getAnzahlGewonneneSoliSie();\n        int anzahlWeiter = data.getAnzahlWeiter();\n\n        double sologesamtwin = (anzahlSoliGesamt) > 0 ? ((double) (anzahlGewonneneSoliGesamt) \/ (anzahlSoliGesamt))\n                : 0;\n        \n        contentStream.moveTextPositionByAmount(50, 650);\n        contentStream.drawString(\"#Spiele (ohne weiter): \"\n                + anzahlSpieleGesamt\n                + \" (gewonnen: \"\n                + String.format(\"%.2f\",\n                        (anzahlSpieleGesamt > 0 ? anzahlSpieleGesamtGewonnen\n                                \/ ((double) anzahlSpieleGesamt) : 0) * 100)\n                + \"%)\");\n        \n        contentStream.moveTextPositionByAmount(0, -20);\n        contentStream.drawString(\"#Rufspiele: \"\n                + anzahlRufspiele\n                + \" (gewonnen: \"\n                + String.format(\"%.2f\",\n                        (anzahlRufspiele > 0 ? anzahlGewonneneRufspiele\n                                \/ ((double) anzahlRufspiele) : 0) * 100)\n                + \"%)\");\n        \n        contentStream.moveTextPositionByAmount(0, -20);\n        contentStream.drawString(\"          -> teuerstes Rufspiel: \"\n                + teuerstesRufspiel);\n        \n        contentStream.moveTextPositionByAmount(0, -20);\n        contentStream.drawString(\"#Soli gesamt: \"\n                + (anzahlSoli + anzahlSoliTout + anzahlSoliSie)\n                + \" (gewonnen: \"\n                + String.format(\"%.2f\", sologesamtwin * 100)\n                + \"%)\");\n        \n        contentStream.moveTextPositionByAmount(0, -20);\n        contentStream.drawString(\"#Soli normal: \"\n                + anzahlSoli\n                + \" (gewonnen: \"\n                + String.format(\"%.2f\", (anzahlSoli > 0 ? anzahlGewonneneSoli\n                        \/ ((double) anzahlSoli) : 0) * 100)\n                + \"%)\");\n        \n        contentStream.moveTextPositionByAmount(0, -20);\n        contentStream.drawString(\"            -> teuerstes Solo: \"\n                + teuerstesSolo);\n        \n        contentStream.moveTextPositionByAmount(0, -20);\n        contentStream.drawString(\"#Solo Tout: \"\n                + anzahlSoliTout\n                + \" (gewonnen: \"\n                + String.format(\"%.2f\",\n                        (anzahlSoliTout > 0 ? anzahlGewonneneSoliTout\n                                \/ ((double) anzahlSoliTout) : 0) * 100)\n                + \"%)\");\n        \n        contentStream.moveTextPositionByAmount(0, -20);\n        contentStream.drawString(\"          -> teuerstes Solo Tout: \"\n                + teuerstesSoloTout);\n        \n        contentStream.moveTextPositionByAmount(0, -20);\n        contentStream.drawString(\"#Solo Sie: \"\n                + anzahlSoliSie\n                + \" (gewonnen: \"\n                + String.format(\"%.2f\",\n                        (anzahlSoliSie > 0 ? anzahlGewonneneSoliSie\n                                \/ ((double) anzahlSoliSie) : 0) * 100) + \"%)\");\n        \n        contentStream.moveTextPositionByAmount(0, -20);\n        contentStream.drawString(\"         -> teuerstes Solo Sie: \" + teuerstesSoloSie);\n        \n        contentStream.moveTextPositionByAmount(0, -20);\n        contentStream.drawString(\"#Weiter: \" + anzahlWeiter);\n\t}\n}\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"f92d37a90db080c2c28060b1be97e727a3c607c6","subject":"code to test for actor count","message":"code to test for actor count\n","repos":"DataDog\/monitor,DataDog\/monitor,eigengo\/monitor,eigengo\/monitor","old_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/ActorCellMonitoringAspect.aj","new_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/ActorCellMonitoringAspect.aj","new_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.actor.*;\n\nimport java.util.ArrayList;\nimport java.util.List;\n\npublic aspect ActorCellMonitoringAspect extends AbstractMonitoringAspect {\n\n    \/\/ decide whether to include this ActorCell in our measurements\n    private boolean includeActorPath(ActorPath actorPath) {\n        if (this.includeSystemActors) return true;\n\n        String userOrSystem = actorPath.getElements().iterator().next();\n        return \"user\".equals(userOrSystem);\n    }\n\n    \/\/ get the tags for the cell\n    private String[] getTags(final ActorPath actorPath, final Actor actor) {\n        List<String> tags = new ArrayList<String>();\n\n        \/\/ TODO: Improve detection of routed actors. This relies only on the naming :(.\n        String lastPathElement = actorPath.elements().last();\n        if (lastPathElement.startsWith(\"$\")) {\n            \/\/ this is routed actor.\n            tags.add(actorPath.parent().toString());\n            if (this.includeRoutees) tags.add(actorPath.toString());\n        } else {\n            \/\/ there is no supervisor\n            tags.add(actorPath.toString());\n        }\n        if (actor != null) {\n            tags.add(String.format(\"akka:%s.%s\", actor.context().system().name(), actor.getClass().getCanonicalName()));\n        }\n\n        return tags.toArray(new String[tags.size()]);\n    }\n\n    Object around(ActorCell actorCell, Object msg) : Pointcuts.receiveMessage(actorCell, msg) {\n        final ActorPath actorPath = actorCell.self().path();\n        if (!includeActorPath(actorPath)) return proceed(actorCell, msg);\n\n        \/\/ we tag by actor name\n        final String[] tags = getTags(actorPath, actorCell.actor());\n\n        \/\/ record the queue size\n        counterInterface.recordGaugeValue(\"akka.queue.size\", actorCell.numberOfMessages(), tags);\n        \/\/ record the message, general and specific\n        counterInterface.incrementCounter(\"akka.actor.delivered\", tags);\n        counterInterface.incrementCounter(\"akka.actor.delivered.\" + msg.getClass().getSimpleName(), tags);\n\n        \/\/ measure the time. we're using the ``nanoTime`` call to access the high-precision timer.\n        \/\/ since we're not really interested in wall time, but just some increasing measure of\n        \/\/ elapsed time\n        Object result = null;\n        final long start = System.nanoTime();\n        \/\/ result will always be ``null``, because target returns ``Unit``\n        result = proceed(actorCell, msg);\n        \/\/ ns or \u00b5s is too fine. ms will do for now.\n        final long duration = (System.nanoTime() - start) \/ 1000000;\n\n        \/\/ record the actor duration\n        counterInterface.recordExecutionTime(\"akka.actor.duration\", (int)duration, tags);\n        \/\/ add gauge value of 1 with actor ref as tag, to provide 'number of actors' metric\n        counterInterface.gaugeValue(\"akka.actor.count\", tag)\n\n        \/\/ return null would do the trick, but we want to be _proper_.\n        return result;\n    }\n\n    before(ActorCell actorCell, Throwable failure) : Pointcuts.handleInvokeFailure(actorCell, failure) {\n        \/\/ record the error, general and specific\n        String[] tags = getTags(actorCell.self().path(), actorCell.actor());\n        counterInterface.incrementCounter(\"akka.actor.error\", tags);\n        counterInterface.incrementCounter(String.format(\"akka.actor.error.%s\", failure.getMessage()), tags);\n    }\n\n    before(Object event) : Pointcuts.eventStreamPublish(event) {\n        if (event instanceof UnhandledMessage) {\n            UnhandledMessage unhandledMessage = (UnhandledMessage)event;\n            String[] tags = getTags(unhandledMessage.recipient().path(), null);\n            counterInterface.incrementCounter(\"akka.actor.undelivered\", tags);\n            counterInterface.incrementCounter(\"akka.actor.undelivered.\" + unhandledMessage.getMessage().getClass().getSimpleName(), tags);\n        }\n    }\n\n\/\/    after() returning (ActorRef actor): execution(* akka.actor.ActorSystem.actorOf(..)) {\n\/\/        if (!includeActorPath(actor.path())) return;\n\/\/\n\/\/        final String tag = actor.path().root().toString();\n\/\/        counterInterface.incrementCounter(\"akka.actor.count\", tag);\n\/\/    }\n\/\/\n\/\/    after() returning (ActorRef actor): execution(* akka.actor.ActorCell.actorOf(..)) {\n\/\/        if (!includeActorPath(actor.path())) return;\n\/\/\n\/\/        final String tag = actor.path().root().toString();\n\/\/        counterInterface.incrementCounter(\"akka.actor.count\", tag);\n\/\/    }\n\/\/\n\/\/    after(ActorRef actor) : execution(* akka.actor.ActorCell.stop(..)) && args(actor) {\n\/\/        if (!includeActorPath(actor.path())) return;\n\/\/\n\/\/        final String tag = actor.path().root().toString();\n\/\/        counterInterface.decrementCounter(\"akka.actor.count\", tag);\n\/\/    }\n\n}","old_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.actor.*;\n\nimport java.util.ArrayList;\nimport java.util.List;\n\npublic aspect ActorCellMonitoringAspect extends AbstractMonitoringAspect {\n\n    \/\/ decide whether to include this ActorCell in our measurements\n    private boolean includeActorPath(ActorPath actorPath) {\n        if (this.includeSystemActors) return true;\n\n        String userOrSystem = actorPath.getElements().iterator().next();\n        return \"user\".equals(userOrSystem);\n    }\n\n    \/\/ get the tags for the cell\n    private String[] getTags(final ActorPath actorPath, final Actor actor) {\n        List<String> tags = new ArrayList<String>();\n\n        \/\/ TODO: Improve detection of routed actors. This relies only on the naming :(.\n        String lastPathElement = actorPath.elements().last();\n        if (lastPathElement.startsWith(\"$\")) {\n            \/\/ this is routed actor.\n            tags.add(actorPath.parent().toString());\n            if (this.includeRoutees) tags.add(actorPath.toString());\n        } else {\n            \/\/ there is no supervisor\n            tags.add(actorPath.toString());\n        }\n        if (actor != null) {\n            tags.add(String.format(\"akka:%s.%s\", actor.context().system().name(), actor.getClass().getCanonicalName()));\n        }\n\n        return tags.toArray(new String[tags.size()]);\n    }\n\n    Object around(ActorCell actorCell, Object msg) : Pointcuts.receiveMessage(actorCell, msg) {\n        final ActorPath actorPath = actorCell.self().path();\n        if (!includeActorPath(actorPath)) return proceed(actorCell, msg);\n\n        \/\/ we tag by actor name\n        final String[] tags = getTags(actorPath, actorCell.actor());\n\n        \/\/ record the queue size\n        counterInterface.recordGaugeValue(\"akka.queue.size\", actorCell.numberOfMessages(), tags);\n        \/\/ record the message, general and specific\n        counterInterface.incrementCounter(\"akka.actor.delivered\", tags);\n        counterInterface.incrementCounter(\"akka.actor.delivered.\" + msg.getClass().getSimpleName(), tags);\n\n        \/\/ measure the time. we're using the ``nanoTime`` call to access the high-precision timer.\n        \/\/ since we're not really interested in wall time, but just some increasing measure of\n        \/\/ elapsed time\n        Object result = null;\n        final long start = System.nanoTime();\n        \/\/ result will always be ``null``, because target returns ``Unit``\n        result = proceed(actorCell, msg);\n        \/\/ ns or \u00b5s is too fine. ms will do for now.\n        final long duration = (System.nanoTime() - start) \/ 1000000;\n\n        \/\/ record the actor duration\n        counterInterface.recordExecutionTime(\"akka.actor.duration\", (int)duration, tags);\n\n        \/\/ return null would do the trick, but we want to be _proper_.\n        return result;\n    }\n\n    before(ActorCell actorCell, Throwable failure) : Pointcuts.handleInvokeFailure(actorCell, failure) {\n        \/\/ record the error, general and specific\n        String[] tags = getTags(actorCell.self().path(), actorCell.actor());\n        counterInterface.incrementCounter(\"akka.actor.error\", tags);\n        counterInterface.incrementCounter(String.format(\"akka.actor.error.%s\", failure.getMessage()), tags);\n    }\n\n    before(Object event) : Pointcuts.eventStreamPublish(event) {\n        if (event instanceof UnhandledMessage) {\n            UnhandledMessage unhandledMessage = (UnhandledMessage)event;\n            String[] tags = getTags(unhandledMessage.recipient().path(), null);\n            counterInterface.incrementCounter(\"akka.actor.undelivered\", tags);\n            counterInterface.incrementCounter(\"akka.actor.undelivered.\" + unhandledMessage.getMessage().getClass().getSimpleName(), tags);\n        }\n    }\n\n    after() returning (ActorRef actor): execution(* akka.actor.ActorSystem.actorOf(..)) {\n        if (!includeActorPath(actor.path())) return;\n\n        final String tag = actor.path().root().toString();\n        counterInterface.incrementCounter(\"akka.actor.count\", tag);\n    }\n\n    after() returning (ActorRef actor): execution(* akka.actor.ActorCell.actorOf(..)) {\n        if (!includeActorPath(actor.path())) return;\n\n        final String tag = actor.path().root().toString();\n        counterInterface.incrementCounter(\"akka.actor.count\", tag);\n    }\n\n    after(ActorRef actor) : execution(* akka.actor.ActorCell.stop(..)) && args(actor) {\n        if (!includeActorPath(actor.path())) return;\n\n        final String tag = actor.path().root().toString();\n        counterInterface.decrementCounter(\"akka.actor.count\", tag);\n    }\n\n}","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"df03ba18def38a8a3248e290b46821b8b062d392","subject":"Dispatcher monitoring","message":"Dispatcher monitoring\n","repos":"eigengo\/monitor,eigengo\/monitor,DataDog\/monitor,DataDog\/monitor","old_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/DispatcherMonitoringAspect.aj","new_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/DispatcherMonitoringAspect.aj","new_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.dispatch.MessageDispatcher;\n\nimport java.util.concurrent.ForkJoinPool;\n\nprivileged aspect DispatcherMonitoringAspect extends AbstractMonitoringAspect issingleton() {\n\n    before(MessageDispatcher dispatcher) : execution(* akka.dispatch.MessageDispatcher.dispatch(..)) && target(dispatcher) {\n        System.out.println(\"*****Dispatching a task\");\n    }\n\n    before(ForkJoinPool pool) : execution(* scala.concurrent.forkjoin.ForkJoinPool.execute(..)) && target(pool) {\n        System.out.println(\"*****Active threads>> \" + pool.getActiveThreadCount());\n        System.out.println(\"*****Queue size>> \" + pool.getQueuedTaskCount());\n        System.out.println(\"*****Running thread count>> \" + pool.getRunningThreadCount());\n    }\n\n\n}\n","old_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\npublic aspect DispatcherMonitoringAspect extends AbstractMonitoringAspect {\n\n\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"49b6be02f7258ae2ae87b575f3b2ed56eea59843","subject":"finish StatOverallGraphical","message":"finish StatOverallGraphical\n","repos":"stieglma\/Schafkopfauswerter","old_file":"src\/StatOverallGraphical.aj","new_file":"src\/StatOverallGraphical.aj","new_contents":"import java.awt.BasicStroke;\nimport java.awt.Color;\nimport java.awt.Font;\nimport java.awt.GridLayout;\nimport java.awt.LinearGradientPaint;\n\nimport javax.swing.JPanel;\nimport javax.swing.JTabbedPane;\n\nimport model.SystemValues.WIN;\nimport model.db.DataObject;\nimport de.erichseifert.gral.data.DataTable;\nimport de.erichseifert.gral.plots.BarPlot;\nimport de.erichseifert.gral.plots.PiePlot;\nimport de.erichseifert.gral.ui.InteractivePanel;\nimport de.erichseifert.gral.plots.BarPlot.BarRenderer;\nimport de.erichseifert.gral.plots.PiePlot.PieSliceRenderer;\nimport de.erichseifert.gral.plots.points.PointRenderer;\nimport de.erichseifert.gral.util.GraphicsUtils;\nimport de.erichseifert.gral.util.Insets2D;\nimport de.erichseifert.gral.util.Location;\nimport view.GUI;\nimport view.UIUpdater;\nimport model.db.GameData;\n\npublic privileged aspect StatOverallGraphical {\n\n\tprivate static GUI gui;\n\tprivate static JPanel panel = new JPanel();\n\n\tprivate static final Color COLOR1 = Color.GREEN;\n\n\tprivate static DataTable playedTypes = new DataTable(Integer.class,\n\t\t\tString.class);\n\tprivate static DataTable mostExpsvGame = new DataTable(Integer.class,\n\t\t\tInteger.class, String.class);\n\tprivate static DataTable wonGames = new DataTable(Integer.class,\n\t\t\tDouble.class, String.class);\n\n\tafter() returning(GUI gui): call(GUI.new(*)) {\n\t\tStatOverallGraphical.gui = gui;\n\t}\n\n\tafter(JTabbedPane tabbedPane): \n\t\t\texecution(public static void StatisticsHelper.StatisticsPaneCreated(JTabbedPane))\n\t\t\t&& args(tabbedPane) {\n\t\tpanel.setLayout(new GridLayout(2, 2));\n\n\t\tupdateData();\n\t\tpanel.add(new InteractivePanel(createExpGameBarPlot()));\n\t\tpanel.add(new InteractivePanel(createWonGamesBarPlot()));\n\t\tpanel.add(new InteractivePanel(createPlayedTypesPlot()));\n\n\t\ttabbedPane.addTab(\"OverallGrafik\", panel);\n\t}\n\n\tafter() : execution(* UIUpdater.run()) {\n\t\tupdateData();\n\t}\n\n\tprivate static void updateData() {\n\t\tStatsData data = gui.model.getGameData().getOverallStatisticsData();\n\n\t\twhile (playedTypes.getRowCount() > 0) {\n\t\t\tplayedTypes.removeLast();\n\t\t}\n\t\tplayedTypes.add(data.anzahlRufspiele, \"Rufspiele\");\n\t\tplayedTypes.add(data.anzahlSolo, \"Soli\");\n\t\tplayedTypes.add(data.anzahlSoloTout, \"Soli Tout\");\n\t\tplayedTypes.add(data.anzahlSoloSie, \"Soli Sie\");\n\t\tplayedTypes.add(data.anzahlWeiter, \"Weiter\");\n\n\t\twhile (mostExpsvGame.getRowCount() > 0) {\n\t\t\tmostExpsvGame.removeLast();\n\t\t}\n\t\tmostExpsvGame.add(1, data.teuerstesRufspiel, \"Rufspiel\");\n\t\tmostExpsvGame.add(2, data.teuerstesSolo, \"Solo\");\n\t\tmostExpsvGame.add(3, data.teuerstesSoloTout, \"Solo Tout\");\n\t\tmostExpsvGame.add(4, data.teuerstesSoloSie, \"Solo Sie\");\n\n\t\t\/\/ percentage of won games by gametype\n\t\tdouble gesamt = (data.anzahlSpieleGesamt > 0 ? data.anzahlSpieleGesamtGewonnen\n\t\t\t\t\/ ((double) data.anzahlSpieleGesamt)\n\t\t\t\t: 0) * 100;\n\t\tdouble rufspiele = (data.anzahlRufspiele > 0 ? data.anzahlGewonneneRufspiele\n\t\t\t\t\/ ((double) data.anzahlRufspiele)\n\t\t\t\t: 0) * 100;\n\t\tdouble soli_gesamt = ((data.anzahlSolo + data.anzahlSoloSie + data.anzahlSoloTout) > 0 ? ((data.anzahlGewonneneSoli\n\t\t\t\t+ data.anzahlGewonneneSoliTout + data.anzahlSoloSie) \/ 1.0 \/ (data.anzahlSolo\n\t\t\t\t+ data.anzahlSoloSie + data.anzahlSoloTout))\n\t\t\t\t: 0) * 100;\n\t\tdouble soli_normal = (data.anzahlSolo > 0 ? data.anzahlGewonneneSoli\n\t\t\t\t\/ ((double) data.anzahlSolo) : 0) * 100;\n\t\tdouble soli_tout = (data.anzahlSoloTout > 0 ? data.anzahlGewonneneSoliTout\n\t\t\t\t\/ ((double) data.anzahlSoloTout)\n\t\t\t\t: 0) * 100;\n\t\tdouble soli_sie = (data.anzahlSoloSie > 0 ? data.anzahlSoloSie\n\t\t\t\t\/ ((double) data.anzahlSoloSie) : 0) * 100;\n\n\t\twhile (wonGames.getRowCount() > 0) {\n\t\t\twonGames.removeLast();\n\t\t}\n\t\twonGames.add(1, gesamt, \"Gesamt\");\n\t\twonGames.add(2, rufspiele, \"Rufspiele\");\n\t\twonGames.add(3, soli_gesamt, \"Soli gesamt\");\n\t\twonGames.add(4, soli_normal, \"Soli normal\");\n\t\twonGames.add(5, soli_tout, \"Soli Tout\");\n\t\twonGames.add(6, soli_sie, \"Soli Sie\");\n\t}\n\n\tprivate static PiePlot createPlayedTypesPlot() {\n\t\tPiePlot plot = new PiePlot(playedTypes);\n\n\t\tPointRenderer pointRenderer = plot.getPointRenderer(playedTypes);\n\t\tpointRenderer.setValueVisible(true);\n\t\tpointRenderer.setValueColumn(1);\n\n\t\t\/\/ Format plot\n\t\tplot.getTitle().setText(\"Anzahl gespielter Spieltypen\");\n\t\t\/\/ Change plot size\n\t\tplot.setRadius(0.9);\n\t\t\/\/ Display a legend\n\t\tplot.setLegendVisible(true);\n\t\t\/\/ Add some margin to the plot area\n\t\tplot.setInsets(new Insets2D.Double(20.0, 40.0, 40.0, 40.0));\n\n\t\tPieSliceRenderer pieSliceRenderer = (PieSliceRenderer) plot\n\t\t\t\t.getPointRenderer(playedTypes);\n\n\t\t\/\/ Change relative size of inner region\n\t\tpieSliceRenderer.setInnerRadius(0.4);\n\t\t\/\/ Change the width of gaps between segments\n\t\tpieSliceRenderer.setGap(0.2);\n\t\t\/\/ Show labels\n\t\tpieSliceRenderer.setValueVisible(true);\n\t\tpieSliceRenderer.setValueColor(Color.WHITE);\n\t\tpieSliceRenderer.setValueFont(Font.decode(null).deriveFont(Font.BOLD));\n\n\t\treturn plot;\n\t}\n\n\tpublic BarPlot createExpGameBarPlot() {\n\t\t\/\/ Create new bar plot\n\t\tBarPlot plot = new BarPlot(mostExpsvGame);\n\n\t\t\/\/ Format plot\n\t\tplot.getTitle().setText(\"Teuerstes Spiel pro Spieltyp\");\n\t\tplot.setInsets(new Insets2D.Double(40.0, 40.0, 40.0, 40.0));\n\t\tplot.setBarWidth(0.075);\n\n\t\t\/\/ Format bars\n\t\tPointRenderer pointRenderer = plot.getPointRenderer(mostExpsvGame);\n\t\tBarRenderer barRenderer = (BarRenderer) pointRenderer;\n\n\t\tbarRenderer.setColor(new LinearGradientPaint(0f, 0f, 0f, 1f,\n\t\t\t\tnew float[] { 0.0f, 1.0f }, new Color[] { COLOR1,\n\t\t\t\t\t\tGraphicsUtils.deriveBrighter(COLOR1) }));\n\t\tbarRenderer.setBorderStroke(new BasicStroke(3f));\n\t\tbarRenderer.setBorderColor(new LinearGradientPaint(0f, 0f, 0f, 1f,\n\t\t\t\tnew float[] { 0.0f, 1.0f }, new Color[] {\n\t\t\t\t\t\tGraphicsUtils.deriveBrighter(COLOR1), COLOR1 }));\n\n\t\tpointRenderer.setValueVisible(true);\n\t\tpointRenderer.setValueColumn(2);\n\n\t\tpointRenderer.setValueLocation(Location.CENTER);\n\t\tpointRenderer.setValueColor(GraphicsUtils.deriveDarker(COLOR1));\n\t\tpointRenderer.setValueFont(Font.decode(null).deriveFont(Font.BOLD));\n\n\t\treturn plot;\n\t}\n\n\tpublic BarPlot createWonGamesBarPlot() {\n\t\t\/\/ Create new bar plot\n\t\tBarPlot plot = new BarPlot(wonGames);\n\n\t\t\/\/ Format plot\n\t\tplot.getTitle().setText(\"Gewonnene Spiele pro Spieltyp (in %)\");\n\t\tplot.setInsets(new Insets2D.Double(40.0, 40.0, 40.0, 40.0));\n\t\tplot.setBarWidth(0.075);\n\n\t\t\/\/ Format bars\n\t\tPointRenderer pointRenderer = plot.getPointRenderer(wonGames);\n\t\tBarRenderer barRenderer = (BarRenderer) pointRenderer;\n\n\t\tbarRenderer.setColor(new LinearGradientPaint(0f, 0f, 0f, 1f,\n\t\t\t\tnew float[] { 0.0f, 1.0f }, new Color[] { COLOR1,\n\t\t\t\t\t\tGraphicsUtils.deriveBrighter(COLOR1) }));\n\t\tbarRenderer.setBorderStroke(new BasicStroke(3f));\n\t\tbarRenderer.setBorderColor(new LinearGradientPaint(0f, 0f, 0f, 1f,\n\t\t\t\tnew float[] { 0.0f, 1.0f }, new Color[] {\n\t\t\t\t\t\tGraphicsUtils.deriveBrighter(COLOR1), COLOR1 }));\n\n\t\tpointRenderer.setValueVisible(true);\n\t\tpointRenderer.setValueColumn(2);\n\n\t\tpointRenderer.setValueLocation(Location.CENTER);\n\t\tpointRenderer.setValueColor(GraphicsUtils.deriveDarker(COLOR1));\n\t\tpointRenderer.setValueFont(Font.decode(null).deriveFont(Font.BOLD));\n\n\t\treturn plot;\n\t}\n\n\tpublic StatsData GameData.getOverallStatisticsData() {\n\t\tint anzahlSpieleGesamt = 0;\n\t\tint anzahlSpieleGesamtGewonnen = 0;\n\t\tint teuerstesRufspiel = 0;\n\t\tint teuerstesSolo = 0;\n\t\tint teuerstesSoloTout = 0;\n\t\tint teuerstesSoloSie = 0;\n\t\tint anzahlRufspiele = 0;\n\t\tint anzahlSolo = 0;\n\t\tint anzahlSoloTout = 0;\n\t\tint anzahlSoloSie = 0;\n\t\tint anzahlGewonneneRufspiele = 0;\n\t\tint anzahlGewonneneSoli = 0;\n\t\tint anzahlGewonneneSoliTout = 0;\n\t\tint anzahlWeiter = 0;\n\n\t\tfor (DataObject obj : data) {\n\t\t\tswitch (obj.getGameKind()) {\n\t\t\tcase \"Rufspiel\":\n\t\t\t\tanzahlRufspiele++;\n\t\t\t\tanzahlSpieleGesamt++;\n\t\t\t\tif (obj.getGameWon() == WIN.PLAYER) {\n\t\t\t\t\tanzahlGewonneneRufspiele++;\n\t\t\t\t\tanzahlSpieleGesamtGewonnen++;\n\t\t\t\t}\n\t\t\t\tif (obj.getGameValue() > teuerstesRufspiel) {\n\t\t\t\t\tteuerstesRufspiel = obj.getGameValue();\n\t\t\t\t}\n\t\t\t\tbreak;\n\t\t\tcase \"Solo\":\n\t\t\t\tanzahlSolo++;\n\t\t\t\tanzahlSpieleGesamt++;\n\t\t\t\tif (obj.getGameWon() == WIN.PLAYER) {\n\t\t\t\t\tanzahlGewonneneSoli++;\n\t\t\t\t\tanzahlSpieleGesamtGewonnen++;\n\t\t\t\t}\n\t\t\t\tif (obj.getGameValue() > teuerstesSolo) {\n\t\t\t\t\tteuerstesSolo = obj.getGameValue();\n\t\t\t\t}\n\t\t\t\tbreak;\n\t\t\tcase \"Solo Tout\":\n\t\t\t\tanzahlSpieleGesamt++;\n\t\t\t\tif (obj.getGameWon() == WIN.PLAYER) {\n\t\t\t\t\tanzahlGewonneneSoliTout++;\n\t\t\t\t\tanzahlSpieleGesamtGewonnen++;\n\t\t\t\t}\n\t\t\t\tif (obj.getGameValue() > teuerstesSoloTout) {\n\t\t\t\t\tteuerstesSoloTout = obj.getGameValue();\n\t\t\t\t}\n\t\t\t\tanzahlSoloTout++;\n\t\t\t\tbreak;\n\t\t\tcase \"Solo Sie\":\n\t\t\t\tanzahlSpieleGesamt++;\n\t\t\t\tanzahlSpieleGesamtGewonnen++;\n\t\t\t\tanzahlSoloSie++;\n\t\t\t\tif (obj.getGameValue() > teuerstesSoloSie) {\n\t\t\t\t\tteuerstesSoloSie = obj.getGameValue();\n\t\t\t\t}\n\t\t\t\tbreak;\n\t\t\tcase \"weiter\":\n\t\t\t\tanzahlWeiter++;\n\t\t\t\tbreak;\n\t\t\t}\n\t\t}\n\n\t\treturn new StatsData(anzahlSpieleGesamt, anzahlSpieleGesamtGewonnen,\n\t\t\t\tteuerstesRufspiel, teuerstesSolo, teuerstesSoloTout,\n\t\t\t\tteuerstesSoloSie, anzahlRufspiele, anzahlSolo, anzahlSoloTout,\n\t\t\t\tanzahlSoloSie, anzahlGewonneneRufspiele, anzahlGewonneneSoli,\n\t\t\t\tanzahlGewonneneSoliTout, anzahlWeiter);\n\t}\n\n\tprivate static class StatsData {\n\t\tprotected int anzahlSpieleGesamt = 0;\n\t\tprotected int anzahlSpieleGesamtGewonnen = 0;\n\t\tprotected int teuerstesRufspiel = 0;\n\t\tprotected int teuerstesSolo = 0;\n\t\tprotected int teuerstesSoloTout = 0;\n\t\tprotected int teuerstesSoloSie = 0;\n\t\tprotected int anzahlRufspiele = 0;\n\t\tprotected int anzahlSolo = 0;\n\t\tprotected int anzahlSoloTout = 0;\n\t\tprotected int anzahlSoloSie = 0;\n\t\tprotected int anzahlGewonneneRufspiele = 0;\n\t\tprotected int anzahlGewonneneSoli = 0;\n\t\tprotected int anzahlGewonneneSoliTout = 0;\n\t\tprotected int anzahlWeiter = 0;\n\n\t\tpublic StatsData(int anzahlSpieleGesamt,\n\t\t\t\tint anzahlSpieleGesamtGewonnen, int teuerstesRufspiel,\n\t\t\t\tint teuerstesSolo, int teuerstesSoloTout, int teuerstesSoloSie,\n\t\t\t\tint anzahlRufspiele, int anzahlSolo, int anzahlSoloTout,\n\t\t\t\tint anzahlSoloSie, int anzahlGewonneneRufspiele,\n\t\t\t\tint anzahlGewonneneSoli, int anzahlGewonneneSoliTout,\n\t\t\t\tint anzahlWeiter) {\n\t\t\tthis.anzahlSpieleGesamt = anzahlSpieleGesamt;\n\t\t\tthis.anzahlSpieleGesamtGewonnen = anzahlSpieleGesamtGewonnen;\n\t\t\tthis.teuerstesRufspiel = teuerstesRufspiel;\n\t\t\tthis.teuerstesSolo = teuerstesSolo;\n\t\t\tthis.teuerstesSoloTout = teuerstesSoloTout;\n\t\t\tthis.teuerstesSoloSie = teuerstesSoloSie;\n\t\t\tthis.anzahlRufspiele = anzahlRufspiele;\n\t\t\tthis.anzahlSolo = anzahlSolo;\n\t\t\tthis.anzahlSoloTout = anzahlSoloTout;\n\t\t\tthis.anzahlSoloSie = anzahlSoloSie;\n\t\t\tthis.anzahlGewonneneRufspiele = anzahlGewonneneRufspiele;\n\t\t\tthis.anzahlGewonneneSoli = anzahlGewonneneSoli;\n\t\t\tthis.anzahlGewonneneSoliTout = anzahlGewonneneSoliTout;\n\t\t\tthis.anzahlWeiter = anzahlWeiter;\n\t\t}\n\t}\n}\n","old_contents":"import java.awt.Color;\nimport java.awt.Font;\nimport java.awt.GridLayout;\n\nimport javax.swing.JPanel;\nimport javax.swing.JTabbedPane;\n\nimport model.SystemValues.WIN;\nimport model.db.DataObject;\nimport de.erichseifert.gral.data.DataTable;\nimport de.erichseifert.gral.plots.PiePlot;\nimport de.erichseifert.gral.ui.InteractivePanel;\nimport de.erichseifert.gral.plots.PiePlot.PieSliceRenderer;\nimport de.erichseifert.gral.util.Insets2D;\nimport view.GUI;\nimport view.UIUpdater;\nimport model.db.GameData;\n\npublic privileged aspect StatOverallGraphical {\n\n    private static GUI gui;\n    private static JPanel panel = new JPanel();\n\n    @SuppressWarnings(\"unchecked\")\n    private static DataTable playedTypesTable = new DataTable(Integer.class);\n\n    after() returning(GUI gui): call(GUI.new(*)) {\n        StatOverallGraphical.gui = gui;\n    }\n\n    after(JTabbedPane tabbedPane): \n        execution(public static void StatisticsHelper.StatisticsPaneCreated(JTabbedPane))\n        && args(tabbedPane) {\n        panel.setLayout(new GridLayout(1, 2));\n\n        panel.add(new InteractivePanel(createPlayedTypesPlot()));\n\n        tabbedPane.addTab(\"OverallGrafik\", panel);\n    }\n\n    after() : execution(* UIUpdater.run()) {\n        updateData();\n    }\n\n    private static void updateData() {\n        StatsData data = gui.model.getGameData().getOverallStatisticsData();\n\n        playedTypesTable.clear();\n        playedTypesTable.add(data.anzahlRufspiele);\n        playedTypesTable.add(data.anzahlSolo);\n        playedTypesTable.add(data.anzahlSoloTout);\n        playedTypesTable.add(data.anzahlSoloSie);\n        playedTypesTable.add(data.anzahlWeiter);\n    }\n\n    private static PiePlot createPlayedTypesPlot() {\n        updateData();\n        PiePlot plot = new PiePlot(playedTypesTable);\n\n        \/\/ Format plot\n        plot.getTitle().setText(\"Anzahl gespielter Spieltypen\");\n        \/\/ Change plot size\n        plot.setRadius(0.9);\n        \/\/ Display a legend\n        plot.setLegendVisible(true);\n        \/\/ Add some margin to the plot area\n        plot.setInsets(new Insets2D.Double(20.0, 40.0, 40.0, 40.0));\n\n        PieSliceRenderer pointRenderer = (PieSliceRenderer) plot.getPointRenderer(playedTypesTable);\n        \/\/ Change relative size of inner region\n        pointRenderer.setInnerRadius(0.4);\n        \/\/ Change the width of gaps between segments\n        pointRenderer.setGap(0.2);\n        \/\/ Show labels\n        pointRenderer.setValueVisible(true);\n        pointRenderer.setValueColor(Color.WHITE);\n        pointRenderer.setValueFont(Font.decode(null).deriveFont(Font.BOLD));\n\n        return plot;\n    }\n\n    public StatsData GameData.getOverallStatisticsData() {\n        int anzahlSpieleGesamt = 0;\n        int anzahlSpieleGesamtGewonnen = 0;\n        int teuerstesRufspiel = 0;\n        int teuerstesSolo = 0;\n        int teuerstesSoloTout = 0;\n        int teuerstesSoloSie = 0;\n        int anzahlRufspiele = 0;\n        int anzahlSolo = 0;\n        int anzahlSoloTout = 0;\n        int anzahlSoloSie = 0;\n        int anzahlGewonneneRufspiele = 0;\n        int anzahlGewonneneSoli = 0;\n        int anzahlGewonneneSoliTout = 0;\n        int anzahlWeiter = 0;\n\n        for (DataObject obj : data) {\n            switch (obj.getGameKind()) {\n            case \"Rufspiel\":\n                anzahlRufspiele++;\n                anzahlSpieleGesamt++;\n                if (obj.getGameWon() == WIN.PLAYER) {\n                    anzahlGewonneneRufspiele++;\n                    anzahlSpieleGesamtGewonnen++;\n                }\n                if (obj.getGameValue() > teuerstesRufspiel) {\n                    teuerstesRufspiel = obj.getGameValue();\n                }\n                break;\n            case \"Solo\":\n                anzahlSolo++;\n                anzahlSpieleGesamt++;\n                if (obj.getGameWon() == WIN.PLAYER) {\n                    anzahlGewonneneSoli++;\n                    anzahlSpieleGesamtGewonnen++;\n                }\n                if (obj.getGameValue() > teuerstesSolo) {\n                    teuerstesSolo = obj.getGameValue();\n                }\n                break;\n            case \"Solo Tout\":\n                anzahlSpieleGesamt++;\n                if (obj.getGameWon() == WIN.PLAYER) {\n                    anzahlGewonneneSoliTout++;\n                    anzahlSpieleGesamtGewonnen++;\n                }\n                if (obj.getGameValue() > teuerstesSoloTout) {\n                    teuerstesSoloTout = obj.getGameValue();\n                }\n                anzahlSoloTout++;\n                break;\n            case \"Solo Sie\":\n                anzahlSpieleGesamt++;\n                anzahlSpieleGesamtGewonnen++;\n                anzahlSoloSie++;\n                if (obj.getGameValue() > teuerstesSoloSie) {\n                    teuerstesSoloSie = obj.getGameValue();\n                }\n                break;\n            case \"weiter\":\n                anzahlWeiter++;\n                break;\n            }\n        }\n\n        double sologesamtwin = (anzahlSolo + anzahlSoloSie + anzahlSoloTout) > 0 ? ((anzahlGewonneneSoli\n                + anzahlGewonneneSoliTout + anzahlSoloSie) \/ 1.0 \/ (anzahlSolo\n                + anzahlSoloSie + anzahlSoloTout))\n                : 0;\n\n        return new StatsData(anzahlSpieleGesamt, anzahlSpieleGesamtGewonnen,\n                teuerstesRufspiel, teuerstesSolo, teuerstesSoloTout,\n                teuerstesSoloSie, anzahlRufspiele, anzahlSolo, anzahlSoloTout,\n                anzahlSoloSie, anzahlGewonneneRufspiele, anzahlGewonneneSoli,\n                anzahlGewonneneSoliTout, anzahlWeiter);\n    }\n\n    private static class StatsData {\n        protected int anzahlSpieleGesamt = 0;\n        protected int anzahlSpieleGesamtGewonnen = 0;\n        protected int teuerstesRufspiel = 0;\n        protected int teuerstesSolo = 0;\n        protected int teuerstesSoloTout = 0;\n        protected int teuerstesSoloSie = 0;\n        protected int anzahlRufspiele = 0;\n        protected int anzahlSolo = 0;\n        protected int anzahlSoloTout = 0;\n        protected int anzahlSoloSie = 0;\n        protected int anzahlGewonneneRufspiele = 0;\n        protected int anzahlGewonneneSoli = 0;\n        protected int anzahlGewonneneSoliTout = 0;\n        protected int anzahlWeiter = 0;\n\n        public StatsData(int anzahlSpieleGesamt,\n                int anzahlSpieleGesamtGewonnen, int teuerstesRufspiel,\n                int teuerstesSolo, int teuerstesSoloTout, int teuerstesSoloSie,\n                int anzahlRufspiele, int anzahlSolo, int anzahlSoloTout,\n                int anzahlSoloSie, int anzahlGewonneneRufspiele,\n                int anzahlGewonneneSoli, int anzahlGewonneneSoliTout,\n                int anzahlWeiter) {\n            this.anzahlSpieleGesamt = anzahlSpieleGesamt;\n            this.anzahlSpieleGesamtGewonnen = anzahlSpieleGesamtGewonnen;\n            this.teuerstesRufspiel = teuerstesRufspiel;\n            this.teuerstesSolo = teuerstesSolo;\n            this.teuerstesSoloTout = teuerstesSoloTout;\n            this.teuerstesSoloSie = teuerstesSoloSie;\n            this.anzahlRufspiele = anzahlRufspiele;\n            this.anzahlSolo = anzahlSolo;\n            this.anzahlSoloTout = anzahlSoloTout;\n            this.anzahlSoloSie = anzahlSoloSie;\n            this.anzahlGewonneneRufspiele = anzahlGewonneneRufspiele;\n            this.anzahlGewonneneSoli = anzahlGewonneneSoli;\n            this.anzahlGewonneneSoliTout = anzahlGewonneneSoliTout;\n            this.anzahlWeiter = anzahlWeiter;\n        }\n    }\n}","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"208d050b5de2c2358a3ff25cf9791766ca646e4e","subject":"changed the logging of ppi-related process instance to only do so, if there are actually ppis defined on the process definition. This way, this feature is also switched off, if you are not using the PPI engine configuration.","message":"changed the logging of ppi-related process instance to only do so, if there are actually ppis defined on the process definition. This way, this feature is also switched off, if you are not using the PPI engine configuration.\n","repos":"ThorbenLindhauer\/activiti-engine-ppi","old_file":"modules\/activiti-engine\/src\/main\/java\/de\/unipotsdam\/hpi\/thorben\/ppi\/aspects\/ProcessInstanceAspect.aj","new_file":"modules\/activiti-engine\/src\/main\/java\/de\/unipotsdam\/hpi\/thorben\/ppi\/aspects\/ProcessInstanceAspect.aj","new_contents":"\/* Copyright 2012 Thorben Lindhauer\n * \n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage de.unipotsdam.hpi.thorben.ppi.aspects;\n\nimport org.activiti.engine.impl.context.Context;\nimport org.activiti.engine.impl.interceptor.CommandContext;\nimport org.activiti.engine.impl.persistence.entity.ExecutionEntity;\nimport org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity;\nimport org.activiti.engine.impl.pvm.process.ActivityImpl;\n\nimport de.unipotsdam.hpi.thorben.ppi.measure.instance.entity.PPIProcessInstanceEntity;\n\npublic aspect ProcessInstanceAspect {\n\n\tpointcut newInstance(ProcessDefinitionEntity processDefinition) : target(processDefinition) && call(ExecutionEntity ProcessDefinitionEntity.createProcessInstance(String, ActivityImpl));\n\n\tafter(ProcessDefinitionEntity processDefinition) returning (ExecutionEntity processInstance): newInstance(processDefinition) {\n\t\tif (!processDefinition.getPPIs().isEmpty()) {\n\t\t\tPPIProcessInstanceEntity instanceEntity = PPIProcessInstanceEntity\n\t\t\t\t\t.fromExecution(processInstance);\n\t\t\tCommandContext commandContext = Context.getCommandContext();\n\t\t\tcommandContext.getDbSqlSession().insert(instanceEntity);\n\t\t}\n\t}\n}\n","old_contents":"\/* Copyright 2012 Thorben Lindhauer\n * \n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage de.unipotsdam.hpi.thorben.ppi.aspects;\n\nimport org.activiti.engine.impl.context.Context;\nimport org.activiti.engine.impl.interceptor.CommandContext;\nimport org.activiti.engine.impl.persistence.entity.ExecutionEntity;\nimport org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity;\nimport org.activiti.engine.impl.pvm.process.ActivityImpl;\n\nimport de.unipotsdam.hpi.thorben.ppi.measure.instance.entity.PPIProcessInstanceEntity;\n\npublic aspect ProcessInstanceAspect {\n\n\tpointcut newInstance(ProcessDefinitionEntity processDefinition) : target(processDefinition) && call(ExecutionEntity ProcessDefinitionEntity.createProcessInstance(String, ActivityImpl));\n\tafter(ProcessDefinitionEntity processDefinition) returning (ExecutionEntity processInstance): newInstance(processDefinition) {\n\t\tPPIProcessInstanceEntity instanceEntity = PPIProcessInstanceEntity.fromExecution(processInstance);\n\t\tCommandContext commandContext = Context.getCommandContext();\n\t\tcommandContext\n        .getDbSqlSession()\n        .insert(instanceEntity);\n\t}\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"124f20a80eee972bbeb506f54cca0c50fabf72af","subject":"removed DummyAspect","message":"removed DummyAspect\n","repos":"palava\/palava-core,palava\/palava-core","old_file":"src\/test\/java\/de\/cosmocode\/palava\/core\/aop\/DummyAspect.aj","new_file":"src\/test\/java\/de\/cosmocode\/palava\/core\/aop\/DummyAspect.aj","new_contents":"","old_contents":"\/**\n * Copyright 2010 CosmoCode GmbH\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage de.cosmocode.palava.core.aop;\n\n\/**\n * Used to check whether {@link AbstractPalavaAspect} works as aspected.\n * Just switch from abstract to final to enable.\n *\n * @author Willi Schoenborn\n *\/\nabstract aspect DummyAspect extends AbstractPalavaAspect issingleton() {\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"6808f46dfdda6005d5993badc34fbae704b8470c","subject":"Don't index Scala binary files for Scala special types.","message":"Don't index Scala binary files for Scala special types.\n\nExclude classifies for\n* anonymous classes (`$anonfun`)\n* top-level objects (`*$.class`)\n* trait imll classes (`..$class.class`)\n\nFixed #1001035.\n","repos":"wpopielarski\/scala-ide,mlangc\/scala-ide,Duhemm\/scala-ide,romanowski\/scala-ide,stephenh\/scala-ide,dragos\/scala-ide,mlangc\/scala-ide,scala-ide\/scala-ide,andrey-ilinykh\/scala-ide,aleksi-lukkarinen\/scala-ide,Duhemm\/scala-ide,mlangc\/scala-ide,aleksi-lukkarinen\/scala-ide,Kwestor\/scala-ide,wpopielarski\/scala-ide,Kwestor\/scala-ide,Duhemm\/scala-ide,aleksi-lukkarinen\/scala-ide,stephenh\/scala-ide,scala-ide\/scala-ide,Kwestor\/scala-ide,romanowski\/scala-ide,andrey-ilinykh\/scala-ide,scala-ide\/scala-ide,Duhemm\/scala-ide,scala-ide\/scala-ide,stephenh\/scala-ide,aleksi-lukkarinen\/scala-ide,dragos\/scala-ide,mlangc\/scala-ide,pilipolio\/scala-ide,romanowski\/scala-ide,Kwestor\/scala-ide,wpopielarski\/scala-ide,andrey-ilinykh\/scala-ide,romanowski\/scala-ide,dragos\/scala-ide,dragos\/scala-ide,pilipolio\/scala-ide,wpopielarski\/scala-ide,sschaef\/scala-ide,sschaef\/scala-ide,stephenh\/scala-ide,pilipolio\/scala-ide,sschaef\/scala-ide,sschaef\/scala-ide,andrey-ilinykh\/scala-ide,pilipolio\/scala-ide","old_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/indexerprovider\/IndexerProviderAspect.aj","new_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/indexerprovider\/IndexerProviderAspect.aj","new_contents":"\/*\n * Copyright 2005-2010 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.indexerprovider;\n\nimport org.eclipse.core.runtime.IPath;\nimport org.eclipse.jdt.core.search.SearchDocument;\nimport org.eclipse.jdt.internal.core.search.indexing.AbstractIndexer;\nimport org.eclipse.jdt.internal.core.search.JavaSearchParticipant;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.ScalaJDTWeavingPlugin;\n\n@SuppressWarnings(\"restriction\")\npublic aspect IndexerProviderAspect {\n\n  pointcut indexDocument(SearchDocument document, IPath indexPath) : \n    execution(public void JavaSearchParticipant.indexDocument(SearchDocument, IPath)) &&\n    args(document, indexPath);\n\n  void around(SearchDocument document, IPath indexPath) : \n    indexDocument(document, indexPath) {\n\n    String path = document.getPath();\n    if (path.endsWith(\".scala\")) {\n      for (IIndexerFactory provider : IndexerProviderRegistry.getInstance().getProviders()) {\n        try {\n          AbstractIndexer indexer = provider.createIndexer(document);\n          indexer.indexDocument();\n        } catch (Throwable t) {\n          ScalaJDTWeavingPlugin.logException(t);\n        }\n      }\n    } else if (!isScalaArtifact(path)) {\n      proceed(document, indexPath);\n    }\n  }\n\n  private boolean isScalaArtifact(String path) {\n    return path.endsWith(\".class\")\n        && (path.endsWith(\"$.class\")          \/\/ top-level object\n            || path.endsWith(\"$class.class\")  \/\/ trait implementation class\n            || path.contains(\"$anon\"));       \/\/ anonymous class or function\n  }\n}\n","old_contents":"\/*\n * Copyright 2005-2010 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.indexerprovider;\n\nimport org.eclipse.core.runtime.IPath;\nimport org.eclipse.jdt.core.search.SearchDocument;\nimport org.eclipse.jdt.internal.core.search.indexing.AbstractIndexer;\nimport org.eclipse.jdt.internal.core.search.JavaSearchParticipant;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.ScalaJDTWeavingPlugin;\n\n@SuppressWarnings(\"restriction\")\npublic aspect IndexerProviderAspect {\n\n  pointcut indexDocument(SearchDocument document, IPath indexPath) : \n    execution(public void JavaSearchParticipant.indexDocument(SearchDocument, IPath)) &&\n    args(document, indexPath);\n\n  void around(SearchDocument document, IPath indexPath) : \n    indexDocument(document, indexPath) {\n\n    String path = document.getPath();\n    if (path.endsWith(\".scala\")) {\n      for (IIndexerFactory provider : IndexerProviderRegistry.getInstance().getProviders()) {\n        try {\n          AbstractIndexer indexer = provider.createIndexer(document);\n          indexer.indexDocument();\n        } catch (Throwable t) {\n          ScalaJDTWeavingPlugin.logException(t);\n        }\n      }\n    } else {\n      proceed(document, indexPath);\n    }\n  }\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"0ddcf68b2e541f4f7d8ef78a8b658ad89079f823","subject":"Attempt to fix duplicate setRollbackOnly calls","message":"Attempt to fix duplicate setRollbackOnly calls\n","repos":"palava\/palava-jta","old_file":"src\/main\/java\/de\/cosmocode\/palava\/jta\/AbstractUserTransactionAspect.aj","new_file":"src\/main\/java\/de\/cosmocode\/palava\/jta\/AbstractUserTransactionAspect.aj","new_contents":"\/**\n * palava - a java-php-bridge\n * Copyright (C) 2007-2010  CosmoCode GmbH\n *\n * This program is free software; you can redistribute it and\/or\n * modify it under the terms of the GNU General Public License\n * as published by the Free Software Foundation; either version 2\n * of the License, or (at your option) any later version.\n *\n * This program is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n * along with this program; if not, write to the Free Software\n * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n * MA  02110-1301, USA.\n *\/\n\npackage de.cosmocode.palava.jta;\n\nimport javax.transaction.NotSupportedException;\nimport javax.transaction.Status;\nimport javax.transaction.SystemException;\nimport javax.transaction.UserTransaction;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\n\npublic abstract aspect AbstractUserTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(AbstractUserTransactionAspect.class);\n\n    private Provider<UserTransaction> provider;\n    \n    @Inject\n    void setProvider(Provider<UserTransaction> provider) {\n        this.provider = Preconditions.checkNotNull(provider, \"Provider\");\n    }\n    \n    protected abstract pointcut transactional();\n    \n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        final UserTransaction tx = provider.get();\n        LOG.trace(\"Using transaction {}\", tx);\n        \n        final boolean local;\n        \n        try {\n            local = tx.getStatus() == Status.STATUS_NO_TRANSACTION;\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        if (local) {\n            LOG.trace(\"Beginning automatic transaction {}\", tx);\n            try {\n                tx.begin();\n            } catch (NotSupportedException e) {\n                throw new IllegalStateException(e);\n            } catch (SystemException e) {\n                throw new IllegalStateException(e);\n            }\n        } else {\n            LOG.trace(\"Transaction {} already active\", tx);\n        }\n\n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (Exception e) {\n            LOG.error(\"Exception inside automatic transaction context\", e);\n            try {\n                if (local && \n                    (tx.getStatus() == Status.STATUS_ACTIVE || tx.getStatus() == Status.STATUS_MARKED_ROLLBACK)) {\n                    LOG.info(\"Rolling back local\/active transaction {}\", tx);\n                    tx.rollback();\n                } else if (tx.getStatus() != Status.STATUS_ROLLEDBACK || tx.getStatus() != Status.STATUS_ROLLING_BACK) {\n                    LOG.debug(\"Setting transaction {} as rollback only\", tx);\n                    tx.setRollbackOnly();\n                }\n            } catch (SystemException inner) {\n                throw new IllegalStateException(inner);\n            }\n            throw new IllegalStateException(e);\n        }\n        \n        final int status;\n        \n        try {\n            status = tx.getStatus();\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n        \n        if (local) {\n            if (status == Status.STATUS_MARKED_ROLLBACK) {\n                try {\n                    LOG.trace(\"Rolling back marked transaction {}\", tx);\n                    tx.rollback();\n                } catch (SystemException e) {\n                    throw new IllegalStateException(e);\n                }\n            } else {\n                try {\n                    tx.commit();\n                    LOG.trace(\"Committed automatic transaction {}\", tx);\n                } catch (Exception e) {\n                    LOG.error(\"Commit in automatic transaction context failed\", e);\n                    try {\n                        LOG.info(\"Rolling back transaction {}\", tx);\n                        tx.rollback();\n                    } catch (SystemException inner) {\n                        throw new IllegalStateException(inner);\n                    }\n                    throw new IllegalStateException(e);\n                }\n            }\n        }\n        \n        return returnValue;\n    }\n    \n}\n","old_contents":"\/**\n * palava - a java-php-bridge\n * Copyright (C) 2007-2010  CosmoCode GmbH\n *\n * This program is free software; you can redistribute it and\/or\n * modify it under the terms of the GNU General Public License\n * as published by the Free Software Foundation; either version 2\n * of the License, or (at your option) any later version.\n *\n * This program is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n * along with this program; if not, write to the Free Software\n * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n * MA  02110-1301, USA.\n *\/\n\npackage de.cosmocode.palava.jta;\n\nimport javax.transaction.NotSupportedException;\nimport javax.transaction.Status;\nimport javax.transaction.SystemException;\nimport javax.transaction.UserTransaction;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\n\npublic abstract aspect AbstractUserTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(AbstractUserTransactionAspect.class);\n\n    private Provider<UserTransaction> provider;\n    \n    @Inject\n    void setProvider(Provider<UserTransaction> provider) {\n        this.provider = Preconditions.checkNotNull(provider, \"Provider\");\n    }\n    \n    protected abstract pointcut transactional();\n    \n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        final UserTransaction tx = provider.get();\n        LOG.trace(\"Using transaction {}\", tx);\n        \n        final boolean local;\n        \n        try {\n            local = tx.getStatus() == Status.STATUS_NO_TRANSACTION;\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        if (local) {\n            LOG.trace(\"Beginning automatic transaction {}\", tx);\n            try {\n                tx.begin();\n            } catch (NotSupportedException e) {\n                throw new IllegalStateException(e);\n            } catch (SystemException e) {\n                throw new IllegalStateException(e);\n            }\n        } else {\n            LOG.trace(\"Transaction {} already active\", tx);\n        }\n\n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (Exception e) {\n            LOG.error(\"Exception inside automatic transaction context\", e);\n            try {\n                if (local && tx.getStatus() == Status.STATUS_ACTIVE) {\n                    LOG.info(\"Rolling back local\/active transaction {}\", tx);\n                    tx.rollback();\n                } else {\n                    LOG.debug(\"Setting transaction {} as rollback only\", tx);\n                    tx.setRollbackOnly();\n                }\n            } catch (SystemException inner) {\n                throw new IllegalStateException(inner);\n            }\n            throw new IllegalStateException(e);\n        }\n        \n        final int status;\n        \n        try {\n            status = tx.getStatus();\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n        \n        if (local) {\n            if (status == Status.STATUS_MARKED_ROLLBACK) {\n                try {\n                    LOG.trace(\"Rolling back marked transaction {}\", tx);\n                    tx.rollback();\n                } catch (SystemException e) {\n                    throw new IllegalStateException(e);\n                }\n            } else {\n                try {\n                    tx.commit();\n                    LOG.trace(\"Committed automatic transaction {}\", tx);\n                } catch (Exception e) {\n                    LOG.error(\"Commit in automatic transaction context failed\", e);\n                    try {\n                        LOG.info(\"Rolling back transaction {}\", tx);\n                        tx.rollback();\n                    } catch (SystemException inner) {\n                        throw new IllegalStateException(inner);\n                    }\n                    throw new IllegalStateException(e);\n                }\n            }\n        }\n        \n        return returnValue;\n    }\n    \n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"032713bce40ab5f762eb154611eadef529d82e12","subject":"comments for RemoveLastDealer","message":"comments for RemoveLastDealer\n","repos":"stieglma\/Schafkopfauswerter","old_file":"src\/RemoveLastDealer.aj","new_file":"src\/RemoveLastDealer.aj","new_contents":"\npublic privileged aspect RemoveLastDealer {\n\n    \/** decrease dealer when game is removed *\/\n    before() : execution (* RemoveLastGameListener.actionPerformed(*)) {\n      Dealer.dealerIndex--;\n      if (Dealer.dealerIndex < 0) {\n          Dealer.dealerIndex = 3;\n      }\n      Dealer.updateShownDealer();\n    }\n}\n","old_contents":"\npublic privileged aspect RemoveLastDealer {\n\n    before() : execution (* RemoveLastGameListener.actionPerformed(*)) {\n      Dealer.dealerIndex--;\n      if (Dealer.dealerIndex < 0) {\n          Dealer.dealerIndex = 3;\n      }\n      Dealer.updateShownDealer();\n    }\n}\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"d9b17ffbb33630a4cb0478c6b6b3f209a79bbbb8","subject":"Fixing injection of plexus-utils imports for XPP3 stuff.","message":"Fixing injection of plexus-utils imports for XPP3 stuff.\n\ngit-svn-id: 2c527eb49caa05e19d6b2be874bf74fa9d7ea670@633750 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"wangyuesong\/maven,apache\/maven,atanasenko\/maven,wangyuesong0\/maven,lbndev\/maven,olamy\/maven,skitt\/maven,njuneau\/maven,apache\/maven,Mounika-Chirukuri\/maven,keith-turner\/maven,barthel\/maven,barthel\/maven,dsyer\/maven,mizdebsk\/maven,changbai1980\/maven,rogerchina\/maven,mcculls\/maven,xasx\/maven,ChristianSchulte\/maven,cstamas\/maven,karthikjaps\/maven,rogerchina\/maven,pkozelka\/maven,changbai1980\/maven,pkozelka\/maven,likaiwalkman\/maven,trajano\/maven,atanasenko\/maven,Mounika-Chirukuri\/maven,runepeter\/maven-deploy-plugin-2.8.1,wangyuesong\/maven,gorcz\/maven,likaiwalkman\/maven,Distrotech\/maven,aheritier\/maven,aheritier\/maven,runepeter\/maven-deploy-plugin-2.8.1,keith-turner\/maven,njuneau\/maven,olamy\/maven,pkozelka\/maven,mcculls\/maven,vedmishr\/demo1,kidaa\/maven-1,trajano\/maven,mizdebsk\/maven,xasx\/maven,stephenc\/maven,stephenc\/maven,vedmishr\/demo1,dsyer\/maven,Tibor17\/maven,josephw\/maven,lbndev\/maven,karthikjaps\/maven,gorcz\/maven,likaiwalkman\/maven,wangyuesong\/maven,lbndev\/maven,karthikjaps\/maven,Distrotech\/maven,wangyuesong0\/maven,olamy\/maven,xasx\/maven,cstamas\/maven,rogerchina\/maven,kidaa\/maven-1,gorcz\/maven,ChristianSchulte\/maven,dsyer\/maven,josephw\/maven,cstamas\/maven,Tibor17\/maven,trajano\/maven,stephenc\/maven,kidaa\/maven-1,keith-turner\/maven,aheritier\/maven,mcculls\/maven,apache\/maven,atanasenko\/maven,skitt\/maven,barthel\/maven,vedmishr\/demo1,mizdebsk\/maven,josephw\/maven,Mounika-Chirukuri\/maven,changbai1980\/maven,skitt\/maven,wangyuesong0\/maven,ChristianSchulte\/maven,njuneau\/maven","old_file":"maven-core\/src\/main\/aspect\/org\/apache\/maven\/compat\/Maven20xCompatAspect.aj","new_file":"maven-core\/src\/main\/aspect\/org\/apache\/maven\/compat\/Maven20xCompatAspect.aj","new_contents":"package org.apache.maven.compat;\n\nimport org.apache.maven.lifecycle.binding.DefaultLifecycleBindingManager;\nimport org.apache.maven.lifecycle.binding.LifecycleBindingManager;\nimport org.codehaus.plexus.PlexusContainer;\nimport org.apache.maven.DefaultMaven;\nimport org.apache.maven.lifecycle.DefaultLifecycleExecutor;\nimport org.apache.maven.lifecycle.MojoBindingUtils;\nimport org.apache.maven.lifecycle.LifecycleUtils;\nimport org.apache.maven.lifecycle.NoSuchPhaseException;\nimport org.apache.maven.execution.MavenExecutionRequest;\nimport org.apache.maven.execution.MavenExecutionResult;\nimport org.apache.maven.execution.MavenSession;\nimport org.apache.maven.extension.DefaultExtensionManager;\nimport org.apache.maven.artifact.Artifact;\nimport org.apache.maven.artifact.factory.ArtifactFactory;\nimport org.apache.maven.artifact.metadata.ResolutionGroup;\nimport org.apache.maven.artifact.repository.ArtifactRepository;\nimport org.apache.maven.artifact.resolver.ArtifactNotFoundException;\nimport org.apache.maven.artifact.resolver.ArtifactResolutionException;\nimport org.apache.maven.artifact.versioning.DefaultArtifactVersion;\nimport org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;\nimport org.apache.maven.artifact.versioning.VersionRange;\nimport org.apache.maven.lifecycle.model.MojoBinding;\nimport org.apache.maven.model.Plugin;\nimport org.apache.maven.plugin.DefaultPluginManager;\nimport org.apache.maven.plugin.InvalidPluginException;\nimport org.apache.maven.plugin.PluginManager;\nimport org.apache.maven.plugin.PluginManagerException;\nimport org.apache.maven.plugin.PluginNotFoundException;\nimport org.apache.maven.plugin.descriptor.PluginDescriptor;\nimport org.apache.maven.plugin.version.PluginVersionNotFoundException;\nimport org.apache.maven.plugin.version.PluginVersionResolutionException;\nimport org.apache.maven.project.MavenProject;\nimport org.apache.maven.realm.MavenRealmManager;\nimport org.apache.maven.settings.MavenSettingsBuilder;\nimport org.apache.maven.settings.DefaultMavenSettingsBuilder;\nimport org.apache.maven.settings.Settings;\nimport org.codehaus.plexus.classworlds.realm.ClassRealm;\nimport org.codehaus.plexus.classworlds.realm.NoSuchRealmException;\nimport org.codehaus.plexus.component.repository.exception.ComponentLookupException;\nimport org.codehaus.plexus.util.xml.pull.XmlPullParserException;\nimport org.codehaus.plexus.util.xml.Xpp3Dom;\nimport org.codehaus.plexus.logging.Logger;\n\nimport java.util.List;\nimport java.io.IOException;\nimport java.util.Iterator;\nimport java.util.Collection;\nimport java.util.Set;\nimport java.util.LinkedHashSet;\n\npublic privileged aspect Maven20xCompatAspect\n{\n\n    \/\/ GRAB Session as soon as it's constructed.\n    private MavenSession session;\n\n    \/\/ GRAB the request when it's passed into a method that returns a corresponding result.\n    \/\/ NOTE: We'll use this in multiple places below...\n    private MavenExecutionRequest request;\n\n    \/\/ Grab this so we have a voice!\n    private Logger logger;\n\n    \/\/ used for injecting plexus-utils into extension and plugin artifact sets.\n    private VersionRange vr = null;\n    private Artifact plexusUtilsArtifact = null;\n\n\n    private pointcut mavenEmbedderStop():\n        execution( * org.apache.maven.embedder.MavenEmbedder.stop( .. ) );\n\n    \/\/ TODO: There must be a more elegant way to release these resources than depending on MavenEmbedder.stop().\n    after(): mavenEmbedderStop()\n    {\n        session = null;\n        request = null;\n        logger = null;\n        vr = null;\n        plexusUtilsArtifact = null;\n    }\n\n\n    \/\/ pointcut to avoid recursive matching on behavior injected by this aspect.\n    private pointcut notHere(): !within( Maven20xCompatAspect );\n\n    private pointcut sessionCreation( MavenSession session ):\n        execution( public MavenSession+.new(..) )\n        && this( session )\n        && notHere();\n\n    \/\/ capture the session instance.\n    after( MavenSession session ): sessionCreation( session )\n    {\n        if ( logger != null && logger.isDebugEnabled() )\n        {\n            logger.debug( \"Capturing session for backward compatibility aspect: \" + session );\n        }\n\n        this.session = session;\n    }\n\n    \/\/ Re-Introduce old verifyPlugin(..) API.\n    public PluginDescriptor PluginManager.verifyPlugin( Plugin plugin,\n                                                        MavenProject project,\n                                                        Settings settings,\n                                                        ArtifactRepository localRepository )\n        throws ArtifactResolutionException, ArtifactNotFoundException, PluginNotFoundException,\n        PluginVersionResolutionException, InvalidPluginException, PluginManagerException,\n        PluginVersionNotFoundException\n    {\n        \/\/ this will always be diverted, so no need to do anything.\n        throw new IllegalStateException( \"This introduced method should ALWAYS be intercepted by backward compatibility aspect.\" );\n    }\n\n    \/\/ USE Session to compensate for old verifyPlugin(..) API.\n    private pointcut verifyPlugin( Plugin plugin, MavenProject project, PluginManager manager ):\n        execution( PluginDescriptor PluginManager+.verifyPlugin( Plugin, MavenProject, Settings, ArtifactRepository+ ) )\n        && args( plugin, project, .. )\n        && this( manager );\n\n    \/\/ redirect the old verifyPlugin(..) call to the new one, using the captured session instance above.\n    PluginDescriptor around( Plugin plugin,\n                             MavenProject project,\n                             PluginManager manager )\n        throws ArtifactResolutionException, ArtifactNotFoundException, PluginNotFoundException,\n        PluginVersionResolutionException, InvalidPluginException, PluginManagerException,\n        PluginVersionNotFoundException:\n            verifyPlugin( plugin, project, manager )\n    {\n        if ( logger != null && logger.isDebugEnabled() )\n        {\n            logger.debug( \"Diverting legacy PluginManager.verifyPlugin(..) call to replacement method using session: \" + session );\n        }\n\n        return manager.verifyPlugin( plugin, project, session );\n    }\n\n    private pointcut getPluginDescriptorForPrefix( String prefix, PluginManager manager ):\n        execution( public PluginDescriptor PluginManager+.getPluginDescriptorForPrefix( String ) )\n        && args( prefix )\n        && this( manager )\n        && notHere();\n\n    PluginDescriptor around( String prefix, PluginManager manager ): getPluginDescriptorForPrefix( prefix, manager )\n    {\n        \/\/ TODO: Implement Me!\n        throw new UnsupportedOperationException( \"This method has not yet been implemented in Maven's backward-compatibility library.\" );\n    }\n\n    public PluginDescriptor PluginManager.getPluginDescriptorForPrefix( String prefix )\n    {\n        return null;\n    }\n\n    \/\/ Intercept retrieval of artifact dependencies of an extension, inject plexus-utils if it's not there.\n    private pointcut extDepArtifactsResolved( DefaultExtensionManager mgr ):\n        call( public Set ResolutionGroup+.getArtifacts() )\n        && within( DefaultExtensionManager+ )\n        && this( mgr )\n        && notHere();\n\n    \/\/ We use the same hack here to make sure that plexus 1.1 is available for extensions that do\n    \/\/ not declare plexus-utils but need it. MNG-2900\n    Set around( DefaultExtensionManager mgr ): extDepArtifactsResolved( mgr )\n    {\n        Set result = proceed( mgr );\n\n        result = checkPlexusUtils( result, mgr.artifactFactory );\n\n        return result;\n    }\n\n    \/\/ Intercept retrieval of artifact dependencies of a plugin, inject plexus-utils if it's not there.\n    private pointcut pluginDepArtifactsResolved( DefaultPluginManager mgr ):\n        call( public Set ResolutionGroup+.getArtifacts() )\n        && cflow( execution( Set DefaultPluginManager+.getPluginArtifacts(..) ) )\n        && this( mgr )\n        && notHere();\n\n    Set around( DefaultPluginManager mgr ): pluginDepArtifactsResolved( mgr )\n    {\n        Set result = proceed( mgr );\n\n        result = checkPlexusUtils( result, mgr.artifactFactory );\n\n        return result;\n    }\n\n    private pointcut methodsTakingRequest( MavenExecutionRequest request ):\n        execution( MavenExecutionResult *.*( MavenExecutionRequest ) )\n        && !withincode( * *.*( MavenExecutionRequest ) )\n        && args( request )\n        && notHere();\n\n    \/\/ capture the request instance before it's passed into any method that returns a corresponding MavenExecutionResult.\n    Object around( MavenExecutionRequest request ): methodsTakingRequest( request )\n    {\n        this.request = request;\n\n        try\n        {\n            return proceed( request );\n        }\n        finally\n        {\n            this.request = null;\n        }\n    }\n\n    \/\/ Re-Introduce old buildSettings() API.\n    public Settings MavenSettingsBuilder.buildSettings()\n        throws IOException, XmlPullParserException\n    {\n        return null;\n    }\n\n    public Settings DefaultMavenSettingsBuilder.buildSettings()\n    throws IOException, XmlPullParserException\n    {\n        return null;\n    }\n\n    \/\/ USE Request to compensate for old buildSettings() API.\n    private pointcut buildSettings( MavenSettingsBuilder builder ):\n        execution( public Settings MavenSettingsBuilder+.buildSettings() )\n        && target( builder );\n\n    \/\/ redirect old buildSettings() call to the new one, using the request captured above.\n    Settings around( MavenSettingsBuilder builder )\n        throws IOException, XmlPullParserException:\n            buildSettings( builder )\n    {\n        return builder.buildSettings( request );\n    }\n\n    private pointcut pluginManager( DefaultPluginManager manager ):\n        execution( * DefaultPluginManager.*( .. ) )\n        && this( manager );\n\n    private pointcut pluginRealmCreation( Plugin plugin, DefaultPluginManager manager ):\n        call( ClassRealm MavenRealmManager+.createPluginRealm( Plugin, Artifact, Collection, .. ) )\n        && cflow( pluginManager( manager ) )\n        && args( plugin, .. );\n\n    \/\/ Add various imports for Xpp3 stuff back into the core realm every time a plugin realm is created.\n    ClassRealm around( Plugin plugin, DefaultPluginManager manager ): pluginRealmCreation( plugin, manager )\n    {\n        ClassRealm pluginRealm = proceed( plugin, manager );\n\n        try\n        {\n            String parentRealmId = manager.container.getContainerRealm().getId();\n\n            \/\/ adding for MNG-3012 to try to work around problems with Xpp3Dom (from plexus-utils)\n            \/\/ spawning a ClassCastException when a mojo calls plugin.getConfiguration() from maven-model...\n            pluginRealm.importFrom( parentRealmId, Xpp3Dom.class.getName() );\n            pluginRealm.importFrom( parentRealmId, \"org.codehaus.plexus.util.xml.pull\" );\n\n            \/\/ Adding for MNG-2878, since maven-reporting-impl was removed from the\n            \/\/ internal list of artifacts managed by maven, the classloader is different\n            \/\/ between maven-reporting-impl and maven-reporting-api...so this resource\n            \/\/ is not available from the AbstractMavenReport since it uses:\n            \/\/ getClass().getResourceAsStream( \"\/default-report.xml\" )\n            \/\/ (maven-reporting-impl version 2.0; line 134; affects: checkstyle plugin, and probably others)\n            pluginRealm.importFrom( parentRealmId, \"\/default-report.xml\" );\n        }\n        catch ( NoSuchRealmException e )\n        {\n            \/\/ can't happen here. All realms are concretely resolved by now.\n        }\n\n        return pluginRealm;\n    }\n\n    before( DefaultMaven maven ):\n        execution( MavenExecutionResult DefaultMaven.execute( MavenExecutionRequest ) )\n        && this( maven )\n    {\n        if ( this.logger == null )\n        {\n            this.logger = maven.getLogger();\n        }\n    }\n\n    private pointcut addMojoBindingCall( String phase, MojoBinding binding ):\n        call( void LifecycleUtils.addMojoBinding( String, MojoBinding, .. ) )\n        && args( phase, binding, .. );\n\n    void around( String phase, MojoBinding binding ): addMojoBindingCall( phase, binding )\n    {\n        try\n        {\n            proceed( phase, binding );\n        }\n        catch ( NoSuchPhaseException e )\n        {\n            logger.debug( \"Mojo execution: \" + MojoBindingUtils.toString( binding )\n                          + \" cannot be attached to lifecycle phase: \" + phase\n                          + \"; it does not exist. Ignoring this binding.\" );\n        }\n    }\n\n    \/\/ --------------------------\n    \/\/ UTILITIES\n    \/\/ --------------------------\n\n    private Set checkPlexusUtils( Set dependencyArtifacts, ArtifactFactory artifactFactory )\n    {\n        \/\/ ----------------------------------------------------------------------------\n        \/\/ If the plugin already declares a dependency on plexus-utils then we're all\n        \/\/ set as the plugin author is aware of its use. If we don't have a dependency\n        \/\/ on plexus-utils then we must protect users from stupid plugin authors who\n        \/\/ did not declare a direct dependency on plexus-utils because the version\n        \/\/ Maven uses is hidden from downstream use. We will also bump up any\n        \/\/ anything below 1.1 to 1.1 as this mimics the behaviour in 2.0.5 where\n        \/\/ plexus-utils 1.1 was being forced into use.\n        \/\/ ----------------------------------------------------------------------------\n\n        if ( vr == null )\n        {\n            try\n            {\n                vr = VersionRange.createFromVersionSpec( \"[1.1,)\" );\n            }\n            catch ( InvalidVersionSpecificationException e )\n            {\n                \/\/ Won't happen\n            }\n        }\n\n        for ( Iterator i = dependencyArtifacts.iterator(); i.hasNext(); )\n        {\n            Artifact a = (Artifact) i.next();\n\n            if ( a.getArtifactId().equals( \"plexus-utils\" )\n                 && vr.containsVersion( new DefaultArtifactVersion( a.getVersion() ) ) )\n            {\n                return dependencyArtifacts;\n            }\n        }\n\n        \/\/ We will add plexus-utils as every plugin was getting this anyway from Maven itself. We will set the\n        \/\/ version to the latest version we know that works as of the 2.0.6 release. We set the scope to runtime\n        \/\/ as this is what's implicitly happening in 2.0.6.\n\n        if ( plexusUtilsArtifact == null )\n        {\n            plexusUtilsArtifact = artifactFactory.createArtifact( \"org.codehaus.plexus\",\n                                                                  \"plexus-utils\",\n                                                                  \"1.1\",\n                                                                  Artifact.SCOPE_RUNTIME,\n                                                                  \"jar\" );\n        }\n\n        Set result = new LinkedHashSet( dependencyArtifacts );\n        result.add( plexusUtilsArtifact );\n\n        return result;\n    }\n\n    \/\/ This is to support the maven-enforcer-plugin.\n    private List DefaultLifecycleExecutor.lifecycles;\n\n    private pointcut lifecycleExecutorExecute( DefaultLifecycleExecutor executor ):\n        execution( * DefaultLifecycleExecutor.execute( .. ) )\n        && this( executor );\n\n    before( DefaultLifecycleExecutor executor ): lifecycleExecutorExecute( executor )\n    {\n        PlexusContainer container = executor.container;\n        DefaultLifecycleBindingManager bindingMgr;\n        try\n        {\n            bindingMgr = (DefaultLifecycleBindingManager) container.lookup( LifecycleBindingManager.ROLE, \"default\" );\n        }\n        catch ( ComponentLookupException e )\n        {\n            IllegalStateException err = new IllegalStateException( \"Cannot lookup default role-hint for: \" + LifecycleBindingManager.ROLE );\n            err.initCause( e );\n\n            throw err;\n        }\n\n        executor.lifecycles = bindingMgr.lifecycles;\n    }\n\n}\n","old_contents":"package org.apache.maven.compat;\n\nimport org.apache.maven.lifecycle.binding.DefaultLifecycleBindingManager;\nimport org.apache.maven.lifecycle.binding.LifecycleBindingManager;\nimport org.codehaus.plexus.PlexusContainer;\nimport org.apache.maven.DefaultMaven;\nimport org.apache.maven.lifecycle.DefaultLifecycleExecutor;\nimport org.apache.maven.lifecycle.MojoBindingUtils;\nimport org.apache.maven.lifecycle.LifecycleUtils;\nimport org.apache.maven.lifecycle.NoSuchPhaseException;\nimport org.apache.maven.execution.MavenExecutionRequest;\nimport org.apache.maven.execution.MavenExecutionResult;\nimport org.apache.maven.execution.MavenSession;\nimport org.apache.maven.extension.DefaultExtensionManager;\nimport org.apache.maven.artifact.Artifact;\nimport org.apache.maven.artifact.factory.ArtifactFactory;\nimport org.apache.maven.artifact.metadata.ResolutionGroup;\nimport org.apache.maven.artifact.repository.ArtifactRepository;\nimport org.apache.maven.artifact.resolver.ArtifactNotFoundException;\nimport org.apache.maven.artifact.resolver.ArtifactResolutionException;\nimport org.apache.maven.artifact.versioning.DefaultArtifactVersion;\nimport org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;\nimport org.apache.maven.artifact.versioning.VersionRange;\nimport org.apache.maven.lifecycle.model.MojoBinding;\nimport org.apache.maven.model.Plugin;\nimport org.apache.maven.plugin.DefaultPluginManager;\nimport org.apache.maven.plugin.InvalidPluginException;\nimport org.apache.maven.plugin.PluginManager;\nimport org.apache.maven.plugin.PluginManagerException;\nimport org.apache.maven.plugin.PluginNotFoundException;\nimport org.apache.maven.plugin.descriptor.PluginDescriptor;\nimport org.apache.maven.plugin.version.PluginVersionNotFoundException;\nimport org.apache.maven.plugin.version.PluginVersionResolutionException;\nimport org.apache.maven.project.MavenProject;\nimport org.apache.maven.realm.MavenRealmManager;\nimport org.apache.maven.settings.MavenSettingsBuilder;\nimport org.apache.maven.settings.DefaultMavenSettingsBuilder;\nimport org.apache.maven.settings.Settings;\nimport org.codehaus.plexus.classworlds.realm.ClassRealm;\nimport org.codehaus.plexus.classworlds.realm.NoSuchRealmException;\nimport org.codehaus.plexus.component.repository.exception.ComponentLookupException;\nimport org.codehaus.plexus.util.xml.pull.XmlPullParserException;\nimport org.codehaus.plexus.util.xml.Xpp3Dom;\nimport org.codehaus.plexus.logging.Logger;\n\nimport java.util.List;\nimport java.io.IOException;\nimport java.util.Iterator;\nimport java.util.Collection;\nimport java.util.Set;\nimport java.util.LinkedHashSet;\n\npublic privileged aspect Maven20xCompatAspect\n{\n\n    \/\/ GRAB Session as soon as it's constructed.\n    private MavenSession session;\n\n    \/\/ GRAB the request when it's passed into a method that returns a corresponding result.\n    \/\/ NOTE: We'll use this in multiple places below...\n    private MavenExecutionRequest request;\n\n    \/\/ Grab this so we have a voice!\n    private Logger logger;\n\n    \/\/ used for injecting plexus-utils into extension and plugin artifact sets.\n    private VersionRange vr = null;\n    private Artifact plexusUtilsArtifact = null;\n\n\n    private pointcut mavenEmbedderStop():\n        execution( * org.apache.maven.embedder.MavenEmbedder.stop( .. ) );\n\n    \/\/ TODO: There must be a more elegant way to release these resources than depending on MavenEmbedder.stop().\n    after(): mavenEmbedderStop()\n    {\n        session = null;\n        request = null;\n        logger = null;\n        vr = null;\n        plexusUtilsArtifact = null;\n    }\n\n\n    \/\/ pointcut to avoid recursive matching on behavior injected by this aspect.\n    private pointcut notHere(): !within( Maven20xCompatAspect );\n\n    private pointcut sessionCreation( MavenSession session ):\n        execution( public MavenSession+.new(..) )\n        && this( session )\n        && notHere();\n\n    \/\/ capture the session instance.\n    after( MavenSession session ): sessionCreation( session )\n    {\n        if ( logger != null && logger.isDebugEnabled() )\n        {\n            logger.debug( \"Capturing session for backward compatibility aspect: \" + session );\n        }\n\n        this.session = session;\n    }\n\n    \/\/ USE Session to compensate for old verifyPlugin(..) API.\n    private pointcut verifyPlugin( Plugin plugin, MavenProject project, PluginManager manager ):\n        execution( PluginDescriptor PluginManager+.verifyPlugin( Plugin, MavenProject, Settings, ArtifactRepository+ ) )\n        && args( plugin, project, .. )\n        && target( manager );\n\n    \/\/ redirect the old verifyPlugin(..) call to the new one, using the captured session instance above.\n    PluginDescriptor around( Plugin plugin,\n                             MavenProject project,\n                             PluginManager manager )\n        throws ArtifactResolutionException, ArtifactNotFoundException, PluginNotFoundException,\n        PluginVersionResolutionException, InvalidPluginException, PluginManagerException,\n        PluginVersionNotFoundException:\n            verifyPlugin( plugin, project, manager )\n    {\n        if ( logger != null && logger.isDebugEnabled() )\n        {\n            logger.debug( \"Diverting legacy PluginManager.verifyPlugin(..) call to replacement method using session: \" + session );\n        }\n\n        return manager.verifyPlugin( plugin, project, session );\n    }\n\n    \/\/ Re-Introduce old verifyPlugin(..) API.\n    public PluginDescriptor PluginManager.verifyPlugin( Plugin plugin,\n                                                        MavenProject project,\n                                                        Settings settings,\n                                                        ArtifactRepository localRepository )\n        throws ArtifactResolutionException, ArtifactNotFoundException, PluginNotFoundException,\n        PluginVersionResolutionException, InvalidPluginException, PluginManagerException,\n        PluginVersionNotFoundException\n    {\n        \/\/ this will always be diverted, so no need to do anything.\n        throw new IllegalStateException( \"This introduced method should ALWAYS be intercepted by backward compatibility aspect.\" );\n    }\n\n    private pointcut getPluginDescriptorForPrefix( String prefix, PluginManager manager ):\n        execution( public PluginDescriptor PluginManager+.getPluginDescriptorForPrefix( String ) )\n        && args( prefix )\n        && target( manager )\n        && notHere();\n\n    PluginDescriptor around( String prefix, PluginManager manager ): getPluginDescriptorForPrefix( prefix, manager )\n    {\n        \/\/ TODO: Implement Me!\n        throw new UnsupportedOperationException( \"This method has not yet been implemented in Maven's backward-compatibility library.\" );\n    }\n\n    public PluginDescriptor PluginManager.getPluginDescriptorForPrefix( String prefix )\n    {\n        return null;\n    }\n\n    \/\/ Intercept retrieval of artifact dependencies of an extension, inject plexus-utils if it's not there.\n    private pointcut extDepArtifactsResolved( DefaultExtensionManager mgr ):\n        call( public Set ResolutionGroup+.getArtifacts() )\n        && within( DefaultExtensionManager+ )\n        && this( mgr )\n        && notHere();\n\n    \/\/ We use the same hack here to make sure that plexus 1.1 is available for extensions that do\n    \/\/ not declare plexus-utils but need it. MNG-2900\n    Set around( DefaultExtensionManager mgr ): extDepArtifactsResolved( mgr )\n    {\n        Set result = proceed( mgr );\n\n        result = checkPlexusUtils( result, mgr.artifactFactory );\n\n        return result;\n    }\n\n    \/\/ Intercept retrieval of artifact dependencies of a plugin, inject plexus-utils if it's not there.\n    private pointcut pluginDepArtifactsResolved( DefaultPluginManager mgr ):\n        call( public Set ResolutionGroup+.getArtifacts() )\n        && cflow( execution( Set DefaultPluginManager+.getPluginArtifacts(..) ) )\n        && this( mgr )\n        && notHere();\n\n    Set around( DefaultPluginManager mgr ): pluginDepArtifactsResolved( mgr )\n    {\n        Set result = proceed( mgr );\n\n        result = checkPlexusUtils( result, mgr.artifactFactory );\n\n        return result;\n    }\n\n    private pointcut methodsTakingRequest( MavenExecutionRequest request ):\n        execution( MavenExecutionResult *.*( MavenExecutionRequest ) )\n        && !withincode( * *.*( MavenExecutionRequest ) )\n        && args( request )\n        && notHere();\n\n    \/\/ capture the request instance before it's passed into any method that returns a corresponding MavenExecutionResult.\n    Object around( MavenExecutionRequest request ): methodsTakingRequest( request )\n    {\n        this.request = request;\n\n        try\n        {\n            return proceed( request );\n        }\n        finally\n        {\n            this.request = null;\n        }\n    }\n\n    \/\/ USE Request to compensate for old buildSettings() API.\n    private pointcut buildSettings( MavenSettingsBuilder builder ):\n        execution( public Settings MavenSettingsBuilder+.buildSettings() )\n        && target( builder )\n        && notHere();\n\n    \/\/ redirect old buildSettings() call to the new one, using the request captured above.\n    Settings around( MavenSettingsBuilder builder )\n        throws IOException, XmlPullParserException:\n            buildSettings( builder )\n    {\n        return builder.buildSettings( request );\n    }\n\n    \/\/ Re-Introduce old buildSettings() API.\n    public Settings MavenSettingsBuilder.buildSettings()\n        throws IOException, XmlPullParserException\n    {\n        return null;\n    }\n\n    public Settings DefaultMavenSettingsBuilder.buildSettings()\n    throws IOException, XmlPullParserException\n    {\n        return null;\n    }\n\n    private pointcut pluginManager( DefaultPluginManager manager ):\n        execution( * DefaultPluginManager.*( .. ) )\n        && this( manager );\n\n    private pointcut pluginRealmCreation( Plugin plugin, DefaultPluginManager manager ):\n        call( ClassRealm MavenRealmManager+.createPluginRealm( Plugin, Artifact, Collection ) )\n        && cflow( pluginManager( manager ) )\n        && args( plugin, .. );\n\n    \/\/ Add various imports for Xpp3 stuff back into the core realm every time a plugin realm is created.\n    ClassRealm around( Plugin plugin, DefaultPluginManager manager ): pluginRealmCreation( plugin, manager )\n    {\n        ClassRealm pluginRealm = proceed( plugin, manager );\n\n        try\n        {\n            String parentRealmId = manager.container.getContainerRealm().getId();\n\n            \/\/ adding for MNG-3012 to try to work around problems with Xpp3Dom (from plexus-utils)\n            \/\/ spawning a ClassCastException when a mojo calls plugin.getConfiguration() from maven-model...\n            pluginRealm.importFrom( parentRealmId, Xpp3Dom.class.getName() );\n            pluginRealm.importFrom( parentRealmId, \"org.codehaus.plexus.util.xml.pull\" );\n\n            \/\/ Adding for MNG-2878, since maven-reporting-impl was removed from the\n            \/\/ internal list of artifacts managed by maven, the classloader is different\n            \/\/ between maven-reporting-impl and maven-reporting-api...so this resource\n            \/\/ is not available from the AbstractMavenReport since it uses:\n            \/\/ getClass().getResourceAsStream( \"\/default-report.xml\" )\n            \/\/ (maven-reporting-impl version 2.0; line 134; affects: checkstyle plugin, and probably others)\n            pluginRealm.importFrom( parentRealmId, \"\/default-report.xml\" );\n        }\n        catch ( NoSuchRealmException e )\n        {\n            \/\/ can't happen here. All realms are concretely resolved by now.\n        }\n\n        return pluginRealm;\n    }\n\n    before( DefaultMaven maven ):\n        execution( MavenExecutionResult DefaultMaven.execute( MavenExecutionRequest ) )\n        && this( maven )\n    {\n        if ( this.logger == null )\n        {\n            this.logger = maven.getLogger();\n        }\n    }\n\n    private pointcut addMojoBindingCall( String phase, MojoBinding binding ):\n        call( void LifecycleUtils.addMojoBinding( String, MojoBinding, .. ) )\n        && args( phase, binding, .. );\n\n    void around( String phase, MojoBinding binding ): addMojoBindingCall( phase, binding )\n    {\n        try\n        {\n            proceed( phase, binding );\n        }\n        catch ( NoSuchPhaseException e )\n        {\n            logger.debug( \"Mojo execution: \" + MojoBindingUtils.toString( binding )\n                          + \" cannot be attached to lifecycle phase: \" + phase\n                          + \"; it does not exist. Ignoring this binding.\" );\n        }\n    }\n\n    \/\/ --------------------------\n    \/\/ UTILITIES\n    \/\/ --------------------------\n\n    private Set checkPlexusUtils( Set dependencyArtifacts, ArtifactFactory artifactFactory )\n    {\n        \/\/ ----------------------------------------------------------------------------\n        \/\/ If the plugin already declares a dependency on plexus-utils then we're all\n        \/\/ set as the plugin author is aware of its use. If we don't have a dependency\n        \/\/ on plexus-utils then we must protect users from stupid plugin authors who\n        \/\/ did not declare a direct dependency on plexus-utils because the version\n        \/\/ Maven uses is hidden from downstream use. We will also bump up any\n        \/\/ anything below 1.1 to 1.1 as this mimics the behaviour in 2.0.5 where\n        \/\/ plexus-utils 1.1 was being forced into use.\n        \/\/ ----------------------------------------------------------------------------\n\n        if ( vr == null )\n        {\n            try\n            {\n                vr = VersionRange.createFromVersionSpec( \"[1.1,)\" );\n            }\n            catch ( InvalidVersionSpecificationException e )\n            {\n                \/\/ Won't happen\n            }\n        }\n\n        for ( Iterator i = dependencyArtifacts.iterator(); i.hasNext(); )\n        {\n            Artifact a = (Artifact) i.next();\n\n            if ( a.getArtifactId().equals( \"plexus-utils\" )\n                 && vr.containsVersion( new DefaultArtifactVersion( a.getVersion() ) ) )\n            {\n                return dependencyArtifacts;\n            }\n        }\n\n        \/\/ We will add plexus-utils as every plugin was getting this anyway from Maven itself. We will set the\n        \/\/ version to the latest version we know that works as of the 2.0.6 release. We set the scope to runtime\n        \/\/ as this is what's implicitly happening in 2.0.6.\n\n        if ( plexusUtilsArtifact == null )\n        {\n            plexusUtilsArtifact = artifactFactory.createArtifact( \"org.codehaus.plexus\",\n                                                                  \"plexus-utils\",\n                                                                  \"1.1\",\n                                                                  Artifact.SCOPE_RUNTIME,\n                                                                  \"jar\" );\n        }\n\n        Set result = new LinkedHashSet( dependencyArtifacts );\n        result.add( plexusUtilsArtifact );\n\n        return result;\n    }\n\n    \/\/ This is to support the maven-enforcer-plugin.\n    private List DefaultLifecycleExecutor.lifecycles;\n\n    private pointcut lifecycleExecutorExecute( DefaultLifecycleExecutor executor ):\n        execution( * DefaultLifecycleExecutor.execute( .. ) )\n        && this( executor );\n\n    before( DefaultLifecycleExecutor executor ): lifecycleExecutorExecute( executor )\n    {\n        PlexusContainer container = executor.container;\n        DefaultLifecycleBindingManager bindingMgr;\n        try\n        {\n            bindingMgr = (DefaultLifecycleBindingManager) container.lookup( LifecycleBindingManager.ROLE, \"default\" );\n        }\n        catch ( ComponentLookupException e )\n        {\n            IllegalStateException err = new IllegalStateException( \"Cannot lookup default role-hint for: \" + LifecycleBindingManager.ROLE );\n            err.initCause( e );\n\n            throw err;\n        }\n\n        executor.lifecycles = bindingMgr.lifecycles;\n    }\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"9875f3152a297b9176f788615c130b0a07ec1d20","subject":"Aspect in package","message":"Aspect in package\n","repos":"meet\/google-apps-trollusk,meet\/google-apps-trollusk","old_file":"src\/main\/java\/edu\/mit\/meet\/googleapps\/CSSStyleSheetMonkeyPatch.aj","new_file":"src\/main\/java\/edu\/mit\/meet\/googleapps\/CSSStyleSheetMonkeyPatch.aj","new_contents":"package edu.mit.meet.googleapps;\n\nimport com.gargoylesoftware.htmlunit.BrowserVersion;\nimport com.gargoylesoftware.htmlunit.html.HtmlElement;\nimport com.gargoylesoftware.htmlunit.javascript.host.css.CSSStyleSheet;\n\nimport org.w3c.css.sac.Selector;\n\naspect CSSStyleSheetMonkeyPatch {\n    pointcut selects(Selector s, HtmlElement e):\n        execution(boolean CSSStyleSheet.selects(..)) && args(BrowserVersion, s, e);\n    \n    boolean around(Selector s, HtmlElement e): selects(s, e) {\n        if (s.getSelectorType() == Selector.SAC_CHILD_SELECTOR && ! (e.getParentNode() instanceof HtmlElement)) {\n            \/\/ XXX ClassCastException when HtmlUnit tries to cast parent to HtmlElement!\n            return false;\n        }\n        return proceed(s, e);\n    }\n}\n","old_contents":"import com.gargoylesoftware.htmlunit.BrowserVersion;\nimport com.gargoylesoftware.htmlunit.html.HtmlElement;\nimport com.gargoylesoftware.htmlunit.javascript.host.css.CSSStyleSheet;\n\nimport org.w3c.css.sac.Selector;\n\naspect CSSStyleSheetMonkeyPatch {\n    pointcut selects(Selector s, HtmlElement e):\n        execution(boolean CSSStyleSheet.selects(..)) && args(BrowserVersion, s, e);\n    \n    boolean around(Selector s, HtmlElement e): selects(s, e) {\n        if (s.getSelectorType() == Selector.SAC_CHILD_SELECTOR && ! (e.getParentNode() instanceof HtmlElement)) {\n            \/\/ XXX ClassCastException when HtmlUnit tries to cast parent to HtmlElement!\n            return false;\n        }\n        return proceed(s, e);\n    }\n}\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"a17c7db762fd8cb4f34c01a4febdfdc604427eb3","subject":"Check value for executor service manager to avoid NullPointerException if no executor is defined in configuration file","message":"Check value for executor service manager to avoid NullPointerException if no executor is defined in configuration file\n","repos":"awltech\/org.parallelj,christophe-w\/parallelj.runtime","old_file":"parallelj-launching\/src\/main\/java\/org\/parallelj\/launching\/internal\/LaunchManagement.aj","new_file":"parallelj-launching\/src\/main\/java\/org\/parallelj\/launching\/internal\/LaunchManagement.aj","new_contents":"\/*\n *     ParallelJ, framework for parallel computing\n *\n *     Copyright (C) 2010, 2011, 2012 Atos Worldline or third-party contributors as\n *     indicated by the @author tags or express copyright attribution\n *     statements applied by the authors.\n *\n *     This library is free software; you can redistribute it and\/or\n *     modify it under the terms of the GNU Lesser General Public\n *     License as published by the Free Software Foundation; either\n *     version 2.1 of the License.\n *\n *     This library is distributed in the hope that it will be useful,\n *     but WITHOUT ANY WARRANTY; without even the implied warranty of\n *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n *     Lesser General Public License for more details.\n *\n *     You should have received a copy of the GNU Lesser General Public\n *     License along with this library; if not, write to the Free Software\n *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n *\/\npackage org.parallelj.launching.internal;\n\nimport java.util.Map;\nimport java.util.concurrent.ConcurrentHashMap;\nimport java.util.concurrent.ExecutorService;\n\nimport org.parallelj.Programs;\nimport org.parallelj.internal.conf.ConfigurationService;\nimport org.parallelj.internal.conf.ParalleljConfigurationManager;\nimport org.parallelj.internal.conf.pojos.CExecutors;\nimport org.parallelj.internal.conf.pojos.ParalleljConfiguration;\nimport org.parallelj.internal.kernel.KProcess;\nimport org.parallelj.internal.kernel.KProcessor;\nimport org.parallelj.internal.kernel.procedure.CallableProcedure.CallableCall.CallableCallRunnable;\nimport org.parallelj.internal.kernel.procedure.RunnableProcedure.RunnableCall.RunnableCallRunnable;\nimport org.parallelj.internal.kernel.procedure.SubProcessProcedure.SubProcessCall.SubProcessRunnable;\nimport org.parallelj.internal.reflect.ProcessHelperImpl;\nimport org.parallelj.launching.Launch;\nimport org.parallelj.launching.LaunchException;\nimport org.parallelj.launching.LaunchingMessageKind;\nimport org.parallelj.launching.ProgramReturnCodes;\nimport org.parallelj.launching.internal.LaunchManagement.LaunchAdapter.IKProcessorLaunch;\nimport org.parallelj.mirror.ParallelJThreadFactory;\n\nimport org.parallelj.launching.executors.ExecutorServiceManager;\n\n\/**\n * Implements the synchLaunch(..) and aSynchLaunch(..) methods of Launch.\n * \n * \n *\/\nprivileged aspect LaunchManagement { \n\t\n\tprivate static Map<KProcessor, LaunchImpl<?>> phl = new ConcurrentHashMap<>(); \n\t\n\tstatic privileged public aspect LaunchAdapter percflow(launchInstance() ) {\n\t\n\t\tdeclare precedence :\n\t\t\torg.parallelj.internal.kernel.Identifiers,\n\t\t\torg.parallelj.internal.reflect.ProgramAdapter,\n\t\t\torg.parallelj.internal.util.sm.impl.KStateMachines,\n\t\t\torg.parallelj.internal.util.sm.impl.KStateMachines.PerMachine,\n\t\t\torg.parallelj.Executables$PerExecutable,\n\t\t\torg.parallelj.internal.reflect.ProgramAdapter.PerProgram,\n\t\t\torg.parallelj.internal.log.Logs;\n\t\n\t\tpointcut launchInstance() : execution(* Launch+.*(..));\n\t\n\t\tinterface IKProcessorLaunch {}\n\t\tLaunchImpl<?> IKProcessorLaunch.launch;\n\t\tdeclare parents: KProcessor implements IKProcessorLaunch;\n\t\t\n\t\tinterface ILaunchExecutors {}\n\t\tExecutorServiceManager ILaunchExecutors.executorServiceManager;\t\t\n\t\tdeclare parents: LaunchImpl implements ILaunchExecutors;\n\t\t\n\t\tprivate LaunchingObservable observable = new LaunchingObservable();\n\t\t\n\t\tboolean stopExecutorServiceAfterExecution = false;\n\t\n\t\tprivate static class AsyncThread implements Runnable {\n\t\n\t\t\tprivate LaunchAdapter launchAdapter;\n\t\t\tprivate LaunchImpl<?> launch;\n\t\n\t\t\tpublic AsyncThread(LaunchImpl<?> launch, LaunchAdapter launchAdapter) {\n\t\t\t\tthis.launch = launch;\n\t\t\t\tthis.launchAdapter = launchAdapter;\n\t\t\t}\n\t\n\t\t\t@Override\n\t\t\tpublic void run() {\n\t\t\t\tthis.launchAdapter.internalSyncLaunch(this.launch);\n\t\t\t}\n\t\t}\n\t\t\n\t\t@SuppressWarnings({ \"rawtypes\", \"unchecked\" })\n\t\tLaunch around(LaunchImpl launch) throws LaunchException: \n\t\t\t\t\texecution(public Launch Launch+.synchLaunch(..) throws LaunchException)\n\t\t\t\t\t\t&& this(launch) {\n\t\t\tproceed(launch);\n\t\t\tlaunch.processHelper = Programs.as(launch.jobInstance);\n\t\t\tlaunch.getLaunchResult().setStatusCode(ProgramReturnCodes.RUNNING);\n\t\t\tthis.observable.prepareLaunching(launch);\n\t\n\t\t\treturn internalSyncLaunch(launch);\n\t\t}\n\t\n\t\t@SuppressWarnings({ \"rawtypes\", \"unchecked\" })\n\t\tLaunch around(LaunchImpl launch) throws LaunchException: \n\t\t\t\t\texecution(public Launch Launch+.aSynchLaunch() throws LaunchException)\n\t\t\t\t\t\t&& this(launch) {\n\t\t\tproceed(launch);\n\t\t\tlaunch.processHelper = Programs.as(launch.jobInstance);\n\t\t\tlaunch.getLaunchResult().setStatusCode(ProgramReturnCodes.RUNNING);\n\t\t\tthis.observable.prepareLaunching(launch);\n\t\t\tif (launch.getExecutorService()!=null) {\n\t\t\t\tlaunch.getExecutorService().execute(new AsyncThread(launch, this));\n\t\t\t} else {\n\t\t\t\tParallelJThreadFactory.getInstance().newThread(new AsyncThread(launch, this)).start();\n\t \t\t}\n\t\t\treturn launch;\n\t\t}\n\t\n\t\t@SuppressWarnings(\"rawtypes\")\n\t\tprivate Launch<?> internalSyncLaunch(LaunchImpl<?> launch) {\n\t\t\tLaunchingMessageKind.ILAUNCH0002.format(launch.getJobInstance()\n\t\t\t\t\t.getClass().getCanonicalName(), launch.getLaunchId());\n\t\t\tinitializeExecutors(launch);\n\t\t\tProcessHelperImpl processHelper = (ProcessHelperImpl)launch.getProcessHelper();\n\t\t\tKProcessor processor = processHelper.processor;\n\t\t\tif (processor == null) {\n\t\t\t\tif ( ((ILaunchExecutors)launch).executorServiceManager!=null \n\t\t\t\t\t\t&& ((ILaunchExecutors)launch).executorServiceManager.getDefaultExecutor()!=null) {\n\t\t\t\t\tprocessor = new KProcessor(((ILaunchExecutors)launch).executorServiceManager.getDefaultExecutor());\n\t\t\t\t} else {\n\t\t\t\t\tprocessor = new KProcessor(launch.getExecutorService());\n\t\t\t\t}\n\t\t\t\t((IKProcessorLaunch)processor).launch = launch;\n\t\t\t\tphl.put(processor, launch);\n\t\t\t}\n\t\t\tprocessor.execute(processHelper.process);\n\t\t\tlaunch.getProcessHelper().join();\n\t\t\tthis.observable.finalizeLaunching(launch);\n\t\t\tlaunch.complete();\n\t\t\tif(launch.executorServiceManager!=null) {\n\t\t\t\tlaunch.executorServiceManager.clean();\n\t\t\t}\n\t\t\tphl.remove(processor);\n\t\t\t\n\t\t\tif (launch.getLaunchResult().getStatusCode()!=ProgramReturnCodes.FAILURE\n\t\t\t\t\t&&launch.getLaunchResult().getStatusCode()!=ProgramReturnCodes.ABORTED) {\n\t\t\t\tlaunch.getLaunchResult().setStatusCode(ProgramReturnCodes.SUCCESS);\n\t\t\t}\n\t\t\tLaunchingMessageKind.ILAUNCH0003.format(launch.getJobInstance()\n\t\t\t\t\t.getClass().getCanonicalName(), launch.getLaunchId(), launch\n\t\t\t\t\t.getLaunchResult().getStatusCode(), launch.getLaunchResult()\n\t\t\t\t\t.getReturnCode());\n\t\t\treturn launch;\n\t\t}\n\t\t\n\t\tprivate void initializeExecutors(LaunchImpl<?> launch) {\n\t\t\tParalleljConfiguration configuration = (ParalleljConfiguration) ConfigurationService\n\t\t\t\t\t.getConfigurationService().getConfigurationManager()\n\t\t\t\t\t.get(ParalleljConfigurationManager.class)\n\t\t\t\t\t.getConfiguration();\n\t\t\tCExecutors cExecutors = configuration != null ? configuration\n\t\t\t\t\t.getExecutorServices() : null;\n\t\t\tif (cExecutors != null) {\n\t\t\t\tlaunch.executorServiceManager = new ExecutorServiceManager(cExecutors);\n\t\t\t}\n\t\t}\n\t}\n\n    void around(KProcessor kProcessor, SubProcessRunnable runnable):execution(public void submit(..))\n                && args(runnable)\n                &&this(kProcessor){\n\t\tLaunchImpl<?> launch = phl.get(kProcessor);\n\t\tKProcess process = runnable.getSubProcessCall().getProcess();\n\t\tif (launch!=null && launch.executorServiceManager!=null) {\n\t\t\tExecutorService service = launch.executorServiceManager.get(process);\n\t\t\tif (service!=null) {\n\t\t\t\tkProcessor.submit(runnable, service);\n\t\t\t} else {\n\t\t\t\tproceed(kProcessor, runnable);\n\t\t\t}\n\t\t} else {\n\t\t\tproceed(kProcessor, runnable);\n\t\t}\n    }\n\n    void around(KProcessor kProcessor, CallableCallRunnable runnable):execution(public void submit(..))\n            && args(runnable)\n            &&this(kProcessor){\n\t\tLaunchImpl<?> launch = phl.get(kProcessor);\n\t\tKProcess process = runnable.getCallableCall().getProcess();\n\t\tif (launch!=null && launch.executorServiceManager!=null) {\n\t\t\tExecutorService service = launch.executorServiceManager.get(process);\n\t\t\tif (service!=null) {\n\t\t\t\tkProcessor.submit(runnable, service);\n\t\t\t} else {\n\t\t\t\tproceed(kProcessor, runnable);\n\t\t\t}\n\t\t} else {\n\t\t\tproceed(kProcessor, runnable);\n\t\t}\n    }\n\n    void around(KProcessor kProcessor, RunnableCallRunnable runnable):execution(public void submit(..))\n            && args(runnable)\n            &&this(kProcessor) {\n\t\tLaunchImpl<?> launch = phl.get(kProcessor);\n\t\tKProcess process = runnable.getRunnableCall().getProcess();\n\t\tif (launch!=null && launch.executorServiceManager!=null) {\n\t\t\tExecutorService service = launch.executorServiceManager.get(process);\n\t\t\tif (service!=null) {\n\t\t\t\tkProcessor.submit(runnable, service);\n\t\t\t} else {\n\t\t\t\tproceed(kProcessor, runnable);\n\t\t\t}\n\t\t} else {\n\t\t\tproceed(kProcessor, runnable);\n\t\t}\n    }\n\n    void around(KProcess kProcess):execution(private void complete(..))\n    \t&& this(kProcess) {\n    \tproceed(kProcess);\n\t\tLaunchImpl<?> launch = ((IKProcessorLaunch)kProcess.getProcessor()).launch;\n\t\tif(launch.executorServiceManager!=null) {\n\t\t\tlaunch.executorServiceManager.complete(kProcess);\n\t\t}\n    }\n\n }\n","old_contents":"\/*\n *     ParallelJ, framework for parallel computing\n *\n *     Copyright (C) 2010, 2011, 2012 Atos Worldline or third-party contributors as\n *     indicated by the @author tags or express copyright attribution\n *     statements applied by the authors.\n *\n *     This library is free software; you can redistribute it and\/or\n *     modify it under the terms of the GNU Lesser General Public\n *     License as published by the Free Software Foundation; either\n *     version 2.1 of the License.\n *\n *     This library is distributed in the hope that it will be useful,\n *     but WITHOUT ANY WARRANTY; without even the implied warranty of\n *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n *     Lesser General Public License for more details.\n *\n *     You should have received a copy of the GNU Lesser General Public\n *     License along with this library; if not, write to the Free Software\n *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n *\/\npackage org.parallelj.launching.internal;\n\nimport java.util.Map;\nimport java.util.concurrent.ConcurrentHashMap;\nimport java.util.concurrent.ExecutorService;\n\nimport org.parallelj.Programs;\nimport org.parallelj.internal.conf.ConfigurationService;\nimport org.parallelj.internal.conf.ParalleljConfigurationManager;\nimport org.parallelj.internal.conf.pojos.CExecutors;\nimport org.parallelj.internal.conf.pojos.ParalleljConfiguration;\nimport org.parallelj.internal.kernel.KProcess;\nimport org.parallelj.internal.kernel.KProcessor;\nimport org.parallelj.internal.kernel.procedure.CallableProcedure.CallableCall.CallableCallRunnable;\nimport org.parallelj.internal.kernel.procedure.RunnableProcedure.RunnableCall.RunnableCallRunnable;\nimport org.parallelj.internal.kernel.procedure.SubProcessProcedure.SubProcessCall.SubProcessRunnable;\nimport org.parallelj.internal.reflect.ProcessHelperImpl;\nimport org.parallelj.launching.Launch;\nimport org.parallelj.launching.LaunchException;\nimport org.parallelj.launching.LaunchingMessageKind;\nimport org.parallelj.launching.ProgramReturnCodes;\nimport org.parallelj.launching.internal.LaunchManagement.LaunchAdapter.IKProcessorLaunch;\nimport org.parallelj.mirror.ParallelJThreadFactory;\n\nimport org.parallelj.launching.executors.ExecutorServiceManager;\n\n\/**\n * Implements the synchLaunch(..) and aSynchLaunch(..) methods of Launch.\n * \n * \n *\/\nprivileged aspect LaunchManagement { \n\t\n\tprivate static Map<KProcessor, LaunchImpl<?>> phl = new ConcurrentHashMap<>(); \n\t\n\tstatic privileged public aspect LaunchAdapter percflow(launchInstance() ) {\n\t\n\t\tdeclare precedence :\n\t\t\torg.parallelj.internal.kernel.Identifiers,\n\t\t\torg.parallelj.internal.reflect.ProgramAdapter,\n\t\t\torg.parallelj.internal.util.sm.impl.KStateMachines,\n\t\t\torg.parallelj.internal.util.sm.impl.KStateMachines.PerMachine,\n\t\t\torg.parallelj.Executables$PerExecutable,\n\t\t\torg.parallelj.internal.reflect.ProgramAdapter.PerProgram,\n\t\t\torg.parallelj.internal.log.Logs;\n\t\n\t\tpointcut launchInstance() : execution(* Launch+.*(..));\n\t\n\t\tinterface IKProcessorLaunch {}\n\t\tLaunchImpl<?> IKProcessorLaunch.launch;\n\t\tdeclare parents: KProcessor implements IKProcessorLaunch;\n\t\t\n\t\tinterface ILaunchExecutors {}\n\t\tExecutorServiceManager ILaunchExecutors.executorServiceManager;\t\t\n\t\tdeclare parents: LaunchImpl implements ILaunchExecutors;\n\t\t\n\t\tprivate LaunchingObservable observable = new LaunchingObservable();\n\t\t\n\t\tboolean stopExecutorServiceAfterExecution = false;\n\t\n\t\tprivate static class AsyncThread implements Runnable {\n\t\n\t\t\tprivate LaunchAdapter launchAdapter;\n\t\t\tprivate LaunchImpl<?> launch;\n\t\n\t\t\tpublic AsyncThread(LaunchImpl<?> launch, LaunchAdapter launchAdapter) {\n\t\t\t\tthis.launch = launch;\n\t\t\t\tthis.launchAdapter = launchAdapter;\n\t\t\t}\n\t\n\t\t\t@Override\n\t\t\tpublic void run() {\n\t\t\t\tthis.launchAdapter.internalSyncLaunch(this.launch);\n\t\t\t}\n\t\t}\n\t\t\n\t\t@SuppressWarnings({ \"rawtypes\", \"unchecked\" })\n\t\tLaunch around(LaunchImpl launch) throws LaunchException: \n\t\t\t\t\texecution(public Launch Launch+.synchLaunch(..) throws LaunchException)\n\t\t\t\t\t\t&& this(launch) {\n\t\t\tproceed(launch);\n\t\t\tlaunch.processHelper = Programs.as(launch.jobInstance);\n\t\t\tlaunch.getLaunchResult().setStatusCode(ProgramReturnCodes.RUNNING);\n\t\t\tthis.observable.prepareLaunching(launch);\n\t\n\t\t\treturn internalSyncLaunch(launch);\n\t\t}\n\t\n\t\t@SuppressWarnings({ \"rawtypes\", \"unchecked\" })\n\t\tLaunch around(LaunchImpl launch) throws LaunchException: \n\t\t\t\t\texecution(public Launch Launch+.aSynchLaunch() throws LaunchException)\n\t\t\t\t\t\t&& this(launch) {\n\t\t\tproceed(launch);\n\t\t\tlaunch.processHelper = Programs.as(launch.jobInstance);\n\t\t\tlaunch.getLaunchResult().setStatusCode(ProgramReturnCodes.RUNNING);\n\t\t\tthis.observable.prepareLaunching(launch);\n\t\t\tif (launch.getExecutorService()!=null) {\n\t\t\t\tlaunch.getExecutorService().execute(new AsyncThread(launch, this));\n\t\t\t} else {\n\t\t\t\tParallelJThreadFactory.getInstance().newThread(new AsyncThread(launch, this)).start();\n\t \t\t}\n\t\t\treturn launch;\n\t\t}\n\t\n\t\t@SuppressWarnings(\"rawtypes\")\n\t\tprivate Launch<?> internalSyncLaunch(LaunchImpl<?> launch) {\n\t\t\tLaunchingMessageKind.ILAUNCH0002.format(launch.getJobInstance()\n\t\t\t\t\t.getClass().getCanonicalName(), launch.getLaunchId());\n\t\t\tinitializeExecutors(launch);\n\t\t\tProcessHelperImpl processHelper = (ProcessHelperImpl)launch.getProcessHelper();\n\t\t\tKProcessor processor = processHelper.processor;\n\t\t\tif (processor == null) {\n\t\t\t\tif ( ((ILaunchExecutors)launch).executorServiceManager!=null \n\t\t\t\t\t\t&& ((ILaunchExecutors)launch).executorServiceManager.getDefaultExecutor()!=null) {\n\t\t\t\t\tprocessor = new KProcessor(((ILaunchExecutors)launch).executorServiceManager.getDefaultExecutor());\n\t\t\t\t} else {\n\t\t\t\t\tprocessor = new KProcessor(launch.getExecutorService());\n\t\t\t\t}\n\t\t\t\t((IKProcessorLaunch)processor).launch = launch;\n\t\t\t\tphl.put(processor, launch);\n\t\t\t}\n\t\t\tprocessor.execute(processHelper.process);\n\t\t\tlaunch.getProcessHelper().join();\n\t\t\tthis.observable.finalizeLaunching(launch);\n\t\t\tlaunch.complete();\n\t\t\tif(launch.executorServiceManager!=null) {\n\t\t\t\tlaunch.executorServiceManager.clean();\n\t\t\t}\n\t\t\tphl.remove(processor);\n\t\t\t\n\t\t\tif (launch.getLaunchResult().getStatusCode()!=ProgramReturnCodes.FAILURE\n\t\t\t\t\t&&launch.getLaunchResult().getStatusCode()!=ProgramReturnCodes.ABORTED) {\n\t\t\t\tlaunch.getLaunchResult().setStatusCode(ProgramReturnCodes.SUCCESS);\n\t\t\t}\n\t\t\tLaunchingMessageKind.ILAUNCH0003.format(launch.getJobInstance()\n\t\t\t\t\t.getClass().getCanonicalName(), launch.getLaunchId(), launch\n\t\t\t\t\t.getLaunchResult().getStatusCode(), launch.getLaunchResult()\n\t\t\t\t\t.getReturnCode());\n\t\t\treturn launch;\n\t\t}\n\t\t\n\t\tprivate void initializeExecutors(LaunchImpl<?> launch) {\n\t\t\tParalleljConfiguration configuration = (ParalleljConfiguration) ConfigurationService\n\t\t\t\t\t.getConfigurationService().getConfigurationManager()\n\t\t\t\t\t.get(ParalleljConfigurationManager.class)\n\t\t\t\t\t.getConfiguration();\n\t\t\tCExecutors cExecutors = configuration != null ? configuration\n\t\t\t\t\t.getExecutorServices() : null;\n\t\t\tif (cExecutors != null) {\n\t\t\t\tlaunch.executorServiceManager = new ExecutorServiceManager(cExecutors);\n\t\t\t}\n\t\t}\n\t}\n\n    void around(KProcessor kProcessor, SubProcessRunnable runnable):execution(public void submit(..))\n                && args(runnable)\n                &&this(kProcessor){\n\t\tLaunchImpl<?> launch = phl.get(kProcessor);\n\t\tKProcess process = runnable.getSubProcessCall().getProcess();\n\t\tif (launch!=null && launch.executorServiceManager!=null) {\n\t\t\tExecutorService service = launch.executorServiceManager.get(process);\n\t\t\tif (service!=null) {\n\t\t\t\tkProcessor.submit(runnable, service);\n\t\t\t} else {\n\t\t\t\tproceed(kProcessor, runnable);\n\t\t\t}\n\t\t} else {\n\t\t\tproceed(kProcessor, runnable);\n\t\t}\n    }\n\n    void around(KProcessor kProcessor, CallableCallRunnable runnable):execution(public void submit(..))\n            && args(runnable)\n            &&this(kProcessor){\n\t\tLaunchImpl<?> launch = phl.get(kProcessor);\n\t\tKProcess process = runnable.getCallableCall().getProcess();\n\t\tif (launch!=null && launch.executorServiceManager!=null) {\n\t\t\tExecutorService service = launch.executorServiceManager.get(process);\n\t\t\tif (service!=null) {\n\t\t\t\tkProcessor.submit(runnable, service);\n\t\t\t} else {\n\t\t\t\tproceed(kProcessor, runnable);\n\t\t\t}\n\t\t} else {\n\t\t\tproceed(kProcessor, runnable);\n\t\t}\n    }\n\n    void around(KProcessor kProcessor, RunnableCallRunnable runnable):execution(public void submit(..))\n            && args(runnable)\n            &&this(kProcessor) {\n\t\tLaunchImpl<?> launch = phl.get(kProcessor);\n\t\tKProcess process = runnable.getRunnableCall().getProcess();\n\t\tif (launch!=null && launch.executorServiceManager!=null) {\n\t\t\tExecutorService service = launch.executorServiceManager.get(process);\n\t\t\tif (service!=null) {\n\t\t\t\tkProcessor.submit(runnable, service);\n\t\t\t} else {\n\t\t\t\tproceed(kProcessor, runnable);\n\t\t\t}\n\t\t} else {\n\t\t\tproceed(kProcessor, runnable);\n\t\t}\n    }\n\n    void around(KProcess kProcess):execution(private void complete(..))\n    \t&& this(kProcess) {\n    \tproceed(kProcess);\n\t\tLaunchImpl<?> launch = ((IKProcessorLaunch)kProcess.getProcessor()).launch;\n\t\tlaunch.executorServiceManager.complete(kProcess);\n    }\n\n }\n","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"73aa5a7de6404ccb383d3a44359f518a25e62469","subject":"Aspect J tryouts","message":"Aspect J tryouts\n","repos":"rashmishrm\/cmpe202-UMLParser,rashmishrm\/cmpe202-UMLParser","old_file":"UMLGenerator\/aspectj\/MethodInterceptor.aj","new_file":"UMLGenerator\/aspectj\/MethodInterceptor.aj","new_contents":"import java.util.*;\n\npublic aspect MethodInterceptor {\n      Stack<String> st = new Stack<String>();\n\n\t\/\/pointcut traced() : !within(MethodInterceptor) && execution(public * *.*(..)) ;\n\tpointcut traced() : !within(MethodInterceptor) && execution( * *.*(..));\n\n\n\nprivate String previousClass;\nprivate String currentClass;\nprivate int callDepth=1;\nprivate String activate;\nprivate String deactivate;\n\n\n\n\n\tbefore() : traced() {\n\n\n        String prefix=null;\n\t\t\tif(callDepth==1){\n        prefix=\"NEW_CALL:\";\n\n\t\t}\n\t\telse{\n\t\tprefix=\"NESTED_CALL:\";\n\n\t\t}\n\t\tObject o = thisJoinPoint.getThis();\n        String currentClassName=null;\n        if(o!=null){\n        currentClassName=o.getClass().getName();\n        }\n        else{\n      String signature=  thisJoinPointStaticPart.getSignature().toString();\n\n      String array[]=signature.split(\"\\\\s\");\n         String methodName=array[1];\n        System.out.println(signature);\n         if(methodName.contains(\".\"))\n         currentClassName=methodName.split(\"\\\\.\")[0];\n        System.out.println(currentClassName);\n\n        }\n        String sender=null;\n\n        if(previousClass==null){\n        previousClass=currentClassName;\n        sender=currentClassName;\n\t    }\n       else  if(previousClass.equals(currentClassName)){\n        sender=currentClassName;\n\n\n        }\n        else{\n        sender=previousClass;\n        }\n\n\n      String call=  thisJoinPointStaticPart.getSignature().toString();\n\n      String array[]=call.split(\"\\\\s\");\n      String methodName=array[1];\n      String returnType=array[0];\n\n      if(methodName.contains(\".\")){\n      methodName=methodName.split(\"\\\\.\")[1];\n      }\n      if(st.size()>0){\n\n      sender=st.peek();\n      }\n\n      String methodCall=methodName+\":\"+returnType;\n\n\/\/System.out.println(callDepth+\"::::\"+prefix+\":::: \"+sender+\"------>\" + methodCall+\"---->\"+currentClassName);\nSystem.out.println(sender+\"->\"+currentClassName+\":\"+methodCall);\n\nif(currentClassName !=null && !currentClassName.equals(activate)){\n\n                System.out.println(\"activate \"+currentClassName);\n                activate=currentClassName;\n\n}\ncurrentClass=currentClassName;\n\n       st.push(currentClass);\n\n\npreviousClass=currentClass;\n\t\tcallDepth++;\n\n\n\n\n\n\t}\n\n\tafter() : traced() {\n\t\tcallDepth--;\nif(currentClass !=null){\nif(currentClass.equals(activate)){\nactivate=null;\n}\n                System.out.println(\"deactivate \"+currentClass);\n                deactivate=currentClass;\n\n\n\n}\n\n\n      st.pop();\n\n\t}\n\n\tprivate void print(String prefix, Object message) {\n\n\n\t\tif(callDepth==1){\n\n\n\n\t\t\t\t\tSystem.out.print(\"NEW_CALL:   \"+callDepth+\":\"+message);\n\n\n\n\t\t}\n\t\telse{\n\t\t\t\tSystem.out.print(\"NESTED_CALL\"+callDepth+message);\n\n\t\t}\n\n\n\t\t\/\/System.out.println(prefix + \": \" + message);\n\t}\n}\n","old_contents":"import java.util.*;\n\npublic aspect MethodInterceptor {\n      Stack<String> st = new Stack<String>();\n\n\t\/\/pointcut traced() : !within(MethodInterceptor) && execution(public * *.*(..)) ;\n\tpointcut traced() : !within(MethodInterceptor) && execution( * *.*(..));\n\n\n\nprivate String previousClass;\nprivate String currentClass;\nprivate int callDepth=1;\n\n\n\n\n\tbefore() : traced() {\n\n\n        String prefix=null;\n\t\t\tif(callDepth==1){\n        prefix=\"NEW_CALL:\";\n\n\t\t}\n\t\telse{\n\t\tprefix=\"NESTED_CALL:\";\n\n\t\t}\n\t\tObject o = thisJoinPoint.getThis();\n        String currentClassName=null;\n        if(o!=null){\n        currentClassName=o.getClass().getName();\n        }\n        else{\n      String signature=  thisJoinPointStaticPart.getSignature().toString();\n\n      String array[]=signature.split(\"\\\\s\");\n         String methodName=array[1];\n        System.out.println(signature);\n         if(methodName.contains(\".\"))\n         currentClassName=methodName.split(\"\\\\.\")[0];\n        System.out.println(currentClassName);\n\n        }\n        String sender=null;\n\n        if(previousClass==null){\n        previousClass=currentClassName;\n        sender=currentClassName;\n\t    }\n       else  if(previousClass.equals(currentClassName)){\n        sender=currentClassName;\n\n        }\n        else{\n        sender=previousClass;\n        }\n\n      String call=  thisJoinPointStaticPart.getSignature().toString();\n\n      String array[]=call.split(\"\\\\s\");\n      String methodName=array[1];\n      String returnType=array[0];\n\n      if(methodName.contains(\".\")){\n      methodName=methodName.split(\"\\\\.\")[1];\n      }\n      if(st.size()>0){\n\n      sender=st.peek();\n      }\n\n      String methodCall=methodName+\":\"+returnType;\n\n\/\/System.out.println(callDepth+\"::::\"+prefix+\":::: \"+sender+\"------>\" + methodCall+\"---->\"+currentClassName);\nSystem.out.println(sender+\"->\"+currentClassName+\":\"+methodCall);\n\ncurrentClass=currentClassName;\n\n       st.push(currentClass);\n\n\npreviousClass=currentClass;\n\t\tcallDepth++;\n\n\n\n\n\n\t}\n\n\tafter() : traced() {\n\t\tcallDepth--;\n\n      st.pop();\n\n\t}\n\n\tprivate void print(String prefix, Object message) {\n\n\n\t\tif(callDepth==1){\n\n\n\n\t\t\t\t\tSystem.out.print(\"NEW_CALL:   \"+callDepth+\":\"+message);\n\n\n\n\t\t}\n\t\telse{\n\t\t\t\tSystem.out.print(\"NESTED_CALL\"+callDepth+message);\n\n\t\t}\n\n\n\t\t\/\/System.out.println(prefix + \": \" + message);\n\t}\n}\n","returncode":0,"stderr":"","license":"agpl-3.0","lang":"AspectJ"}
{"commit":"83345666778dea3e8c7a607cc3cedf9d52f708fd","subject":"check filters before monitoring","message":"check filters before monitoring\n","repos":"DataDog\/monitor,eigengo\/monitor,eigengo\/monitor,DataDog\/monitor","old_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/ActorCellMonitoringAspect.aj","new_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/ActorCellMonitoringAspect.aj","new_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.actor.*;\nimport akka.japi.Creator;\nimport org.eigengo.monitor.agent.AgentConfiguration;\nimport org.eigengo.monitor.output.CounterInterface;\nimport scala.Option;\n\nimport java.util.ArrayList;\nimport java.util.List;\nimport java.util.concurrent.atomic.AtomicInteger;\nimport java.util.concurrent.atomic.AtomicLong;\nimport java.util.concurrent.ConcurrentHashMap;\n\n\/**\n * Contains advices for monitoring behaviour of an actor; typically imprisoned in an {@code ActorCell}.\n *\/\npublic aspect ActorCellMonitoringAspect extends AbstractMonitoringAspect issingleton() {\n    private AkkaAgentConfiguration agentConfiguration;\n    private final CounterInterface counterInterface;\n    private final Option<String> anonymousActorClassName = Option.empty();\n    \/\/ we sample based on actor type (i.e. a sampling rate of 'n' for a filter means 'every nth actor with type k, for each type k that matches that filter')\n    private final ConcurrentHashMap<Option<String>, AtomicLong> samplingCounters  = new ConcurrentHashMap<Option<String>, AtomicLong>();\n    \/\/ we count actors by actor type (any 'anonymous' or 'generic' actors are treated as the same type)\n    private final ConcurrentHashMap<Option<String>, AtomicInteger> numberOfActors = new ConcurrentHashMap<Option<String>, AtomicInteger>();\n    private final ConcurrentHashMap<ActorPath, String> pathTags                   = new ConcurrentHashMap<ActorPath, String>();\n\n    \/**\n     * Constructs this aspect\n     *\/\n    public ActorCellMonitoringAspect() {\n        AgentConfiguration<AkkaAgentConfiguration> configuration = getAgentConfiguration(\"akka\", AkkaAgentConfigurationJapi.apply());\n        this.agentConfiguration = configuration.agent();\n        this.counterInterface = createCounterInterface(configuration.common());\n    }\n\n    \/**\n     * Advises the {@code ActorCell.receiveMessage(message: Object): Unit}\n     * We proceed with the pointcut if the actor is to be included in the monitoring *and* this is\n     * the 'multiple-of-n'th time we've seen a message for an actor with a sample rate of n.\n     *\n     * Currently, we sample queue size, the fact that the message is delivered, the simple name of the class of the\n     * message, and the time taken to complete the actor's reactive action.\n     *\n     * @param actorCell the ActorCell where the actor that receives the message \"lives\"\n     * @param msg the incoming message\n     *\/\n    Object around(ActorCell actorCell, Object msg) : Pointcuts.actorCellReceiveMessage(actorCell, msg) {\n        final ActorPath actorPath = actorCell.self().path();\n        final Option<String> className = getActorClassName(actorCell, actorPath);\n        final PathAndClass pathAndClass = new PathAndClass(actorPath, className);\n        if (!includeActorPath(pathAndClass) || !sampleMessage(pathAndClass)) return proceed(actorCell, msg);\n\n        int samplingRate = getSampleRate(pathAndClass);\n\n        \/\/ we tag by actor name\n        final String[] tags = getTags(actorPath, className);\n\n        \/\/ record the queue size\n        this.counterInterface.recordGaugeValue(Aspects.queueSize(), actorCell.numberOfMessages(), tags);\n        \/\/ record the message, general and specific\n        this.counterInterface.incrementCounter(Aspects.delivered(), samplingRate, tags);\n        this.counterInterface.incrementCounter(Aspects.delivered(msg), samplingRate, tags);\n\n        \/\/ measure the time. we're using the ``nanoTime`` call to access the high-precision timer.\n        \/\/ since we're not really interested in wall time, but just some increasing measure of\n        \/\/ elapsed time\n        Object result = null;\n        final long start = System.nanoTime();\n        \/\/ result will always be ``null``, because target returns ``Unit``\n        result = proceed(actorCell, msg);\n        \/\/ ns or \u00b5s is too fine. ms will do for now.\n        final long duration = (System.nanoTime() - start) \/ 1000000;\n\n        \/\/ record the actor duration\n        this.counterInterface.recordExecutionTime(Aspects.actorDuration(), (int)duration, tags);\n\n        \/\/ return null would do the trick, but we want to be _proper_.\n        return result;\n    }\n\n    \/**\n     * Advises the {@code ActorCell.handleInvokeFailure(_, failure: Throwable): Unit}\n     *\n     * @param actorCell the ActorCell where the error spreads from\n     * @param failure the exception that escaped from the {@code receive} method\n     *\/\n    before(ActorCell actorCell, Throwable failure) : Pointcuts.actorCellHandleInvokeFailure(actorCell, failure) {\n        \/\/ record the error, general and specific\n        String[] tags = getTags(actorCell.self().path(), getActorClassName(actorCell, actorCell.self().path()));\n        this.counterInterface.incrementCounter(Aspects.actorError(), tags);\n        this.counterInterface.incrementCounter(Aspects.actorError(failure), tags);\n    }\n\n    \/**\n     * Advises the {@code EventStream.publish(event: Any): Unit}\n     *\n     * @param event the received event\n     *\/\n    before(Object event) : Pointcuts.eventStreamPublish(event) {\n        if (event instanceof UnhandledMessage) {\n            UnhandledMessage unhandledMessage = (UnhandledMessage)event;\n            String[] tags = getTags(unhandledMessage.recipient().path(), this.anonymousActorClassName);\n            this.counterInterface.incrementCounter(Aspects.undelivered(), tags);\n            this.counterInterface.incrementCounter(Aspects.undelivered(unhandledMessage.getMessage()), tags);\n        }\n    }\n\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorRefFactory} implementations\n     *\n     * @param props the {@code Props} instance used in the call\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after(Props props) returning (ActorRef actor) : Pointcuts.anyActorOf(props) {\n        recordActorCount(actor.path(), props, CountType.Increment);\n    }\n\n    \/**\n     * Advises the {@code LocalActorRef.stop} method\n     *\n     * @param actorCell the {@code ActorCell} of the actor being stopped\n     *\/\n    after(ActorCell actorCell) : Pointcuts.actorCellInternalStop(actorCell) {\n        recordActorCount(actorCell.self().path(), actorCell.props(), CountType.Decrement);\n    }\n\n    \/**\n     * Records the actor count increment or decrement\n     *\n     * @param path the ActorPath being created or destroyed\n     * @param props the Props of the actor at the {@code path}\n     * @param countType the increment or decrement\n     *\/\n     private void recordActorCount(ActorPath path, Props props, CountType countType) {\n         final Option<String> className = getActorClassName(props, path);\n         final PathAndClass pac = new PathAndClass(path, getActorClassName(props, path));\n         if (!includeActorPath(pac)) return;\n\n         final String[] tags = getTags(path, className);\n         this.numberOfActors.putIfAbsent(className, new AtomicInteger(0));\n         \/\/ increment and get the current number of actors of this type (if the value was 0, then this returns 1 -- which is correct)\n         final int currentNumberOfActors;\n         switch (countType) {\n             case Increment:\n                 currentNumberOfActors = this.numberOfActors.get(className).incrementAndGet();\n                 break;\n             case Decrement:\n                 currentNumberOfActors = this.numberOfActors.get(className).decrementAndGet();\n                 break;\n             default:\n                 currentNumberOfActors = 0;\n                 break;\n         }\n\n         this.counterInterface.recordGaugeValue(Aspects.actorCount(), currentNumberOfActors, tags);\n     }\n\n    \/**\n     * Injects the new {@code AkkaAgentConfiguration} instance.\n     *\n     * @param agentConfiguration the new configuration\n     *\/\n    synchronized final void setAgentConfiguration(AkkaAgentConfiguration agentConfiguration) {\n        this.agentConfiguration = agentConfiguration;\n    }\n\n    \/**\n     * The count type for exhaustive matching\n     *\/\n    private static enum CountType {\n        Increment, Decrement\n    }\n\n    \/**\n     * Decide whether to include this ActorCell in our measurements\n     *\n     * @param pathAndClass the PAC container\n     * @return whether to include the given actor in the metrics\n     *\/\n    private boolean includeActorPath(final PathAndClass pathAndClass) {\n        \/\/ do not monitor our own output code\n        if (pathAndClass.actorClassName().isDefined()) {\n            if (pathAndClass.actorClassName().get().startsWith(\"org.eigengo.monitor.output\")) return false;\n        }\n\n        \/\/ include actor if it's in 'included' list\n        if (this.agentConfiguration.included().accept(pathAndClass)) return true;\n        \/\/ exclude actor if excluded (i.e. is in 'excluded' list, or excludeAllNotIncluded = true, and actor is not included)\n        if (this.agentConfiguration.excluded().accept(pathAndClass)) return false;\n\n        \/\/ skip system actor checks if we wish to monitor them\n        if (this.agentConfiguration.includeSystemAgents()) return true;\n\n        String userOrSystem = pathAndClass.actorPath().getElements().iterator().next();\n        return \"user\".equals(userOrSystem);\n    }\n\n    \/**\n     * Lookup the sample rate for an actor from the configuration\n     *\n     * @param pathAndClass the PAC container\n     * @return the sampling rate as non-negative integer\n     *\/\n    private int getSampleRate(final PathAndClass pathAndClass) {\n        return this.agentConfiguration.sampling().getRate(pathAndClass);\n    }\n\n    \/**\n     * Decide whether to sample an actor on a particular occasion\n     *\n     * @param pathAndClass the PAC container\n     * @return {@code true} if we should sample this actor\n     *\/\n    private boolean sampleMessage(final PathAndClass pathAndClass) {\n        final Option<String> className = pathAndClass.actorClassName();\n        int sampleRate = getSampleRate(pathAndClass);\n        if (sampleRate == 1) return true;\n\n        this.samplingCounters.putIfAbsent(className, new AtomicLong(0));\n        long timesSeenSoFar = this.samplingCounters.get(className).incrementAndGet();\n        return (timesSeenSoFar % sampleRate == 1); \/\/ == 1 to log first value (incrementAndGet returns updated value)\n    }\n\n    \/**\n     * Formats the given {@code path} in a way that can be used for tagging. For example, for\n     * path <code>akka:\/\/default\/user\/a\/b\/c<\/code>, it returns <code>akka.path:\/default\/user\/a\/b\/c<\/code>\n     *\n     * @param path the path\n     * @return the tag-ready path\n     *\/\n    private String actorPathToString(ActorPath path) {\n        StringBuilder sb = new StringBuilder();\n        sb.append(\"akka.path:\/\");\n        sb.append(path.address().system());\n        for (String element : path.getElements()) {\n            sb.append(\"\/\");\n            sb.append(element);\n        }\n        return sb.toString();\n    }\n\n    \/**\n     * Decides whether {@code path} represents the \"root\" of the user actors\n     *\n     * @param path the actor path\n     * @return {@code true} if root of user actors\n     *\/\n    private boolean isUserRoot(ActorPath path) {\n        return \"user\".equals(path.elements().mkString(\"\/\"));\n    }\n\n    \/**\n     * Computes the tags for the given {@code actorPath} and {@code actor} instances.\n     *\n     * @param actorPath the actor path; never {@code null}\n     * @param actorClassName the actor instance; may be {@code null}\n     * @return non-{@code null} array of tags\n     *\/\n    private String[] getTags(final ActorPath actorPath, final Option<String> actorClassName) {\n        List<String> tags = new ArrayList<String>();\n\n        \/\/ TODO: Improve detection of routed actors. This only detects \"root\" unnamed actors\n        String lastPathElement = actorPath.elements().last();\n        if (lastPathElement.startsWith(\"$\")) {\n            \/\/ this is routed actor.\n            final ActorPath parent = actorPath.parent();\n            if (isUserRoot(parent)) {\n                \/\/ the parent is akka:\/\/xxx\/user\n                tags.add(actorPathToString(actorPath));\n            } else {\n                \/\/ the parent is some other actor, akka:\/\/xxx\/user\/foo\n                tags.add(actorPathToString(parent));\n                if (this.agentConfiguration.includeRoutees()) tags.add(actorPathToString(actorPath));\n            }\n        } else {\n            \/\/ there is no supervisor\n            tags.add(actorPathToString(actorPath));\n        }\n        if (actorClassName.isDefined()) {\n            tags.add(String.format(\"akka.type:%s.%s\", actorPath.address().system(), actorClassName.get()));\n        }\n\n        return tags.toArray(new String[tags.size()]);\n    }\n\n    \/**\n     * returns the canonical name of the actor type associated with an ActorCell\n     *\n     * @param actorCell the actor cell to get the name for\n     * @return the Option of actor class, never {@code null}.\n     *\/\n    private Option<String> getActorClassName(final ActorCell actorCell, final ActorPath actorPath) {\n        return getActorClassName(actorCell.props(), actorPath);\n    }\n\n    \/**\n     * Returns the canonical name of the actor type associated with a Props instance\n     *\n     * Returns null if props.actorClass does not have a canonical name (i.e., if\n     * it is a local or anonymous class)\n     *\n     * Notably, when the actor class is anonymous, the {@code getCanonicalName} returns {@code null},\n     * which we deal with here.\n     *\n     * @param props the ActorRef {@code Props} instance\n     * @return the Option of actor class, never {@code null}.\n     *\/\n    private Option<String> getActorClassName(final Props props, final ActorPath actorPath) {\n        final String canonicalName = props.actorClass().getCanonicalName();\n        if (canonicalName == null \/*if actor is anonymous*\/||\/*OR actor is generic*\/\n                canonicalName.endsWith(\"akka.actor.Actor\")) {\n            \/\/ then we check to see if our path->className map can help...\n            if (this.pathTags.containsKey(actorPath)) return Option.apply(this.pathTags.get(actorPath));\n            return this.anonymousActorClassName;\n        }\n        return Option.apply(canonicalName);\n    }\n\n    \/**\n     * Catches actors created by the japi.Creator.create(), at a point when their type is visible to the runtime.\n     * We use the visibility of the type at this one pointcut to create a map from the actor path to its type,\n     * which we then access within the other pointcuts (notably on actor death and message receipt) to get the\n     * 'real' type at those points.\n     *\n     * Since the 'ActorRefFactory.actorOf' method is guaranteed to be called on the creation of any actors after the\n     * initialisation of the actorSystem itself, and since we consider anonymous\/untyped actors in our count, we also\n     * decrement the count of 'anonymous' actors here, for we know their type to be invisible to other pointcuts, and\n     * that the element mapping path to type will not have been created (i.e. we generally assume actor paths are unique,\n     * and that the actorOf advice will access the 'pathTags' map before we've inserted this new value). This approach\n     * may not be robust enough -- in particular, with regards the second assumption.\n     *\n     * Regardless, we still double check that the map element doesn't already exist. If it does, we make the assumption\n     * that it was created 'a while ago', and that the path referred to an actor of the same type.\n     *\n     * @param actor the Actor returned by the {@code Creator.create()} method\n     * *\/\n    after() returning(final Actor actor) : Pointcuts.actorCreator() {\n        final String className = actor.getClass().getCanonicalName();\n        final ActorPath actorPath = actor.self().path();\n        final PathAndClass pac = new PathAndClass(actorPath, Option.apply(className));\n        if (this.pathTags.containsKey(actorPath)) return; \/\/ the key is there, we need do nothing.\n\n        if (includeActorPath(pac)) {\n            \/\/ add the path -> type pair to the pathTags map\n            this.pathTags.putIfAbsent(actorPath, className);\n\n            \/\/ safe increment of the count of actors of this type\n            this.numberOfActors.putIfAbsent(pac.actorClassName(), new AtomicInteger(0));\n            final int currentNumberOfActors = this.numberOfActors.get(pac.actorClassName()).incrementAndGet();\n            this.counterInterface.recordGaugeValue(Aspects.actorCount(), currentNumberOfActors, getTags(actorPath, pac.actorClassName()));\n        }\n\n        if (includeActorPath(new PathAndClass(actorPath, this.anonymousActorClassName))) {\n            \/\/ safe decrement of the count of anonymous\/untyped actors\n            this.numberOfActors.putIfAbsent(this.anonymousActorClassName, new AtomicInteger(0));\n            final int currentNumberOfActors = this.numberOfActors.get(this.anonymousActorClassName).decrementAndGet();\n            this.counterInterface.recordGaugeValue(Aspects.actorCount(), currentNumberOfActors, getTags(actorPath, this.anonymousActorClassName));\n        }\n    }\n\n}\n","old_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.actor.*;\nimport akka.japi.Creator;\nimport org.eigengo.monitor.agent.AgentConfiguration;\nimport org.eigengo.monitor.output.CounterInterface;\nimport scala.Option;\n\nimport java.util.ArrayList;\nimport java.util.List;\nimport java.util.concurrent.atomic.AtomicInteger;\nimport java.util.concurrent.atomic.AtomicLong;\nimport java.util.concurrent.ConcurrentHashMap;\n\n\/**\n * Contains advices for monitoring behaviour of an actor; typically imprisoned in an {@code ActorCell}.\n *\/\npublic aspect ActorCellMonitoringAspect extends AbstractMonitoringAspect issingleton() {\n    private AkkaAgentConfiguration agentConfiguration;\n    private final CounterInterface counterInterface;\n    private final Option<String> anonymousActorClassName = Option.empty();\n    \/\/ we sample based on actor type (i.e. a sampling rate of 'n' for a filter means 'every nth actor with type k, for each type k that matches that filter')\n    private final ConcurrentHashMap<Option<String>, AtomicLong> samplingCounters  = new ConcurrentHashMap<Option<String>, AtomicLong>();\n    \/\/ we count actors by actor type (any 'anonymous' or 'generic' actors are treated as the same type)\n    private final ConcurrentHashMap<Option<String>, AtomicInteger> numberOfActors = new ConcurrentHashMap<Option<String>, AtomicInteger>();\n    private final ConcurrentHashMap<ActorPath, String> pathTags                   = new ConcurrentHashMap<ActorPath, String>();\n\n    \/**\n     * Constructs this aspect\n     *\/\n    public ActorCellMonitoringAspect() {\n        AgentConfiguration<AkkaAgentConfiguration> configuration = getAgentConfiguration(\"akka\", AkkaAgentConfigurationJapi.apply());\n        this.agentConfiguration = configuration.agent();\n        this.counterInterface = createCounterInterface(configuration.common());\n    }\n\n    \/**\n     * Advises the {@code ActorCell.receiveMessage(message: Object): Unit}\n     * We proceed with the pointcut if the actor is to be included in the monitoring *and* this is\n     * the 'multiple-of-n'th time we've seen a message for an actor with a sample rate of n.\n     *\n     * Currently, we sample queue size, the fact that the message is delivered, the simple name of the class of the\n     * message, and the time taken to complete the actor's reactive action.\n     *\n     * @param actorCell the ActorCell where the actor that receives the message \"lives\"\n     * @param msg the incoming message\n     *\/\n    Object around(ActorCell actorCell, Object msg) : Pointcuts.actorCellReceiveMessage(actorCell, msg) {\n        final ActorPath actorPath = actorCell.self().path();\n        final Option<String> className = getActorClassName(actorCell, actorPath);\n        final PathAndClass pathAndClass = new PathAndClass(actorPath, className);\n        if (!includeActorPath(pathAndClass) || !sampleMessage(pathAndClass)) return proceed(actorCell, msg);\n\n        int samplingRate = getSampleRate(pathAndClass);\n\n        \/\/ we tag by actor name\n        final String[] tags = getTags(actorPath, className);\n\n        \/\/ record the queue size\n        this.counterInterface.recordGaugeValue(Aspects.queueSize(), actorCell.numberOfMessages(), tags);\n        \/\/ record the message, general and specific\n        this.counterInterface.incrementCounter(Aspects.delivered(), samplingRate, tags);\n        this.counterInterface.incrementCounter(Aspects.delivered(msg), samplingRate, tags);\n\n        \/\/ measure the time. we're using the ``nanoTime`` call to access the high-precision timer.\n        \/\/ since we're not really interested in wall time, but just some increasing measure of\n        \/\/ elapsed time\n        Object result = null;\n        final long start = System.nanoTime();\n        \/\/ result will always be ``null``, because target returns ``Unit``\n        result = proceed(actorCell, msg);\n        \/\/ ns or \u00b5s is too fine. ms will do for now.\n        final long duration = (System.nanoTime() - start) \/ 1000000;\n\n        \/\/ record the actor duration\n        this.counterInterface.recordExecutionTime(Aspects.actorDuration(), (int)duration, tags);\n\n        \/\/ return null would do the trick, but we want to be _proper_.\n        return result;\n    }\n\n    \/**\n     * Advises the {@code ActorCell.handleInvokeFailure(_, failure: Throwable): Unit}\n     *\n     * @param actorCell the ActorCell where the error spreads from\n     * @param failure the exception that escaped from the {@code receive} method\n     *\/\n    before(ActorCell actorCell, Throwable failure) : Pointcuts.actorCellHandleInvokeFailure(actorCell, failure) {\n        \/\/ record the error, general and specific\n        String[] tags = getTags(actorCell.self().path(), getActorClassName(actorCell, actorCell.self().path()));\n        this.counterInterface.incrementCounter(Aspects.actorError(), tags);\n        this.counterInterface.incrementCounter(Aspects.actorError(failure), tags);\n    }\n\n    \/**\n     * Advises the {@code EventStream.publish(event: Any): Unit}\n     *\n     * @param event the received event\n     *\/\n    before(Object event) : Pointcuts.eventStreamPublish(event) {\n        if (event instanceof UnhandledMessage) {\n            UnhandledMessage unhandledMessage = (UnhandledMessage)event;\n            String[] tags = getTags(unhandledMessage.recipient().path(), this.anonymousActorClassName);\n            this.counterInterface.incrementCounter(Aspects.undelivered(), tags);\n            this.counterInterface.incrementCounter(Aspects.undelivered(unhandledMessage.getMessage()), tags);\n        }\n    }\n\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorRefFactory} implementations\n     *\n     * @param props the {@code Props} instance used in the call\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after(Props props) returning (ActorRef actor) : Pointcuts.anyActorOf(props) {\n        recordActorCount(actor.path(), props, CountType.Increment);\n    }\n\n    \/**\n     * Advises the {@code LocalActorRef.stop} method\n     *\n     * @param actorCell the {@code ActorCell} of the actor being stopped\n     *\/\n    after(ActorCell actorCell) : Pointcuts.actorCellInternalStop(actorCell) {\n        recordActorCount(actorCell.self().path(), actorCell.props(), CountType.Decrement);\n    }\n\n    \/**\n     * Records the actor count increment or decrement\n     *\n     * @param path the ActorPath being created or destroyed\n     * @param props the Props of the actor at the {@code path}\n     * @param countType the increment or decrement\n     *\/\n     private void recordActorCount(ActorPath path, Props props, CountType countType) {\n         final Option<String> className = getActorClassName(props, path);\n         final PathAndClass pac = new PathAndClass(path, getActorClassName(props, path));\n         if (!includeActorPath(pac)) return;\n\n         final String[] tags = getTags(path, className);\n         this.numberOfActors.putIfAbsent(className, new AtomicInteger(0));\n         \/\/ increment and get the current number of actors of this type (if the value was 0, then this returns 1 -- which is correct)\n         final int currentNumberOfActors;\n         switch (countType) {\n             case Increment:\n                 currentNumberOfActors = this.numberOfActors.get(className).incrementAndGet();\n                 break;\n             case Decrement:\n                 currentNumberOfActors = this.numberOfActors.get(className).decrementAndGet();\n                 break;\n             default:\n                 currentNumberOfActors = 0;\n                 break;\n         }\n\n         this.counterInterface.recordGaugeValue(Aspects.actorCount(), currentNumberOfActors, tags);\n     }\n\n    \/**\n     * Injects the new {@code AkkaAgentConfiguration} instance.\n     *\n     * @param agentConfiguration the new configuration\n     *\/\n    synchronized final void setAgentConfiguration(AkkaAgentConfiguration agentConfiguration) {\n        this.agentConfiguration = agentConfiguration;\n    }\n\n    \/**\n     * The count type for exhaustive matching\n     *\/\n    private static enum CountType {\n        Increment, Decrement\n    }\n\n    \/**\n     * Decide whether to include this ActorCell in our measurements\n     *\n     * @param pathAndClass the PAC container\n     * @return whether to include the given actor in the metrics\n     *\/\n    private boolean includeActorPath(final PathAndClass pathAndClass) {\n        \/\/ do not monitor our own output code\n        if (pathAndClass.actorClassName().isDefined()) {\n            if (pathAndClass.actorClassName().get().startsWith(\"org.eigengo.monitor.output\")) return false;\n        }\n\n        \/\/ include actor if it's in 'included' list\n        if (this.agentConfiguration.included().accept(pathAndClass)) return true;\n        \/\/ exclude actor if excluded (i.e. is in 'excluded' list, or excludeAllNotIncluded = true, and actor is not included)\n        if (this.agentConfiguration.excluded().accept(pathAndClass)) return false;\n\n        \/\/ skip system actor checks if we wish to monitor them\n        if (this.agentConfiguration.includeSystemAgents()) return true;\n\n        String userOrSystem = pathAndClass.actorPath().getElements().iterator().next();\n        return \"user\".equals(userOrSystem);\n    }\n\n    \/**\n     * Lookup the sample rate for an actor from the configuration\n     *\n     * @param pathAndClass the PAC container\n     * @return the sampling rate as non-negative integer\n     *\/\n    private int getSampleRate(final PathAndClass pathAndClass) {\n        return this.agentConfiguration.sampling().getRate(pathAndClass);\n    }\n\n    \/**\n     * Decide whether to sample an actor on a particular occasion\n     *\n     * @param pathAndClass the PAC container\n     * @return {@code true} if we should sample this actor\n     *\/\n    private boolean sampleMessage(final PathAndClass pathAndClass) {\n        final Option<String> className = pathAndClass.actorClassName();\n        int sampleRate = getSampleRate(pathAndClass);\n        if (sampleRate == 1) return true;\n\n        this.samplingCounters.putIfAbsent(className, new AtomicLong(0));\n        long timesSeenSoFar = this.samplingCounters.get(className).incrementAndGet();\n        return (timesSeenSoFar % sampleRate == 1); \/\/ == 1 to log first value (incrementAndGet returns updated value)\n    }\n\n    \/**\n     * Formats the given {@code path} in a way that can be used for tagging. For example, for\n     * path <code>akka:\/\/default\/user\/a\/b\/c<\/code>, it returns <code>akka.path:\/default\/user\/a\/b\/c<\/code>\n     *\n     * @param path the path\n     * @return the tag-ready path\n     *\/\n    private String actorPathToString(ActorPath path) {\n        StringBuilder sb = new StringBuilder();\n        sb.append(\"akka.path:\/\");\n        sb.append(path.address().system());\n        for (String element : path.getElements()) {\n            sb.append(\"\/\");\n            sb.append(element);\n        }\n        return sb.toString();\n    }\n\n    \/**\n     * Decides whether {@code path} represents the \"root\" of the user actors\n     *\n     * @param path the actor path\n     * @return {@code true} if root of user actors\n     *\/\n    private boolean isUserRoot(ActorPath path) {\n        return \"user\".equals(path.elements().mkString(\"\/\"));\n    }\n\n    \/**\n     * Computes the tags for the given {@code actorPath} and {@code actor} instances.\n     *\n     * @param actorPath the actor path; never {@code null}\n     * @param actorClassName the actor instance; may be {@code null}\n     * @return non-{@code null} array of tags\n     *\/\n    private String[] getTags(final ActorPath actorPath, final Option<String> actorClassName) {\n        List<String> tags = new ArrayList<String>();\n\n        \/\/ TODO: Improve detection of routed actors. This only detects \"root\" unnamed actors\n        String lastPathElement = actorPath.elements().last();\n        if (lastPathElement.startsWith(\"$\")) {\n            \/\/ this is routed actor.\n            final ActorPath parent = actorPath.parent();\n            if (isUserRoot(parent)) {\n                \/\/ the parent is akka:\/\/xxx\/user\n                tags.add(actorPathToString(actorPath));\n            } else {\n                \/\/ the parent is some other actor, akka:\/\/xxx\/user\/foo\n                tags.add(actorPathToString(parent));\n                if (this.agentConfiguration.includeRoutees()) tags.add(actorPathToString(actorPath));\n            }\n        } else {\n            \/\/ there is no supervisor\n            tags.add(actorPathToString(actorPath));\n        }\n        if (actorClassName.isDefined()) {\n            tags.add(String.format(\"akka.type:%s.%s\", actorPath.address().system(), actorClassName.get()));\n        }\n\n        return tags.toArray(new String[tags.size()]);\n    }\n\n    \/**\n     * returns the canonical name of the actor type associated with an ActorCell\n     *\n     * @param actorCell the actor cell to get the name for\n     * @return the Option of actor class, never {@code null}.\n     *\/\n    private Option<String> getActorClassName(final ActorCell actorCell, final ActorPath actorPath) {\n        return getActorClassName(actorCell.props(), actorPath);\n    }\n\n    \/**\n     * Returns the canonical name of the actor type associated with a Props instance\n     *\n     * Returns null if props.actorClass does not have a canonical name (i.e., if\n     * it is a local or anonymous class)\n     *\n     * Notably, when the actor class is anonymous, the {@code getCanonicalName} returns {@code null},\n     * which we deal with here.\n     *\n     * @param props the ActorRef {@code Props} instance\n     * @return the Option of actor class, never {@code null}.\n     *\/\n    private Option<String> getActorClassName(final Props props, final ActorPath actorPath) {\n        final String canonicalName = props.actorClass().getCanonicalName();\n        if (canonicalName == null \/*if actor is anonymous*\/||\/*OR actor is generic*\/\n                canonicalName.endsWith(\"akka.actor.Actor\")) {\n            \/\/ then we check to see if our path->className map can help...\n            if (this.pathTags.containsKey(actorPath)) return Option.apply(this.pathTags.get(actorPath));\n            return this.anonymousActorClassName;\n        }\n        return Option.apply(canonicalName);\n    }\n\n    \/**\n     * Catches actors created by the japi.Creator.create(), at a point when their type is visible to the runtime.\n     * We use the visibility of the type at this one pointcut to create a map from the actor path to its type,\n     * which we then access within the other pointcuts (notably on actor death and message receipt) to get the\n     * 'real' type at those points.\n     *\n     * Since the 'ActorRefFactory.actorOf' method is guaranteed to be called on the creation of any actors after the\n     * initialisation of the actorSystem itself, and since we consider anonymous\/untyped actors in our count, we also\n     * decrement the count of 'anonymous' actors here, for we know their type to be invisible to other pointcuts, and\n     * that the element mapping path to type will not have been created (i.e. we generally assume actor paths are unique,\n     * and that the actorOf advice will access the 'pathTags' map before we've inserted this new value). This approach\n     * may not be robust enough -- in particular, with regards the second assumption.\n     *\n     * Regardless, we still double check that the map element doesn't already exist. If it does, we make the assumption\n     * that it was created 'a while ago', and that the path referred to an actor of the same type.\n     *\n     * @param actor the Actor returned by the {@code Creator.create()} method\n     * *\/\n    after() returning(final Actor actor) : Pointcuts.actorCreator() {\n        final String className = actor.getClass().getCanonicalName();\n        final ActorPath actorPath = actor.self().path();\n        if (this.pathTags.containsKey(actorPath)) return;\n        \/\/ add the path -> type pair to the pathTags map\n        this.pathTags.putIfAbsent(actorPath, className);\n\n        \/\/ safe increment of the count of actors of this type\n        this.numberOfActors.putIfAbsent(Option.apply(className), new AtomicInteger(0));\n        int currentNumberOfActors = this.numberOfActors.get(Option.apply(className)).incrementAndGet();\n        this.counterInterface.recordGaugeValue(Aspects.actorCount(), currentNumberOfActors, getTags(actorPath, Option.apply(className)));\n\n        \/\/ safe decrement of the count of anonymous\/untyped actors\n        this.numberOfActors.putIfAbsent(this.anonymousActorClassName, new AtomicInteger(0));\n                \/\/ reuse of int for (almost-?)invisible performance improvement\n        currentNumberOfActors = this.numberOfActors.get(this.anonymousActorClassName).decrementAndGet();\n        this.counterInterface.recordGaugeValue(Aspects.actorCount(), currentNumberOfActors, getTags(actorPath, this.anonymousActorClassName));\n    }\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"3a89bc4b266c9ab351a33727eaa8d0236b6f737b","subject":"Fix merge error in previous commit","message":"Fix merge error in previous commit\n\nIssue: SPR-11385\n","repos":"spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework","old_file":"spring-aspects\/src\/main\/java\/org\/springframework\/mock\/staticmock\/AbstractMethodMockingControl.aj","new_file":"spring-aspects\/src\/main\/java\/org\/springframework\/mock\/staticmock\/AbstractMethodMockingControl.aj","new_contents":"\/*\n * Copyright 2002-2014 the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.springframework.mock.staticmock;\n\nimport java.util.Arrays;\nimport java.util.LinkedList;\n\nimport org.springframework.util.ObjectUtils;\n\n\/**\n * Abstract aspect to enable mocking of methods picked out by a pointcut.\n *\n * <p>Sub-aspects must define:\n * <ul>\n * <li>the {@link #mockStaticsTestMethod()} pointcut to indicate call stacks\n * when mocking should be triggered\n * <li>the {@link #methodToMock()} pointcut to pick out method invocations to mock\n * <\/ul>\n *\n * @author Rod Johnson\n * @author Ramnivas Laddad\n * @author Sam Brannen\n *\/\npublic abstract aspect AbstractMethodMockingControl percflow(mockStaticsTestMethod()) {\n\n\tprotected abstract pointcut mockStaticsTestMethod();\n\n\tprotected abstract pointcut methodToMock();\n\n\n\tprivate boolean recording = true;\n\n\n\tstatic enum CallResponse {\n\t\tnothing, return_, throw_\n\t};\n\n\t\/**\n\t * Represents a list of expected calls to methods.\n\t *\/\n\t\/\/ Public to allow inserted code to access: is this normal??\n\tpublic class Expectations {\n\n\t\t\/**\n\t\t * Represents an expected call to a method.\n\t\t *\/\n\t\tprivate class Call {\n\n\t\t\tprivate final String signature;\n\t\t\tprivate final Object[] args;\n\n\t\t\tprivate Object responseObject; \/\/ return value or throwable\n\t\t\tprivate CallResponse responseType = CallResponse.nothing;\n\n\n\t\t\tpublic Call(String signature, Object[] args) {\n\t\t\t\tthis.signature = signature;\n\t\t\t\tthis.args = args;\n\t\t\t}\n\n\t\t\tpublic boolean hasResponseSpecified() {\n\t\t\t\treturn responseType != CallResponse.nothing;\n\t\t\t}\n\n\t\t\tpublic void setReturnVal(Object retVal) {\n\t\t\t\tthis.responseObject = retVal;\n\t\t\t\tresponseType = CallResponse.return_;\n\t\t\t}\n\n\t\t\tpublic void setThrow(Throwable throwable) {\n\t\t\t\tthis.responseObject = throwable;\n\t\t\t\tresponseType = CallResponse.throw_;\n\t\t\t}\n\n\t\t\tpublic Object returnValue(String lastSig, Object[] args) {\n\t\t\t\tcheckSignature(lastSig, args);\n\t\t\t\treturn responseObject;\n\t\t\t}\n\n\t\t\tpublic Object throwException(String lastSig, Object[] args) {\n\t\t\t\tcheckSignature(lastSig, args);\n\t\t\t\tthrow (RuntimeException) responseObject;\n\t\t\t}\n\n\t\t\tprivate void checkSignature(String lastSig, Object[] args) {\n\t\t\t\tif (!signature.equals(lastSig)) {\n\t\t\t\t\tthrow new IllegalArgumentException(\"Signature doesn't match\");\n\t\t\t\t}\n\t\t\t\tif (!Arrays.equals(this.args, args)) {\n\t\t\t\t\tthrow new IllegalArgumentException(\"Arguments don't match\");\n\t\t\t\t}\n\t\t\t}\n\n\t\t\t@Override\n\t\t\tpublic String toString() {\n\t\t\t\treturn String.format(\"Call with signature [%s] and arguments %s\", this.signature,\n\t\t\t\t\tObjectUtils.nullSafeToString(args));\n\t\t\t}\n\t\t}\n\n\n\t\t\/**\n\t\t * The list of recorded calls.\n\t\t *\/\n\t\tprivate final LinkedList<Call> calls = new LinkedList<Call>();\n\n\t\t\/**\n\t\t * The number of calls already verified.\n\t\t *\/\n\t\tprivate int verified;\n\n\n\t\tpublic void verify() {\n\t\t\tif (verified != calls.size()) {\n\t\t\t\tthrow new IllegalStateException(\"Expected \" + calls.size() + \" calls, but received \" + verified);\n\t\t\t}\n\t\t}\n\n\t\t\/**\n\t\t * Validate the call and provide the expected return value.\n\t\t *\/\n\t\tpublic Object respond(String lastSig, Object[] args) {\n\t\t\tCall c = nextCall();\n\n\t\t\tswitch (c.responseType) {\n\t\t\t\tcase return_: {\n\t\t\t\t\treturn c.returnValue(lastSig, args);\n\t\t\t\t}\n\t\t\t\tcase throw_: {\n\t\t\t\t\treturn c.throwException(lastSig, args);\n\t\t\t\t}\n\t\t\t\tdefault: {\n\t\t\t\t\tthrow new IllegalStateException(\"Behavior of \" + c + \" not specified\");\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\n\t\tprivate Call nextCall() {\n\t\t\tverified++;\n\t\t\tif (verified > calls.size()) {\n\t\t\t\tthrow new IllegalStateException(\"Expected \" + calls.size() + \" calls, but received \" + verified);\n\t\t\t}\n\t\t\t\/\/ The 'verified' count is 1-based; whereas, 'calls' is 0-based.\n\t\t\treturn calls.get(verified - 1);\n\t\t}\n\n\t\tpublic void expectCall(String lastSig, Object[] lastArgs) {\n\t\t\tcalls.add(new Call(lastSig, lastArgs));\n\t\t}\n\n\t\tpublic boolean hasCalls() {\n\t\t\treturn !calls.isEmpty();\n\t\t}\n\n\t\tpublic void expectReturn(Object retVal) {\n\t\t\tCall c = calls.getLast();\n\t\t\tif (c.hasResponseSpecified()) {\n\t\t\t\tthrow new IllegalStateException(\"No method invoked before setting return value\");\n\t\t\t}\n\t\t\tc.setReturnVal(retVal);\n\t\t}\n\n\t\tpublic void expectThrow(Throwable throwable) {\n\t\t\tCall c = calls.getLast();\n\t\t\tif (c.hasResponseSpecified()) {\n\t\t\t\tthrow new IllegalStateException(\"No method invoked before setting throwable\");\n\t\t\t}\n\t\t\tc.setThrow(throwable);\n\t\t}\n\t}\n\n\n\tprivate final Expectations expectations = new Expectations();\n\n\n\tafter() returning : mockStaticsTestMethod() {\n\t\tif (recording && (expectations.hasCalls())) {\n\t\t\tthrow new IllegalStateException(\n\t\t\t\t\"Calls recorded, yet playback state never reached: Create expectations then call \"\n\t\t\t\t\t\t+ this.getClass().getSimpleName() + \".playback()\");\n\t\t}\n\t\texpectations.verify();\n\t}\n\n\tObject around() : methodToMock() && cflowbelow(mockStaticsTestMethod()) {\n\t\tif (recording) {\n\t\t\texpectations.expectCall(thisJoinPointStaticPart.toLongString(), thisJoinPoint.getArgs());\n\t\t\t\/\/ Return value doesn't matter\n\t\t\treturn null;\n\t\t}\n\t\telse {\n\t\t\treturn expectations.respond(thisJoinPointStaticPart.toLongString(), thisJoinPoint.getArgs());\n\t\t}\n\t}\n\n\tpublic void expectReturnInternal(Object retVal) {\n\t\tif (!recording) {\n\t\t\tthrow new IllegalStateException(\"Not recording: Cannot set return value\");\n\t\t}\n\t\texpectations.expectReturn(retVal);\n\t}\n\n\tpublic void expectThrowInternal(Throwable throwable) {\n\t\tif (!recording) {\n\t\t\tthrow new IllegalStateException(\"Not recording: Cannot set throwable value\");\n\t\t}\n\t\texpectations.expectThrow(throwable);\n\t}\n\n\tpublic void playbackInternal() {\n\t\trecording = false;\n\t}\n\n}\n","old_contents":"\/*\n * Copyright 2002-2014 the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.springframework.mock.staticmock;\n\nimport java.util.Arrays;\nimport java.util.LinkedList;\n\nimport org.springframework.util.ObjectUtils;\n\n\/**\n * Abstract aspect to enable mocking of methods picked out by a pointcut.\n *\n * <p>Sub-aspects must define:\n * <ul>\n * <li>the {@link #mockStaticsTestMethod()} pointcut to indicate call stacks\n * when mocking should be triggered\n * <li>the {@link #methodToMock()} pointcut to pick out method invocations to mock\n * <\/ul>\n *\n * @author Rod Johnson\n * @author Ramnivas Laddad\n * @author Sam Brannen\n *\/\npublic abstract aspect AbstractMethodMockingControl percflow(mockStaticsTestMethod()) {\n\n\tprotected abstract pointcut mockStaticsTestMethod();\n\n\tprotected abstract pointcut methodToMock();\n\n\n\tprivate boolean recording = true;\n\n\n\tstatic enum CallResponse {\n\t\tnothing, return_, throw_\n\t};\n\n\t\/**\n\t * Represents a list of expected calls to methods.\n\t *\/\n\t\/\/ Public to allow inserted code to access: is this normal??\n\tpublic class Expectations {\n\n\t\t\/**\n\t\t * Represents an expected call to a method.\n\t\t *\/\n\t\tprivate class Call {\n\n\t\t\tprivate final String signature;\n\t\t\tprivate final Object[] args;\n\n\t\t\tprivate Object responseObject; \/\/ return value or throwable\n\t\t\tprivate CallResponse responseType = CallResponse.nothing;\n\n\n\t\t\tpublic Call(String signature, Object[] args) {\n\t\t\t\tthis.signature = signature;\n\t\t\t\tthis.args = args;\n\t\t\t}\n\n\t\t\tpublic boolean hasResponseSpecified() {\n\t\t\t\treturn responseType != CallResponse.nothing;\n\t\t\t}\n\n\t\t\tpublic void setReturnVal(Object retVal) {\n\t\t\t\tthis.responseObject = retVal;\n\t\t\t\tresponseType = CallResponse.return_;\n\t\t\t}\n\n\t\t\tpublic void setThrow(Throwable throwable) {\n\t\t\t\tthis.responseObject = throwable;\n\t\t\t\tresponseType = CallResponse.throw_;\n\t\t\t}\n\n\t\t\tpublic Object returnValue(String lastSig, Object[] args) {\n\t\t\t\tcheckSignature(lastSig, args);\n\t\t\t\treturn responseObject;\n\t\t\t}\n\n\t\t\tpublic Object throwException(String lastSig, Object[] args) {\n\t\t\t\tcheckSignature(lastSig, args);\n\t\t\t\tthrow (RuntimeException) responseObject;\n\t\t\t}\n\n\t\t\tprivate void checkSignature(String lastSig, Object[] args) {\n\t\t\t\tif (!signature.equals(lastSig)) {\n\t\t\t\t\tthrow new IllegalArgumentException(\"Signature doesn't match\");\n\t\t\t\t}\n\t\t\t\tif (!Arrays.equals(this.args, args)) {\n\t\t\t\t\tthrow new IllegalArgumentException(\"Arguments don't match\");\n\t\t\t\t}\n\t\t\t}\n\n\t\t\t@Override\n\t\t\tpublic String toString() {\n\t\t\t\treturn String.format(\"Call with signature [%s] and arguments %s\", this.signature,\n\t\t\t\t\tObjectUtils.nullSafeToString(args));\n\t\t\t}\n\t\t}\n\n\n\t\t\/**\n\t\t * The list of recorded calls.\n\t\t *\/\n\t\tprivate final LinkedList<Call> calls = new LinkedList<Call>();\n\n\t\t\/**\n\t\t * The number of calls already verified.\n\t\t *\/\n\t\tprivate int verified;\n\n\n\t\tpublic void verify() {\n\t\t\tif (verified != calls.size()) {\n\t\t\t\tthrow new IllegalStateException(\"Expected \" + calls.size() + \" calls, but received \" + verified);\n\t\t\t}\n\t\t}\n\n\t\t\/**\n\t\t * Validate the call and provide the expected return value.\n\t\t *\/\n\t\tpublic Object respond(String lastSig, Object[] args) {\n\t\t\tCall c = nextCall();\n\n\t\t\tswitch (c.responseType) {\n\t\t\t\tcase return_: {\n\t\t\t\t\treturn c.returnValue(lastSig, args);\n\t\t\t\t}\n\t\t\t\tcase throw_: {\n\t\t\t\t\treturn c.throwException(lastSig, args);\n\t\t\t\t}\n\t\t\t\tdefault: {\n\t\t\t\t\tthrow new IllegalStateException(\"Behavior of \" + c + \" not specified\");\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\n\t\tprivate Call nextCall() {\n\t\t\tverified++;\n\t\t\tif (verified > calls.size()) {\n\t\t\t\tthrow new IllegalStateException(\"Expected \" + calls.size() + \" calls, but received \" + verified);\n\t\t\t}\n\t\t\t\/\/ The 'verified' count is 1-based; whereas, 'calls' is 0-based.\n\t\t\treturn calls.get(verified - 1);\n\t\t}\n\n\t\tpublic void expectCall(String lastSig, Object[] lastArgs) {\n\t\t\tcalls.add(new Call(lastSig, lastArgs));\n\t\t}\n\n\t\tpublic boolean hasCalls() {\n\t\t\treturn !calls.isEmpty();\n\t\t}\n\n\t\tpublic void expectReturn(Object retVal) {\n\t\t\tCall c = calls.getLast();\n\t\t\tif (c.hasResponseSpecified()) {\n\t\t\t\tthrow new IllegalStateException(\"No method invoked before setting return value\");\n\t\t\t}\n\t\t\tc.setReturnVal(retVal);\n\t\t}\n\n\t\tpublic void expectThrow(Throwable throwable) {\n\t\t\tCall c = calls.getLast();\n\t\t\tif (c.hasResponseSpecified()) {\n\t\t\t\tthrow new IllegalStateException(\"No method invoked before setting throwable\");\n\t\t\t}\n\t\t\tc.setThrow(throwable);\n\t\t}\n\t\t}\n\t}\n\n\n\tprivate final Expectations expectations = new Expectations();\n\n\n\tafter() returning : mockStaticsTestMethod() {\n\t\tif (recording && (expectations.hasCalls())) {\n\t\t\tthrow new IllegalStateException(\n\t\t\t\t\"Calls recorded, yet playback state never reached: Create expectations then call \"\n\t\t\t\t\t\t+ this.getClass().getSimpleName() + \".playback()\");\n\t\t}\n\t\texpectations.verify();\n\t}\n\n\tObject around() : methodToMock() && cflowbelow(mockStaticsTestMethod()) {\n\t\tif (recording) {\n\t\t\texpectations.expectCall(thisJoinPointStaticPart.toLongString(), thisJoinPoint.getArgs());\n\t\t\t\/\/ Return value doesn't matter\n\t\t\treturn null;\n\t\t}\n\t\telse {\n\t\t\treturn expectations.respond(thisJoinPointStaticPart.toLongString(), thisJoinPoint.getArgs());\n\t\t}\n\t}\n\n\tpublic void expectReturnInternal(Object retVal) {\n\t\tif (!recording) {\n\t\t\tthrow new IllegalStateException(\"Not recording: Cannot set return value\");\n\t\t}\n\t\texpectations.expectReturn(retVal);\n\t}\n\n\tpublic void expectThrowInternal(Throwable throwable) {\n\t\tif (!recording) {\n\t\t\tthrow new IllegalStateException(\"Not recording: Cannot set throwable value\");\n\t\t}\n\t\texpectations.expectThrow(throwable);\n\t}\n\n\tpublic void playbackInternal() {\n\t\trecording = false;\n\t}\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"9e1e3c34ec067b1d0018b48488279c8a30d56bb9","subject":"Dirty fix for issue #16","message":"Dirty fix for issue #16","repos":"authzforce\/core,authzforce\/core,authzforce\/core","old_file":"src\/main\/aspect\/com\/thalesgroup\/authzforce\/audit\/aspect\/AuditAspect.aj","new_file":"src\/main\/aspect\/com\/thalesgroup\/authzforce\/audit\/aspect\/AuditAspect.aj","new_contents":"\/**\r\n * Copyright (C) 2011-2014 Thales Services - ThereSIS - All rights reserved.\r\n *\r\n * Licensed under the Apache License, Version 2.0 (the \"License\");\r\n *    you may not use this file except in compliance with the License.\r\n *    You may obtain a copy of the License at\r\n *\r\n *        http:\/\/www.apache.org\/licenses\/LICENSE-2.0\r\n *\r\n *    Unless required by applicable law or agreed to in writing, software\r\n *    distributed under the License is distributed on an \"AS IS\" BASIS,\r\n *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n *    See the License for the specific language governing permissions and\r\n *    limitations under the License.\r\n *\/\r\npackage com.thalesgroup.authzforce.audit.aspect;\r\n\r\nimport java.net.URI;\r\nimport java.text.DateFormat;\r\nimport java.text.SimpleDateFormat;\r\n\r\nimport oasis.names.tc.xacml._3_0.core.schema.wd_17.Policy;\r\nimport oasis.names.tc.xacml._3_0.core.schema.wd_17.Result;\r\nimport oasis.names.tc.xacml._3_0.core.schema.wd_17.Rule;\r\n\r\nimport org.aspectj.lang.JoinPoint;\r\nimport org.aspectj.lang.annotation.AfterReturning;\r\nimport org.aspectj.lang.annotation.Aspect;\r\nimport org.aspectj.lang.annotation.Pointcut;\r\nimport org.slf4j.Logger;\r\nimport org.slf4j.LoggerFactory;\r\n\r\nimport com.sun.xacml.BasicEvaluationCtx;\r\nimport com.sun.xacml.attr.DateTimeAttribute;\r\nimport com.sun.xacml.attr.xacmlv3.AttributeValue;\r\nimport com.sun.xacml.cond.xacmlv3.EvaluationResult;\r\nimport com.thalesgroup.authzforce.audit.AttributesResolved;\r\nimport com.thalesgroup.authzforce.audit.AuditLogs;\r\nimport com.thalesgroup.authzforce.audit.annotations.Audit;\r\nimport com.thalesgroup.authzforce.audit.schema.pdp.AuditLog;\r\nimport com.thalesgroup.authzforce.audit.schema.pdp.AuditedPolicy;\r\nimport com.thalesgroup.authzforce.audit.schema.pdp.AuditedResult;\r\nimport com.thalesgroup.authzforce.audit.schema.pdp.AuditedRule;\r\nimport com.thalesgroup.authzforce.xacml.schema.XACMLAttributeId;\r\nimport com.thalesgroup.authzforce.xacml.schema.XACMLDatatypes;\r\n\r\n@Aspect\r\npublic class AuditAspect {\r\n\r\n\tprivate static final Logger LOGGER = LoggerFactory\r\n\t\t\t.getLogger(AuditAspect.class);\r\n\tprivate static final DateFormat dateFormat = new SimpleDateFormat(\r\n\t\t\t\"dd-MM-yyyy HH:mm:ss.SSSSSSSSS\");\r\n\tprivate static final DateFormat dateFormatWOoNano = new SimpleDateFormat(\r\n\t\t\t\"dd-MM-yyyy HH:mm:ss\");\r\n\r\n\t@Pointcut(\"execution (@com.thalesgroup.authzforce.audit.annotations * *.*(..))\")\r\n\tpublic void searchAnnotation() {\r\n\r\n\t}\r\n\r\n\t@AfterReturning(value = \"@annotation(annotation)\", returning = \"result\")\r\n\tpublic void doAuditLog(Audit annotation, JoinPoint jp, Object result) {\r\n\t\tswitch (annotation.type()) {\r\n\t\tcase RULE:\r\n\t\t\tAuditLog audit = new AuditLog();\r\n\t\t\tAuditedRule auditedRule = new AuditedRule();\r\n\t\t\tauditedRule.setId(((Rule) jp.getTarget()).getRuleId());\r\n\t\t\tauditedRule.setResult(AuditedResult.fromValue(((Result) result)\r\n\t\t\t\t\t.getDecision().value()));\r\n\t\t\tfor (Object arg : jp.getArgs()) {\r\n\t\t\t\tif (arg instanceof BasicEvaluationCtx) {\r\n\t\t\t\t\taudit.setDate(this.formatDate(((BasicEvaluationCtx) arg)\r\n\t\t\t\t\t\t\t.getCurrentDateTime()));\r\n\t\t\t\t\taudit.setRequest(((BasicEvaluationCtx) arg).getRequest());\r\n\t\t\t\t\taudit = this.setAttributes(audit, ((BasicEvaluationCtx) arg));\r\n\t\t\t\t}\r\n\t\t\t}\r\n\r\n\t\t\taudit.getRules().add(auditedRule);\r\n\r\n\t\t\tsynchronized (audit) {\r\n\t\t\t\tAuditLogs.getInstance().addAudit(audit);\t\r\n\t\t\t}\t\t\t\r\n\t\t\tbreak;\r\n\r\n\t\tcase POLICY:\r\n\t\t\taudit = new AuditLog();\r\n\t\t\tAuditedPolicy auditedPolicy = new AuditedPolicy();\r\n\t\t\tauditedPolicy.setId(((Policy) jp.getTarget()).getPolicyId());\r\n\t\t\tauditedPolicy.setRuleCombiningAlgorithm(((Policy) jp.getTarget())\r\n\t\t\t\t\t.getRuleCombiningAlgId());\r\n\t\t\tauditedPolicy.setResult(AuditedResult.fromValue(((Result) result)\r\n\t\t\t\t\t.getDecision().value()));\r\n\t\t\tfor (Object arg : jp.getArgs()) {\r\n\t\t\t\tif (arg instanceof BasicEvaluationCtx) {\r\n\t\t\t\t\taudit.setDate(this.formatDate(((BasicEvaluationCtx) arg)\r\n\t\t\t\t\t\t\t.getCurrentDateTime()));\r\n\t\t\t\t\taudit.setRequest(((BasicEvaluationCtx) arg).getRequest());\r\n\t\t\t\t\taudit = this.setAttributes(audit, ((BasicEvaluationCtx) arg));;\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t\taudit.getMatchedPolicies().add(auditedPolicy);\r\n\t\t\tsynchronized (audit) {\r\n\t\t\t\tAuditLogs.getInstance().addAudit(audit);\t\r\n\t\t\t}\t\r\n\t\t\tbreak;\r\n\r\n\t\tcase ATTRIBUTE:\r\n\t\t\taudit = new AuditLog();\r\n\t\t\tAttributesResolved attrResolved = new AttributesResolved();\r\n\t\t\t\/\/ FIXME: jump subject-id research due to infinite call loop (issue #16)\r\n\t\t\tif(jp.getArgs()[1] != null && jp.getArgs()[1] instanceof URI) {\r\n\t\t\t\tURI attributeId = (URI) jp.getArgs()[1];\r\n\t\t\t\tif(attributeId.equals(URI.create(XACMLAttributeId.XACML_SUBJECT_SUBJECT_ID.value()))) {\r\n\t\t\t\t\tbreak;\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t\tfor (Object arg : jp.getArgs()) {\r\n\t\t\t\tif (arg instanceof BasicEvaluationCtx) {\r\n\t\t\t\t\taudit.setDate(this.formatDate(((BasicEvaluationCtx) arg)\r\n\t\t\t\t\t\t\t.getCurrentDateTime()));\r\n\t\t\t\t\taudit.setRequest(((BasicEvaluationCtx) arg).getRequest());\r\n\t\t\t\t\taudit = this.setAttributes(audit, ((BasicEvaluationCtx) arg));\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t\tattrResolved.setAttributeValue(((EvaluationResult) result)\r\n\t\t\t\t\t.getAttributeValue());\r\n\t\t\tbreak;\r\n\r\n\t\t\/\/ Used to display and clean the audit log pool\r\n\t\tcase DISPLAY:\r\n\t\t\tLOGGER.info(AuditLogs.getInstance().toString());\r\n\t\t\tbreak;\r\n\t\tdefault:\r\n\t\t\tLOGGER.error(\"Type unknown: \" + annotation.type());\r\n\t\t}\r\n\t}\r\n\r\n\tprivate AuditLog setAttributes(AuditLog audit,\r\n\t\t\tBasicEvaluationCtx basicEvaluationCtx) {\r\n\t\tif (((BasicEvaluationCtx) basicEvaluationCtx).getSubjectAttribute(\r\n\t\t\t\tURI.create(XACMLDatatypes.XACML_DATATYPE_STRING.value()),\r\n\t\t\t\tURI.create(XACMLAttributeId.XACML_SUBJECT_SUBJECT_ID.value()),\r\n\t\t\t\tURI.create(XACMLAttributeId.SUBJECT_CATEGORY.value())) != null) {\r\n\t\t\tif(((BasicEvaluationCtx) basicEvaluationCtx).getSubjectAttribute(\r\n\t\t\t\t\t\tURI.create(XACMLDatatypes.XACML_DATATYPE_STRING.value()),\r\n\t\t\t\t\t\tURI.create(XACMLAttributeId.XACML_SUBJECT_SUBJECT_ID.value()),\r\n\t\t\t\t\t\tURI.create(XACMLAttributeId.SUBJECT_CATEGORY.value())).getAttributeValue().getContent().size() > 0) {\r\n\t\t\t\t\t\t\tString subjectId = (String) ((BasicEvaluationCtx) basicEvaluationCtx).getSubjectAttribute(\r\n\t\t\t\t\t\t\t\t\tURI.create(XACMLDatatypes.XACML_DATATYPE_STRING.value()),\r\n\t\t\t\t\t\t\t\t\tURI.create(XACMLAttributeId.XACML_SUBJECT_SUBJECT_ID.value()),\r\n\t\t\t\t\t\t\t\t\tURI.create(XACMLAttributeId.SUBJECT_CATEGORY.value())).getAttributeValue().getContent().get(0);\r\n\t\t\t\t\t\t\t\r\n\t\t\t\t\t\t\taudit.setSubjectId(subjectId);\t\r\n\t\t\t\t\t\t}\r\n\t\t}\r\n\r\n\t\tAttributeValue resourceId = ((BasicEvaluationCtx) basicEvaluationCtx).getResourceId();\r\n\t\tif(resourceId.getContent().size() > 0) {\r\n\t\t\taudit.setResourceId(String.valueOf(resourceId.getContent().get(0)));\t\r\n\t\t}\r\n\r\n\t\t\/\/ FIXME: Set the ActionId attribute\r\n\t\t\/\/ audit.setActionId();\r\n\t\t\r\n\t\treturn audit;\r\n\t}\r\n\r\n\tprivate String formatDate(DateTimeAttribute currentDateTime) {\r\n\t\tString date = dateFormatWOoNano.format(currentDateTime.getValue())\r\n\t\t\t\t+ \".\" + String.valueOf(currentDateTime.getNanoseconds());\r\n\r\n\t\treturn date;\r\n\t}\r\n}","old_contents":"\/**\r\n * Copyright (C) 2011-2014 Thales Services - ThereSIS - All rights reserved.\r\n *\r\n * Licensed under the Apache License, Version 2.0 (the \"License\");\r\n *    you may not use this file except in compliance with the License.\r\n *    You may obtain a copy of the License at\r\n *\r\n *        http:\/\/www.apache.org\/licenses\/LICENSE-2.0\r\n *\r\n *    Unless required by applicable law or agreed to in writing, software\r\n *    distributed under the License is distributed on an \"AS IS\" BASIS,\r\n *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n *    See the License for the specific language governing permissions and\r\n *    limitations under the License.\r\n *\/\r\npackage com.thalesgroup.authzforce.audit.aspect;\r\n\r\nimport java.net.URI;\r\nimport java.text.DateFormat;\r\nimport java.text.SimpleDateFormat;\r\n\r\nimport oasis.names.tc.xacml._3_0.core.schema.wd_17.Policy;\r\nimport oasis.names.tc.xacml._3_0.core.schema.wd_17.Result;\r\nimport oasis.names.tc.xacml._3_0.core.schema.wd_17.Rule;\r\n\r\nimport org.aspectj.lang.JoinPoint;\r\nimport org.aspectj.lang.annotation.AfterReturning;\r\nimport org.aspectj.lang.annotation.Aspect;\r\nimport org.aspectj.lang.annotation.Pointcut;\r\nimport org.slf4j.Logger;\r\nimport org.slf4j.LoggerFactory;\r\n\r\nimport com.sun.xacml.BasicEvaluationCtx;\r\nimport com.sun.xacml.attr.DateTimeAttribute;\r\nimport com.sun.xacml.attr.xacmlv3.AttributeValue;\r\nimport com.sun.xacml.cond.xacmlv3.EvaluationResult;\r\nimport com.thalesgroup.authzforce.audit.AttributesResolved;\r\nimport com.thalesgroup.authzforce.audit.AuditLogs;\r\nimport com.thalesgroup.authzforce.audit.annotations.Audit;\r\nimport com.thalesgroup.authzforce.audit.schema.pdp.AuditLog;\r\nimport com.thalesgroup.authzforce.audit.schema.pdp.AuditedPolicy;\r\nimport com.thalesgroup.authzforce.audit.schema.pdp.AuditedResult;\r\nimport com.thalesgroup.authzforce.audit.schema.pdp.AuditedRule;\r\nimport com.thalesgroup.authzforce.xacml.schema.XACMLAttributeId;\r\nimport com.thalesgroup.authzforce.xacml.schema.XACMLDatatypes;\r\n\r\n@Aspect\r\npublic class AuditAspect {\r\n\r\n\tprivate static final Logger LOGGER = LoggerFactory\r\n\t\t\t.getLogger(AuditAspect.class);\r\n\tprivate static final DateFormat dateFormat = new SimpleDateFormat(\r\n\t\t\t\"dd-MM-yyyy HH:mm:ss.SSSSSSSSS\");\r\n\tprivate static final DateFormat dateFormatWOoNano = new SimpleDateFormat(\r\n\t\t\t\"dd-MM-yyyy HH:mm:ss\");\r\n\r\n\t@Pointcut(\"execution (@com.thalesgroup.authzforce.audit.annotations * *.*(..))\")\r\n\tpublic void searchAnnotation() {\r\n\r\n\t}\r\n\r\n\t@AfterReturning(value = \"@annotation(annotation)\", returning = \"result\")\r\n\tpublic void doAuditLog(Audit annotation, JoinPoint jp, Object result) {\r\n\t\tswitch (annotation.type()) {\r\n\t\tcase RULE:\r\n\t\t\tAuditLog audit = new AuditLog();\r\n\t\t\tAuditedRule auditedRule = new AuditedRule();\r\n\t\t\tauditedRule.setId(((Rule) jp.getTarget()).getRuleId());\r\n\t\t\tauditedRule.setResult(AuditedResult.fromValue(((Result) result)\r\n\t\t\t\t\t.getDecision().value()));\r\n\t\t\tfor (Object arg : jp.getArgs()) {\r\n\t\t\t\tif (arg instanceof BasicEvaluationCtx) {\r\n\t\t\t\t\taudit.setDate(this.formatDate(((BasicEvaluationCtx) arg)\r\n\t\t\t\t\t\t\t.getCurrentDateTime()));\r\n\t\t\t\t\taudit.setRequest(((BasicEvaluationCtx) arg).getRequest());\r\n\t\t\t\t\taudit = this.setAttributes(audit, ((BasicEvaluationCtx) arg));\r\n\t\t\t\t}\r\n\t\t\t}\r\n\r\n\t\t\taudit.getRules().add(auditedRule);\r\n\r\n\t\t\tsynchronized (audit) {\r\n\t\t\t\tAuditLogs.getInstance().addAudit(audit);\t\r\n\t\t\t}\t\t\t\r\n\t\t\tbreak;\r\n\r\n\t\tcase POLICY:\r\n\t\t\taudit = new AuditLog();\r\n\t\t\tAuditedPolicy auditedPolicy = new AuditedPolicy();\r\n\t\t\tauditedPolicy.setId(((Policy) jp.getTarget()).getPolicyId());\r\n\t\t\tauditedPolicy.setRuleCombiningAlgorithm(((Policy) jp.getTarget())\r\n\t\t\t\t\t.getRuleCombiningAlgId());\r\n\t\t\tauditedPolicy.setResult(AuditedResult.fromValue(((Result) result)\r\n\t\t\t\t\t.getDecision().value()));\r\n\t\t\tfor (Object arg : jp.getArgs()) {\r\n\t\t\t\tif (arg instanceof BasicEvaluationCtx) {\r\n\t\t\t\t\taudit.setDate(this.formatDate(((BasicEvaluationCtx) arg)\r\n\t\t\t\t\t\t\t.getCurrentDateTime()));\r\n\t\t\t\t\taudit.setRequest(((BasicEvaluationCtx) arg).getRequest());\r\n\t\t\t\t\taudit = this.setAttributes(audit, ((BasicEvaluationCtx) arg));;\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t\taudit.getMatchedPolicies().add(auditedPolicy);\r\n\t\t\tsynchronized (audit) {\r\n\t\t\t\tAuditLogs.getInstance().addAudit(audit);\t\r\n\t\t\t}\t\r\n\t\t\tbreak;\r\n\r\n\t\tcase ATTRIBUTE:\r\n\t\t\taudit = new AuditLog();\r\n\t\t\tAttributesResolved attrResolved = new AttributesResolved();\r\n\t\t\tfor (Object arg : jp.getArgs()) {\r\n\t\t\t\tif (arg instanceof BasicEvaluationCtx) {\r\n\t\t\t\t\taudit.setDate(this.formatDate(((BasicEvaluationCtx) arg)\r\n\t\t\t\t\t\t\t.getCurrentDateTime()));\r\n\t\t\t\t\taudit.setRequest(((BasicEvaluationCtx) arg).getRequest());\r\n\t\t\t\t\taudit = this.setAttributes(audit, ((BasicEvaluationCtx) arg));\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t\tattrResolved.setAttributeValue(((EvaluationResult) result)\r\n\t\t\t\t\t.getAttributeValue());\r\n\t\t\tbreak;\r\n\r\n\t\t\/\/ Used to display and clean the audit log pool\r\n\t\tcase DISPLAY:\r\n\t\t\tLOGGER.info(AuditLogs.getInstance().toString());\r\n\t\t\tbreak;\r\n\t\tdefault:\r\n\t\t\tLOGGER.error(\"Type unknown: \" + annotation.type());\r\n\t\t}\r\n\t}\r\n\r\n\tprivate AuditLog setAttributes(AuditLog audit,\r\n\t\t\tBasicEvaluationCtx basicEvaluationCtx) {\r\n\t\tif (((BasicEvaluationCtx) basicEvaluationCtx).getSubjectAttribute(\r\n\t\t\t\tURI.create(XACMLDatatypes.XACML_DATATYPE_STRING.value()),\r\n\t\t\t\tURI.create(XACMLAttributeId.XACML_SUBJECT_SUBJECT_ID.value()),\r\n\t\t\t\tURI.create(XACMLAttributeId.SUBJECT_CATEGORY.value())) != null) {\r\n\t\t\tif(((BasicEvaluationCtx) basicEvaluationCtx).getSubjectAttribute(\r\n\t\t\t\t\t\tURI.create(XACMLDatatypes.XACML_DATATYPE_STRING.value()),\r\n\t\t\t\t\t\tURI.create(XACMLAttributeId.XACML_SUBJECT_SUBJECT_ID.value()),\r\n\t\t\t\t\t\tURI.create(XACMLAttributeId.SUBJECT_CATEGORY.value())).getAttributeValue().getContent().size() > 0) {\r\n\t\t\t\t\t\t\tString subjectId = (String) ((BasicEvaluationCtx) basicEvaluationCtx).getSubjectAttribute(\r\n\t\t\t\t\t\t\t\t\tURI.create(XACMLDatatypes.XACML_DATATYPE_STRING.value()),\r\n\t\t\t\t\t\t\t\t\tURI.create(XACMLAttributeId.XACML_SUBJECT_SUBJECT_ID.value()),\r\n\t\t\t\t\t\t\t\t\tURI.create(XACMLAttributeId.SUBJECT_CATEGORY.value())).getAttributeValue().getContent().get(0);\r\n\t\t\t\t\t\t\t\r\n\t\t\t\t\t\t\taudit.setSubjectId(subjectId);\t\r\n\t\t\t\t\t\t}\r\n\t\t}\r\n\r\n\t\tAttributeValue resourceId = ((BasicEvaluationCtx) basicEvaluationCtx).getResourceId();\r\n\t\tif(resourceId.getContent().size() > 0) {\r\n\t\t\taudit.setResourceId(String.valueOf(resourceId.getContent().get(0)));\t\r\n\t\t}\r\n\r\n\t\t\/\/ FIXME: Set the ActionId attribute\r\n\t\t\/\/ audit.setActionId();\r\n\t\t\r\n\t\treturn audit;\r\n\t}\r\n\r\n\tprivate String formatDate(DateTimeAttribute currentDateTime) {\r\n\t\tString date = dateFormatWOoNano.format(currentDateTime.getValue())\r\n\t\t\t\t+ \".\" + String.valueOf(currentDateTime.getNanoseconds());\r\n\r\n\t\treturn date;\r\n\t}\r\n}","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"974218d8636735ce6956a71de26b5b751bf5a704","subject":"Fix possible null pointer issues with around advice","message":"Fix possible null pointer issues with around advice\n","repos":"NetSys\/demi-applications,NetSys\/demi,NetSys\/demi-applications,NetSys\/demi-applications","old_file":"src\/main\/aspectj\/WeaveActor.aj","new_file":"src\/main\/aspectj\/WeaveActor.aj","new_contents":"package sample;\n\nimport static java.lang.Thread.sleep;\n\nimport akka.dispatch.verification.Instrumenter;\n\nimport akka.actor.ActorRef;\nimport akka.actor.ScalaActorRef;\nimport akka.actor.Actor;\nimport akka.actor.Props;\nimport akka.actor.ActorCell;\nimport akka.actor.ActorSystem;\nimport akka.actor.ActorContext;\nimport akka.actor.Scheduler;\nimport akka.actor.Cancellable;\nimport akka.actor.LightArrayRevolverScheduler;\n\nimport akka.pattern.AskSupport;\n\nimport akka.dispatch.Envelope;\nimport akka.dispatch.MessageQueue;\nimport akka.dispatch.MessageDispatcher;\n\nimport scala.concurrent.impl.CallbackRunnable;\nimport scala.concurrent.duration.FiniteDuration;\nimport scala.concurrent.ExecutionContext;\nimport java.lang.Runnable;\n\nprivileged public aspect WeaveActor {\n\n  Instrumenter inst = Instrumenter.apply();\n    \n  pointcut enqueueOperation(MessageQueue me, ActorRef receiver, Envelope handle): \n  execution(public * akka.dispatch.MessageQueue.enqueue(ActorRef, Envelope)) &&\n  args(receiver, handle) && this(me);\n  \n  Object around(MessageQueue me, ActorRef receiver, Envelope handle):\n  enqueueOperation(me, receiver, handle) {\n\treturn proceed(me, receiver, handle);\n  }\n  \n  \n  \n  before(ActorCell me, Object msg):\n  execution(* akka.actor.ActorCell.receiveMessage(Object)) &&\n  args(msg, ..) && this(me) {\n\tinst.beforeMessageReceive(me, msg);\n  }\n  \n  after(ActorCell me, Object msg):\n  execution(* akka.actor.ActorCell.receiveMessage(Object)) &&\n  args(msg, ..) && this(me) {\n\tinst.afterMessageReceive(me, msg);\n  }\n\n\n\n  pointcut dispatchOperation(MessageDispatcher me, ActorCell receiver, Envelope handle): \n  execution(* akka.dispatch.MessageDispatcher.dispatch(..)) &&\n  args(receiver, handle, ..) && this(me);\n\n  Object around(MessageDispatcher me, ActorCell receiver, Envelope handle):\n  dispatchOperation(me, receiver, handle) {\n  \tif (inst.aroundDispatch(me, receiver, handle))\n   \t\treturn proceed(me, receiver, handle);\n   \telse\n   \t\treturn null;\n  }\n  \n  \n  after(ActorSystem me, Props props) returning(ActorRef actor):\n  execution(ActorRef akka.actor.ActorSystem.actorOf(Props)) &&\n  args(props) && this(me) {\n  \tinst.new_actor(me, props, actor);\n  }\n  \n  after(ActorSystem me, Props props, String name) returning(ActorRef actor):\n  execution(ActorRef akka.actor.ActorSystem.actorOf(Props, String)) &&\n  args(props, name) && this(me) {\n  \tinst.new_actor(me, props, name, actor);\n  }\n\n\n  \n  after(ActorContext me, Props props) returning(ActorRef actor):\n  execution(ActorRef akka.actor.ActorContext.actorOf(Props)) &&\n  args(props) && this(me) {\n  \tinst.new_actor(me.system(), props, actor);\n  }\n  \n  after(ActorContext me, Props props, String name) returning(ActorRef actor):\n  execution(ActorRef akka.actor.ActorContext.actorOf(Props, String)) &&\n  args(props, name) && this(me) {\n  \tinst.new_actor(me.system(), props, name, actor);\n  }\n\n\n  before(ActorRef me, Object msg, ActorRef sender):\n  execution(* akka.actor.ScalaActorRef.$bang(Object, ActorRef)) &&\n  args(msg, sender) && this(me) {\n  \tinst.tell(me, msg, sender);\n  }\n  \n  before(ActorRef me, Object msg, ActorRef sender):\n  execution(* akka.actor.ActorRef.tell(Object, ActorRef)) &&\n  args(msg, sender, ..) && this(me) {\n  }\n\n  \/\/ Override akka.actor.Scheduler.schedulerOnce\n  pointcut scheduleOnce(LightArrayRevolverScheduler me, FiniteDuration delay, ActorRef receiver, Object msg, ExecutionContext exc, ActorRef sender):\n  execution(public * akka.actor.LightArrayRevolverScheduler.scheduleOnce(FiniteDuration,ActorRef,Object,ExecutionContext,ActorRef)) &&\n  args(delay, receiver, msg, exc, sender) && this(me);\n\n  \/\/ Never actually proceed(), just schedule our own timer, which does not use\n  \/\/ ! directly, but instead calls enqueue_message..\n  Object around(LightArrayRevolverScheduler me, FiniteDuration delay, ActorRef receiver, Object msg, ExecutionContext exc, ActorRef sender):\n  scheduleOnce(me, delay, receiver, msg, exc, sender) {\n    class MyRunnable implements java.lang.Runnable {\n      ActorRef rcv;\n      Object m;\n      Instrumenter i;\n\n      public MyRunnable(ActorRef receiver, Object msg, Instrumenter inst) {\n        rcv = receiver;\n        m = msg;\n        i = inst;\n      }\n\n      public void run() {\n        \/\/ Use essentially the same scheduleOnce implementation, but don't use !\n        \/\/ See:\n        \/\/   https:\/\/github.com\/akka\/akka\/blob\/cb05725c1ec8a09e9bfd57dd093911dd41c7b288\/akka-actor\/src\/main\/scala\/akka\/actor\/Scheduler.scala#L105\n        i.handleTick(rcv, m);\n      }\n    }\n    Cancellable c = me.scheduleOnce(delay, new MyRunnable(receiver, msg, inst), exc);\n    inst.registerCancellable(c);\n\t  return c;\n  }\n\n  \/\/ Override akka.actor.Scheduler.scheduler\n  pointcut schedule(LightArrayRevolverScheduler me, FiniteDuration delay, FiniteDuration interval, ActorRef receiver, Object msg, ExecutionContext exc, ActorRef sender):\n  execution(public * akka.actor.LightArrayRevolverScheduler.schedule(FiniteDuration,FiniteDuration,ActorRef,Object,ExecutionContext,ActorRef)) &&\n  args(delay, interval, receiver, msg, exc, sender) && this(me);\n\n  \/\/ Never actually proceed(), just schedule our own timer, which does not use\n  \/\/ ! directly, but instead calls enqueue_message..\n  Object around(LightArrayRevolverScheduler me, FiniteDuration delay, FiniteDuration interval, ActorRef receiver, Object msg, ExecutionContext exc, ActorRef sender):\n  schedule(me, delay, interval, receiver, msg, exc, sender) {\n    class MyRunnable implements java.lang.Runnable {\n      ActorRef rcv;\n      Object m;\n      Instrumenter i;\n\n      public MyRunnable(ActorRef receiver, Object msg, Instrumenter inst) {\n        rcv = receiver;\n        m = msg;\n        i = inst;\n      }\n\n      public void run() {\n        \/\/ Use essentially the same scheduleOnce implementation, but don't use !\n        \/\/ See:\n        \/\/   https:\/\/github.com\/akka\/akka\/blob\/cb05725c1ec8a09e9bfd57dd093911dd41c7b288\/akka-actor\/src\/main\/scala\/akka\/actor\/Scheduler.scala#L105\n        i.handleTick(rcv, m);\n      }\n    }\n    Cancellable c = me.schedule(delay, interval, new MyRunnable(receiver, msg, inst), exc);\n    inst.registerCancellable(c);\n\t  return c;\n  }\n}\n","old_contents":"package sample;\n\nimport static java.lang.Thread.sleep;\n\nimport akka.dispatch.verification.Instrumenter;\n\nimport akka.actor.ActorRef;\nimport akka.actor.ScalaActorRef;\nimport akka.actor.Actor;\nimport akka.actor.Props;\nimport akka.actor.ActorCell;\nimport akka.actor.ActorSystem;\nimport akka.actor.ActorContext;\nimport akka.actor.Scheduler;\nimport akka.actor.Cancellable;\nimport akka.actor.LightArrayRevolverScheduler;\n\nimport akka.pattern.AskSupport;\n\nimport akka.dispatch.Envelope;\nimport akka.dispatch.MessageQueue;\nimport akka.dispatch.MessageDispatcher;\n\nimport scala.concurrent.impl.CallbackRunnable;\nimport scala.concurrent.duration.FiniteDuration;\nimport scala.concurrent.ExecutionContext;\nimport java.lang.Runnable;\n\nprivileged public aspect WeaveActor {\n\n  Instrumenter inst = Instrumenter.apply();\n    \n  pointcut enqueueOperation(MessageQueue me, ActorRef receiver, Envelope handle): \n  execution(public * akka.dispatch.MessageQueue.enqueue(ActorRef, Envelope)) &&\n  args(receiver, handle) && this(me);\n  \n  Object around(MessageQueue me, ActorRef receiver, Envelope handle):\n  enqueueOperation(me, receiver, handle) {\n\treturn proceed(me, receiver, handle);\n  }\n  \n  \n  \n  before(ActorCell me, Object msg):\n  execution(* akka.actor.ActorCell.receiveMessage(Object)) &&\n  args(msg, ..) && this(me) {\n\tinst.beforeMessageReceive(me, msg);\n  }\n  \n  after(ActorCell me, Object msg):\n  execution(* akka.actor.ActorCell.receiveMessage(Object)) &&\n  args(msg, ..) && this(me) {\n\tinst.afterMessageReceive(me, msg);\n  }\n\n\n\n  pointcut dispatchOperation(MessageDispatcher me, ActorCell receiver, Envelope handle): \n  execution(* akka.dispatch.MessageDispatcher.dispatch(..)) &&\n  args(receiver, handle, ..) && this(me);\n\n  Object around(MessageDispatcher me, ActorCell receiver, Envelope handle):\n  dispatchOperation(me, receiver, handle) {\n  \tif (inst.aroundDispatch(me, receiver, handle))\n   \t\treturn proceed(me, receiver, handle);\n   \telse\n   \t\treturn null;\n  }\n  \n  \n  after(ActorSystem me, Props props) returning(ActorRef actor):\n  execution(ActorRef akka.actor.ActorSystem.actorOf(Props)) &&\n  args(props) && this(me) {\n  \tinst.new_actor(me, props, actor);\n  }\n  \n  after(ActorSystem me, Props props, String name) returning(ActorRef actor):\n  execution(ActorRef akka.actor.ActorSystem.actorOf(Props, String)) &&\n  args(props, name) && this(me) {\n  \tinst.new_actor(me, props, name, actor);\n  }\n\n\n  \n  after(ActorContext me, Props props) returning(ActorRef actor):\n  execution(ActorRef akka.actor.ActorContext.actorOf(Props)) &&\n  args(props) && this(me) {\n  \tinst.new_actor(me.system(), props, actor);\n  }\n  \n  after(ActorContext me, Props props, String name) returning(ActorRef actor):\n  execution(ActorRef akka.actor.ActorContext.actorOf(Props, String)) &&\n  args(props, name) && this(me) {\n  \tinst.new_actor(me.system(), props, name, actor);\n  }\n\n\n  before(ActorRef me, Object msg, ActorRef sender):\n  execution(* akka.actor.ScalaActorRef.$bang(Object, ActorRef)) &&\n  args(msg, sender) && this(me) {\n  \tinst.tell(me, msg, sender);\n  }\n  \n  before(ActorRef me, Object msg, ActorRef sender):\n  execution(* akka.actor.ActorRef.tell(Object, ActorRef)) &&\n  args(msg, sender, ..) && this(me) {\n  }\n\n  \/\/ Override akka.actor.Scheduler.schedulerOnce\n  pointcut scheduleOnce(LightArrayRevolverScheduler me, FiniteDuration delay, ActorRef receiver, Object msg, ExecutionContext exc, ActorRef sender):\n  execution(public * akka.actor.LightArrayRevolverScheduler.scheduleOnce(FiniteDuration,ActorRef,Object,ExecutionContext,ActorRef)) &&\n  args(delay, receiver, msg, exc, sender) && this(me);\n\n  \/\/ Never actually proceed(), just schedule our own timer, which does not use\n  \/\/ ! directly, but instead calls enqueue_message..\n  Object around(LightArrayRevolverScheduler me, FiniteDuration delay, ActorRef receiver, Object msg, ExecutionContext exc, ActorRef sender):\n  scheduleOnce(me, delay, receiver, msg, exc, sender) {\n    class MyRunnable implements java.lang.Runnable {\n      ActorRef rcv;\n      Object m;\n      Instrumenter i;\n\n      public MyRunnable(ActorRef receiver, Object msg, Instrumenter inst) {\n        rcv = receiver;\n        m = msg;\n        i = inst;\n      }\n\n      public void run() {\n        \/\/ Use essentially the same scheduleOnce implementation, but don't use !\n        \/\/ See:\n        \/\/   https:\/\/github.com\/akka\/akka\/blob\/cb05725c1ec8a09e9bfd57dd093911dd41c7b288\/akka-actor\/src\/main\/scala\/akka\/actor\/Scheduler.scala#L105\n        i.handleTick(rcv, m);\n      }\n    }\n    inst.registerCancellable(me.scheduleOnce(delay, new MyRunnable(receiver, msg, inst), exc));\n\t  return null;\n  }\n\n  \/\/ Override akka.actor.Scheduler.scheduler\n  pointcut schedule(LightArrayRevolverScheduler me, FiniteDuration delay, FiniteDuration interval, ActorRef receiver, Object msg, ExecutionContext exc, ActorRef sender):\n  execution(public * akka.actor.LightArrayRevolverScheduler.schedule(FiniteDuration,FiniteDuration,ActorRef,Object,ExecutionContext,ActorRef)) &&\n  args(delay, interval, receiver, msg, exc, sender) && this(me);\n\n  \/\/ Never actually proceed(), just schedule our own timer, which does not use\n  \/\/ ! directly, but instead calls enqueue_message..\n  Object around(LightArrayRevolverScheduler me, FiniteDuration delay, FiniteDuration interval, ActorRef receiver, Object msg, ExecutionContext exc, ActorRef sender):\n  schedule(me, delay, interval, receiver, msg, exc, sender) {\n    class MyRunnable implements java.lang.Runnable {\n      ActorRef rcv;\n      Object m;\n      Instrumenter i;\n\n      public MyRunnable(ActorRef receiver, Object msg, Instrumenter inst) {\n        rcv = receiver;\n        m = msg;\n        i = inst;\n      }\n\n      public void run() {\n        \/\/ Use essentially the same scheduleOnce implementation, but don't use !\n        \/\/ See:\n        \/\/   https:\/\/github.com\/akka\/akka\/blob\/cb05725c1ec8a09e9bfd57dd093911dd41c7b288\/akka-actor\/src\/main\/scala\/akka\/actor\/Scheduler.scala#L105\n        i.handleTick(rcv, m);\n      }\n    }\n    inst.registerCancellable(me.schedule(delay, interval, new MyRunnable(receiver, msg, inst), exc));\n\t  return null;\n  }\n}\n","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"AspectJ"}
{"commit":"dd9e9fed350f702cb5e2cebf32d9dfb1276783cf","subject":"Add missing import.","message":"Add missing import.\n","repos":"archiecobbs\/jsimpledb,tempbottle\/jsimpledb,archiecobbs\/jsimpledb,permazen\/permazen,archiecobbs\/jsimpledb,tempbottle\/jsimpledb,tempbottle\/jsimpledb,permazen\/permazen,permazen\/permazen","old_file":"src\/java\/org\/dellroad\/stuff\/vaadin\/VaadinConfigurableAspect.aj","new_file":"src\/java\/org\/dellroad\/stuff\/vaadin\/VaadinConfigurableAspect.aj","new_contents":"\n\/*\n * Copyright (C) 2011 Archie L. Cobbs. All rights reserved.\n *\n * $Id: SpringContextApplication.java 160 2011-10-24 18:00:49Z archie.cobbs $\n *\/\n\npackage org.dellroad.stuff.vaadin;\n\nimport org.springframework.beans.factory.annotation.Configurable;\nimport org.springframework.beans.factory.aspectj.AbstractInterfaceDrivenDependencyInjectionAspect;\nimport org.springframework.beans.factory.aspectj.ConfigurableObject;\n\n\/**\n * Aspect that autowires classes marked with the Spring's {@link Configurable @Configurable} annotation to a\n * {@link SpringContextApplication} application context.\n *\n * <p>\n * This aspect does the same thing that Spring's {@code AnnotationBeanConfigurerAspect} aspect does,\n * except that this aspect configures beans using the application context associated with the current\n * {@link SpringContextApplication} Vaadin application rather than the one associated with the overall\n * servlet context (i.e., its parent).\n * <\/p>\n *\n * <p>\n * As a result, objects so annotated will be configured for their specific {@link SpringContextApplication}\n * instance, and therefore can only be instantiated by threads associated with a current {@link SpringContextApplication}\n * (see {@link ContextApplication#get}). This will be the case when executing within a {@link SpringContextApplication}\n * Vaadin application HTTP request or an invocation of {@link ContextApplication#invoke} on same.\n * <\/p>\n *\n * <p>\n * This implementation is derived from Spring's {@code AnnotationBeanConfigurerAspect} implementation\n * and therefore shares its license (also Apache).\n * <\/p>\n *\n * @see SpringContextApplication\n * @see ContextApplication#get\n * @see Configurable\n *\/\npublic aspect VaadinConfigurableAspect extends AbstractInterfaceDrivenDependencyInjectionAspect {\n\n\tpublic pointcut inConfigurableBean() : @this(Configurable);\n\n\tpublic pointcut preConstructionConfiguration() : preConstructionConfigurationSupport(*); \n\n\tdeclare parents: @Configurable * implements ConfigurableObject;\n\n    @Override\n\tpublic void configureBean(Object bean) {\n        SpringContextApplication.get().getBeanConfigurerSupport().configureBean(bean);\n    }\n\n\tprivate pointcut preConstructionConfigurationSupport(Configurable c) : @this(c) && if(c.preConstruction());\n}\n\n","old_contents":"\n\/*\n * Copyright (C) 2011 Archie L. Cobbs. All rights reserved.\n *\n * $Id: SpringContextApplication.java 160 2011-10-24 18:00:49Z archie.cobbs $\n *\/\n\npackage org.dellroad.stuff.vaadin;\n\nimport org.springframework.beans.factory.annotation.Configurable;\nimport org.springframework.beans.factory.aspectj.AbstractInterfaceDrivenDependencyInjectionAspect;\n\n\/**\n * Aspect that autowires classes marked with the Spring's {@link Configurable @Configurable} annotation to a\n * {@link SpringContextApplication} application context.\n *\n * <p>\n * This aspect does the same thing that Spring's {@code AnnotationBeanConfigurerAspect} aspect does,\n * except that this aspect configures beans using the application context associated with the current\n * {@link SpringContextApplication} Vaadin application rather than the one associated with the overall\n * servlet context (i.e., its parent).\n * <\/p>\n *\n * <p>\n * As a result, objects so annotated will be configured for their specific {@link SpringContextApplication}\n * instance, and therefore can only be instantiated by threads associated with a current {@link SpringContextApplication}\n * (see {@link ContextApplication#get}). This will be the case when executing within a {@link SpringContextApplication}\n * Vaadin application HTTP request or an invocation of {@link ContextApplication#invoke} on same.\n * <\/p>\n *\n * <p>\n * This implementation is derived from Spring's {@code AnnotationBeanConfigurerAspect} implementation\n * and therefore shares its license (also Apache).\n * <\/p>\n *\n * @see SpringContextApplication\n * @see ContextApplication#get\n * @see Configurable\n *\/\npublic aspect VaadinConfigurableAspect extends AbstractInterfaceDrivenDependencyInjectionAspect {\n\n\tpublic pointcut inConfigurableBean() : @this(Configurable);\n\n\tpublic pointcut preConstructionConfiguration() : preConstructionConfigurationSupport(*); \n\n\tdeclare parents: @Configurable * implements ConfigurableObject;\n\n    @Override\n\tpublic void configureBean(Object bean) {\n        SpringContextApplication.get().getBeanConfigurerSupport().configureBean(bean);\n    }\n\n\tprivate pointcut preConstructionConfigurationSupport(Configurable c) : @this(c) && if(c.preConstruction());\n}\n\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"d649b192b123e3856d6a727d02bc8bbdfc6cf86c","subject":"XSKINX-43 Compatibility mapping to support skin file extensions move\/rename with backward compatibility","message":"XSKINX-43 Compatibility mapping to support skin file extensions move\/rename with backward compatibility\n\nFixed missing reference to JIRA issue for the fullScreen script rename\/move\n\n\ngit-svn-id: ace560153e38297b711cbd4c8e91a836d3f7586e@32593 f329d543-caf0-0310-9063-dda96c69346f\n","repos":"pbondoer\/xwiki-platform,pbondoer\/xwiki-platform,pbondoer\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,xwiki\/xwiki-platform,xwiki\/xwiki-platform","old_file":"xwiki-platform-skinx\/src\/main\/aspect\/compatibility\/com\/xpn\/xwiki\/plugin\/skinx\/SkinFileExtensionPluginApiCompatibilityAspect.aj","new_file":"xwiki-platform-skinx\/src\/main\/aspect\/compatibility\/com\/xpn\/xwiki\/plugin\/skinx\/SkinFileExtensionPluginApiCompatibilityAspect.aj","new_contents":"\/*\n * See the NOTICE file distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This is free software; you can redistribute it and\/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF site: http:\/\/www.fsf.org.\n *\/\npackage com.xpn.xwiki.plugin.skinx;\n\nimport java.text.MessageFormat;\nimport java.util.HashMap;\nimport java.util.Map;\n\nimport org.apache.log4j.Logger;\n\n\/**\n * Add a backward compatibility layer to the {@link com.xpn.xwiki.plugin.skinx.SkinFileExtensionPluginApi} class.\n * \n * @version $Id$\n *\/\npublic aspect SkinFileExtensionPluginApiCompatibilityAspect\n{\n    \/**\n     * Compatibility mapping that associates a deprecated resource file to its new relative path\n     *\/\n    private static Map<String, String> compatibilityMap = new HashMap<String, String>();\n\n    static {\n        \/\/ fullScreen script has been moved and renamed in XWiki 2.6RC2 \/ 2.7M1 See XWIKI-5659\n        compatibilityMap.put(\"js\/xwiki\/editors\/fullScreenEdit.js\", \"uicomponents\/widgets\/fullScreen.js\");\n        compatibilityMap.put(\"js\/xwiki\/editors\/fullScreenEdit.css\", \"uicomponents\/widgets\/fullScreen.css\");\n    }\n\n    \/**\n     * Pointcut that catches all skin file extensions \"use\" join points.\n     *\/\n    private pointcut sfxUse(String path) : execution(void SkinFileExtensionPluginApi.use(..)) && args(path, ..);\n\n    \/**\n     * Advice around skin file extensions \"use\" join points, that checks if the requested file is declared in the map of\n     * deprecated extensions paths. If it is, it logs a warning message in the console, and calls the skin extension\n     * plugin with the new path, declared in the map.\n     *\/\n    void around(String path): sfxUse(path)\n    {\n        if (compatibilityMap.containsKey(path)) {\n\n            Logger logger = Logger.getLogger(thisJoinPoint.getSignature().getDeclaringType());\n            logger.warn(MessageFormat.format(\n                \"Skin file extension with path [{0}] is deprecated. Please use [{1}] instead.\", new Object[] {path,\n                    compatibilityMap.get(path)}));\n\n            proceed(compatibilityMap.get(path));\n        }\n\n        proceed(path);\n    }\n}\n","old_contents":"\/*\n * See the NOTICE file distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This is free software; you can redistribute it and\/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF site: http:\/\/www.fsf.org.\n *\/\npackage com.xpn.xwiki.plugin.skinx;\n\nimport java.text.MessageFormat;\nimport java.util.HashMap;\nimport java.util.Map;\n\nimport org.apache.log4j.Logger;\n\n\/**\n * Add a backward compatibility layer to the {@link com.xpn.xwiki.plugin.skinx.SkinFileExtensionPluginApi} class.\n * \n * @version $Id$\n *\/\npublic aspect SkinFileExtensionPluginApiCompatibilityAspect\n{\n    \/**\n     * Compatibility mapping that associates a deprecated resource file to its new relative path\n     *\/\n    private static Map<String, String> compatibilityMap = new HashMap<String, String>();\n\n    static {\n        \/\/ fullScreen script has been moved and renamed in XWiki 2.6RC2 \/ 2.7M1 See   \n        compatibilityMap.put(\"js\/xwiki\/editors\/fullScreenEdit.js\", \"uicomponents\/widgets\/fullScreen.js\");\n        compatibilityMap.put(\"js\/xwiki\/editors\/fullScreenEdit.css\", \"uicomponents\/widgets\/fullScreen.css\");\n    }\n\n    \/**\n     * Pointcut that catches all skin file extensions \"use\" join points.\n     *\/\n    private pointcut sfxUse(String path) : execution(void SkinFileExtensionPluginApi.use(..)) && args(path, ..);\n\n    \/**\n     * Advice around skin file extensions \"use\" join points, that checks if the requested file is declared in the map of\n     * deprecated extensions paths. If it is, it logs a warning message in the console, and calls the skin extension\n     * plugin with the new path, declared in the map.\n     *\/\n    void around(String path): sfxUse(path)\n    {\n        if (compatibilityMap.containsKey(path)) {\n\n            Logger logger = Logger.getLogger(thisJoinPoint.getSignature().getDeclaringType());\n            logger.warn(MessageFormat.format(\n                \"Skin file extension with path [{0}] is deprecated. Please use [{1}] instead.\", new Object[] {path,\n                    compatibilityMap.get(path)}));\n\n            proceed(compatibilityMap.get(path));\n        }\n\n        proceed(path);\n    }\n}\n","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"db16bb8d47b0abf6a174633ac1c3163fd821f6b1","subject":"added license header","message":"added license header\n","repos":"palava\/palava-jta","old_file":"src\/main\/java\/de\/cosmocode\/palava\/jta\/AbstractUserTransactionAspect.aj","new_file":"src\/main\/java\/de\/cosmocode\/palava\/jta\/AbstractUserTransactionAspect.aj","new_contents":"\/**\n * palava - a java-php-bridge\n * Copyright (C) 2007-2010  CosmoCode GmbH\n *\n * This program is free software; you can redistribute it and\/or\n * modify it under the terms of the GNU General Public License\n * as published by the Free Software Foundation; either version 2\n * of the License, or (at your option) any later version.\n *\n * This program is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n * along with this program; if not, write to the Free Software\n * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n * MA  02110-1301, USA.\n *\/\n\npackage de.cosmocode.palava.jta;\n\nimport javax.transaction.Status;\nimport javax.transaction.UserTransaction;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\n\npublic abstract aspect AbstractUserTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(AbstractUserTransactionAspect.class);\n\n    private Provider<UserTransaction> provider;\n    \n    @Inject\n    void setProvider(Provider<UserTransaction> provider) {\n        this.provider = Preconditions.checkNotNull(provider, \"Provider\");\n    }\n    \n    protected abstract pointcut transactional();\n    \n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around() throws Exception: transactional() {\n        final UserTransaction tx = provider.get();\n        LOG.trace(\"Using transaction {}\", tx);\n        final boolean localTx = tx.getStatus() == Status.STATUS_NO_TRANSACTION;\n\n        if (localTx) {\n            LOG.trace(\"Beginning automatic transaction\");\n            tx.begin();\n        } else {\n            LOG.trace(\"Transaction already active\");\n        }\n\n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (RuntimeException e) {\n            LOG.error(\"Exception inside automatic transaction context\", e);\n            tx.rollback();\n            throw e;\n        }\n        \n        try {\n            if (localTx && tx.getStatus() == Status.STATUS_ACTIVE) {\n                tx.commit();\n                LOG.trace(\"Committed automatic transaction\");\n            }\n            return returnValue;\n        } catch (Exception e) {\n            LOG.error(\"Commit in automatic transaction context failed\", e);\n            tx.rollback();\n            throw e;\n        }\n    }\n    \n}\n","old_contents":"package de.cosmocode.palava.jta;\n\nimport javax.transaction.Status;\nimport javax.transaction.UserTransaction;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\n\npublic abstract aspect AbstractUserTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(AbstractUserTransactionAspect.class);\n\n    private Provider<UserTransaction> provider;\n    \n    @Inject\n    void setProvider(Provider<UserTransaction> provider) {\n        this.provider = Preconditions.checkNotNull(provider, \"Provider\");\n    }\n    \n    protected abstract pointcut transactional();\n    \n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around() throws Exception: transactional() {\n        final UserTransaction tx = provider.get();\n        LOG.trace(\"Using transaction {}\", tx);\n        final boolean localTx = tx.getStatus() == Status.STATUS_NO_TRANSACTION;\n\n        if (localTx) {\n            LOG.trace(\"Beginning automatic transaction\");\n            tx.begin();\n        } else {\n            LOG.trace(\"Transaction already active\");\n        }\n\n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (RuntimeException e) {\n            LOG.error(\"Exception inside automatic transaction context\", e);\n            tx.rollback();\n            throw e;\n        }\n        \n        try {\n            if (localTx && tx.getStatus() == Status.STATUS_ACTIVE) {\n                tx.commit();\n                LOG.trace(\"Committed automatic transaction\");\n            }\n            return returnValue;\n        } catch (Exception e) {\n            LOG.error(\"Commit in automatic transaction context failed\", e);\n            tx.rollback();\n            throw e;\n        }\n    }\n    \n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"a22dce2043e477627666cf9e18ba77590637f1e5","subject":"warning fixes","message":"warning fixes\n\nSigned-off-by: Ketoth Xupack <2ff7bd69a79a23dbf64ebd5846a612566f93fbf7@gmail.com>\n","repos":"no-hope\/java-toolkit,no-hope\/java-toolkit,no-hope\/java-toolkit,no-hope\/java-toolkit","old_file":"projects\/jsr305-aspectj-validation\/src\/main\/java\/org\/nohope\/validation\/NotNullAspect.aj","new_file":"projects\/jsr305-aspectj-validation\/src\/main\/java\/org\/nohope\/validation\/NotNullAspect.aj","new_contents":"package org.nohope.validation;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.aspectj.lang.reflect.MethodSignature;\n\nimport javax.annotation.Nonnull;\nimport javax.annotation.meta.When;\nimport java.lang.annotation.Annotation;\nimport java.lang.reflect.Method;\n\n@SuppressWarnings({\n        \"StringBufferReplaceableByString\",\n        \"UtilityClassWithoutPrivateConstructor\"\n})\npublic final aspect NotNullAspect {\n\n    \/\/ searches for all methods have at last one parameter annotated with @Nonnull\n    pointcut nonNullParameter():\n            execution(* *.*(.., @javax.annotation.Nonnull (*), ..));\n\n    \/\/ searches for all methods which returns any reference type and annotated with @Nonnull\n    pointcut validatedReturnValue():\n            execution(@javax.annotation.Nonnull Object+ *.*(..));\n\n    @SuppressAjWarnings\n    after() returning(final Object ret): validatedReturnValue() {\n        final MethodSignature sig = (MethodSignature) thisJoinPoint.getSignature();\n        if (ret == null) {\n            throw new IllegalStateException(new StringBuilder(\"@Nonnull method \")\n                    .append(toString(sig))\n                    .append(\" must not return null\")\n                    .toString()\n            );\n        }\n    }\n\n    @SuppressAjWarnings\n    before(): nonNullParameter() {\n        final MethodSignature sig = (MethodSignature) thisJoinPoint.getSignature();\n        final Method method = sig.getMethod();\n        final Annotation[][] annotations = method.getParameterAnnotations();\n\n        int i = 1;\n        for (final Object obj : thisJoinPoint.getArgs()) {\n            Nonnull a = null;\n            for (Annotation annotation : annotations[i - 1]) {\n                if (annotation instanceof Nonnull) {\n                    a = (Nonnull) annotation;\n                    break;\n                }\n            }\n\n            if (obj == null && a != null && a.when() == When.ALWAYS) {\n                throw new IllegalArgumentException(new StringBuilder(\"Argument \")\n                        .append(i)\n                        .append(\" for @Nonnull parameter of \")\n                        .append(toString(sig))\n                        .append(\" must not be null\")\n                        .toString()\n                );\n            }\n            i++;\n        }\n    }\n\n    private static StringBuilder toString(final MethodSignature sig) {\n        final Method method = sig.getMethod();\n        final Class[] args = method.getParameterTypes();\n        final StringBuilder builder = new StringBuilder();\n        builder.append('\\'')\n               .append(method.getReturnType().getSimpleName())\n               .append(\" \")\n               .append(sig.getDeclaringType().getCanonicalName())\n               .append('.')\n               .append(method.getName())\n               .append('(');\n        boolean started = true;\n        for (final Class arg : args) {\n            if (!started) {\n                builder.append(\", \");\n            } else {\n                started = false;\n            }\n            builder.append(arg.getCanonicalName());\n        }\n        builder.append(\")'\");\n        return builder;\n    }\n}\n","old_contents":"package org.nohope.validation;\n\nimport org.aspectj.lang.reflect.MethodSignature;\n\nimport javax.annotation.Nonnull;\nimport javax.annotation.meta.When;\nimport java.lang.annotation.Annotation;\nimport java.lang.reflect.Method;\n\n@SuppressWarnings({\n        \"StringBufferReplaceableByString\",\n        \"UtilityClassWithoutPrivateConstructor\"\n})\npublic final aspect NotNullAspect {\n\n    \/\/ searches for all methods have at last one parameter annotated with @Nonnull\n    pointcut nonNullParameter():\n            execution(* *.*(.., @javax.annotation.Nonnull (*), ..));\n\n    \/\/ searches for all methods which returns any reference type and annotated with @Nonnull\n    pointcut validatedReturnValue():\n            execution(@javax.annotation.Nonnull Object+ *.*(..));\n\n    after() returning(final Object ret): validatedReturnValue() {\n        final MethodSignature sig = (MethodSignature) thisJoinPoint.getSignature();\n        if (ret == null) {\n            throw new IllegalStateException(new StringBuilder(\"@Nonnull method \")\n                    .append(toString(sig))\n                    .append(\" must not return null\")\n                    .toString()\n            );\n        }\n    }\n\n    before(): nonNullParameter() {\n        final MethodSignature sig = (MethodSignature) thisJoinPoint.getSignature();\n        final Method method = sig.getMethod();\n        final Annotation[][] annotations = method.getParameterAnnotations();\n\n        int i = 1;\n        for (final Object obj : thisJoinPoint.getArgs()) {\n            Nonnull a = null;\n            for (Annotation annotation : annotations[i - 1]) {\n                if (annotation instanceof Nonnull) {\n                    a = (Nonnull) annotation;\n                    break;\n                }\n            }\n\n            if (obj == null && a != null && a.when() == When.ALWAYS) {\n                throw new IllegalArgumentException(new StringBuilder(\"Argument \")\n                        .append(i)\n                        .append(\" for @Nonnull parameter of \")\n                        .append(toString(sig))\n                        .append(\" must not be null\")\n                        .toString()\n                );\n            }\n            i++;\n        }\n    }\n\n    private static StringBuilder toString(final MethodSignature sig) {\n        final Method method = sig.getMethod();\n        final Class[] args = method.getParameterTypes();\n        final StringBuilder builder = new StringBuilder();\n        builder.append('\\'')\n               .append(method.getReturnType().getSimpleName())\n               .append(\" \")\n               .append(sig.getDeclaringType().getCanonicalName())\n               .append('.')\n               .append(method.getName())\n               .append('(');\n        boolean started = true;\n        for (final Class arg : args) {\n            if (!started) {\n                builder.append(\", \");\n            } else {\n                started = false;\n            }\n            builder.append(arg.getCanonicalName());\n        }\n        builder.append(\")'\");\n        return builder;\n    }\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"6b8b6562fb29b6de4baf96ee9d30ed03d840edd7","subject":"inspections","message":"inspections\n\nSigned-off-by: Ketoth Xupack <2ff7bd69a79a23dbf64ebd5846a612566f93fbf7@gmail.com>\n","repos":"no-hope\/java-toolkit,no-hope\/java-toolkit,no-hope\/java-toolkit,no-hope\/java-toolkit","old_file":"projects\/jsr305-aspectj-validation\/src\/main\/java\/org\/nohope\/validation\/NotNullAspect.aj","new_file":"projects\/jsr305-aspectj-validation\/src\/main\/java\/org\/nohope\/validation\/NotNullAspect.aj","new_contents":"package org.nohope.validation;\n\nimport org.aspectj.lang.Signature;\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.aspectj.lang.reflect.ConstructorSignature;\nimport org.aspectj.lang.reflect.MethodSignature;\n\nimport javax.annotation.Nonnull;\nimport javax.annotation.meta.When;\nimport java.lang.annotation.Annotation;\nimport java.lang.reflect.Constructor;\nimport java.lang.reflect.Method;\nimport java.util.Map;\nimport java.util.concurrent.ConcurrentHashMap;\n\npublic final privileged aspect NotNullAspect {\n    private static final Map<Constructor, MethodCache> constructorCache = new ConcurrentHashMap<>();\n    private static final Map<Method, MethodCache> methodCache = new ConcurrentHashMap<>();\n\n    \/** Utility constructor. *\/\n    private NotNullAspect() {\n    }\n\n    pointcut thisAdvice(): adviceexecution() && within(NotNullAspect);\n\n    \/**\n     * matches all constructors with at last one parameter\n     * marked with @Nonnull annotation\n     *\/\n    pointcut nonNullConstructorParameters():\n            execution(new(.., @javax.annotation.Nonnull (*), ..))\n            && !cflow(thisAdvice())\n            ;\n\n    \/**\n     * searches for all methods have at last one parameter\n     * annotated with @Nonnull\n     *\/\n    pointcut nonNullMethodParameters():\n            execution(* *.*(.., @javax.annotation.Nonnull (*), ..))\n            && !cflow(thisAdvice())\n            ;\n\n    \/**\n     * searches for all methods which returns any reference type and\n     * annotated with @Nonnull\n     *\/\n    static pointcut validatedReturnValue():\n            execution(@javax.annotation.Nonnull (Object+) *.*(..))\n            && !cflow(thisAdvice())\n            ;\n\n    @SuppressAjWarnings\n    after() returning(final Object ret): validatedReturnValue() {\n        final MethodSignature sig = (MethodSignature) thisJoinPoint.getStaticPart().getSignature();\n        if (ret == null) {\n            throw new IllegalStateException(\"@Nonnull method \"\n                    + toString(sig.getMethod())\n                    + \" must not return null\");\n        }\n    }\n\n    @SuppressAjWarnings\n    before(): nonNullMethodParameters() || nonNullConstructorParameters() {\n        final Signature signature = thisJoinPoint.getStaticPart().getSignature();\n        final MethodCache cache;\n\n        if (signature instanceof MethodSignature) {\n            final MethodSignature sig = (MethodSignature) thisJoinPoint.getStaticPart().getSignature();\n            final Method method = sig.getMethod();\n            cache = getCached(method);\n        } else if (signature instanceof ConstructorSignature) {\n            final ConstructorSignature sig = (ConstructorSignature) signature;\n            final Constructor method = sig.getConstructor();\n            cache = getCached(method);\n        } else {\n            throw new IllegalStateException(\"Illegal advice for \" + signature.getClass());\n        }\n\n        final Object[] args = thisJoinPoint.getArgs();\n        final int constructorDiff = args.length - cache.params.length;\n        for (int j = constructorDiff; j < args.length; j++) {\n            final Object obj = args[j];\n            Nonnull a = null;\n            for (Annotation annotation : cache.params[j - constructorDiff]) {\n                if (annotation instanceof Nonnull) {\n                    a = (Nonnull) annotation;\n                    break;\n                }\n            }\n\n            if (obj == null && a != null && a.when() == When.ALWAYS) {\n                throw new IllegalArgumentException(\"Argument \"\n                        + (j - constructorDiff + 1)\n                        + \" for @Nonnull parameter of \"\n                        + cache.message\n                        + \" must not be null\"\n                );\n            }\n        }\n    }\n\n    private static MethodCache getCached(final Method method) {\n        MethodCache result = methodCache.get(method);\n        if (result == null) {\n            result = new MethodCache(NotNullAspect.toString(method),\n                    method.getParameterAnnotations());\n            methodCache.put(method, result);\n        }\n        return result;\n    }\n\n    private static MethodCache getCached(final Constructor constructor) {\n        MethodCache result = constructorCache.get(constructor);\n        if (result == null) {\n            result = new MethodCache(NotNullAspect.toString(constructor),\n                    constructor.getParameterAnnotations());\n            constructorCache.put(constructor, result);\n        }\n        return result;\n    }\n\n    private static String toString(final Constructor method) {\n        final Class[] args = method.getParameterTypes();\n        String builder = '\\''\n                + method.getName()\n                + '('\n                ;\n        boolean started = true;\n        for (final Class arg : args) {\n            if (!started) {\n                builder += \", \";\n            } else {\n                started = false;\n            }\n            builder = arg.getCanonicalName();\n        }\n        builder = \")'\";\n        return builder;\n    }\n\n    private static String toString(final Method method) {\n        final Class[] args = method.getParameterTypes();\n        String builder = '\\''\n                + method.getReturnType().getSimpleName()\n                +  \" \"\n                + method.getDeclaringClass().getCanonicalName()\n                + '.'\n                + method.getName()\n                + '('\n                ;\n        boolean started = true;\n        for (final Class arg : args) {\n            if (!started) {\n                builder += \", \";\n            } else {\n                started = false;\n            }\n            builder += arg.getCanonicalName();\n        }\n        builder += \")'\";\n        return builder;\n    }\n\n    private static final class MethodCache {\n        private final String message;\n        private final Annotation[][] params;\n\n        private MethodCache(final String message, final Annotation[][] params) {\n            this.message = message;\n            this.params = params;\n        }\n    }\n}\n","old_contents":"package org.nohope.validation;\n\nimport org.aspectj.lang.Signature;\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.aspectj.lang.reflect.ConstructorSignature;\nimport org.aspectj.lang.reflect.MethodSignature;\n\nimport javax.annotation.Nonnull;\nimport javax.annotation.meta.When;\nimport java.lang.annotation.Annotation;\nimport java.lang.reflect.Constructor;\nimport java.lang.reflect.Method;\nimport java.util.Map;\nimport java.util.concurrent.ConcurrentHashMap;\n\npublic final privileged aspect NotNullAspect {\n    private static final Map<Constructor, MethodCache> constructorCache = new ConcurrentHashMap<>();\n    private static final Map<Method, MethodCache> methodCache = new ConcurrentHashMap<>();\n\n    \/** Utility constructor. *\/\n    private NotNullAspect() {\n    }\n\n    pointcut thisAdvice(): adviceexecution() && within(NotNullAspect);\n\n    \/**\n     * matches all constructors with at last one parameter\n     * marked with @Nonnull annotation\n     *\/\n    pointcut nonNullConstructorParameters():\n            execution(new(.., @javax.annotation.Nonnull (*), ..))\n            && !cflow(thisAdvice())\n            ;\n\n    \/**\n     * searches for all methods have at last one parameter\n     * annotated with @Nonnull\n     *\/\n    pointcut nonNullMethodParameters():\n            execution(* *.*(.., @javax.annotation.Nonnull (*), ..))\n            && !cflow(thisAdvice())\n            ;\n\n    \/**\n     * searches for all methods which returns any reference type and\n     * annotated with @Nonnull\n     *\/\n    static pointcut validatedReturnValue():\n            execution(@javax.annotation.Nonnull (Object+) *.*(..))\n            && !cflow(thisAdvice())\n            ;\n\n    @SuppressAjWarnings\n    after() returning(final Object ret): validatedReturnValue() {\n        final MethodSignature sig = (MethodSignature) thisJoinPoint.getStaticPart().getSignature();\n        if (ret == null) {\n            throw new IllegalStateException(\"@Nonnull method \"\n                    + toString(sig.getMethod())\n                    + \" must not return null\");\n        }\n    }\n\n    @SuppressAjWarnings\n    before(): nonNullMethodParameters() || nonNullConstructorParameters() {\n        final Signature signature = thisJoinPoint.getStaticPart().getSignature();\n        final MethodCache cache;\n\n        if (signature instanceof MethodSignature) {\n            final MethodSignature sig = (MethodSignature) thisJoinPoint.getStaticPart().getSignature();\n            final Method method = sig.getMethod();\n            cache = getCached(method);\n        } else if (signature instanceof ConstructorSignature) {\n            final ConstructorSignature sig = (ConstructorSignature) signature;\n            final Constructor method = sig.getConstructor();\n            cache = getCached(method);\n        } else {\n            throw new IllegalStateException(\"Illegal advice for \" + signature.getClass());\n        }\n\n        final Object[] args = thisJoinPoint.getArgs();\n        final int constructorDiff = args.length - cache.params.length;\n        for (int j = constructorDiff; j < args.length; j++) {\n            final Object obj = args[j];\n            Nonnull a = null;\n            for (Annotation annotation : cache.params[j - constructorDiff]) {\n                if (annotation instanceof Nonnull) {\n                    a = (Nonnull) annotation;\n                    break;\n                }\n            }\n\n            if (obj == null && a != null && a.when() == When.ALWAYS) {\n                throw new IllegalArgumentException(\"Argument \"\n                        + (j - constructorDiff + 1)\n                        + \" for @Nonnull parameter of \"\n                        + cache.message\n                        + \" must not be null\"\n                );\n            }\n        }\n    }\n\n    private static MethodCache getCached(final Method method) {\n        MethodCache result = methodCache.get(method);\n        if (result == null) {\n            result = new MethodCache(NotNullAspect.toString(method),\n                    method.getParameterAnnotations());\n            methodCache.put(method, result);\n        }\n        return result;\n    }\n\n    private static MethodCache getCached(final Constructor constructor) {\n        MethodCache result = constructorCache.get(constructor);\n        if (result == null) {\n            result = new MethodCache(NotNullAspect.toString(constructor),\n                    constructor.getParameterAnnotations());\n            constructorCache.put(constructor, result);\n        }\n        return result;\n    }\n\n    private static String toString(final Constructor method) {\n        final Class[] args = method.getParameterTypes();\n        String builder = '\\''\n                + method.getName()\n                + '('\n                ;\n        boolean started = true;\n        for (final Class arg : args) {\n            if (!started) {\n                builder += \", \";\n            } else {\n                started = false;\n            }\n            builder = arg.getCanonicalName();\n        }\n        builder = \")'\";\n        return builder;\n    }\n\n    private static String toString(final Method method) {\n        final Class[] args = method.getParameterTypes();\n        String builder = '\\''\n                + method.getReturnType().getSimpleName()\n                +  \" \"\n                + method.getDeclaringClass().getCanonicalName()\n                + '.'\n                + method.getName()\n                + '('\n                ;\n        boolean started = true;\n        for (final Class arg : args) {\n            if (!started) {\n                builder += \", \";\n            } else {\n                started = false;\n            }\n            builder += arg.getCanonicalName();\n        }\n        builder += \")'\";\n        return builder;\n    }\n\n    private static class MethodCache {\n        private final String message;\n        private final Annotation[][] params;\n\n        private MethodCache(final String message, final Annotation[][] params) {\n            this.message = message;\n            this.params = params;\n        }\n    }\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"ae0cf7e3c0b83dba7024f7e6f84a3ffc57e69d15","subject":"SPR-2199","message":"SPR-2199\n\n\ngit-svn-id: b619a0c99665f88f1afe72824344cefe9a1c8c90@10875 fd5a2b45-1f63-4059-99e9-3c7cb7fd75c8\n","repos":"cbeams-archive\/spring-framework-2.5.x,cbeams-archive\/spring-framework-2.5.x,cbeams-archive\/spring-framework-2.5.x,cbeams-archive\/spring-framework-2.5.x","old_file":"aspectj\/src\/org\/springframework\/transaction\/aspectj\/AbstractTransactionAspect.aj","new_file":"aspectj\/src\/org\/springframework\/transaction\/aspectj\/AbstractTransactionAspect.aj","new_contents":"\/*\n * Copyright 2002-2005 the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.springframework.transaction.aspectj;\n\nimport java.lang.reflect.Method;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.aspectj.lang.reflect.MethodSignature;\nimport org.springframework.transaction.interceptor.TransactionAspectSupport;\nimport org.springframework.transaction.interceptor.TransactionAttributeSource;\n\n\/**\n * Abstract superaspect for AspectJ transaction aspects. Concrete\n * subaspects will implement the <code>transactionalMethodExecution()<\/code>\n * pointcut using a strategy such as Java 5 annotations.\n *\n * <p>Suitable for use inside or outside the Spring IoC container.\n * Set the \"transactionManager\" property appropriately, allowing\n * use of any transaction implementation supported by Spring.\n *\n * <p><b>NB:<\/b> If a method implements an interface that is itself\n * transactionally annotated, the relevant Spring transaction attribute\n * will <i>not<\/i> be resolved. This behavior will vary from that of Spring AOP\n * if proxying an interface (but not when proxying a class). We recommend that\n * transaction annotations should be added to classes, rather than business\n * interfaces, as they are an implementation detail rather than a contract\n * specification validation.\n *\n * @author Rod Johnson\n * @author Ramnivas Laddad\n * @since 2.0\n *\/\npublic abstract aspect AbstractTransactionAspect extends TransactionAspectSupport {\n\t\n\t\/**\n\t * Construct object using the given transaction metadata retrieval strategy.\n\t * @param tas TransactionAttributeSource implementation, retrieving Spring\n\t * transaction metadata for each joinpoint. Write the subclass to pass in null\n\t * if it's intended to be configured by Setter Injection.\n\t *\/\n\tprotected AbstractTransactionAspect(TransactionAttributeSource tas) {\n\t\tsetTransactionAttributeSource(tas);\n\t}\n\t\n\t@SuppressAjWarnings(\"adviceDidNotMatch\")\n\tbefore(Object txObject) : transactionalMethodExecution(txObject) {\n\t\tMethodSignature methodSignature = (MethodSignature) thisJoinPoint.getSignature();\n\t\tMethod method = methodSignature.getMethod();\n\t\t\/\/  Create transaction if necessary.\n\t\tTransactionInfo txInfo = createTransactionIfNecessary(method, txObject.getClass());\n\t\tif (logger.isDebugEnabled()) {\n\t\t\tlogger.debug(\"Aspect-created transaction: \" + txInfo);\n\t\t}\n\t}\n\t\n\t@SuppressAjWarnings(\"adviceDidNotMatch\")\n\tafter(Object txObject) throwing(Throwable t) : transactionalMethodExecution(txObject) {\n    try {\n      doCloseTransactionAfterThrowing(TransactionAspectSupport.currentTransactionInfo(), t);\n    }\n    catch (Throwable th) {\n      logger.error(\"Failed to close transaction after throwing in a Transactional method\", th);\n    }\n  }\n\t\n\t@SuppressAjWarnings(\"adviceDidNotMatch\")\n\tafter(Object txObject) returning() : transactionalMethodExecution(txObject) {\n\t\tdoCommitTransactionAfterReturning(TransactionAspectSupport.currentTransactionInfo());\n\t}\n\t\n\t@SuppressAjWarnings(\"adviceDidNotMatch\")\n\tafter(Object txObject) : transactionalMethodExecution(txObject) {\n\t\tdoFinally(TransactionAspectSupport.currentTransactionInfo());\n\t}\n\n\n\t\/\/ TODO extend TransactionAttributeSource to support join points besides methods\n\n\t\/**\n\t * Concrete subaspects must implement this pointcut, to identify\n\t * transactional methods. For each selected joinpoint, TransactionMetadata\n\t * will be retrieved using Spring's TransactionAttributeSource interface.\n\t *\/\n\tprotected abstract pointcut transactionalMethodExecution(Object txObject);\n\n}\n","old_contents":"\/*\n * Copyright 2002-2005 the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.springframework.transaction.aspectj;\n\nimport java.lang.reflect.Method;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.aspectj.lang.reflect.MethodSignature;\nimport org.springframework.transaction.interceptor.TransactionAspectSupport;\nimport org.springframework.transaction.interceptor.TransactionAttributeSource;\n\n\/**\n * Abstract superaspect for AspectJ transaction aspects. Concrete\n * subaspects will implement the <code>transactionalMethodExecution()<\/code>\n * pointcut using a strategy such as Java 5 annotations.\n *\n * <p>Suitable for use inside or outside the Spring IoC container.\n * Set the \"transactionManager\" property appropriately, allowing\n * use of any transaction implementation supported by Spring.\n *\n * <p><b>NB:<\/b> If a method implements an interface that is itself\n * transactionally annotated, the relevant Spring transaction attribute\n * will <i>not<\/i> be resolved. This behavior will vary from that of Spring AOP\n * if proxying an interface (but not when proxying a class). We recommend that\n * transaction annotations should be added to classes, rather than business\n * interfaces, as they are an implementation detail rather than a contract\n * specification validation.\n *\n * @author Rod Johnson\n * @author Ramnivas Laddad\n * @since 2.0\n *\/\npublic abstract aspect AbstractTransactionAspect extends TransactionAspectSupport {\n\t\n\t\/**\n\t * Construct object using the given transaction metadata retrieval strategy.\n\t * @param tas TransactionAttributeSource implementation, retrieving Spring\n\t * transaction metadata for each joinpoint. Write the subclass to pass in null\n\t * if it's intended to be configured by Setter Injection.\n\t *\/\n\tprotected AbstractTransactionAspect(TransactionAttributeSource tas) {\n\t\tsetTransactionAttributeSource(tas);\n\t}\n\t\n\t@SuppressAjWarnings(\"adviceDidNotMatch\")\n\tbefore(Object txObject) : transactionalMethodExecution(txObject) {\n\t\tMethodSignature methodSignature = (MethodSignature) thisJoinPoint.getSignature();\n\t\tMethod method = methodSignature.getMethod();\n\t\t\/\/  Create transaction if necessary.\n\t\tTransactionInfo txInfo = createTransactionIfNecessary(method, txObject.getClass());\n\t\tif (logger.isDebugEnabled()) {\n\t\t\tlogger.debug(\"Aspect-created transaction: \" + txInfo);\n\t\t}\n\t}\n\t\n\t@SuppressAjWarnings(\"adviceDidNotMatch\")\n\tafter(Object txObject) throwing(Throwable t) : transactionalMethodExecution(txObject) {\n\t\tdoCloseTransactionAfterThrowing(TransactionAspectSupport.currentTransactionInfo(), t);\n\t}\n\t\n\t@SuppressAjWarnings(\"adviceDidNotMatch\")\n\tafter(Object txObject) returning() : transactionalMethodExecution(txObject) {\n\t\tdoCommitTransactionAfterReturning(TransactionAspectSupport.currentTransactionInfo());\n\t}\n\t\n\t@SuppressAjWarnings(\"adviceDidNotMatch\")\n\tafter(Object txObject) : transactionalMethodExecution(txObject) {\n\t\tdoFinally(TransactionAspectSupport.currentTransactionInfo());\n\t}\n\n\n\t\/\/ TODO extend TransactionAttributeSource to support join points besides methods\n\n\t\/**\n\t * Concrete subaspects must implement this pointcut, to identify\n\t * transactional methods. For each selected joinpoint, TransactionMetadata\n\t * will be retrieved using Spring's TransactionAttributeSource interface.\n\t *\/\n\tprotected abstract pointcut transactionalMethodExecution(Object txObject);\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"8461990362eb7312f2501310a78c052b3bdf3e10","subject":"fix the bean initialization eror","message":"fix the bean initialization eror\n","repos":"inbloom\/secure-data-service,inbloom\/secure-data-service,inbloom\/secure-data-service,inbloom\/secure-data-service,inbloom\/secure-data-service","old_file":"sli\/ingestion\/ingestion-core\/src\/main\/java\/org\/slc\/sli\/aspect\/LoggerCarrierAspect.aj","new_file":"sli\/ingestion\/ingestion-core\/src\/main\/java\/org\/slc\/sli\/aspect\/LoggerCarrierAspect.aj","new_contents":"package org.slc.sli.aspect;\n\nimport java.util.HashMap;\nimport java.util.Map;\n\nimport org.slf4j.LoggerFactory;\nimport org.springframework.beans.factory.annotation.Value;\nimport org.springframework.data.mongodb.core.CollectionOptions;\nimport org.springframework.data.mongodb.core.MongoTemplate;\nimport org.slc.sli.domain.Entity;\nimport org.slc.sli.domain.Repository;\nimport org.slc.sli.dal.repository.MongoRepository;\n\nimport org.slc.sli.common.util.logging.SecurityEvent;\nimport org.slc.sli.common.util.logging.LoggerCarrier;\n\nimport com.mongodb.BasicDBObject;\nimport com.mongodb.DBObject;\n\npublic aspect LoggerCarrierAspect {\n\tdeclare parents : (org.slc.sli.ingestion..* &&\n            !java.lang.Enum+)  implements LoggerCarrier;\n    \n    private Repository<Entity> entityRepository;\n    \n\/\/    private MongoTemplate template;\n    \n\/\/    public MongoTemplate getTemplate() {\n\/\/    \treturn template;\n\/\/    }\n    \n\/\/    public void setTemplate(MongoTemplate template) {\n\/\/    \tthis.template = template;\n\/\/    }\n    \n    \n    @Value(\"${sli.ingestion.securityEvent.capSize}\")\n    private String capSize;\n    \n    public void LoggerCarrier.audit(SecurityEvent event) {\n        MongoRepository<Entity> mer = (MongoRepository<Entity>) LoggerCarrierAspect.aspectOf().getEntityRepository();\n        if (mer != null) {\n            MongoTemplate mongoTemplate = mer.getTemplate();\n            String capSizeStr = LoggerCarrierAspect.aspectOf().getCapSize();\n            \n            if (capSizeStr != null && !capSizeStr.isEmpty()) {\n                int capSizeInt = Integer.parseInt(capSizeStr);\n                \/\/ UN: If the collection is not present, create the capped collection.\n                \/\/ However, if it is present and uncapped, change it to capped collection\n                \/\/ 496 bytes is size of 1 security event document * capsize ~ the size that we want.\n                if (!mongoTemplate.collectionExists(\"securityEvent\")) {\n                    CollectionOptions collectionOptions = new CollectionOptions(capSizeInt * 496, capSizeInt, true);\n                    mongoTemplate.createCollection(\"securityEvent\", collectionOptions);\n                } else {\n                    if (!mongoTemplate.getCollection(\"securityEvent\").isCapped()) {\n                        DBObject cmd = new BasicDBObject();\n                        cmd.put(\"convertToCapped\", \"securityEvent\");\n                        cmd.put(\"size\", capSizeInt * 496);\n                        mongoTemplate.getDb().command(cmd);\n                    }\n                }\n            }\n            \n            Map<String, Object> metadata = new HashMap<String, Object>();\n            metadata.put(\"tenantId\", event.getTenantId());\n            mer.create(\"securityEvent\", event.getProperties(), metadata, \"securityEvent\");\n        } else {\n            LoggerFactory.getLogger(\"SecurityMonitor\").info(\"[Could not log SecurityEvent to mongo!]\");\n        }\n        \n        switch (event.getLogLevel()) {\n            case TYPE_DEBUG:\n                LoggerFactory.getLogger(\"SecurityMonitor\").debug(event.toString());\n                break;\n            \n            case TYPE_WARN:\n                LoggerFactory.getLogger(\"SecurityMonitor\").warn(event.toString());\n                break;\n            \n            case TYPE_INFO:\n                LoggerFactory.getLogger(\"SecurityMonitor\").info(event.toString());\n                break;\n            \n            case TYPE_ERROR:\n                LoggerFactory.getLogger(\"SecurityMonitor\").error(event.toString());\n                break;\n            \n            case TYPE_TRACE:\n                LoggerFactory.getLogger(\"SecurityMonitor\").trace(event.toString());\n                break;\n            \n            default:\n                LoggerFactory.getLogger(\"SecurityMonitor\").info(event.toString());\n                break;\n        }\n    }\n\n    public Repository<Entity> getEntityRepository() {\n        return entityRepository;\n    }\n    \n    public void setEntityRepository(Repository<Entity> entityRepository) {\n        this.entityRepository = entityRepository;\n    }\n\n    public String getCapSize() {\n        return capSize;\n    }\n    \n    public void setCapSize(String capSize) {\n        this.capSize = capSize;\n    }\n    \n}\n","old_contents":"package org.slc.sli.aspect;\n\nimport java.util.HashMap;\nimport java.util.Map;\n\nimport org.slf4j.LoggerFactory;\nimport org.springframework.beans.factory.annotation.Value;\nimport org.springframework.data.mongodb.core.CollectionOptions;\nimport org.springframework.data.mongodb.core.MongoTemplate;\nimport org.slc.sli.domain.Entity;\nimport org.slc.sli.domain.Repository;\nimport org.slc.sli.dal.repository.MongoRepository;\n\nimport org.slc.sli.common.util.logging.SecurityEvent;\nimport org.slc.sli.common.util.logging.LoggerCarrier;\n\nimport com.mongodb.BasicDBObject;\nimport com.mongodb.DBObject;\n\npublic aspect LoggerCarrierAspect {\n\tdeclare parents : (org.slc.sli.ingestion..* &&\n            !java.lang.Enum+)  implements LoggerCarrier;\n    \n    private Repository<Entity> entityRepository;\n    \n    private MongoTemplate template;\n    \n    public MongoTemplate getTemplate() {\n    \treturn template;\n    }\n    \n    public void setTemplate(MongoTemplate template) {\n    \tthis.template = template;\n    }\n    \n    \n    @Value(\"${sli.ingestion.securityEvent.capSize}\")\n    private String capSize;\n    \n    public void LoggerCarrier.audit(SecurityEvent event) {\n        MongoRepository<Entity> mer = (MongoRepository<Entity>) LoggerCarrierAspect.aspectOf().getEntityRepository();\n        if (mer != null) {\n            MongoTemplate mongoTemplate = mer.getTemplate();\n            String capSizeStr = LoggerCarrierAspect.aspectOf().getCapSize();\n            \n            if (capSizeStr != null && !capSizeStr.isEmpty()) {\n                int capSizeInt = Integer.parseInt(capSizeStr);\n                \/\/ UN: If the collection is not present, create the capped collection.\n                \/\/ However, if it is present and uncapped, change it to capped collection\n                \/\/ 496 bytes is size of 1 security event document * capsize ~ the size that we want.\n                if (!mongoTemplate.collectionExists(\"securityEvent\")) {\n                    CollectionOptions collectionOptions = new CollectionOptions(capSizeInt * 496, capSizeInt, true);\n                    mongoTemplate.createCollection(\"securityEvent\", collectionOptions);\n                } else {\n                    if (!mongoTemplate.getCollection(\"securityEvent\").isCapped()) {\n                        DBObject cmd = new BasicDBObject();\n                        cmd.put(\"convertToCapped\", \"securityEvent\");\n                        cmd.put(\"size\", capSizeInt * 496);\n                        mongoTemplate.getDb().command(cmd);\n                    }\n                }\n            }\n            \n            Map<String, Object> metadata = new HashMap<String, Object>();\n            metadata.put(\"tenantId\", event.getTenantId());\n            mer.create(\"securityEvent\", event.getProperties(), metadata, \"securityEvent\");\n        } else {\n            LoggerFactory.getLogger(\"SecurityMonitor\").info(\"[Could not log SecurityEvent to mongo!]\");\n        }\n        \n        switch (event.getLogLevel()) {\n            case TYPE_DEBUG:\n                LoggerFactory.getLogger(\"SecurityMonitor\").debug(event.toString());\n                break;\n            \n            case TYPE_WARN:\n                LoggerFactory.getLogger(\"SecurityMonitor\").warn(event.toString());\n                break;\n            \n            case TYPE_INFO:\n                LoggerFactory.getLogger(\"SecurityMonitor\").info(event.toString());\n                break;\n            \n            case TYPE_ERROR:\n                LoggerFactory.getLogger(\"SecurityMonitor\").error(event.toString());\n                break;\n            \n            case TYPE_TRACE:\n                LoggerFactory.getLogger(\"SecurityMonitor\").trace(event.toString());\n                break;\n            \n            default:\n                LoggerFactory.getLogger(\"SecurityMonitor\").info(event.toString());\n                break;\n        }\n    }\n\n    public Repository<Entity> getEntityRepository() {\n        return entityRepository;\n    }\n    \n    public void setEntityRepository(Repository<Entity> entityRepository) {\n        this.entityRepository = entityRepository;\n    }\n\n    public String getCapSize() {\n        return capSize;\n    }\n    \n    public void setCapSize(String capSize) {\n        this.capSize = capSize;\n    }\n    \n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"c9abc49ea86a6ea3c108aec8b79d75606f8f8285","subject":"Catch object registration exception when its done more than one time","message":"Catch object registration exception when its done more than one time\n","repos":"leotizzei\/PublicHealthComplaintAO_01,leotizzei\/PublicHealthComplaintAO_01","old_file":"src\/publichealthcomplaint\/distribution\/aspects\/AAServerDistribution.aj","new_file":"src\/publichealthcomplaint\/distribution\/aspects\/AAServerDistribution.aj","new_contents":"package publichealthcomplaint.distribution.aspects;\n\nimport java.rmi.server.UnicastRemoteObject;\n\nimport javax.servlet.http.HttpServletRequest;\n\n\nimport publichealthcomplaint.datatypes.Constants;\nimport publichealthcomplaint.rmiconnector.HealthWatcherFacade;\n\npublic abstract aspect AAServerDistribution {\n\n\n\n\tpublic abstract pointcut registering();\n\n\n\tpublic abstract pointcut callRequest(HttpServletRequest request);\n\n\n\tbefore(): registering(){ \n\n\t\ttry {\n\t\t\tSystem.out.println(\"Creating RMI server...\");\n\n\t\t\tString remoteObjectName = new String(\"\/\/\" + Constants.SERVER_NAME + \"\/\"+ Constants.SYSTEM_NAME);\n\t\t\tboolean objectIsAlreadyBinded = false;\n\n\t\t\tString[] bindedList = java.rmi.Naming.list(\"\/\/\" + Constants.SERVER_NAME + \"\/\"\t+ Constants.SYSTEM_NAME);\n\n\t\t\tSystem.out.println(\"[AAServerDistribution:callRequest()] object \"+ remoteObjectName +\" is not bind yet\");\n\n\t\t\tHealthWatcherFacade adapter = HealthWatcherFacade.getInstance();\n\t\t\t\n\t\t\t\/\/begin debug\n\t\t\tif(adapter == null)\n\t\t\t\tSystem.out.println(\"[AAServerDistribution:registering()] adapter is null\");\n\t\t\telse\n\t\t\t\tSystem.out.println(\"[AAServerDistribution:registering()] adapter = \"+adapter);\n\t\t\t\/\/end debug\n\t\t\t\n\t\t\ttry\n\t\t\t{\n\t\t\t\tUnicastRemoteObject.exportObject(adapter);\n\t\t\t}\n\t\t\tcatch (java.rmi.RemoteException rmiEx)\n\t\t\t{\n\t\t\t\t\/\/ object already exported \n\t\t\t}\n\t\t\t\n\t\t\t\n\t\t\tSystem.out.println(\"[AAServerDistribution:registering()]  Object \"+ adapter.getClass().getName() +\" exported\");\n\t\t\tjava.rmi.Naming.rebind(\"\/\/\" + Constants.SERVER_NAME + \"\/\"\n\t\t\t\t\t+ Constants.SYSTEM_NAME, adapter);\n\t\t\tSystem.out.println(\"[AAServerDistribution:registering()]  Server created and ready.\");\n\n\n\n\t\t}   catch (java.rmi.RemoteException rmiEx) {\n\t\t\tSystem.err.println(\"[AAServerDistribution:registering()] \"+rmiEx.getLocalizedMessage());\n\t\t\trmiEx.printStackTrace();\n\t\t\trmiFacadeExceptionHandling(rmiEx);\n\t\t} catch (java.net.MalformedURLException rmiEx) {\n\t\t\tSystem.err.println(\"[AAServerDistribution:registering()] \"+rmiEx.getLocalizedMessage());\n\t\t\trmiEx.printStackTrace();\n\t\t\trmiFacadeExceptionHandling(rmiEx);\n\t\t}\n\t}\n\n\t\/**\n\t * Compare the strings which represent the remote object in order to check if the object is already binded\n\t * @param remoteObjectCandidate\n\t * @param alreadyBindedObject\n\t * @return\n\t *\/\n\tprivate boolean isAlreadyBinded(String remoteObjectCandidate, String alreadyBindedObject){\n\t\tif( remoteObjectCandidate == null || alreadyBindedObject == null )\n\t\t\treturn false;\n\n\t\tString canditateName = extractObjectName(remoteObjectCandidate);\n\t\tString objBinded = extractObjectName(alreadyBindedObject);\n\n\t\tSystem.out.println(canditateName+\" == \"+objBinded);\n\t\tif( canditateName.equals(objBinded))\n\t\t\treturn true;\n\t\telse\n\t\t\treturn false;\n\n\t}\n\n\t\/\/get the name of the object that is the substring after the last '\/'\n\tprivate String extractObjectName(String fullPath){\n\t\tif( ( fullPath != null) && ( fullPath.contains(\"\/\") ) ){\n\t\t\tString[] aux = fullPath.split(\"\/\");\n\t\t\tif( aux != null ){\n\t\t\t\tint length = aux.length;\n\t\t\t\tString nameBinded = aux[ length - 1 ];\n\t\t\t\treturn nameBinded;\n\t\t\t}\n\t\t}\n\t\treturn null;\n\t}\n\n\n\n\tprivate void rmiFacadeExceptionHandling(Throwable exception) {\n\t\tSystem.out.println(\"**************************************************\");\n\t\tSystem.out.println(\"* Error during server initialization!            *\");\n\t\tSystem.out.println(\"* The exception message is:                      *\");\n\t\tSystem.out.println(\"      \" + exception.getMessage()                   );\n\t\tSystem.out.println(\"* You may have to restart the server or registry.*\");\n\t\tSystem.out.println(\"**************************************************\");\n\t\texception.printStackTrace();\n\t}\n}\n","old_contents":"package publichealthcomplaint.distribution.aspects;\n\nimport java.rmi.server.UnicastRemoteObject;\n\nimport javax.servlet.http.HttpServletRequest;\n\n\nimport publichealthcomplaint.datatypes.Constants;\nimport publichealthcomplaint.rmiconnector.HealthWatcherFacade;\n\npublic abstract aspect AAServerDistribution {\n\n\n\n\tpublic abstract pointcut registering();\n\n\n\tpublic abstract pointcut callRequest(HttpServletRequest request);\n\n\n\tbefore(): registering(){ \n\n\t\ttry {\n\t\t\tSystem.out.println(\"Creating RMI server...\");\n\n\t\t\tString remoteObjectName = new String(\"\/\/\" + Constants.SERVER_NAME + \"\/\"+ Constants.SYSTEM_NAME);\n\t\t\tboolean objectIsAlreadyBinded = false;\n\n\t\t\tString[] bindedList = java.rmi.Naming.list(\"\/\/\" + Constants.SERVER_NAME + \"\/\"\t+ Constants.SYSTEM_NAME);\n\n\t\t\tSystem.out.println(\"[AAServerDistribution:callRequest()] object \"+ remoteObjectName +\" is not bind yet\");\n\n\t\t\tHealthWatcherFacade adapter = HealthWatcherFacade.getInstance();\n\t\t\t\n\t\t\t\/\/begin debug\n\t\t\tif(adapter == null)\n\t\t\t\tSystem.out.println(\"[AAServerDistribution:registering()] adapter is null\");\n\t\t\telse\n\t\t\t\tSystem.out.println(\"[AAServerDistribution:registering()] adapter = \"+adapter);\n\t\t\t\/\/end debug\n\t\t\t\n\t\t\t\n\t\t\tUnicastRemoteObject.exportObject(adapter);\n\t\t\tSystem.out.println(\"[AAServerDistribution:registering()]  Object \"+ adapter.getClass().getName() +\" exported\");\n\t\t\tjava.rmi.Naming.rebind(\"\/\/\" + Constants.SERVER_NAME + \"\/\"\n\t\t\t\t\t+ Constants.SYSTEM_NAME, adapter);\n\t\t\tSystem.out.println(\"[AAServerDistribution:registering()]  Server created and ready.\");\n\n\n\n\t\t}   catch (java.rmi.RemoteException rmiEx) {\n\t\t\tSystem.err.println(\"[AAServerDistribution:registering()] \"+rmiEx.getLocalizedMessage());\n\t\t\trmiEx.printStackTrace();\n\t\t\trmiFacadeExceptionHandling(rmiEx);\n\t\t} catch (java.net.MalformedURLException rmiEx) {\n\t\t\tSystem.err.println(\"[AAServerDistribution:registering()] \"+rmiEx.getLocalizedMessage());\n\t\t\trmiEx.printStackTrace();\n\t\t\trmiFacadeExceptionHandling(rmiEx);\n\t\t}\n\t}\n\n\t\/**\n\t * Compare the strings which represent the remote object in order to check if the object is already binded\n\t * @param remoteObjectCandidate\n\t * @param alreadyBindedObject\n\t * @return\n\t *\/\n\tprivate boolean isAlreadyBinded(String remoteObjectCandidate, String alreadyBindedObject){\n\t\tif( remoteObjectCandidate == null || alreadyBindedObject == null )\n\t\t\treturn false;\n\n\t\tString canditateName = extractObjectName(remoteObjectCandidate);\n\t\tString objBinded = extractObjectName(alreadyBindedObject);\n\n\t\tSystem.out.println(canditateName+\" == \"+objBinded);\n\t\tif( canditateName.equals(objBinded))\n\t\t\treturn true;\n\t\telse\n\t\t\treturn false;\n\n\t}\n\n\t\/\/get the name of the object that is the substring after the last '\/'\n\tprivate String extractObjectName(String fullPath){\n\t\tif( ( fullPath != null) && ( fullPath.contains(\"\/\") ) ){\n\t\t\tString[] aux = fullPath.split(\"\/\");\n\t\t\tif( aux != null ){\n\t\t\t\tint length = aux.length;\n\t\t\t\tString nameBinded = aux[ length - 1 ];\n\t\t\t\treturn nameBinded;\n\t\t\t}\n\t\t}\n\t\treturn null;\n\t}\n\n\n\n\tprivate void rmiFacadeExceptionHandling(Throwable exception) {\n\t\tSystem.out.println(\"**************************************************\");\n\t\tSystem.out.println(\"* Error during server initialization!            *\");\n\t\tSystem.out.println(\"* The exception message is:                      *\");\n\t\tSystem.out.println(\"      \" + exception.getMessage()                   );\n\t\tSystem.out.println(\"* You may have to restart the server or registry.*\");\n\t\tSystem.out.println(\"**************************************************\");\n\t\texception.printStackTrace();\n\t}\n}\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"2553fb8ba1cef72d594032149befd02a56300f8a","subject":"Apply ListenableFuture support to AspectJ","message":"Apply ListenableFuture support to AspectJ\n\nPrior to this commit, only @Async annotated methods with proxy style\nhad an explicit support for ListenableFuture. This commit brings that\nsupport to AspectJ as well.\n\nIssue: SPR-12092\n","repos":"spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework","old_file":"spring-aspects\/src\/main\/java\/org\/springframework\/scheduling\/aspectj\/AbstractAsyncExecutionAspect.aj","new_file":"spring-aspects\/src\/main\/java\/org\/springframework\/scheduling\/aspectj\/AbstractAsyncExecutionAspect.aj","new_contents":"\/*\n * Copyright 2002-2014 the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.springframework.scheduling.aspectj;\n\nimport java.util.concurrent.Callable;\nimport java.util.concurrent.Executor;\nimport java.util.concurrent.Future;\n\nimport org.aspectj.lang.reflect.MethodSignature;\n\nimport org.springframework.aop.interceptor.AsyncExecutionAspectSupport;\nimport org.springframework.core.task.AsyncListenableTaskExecutor;\nimport org.springframework.core.task.AsyncTaskExecutor;\nimport org.springframework.util.concurrent.ListenableFuture;\n\n\/**\n * Abstract aspect that routes selected methods asynchronously.\n *\n * <p>This aspect needs to be injected with an implementation of\n * {@link Executor} to activate it for a specific thread pool.\n * Otherwise it will simply delegate all calls synchronously.\n *\n * @author Ramnivas Laddad\n * @author Juergen Hoeller\n * @author Chris Beams\n * @author Stephane Nicoll\n * @since 3.0.5\n *\/\npublic abstract aspect AbstractAsyncExecutionAspect extends AsyncExecutionAspectSupport {\n\n\t\/**\n\t * Create an {@code AnnotationAsyncExecutionAspect} with a {@code null} default\n\t * executor, which should instead be set via {@code #aspectOf} and\n\t * {@link #setExecutor(Executor)}. The same applies for {@link #setExceptionHandler}\n\t *\/\n\tpublic AbstractAsyncExecutionAspect() {\n\t\tsuper(null);\n\t}\n\n\t\/**\n\t * Apply around advice to methods matching the {@link #asyncMethod()} pointcut,\n\t * submit the actual calling of the method to the correct task executor and return\n\t * immediately to the caller.\n\t * @return {@link Future} if the original method returns {@code Future}; {@code null}\n\t * otherwise.\n\t *\/\n\tObject around() : asyncMethod() {\n\t\tfinal MethodSignature methodSignature = (MethodSignature) thisJoinPointStaticPart.getSignature();\n\t\tAsyncTaskExecutor executor = determineAsyncExecutor(methodSignature.getMethod());\n\t\tif (executor == null) {\n\t\t\treturn proceed();\n\t\t}\n\t\tCallable<Object> callable = new Callable<Object>() {\n\t\t\tpublic Object call() throws Exception {\n\t\t\t\ttry {\n\t\t\t\t\tObject result = proceed();\n\t\t\t\t\tif (result instanceof Future) {\n\t\t\t\t\t\treturn ((Future<?>) result).get();\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\tcatch (Throwable ex) {\n\t\t\t\t\thandleError(ex, methodSignature.getMethod(), thisJoinPoint.getArgs());\n\t\t\t\t}\n\t\t\t\treturn null;\n\t\t\t}};\n\n\t\tClass<?> returnType = methodSignature.getReturnType();\n\t\tif (ListenableFuture.class.isAssignableFrom(returnType)) {\n\t\t\treturn ((AsyncListenableTaskExecutor) executor).submitListenable(callable);\n\t\t}\n\t\telse if (Future.class.isAssignableFrom(returnType)) {\n\t\t\treturn executor.submit(callable);\n\t\t}\n\t\telse {\n\t\t\texecutor.submit(callable);\n\t\t\treturn null;\n\t\t}\n\t}\n\n\t\/**\n\t * Return the set of joinpoints at which async advice should be applied.\n\t *\/\n\tpublic abstract pointcut asyncMethod();\n\n}\n","old_contents":"\/*\n * Copyright 2002-2014 the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.springframework.scheduling.aspectj;\n\nimport java.util.concurrent.Callable;\nimport java.util.concurrent.Executor;\nimport java.util.concurrent.Future;\n\nimport org.aspectj.lang.reflect.MethodSignature;\n\nimport org.springframework.aop.interceptor.AsyncExecutionAspectSupport;\nimport org.springframework.core.task.AsyncTaskExecutor;\n\n\/**\n * Abstract aspect that routes selected methods asynchronously.\n *\n * <p>This aspect needs to be injected with an implementation of\n * {@link Executor} to activate it for a specific thread pool.\n * Otherwise it will simply delegate all calls synchronously.\n *\n * @author Ramnivas Laddad\n * @author Juergen Hoeller\n * @author Chris Beams\n * @author Stephane Nicoll\n * @since 3.0.5\n *\/\npublic abstract aspect AbstractAsyncExecutionAspect extends AsyncExecutionAspectSupport {\n\n\t\/**\n\t * Create an {@code AnnotationAsyncExecutionAspect} with a {@code null} default\n\t * executor, which should instead be set via {@code #aspectOf} and\n\t * {@link #setExecutor(Executor)}. The same applies for {@link #setExceptionHandler}\n\t *\/\n\tpublic AbstractAsyncExecutionAspect() {\n\t\tsuper(null);\n\t}\n\n\t\/**\n\t * Apply around advice to methods matching the {@link #asyncMethod()} pointcut,\n\t * submit the actual calling of the method to the correct task executor and return\n\t * immediately to the caller.\n\t * @return {@link Future} if the original method returns {@code Future}; {@code null}\n\t * otherwise.\n\t *\/\n\tObject around() : asyncMethod() {\n\t\tfinal MethodSignature methodSignature = (MethodSignature) thisJoinPointStaticPart.getSignature();\n\t\tAsyncTaskExecutor executor = determineAsyncExecutor(methodSignature.getMethod());\n\t\tif (executor == null) {\n\t\t\treturn proceed();\n\t\t}\n\t\tCallable<Object> callable = new Callable<Object>() {\n\t\t\tpublic Object call() throws Exception {\n\t\t\t\ttry {\n\t\t\t\t\tObject result = proceed();\n\t\t\t\t\tif (result instanceof Future) {\n\t\t\t\t\t\treturn ((Future<?>) result).get();\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\tcatch (Throwable ex) {\n\t\t\t\t\thandleError(ex, methodSignature.getMethod(), thisJoinPoint.getArgs());\n\t\t\t\t}\n\t\t\t\treturn null;\n\t\t\t}};\n\t\tFuture<?> result = executor.submit(callable);\n\t\tif (Future.class.isAssignableFrom(methodSignature.getReturnType())) {\n\t\t\treturn result;\n\t\t}\n\t\telse {\n\t\t\treturn null;\n\t\t}\n\t}\n\n\t\/**\n\t * Return the set of joinpoints at which async advice should be applied.\n\t *\/\n\tpublic abstract pointcut asyncMethod();\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"f2fc46733200b808b856339494bc1e643c0b84fc","subject":"Fixed #2553.","message":"Fixed #2553.\n\ngit-svn-id: f4ecfe233223879a4a16cd7937f11b5152963d8e@19496 5e8d7ff9-d8ef-0310-90f0-a4852d11357a\n","repos":"scala-ide\/scala-ide,wpopielarski\/scala-ide,dragos\/scala-ide,andrey-ilinykh\/scala-ide,andrey-ilinykh\/scala-ide,andrey-ilinykh\/scala-ide,aleksi-lukkarinen\/scala-ide,pilipolio\/scala-ide,stephenh\/scala-ide,dragos\/scala-ide,dragos\/scala-ide,pilipolio\/scala-ide,aleksi-lukkarinen\/scala-ide,dragos\/scala-ide,stephenh\/scala-ide,Kwestor\/scala-ide,mlangc\/scala-ide,Duhemm\/scala-ide,stephenh\/scala-ide,sschaef\/scala-ide,mlangc\/scala-ide,wpopielarski\/scala-ide,aleksi-lukkarinen\/scala-ide,Kwestor\/scala-ide,mlangc\/scala-ide,Kwestor\/scala-ide,romanowski\/scala-ide,Duhemm\/scala-ide,pilipolio\/scala-ide,Duhemm\/scala-ide,romanowski\/scala-ide,scala-ide\/scala-ide,andrey-ilinykh\/scala-ide,pilipolio\/scala-ide,sschaef\/scala-ide,scala-ide\/scala-ide,mlangc\/scala-ide,wpopielarski\/scala-ide,sschaef\/scala-ide,romanowski\/scala-ide,sschaef\/scala-ide,wpopielarski\/scala-ide,scala-ide\/scala-ide,stephenh\/scala-ide,romanowski\/scala-ide,Kwestor\/scala-ide,aleksi-lukkarinen\/scala-ide,Duhemm\/scala-ide","old_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/core\/DOMAspect.aj","new_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/core\/DOMAspect.aj","new_contents":"\/*\n * Copyright 2005-2009 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.core;\n\nimport java.util.Locale;\nimport java.util.Map;\n\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.core.ICompilationUnit;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.core.dom.AST;\nimport org.eclipse.jdt.core.dom.ASTNode;\nimport org.eclipse.jdt.core.dom.ASTParser;\nimport org.eclipse.jdt.internal.compiler.CompilationResult;\nimport org.eclipse.jdt.internal.compiler.DefaultErrorHandlingPolicies;\nimport org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.AbstractVariableDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;\nimport org.eclipse.jdt.internal.compiler.env.AccessRestriction;\nimport org.eclipse.jdt.internal.compiler.env.IBinaryType;\nimport org.eclipse.jdt.internal.compiler.env.INameEnvironment;\nimport org.eclipse.jdt.internal.compiler.env.ISourceType;\nimport org.eclipse.jdt.internal.compiler.impl.CompilerOptions;\nimport org.eclipse.jdt.internal.compiler.impl.ITypeRequestor;\nimport org.eclipse.jdt.internal.compiler.lookup.LookupEnvironment;\nimport org.eclipse.jdt.internal.compiler.lookup.PackageBinding;\nimport org.eclipse.jdt.internal.compiler.parser.SourceTypeConverter;\nimport org.eclipse.jdt.internal.compiler.problem.DefaultProblemFactory;\nimport org.eclipse.jdt.internal.compiler.problem.ProblemReporter;\nimport org.eclipse.jdt.internal.core.DefaultWorkingCopyOwner;\nimport org.eclipse.jdt.internal.core.JavaProject;\nimport org.eclipse.jdt.internal.core.SourceType;\nimport org.eclipse.jdt.internal.core.SourceTypeElementInfo;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaCompilationUnit;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect DOMAspect {\n  pointcut internalCreateAST(ASTParser parser, IProgressMonitor monitor) :\n    execution(ASTNode ASTParser.internalCreateAST(IProgressMonitor)) &&\n    args(monitor) &&\n    target(parser);\n  \n  ASTNode around(ASTParser parser, IProgressMonitor monitor) :\n    internalCreateAST(parser, monitor) {\n    try {\n      if (!(parser.typeRoot instanceof IScalaCompilationUnit))\n        return proceed(parser, monitor);\n      \n      ICompilationUnit cu = (ICompilationUnit)parser.typeRoot;\n      org.eclipse.jdt.internal.compiler.env.ICompilationUnit sourceUnit = (org.eclipse.jdt.internal.compiler.env.ICompilationUnit)cu;\n      \n      IType[] topLevelTypes = cu.getTypes();\n      int length = topLevelTypes.length;\n      if (length == 0)\n        throw new IllegalStateException();\n      \n      SourceTypeElementInfo[] topLevelInfos = new SourceTypeElementInfo[length];\n      for (int i = 0; i < length; i++) {\n        topLevelInfos[i] = (SourceTypeElementInfo) ((SourceType)topLevelTypes[i]).getElementInfo();\n      }\n      char[] fileName = ((ISourceType)topLevelInfos[0]).getFileName();\n      \n      CompilationResult result = new CompilationResult(fileName, 1, 1, 100);\n\n      JavaProject javaProject = (JavaProject)cu.getJavaProject(); \n      Map compilerOptions0 = javaProject.getOptions(true);\n      CompilerOptions compilerOptions = new CompilerOptions(compilerOptions0);\n      compilerOptions.storeAnnotations = true;\n      \n      ProblemReporter problemReporter =\n        new ProblemReporter(\n          DefaultErrorHandlingPolicies.proceedWithAllProblems(),\n          compilerOptions,\n          new DefaultProblemFactory(Locale.getDefault()));\n      \n      int flags = SourceTypeConverter.FIELD_AND_METHOD | SourceTypeConverter.MEMBER_TYPE;\n      \n      CompilationUnitDeclaration unit =\n        SourceTypeConverter.buildCompilationUnit(topLevelInfos, flags, problemReporter, result);\n      \n      INameEnvironment ne = javaProject.newSearchableNameEnvironment(DefaultWorkingCopyOwner.PRIMARY);\n      final LookupEnvironment le = new LookupEnvironment(null, compilerOptions, problemReporter, ne);\n      ITypeRequestor typeRequestor = new ITypeRequestor() {\n        public void accept(IBinaryType binaryType, PackageBinding packageBinding, AccessRestriction accessRestriction) {\n          le.createBinaryTypeFrom(binaryType, packageBinding, accessRestriction);\n        }\n        public void accept(org.eclipse.jdt.internal.compiler.env.ICompilationUnit unit, AccessRestriction accessRestriction) {}\n        public void accept(ISourceType[] sourceType, PackageBinding packageBinding, AccessRestriction accessRestriction) {}\n      };\n      le.typeRequestor = typeRequestor;\n      \n      le.buildTypeBindings(unit, null);\n      le.completeTypeBindings();\n      fixTypes(unit.types);\n      \n      AST ast = AST.newAST(AST.JLS3);\n      ast.setFlag(AST.RESOLVED_BINDINGS);\n      ast.setDefaultNodeFlag(ASTNode.ORIGINAL);\n\n      org.eclipse.jdt.core.dom.ASTConverter converter =\n        new org.eclipse.jdt.core.dom.ASTConverter(compilerOptions0, true, monitor);\n      \n      org.eclipse.jdt.core.dom.BindingResolver resolver =\n        new org.eclipse.jdt.core.dom.DefaultBindingResolver(\n          unit.scope,\n          DefaultWorkingCopyOwner.PRIMARY,\n          new org.eclipse.jdt.core.dom.DefaultBindingResolver.BindingTables(),\n          true);\n      ast.setBindingResolver(resolver);\n      converter.setAST(ast);\n      \n      ASTNode node = converter.convert(unit, sourceUnit.getContents());\n      return node;\n    } catch (JavaModelException ex) {\n      throw new IllegalArgumentException(ex);\n    }\n  }\n  \n  private void fixTypes(TypeDeclaration[] types) {\n    for(int i = 0, iLimit = types.length; i < iLimit ; ++i) {\n      TypeDeclaration tpe = types[i];\n      tpe.binding.getAnnotationTagBits();\n      tpe.scope.buildFields();\n      tpe.scope.buildMethods();\n      fixFields(tpe.fields);\n      fixMethods(tpe.methods);\n      fixTypes(tpe.memberTypes);\n    }\n  }\n  \n  private void fixMethods(AbstractMethodDeclaration[] methods) {\n    if (methods == null)\n      return;\n    \n    for(int i = 0, iLimit = methods.length; i < iLimit; ++i) {\n      AbstractMethodDeclaration m = methods[i];\n      m.bodyStart = m.declarationSourceStart;\n      m.bodyEnd = m.declarationSourceEnd;\n      m.binding.getAnnotationTagBits();\n    }\n  }\n  \n  private void fixFields(AbstractVariableDeclaration[] fields) {\n    if (fields == null)\n      return;\n    \n    for(int i = 0, iLimit = fields.length; i < iLimit; ++i) {\n      AbstractVariableDeclaration f = fields[i];\n      f.declarationEnd = f.declarationSourceEnd;\n    }\n  }\n}\n","old_contents":"\/*\n * Copyright 2005-2009 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.core;\n\nimport java.util.Locale;\nimport java.util.Map;\n\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.core.ICompilationUnit;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.core.dom.AST;\nimport org.eclipse.jdt.core.dom.ASTNode;\nimport org.eclipse.jdt.core.dom.ASTParser;\nimport org.eclipse.jdt.internal.compiler.CompilationResult;\nimport org.eclipse.jdt.internal.compiler.DefaultErrorHandlingPolicies;\nimport org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;\nimport org.eclipse.jdt.internal.compiler.env.AccessRestriction;\nimport org.eclipse.jdt.internal.compiler.env.IBinaryType;\nimport org.eclipse.jdt.internal.compiler.env.INameEnvironment;\nimport org.eclipse.jdt.internal.compiler.env.ISourceType;\nimport org.eclipse.jdt.internal.compiler.impl.CompilerOptions;\nimport org.eclipse.jdt.internal.compiler.impl.ITypeRequestor;\nimport org.eclipse.jdt.internal.compiler.lookup.LookupEnvironment;\nimport org.eclipse.jdt.internal.compiler.lookup.PackageBinding;\nimport org.eclipse.jdt.internal.compiler.parser.SourceTypeConverter;\nimport org.eclipse.jdt.internal.compiler.problem.DefaultProblemFactory;\nimport org.eclipse.jdt.internal.compiler.problem.ProblemReporter;\nimport org.eclipse.jdt.internal.core.DefaultWorkingCopyOwner;\nimport org.eclipse.jdt.internal.core.JavaProject;\nimport org.eclipse.jdt.internal.core.SourceType;\nimport org.eclipse.jdt.internal.core.SourceTypeElementInfo;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaCompilationUnit;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect DOMAspect {\n  pointcut internalCreateAST(ASTParser parser, IProgressMonitor monitor) :\n    execution(ASTNode ASTParser.internalCreateAST(IProgressMonitor)) &&\n    args(monitor) &&\n    target(parser);\n  \n  ASTNode around(ASTParser parser, IProgressMonitor monitor) :\n    internalCreateAST(parser, monitor) {\n    try {\n      if (!(parser.typeRoot instanceof IScalaCompilationUnit))\n        return proceed(parser, monitor);\n      \n      ICompilationUnit cu = (ICompilationUnit)parser.typeRoot;\n      org.eclipse.jdt.internal.compiler.env.ICompilationUnit sourceUnit = (org.eclipse.jdt.internal.compiler.env.ICompilationUnit)cu;\n      \n      IType[] topLevelTypes = cu.getTypes();\n      int length = topLevelTypes.length;\n      if (length == 0)\n        throw new IllegalStateException();\n      \n      SourceTypeElementInfo[] topLevelInfos = new SourceTypeElementInfo[length];\n      for (int i = 0; i < length; i++) {\n        topLevelInfos[i] = (SourceTypeElementInfo) ((SourceType)topLevelTypes[i]).getElementInfo();\n      }\n      char[] fileName = ((ISourceType)topLevelInfos[0]).getFileName();\n      \n      CompilationResult result = new CompilationResult(fileName, 1, 1, 100);\n\n      JavaProject javaProject = (JavaProject)cu.getJavaProject(); \n      Map compilerOptions0 = javaProject.getOptions(true);\n      CompilerOptions compilerOptions = new CompilerOptions(compilerOptions0);\n      compilerOptions.storeAnnotations = true;\n      \n      ProblemReporter problemReporter =\n        new ProblemReporter(\n          DefaultErrorHandlingPolicies.proceedWithAllProblems(),\n          compilerOptions,\n          new DefaultProblemFactory(Locale.getDefault()));\n      \n      int flags = SourceTypeConverter.FIELD_AND_METHOD | SourceTypeConverter.MEMBER_TYPE;\n      \n      CompilationUnitDeclaration unit =\n        SourceTypeConverter.buildCompilationUnit(topLevelInfos, flags, problemReporter, result);\n      \n      INameEnvironment ne = javaProject.newSearchableNameEnvironment(DefaultWorkingCopyOwner.PRIMARY);\n      final LookupEnvironment le = new LookupEnvironment(null, compilerOptions, problemReporter, ne);\n      ITypeRequestor typeRequestor = new ITypeRequestor() {\n        public void accept(IBinaryType binaryType, PackageBinding packageBinding, AccessRestriction accessRestriction) {\n          le.createBinaryTypeFrom(binaryType, packageBinding, accessRestriction);\n        }\n        public void accept(org.eclipse.jdt.internal.compiler.env.ICompilationUnit unit, AccessRestriction accessRestriction) {}\n        public void accept(ISourceType[] sourceType, PackageBinding packageBinding, AccessRestriction accessRestriction) {}\n      };\n      le.typeRequestor = typeRequestor;\n      \n      le.buildTypeBindings(unit, null);\n      le.completeTypeBindings();\n      fixTypes(unit.types);\n      \n      AST ast = AST.newAST(AST.JLS3);\n      ast.setFlag(AST.RESOLVED_BINDINGS);\n      ast.setDefaultNodeFlag(ASTNode.ORIGINAL);\n\n      org.eclipse.jdt.core.dom.ASTConverter converter =\n        new org.eclipse.jdt.core.dom.ASTConverter(compilerOptions0, true, monitor);\n      \n      org.eclipse.jdt.core.dom.BindingResolver resolver =\n        new org.eclipse.jdt.core.dom.DefaultBindingResolver(\n          unit.scope,\n          DefaultWorkingCopyOwner.PRIMARY,\n          new org.eclipse.jdt.core.dom.DefaultBindingResolver.BindingTables(),\n          true);\n      ast.setBindingResolver(resolver);\n      converter.setAST(ast);\n      \n      ASTNode node = converter.convert(unit, sourceUnit.getContents());\n      return node;\n    } catch (JavaModelException ex) {\n      throw new IllegalArgumentException(ex);\n    }\n  }\n  \n  private void fixTypes(TypeDeclaration[] types) {\n    for(int i = 0, iLimit = types.length; i < iLimit ; ++i) {\n      TypeDeclaration tpe = types[i];\n      tpe.binding.getAnnotationTagBits();\n      tpe.scope.buildFields();\n      tpe.scope.buildMethods();\n      fixMethods(tpe, tpe.methods);\n      fixTypes(tpe.memberTypes);\n    }\n  }\n  \n  private void fixMethods(TypeDeclaration tpe, AbstractMethodDeclaration[] methods) {\n    for(int i = 0, iLimit = methods.length; i < iLimit; ++i) {\n      AbstractMethodDeclaration m = methods[i];\n      m.bodyStart = m.declarationSourceStart;\n      m.bodyEnd = m.declarationSourceEnd;\n      m.binding.getAnnotationTagBits();\n    }\n  }\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"d08d2a0dfe224d71cf0dad82471845c01a2ba3f8","subject":"BuildManagers weren't deleting invalidated classfiles; dependency tracker was only recording the dependency of Foo$.class on the source of object Foo ... Foo.class is now also recorded; the Eclipse Java builder could copy modified Scala sources to the output folder during incremental builds. Fixes #2428.","message":"BuildManagers weren't deleting invalidated classfiles; dependency tracker was only recording the dependency of Foo$.class on the source of object Foo ... Foo.class is now also recorded; the Eclipse Java builder could copy modified Scala sources to the output folder during incremental builds. Fixes #2428.\n\ngit-svn-id: f4ecfe233223879a4a16cd7937f11b5152963d8e@18920 5e8d7ff9-d8ef-0310-90f0-a4852d11357a\n","repos":"aleksi-lukkarinen\/scala-ide,wpopielarski\/scala-ide,Duhemm\/scala-ide,Duhemm\/scala-ide,Kwestor\/scala-ide,dragos\/scala-ide,mlangc\/scala-ide,Kwestor\/scala-ide,Duhemm\/scala-ide,andrey-ilinykh\/scala-ide,andrey-ilinykh\/scala-ide,sschaef\/scala-ide,wpopielarski\/scala-ide,dragos\/scala-ide,stephenh\/scala-ide,scala-ide\/scala-ide,stephenh\/scala-ide,Kwestor\/scala-ide,stephenh\/scala-ide,romanowski\/scala-ide,aleksi-lukkarinen\/scala-ide,pilipolio\/scala-ide,romanowski\/scala-ide,mlangc\/scala-ide,pilipolio\/scala-ide,romanowski\/scala-ide,aleksi-lukkarinen\/scala-ide,wpopielarski\/scala-ide,sschaef\/scala-ide,sschaef\/scala-ide,andrey-ilinykh\/scala-ide,andrey-ilinykh\/scala-ide,stephenh\/scala-ide,wpopielarski\/scala-ide,dragos\/scala-ide,dragos\/scala-ide,mlangc\/scala-ide,pilipolio\/scala-ide,scala-ide\/scala-ide,mlangc\/scala-ide,sschaef\/scala-ide,scala-ide\/scala-ide,scala-ide\/scala-ide,aleksi-lukkarinen\/scala-ide,romanowski\/scala-ide,Duhemm\/scala-ide,pilipolio\/scala-ide,Kwestor\/scala-ide","old_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/builderoptions\/ScalaJavaBuilderAspect.aj","new_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/builderoptions\/ScalaJavaBuilderAspect.aj","new_contents":"\/*\n * Copyright 2005-2009 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.builderoptions;\n\nimport org.eclipse.core.resources.IResource;\n\nimport java.util.Map;\n\nimport org.eclipse.core.resources.IProject;\nimport org.eclipse.core.resources.IResource;\nimport org.eclipse.core.runtime.CoreException;\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.internal.core.builder.BatchImageBuilder;\nimport org.eclipse.jdt.internal.core.builder.JavaBuilder;\n\/\/import org.eclipse.jdt.internal.core.builder.ClasspathMultiDirectory;\nimport org.eclipse.jdt.internal.core.util.Util;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect ScalaJavaBuilderAspect {\n  pointcut build() :\n    execution(IProject[] ScalaJavaBuilder.build(int, Map, IProgressMonitor) throws CoreException);\n  \n  pointcut cleanOutputFolders(boolean copyBack) :\n    args(copyBack) &&\n    execution(void BatchImageBuilder.cleanOutputFolders(boolean) throws CoreException);\n  \n  pointcut isJavaLikeFileName(String fileName) :\n    args(fileName) &&\n    execution(boolean Util.isJavaLikeFileName(String));  \n  \n  pointcut filterExtraResource(IResource resource) :\n    args(resource) &&\n    execution(boolean JavaBuilder.filterExtraResource(IResource));\n  \n  void around(BatchImageBuilder builder, boolean copyBack) throws CoreException :\n    target(builder) &&\n    cleanOutputFolders(copyBack) &&\n    cflow(build()) {\n    \/\/ Suppress the cleaning behaviour but do the extra resource copying if requested\n    if (copyBack)\n      for (int i = 0, l = builder.sourceLocations.length; i < l; i++) {\n        org.eclipse.jdt.internal.core.builder.ClasspathMultiDirectory sourceLocation = builder.sourceLocations[i];\n        if (sourceLocation.hasIndependentOutputFolder)\n          builder.copyExtraResourcesBack(sourceLocation, false);\n      }\n  }\n  \n  boolean around(String fileName) :\n    isJavaLikeFileName(fileName) &&\n    cflow(build()) &&\n    !cflow(cleanOutputFolders(*)) {\n    if (fileName != null && fileName.endsWith(\"scala\"))\n      return false;\n    else\n      return proceed(fileName);\n  }\n  \n  boolean around(IResource resource) :\n    filterExtraResource(resource) &&\n    cflow(build()) {\n    return resource.getName().endsWith(\".scala\") || proceed(resource);\n  }\n}\n","old_contents":"\/*\n * Copyright 2005-2009 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.builderoptions;\n\nimport java.util.Map;\n\nimport org.eclipse.core.resources.IProject;\nimport org.eclipse.core.runtime.CoreException;\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.internal.core.builder.BatchImageBuilder;\n\/\/import org.eclipse.jdt.internal.core.builder.ClasspathMultiDirectory;\nimport org.eclipse.jdt.internal.core.util.Util;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect ScalaJavaBuilderAspect {\n  pointcut build() :\n    execution(IProject[] ScalaJavaBuilder.build(int, Map, IProgressMonitor) throws CoreException);\n  \n  pointcut cleanOutputFolders(boolean copyBack) :\n    args(copyBack) &&\n    execution(void BatchImageBuilder.cleanOutputFolders(boolean) throws CoreException);\n  \n  pointcut isJavaLikeFileName(String fileName) :\n    args(fileName) &&\n    execution(boolean Util.isJavaLikeFileName(String));  \n  \n  void around(BatchImageBuilder builder, boolean copyBack) throws CoreException :\n    target(builder) &&\n    cleanOutputFolders(copyBack) &&\n    cflow(build()) {\n    \/\/ Suppress the cleaning behaviour but do the extra resource copying if requested\n    if (copyBack)\n      for (int i = 0, l = builder.sourceLocations.length; i < l; i++) {\n        org.eclipse.jdt.internal.core.builder.ClasspathMultiDirectory sourceLocation = builder.sourceLocations[i];\n        if (sourceLocation.hasIndependentOutputFolder)\n          builder.copyExtraResourcesBack(sourceLocation, false);\n      }\n  }\n  \n  boolean around(String fileName) :\n    isJavaLikeFileName(fileName) &&\n    cflow(build()) &&\n    !cflow(cleanOutputFolders(*)) {\n    if (fileName != null && fileName.endsWith(\"scala\"))\n      return false;\n    else\n      return proceed(fileName);\n  }\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"65f7f1801dcb52afe5d85068b84806666dfd15f7","subject":"Alter JavaDoc","message":"Alter JavaDoc\n","repos":"eigengo\/monitor,DataDog\/monitor,DataDog\/monitor,eigengo\/monitor","old_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/ActorCellMonitoringAspect.aj","new_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/ActorCellMonitoringAspect.aj","new_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.actor.*;\nimport org.eigengo.monitor.agent.AgentConfiguration;\nimport org.eigengo.monitor.output.CounterInterface;\nimport scala.Option;\n\nimport java.util.ArrayList;\nimport java.util.List;\nimport java.util.concurrent.atomic.AtomicInteger;\nimport java.util.concurrent.atomic.AtomicLong;\nimport java.util.concurrent.ConcurrentHashMap;\n\n\/**\n * Contains advices for monitoring behaviour of an actor; typically imprisoned in an {@code ActorCell}.\n *\/\npublic aspect ActorCellMonitoringAspect extends AbstractMonitoringAspect issingleton() {\n    private AkkaAgentConfiguration agentConfiguration;\n    private final CounterInterface counterInterface;\n    private final Option<String> noActorClazz = Option.empty();\n    private final ConcurrentHashMap<Option<String>, AtomicLong> samplingCounters  = new ConcurrentHashMap<Option<String>, AtomicLong>();\n    private final ConcurrentHashMap<Option<String>, AtomicInteger> numberOfActors = new ConcurrentHashMap<Option<String>, AtomicInteger>();\n\n\n    \/**\n     * Constructs this aspect\n     *\/\n    public ActorCellMonitoringAspect() {\n        AgentConfiguration<AkkaAgentConfiguration> configuration = getAgentConfiguration(\"akka\", AkkaAgentConfigurationJapi.apply());\n        this.agentConfiguration = configuration.agent();\n        this.counterInterface = createCounterInterface(configuration.common());\n    }\n\n    \/**\n     * Injects the new {@code AkkaAgentConfiguration} instance.\n     *\n     * @param agentConfiguration the new configuration\n     *\/\n    synchronized final void setAgentConfiguration(AkkaAgentConfiguration agentConfiguration) {\n        this.agentConfiguration = agentConfiguration;\n    }\n\n    \/**\n     * decide whether to include this ActorCell in our measurements\n     * *\/\n    private boolean includeActorPath(final PathAndClass pathAndClass) {\n        \/\/ do not monitor our own output code\n        if (pathAndClass.actorClassName().isDefined()) {\n            if (pathAndClass.actorClassName().get().startsWith(\"org.eigengo.monitor.output\")) return false;\n        }\n\n        \/\/ skip if not included\n        if (!this.agentConfiguration.included().accept(pathAndClass)) return false;\n        \/\/ skip if excluded\n        if (this.agentConfiguration.excluded().accept(pathAndClass)) return false;\n\n        \/\/ skip system actor checks if we wish to monitor them\n        if (this.agentConfiguration.includeSystemAgents()) return true;\n\n        String userOrSystem = pathAndClass.actorPath().getElements().iterator().next();\n        return \"user\".equals(userOrSystem);\n    }\n\n    \/**\n     * get the sample rate for an actor\n     * *\/\n    private int getSampleRate(final PathAndClass pathAndClass) {\n        return this.agentConfiguration.sampling().getRate(pathAndClass);\n    }\n\n    \/**\n     * decide whether to sample an actor on a particular occasion\n     *\n     * @param pathAndClass\n     * @return true if we should sample this actor, otherwise false.\n     *\/\n    private final boolean sampleMessage(final PathAndClass pathAndClass) {\n        int sampleRate = getSampleRate(pathAndClass);\n        if (sampleRate == 1) return true;\n\n        this.samplingCounters.putIfAbsent(pathAndClass.actorClassName(), new AtomicLong(0));\n        long timesSeenSoFar = this.samplingCounters.get(pathAndClass.actorClassName()).incrementAndGet();\n        return (timesSeenSoFar % sampleRate == 1); \/\/ == 1 to log first value (incrementAndGet returns updated value)\n    }\n\n    \/**\n     * get the tags for the cell\n     * *\/\n    private String[] getTags(final ActorPath actorPath, final Actor actor) {\n        List<String> tags = new ArrayList<String>();\n\n        \/\/ TODO: Improve detection of routed actors. This relies only on the naming :(.\n        String lastPathElement = actorPath.elements().last();\n        if (lastPathElement.startsWith(\"$\")) {\n            \/\/ this is routed actor.\n            tags.add(actorPath.parent().toString());\n            if (this.agentConfiguration.includeRoutees()) tags.add(actorPath.toString());\n        } else {\n            \/\/ there is no supervisor\n            tags.add(actorPath.toString());\n        }\n        if (actor != null) {\n            tags.add(String.format(\"akka:%s.%s\", actor.context().system().name(), actor.getClass().getCanonicalName()));\n        }\n\n        return tags.toArray(new String[tags.size()]);\n    }\n\n    \/**\n     * returns the canonical name of the actor type associated with an ActorCell\n     * *\/\n    private String uncheckedActorNameFrom(final ActorCell actorCell) {\n        return uncheckedActorNameFrom(actorCell.props());\n    }\n\n    \/**\n     * returns the canonical name of the actor type associated with a Props instance\n     * *\/\n    private String uncheckedActorNameFrom(final Props props) {\n        return props.actorClass().getCanonicalName();\n    }\n\n    \/**\n     * Advises the {@code ActorCell.receiveMessage(message: Object): Unit}\n     * We proceed with the pointcut if the actor is to be included in the monitoring *and* this is\n     * the 'multiple-of-n'th time we've seen a message for an actor with a sample rate of n.\n     *\n     * Currently, we sample queue size, the fact that the message is delivered, the simple name of the class of the\n     * message, and the time taken to complete the actor's reactive action.\n     *\n     * @param actorCell the ActorCell where the actor that receives the message \"lives\"\n     * @param msg the incoming message\n     *\/\n    Object around(ActorCell actorCell, Object msg) : Pointcuts.actorCellReceiveMessage(actorCell, msg) {\n\n        final ActorPath actorPath = actorCell.self().path();\n        final PathAndClass pathAndClass = new PathAndClass(actorPath, Option.apply(uncheckedActorNameFrom(actorCell)));\n        if (!includeActorPath(pathAndClass) || !sampleMessage(pathAndClass)) return proceed(actorCell, msg);\n\n        int samplingRate = getSampleRate(pathAndClass);\n\n        \/\/ we tag by actor name\n        final String[] tags = getTags(actorPath, actorCell.actor());\n\n        \/\/ record the queue size\n        this.counterInterface.recordGaugeValue(\"akka.queue.size\", actorCell.numberOfMessages(), tags);\n        \/\/ record the message, general and specific\n        this.counterInterface.incrementCounter(\"akka.actor.delivered\", samplingRate, tags);\n        this.counterInterface.incrementCounter(\"akka.actor.delivered.\" + msg.getClass().getSimpleName(), samplingRate, tags);\n\n        \/\/ measure the time. we're using the ``nanoTime`` call to access the high-precision timer.\n        \/\/ since we're not really interested in wall time, but just some increasing measure of\n        \/\/ elapsed time\n        Object result = null;\n        final long start = System.nanoTime();\n        \/\/ result will always be ``null``, because target returns ``Unit``\n        result = proceed(actorCell, msg);\n        \/\/ ns or \u00b5s is too fine. ms will do for now.\n        final long duration = (System.nanoTime() - start) \/ 1000000;\n\n        \/\/ record the actor duration\n        this.counterInterface.recordExecutionTime(\"akka.actor.duration\", (int)duration, tags);\n\n        \/\/ return null would do the trick, but we want to be _proper_.\n        return result;\n    }\n\n    \/**\n     * Advises the {@code ActorCell.handleInvokeFailure(_, failure: Throwable): Unit}\n     *\n     * @param actorCell the ActorCell where the error spreads from\n     * @param failure the exception that escaped from the {@code receive} method\n     *\/\n    before(ActorCell actorCell, Throwable failure) : Pointcuts.actorCellHandleInvokeFailure(actorCell, failure) {\n        \/\/ record the error, general and specific\n        String[] tags = getTags(actorCell.self().path(), actorCell.actor());\n        this.counterInterface.incrementCounter(\"akka.actor.error\", tags);\n        this.counterInterface.incrementCounter(String.format(\"akka.actor.error.%s\", failure.getMessage()), tags);\n    }\n\n    \/**\n     * Advises the {@code EventStream.publish(event: Any): Unit}\n     *\n     * @param event the received event\n     *\/\n    before(Object event) : Pointcuts.eventStreamPublish(event) {\n        if (event instanceof UnhandledMessage) {\n            UnhandledMessage unhandledMessage = (UnhandledMessage)event;\n            String[] tags = getTags(unhandledMessage.recipient().path(), null);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered\", tags);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered.\" + unhandledMessage.getMessage().getClass().getSimpleName(), tags);\n        }\n    }\n\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorRefFactory} implementations\n     *\n     * @param props the {@code Props} instance used in the call\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after(Props props) returning (ActorRef actor): Pointcuts.anyActorOf(props) {\n        recordActorCreation(props, actor);\n    }\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorRefFactory} implementations when actor is named in construction\n     *\n     * @param props the {@code Props} instance used in the call\n     * @param actorName the {@code String} used to name the actor at creation site\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after(Props props, String actorName) returning (ActorRef actor): Pointcuts.namedActorOf(props, actorName) {\n        recordActorCreation(props, actor);\n    }\n\n    \/**\n     * method containing the recording logic for advising actor creation\n     * *\/\n    private void recordActorCreation(Props props, ActorRef actor) {\n        if (!includeActorPath(new PathAndClass(actor.path(), this.noActorClazz))) return;\n        final String uncheckedClassName = uncheckedActorNameFrom(props);\n        final Option<String> className = Option.apply(uncheckedClassName);\n\n        this.numberOfActors.putIfAbsent(className, new AtomicInteger(0));\n        \/\/ increment and get the current number of actors of this type (if the value was 0, then this returns 1 -- which is correct)\n        final int currentNumberOfActors = this.numberOfActors.get(className).incrementAndGet();\n\n        \/\/ record the current number of actors of this type\n        this.counterInterface.recordGaugeValue(\"akka.actor.count\", currentNumberOfActors, uncheckedClassName);\n    }\n\n    \/**\n     * Advises the {@code LocalActorRef.stop} method\n     *\n     * @param actorCell the {@code ActorCell} of the actor being stopped\n     *\/\n    after(ActorCell actorCell) : Pointcuts.actorCellInternalStop(actorCell) {\n        if (!includeActorPath(new PathAndClass(actorCell.self().path(), this.noActorClazz))) return;\n        final String uncheckedClassName = uncheckedActorNameFrom(actorCell);\n        final Option<String> className = Option.apply(uncheckedClassName);\n\n        this.numberOfActors.putIfAbsent(className, new AtomicInteger(0));\n        \/\/ decrement and get the current number of actors of this type (if the value was 1, then this returns 0 -- which is correct)\n        final int currentNumberOfActors = this.numberOfActors.get(className).decrementAndGet();\n\n        this.counterInterface.recordGaugeValue(\"akka.actor.count\", currentNumberOfActors, uncheckedClassName);\n    }\n\n}","old_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.actor.*;\nimport org.eigengo.monitor.agent.AgentConfiguration;\nimport org.eigengo.monitor.output.CounterInterface;\nimport scala.Option;\n\nimport java.util.ArrayList;\nimport java.util.List;\nimport java.util.concurrent.atomic.AtomicInteger;\nimport java.util.concurrent.atomic.AtomicLong;\nimport java.util.concurrent.ConcurrentHashMap;\n\n\/**\n * Contains advices for monitoring behaviour of an actor; typically imprisoned in an {@code ActorCell}.\n *\/\npublic aspect ActorCellMonitoringAspect extends AbstractMonitoringAspect issingleton() {\n    private AkkaAgentConfiguration agentConfiguration;\n    private final CounterInterface counterInterface;\n    private final Option<String> noActorClazz = Option.empty();\n    private final ConcurrentHashMap<Option<String>, AtomicLong> samplingCounters  = new ConcurrentHashMap<Option<String>, AtomicLong>();\n    private final ConcurrentHashMap<Option<String>, AtomicInteger> numberOfActors = new ConcurrentHashMap<Option<String>, AtomicInteger>();\n\n\n    \/**\n     * Constructs this aspect\n     *\/\n    public ActorCellMonitoringAspect() {\n        AgentConfiguration<AkkaAgentConfiguration> configuration = getAgentConfiguration(\"akka\", AkkaAgentConfigurationJapi.apply());\n        this.agentConfiguration = configuration.agent();\n        this.counterInterface = createCounterInterface(configuration.common());\n    }\n\n    \/**\n     * Injects the new {@code AkkaAgentConfiguration} instance.\n     *\n     * @param agentConfiguration the new configuration\n     *\/\n    synchronized final void setAgentConfiguration(AkkaAgentConfiguration agentConfiguration) {\n        this.agentConfiguration = agentConfiguration;\n    }\n\n    \/**\n     * decide whether to include this ActorCell in our measurements\n     * *\/\n    private boolean includeActorPath(final PathAndClass pathAndClass) {\n        \/\/ do not monitor our own output code\n        if (pathAndClass.actorClassName().isDefined()) {\n            if (pathAndClass.actorClassName().get().startsWith(\"org.eigengo.monitor.output\")) return false;\n        }\n\n        \/\/ skip if not included\n        if (!this.agentConfiguration.included().accept(pathAndClass)) return false;\n        \/\/ skip if excluded\n        if (this.agentConfiguration.excluded().accept(pathAndClass)) return false;\n\n        \/\/ skip system actor checks if we wish to monitor them\n        if (this.agentConfiguration.includeSystemAgents()) return true;\n\n        String userOrSystem = pathAndClass.actorPath().getElements().iterator().next();\n        return \"user\".equals(userOrSystem);\n    }\n\n    \/**\n     * get the sample rate for an actor\n     * *\/\n    private int getSampleRate(final PathAndClass pathAndClass) {\n        return this.agentConfiguration.sampling().getRate(pathAndClass);\n    }\n\n    \/**\n     * decide whether to sample an actor on a particular occasion\n     *\n     * @param pathAndClass\n     * @return true if we should sample this actor, otherwise false.\n     *\/\n    private final boolean sampleMessage(final PathAndClass pathAndClass) {\n        int sampleRate = getSampleRate(pathAndClass);\n        if (sampleRate == 1) return true;\n\n        this.samplingCounters.putIfAbsent(pathAndClass.actorClassName(), new AtomicLong(0));\n        long timesSeenSoFar = this.samplingCounters.get(pathAndClass.actorClassName()).incrementAndGet();\n        return (timesSeenSoFar % sampleRate == 1); \/\/ == 1 to log first value (incrementAndGet returns updated value)\n    }\n\n    \/**\n     * get the tags for the cell\n     * *\/\n    private String[] getTags(final ActorPath actorPath, final Actor actor) {\n        List<String> tags = new ArrayList<String>();\n\n        \/\/ TODO: Improve detection of routed actors. This relies only on the naming :(.\n        String lastPathElement = actorPath.elements().last();\n        if (lastPathElement.startsWith(\"$\")) {\n            \/\/ this is routed actor.\n            tags.add(actorPath.parent().toString());\n            if (this.agentConfiguration.includeRoutees()) tags.add(actorPath.toString());\n        } else {\n            \/\/ there is no supervisor\n            tags.add(actorPath.toString());\n        }\n        if (actor != null) {\n            tags.add(String.format(\"akka:%s.%s\", actor.context().system().name(), actor.getClass().getCanonicalName()));\n        }\n\n        return tags.toArray(new String[tags.size()]);\n    }\n\n    \/**\n     * returns the canonical name of the actor type associated with an ActorCell\n     * *\/\n    private String uncheckedActorNameFrom(final ActorCell actorCell) {\n        return uncheckedActorNameFrom(actorCell.props());\n    }\n\n    \/**\n     * returns the canonical name of the actor type associated with a Props instance\n     * *\/\n    private String uncheckedActorNameFrom(final Props props) {\n        return props.actorClass().getCanonicalName();\n    }\n\n    \/**\n     * Advises the {@code ActorCell.receiveMessage(message: Object): Unit}\n     * We proceed with the pointcut if the actor is to be included in the monitoring *and* this is\n     * the 'multiple-of-n'th time we've seen a message for an actor with a sample rate of n.\n     *\n     * Currently, we sample queue size, the fact that the message is delivered, the simple name of the class of the\n     * message, and the time taken to complete the actor's reactive action.\n     *\n     * @param actorCell the ActorCell where the actor that receives the message \"lives\"\n     * @param msg the incoming message\n     *\/\n    Object around(ActorCell actorCell, Object msg) : Pointcuts.actorCellReceiveMessage(actorCell, msg) {\n\n        final ActorPath actorPath = actorCell.self().path();\n        final PathAndClass pathAndClass = new PathAndClass(actorPath, Option.apply(uncheckedActorNameFrom(actorCell)));\n        if (!includeActorPath(pathAndClass) || !sampleMessage(pathAndClass)) return proceed(actorCell, msg);\n\n        int samplingRate = getSampleRate(pathAndClass);\n\n        \/\/ we tag by actor name\n        final String[] tags = getTags(actorPath, actorCell.actor());\n\n        \/\/ record the queue size\n        this.counterInterface.recordGaugeValue(\"akka.queue.size\", actorCell.numberOfMessages(), tags);\n        \/\/ record the message, general and specific\n        this.counterInterface.incrementCounter(\"akka.actor.delivered\", samplingRate, tags);\n        this.counterInterface.incrementCounter(\"akka.actor.delivered.\" + msg.getClass().getSimpleName(), samplingRate, tags);\n\n        \/\/ measure the time. we're using the ``nanoTime`` call to access the high-precision timer.\n        \/\/ since we're not really interested in wall time, but just some increasing measure of\n        \/\/ elapsed time\n        Object result = null;\n        final long start = System.nanoTime();\n        \/\/ result will always be ``null``, because target returns ``Unit``\n        result = proceed(actorCell, msg);\n        \/\/ ns or \u00b5s is too fine. ms will do for now.\n        final long duration = (System.nanoTime() - start) \/ 1000000;\n\n        \/\/ record the actor duration\n        this.counterInterface.recordExecutionTime(\"akka.actor.duration\", (int)duration, tags);\n\n        \/\/ return null would do the trick, but we want to be _proper_.\n        return result;\n    }\n\n    \/**\n     * Advises the {@code ActorCell.handleInvokeFailure(_, failure: Throwable): Unit}\n     *\n     * @param actorCell the ActorCell where the error spreads from\n     * @param failure the exception that escaped from the {@code receive} method\n     *\/\n    before(ActorCell actorCell, Throwable failure) : Pointcuts.actorCellHandleInvokeFailure(actorCell, failure) {\n        \/\/ record the error, general and specific\n        String[] tags = getTags(actorCell.self().path(), actorCell.actor());\n        this.counterInterface.incrementCounter(\"akka.actor.error\", tags);\n        this.counterInterface.incrementCounter(String.format(\"akka.actor.error.%s\", failure.getMessage()), tags);\n    }\n\n    \/**\n     * Advises the {@code EventStream.publish(event: Any): Unit}\n     *\n     * @param event the received event\n     *\/\n    before(Object event) : Pointcuts.eventStreamPublish(event) {\n        if (event instanceof UnhandledMessage) {\n            UnhandledMessage unhandledMessage = (UnhandledMessage)event;\n            String[] tags = getTags(unhandledMessage.recipient().path(), null);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered\", tags);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered.\" + unhandledMessage.getMessage().getClass().getSimpleName(), tags);\n        }\n    }\n\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorCell} and {@code ActorSystem}\n     *\n     * @param props the {@code Props} instance used in the call\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after(Props props) returning (ActorRef actor): Pointcuts.anyActorOf(props) {\n        recordActorCreation(props, actor);\n    }\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorCell} and {@code ActorSystem} when actor is named in construction\n     *\n     * @param props the {@code Props} instance used in the call\n     * @param actorName the {@code String} used to name the actor at creation site\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after(Props props, String actorName) returning (ActorRef actor): Pointcuts.namedActorOf(props, actorName) {\n        recordActorCreation(props, actor);\n    }\n\n    \/**\n     * method containing the recording logic for advising actor creation\n     * *\/\n    private void recordActorCreation(Props props, ActorRef actor) {\n        if (!includeActorPath(new PathAndClass(actor.path(), this.noActorClazz))) return;\n        final String uncheckedClassName = uncheckedActorNameFrom(props);\n        final Option<String> className = Option.apply(uncheckedClassName);\n\n        this.numberOfActors.putIfAbsent(className, new AtomicInteger(0));\n        \/\/ increment and get the current number of actors of this type (if the value was 0, then this returns 1 -- which is correct)\n        final int currentNumberOfActors = this.numberOfActors.get(className).incrementAndGet();\n\n        \/\/ record the current number of actors of this type\n        this.counterInterface.recordGaugeValue(\"akka.actor.count\", currentNumberOfActors, uncheckedClassName);\n    }\n\n    \/**\n     * Advises the {@code LocalActorRef.stop} method\n     *\n     * @param actorCell the {@code ActorCell} of the actor being stopped\n     *\/\n    after(ActorCell actorCell) : Pointcuts.actorCellInternalStop(actorCell) {\n        if (!includeActorPath(new PathAndClass(actorCell.self().path(), this.noActorClazz))) return;\n        final String uncheckedClassName = uncheckedActorNameFrom(actorCell);\n        final Option<String> className = Option.apply(uncheckedClassName);\n\n        this.numberOfActors.putIfAbsent(className, new AtomicInteger(0));\n        \/\/ decrement and get the current number of actors of this type (if the value was 1, then this returns 0 -- which is correct)\n        final int currentNumberOfActors = this.numberOfActors.get(className).decrementAndGet();\n\n        this.counterInterface.recordGaugeValue(\"akka.actor.count\", currentNumberOfActors, uncheckedClassName);\n    }\n\n}","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"af76945437b468fa64a3206ec4f0b53b068d4654","subject":"Update Queues instrumentation","message":"Update Queues instrumentation\n","repos":"brownsys\/tracing-framework,brownsys\/tracing-framework,brownsys\/tracing-framework,brownsys\/tracing-framework,brownsys\/tracing-framework,brownsys\/tracing-framework,brownsys\/tracing-framework","old_file":"tracingplane\/aspects\/src\/main\/aspect\/edu\/brown\/cs\/systems\/tracing\/aspects\/Queues.aj","new_file":"tracingplane\/aspects\/src\/main\/aspect\/edu\/brown\/cs\/systems\/tracing\/aspects\/Queues.aj","new_contents":"package edu.brown.cs.systems.tracing.aspects;\n\nimport java.util.concurrent.BlockingQueue;\n\nimport edu.brown.cs.systems.baggage.Baggage;\nimport edu.brown.cs.systems.baggage.DetachedBaggage;\nimport edu.brown.cs.systems.tracing.aspects.Annotations.InstrumentQueues;\nimport edu.brown.cs.systems.tracing.aspects.Annotations.InstrumentedQueueElement;\n\n\/** Instruments potentially asynchronous executions -- runnables, callables, and threads. Special-case handling for\n * threads since they can themselves be a runnable, or they can wrap a runnable *\/\npublic aspect Queues {\n\n    \/* ================================================================================================================\n     * \n     * QueueElementWithBaggage is added to any class that is used as a queue element, with the InstrumentedQueueElement\n     * annotation. *\/\n\n    public interface QueueElementWithBaggage {\n        public DetachedBaggage takeAttachedBaggage();\n        public void attachProvidedBaggage(DetachedBaggage baggage);\n    }\n\n    public volatile DetachedBaggage QueueElementWithBaggage.attachedQueueElementBaggage;\n\n    public DetachedBaggage QueueElementWithBaggage.takeAttachedBaggage() {\n        try {\n            return attachedQueueElementBaggage;\n        } finally {\n            attachedQueueElementBaggage = null;\n        }\n    }\n\n    public void QueueElementWithBaggage.attachProvidedBaggage(DetachedBaggage baggage) {\n        attachedQueueElementBaggage = baggage;\n    }\n\n    \/* ================================================================================================================\n     * \n     * All instrumented queue element annotated get baggage added *\/\n\n    declare parents: (@InstrumentedQueueElement Object)+ implements QueueElementWithBaggage;\n    \n    before(QueueElementWithBaggage e): args(e,..) && within(@InstrumentQueues *) && (\n            call(* BlockingQueue+.add(..)) || call(* BlockingQueue+.offer(..)) || call(* BlockingQueue+.put(..))\n            ) {\n        e.attachProvidedBaggage(Baggage.fork());\n    }\n    \n    before(): within(@InstrumentQueues *) && call(* BlockingQueue+.take(..)) {\n        Baggage.discard();\n    }\n    \n    after() returning(QueueElementWithBaggage e): within(@InstrumentQueues *) && call(* BlockingQueue+.take(..)) {\n        if (e != null) {\n            Baggage.start(e.takeAttachedBaggage());\n        }\n    }\n\n}","old_contents":"package edu.brown.cs.systems.tracing.aspects;\n\nimport java.util.concurrent.BlockingQueue;\n\nimport edu.brown.cs.systems.baggage.Baggage;\nimport edu.brown.cs.systems.baggage.DetachedBaggage;\nimport edu.brown.cs.systems.tracing.aspects.Annotations.InstrumentQueues;\nimport edu.brown.cs.systems.tracing.aspects.Annotations.InstrumentedQueueElement;\n\n\/** Instruments potentially asynchronous executions -- runnables, callables, and threads. Special-case handling for\n * threads since they can themselves be a runnable, or they can wrap a runnable *\/\npublic aspect Queues {\n\n    \/* ================================================================================================================\n     * \n     * QueueElementWithBaggage is added to any class that is used as a queue element, with the InstrumentedQueueElement\n     * annotation. *\/\n\n    public interface QueueElementWithBaggage {\n        public DetachedBaggage takeAttachedBaggage();\n        public void attachProvidedBaggage(DetachedBaggage baggage);\n    }\n\n    public volatile DetachedBaggage QueueElementWithBaggage.attachedQueueElementBaggage;\n\n    public DetachedBaggage QueueElementWithBaggage.takeAttachedBaggage() {\n        try {\n            return attachedQueueElementBaggage;\n        } finally {\n            attachedQueueElementBaggage = null;\n        }\n    }\n\n    public void QueueElementWithBaggage.attachProvidedBaggage(DetachedBaggage baggage) {\n        attachedQueueElementBaggage = baggage;\n    }\n\n    \/* ================================================================================================================\n     * \n     * All instrumented queue element annotated get baggage added *\/\n\n    declare parents: (@InstrumentedQueueElement Object)+ implements QueueElementWithBaggage;\n    \n    before(QueueElementWithBaggage e): args(e,..) && within(@InstrumentQueues *) && call(* BlockingQueue+.add(..)) {\n        e.attachProvidedBaggage(Baggage.fork());\n    }\n    \n    before(): within(@InstrumentQueues *) && call(* BlockingQueue+.take(..)) {\n        Baggage.discard();\n    }\n    \n    after() returning(QueueElementWithBaggage e): within(@InstrumentQueues *) && call(* BlockingQueue+.take(..)) {\n        if (e != null) {\n            Baggage.start(e.takeAttachedBaggage());\n        }\n    }\n\n}","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"7ae9634bbc97533c836c9324e4c302c9e58552ff","subject":"delete relationship","message":"delete relationship\n","repos":"spring-projects\/spring-data-graph","old_file":"src\/main\/java\/org\/springframework\/datastore\/graph\/neo4j\/spi\/node\/Neo4jNodeBacking.aj","new_file":"src\/main\/java\/org\/springframework\/datastore\/graph\/neo4j\/spi\/node\/Neo4jNodeBacking.aj","new_contents":"package org.springframework.datastore.graph.neo4j.spi.node;\n\nimport org.aspectj.lang.JoinPoint;\nimport org.aspectj.lang.reflect.FieldSignature;\nimport org.neo4j.graphdb.DynamicRelationshipType;\nimport org.neo4j.graphdb.Node;\nimport org.neo4j.graphdb.Relationship;\nimport org.neo4j.graphdb.RelationshipType;\nimport org.neo4j.graphdb.traversal.TraversalDescription;\nimport org.neo4j.graphdb.traversal.Traverser;\nimport org.springframework.beans.factory.annotation.Autowired;\nimport org.springframework.datastore.graph.api.GraphEntity;\nimport org.springframework.datastore.graph.api.NodeBacked;\nimport org.springframework.datastore.graph.api.RelationshipBacked;\nimport org.springframework.datastore.graph.neo4j.fieldaccess.*;\nimport org.springframework.datastore.graph.neo4j.support.GraphDatabaseContext;\nimport org.springframework.persistence.support.AbstractTypeAnnotatingMixinFields;\n\nimport org.springframework.persistence.support.AbstractConstructorEntityInstantiator;\nimport org.springframework.datastore.graph.neo4j.spi.node.Neo4jConstructorGraphEntityInstantiator;\nimport org.springframework.datastore.graph.neo4j.spi.relationship.ConstructorBypassingGraphRelationshipInstantiator;\n\nimport java.lang.reflect.Field;\n\nimport static org.springframework.datastore.graph.neo4j.fieldaccess.DoReturn.unwrap;\nimport org.springframework.datastore.graph.neo4j.fieldaccess.NodeEntityStateAccessorsFactory;\nimport org.springframework.persistence.support.StateProvider;\n\n\/**\n * Aspect to turn an object annotated with GraphEntity into a graph entity using Neo4J.\n * Delegates all field access (except for fields assumed to be transient)\n * to an underlying Neo4 graph node.\n * \n * @author Rod Johnson\n *\/\npublic aspect Neo4jNodeBacking extends AbstractTypeAnnotatingMixinFields<GraphEntity, NodeBacked> {\n    private GraphDatabaseContext graphDatabaseContext;\n    private NodeEntityStateAccessorsFactory entityStateAccessorsFactory;\n\n    @Autowired\n    public void init(GraphDatabaseContext graphDatabaseContext, NodeEntityStateAccessorsFactory entityStateAccessorsFactory) {\n        this.graphDatabaseContext = graphDatabaseContext;\n        this.entityStateAccessorsFactory = entityStateAccessorsFactory;\n    }\n\t\/\/-------------------------------------------------------------------------\n\t\/\/ Advise user-defined constructors of NodeBacked objects to create a new Neo4J backing node\n\t\/\/-------------------------------------------------------------------------\n\tpointcut arbitraryUserConstructorOfNodeBackedObject(NodeBacked entity) : \n\t\texecution((@GraphEntity *).new(..)) &&\n\t\t!execution((@GraphEntity *).new(Node)) &&\n\t\tthis(entity) && !cflowbelow(call(* fromStateInternal(..)));\n\t\n\t\n\t\/\/ Create a new node in the Graph if no Node was passed in a constructor\n    before(NodeBacked entity): arbitraryUserConstructorOfNodeBackedObject(entity) {\n        if (entityStateAccessorsFactory == null) {\n            log.error(\"entityStateAccessorsFactory not set, not creating accessors for \" + entity.getClass());\n        } else {\n            entity.stateAccessors = entityStateAccessorsFactory.getEntityStateAccessors(entity);\n            Node node = StateProvider.retrieveState();\n            if (node != null) {\n                entity.setUnderlyingState(node);\n            } else {\n                if (graphDatabaseContext.transactionIsRunning()) {\n                    entity.stateAccessors.createAndAssignState();\n                } else {\n                    log.warn(\"New Nodebacked created outside of transaction \" + entity.getClass());\n                }\n            }\n        }\n    }\n\n    \/\/ Introduced field\n\tprivate transient Node NodeBacked.underlyingNode;\n    private transient EntityStateAccessors<NodeBacked,Node> NodeBacked.stateAccessors;\n\n    \/*\n    public NodeBacked.new(Node n) {\n       this.setUnderlyingState(n);\n    }\n    *\/\n\tpublic void NodeBacked.setUnderlyingState(Node n) {\n\t\tthis.underlyingNode = n;\n        if (this.stateAccessors == null) {\n            this.stateAccessors = Neo4jNodeBacking.aspectOf().entityStateAccessorsFactory.getEntityStateAccessors(this);\n        } else {\n            this.stateAccessors.setUnderlyingState(n);\n        }\n\t}\n\t\n\tpublic Node NodeBacked.getUnderlyingState() {\n\t\treturn underlyingNode;\n\t}\n\t\n    public EntityStateAccessors NodeBacked.getStateAccessors() {\n        return stateAccessors;\n    }\n\n    public boolean NodeBacked.hasUnderlyingNode() {\n        return underlyingNode!=null;\n    }\n\n\tpublic Relationship NodeBacked.relateTo(NodeBacked nb, RelationshipType type) {\n\t\treturn this.underlyingNode.createRelationshipTo(nb.getUnderlyingState(), type);\n\t}\n\n\tpublic Long NodeBacked.getNodeId() {\n        if (!hasUnderlyingNode()) return null;\n\t\treturn underlyingNode.getId();\n\t}\n\n    public  Iterable<? extends NodeBacked> NodeBacked.find(final Class<? extends NodeBacked> targetType, TraversalDescription traversalDescription) {\n        if (!hasUnderlyingNode()) throw new IllegalStateException(\"No node attached to \" + this);\n        final Traverser traverser = traversalDescription.traverse(this.getUnderlyingState());\n        return new NodeBackedNodeIterableWrapper(traverser, targetType, Neo4jNodeBacking.aspectOf().graphDatabaseContext);\n    }\n    \/* todo Andy Clement\n    public Iterable<? extends NodeBacked> NodeBacked.traverse(TraversalDescription traversalDescription) {\n        final Class<? extends NodeBacked> target = this.getClass();\n        return this.traverse(target,traversalDescription);\n    }\n    *\/\n\n    \/* todo Andy Clement\n    public <R extends RelationshipBacked, N extends NodeBacked> R NodeBacked.relateTo(N node, Class<R> relationshipType, String type) {\n        Relationship rel = this.getUnderlyingState().createRelationshipTo(node.getUnderlyingState(), DynamicRelationshipType.withName(type));\n        Neo4jNodeBacking.aspectOf().relationshipEntityInstantiator.createEntityFromState(rel, relationshipType);\n    }\n    *\/\n\n    public RelationshipBacked NodeBacked.relateTo(NodeBacked node, Class<? extends RelationshipBacked> relationshipType, String type) {\n        Relationship rel = this.getUnderlyingState().createRelationshipTo(node.getUnderlyingState(), DynamicRelationshipType.withName(type));\n        return Neo4jNodeBacking.aspectOf().graphDatabaseContext.createEntityFromState(rel, relationshipType);\n    }\n\n    public void NodeBacked.removeRelationshipTo(NodeBacked node, String type) {\n        Node myNode=this.getUnderlyingState();\n        Node otherNode=node.getUnderlyingState();\n        for (Relationship rel : this.getUnderlyingState().getRelationships(DynamicRelationshipType.withName(type))) {\n            if (rel.getOtherNode(myNode).equals(otherNode)) {\n                rel.delete();\n                return;\n            }\n        }\n        return;\n    }\n\n    public RelationshipBacked NodeBacked.getRelationshipTo(NodeBacked node, Class<? extends RelationshipBacked> relationshipType, String type) {\n        Node myNode=this.getUnderlyingState();\n        Node otherNode=node.getUnderlyingState();\n        for (Relationship rel : this.getUnderlyingState().getRelationships(DynamicRelationshipType.withName(type))) {\n            if (rel.getOtherNode(myNode).equals(otherNode)) return Neo4jNodeBacking.aspectOf().graphDatabaseContext.createEntityFromState(rel, relationshipType);\n        }\n        return null;\n    }\n\n\tpublic final boolean NodeBacked.equals(Object obj) {\n        if (obj == this) return true;\n        if (!hasUnderlyingNode()) return false;\n\t\tif (obj instanceof NodeBacked) {\n\t\t\treturn this.getUnderlyingState().equals(((NodeBacked) obj).getUnderlyingState());\n\t\t}\n\t\treturn false;\n\t}\n\t\n\tpublic final int NodeBacked.hashCode() {\n        if (!hasUnderlyingNode()) return System.identityHashCode(this);\n\t\treturn getUnderlyingState().hashCode();\n\t}\n\n    Object around(NodeBacked entity): entityFieldGet(entity) {\n        Object result=entity.stateAccessors.getValue(field(thisJoinPoint));\n        if (result instanceof DoReturn) return unwrap(result);\n        return proceed(entity);\n    }\n\n    Object around(NodeBacked entity, Object newVal) : entityFieldSet(entity, newVal) {\n        Object result=entity.stateAccessors.setValue(field(thisJoinPoint),newVal);\n        if (result instanceof DoReturn) return unwrap(result);\n        return proceed(entity,result);\n\t}\n\n    Field field(JoinPoint joinPoint) {\n        FieldSignature fieldSignature = (FieldSignature)joinPoint.getSignature();\n        return fieldSignature.getField();\n    }\n}\n","old_contents":"package org.springframework.datastore.graph.neo4j.spi.node;\n\nimport org.aspectj.lang.JoinPoint;\nimport org.aspectj.lang.reflect.FieldSignature;\nimport org.neo4j.graphdb.DynamicRelationshipType;\nimport org.neo4j.graphdb.Node;\nimport org.neo4j.graphdb.Relationship;\nimport org.neo4j.graphdb.RelationshipType;\nimport org.neo4j.graphdb.traversal.TraversalDescription;\nimport org.neo4j.graphdb.traversal.Traverser;\nimport org.springframework.beans.factory.annotation.Autowired;\nimport org.springframework.datastore.graph.api.GraphEntity;\nimport org.springframework.datastore.graph.api.NodeBacked;\nimport org.springframework.datastore.graph.api.RelationshipBacked;\nimport org.springframework.datastore.graph.neo4j.fieldaccess.*;\nimport org.springframework.datastore.graph.neo4j.support.GraphDatabaseContext;\nimport org.springframework.persistence.support.AbstractTypeAnnotatingMixinFields;\n\nimport org.springframework.persistence.support.AbstractConstructorEntityInstantiator;\nimport org.springframework.datastore.graph.neo4j.spi.node.Neo4jConstructorGraphEntityInstantiator;\nimport org.springframework.datastore.graph.neo4j.spi.relationship.ConstructorBypassingGraphRelationshipInstantiator;\n\nimport java.lang.reflect.Field;\n\nimport static org.springframework.datastore.graph.neo4j.fieldaccess.DoReturn.unwrap;\nimport org.springframework.datastore.graph.neo4j.fieldaccess.NodeEntityStateAccessorsFactory;\nimport org.springframework.persistence.support.StateProvider;\n\n\/**\n * Aspect to turn an object annotated with GraphEntity into a graph entity using Neo4J.\n * Delegates all field access (except for fields assumed to be transient)\n * to an underlying Neo4 graph node.\n * \n * @author Rod Johnson\n *\/\npublic aspect Neo4jNodeBacking extends AbstractTypeAnnotatingMixinFields<GraphEntity, NodeBacked> {\n    private GraphDatabaseContext graphDatabaseContext;\n    private NodeEntityStateAccessorsFactory entityStateAccessorsFactory;\n\n    @Autowired\n    public void init(GraphDatabaseContext graphDatabaseContext, NodeEntityStateAccessorsFactory entityStateAccessorsFactory) {\n        this.graphDatabaseContext = graphDatabaseContext;\n        this.entityStateAccessorsFactory = entityStateAccessorsFactory;\n    }\n\t\/\/-------------------------------------------------------------------------\n\t\/\/ Advise user-defined constructors of NodeBacked objects to create a new Neo4J backing node\n\t\/\/-------------------------------------------------------------------------\n\tpointcut arbitraryUserConstructorOfNodeBackedObject(NodeBacked entity) : \n\t\texecution((@GraphEntity *).new(..)) &&\n\t\t!execution((@GraphEntity *).new(Node)) &&\n\t\tthis(entity) && !cflowbelow(call(* fromStateInternal(..)));\n\t\n\t\n\t\/\/ Create a new node in the Graph if no Node was passed in a constructor\n    before(NodeBacked entity): arbitraryUserConstructorOfNodeBackedObject(entity) {\n        if (entityStateAccessorsFactory == null) {\n            log.error(\"entityStateAccessorsFactory not set, not creating accessors for \" + entity.getClass());\n        } else {\n            entity.stateAccessors = entityStateAccessorsFactory.getEntityStateAccessors(entity);\n            Node node = StateProvider.retrieveState();\n            if (node != null) {\n                entity.setUnderlyingState(node);\n            } else {\n                if (graphDatabaseContext.transactionIsRunning()) {\n                    entity.stateAccessors.createAndAssignState();\n                } else {\n                    log.warn(\"New Nodebacked created outside of transaction \" + entity.getClass());\n                }\n            }\n        }\n    }\n\n    \/\/ Introduced field\n\tprivate transient Node NodeBacked.underlyingNode;\n    private transient EntityStateAccessors<NodeBacked,Node> NodeBacked.stateAccessors;\n\n    \/*\n    public NodeBacked.new(Node n) {\n       this.setUnderlyingState(n);\n    }\n    *\/\n\tpublic void NodeBacked.setUnderlyingState(Node n) {\n\t\tthis.underlyingNode = n;\n        if (this.stateAccessors == null) {\n            this.stateAccessors = Neo4jNodeBacking.aspectOf().entityStateAccessorsFactory.getEntityStateAccessors(this);\n        } else {\n            this.stateAccessors.setUnderlyingState(n);\n        }\n\t}\n\t\n\tpublic Node NodeBacked.getUnderlyingState() {\n\t\treturn underlyingNode;\n\t}\n\t\n    public EntityStateAccessors NodeBacked.getStateAccessors() {\n        return stateAccessors;\n    }\n\n    public boolean NodeBacked.hasUnderlyingNode() {\n        return underlyingNode!=null;\n    }\n\n\tpublic Relationship NodeBacked.relateTo(NodeBacked nb, RelationshipType type) {\n\t\treturn this.underlyingNode.createRelationshipTo(nb.getUnderlyingState(), type);\n\t}\n\n\tpublic Long NodeBacked.getNodeId() {\n        if (!hasUnderlyingNode()) return null;\n\t\treturn underlyingNode.getId();\n\t}\n\n    public  Iterable<? extends NodeBacked> NodeBacked.find(final Class<? extends NodeBacked> targetType, TraversalDescription traversalDescription) {\n        if (!hasUnderlyingNode()) throw new IllegalStateException(\"No node attached to \" + this);\n        final Traverser traverser = traversalDescription.traverse(this.getUnderlyingState());\n        return new NodeBackedNodeIterableWrapper(traverser, targetType, Neo4jNodeBacking.aspectOf().graphDatabaseContext);\n    }\n    \/* todo Andy Clement\n    public Iterable<? extends NodeBacked> NodeBacked.traverse(TraversalDescription traversalDescription) {\n        final Class<? extends NodeBacked> target = this.getClass();\n        return this.traverse(target,traversalDescription);\n    }\n    *\/\n\n    \/* todo Andy Clement\n    public <R extends RelationshipBacked, N extends NodeBacked> R NodeBacked.relateTo(N node, Class<R> relationshipType, String type) {\n        Relationship rel = this.getUnderlyingState().createRelationshipTo(node.getUnderlyingState(), DynamicRelationshipType.withName(type));\n        Neo4jNodeBacking.aspectOf().relationshipEntityInstantiator.createEntityFromState(rel, relationshipType);\n    }\n    *\/\n\n    public RelationshipBacked NodeBacked.relateTo(NodeBacked node, Class<? extends RelationshipBacked> relationshipType, String type) {\n        Relationship rel = this.getUnderlyingState().createRelationshipTo(node.getUnderlyingState(), DynamicRelationshipType.withName(type));\n        return Neo4jNodeBacking.aspectOf().graphDatabaseContext.createEntityFromState(rel, relationshipType);\n    }\n\n    public RelationshipBacked NodeBacked.getRelationshipTo(NodeBacked node, Class<? extends RelationshipBacked> relationshipType, String type) {\n        Node myNode=this.getUnderlyingState();\n        Node otherNode=node.getUnderlyingState();\n        for (Relationship rel : this.getUnderlyingState().getRelationships(DynamicRelationshipType.withName(type))) {\n            if (rel.getOtherNode(myNode).equals(otherNode)) return Neo4jNodeBacking.aspectOf().graphDatabaseContext.createEntityFromState(rel, relationshipType);\n        }\n        return null;\n    }\n\n\tpublic final boolean NodeBacked.equals(Object obj) {\n        if (obj == this) return true;\n        if (!hasUnderlyingNode()) return false;\n\t\tif (obj instanceof NodeBacked) {\n\t\t\treturn this.getUnderlyingState().equals(((NodeBacked) obj).getUnderlyingState());\n\t\t}\n\t\treturn false;\n\t}\n\t\n\tpublic final int NodeBacked.hashCode() {\n        if (!hasUnderlyingNode()) return System.identityHashCode(this);\n\t\treturn getUnderlyingState().hashCode();\n\t}\n\n    Object around(NodeBacked entity): entityFieldGet(entity) {\n        Object result=entity.stateAccessors.getValue(field(thisJoinPoint));\n        if (result instanceof DoReturn) return unwrap(result);\n        return proceed(entity);\n    }\n\n    Object around(NodeBacked entity, Object newVal) : entityFieldSet(entity, newVal) {\n        Object result=entity.stateAccessors.setValue(field(thisJoinPoint),newVal);\n        if (result instanceof DoReturn) return unwrap(result);\n        return proceed(entity,result);\n\t}\n\n    Field field(JoinPoint joinPoint) {\n        FieldSignature fieldSignature = (FieldSignature)joinPoint.getSignature();\n        return fieldSignature.getField();\n    }\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"735107982236eacdabf690c48cd2e1568c0556a1","subject":"Formatting","message":"Formatting\n","repos":"DataDog\/monitor,eigengo\/monitor,DataDog\/monitor,eigengo\/monitor","old_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/ActorCellMonitoringAspect.aj","new_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/ActorCellMonitoringAspect.aj","new_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.actor.*;\nimport org.eigengo.monitor.agent.AgentConfiguration;\nimport org.eigengo.monitor.output.CounterInterface;\nimport scala.Option;\n\nimport java.util.ArrayList;\nimport java.util.List;\nimport java.util.concurrent.atomic.AtomicInteger;\nimport java.util.concurrent.atomic.AtomicLong;\nimport java.util.concurrent.ConcurrentHashMap;\n\n\/**\n * Contains advices for monitoring behaviour of an actor; typically imprisoned in an {@code ActorCell}.\n *\/\npublic aspect ActorCellMonitoringAspect extends AbstractMonitoringAspect issingleton() {\n    private AkkaAgentConfiguration agentConfiguration;\n    private final CounterInterface counterInterface;\n    private final Option<String> noActorClazz = Option.empty();\n    private final ConcurrentHashMap<Option<String>, AtomicLong> samplingCounters  = new ConcurrentHashMap<Option<String>, AtomicLong>();\n    private final ConcurrentHashMap<Option<String>, AtomicInteger> numberOfActors = new ConcurrentHashMap<Option<String>, AtomicInteger>();\n\n\n    \/**\n     * Constructs this aspect\n     *\/\n    public ActorCellMonitoringAspect() {\n        AgentConfiguration<AkkaAgentConfiguration> configuration = getAgentConfiguration(\"akka\", AkkaAgentConfigurationJapi.apply());\n        this.agentConfiguration = configuration.agent();\n        this.counterInterface = createCounterInterface(configuration.common());\n    }\n\n    \/**\n     * Injects the new {@code AkkaAgentConfiguration} instance.\n     *\n     * @param agentConfiguration the new configuration\n     *\/\n    synchronized final void setAgentConfiguration(AkkaAgentConfiguration agentConfiguration) {\n        this.agentConfiguration = agentConfiguration;\n    }\n\n    \/**\n     * decide whether to include this ActorCell in our measurements\n     * *\/\n    private boolean includeActorPath(final PathAndClass pathAndClass) {\n        \/\/ do not monitor our own output code\n        if (pathAndClass.actorClassName().isDefined()) {\n            if (pathAndClass.actorClassName().get().startsWith(\"org.eigengo.monitor.output\")) return false;\n        }\n\n        \/\/ skip if not included\n        if (!this.agentConfiguration.included().accept(pathAndClass)) return false;\n        \/\/ skip if excluded\n        if (this.agentConfiguration.excluded().accept(pathAndClass)) return false;\n\n        \/\/ skip system actor checks if we wish to monitor them\n        if (this.agentConfiguration.includeSystemAgents()) return true;\n\n        String userOrSystem = pathAndClass.actorPath().getElements().iterator().next();\n        return \"user\".equals(userOrSystem);\n    }\n\n    \/**\n     * get the sample rate for an actor\n     * *\/\n    private int getSampleRate(final PathAndClass pathAndClass) {\n        return this.agentConfiguration.sampling().getRate(pathAndClass);\n    }\n\n    \/**\n     * decide whether to sample an actor on a particular occasion\n     *\n     * @param pathAndClass\n     * @return true if we should sample this actor, otherwise false.\n     *\/\n    private final boolean sampleMessage(final PathAndClass pathAndClass) {\n        int sampleRate = getSampleRate(pathAndClass);\n        if (sampleRate == 1) return true;\n\n        this.samplingCounters.putIfAbsent(pathAndClass.actorClassName(), new AtomicLong(0));\n        long timesSeenSoFar = this.samplingCounters.get(pathAndClass.actorClassName()).incrementAndGet();\n        return (timesSeenSoFar % sampleRate == 1); \/\/ == 1 to log first value (incrementAndGet returns updated value)\n    }\n\n    \/**\n     * get the tags for the cell\n     * *\/\n    private String[] getTags(final ActorPath actorPath, final Actor actor) {\n        List<String> tags = new ArrayList<String>();\n\n        \/\/ TODO: Improve detection of routed actors. This relies only on the naming :(.\n        String lastPathElement = actorPath.elements().last();\n        if (lastPathElement.startsWith(\"$\")) {\n            \/\/ this is routed actor.\n            tags.add(actorPath.parent().toString());\n            if (this.agentConfiguration.includeRoutees()) tags.add(actorPath.toString());\n        } else {\n            \/\/ there is no supervisor\n            tags.add(actorPath.toString());\n        }\n        if (actor != null) {\n            tags.add(String.format(\"akka:%s.%s\", actor.context().system().name(), actor.getClass().getCanonicalName()));\n        }\n\n        return tags.toArray(new String[tags.size()]);\n    }\n\n    \/**\n     * returns the canonical name of the actor type associated with an ActorCell\n     * *\/\n    private String uncheckedActorNameFrom(final ActorCell actorCell) {\n        return uncheckedActorNameFrom(actorCell.props());\n    }\n\n    \/**\n     * returns the canonical name of the actor type associated with a Props instance\n     * *\/\n    private String uncheckedActorNameFrom(final Props props) {\n        return props.actorClass().getCanonicalName();\n    }\n\n    \/**\n     * Advises the {@code ActorCell.receiveMessage(message: Object): Unit}\n     * We proceed with the pointcut if the actor is to be included in the monitoring *and* this is\n     * the 'multiple-of-n'th time we've seen a message for an actor with a sample rate of n.\n     *\n     * Currently, we sample queue size, the fact that the message is delivered, the simple name of the class of the\n     * message, and the time taken to complete the actor's reactive action.\n     *\n     * @param actorCell the ActorCell where the actor that receives the message \"lives\"\n     * @param msg the incoming message\n     *\/\n    Object around(ActorCell actorCell, Object msg) : Pointcuts.actorCellReceiveMessage(actorCell, msg) {\n\n        final ActorPath actorPath = actorCell.self().path();\n        final PathAndClass pathAndClass = new PathAndClass(actorPath, Option.apply(uncheckedActorNameFrom(actorCell)));\n        if (!includeActorPath(pathAndClass) || !sampleMessage(pathAndClass)) return proceed(actorCell, msg);\n\n        int samplingRate = getSampleRate(pathAndClass);\n\n        \/\/ we tag by actor name\n        final String[] tags = getTags(actorPath, actorCell.actor());\n\n        \/\/ record the queue size\n        this.counterInterface.recordGaugeValue(\"akka.queue.size\", actorCell.numberOfMessages(), tags);\n        \/\/ record the message, general and specific\n        this.counterInterface.incrementCounter(\"akka.actor.delivered\", samplingRate, tags);\n        this.counterInterface.incrementCounter(\"akka.actor.delivered.\" + msg.getClass().getSimpleName(), samplingRate, tags);\n\n        \/\/ measure the time. we're using the ``nanoTime`` call to access the high-precision timer.\n        \/\/ since we're not really interested in wall time, but just some increasing measure of\n        \/\/ elapsed time\n        Object result = null;\n        final long start = System.nanoTime();\n        \/\/ result will always be ``null``, because target returns ``Unit``\n        result = proceed(actorCell, msg);\n        \/\/ ns or \u00b5s is too fine. ms will do for now.\n        final long duration = (System.nanoTime() - start) \/ 1000000;\n\n        \/\/ record the actor duration\n        this.counterInterface.recordExecutionTime(\"akka.actor.duration\", (int)duration, tags);\n\n        \/\/ return null would do the trick, but we want to be _proper_.\n        return result;\n    }\n\n    \/**\n     * Advises the {@code ActorCell.handleInvokeFailure(_, failure: Throwable): Unit}\n     *\n     * @param actorCell the ActorCell where the error spreads from\n     * @param failure the exception that escaped from the {@code receive} method\n     *\/\n    before(ActorCell actorCell, Throwable failure) : Pointcuts.actorCellHandleInvokeFailure(actorCell, failure) {\n        \/\/ record the error, general and specific\n        String[] tags = getTags(actorCell.self().path(), actorCell.actor());\n        this.counterInterface.incrementCounter(\"akka.actor.error\", tags);\n        this.counterInterface.incrementCounter(String.format(\"akka.actor.error.%s\", failure.getMessage()), tags);\n    }\n\n    \/**\n     * Advises the {@code EventStream.publish(event: Any): Unit}\n     *\n     * @param event the received event\n     *\/\n    before(Object event) : Pointcuts.eventStreamPublish(event) {\n        if (event instanceof UnhandledMessage) {\n            UnhandledMessage unhandledMessage = (UnhandledMessage)event;\n            String[] tags = getTags(unhandledMessage.recipient().path(), null);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered\", tags);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered.\" + unhandledMessage.getMessage().getClass().getSimpleName(), tags);\n        }\n    }\n\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorRefFactory} implementations\n     *\n     * @param props the {@code Props} instance used in the call\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after(Props props) returning (ActorRef actor) : Pointcuts.anyActorOf(props) {\n        if (!includeActorPath(new PathAndClass(actor.path(), this.noActorClazz))) return;\n        final String uncheckedClassName = uncheckedActorNameFrom(props);\n        final Option<String> className = Option.apply(uncheckedClassName);\n\n        this.numberOfActors.putIfAbsent(className, new AtomicInteger(0));\n        \/\/ increment and get the current number of actors of this type (if the value was 0, then this returns 1 -- which is correct)\n        final int currentNumberOfActors = this.numberOfActors.get(className).incrementAndGet();\n\n        \/\/ record the current number of actors of this type\n        this.counterInterface.recordGaugeValue(\"akka.actor.count\", currentNumberOfActors, uncheckedClassName);\n    }\n\n    \/**\n     * Advises the {@code LocalActorRef.stop} method\n     *\n     * @param actorCell the {@code ActorCell} of the actor being stopped\n     *\/\n    after(ActorCell actorCell) : Pointcuts.actorCellInternalStop(actorCell) {\n        if (!includeActorPath(new PathAndClass(actorCell.self().path(), this.noActorClazz))) return;\n        final String uncheckedClassName = uncheckedActorNameFrom(actorCell);\n        final Option<String> className = Option.apply(uncheckedClassName);\n\n        this.numberOfActors.putIfAbsent(className, new AtomicInteger(0));\n        \/\/ decrement and get the current number of actors of this type (if the value was 1, then this returns 0 -- which is correct)\n        final int currentNumberOfActors = this.numberOfActors.get(className).decrementAndGet();\n\n        this.counterInterface.recordGaugeValue(\"akka.actor.count\", currentNumberOfActors, uncheckedClassName);\n    }\n\n}","old_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.actor.*;\nimport org.eigengo.monitor.agent.AgentConfiguration;\nimport org.eigengo.monitor.output.CounterInterface;\nimport scala.Option;\n\nimport java.util.ArrayList;\nimport java.util.List;\nimport java.util.concurrent.atomic.AtomicInteger;\nimport java.util.concurrent.atomic.AtomicLong;\nimport java.util.concurrent.ConcurrentHashMap;\n\n\/**\n * Contains advices for monitoring behaviour of an actor; typically imprisoned in an {@code ActorCell}.\n *\/\npublic aspect ActorCellMonitoringAspect extends AbstractMonitoringAspect issingleton() {\n    private AkkaAgentConfiguration agentConfiguration;\n    private final CounterInterface counterInterface;\n    private final Option<String> noActorClazz = Option.empty();\n    private final ConcurrentHashMap<Option<String>, AtomicLong> samplingCounters  = new ConcurrentHashMap<Option<String>, AtomicLong>();\n    private final ConcurrentHashMap<Option<String>, AtomicInteger> numberOfActors = new ConcurrentHashMap<Option<String>, AtomicInteger>();\n\n\n    \/**\n     * Constructs this aspect\n     *\/\n    public ActorCellMonitoringAspect() {\n        AgentConfiguration<AkkaAgentConfiguration> configuration = getAgentConfiguration(\"akka\", AkkaAgentConfigurationJapi.apply());\n        this.agentConfiguration = configuration.agent();\n        this.counterInterface = createCounterInterface(configuration.common());\n    }\n\n    \/**\n     * Injects the new {@code AkkaAgentConfiguration} instance.\n     *\n     * @param agentConfiguration the new configuration\n     *\/\n    synchronized final void setAgentConfiguration(AkkaAgentConfiguration agentConfiguration) {\n        this.agentConfiguration = agentConfiguration;\n    }\n\n    \/**\n     * decide whether to include this ActorCell in our measurements\n     * *\/\n    private boolean includeActorPath(final PathAndClass pathAndClass) {\n        \/\/ do not monitor our own output code\n        if (pathAndClass.actorClassName().isDefined()) {\n            if (pathAndClass.actorClassName().get().startsWith(\"org.eigengo.monitor.output\")) return false;\n        }\n\n        \/\/ skip if not included\n        if (!this.agentConfiguration.included().accept(pathAndClass)) return false;\n        \/\/ skip if excluded\n        if (this.agentConfiguration.excluded().accept(pathAndClass)) return false;\n\n        \/\/ skip system actor checks if we wish to monitor them\n        if (this.agentConfiguration.includeSystemAgents()) return true;\n\n        String userOrSystem = pathAndClass.actorPath().getElements().iterator().next();\n        return \"user\".equals(userOrSystem);\n    }\n\n    \/**\n     * get the sample rate for an actor\n     * *\/\n    private int getSampleRate(final PathAndClass pathAndClass) {\n        return this.agentConfiguration.sampling().getRate(pathAndClass);\n    }\n\n    \/**\n     * decide whether to sample an actor on a particular occasion\n     *\n     * @param pathAndClass\n     * @return true if we should sample this actor, otherwise false.\n     *\/\n    private final boolean sampleMessage(final PathAndClass pathAndClass) {\n        int sampleRate = getSampleRate(pathAndClass);\n        if (sampleRate == 1) return true;\n\n        this.samplingCounters.putIfAbsent(pathAndClass.actorClassName(), new AtomicLong(0));\n        long timesSeenSoFar = this.samplingCounters.get(pathAndClass.actorClassName()).incrementAndGet();\n        return (timesSeenSoFar % sampleRate == 1); \/\/ == 1 to log first value (incrementAndGet returns updated value)\n    }\n\n    \/**\n     * get the tags for the cell\n     * *\/\n    private String[] getTags(final ActorPath actorPath, final Actor actor) {\n        List<String> tags = new ArrayList<String>();\n\n        \/\/ TODO: Improve detection of routed actors. This relies only on the naming :(.\n        String lastPathElement = actorPath.elements().last();\n        if (lastPathElement.startsWith(\"$\")) {\n            \/\/ this is routed actor.\n            tags.add(actorPath.parent().toString());\n            if (this.agentConfiguration.includeRoutees()) tags.add(actorPath.toString());\n        } else {\n            \/\/ there is no supervisor\n            tags.add(actorPath.toString());\n        }\n        if (actor != null) {\n            tags.add(String.format(\"akka:%s.%s\", actor.context().system().name(), actor.getClass().getCanonicalName()));\n        }\n\n        return tags.toArray(new String[tags.size()]);\n    }\n\n    \/**\n     * returns the canonical name of the actor type associated with an ActorCell\n     * *\/\n    private String uncheckedActorNameFrom(final ActorCell actorCell) {\n        return uncheckedActorNameFrom(actorCell.props());\n    }\n\n    \/**\n     * returns the canonical name of the actor type associated with a Props instance\n     * *\/\n    private String uncheckedActorNameFrom(final Props props) {\n        return props.actorClass().getCanonicalName();\n    }\n\n    \/**\n     * Advises the {@code ActorCell.receiveMessage(message: Object): Unit}\n     * We proceed with the pointcut if the actor is to be included in the monitoring *and* this is\n     * the 'multiple-of-n'th time we've seen a message for an actor with a sample rate of n.\n     *\n     * Currently, we sample queue size, the fact that the message is delivered, the simple name of the class of the\n     * message, and the time taken to complete the actor's reactive action.\n     *\n     * @param actorCell the ActorCell where the actor that receives the message \"lives\"\n     * @param msg the incoming message\n     *\/\n    Object around(ActorCell actorCell, Object msg) : Pointcuts.actorCellReceiveMessage(actorCell, msg) {\n\n        final ActorPath actorPath = actorCell.self().path();\n        final PathAndClass pathAndClass = new PathAndClass(actorPath, Option.apply(uncheckedActorNameFrom(actorCell)));\n        if (!includeActorPath(pathAndClass) || !sampleMessage(pathAndClass)) return proceed(actorCell, msg);\n\n        int samplingRate = getSampleRate(pathAndClass);\n\n        \/\/ we tag by actor name\n        final String[] tags = getTags(actorPath, actorCell.actor());\n\n        \/\/ record the queue size\n        this.counterInterface.recordGaugeValue(\"akka.queue.size\", actorCell.numberOfMessages(), tags);\n        \/\/ record the message, general and specific\n        this.counterInterface.incrementCounter(\"akka.actor.delivered\", samplingRate, tags);\n        this.counterInterface.incrementCounter(\"akka.actor.delivered.\" + msg.getClass().getSimpleName(), samplingRate, tags);\n\n        \/\/ measure the time. we're using the ``nanoTime`` call to access the high-precision timer.\n        \/\/ since we're not really interested in wall time, but just some increasing measure of\n        \/\/ elapsed time\n        Object result = null;\n        final long start = System.nanoTime();\n        \/\/ result will always be ``null``, because target returns ``Unit``\n        result = proceed(actorCell, msg);\n        \/\/ ns or \u00b5s is too fine. ms will do for now.\n        final long duration = (System.nanoTime() - start) \/ 1000000;\n\n        \/\/ record the actor duration\n        this.counterInterface.recordExecutionTime(\"akka.actor.duration\", (int)duration, tags);\n\n        \/\/ return null would do the trick, but we want to be _proper_.\n        return result;\n    }\n\n    \/**\n     * Advises the {@code ActorCell.handleInvokeFailure(_, failure: Throwable): Unit}\n     *\n     * @param actorCell the ActorCell where the error spreads from\n     * @param failure the exception that escaped from the {@code receive} method\n     *\/\n    before(ActorCell actorCell, Throwable failure) : Pointcuts.actorCellHandleInvokeFailure(actorCell, failure) {\n        \/\/ record the error, general and specific\n        String[] tags = getTags(actorCell.self().path(), actorCell.actor());\n        this.counterInterface.incrementCounter(\"akka.actor.error\", tags);\n        this.counterInterface.incrementCounter(String.format(\"akka.actor.error.%s\", failure.getMessage()), tags);\n    }\n\n    \/**\n     * Advises the {@code EventStream.publish(event: Any): Unit}\n     *\n     * @param event the received event\n     *\/\n    before(Object event) : Pointcuts.eventStreamPublish(event) {\n        if (event instanceof UnhandledMessage) {\n            UnhandledMessage unhandledMessage = (UnhandledMessage)event;\n            String[] tags = getTags(unhandledMessage.recipient().path(), null);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered\", tags);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered.\" + unhandledMessage.getMessage().getClass().getSimpleName(), tags);\n        }\n    }\n\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorRefFactory} implementations\n     *\n     * @param props the {@code Props} instance used in the call\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after(Props props) returning (ActorRef actor): Pointcuts.anyActorOf(props) {\n        recordActorCreation(props, actor);\n    }\n\n    \/**\n     * method containing the recording logic for advising actor creation\n     * *\/\n    private void recordActorCreation(Props props, ActorRef actor) {\n        if (!includeActorPath(new PathAndClass(actor.path(), this.noActorClazz))) return;\n        final String uncheckedClassName = uncheckedActorNameFrom(props);\n        final Option<String> className = Option.apply(uncheckedClassName);\n\n        this.numberOfActors.putIfAbsent(className, new AtomicInteger(0));\n        \/\/ increment and get the current number of actors of this type (if the value was 0, then this returns 1 -- which is correct)\n        final int currentNumberOfActors = this.numberOfActors.get(className).incrementAndGet();\n\n        \/\/ record the current number of actors of this type\n        this.counterInterface.recordGaugeValue(\"akka.actor.count\", currentNumberOfActors, uncheckedClassName);\n    }\n\n    \/**\n     * Advises the {@code LocalActorRef.stop} method\n     *\n     * @param actorCell the {@code ActorCell} of the actor being stopped\n     *\/\n    after(ActorCell actorCell) : Pointcuts.actorCellInternalStop(actorCell) {\n        if (!includeActorPath(new PathAndClass(actorCell.self().path(), this.noActorClazz))) return;\n        final String uncheckedClassName = uncheckedActorNameFrom(actorCell);\n        final Option<String> className = Option.apply(uncheckedClassName);\n\n        this.numberOfActors.putIfAbsent(className, new AtomicInteger(0));\n        \/\/ decrement and get the current number of actors of this type (if the value was 1, then this returns 0 -- which is correct)\n        final int currentNumberOfActors = this.numberOfActors.get(className).decrementAndGet();\n\n        this.counterInterface.recordGaugeValue(\"akka.actor.count\", currentNumberOfActors, uncheckedClassName);\n    }\n\n}","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"5ab2bf16a5453f3d54db589a92c3ec4bc553f8d2","subject":"fixed pointcut for type-level annotation to only apply to public methods (SPR-8890)","message":"fixed pointcut for type-level annotation to only apply to public methods (SPR-8890)\n","repos":"spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework","old_file":"org.springframework.aspects\/src\/main\/java\/org\/springframework\/transaction\/aspectj\/AnnotationTransactionAspect.aj","new_file":"org.springframework.aspects\/src\/main\/java\/org\/springframework\/transaction\/aspectj\/AnnotationTransactionAspect.aj","new_contents":"\/*\r\n * Copyright 2002-2010 the original author or authors.\r\n *\r\n * Licensed under the Apache License, Version 2.0 (the \"License\");\r\n * you may not use this file except in compliance with the License.\r\n * You may obtain a copy of the License at\r\n *\r\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\r\n *\r\n * Unless required by applicable law or agreed to in writing, software\r\n * distributed under the License is distributed on an \"AS IS\" BASIS,\r\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n * See the License for the specific language governing permissions and\r\n * limitations under the License.\r\n *\/\r\n\r\npackage org.springframework.transaction.aspectj;\r\n\r\nimport org.springframework.transaction.annotation.AnnotationTransactionAttributeSource;\r\nimport org.springframework.transaction.annotation.Transactional;\r\n\r\n\/**\r\n * Concrete AspectJ transaction aspect using Spring's @Transactional annotation.\r\n * \r\n * <p>When using this aspect, you <i>must<\/i> annotate the implementation class\r\n * (and\/or methods within that class), <i>not<\/i> the interface (if any) that\r\n * the class implements. AspectJ follows Java's rule that annotations on \r\n * interfaces are <i>not<\/i> inherited.\r\n *\r\n * <p>An @Transactional annotation on a class specifies the default transaction\r\n * semantics for the execution of any <b>public<\/b> operation in the class.\r\n *\r\n * <p>An @Transactional annotation on a method within the class overrides the\r\n * default transaction semantics given by the class annotation (if present). \r\n * Any method may be annotated (regardless of visibility).\r\n * Annotating non-public methods directly is the only way\r\n * to get transaction demarcation for the execution of such operations.\r\n *\r\n * @author Rod Johnson\r\n * @author Ramnivas Laddad\r\n * @author Adrian Colyer\r\n * @since 2.0\r\n * @see org.springframework.transaction.annotation.Transactional\r\n *\/\r\npublic aspect AnnotationTransactionAspect extends AbstractTransactionAspect {\r\n\r\n\tpublic AnnotationTransactionAspect() {\r\n\t\tsuper(new AnnotationTransactionAttributeSource(false));\r\n\t}\r\n\r\n\t\/**\r\n\t * Matches the execution of any public method in a type with the\r\n\t * Transactional annotation, or any subtype of a type with the\r\n\t * Transactional annotation.\r\n\t *\/\r\n\tprivate pointcut executionOfAnyPublicMethodInAtTransactionalType() :\r\n\t\texecution(public * ((@Transactional *)+).*(..)) && within(@Transactional *);\r\n\r\n\t\/**\r\n\t * Matches the execution of any method with the \r\n\t * Transactional annotation.\r\n\t *\/\r\n\tprivate pointcut executionOfTransactionalMethod() :\r\n\t\texecution(@Transactional * *(..));\r\n\r\n\t\/**\r\n\t * Definition of pointcut from super aspect - matched join points\r\n\t * will have Spring transaction management applied.\r\n\t *\/\t\r\n\tprotected pointcut transactionalMethodExecution(Object txObject) :\r\n\t\t(executionOfAnyPublicMethodInAtTransactionalType()\r\n\t\t || executionOfTransactionalMethod() )\r\n\t\t && this(txObject);\r\n\r\n}\r\n","old_contents":"\/*\r\n * Copyright 2002-2010 the original author or authors.\r\n *\r\n * Licensed under the Apache License, Version 2.0 (the \"License\");\r\n * you may not use this file except in compliance with the License.\r\n * You may obtain a copy of the License at\r\n *\r\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\r\n *\r\n * Unless required by applicable law or agreed to in writing, software\r\n * distributed under the License is distributed on an \"AS IS\" BASIS,\r\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n * See the License for the specific language governing permissions and\r\n * limitations under the License.\r\n *\/\r\n\r\npackage org.springframework.transaction.aspectj;\r\n\r\nimport org.springframework.transaction.annotation.AnnotationTransactionAttributeSource;\r\nimport org.springframework.transaction.annotation.Transactional;\r\n\r\n\/**\r\n * Concrete AspectJ transaction aspect using Spring's @Transactional annotation.\r\n * \r\n * <p>When using this aspect, you <i>must<\/i> annotate the implementation class\r\n * (and\/or methods within that class), <i>not<\/i> the interface (if any) that\r\n * the class implements. AspectJ follows Java's rule that annotations on \r\n * interfaces are <i>not<\/i> inherited.\r\n *\r\n * <p>An @Transactional annotation on a class specifies the default transaction\r\n * semantics for the execution of any <b>public<\/b> operation in the class.\r\n *\r\n * <p>An @Transactional annotation on a method within the class overrides the\r\n * default transaction semantics given by the class annotation (if present). \r\n * Any method may be annotated (regardless of visibility).\r\n * Annotating non-public methods directly is the only way\r\n * to get transaction demarcation for the execution of such operations.\r\n *\r\n * @author Rod Johnson\r\n * @author Ramnivas Laddad\r\n * @author Adrian Colyer\r\n * @since 2.0\r\n * @see org.springframework.transaction.annotation.Transactional\r\n *\/\r\npublic aspect AnnotationTransactionAspect extends AbstractTransactionAspect {\r\n\r\n\tpublic AnnotationTransactionAspect() {\r\n\t\tsuper(new AnnotationTransactionAttributeSource(false));\r\n\t}\r\n\r\n\t\/**\r\n\t * Matches the execution of any public method in a type with the\r\n\t * Transactional annotation, or any subtype of a type with the\r\n\t * Transactional annotation.\r\n\t *\/\r\n\tprivate pointcut executionOfAnyPublicMethodInAtTransactionalType() :\r\n\t\texecution(public * ((@Transactional *)+).*(..)) && within(@Transactional);\r\n\r\n\t\/**\r\n\t * Matches the execution of any method with the \r\n\t * Transactional annotation.\r\n\t *\/\r\n\tprivate pointcut executionOfTransactionalMethod() :\r\n\t\texecution(@Transactional * *(..));\r\n\r\n\t\/**\r\n\t * Definition of pointcut from super aspect - matched join points\r\n\t * will have Spring transaction management applied.\r\n\t *\/\t\r\n\tprotected pointcut transactionalMethodExecution(Object txObject) :\r\n\t\t(executionOfAnyPublicMethodInAtTransactionalType()\r\n\t\t || executionOfTransactionalMethod() )\r\n\t\t && this(txObject);\r\n\r\n}\r\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"1077cfeb12e0615bf0088ae1d5bb524bce9263ad","subject":"Event printing commented","message":"Event printing commented\n","repos":"selig\/qea","old_file":"code\/qea\/src\/benchmark\/competition\/java\/larva\/monitoring\/LarvaTenAspect.aj","new_file":"code\/qea\/src\/benchmark\/competition\/java\/larva\/monitoring\/LarvaTenAspect.aj","new_contents":"package benchmark.competition.java.larva.monitoring;\r\n\r\nimport monitoring.impl.MonitorFactory;\r\nimport monitoring.intf.Monitor;\r\nimport properties.Property;\r\nimport properties.competition.Larva;\r\nimport structure.impl.other.Verdict;\r\nimport structure.intf.QEA;\r\nimport benchmark.competition.java.larva.transactionsystem.UserSession;\r\n\r\npublic aspect LarvaTenAspect {\r\n\r\n\tprivate final Monitor monitor;\r\n\r\n\tprivate final int OPEN_SESSION = 1;\r\n\tprivate final int CLOSE_SESSION = 2;\r\n\tprivate final int LOG = 3;\r\n\r\n\tpublic LarvaTenAspect() {\r\n\t\tQEA qea = new Larva().make(Property.LARVA_TEN);\r\n\t\tmonitor = MonitorFactory.create(qea);\r\n\t}\r\n\r\n\tpointcut openSession(UserSession session) :\r\n\t\tcall(void UserSession.openSession()) && target(session);\r\n\r\n\tpointcut closeSession(UserSession session) :\r\n\t\tcall(void UserSession.closeSession()) && target(session);\r\n\r\n\tpointcut log(UserSession session) :\r\n\t\tcall(void UserSession.log(String)) && target(session);\r\n\r\n\tbefore(UserSession session) : openSession(session) {\r\n\/\/\t\tSystem.out.println(\">> openSession(\" + session.getOwner() + \")\");\r\n\t\tVerdict verdict = monitor.step(OPEN_SESSION, session.getOwner());\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err.println(\"Violation in Larva 10. [userId=\"\r\n\t\t\t\t\t+ session.getOwner() + \"] [sid=\" + session.getId()\r\n\t\t\t\t\t+ \"]. Logging can only be made to an active session.\");\r\n\t\t}\r\n\t};\r\n\r\n\tbefore(UserSession session) : closeSession(session) {\r\n\/\/\t\tSystem.out.println(\">> closeSession(\" + session.getOwner() + \")\");\r\n\t\tVerdict verdict = monitor.step(CLOSE_SESSION, session.getOwner());\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err.println(\"Violation in Larva 10. [userId=\"\r\n\t\t\t\t\t+ session.getOwner() + \"] [sid=\" + session.getId()\r\n\t\t\t\t\t+ \"]. Logging can only be made to an active session.\");\r\n\t\t}\r\n\t};\r\n\r\n\tbefore(UserSession session) : log(session) {\r\n\/\/\t\tSystem.out.println(\">> log(\" + session.getOwner() + \")\");\r\n\t\tVerdict verdict = monitor.step(LOG, session.getOwner());\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err.println(\"Violation in Larva 10. [userId=\"\r\n\t\t\t\t\t+ session.getOwner() + \"] [sid=\" + session.getId()\r\n\t\t\t\t\t+ \"]. Logging can only be made to an active session.\");\r\n\t\t}\r\n\t};\r\n}\r\n","old_contents":"package benchmark.competition.java.larva.monitoring;\r\n\r\nimport monitoring.impl.MonitorFactory;\r\nimport monitoring.intf.Monitor;\r\nimport properties.Property;\r\nimport properties.competition.Larva;\r\nimport structure.impl.other.Verdict;\r\nimport structure.intf.QEA;\r\nimport benchmark.competition.java.larva.transactionsystem.UserSession;\r\n\r\npublic aspect LarvaTenAspect {\r\n\r\n\tprivate final Monitor monitor;\r\n\r\n\tprivate final int OPEN_SESSION = 1;\r\n\tprivate final int CLOSE_SESSION = 2;\r\n\tprivate final int LOG = 3;\r\n\r\n\tpublic LarvaTenAspect() {\r\n\t\tQEA qea = new Larva().make(Property.LARVA_TEN);\r\n\t\tmonitor = MonitorFactory.create(qea);\r\n\t}\r\n\r\n\tpointcut openSession(UserSession session) :\r\n\t\tcall(void UserSession.openSession()) && target(session);\r\n\r\n\tpointcut closeSession(UserSession session) :\r\n\t\tcall(void UserSession.closeSession()) && target(session);\r\n\r\n\tpointcut log(UserSession session) :\r\n\t\tcall(void UserSession.log(String)) && target(session);\r\n\r\n\tbefore(UserSession session) : openSession(session) {\r\n\t\tSystem.out.println(\">> openSession(\" + session.getOwner() + \")\");\r\n\t\tVerdict verdict = monitor.step(OPEN_SESSION, session.getOwner());\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err.println(\"Violation in Larva 10. [userId=\"\r\n\t\t\t\t\t+ session.getOwner() + \"] [sid=\" + session.getId()\r\n\t\t\t\t\t+ \"]. Logging can only be made to an active session.\");\r\n\t\t}\r\n\t};\r\n\r\n\tbefore(UserSession session) : closeSession(session) {\r\n\t\tSystem.out.println(\">> closeSession(\" + session.getOwner() + \")\");\r\n\t\tVerdict verdict = monitor.step(CLOSE_SESSION, session.getOwner());\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err.println(\"Violation in Larva 10. [userId=\"\r\n\t\t\t\t\t+ session.getOwner() + \"] [sid=\" + session.getId()\r\n\t\t\t\t\t+ \"]. Logging can only be made to an active session.\");\r\n\t\t}\r\n\t};\r\n\r\n\tbefore(UserSession session) : log(session) {\r\n\t\tSystem.out.println(\">> log(\" + session.getOwner() + \")\");\r\n\t\tVerdict verdict = monitor.step(LOG, session.getOwner());\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err.println(\"Violation in Larva 10. [userId=\"\r\n\t\t\t\t\t+ session.getOwner() + \"] [sid=\" + session.getId()\r\n\t\t\t\t\t+ \"]. Logging can only be made to an active session.\");\r\n\t\t}\r\n\t};\r\n}\r\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"b3e773c898aca02a9578ad673cd1965403550b0f","subject":"removed dead imports","message":"removed dead imports\n","repos":"eigengo\/monitor,DataDog\/monitor,DataDog\/monitor,eigengo\/monitor","old_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/AbstractMonitoringAspect.aj","new_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/AbstractMonitoringAspect.aj","new_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport com.typesafe.config.Config;\nimport org.eigengo.monitor.agent.AgentConfiguration;\nimport org.eigengo.monitor.agent.AgentConfigurationFactory;\nimport org.eigengo.monitor.agent.CommonAgentConfiguration;\nimport org.eigengo.monitor.output.CounterInterface;\nimport org.eigengo.monitor.output.NullCounterInterface;\nimport scala.Function1;\n\nabstract aspect AbstractMonitoringAspect {\n\n    protected final CounterInterface createCounterInterface(CommonAgentConfiguration configuration) {\n        try {\n            CounterInterface counterInterface = (CounterInterface)Class.forName(configuration.counterInterfaceClassName()).newInstance();\n            return counterInterface;\n        } catch (final ReflectiveOperationException e) {\n            return new NullCounterInterface();\n        } catch (final ClassCastException e) {\n            return new NullCounterInterface();\n        }\n    }\n\n    protected final <A> AgentConfiguration<A> getAgentConfiguration(String agentName, Function1<Config, A> agent) {\n        return AgentConfigurationFactory.getAgentCofiguration(agentName, agent);\n    }\n}\n","old_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport com.typesafe.config.Config;\nimport org.eigengo.monitor.agent.AgentConfiguration;\nimport org.eigengo.monitor.agent.AgentConfigurationFactory;\nimport org.eigengo.monitor.agent.CommonAgentConfiguration;\nimport org.eigengo.monitor.output.CounterInterface;\nimport org.eigengo.monitor.output.NullCounterInterface;\nimport scala.Function1;\n\nimport java.util.concurrent.ConcurrentHashMap;\nimport java.util.concurrent.atomic.AtomicLong;\n\nabstract aspect AbstractMonitoringAspect {\n\n    protected final CounterInterface createCounterInterface(CommonAgentConfiguration configuration) {\n        try {\n            CounterInterface counterInterface = (CounterInterface)Class.forName(configuration.counterInterfaceClassName()).newInstance();\n            return counterInterface;\n        } catch (final ReflectiveOperationException e) {\n            return new NullCounterInterface();\n        } catch (final ClassCastException e) {\n            return new NullCounterInterface();\n        }\n    }\n\n    protected final <A> AgentConfiguration<A> getAgentConfiguration(String agentName, Function1<Config, A> agent) {\n        return AgentConfigurationFactory.getAgentCofiguration(agentName, agent);\n    }\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"5e36e078cc67b71ef2da0b6ada26e8ba28b24950","subject":"Slight rewrite","message":"Slight rewrite\n","repos":"ties\/winstone","old_file":"winstone\/src\/main\/aspectj\/RateLimitingAspect.aj","new_file":"winstone\/src\/main\/aspectj\/RateLimitingAspect.aj","new_contents":"import net.winstone.core.WinstoneConstant;\nimport org.slf4j.LoggerFactory;\n\n\/\/ Java EE servlet API\nimport javax.servlet.Servlet;\nimport javax.servlet.ServletRequest;\nimport javax.servlet.ServletResponse;\nimport javax.servlet.http.HttpServlet;\n\n\/\/ Used to scope pointcuts\nimport net.winstone.core.listener.RequestHandlerThread;\nimport net.winstone.core.ServletConfiguration;\nimport net.winstone.core.SimpleRequestDispatcher;\n\n\n\/\/ Rate Limiter\nimport edu.utwente.aop.tools.RateLimiter;\nimport java.util.concurrent.TimeUnit;\n\n\/\/ exceptions from Servlet.service(..)\nimport java.io.IOException;\nimport javax.servlet.ServletException;\nimport javax.servlet.http.HttpServletResponse;\n\n\/\/ We redirect the call flow to error servlet\nimport net.winstone.servlet.ErrorServlet;\n\n\/**\n * Ensure that the request is allowed by the RateLimiter before continuing..\n *\/\npublic privileged aspect RateLimitingAspect  percflow(processRequest()) {\n    private enum State { NOTICKET, TICKET, NOTICKET_AVAILABLE };\n\n    public final int RESPONSE_TIME_MS = 1000;\n\n    \/** public because it is implicitly accessed from WebAppConfiguration *\/\n    public State state = State.NOTICKET;\n\n    static org.slf4j.Logger logger = LoggerFactory.getLogger(Servlet.class);\n    \/\/ Allow 5 requests per limit\n    private static RateLimiter limits = new RateLimiter(5, 1, TimeUnit.MINUTES);\n\n    \/**\n     * Pointcut that captures all requests flows in which a request is handled.\n     * This is used to instantiate this aspect per request that is handled.\n     *\n     * within(RequestHandlerThread) is not needed because processRequest is private, and the compositional\n     * behaviour that would result from calling this using a priviliged aspect probably\n     * would be sensible.\n     *\/\n    pointcut processRequest(): call(void RequestHandlerThread.processRequest(..));\n\n    \/**\n     * Only service calls from within the configuration should be augmented\n     *\/\n    pointcut inWinstoneServletConfiguration(): within(ServletConfiguration);\n\n    \/**\n     * When the control flow has reached HttpServletResponse.sendError we disable the ratelimiting\n     *\/\n    pointcut handlingError(): cflow(call(void HttpServletResponse.sendError(int, String)));\n\n    \/** Around did not work when trying to abstract call(...) && args into a seperate pointcut\n     * @throws IOException when sendError throws an exception.\n     *\/\n    void around(ServletRequest req, ServletResponse resp) throws IOException:\n            inWinstoneServletConfiguration() && !handlingError() &&\n            call(void Servlet.service(..)) && args(req, resp) {\n        if (!ensureTicket()) {\n            \/\/ Instantiate new 503-UNAVAILABLE\n            logger.info(\"No tickets: redirecting request to 503\");\n            ((HttpServletResponse) resp).sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE, \"Rate limit reached - Throttled\");\n        } else {\n            proceed(req, resp);\n        }\n    }\n\n    \/**\n     * Try to get a ticket from the state machine\n     * @return true when this aspect instance (control flow) has a valid ticket\n     *\/\n    private boolean ensureTicket() {\n        switch (state) {\n            case TICKET:\n                logger.info(\"Re-using ticket\");\n                break;\n            case NOTICKET:\n                if (limits.acquire(RESPONSE_TIME_MS)) {\n                    logger.info(\"Acquired new ticket for {}\", this);\n                    state = State.TICKET;\n                } else {\n                    state = State.NOTICKET_AVAILABLE;\n                }\n                break;\n            case NOTICKET_AVAILABLE:\n                logger.info(\"No tickets available\");\n                break;\n        }\n\n        return state == State.TICKET;\n    }\n}\n","old_contents":"import net.winstone.core.WinstoneConstant;\nimport org.slf4j.LoggerFactory;\n\n\/\/ Java EE servlet API\nimport javax.servlet.Servlet;\nimport javax.servlet.ServletRequest;\nimport javax.servlet.ServletResponse;\nimport javax.servlet.http.HttpServlet;\n\n\/\/ Used to scope pointcuts\nimport net.winstone.core.listener.RequestHandlerThread;\nimport net.winstone.core.ServletConfiguration;\nimport net.winstone.core.SimpleRequestDispatcher;\n\n\n\/\/ Rate Limiter\nimport edu.utwente.aop.tools.RateLimiter;\nimport java.util.concurrent.TimeUnit;\n\n\/\/ exceptions from Servlet.service(..)\nimport java.io.IOException;\nimport javax.servlet.ServletException;\nimport javax.servlet.http.HttpServletResponse;\n\n\/\/ We redirect the call flow to error servlet\nimport net.winstone.servlet.ErrorServlet;\n\n\/**\n * Ensure that the request is allowed by the RateLimiter before continuing..\n *\/\npublic privileged aspect RateLimitingAspect  percflow(processRequest()) {\n    private enum State { NOTICKET, TICKET, NOTICKET_AVAILABLE };\n\n    public final int RESPONSE_TIME_MS = 1000;\n\n    \/** public because it is implicitly accessed from WebAppConfiguration *\/\n    public State state = State.NOTICKET;\n\n    static org.slf4j.Logger logger = LoggerFactory.getLogger(Servlet.class);\n    \/\/ Allow 5 requests per limit\n    private static RateLimiter limits = new RateLimiter(5, 1, TimeUnit.MINUTES);\n\n    \/**\n     * Pointcut that captures all requests flows in which a request is handled.\n     * This is used to instantiate this aspect per request that is handled.\n     *\n     * within(RequestHandlerThread) is not needed because processRequest is private, and the compositional\n     * behaviour that would result from calling this using a priviliged aspect probably\n     * would be sensible.\n     *\/\n    pointcut processRequest(): call(void RequestHandlerThread.processRequest(..));\n\n    \/**\n     * Only service calls from within the configuration should be augmented\n     *\/\n    pointcut inWinstoneServletConfiguration(): within(ServletConfiguration);\n\n    \/**\n     * When the control flow has reached HttpServletResponse.sendError we disable the ratelimiting\n     *\/\n    pointcut handlingError(): cflow(call(void HttpServletResponse.sendError(int, String)));\n\n    \/** Around did not work when trying to abstract call(...) && args into a seperate pointcut\n     * @throws IOException when sendError throws an exception.\n     *\/\n    void around(ServletRequest req, ServletResponse resp) throws IOException: inWinstoneServletConfiguration() && !handlingError() && call(void Servlet.service(..)) && args(req, resp) {\n\n        ensureTicket();\n\n        if (state != State.TICKET) {\n            \/\/ Instantiate new 503-UNAVAILABLE\n            logger.info(\"Redirecting request to 503\");\n            ((HttpServletResponse) resp).sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE, \"Rate limit reached - Throttled\");\n        } else {\n            proceed(req, resp);\n        }\n    }\n\n    \/**\n     * Try to get a ticket from the state machine\n     *\/\n    private void ensureTicket() {\n        switch (state) {\n            case TICKET:\n                logger.info(\"Re-using ticket\");\n                break;\n            case NOTICKET:\n                logger.info(\"Trying to acquire ticket for \" + this);\n                if (limits.acquire(RESPONSE_TIME_MS)) {\n                    logger.info(\"Acquired ticket\");\n                    state = State.TICKET;\n                } else {\n                    state = State.NOTICKET_AVAILABLE;\n                }\n                break;\n            case NOTICKET_AVAILABLE:\n                logger.info(\"No tickets available\");\n                break;\n        }\n    }\n}\n","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"bd62685768e7eb72d73d2c2bd10ea4a99537f5a6","subject":"type patterns fixed","message":"type patterns fixed\n","repos":"volodarsky\/activeobject","old_file":"aspect\/src\/main\/aspect\/org\/jvnet\/zephyr\/activeobject\/aspect\/ActiveObjectAspect.aj","new_file":"aspect\/src\/main\/aspect\/org\/jvnet\/zephyr\/activeobject\/aspect\/ActiveObjectAspect.aj","new_contents":"\/*\n * The MIT License (MIT)\n *\n * Copyright (c) 2015 Igor Konev\n *\n * Permission is hereby granted, free of charge, to any person obtaining a copy\n * of this software and associated documentation files (the \"Software\"), to deal\n * in the Software without restriction, including without limitation the rights\n * to use, copy, modify, merge, publish, distribute, sublicense, and\/or sell\n * copies of the Software, and to permit persons to whom the Software is\n * furnished to do so, subject to the following conditions:\n *\n * The above copyright notice and this permission notice shall be included in\n * all copies or substantial portions of the Software.\n *\n * THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n * THE SOFTWARE.\n *\/\n\npackage org.jvnet.zephyr.activeobject.aspect;\n\nimport org.jvnet.zephyr.activeobject.annotation.Active;\nimport org.jvnet.zephyr.activeobject.annotation.Exclude;\nimport org.jvnet.zephyr.activeobject.annotation.Include;\nimport org.jvnet.zephyr.activeobject.annotation.Oneway;\nimport org.jvnet.zephyr.activeobject.disposer.Disposer;\nimport org.jvnet.zephyr.activeobject.mailbox.Mailbox;\nimport org.jvnet.zephyr.activeobject.mailbox.MailboxFactory;\nimport org.jvnet.zephyr.activeobject.mailbox.ReflectiveMailboxFactory;\nimport org.jvnet.zephyr.activeobject.support.ActiveObjectThread;\nimport org.jvnet.zephyr.activeobject.util.concurrent.RunnableFutureTask;\n\nimport java.lang.reflect.Constructor;\nimport java.lang.reflect.InvocationTargetException;\nimport java.util.concurrent.ExecutionException;\nimport java.util.concurrent.RunnableFuture;\nimport java.util.concurrent.TimeUnit;\nimport java.util.concurrent.TimeoutException;\n\npublic final aspect ActiveObjectAspect pertypewithin(ActiveObject+) {\n\n    declare error: execution(@Include @Exclude * *.*(..)): \"@Include and @Exclude on the same method are not allowed\";\n    declare error: execution(@Include static * *.*(..)): \"@Include on a static method is not allowed\";\n    declare error: execution(@Exclude static * *.*(..)): \"@Exclude on a static method is not allowed\";\n    declare error: execution(@Oneway static * *.*(..)): \"@Oneway on a static method is not allowed\";\n    declare error: execution(@Oneway !void *.*(..)): \"@Oneway requires void return type\";\n    declare error: execution(@Oneway * *.*(..) throws Throwable+ && !(Error+ || RuntimeException+)):\n            \"@Oneway allows throwing unchecked exceptions only\";\n    declare warning: execution(@Include public * *.*(..)): \"@Include on a public method is redundand\";\n    declare warning: execution(@Exclude !public * *.*(..)): \"@Exclude on a non-public method is redundand\";\n    declare parents: @Active * implements ActiveObject;\n\n    private static final Disposer disposer = new Disposer();\n    private Class<?> declaringType;\n    private MailboxFactory mailboxFactory;\n    private long timeout;\n    private ActiveObjectThread ActiveObject.thread;\n\n    after() returning: staticinitialization(ActiveObject+) {\n        declaringType = thisJoinPointStaticPart.getSignature().getDeclaringType();\n        Active annotation = declaringType.getAnnotation(Active.class);\n\n        Class<?> cls = annotation.mailbox();\n        Constructor<?> constructor;\n        try {\n            constructor = (Constructor<?>) cls.getConstructor();\n        } catch (NoSuchMethodException e) {\n            throw new RuntimeException(e);\n        }\n        if (Mailbox.class.isAssignableFrom(cls)) {\n            mailboxFactory = new ReflectiveMailboxFactory((Constructor<? extends Mailbox>) constructor);\n        } else {\n            try {\n                mailboxFactory = (MailboxFactory) constructor.newInstance();\n            } catch (InstantiationException | IllegalAccessException e) {\n                throw new RuntimeException(e);\n            } catch (InvocationTargetException e) {\n                Throwable cause = e.getCause();\n                if (cause instanceof Error) {\n                    throw (Error) cause;\n                } else if (cause instanceof RuntimeException) {\n                    throw (RuntimeException) cause;\n                } else {\n                    throw new RuntimeException(cause);\n                }\n            }\n        }\n\n        timeout = annotation.timeout();\n        if (timeout < 0) {\n            throw new RuntimeException(\"timeout < 0\");\n        }\n    }\n\n    after(ActiveObject obj) returning: initialization((ActiveObject+ && !ActiveObject).new(..)) && this(obj) {\n        if (obj.getClass() == declaringType) {\n            ActiveObjectThread thread = new ActiveObjectThread(mailboxFactory.create());\n            thread.setName(obj.getClass().getName() + '@' + Integer.toHexString(System.identityHashCode(obj)));\n            thread.setDaemon(true);\n            disposer.register(obj, thread);\n            obj.thread = thread;\n            thread.start();\n        }\n    }\n\n    Object around(final ActiveObject obj): (execution(!@Exclude !@Oneway public * ActiveObject+.*(..))\n            || execution(@Include !@Oneway !public * ActiveObject+.*(..))) && this(obj) {\n        ActiveObjectThread thread = obj.thread;\n        if (Thread.currentThread() == thread) {\n            return proceed(obj);\n        }\n\n        RunnableFuture<?> task = new RunnableFutureTask<Object>() {\n            @Override\n            public void run() {\n                Object result;\n                try {\n                    result = proceed(obj);\n                } catch (Throwable e) {\n                    setException(e);\n                    return;\n                }\n                set(result);\n            }\n        };\n\n        boolean interrupted = false;\n        try {\n            while (true) {\n                try {\n                    thread.getMailbox().enqueue(task);\n                    break;\n                } catch (InterruptedException ignored) {\n                    interrupted = true;\n                }\n            }\n        } finally {\n            if (interrupted) {\n                Thread.currentThread().interrupt();\n            }\n        }\n\n        try {\n            interrupted = false;\n            try {\n                while (true) {\n                    try {\n                        if (timeout > 0) {\n                            try {\n                                return task.get(timeout, TimeUnit.MILLISECONDS);\n                            } catch (TimeoutException e) {\n                                throw new RuntimeException(e);\n                            }\n                        } else {\n                            return task.get();\n                        }\n                    } catch (InterruptedException ignored) {\n                        interrupted = true;\n                    }\n                }\n            } finally {\n                if (interrupted) {\n                    Thread.currentThread().interrupt();\n                }\n            }\n        } catch (ExecutionException e) {\n            throw ActiveObjectAspect.<RuntimeException>throwException(e.getCause());\n        }\n    }\n\n    @SuppressWarnings(\"unchecked\")\n    private static <E extends Throwable> E throwException(Throwable exception) throws E {\n        throw (E) exception;\n    }\n\n    void around(final ActiveObject obj): (execution(!@Exclude @Oneway public void ActiveObject+.*(..))\n            || execution(@Include @Oneway !public void ActiveObject+.*(..))) && this(obj) {\n        ActiveObjectThread thread = obj.thread;\n        if (Thread.currentThread() == thread) {\n            proceed(obj);\n            return;\n        }\n\n        Runnable task = new Runnable() {\n            @Override\n            public void run() {\n                try {\n                    proceed(obj);\n                } catch (Throwable e) {\n                    e.printStackTrace();\n                }\n            }\n        };\n\n        boolean interrupted = false;\n        try {\n            while (true) {\n                try {\n                    thread.getMailbox().enqueue(task);\n                    break;\n                } catch (InterruptedException ignored) {\n                    interrupted = true;\n                }\n            }\n        } finally {\n            if (interrupted) {\n                Thread.currentThread().interrupt();\n            }\n        }\n    }\n\n    private interface ActiveObject {\n    }\n}\n","old_contents":"\/*\n * The MIT License (MIT)\n *\n * Copyright (c) 2015 Igor Konev\n *\n * Permission is hereby granted, free of charge, to any person obtaining a copy\n * of this software and associated documentation files (the \"Software\"), to deal\n * in the Software without restriction, including without limitation the rights\n * to use, copy, modify, merge, publish, distribute, sublicense, and\/or sell\n * copies of the Software, and to permit persons to whom the Software is\n * furnished to do so, subject to the following conditions:\n *\n * The above copyright notice and this permission notice shall be included in\n * all copies or substantial portions of the Software.\n *\n * THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n * THE SOFTWARE.\n *\/\n\npackage org.jvnet.zephyr.activeobject.aspect;\n\nimport org.jvnet.zephyr.activeobject.annotation.Active;\nimport org.jvnet.zephyr.activeobject.annotation.Exclude;\nimport org.jvnet.zephyr.activeobject.annotation.Include;\nimport org.jvnet.zephyr.activeobject.annotation.Oneway;\nimport org.jvnet.zephyr.activeobject.disposer.Disposer;\nimport org.jvnet.zephyr.activeobject.mailbox.Mailbox;\nimport org.jvnet.zephyr.activeobject.mailbox.MailboxFactory;\nimport org.jvnet.zephyr.activeobject.mailbox.ReflectiveMailboxFactory;\nimport org.jvnet.zephyr.activeobject.support.ActiveObjectThread;\nimport org.jvnet.zephyr.activeobject.util.concurrent.RunnableFutureTask;\n\nimport java.lang.reflect.Constructor;\nimport java.lang.reflect.InvocationTargetException;\nimport java.util.concurrent.ExecutionException;\nimport java.util.concurrent.RunnableFuture;\nimport java.util.concurrent.TimeUnit;\nimport java.util.concurrent.TimeoutException;\n\npublic final aspect ActiveObjectAspect pertypewithin(ActiveObject+) {\n\n    declare error: execution(@Include @Exclude * *.*(..)): \"@Include and @Exclude on the same method are not allowed\";\n    declare error: execution(@Include static * *.*(..)): \"@Include on a static method is not allowed\";\n    declare error: execution(@Exclude static * *.*(..)): \"@Exclude on a static method is not allowed\";\n    declare error: execution(@Oneway static * *.*(..)): \"@Oneway on a static method is not allowed\";\n    declare error: execution(@Oneway !void *.*(..)): \"@Oneway requires void return type\";\n    declare error: execution(@Oneway * *.*(..) throws Throwable+ && !(Error+ || RuntimeException+)):\n            \"@Oneway allows throwing unchecked exceptions only\";\n    declare warning: execution(@Include public * *.*(..)): \"@Include on a public method is redundand\";\n    declare warning: execution(@Exclude !public * *.*(..)): \"@Exclude on a non-public method is redundand\";\n    declare parents: @Active * implements ActiveObject;\n\n    private static final Disposer disposer = new Disposer();\n    private Class<?> declaringType;\n    private MailboxFactory mailboxFactory;\n    private long timeout;\n    private ActiveObjectThread ActiveObject.thread;\n\n    after() returning: staticinitialization(*) {\n        declaringType = thisJoinPointStaticPart.getSignature().getDeclaringType();\n        Active annotation = declaringType.getAnnotation(Active.class);\n\n        Class<?> cls = annotation.mailbox();\n        Constructor<?> constructor;\n        try {\n            constructor = (Constructor<?>) cls.getConstructor();\n        } catch (NoSuchMethodException e) {\n            throw new RuntimeException(e);\n        }\n        if (Mailbox.class.isAssignableFrom(cls)) {\n            mailboxFactory = new ReflectiveMailboxFactory((Constructor<? extends Mailbox>) constructor);\n        } else {\n            try {\n                mailboxFactory = (MailboxFactory) constructor.newInstance();\n            } catch (InstantiationException | IllegalAccessException e) {\n                throw new RuntimeException(e);\n            } catch (InvocationTargetException e) {\n                Throwable cause = e.getCause();\n                if (cause instanceof Error) {\n                    throw (Error) cause;\n                } else if (cause instanceof RuntimeException) {\n                    throw (RuntimeException) cause;\n                } else {\n                    throw new RuntimeException(cause);\n                }\n            }\n        }\n\n        timeout = annotation.timeout();\n        if (timeout < 0) {\n            throw new RuntimeException(\"timeout < 0\");\n        }\n    }\n\n    after(ActiveObject obj) returning: initialization((!ActiveObject).new(..)) && this(obj) {\n        if (obj.getClass() == declaringType) {\n            ActiveObjectThread thread = new ActiveObjectThread(mailboxFactory.create());\n            thread.setName(obj.getClass().getName() + '@' + Integer.toHexString(System.identityHashCode(obj)));\n            thread.setDaemon(true);\n            disposer.register(obj, thread);\n            obj.thread = thread;\n            thread.start();\n        }\n    }\n\n    Object around(final ActiveObject obj): (execution(!@Exclude !@Oneway public * *(..))\n            || execution(@Include !@Oneway !public * *(..))) && this(obj) {\n        ActiveObjectThread thread = obj.thread;\n        if (Thread.currentThread() == thread) {\n            return proceed(obj);\n        }\n\n        RunnableFuture<?> task = new RunnableFutureTask<Object>() {\n            @Override\n            public void run() {\n                Object result;\n                try {\n                    result = proceed(obj);\n                } catch (Throwable e) {\n                    setException(e);\n                    return;\n                }\n                set(result);\n            }\n        };\n\n        boolean interrupted = false;\n        try {\n            while (true) {\n                try {\n                    thread.getMailbox().enqueue(task);\n                    break;\n                } catch (InterruptedException ignored) {\n                    interrupted = true;\n                }\n            }\n        } finally {\n            if (interrupted) {\n                Thread.currentThread().interrupt();\n            }\n        }\n\n        try {\n            interrupted = false;\n            try {\n                while (true) {\n                    try {\n                        if (timeout > 0) {\n                            try {\n                                return task.get(timeout, TimeUnit.MILLISECONDS);\n                            } catch (TimeoutException e) {\n                                throw new RuntimeException(e);\n                            }\n                        } else {\n                            return task.get();\n                        }\n                    } catch (InterruptedException ignored) {\n                        interrupted = true;\n                    }\n                }\n            } finally {\n                if (interrupted) {\n                    Thread.currentThread().interrupt();\n                }\n            }\n        } catch (ExecutionException e) {\n            throw ActiveObjectAspect.<RuntimeException>throwException(e.getCause());\n        }\n    }\n\n    @SuppressWarnings(\"unchecked\")\n    private static <E extends Throwable> E throwException(Throwable exception) throws E {\n        throw (E) exception;\n    }\n\n    void around(final ActiveObject obj): (execution(!@Exclude @Oneway public void *(..))\n            || execution(@Include @Oneway !public void *(..))) && this(obj) {\n        ActiveObjectThread thread = obj.thread;\n        if (Thread.currentThread() == thread) {\n            proceed(obj);\n            return;\n        }\n\n        Runnable task = new Runnable() {\n            @Override\n            public void run() {\n                try {\n                    proceed(obj);\n                } catch (Throwable e) {\n                    e.printStackTrace();\n                }\n            }\n        };\n\n        boolean interrupted = false;\n        try {\n            while (true) {\n                try {\n                    thread.getMailbox().enqueue(task);\n                    break;\n                } catch (InterruptedException ignored) {\n                    interrupted = true;\n                }\n            }\n        } finally {\n            if (interrupted) {\n                Thread.currentThread().interrupt();\n            }\n        }\n    }\n\n    private interface ActiveObject {\n    }\n}\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"0bef1ef737b85f1355f1df47137a47740dd03f29","subject":"comments for PDFGraph feature","message":"comments for PDFGraph feature\n","repos":"stieglma\/Schafkopfauswerter","old_file":"src\/GraphExport.aj","new_file":"src\/GraphExport.aj","new_contents":"\nimport java.io.ByteArrayInputStream;\nimport java.io.ByteArrayOutputStream;\nimport java.io.IOException;\n\nimport org.apache.pdfbox.pdmodel.PDDocument;\nimport org.apache.pdfbox.util.PDFMergerUtility;\n\nimport de.erichseifert.gral.io.plots.DrawableWriter;\nimport de.erichseifert.gral.io.plots.DrawableWriterFactory;\n\npublic privileged aspect GraphExport {\n\n    \/**\n     * Add graph to PDF\n     *\/\n    after(PDDocument document) returning() throws IOException\n    : execution (* PDFReportListener.drawTable(PDDocument)) \n    && args(document) {\n\n        \/\/ create bytes array from graph\n        ByteArrayOutputStream baos = new ByteArrayOutputStream();\n        DrawableWriter wr = DrawableWriterFactory.getInstance().get(\"application\/pdf\");\n        wr.write(Graph.createPlot(), baos, 800, 600);\n        baos.flush();\n        byte[] bytes = baos.toByteArray();\n        baos.close();\n\n        PDDocument picture = PDDocument.load(new ByteArrayInputStream(bytes));\n        new PDFMergerUtility().appendDocument(document, picture);\n        picture.close();\n    }\n}\n","old_contents":"\nimport java.io.ByteArrayInputStream;\nimport java.io.ByteArrayOutputStream;\nimport java.io.IOException;\n\nimport org.apache.pdfbox.pdmodel.PDDocument;\nimport org.apache.pdfbox.util.PDFMergerUtility;\n\nimport de.erichseifert.gral.io.plots.DrawableWriter;\nimport de.erichseifert.gral.io.plots.DrawableWriterFactory;\n\npublic privileged aspect GraphExport {\n\n    after(PDDocument document) returning() throws IOException\n    : execution (* PDFReportListener.drawTable(PDDocument)) \n    && args(document) {\n\n        \/\/ create bytes array from graph\n        ByteArrayOutputStream baos = new ByteArrayOutputStream();\n        DrawableWriter wr = DrawableWriterFactory.getInstance().get(\"application\/pdf\");\n        wr.write(Graph.createPlot(), baos, 800, 600);\n        baos.flush();\n        byte[] bytes = baos.toByteArray();\n        baos.close();\n\n        PDDocument picture = PDDocument.load(new ByteArrayInputStream(bytes));\n        new PDFMergerUtility().appendDocument(document, picture);\n        picture.close();\n    }\n}\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"34063cf5c1eb85747bc407ecc8d3378b2ca2f33e","subject":"Updated the around pointcuts.","message":"Updated the around pointcuts.\n\nThe important issue is to ensure that the lock\/unlock methods and the\nmonitor steps are performed atomically.\n\nThis still might not be the best approach - it seems artifical as we\nlock an object whilst locking it (tryLock). Perhaps it would be better\nprotected by the monitor object, but if tryLock is false this introduces\nunnecessary contention.","repos":"selig\/qea","old_file":"code\/qea\/src\/benchmark\/competition\/java\/jUnitRV_MMT\/monitoring\/JUnitRV_MMTThreeAspect.aj","new_file":"code\/qea\/src\/benchmark\/competition\/java\/jUnitRV_MMT\/monitoring\/JUnitRV_MMTThreeAspect.aj","new_contents":"package benchmark.competition.java.jUnitRV_MMT.monitoring;\r\n\r\nimport java.util.concurrent.locks.Lock;\r\n\r\nimport monitoring.impl.MonitorFactory;\r\nimport monitoring.intf.Monitor;\r\nimport properties.Property;\r\nimport properties.competition.JavaRV_mmt;\r\nimport structure.impl.other.Verdict;\r\nimport structure.intf.QEA;\r\nimport benchmark.competition.java.jUnitRV_MMT.ExampleLocking;\r\n\r\npublic aspect JUnitRV_MMTThreeAspect {\r\n\r\n\tprivate final Monitor monitor;\r\n\r\n\tprivate final int RUN = 1;\r\n\tprivate final int LOCK_TRUE = 2;\r\n\tprivate final int UNLOCK = 3;\r\n\tprivate final int ACTION = 4;\r\n\r\n\tpublic JUnitRV_MMTThreeAspect() {\r\n\t\tQEA qea = new JavaRV_mmt().make(Property.JAVARV_MMT_THREE);\r\n\t\tmonitor = MonitorFactory.create(qea);\r\n\t}\r\n\r\n\tpointcut run(ExampleLocking thread) : execution(void ExampleLocking.run())\r\n\t\t&& target(thread);\r\n\r\n\tpointcut action(ExampleLocking thread) : call(void ExampleLocking.action())\r\n\t\t&& target(thread);\r\n\r\n\tbefore(ExampleLocking thread) : run(thread) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(RUN, thread);\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [thread=\"\r\n\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n\tboolean around(Lock lockObj, ExampleLocking thread) :\r\n\t\t\tcall(boolean Lock.tryLock())\r\n\t\t\t&& cflow(call(boolean ExampleLocking.lock())) && target(lockObj)\r\n\t\t\t&& this(thread) {\r\n\r\n\t\tboolean result = false;\r\n\t\t\/\/ We perform the lock and the monitor step as an atomic action\r\n\t\t\/\/ i.e. whilst holding the lockObj, so that we cannot be interrupted\r\n\t\tsynchronized (lockObj) {\r\n\t\t\tresult = proceed(lockObj, thread);\t\t\r\n\t\t\tif (result) {\r\n\t\t\t\tVerdict verdict = null;\r\n\t\t\t\t\/\/ Ordering between lockObj and monitor important\r\n\t\t\t\tsynchronized (monitor) {\r\n\t\t\t\t\tverdict = monitor.step(LOCK_TRUE, thread);\r\n\t\t\t\t}\r\n\t\t\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\t\t\tSystem.err\r\n\t\t\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [thread=\"\r\n\t\t\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t\t\t}\r\n\t\r\n\t\t\t}\r\n\t\t}\r\n\t\treturn result;\r\n\t};\r\n\r\n\tvoid around(Lock lockObj, ExampleLocking thread) :\r\n\t\tcall(void Lock.unlock()) && cflow(call(void ExampleLocking.unlock()))\r\n\t\t&& target(lockObj) && this(thread) {\r\n\r\n\t\t\/\/ We perform the unlock and the monitor step as an atomic action\r\n\t\t\/\/ i.e. whilst holding the lockObj, so that we cannot be interrupted\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (lockObj) {\r\n\t\t\tproceed(lockObj, thread);\t\r\n\t\t\t\/\/ Ordering between lockObj and monitor important\r\n\t\t\tsynchronized (monitor) {\r\n\t\t\t\tverdict = monitor.step(LOCK_TRUE, thread);\r\n\t\t\t}\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [thread=\"\r\n\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n\tbefore(ExampleLocking thread) : action(thread) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(ACTION, thread);\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [id=\"\r\n\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n}\r\n","old_contents":"package benchmark.competition.java.jUnitRV_MMT.monitoring;\r\n\r\nimport java.util.concurrent.locks.Lock;\r\n\r\nimport monitoring.impl.MonitorFactory;\r\nimport monitoring.intf.Monitor;\r\nimport properties.Property;\r\nimport properties.competition.JavaRV_mmt;\r\nimport structure.impl.other.Verdict;\r\nimport structure.intf.QEA;\r\nimport benchmark.competition.java.jUnitRV_MMT.ExampleLocking;\r\n\r\npublic aspect JUnitRV_MMTThreeAspect {\r\n\r\n\tprivate final Monitor monitor;\r\n\r\n\tprivate final int RUN = 1;\r\n\tprivate final int LOCK_TRUE = 2;\r\n\tprivate final int UNLOCK = 3;\r\n\tprivate final int ACTION = 4;\r\n\r\n\tpublic JUnitRV_MMTThreeAspect() {\r\n\t\tQEA qea = new JavaRV_mmt().make(Property.JAVARV_MMT_THREE);\r\n\t\tmonitor = MonitorFactory.create(qea);\r\n\t}\r\n\r\n\tpointcut run(ExampleLocking thread) : execution(void ExampleLocking.run())\r\n\t\t&& target(thread);\r\n\r\n\tpointcut action(ExampleLocking thread) : call(void ExampleLocking.action())\r\n\t\t&& target(thread);\r\n\r\n\tbefore(ExampleLocking thread) : run(thread) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(RUN, thread);\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [thread=\"\r\n\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n\tboolean around(Lock lockObj, ExampleLocking thread) :\r\n\t\t\tcall(boolean Lock.tryLock())\r\n\t\t\t&& cflow(call(boolean ExampleLocking.lock())) && target(lockObj)\r\n\t\t\t&& this(thread) {\r\n\r\n\t\tboolean result = false;\r\n\t\tsynchronized (lockObj) {\r\n\t\t\tresult = proceed(lockObj, thread); \/\/ TODO Not sure if this is right\r\n\t\t}\r\n\t\tif (result) {\r\n\t\t\tVerdict verdict = null;\r\n\t\t\tsynchronized (monitor) {\r\n\t\t\t\tverdict = monitor.step(LOCK_TRUE, thread);\r\n\t\t\t}\r\n\t\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\t\tSystem.err\r\n\t\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [thread=\"\r\n\t\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t\t}\r\n\r\n\t\t}\r\n\t\treturn result;\r\n\t};\r\n\r\n\tvoid around(Lock lockObj, ExampleLocking thread) :\r\n\t\tcall(void Lock.unlock()) && cflow(call(void ExampleLocking.unlock()))\r\n\t\t&& target(lockObj) && this(thread) {\r\n\r\n\t\tsynchronized (lockObj) {\r\n\t\t\tproceed(lockObj, thread); \/\/ TODO Not sure if this is right\r\n\t\t}\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(LOCK_TRUE, thread);\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [thread=\"\r\n\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n\tbefore(ExampleLocking thread) : action(thread) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(ACTION, thread);\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [id=\"\r\n\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n}\r\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"ce8f6f822e78229cf81843b646e67bd29633a3df","subject":"BuildManagers weren't deleting invalidated classfiles; dependency tracker was only recording the dependency of Foo$.class on the source of object Foo ... Foo.class is now also recorded; the Eclipse Java builder could copy modified Scala sources to the output folder during incremental builds. Fixes #2428.","message":"BuildManagers weren't deleting invalidated classfiles; dependency tracker was only recording the dependency of Foo$.class on the source of object Foo ... Foo.class is now also recorded; the Eclipse Java builder could copy modified Scala sources to the output folder during incremental builds. Fixes #2428.\n\ngit-svn-id: f4ecfe233223879a4a16cd7937f11b5152963d8e@18920 5e8d7ff9-d8ef-0310-90f0-a4852d11357a\n","repos":"dragos\/scala-ide,romanowski\/scala-ide,wpopielarski\/scala-ide,Kwestor\/scala-ide,pilipolio\/scala-ide,stephenh\/scala-ide,Kwestor\/scala-ide,stephenh\/scala-ide,pilipolio\/scala-ide,Duhemm\/scala-ide,Duhemm\/scala-ide,andrey-ilinykh\/scala-ide,Duhemm\/scala-ide,romanowski\/scala-ide,dragos\/scala-ide,wpopielarski\/scala-ide,wpopielarski\/scala-ide,andrey-ilinykh\/scala-ide,romanowski\/scala-ide,dragos\/scala-ide,aleksi-lukkarinen\/scala-ide,aleksi-lukkarinen\/scala-ide,pilipolio\/scala-ide,sschaef\/scala-ide,stephenh\/scala-ide,mlangc\/scala-ide,Duhemm\/scala-ide,dragos\/scala-ide,romanowski\/scala-ide,scala-ide\/scala-ide,andrey-ilinykh\/scala-ide,mlangc\/scala-ide,aleksi-lukkarinen\/scala-ide,scala-ide\/scala-ide,stephenh\/scala-ide,mlangc\/scala-ide,mlangc\/scala-ide,sschaef\/scala-ide,aleksi-lukkarinen\/scala-ide,Kwestor\/scala-ide,Kwestor\/scala-ide,andrey-ilinykh\/scala-ide,scala-ide\/scala-ide,pilipolio\/scala-ide,sschaef\/scala-ide,scala-ide\/scala-ide,sschaef\/scala-ide,wpopielarski\/scala-ide","old_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/builderoptions\/ScalaJavaBuilderAspect.aj","new_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/builderoptions\/ScalaJavaBuilderAspect.aj","new_contents":"\/*\n * Copyright 2005-2009 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.builderoptions;\n\nimport org.eclipse.core.resources.IResource;\n\nimport java.util.Map;\n\nimport org.eclipse.core.resources.IProject;\nimport org.eclipse.core.resources.IResource;\nimport org.eclipse.core.runtime.CoreException;\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.internal.core.builder.BatchImageBuilder;\nimport org.eclipse.jdt.internal.core.builder.JavaBuilder;\n\/\/import org.eclipse.jdt.internal.core.builder.ClasspathMultiDirectory;\nimport org.eclipse.jdt.internal.core.util.Util;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect ScalaJavaBuilderAspect {\n  pointcut build() :\n    execution(IProject[] ScalaJavaBuilder.build(int, Map, IProgressMonitor) throws CoreException);\n  \n  pointcut cleanOutputFolders(boolean copyBack) :\n    args(copyBack) &&\n    execution(void BatchImageBuilder.cleanOutputFolders(boolean) throws CoreException);\n  \n  pointcut isJavaLikeFileName(String fileName) :\n    args(fileName) &&\n    execution(boolean Util.isJavaLikeFileName(String));  \n  \n  pointcut filterExtraResource(IResource resource) :\n    args(resource) &&\n    execution(boolean JavaBuilder.filterExtraResource(IResource));\n  \n  void around(BatchImageBuilder builder, boolean copyBack) throws CoreException :\n    target(builder) &&\n    cleanOutputFolders(copyBack) &&\n    cflow(build()) {\n    \/\/ Suppress the cleaning behaviour but do the extra resource copying if requested\n    if (copyBack)\n      for (int i = 0, l = builder.sourceLocations.length; i < l; i++) {\n        org.eclipse.jdt.internal.core.builder.ClasspathMultiDirectory sourceLocation = builder.sourceLocations[i];\n        if (sourceLocation.hasIndependentOutputFolder)\n          builder.copyExtraResourcesBack(sourceLocation, false);\n      }\n  }\n  \n  boolean around(String fileName) :\n    isJavaLikeFileName(fileName) &&\n    cflow(build()) &&\n    !cflow(cleanOutputFolders(*)) {\n    if (fileName != null && fileName.endsWith(\"scala\"))\n      return false;\n    else\n      return proceed(fileName);\n  }\n  \n  boolean around(IResource resource) :\n    filterExtraResource(resource) &&\n    cflow(build()) {\n    return resource.getName().endsWith(\".scala\") || proceed(resource);\n  }\n}\n","old_contents":"\/*\n * Copyright 2005-2009 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.builderoptions;\n\nimport java.util.Map;\n\nimport org.eclipse.core.resources.IProject;\nimport org.eclipse.core.runtime.CoreException;\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.internal.core.builder.BatchImageBuilder;\n\/\/import org.eclipse.jdt.internal.core.builder.ClasspathMultiDirectory;\nimport org.eclipse.jdt.internal.core.util.Util;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect ScalaJavaBuilderAspect {\n  pointcut build() :\n    execution(IProject[] ScalaJavaBuilder.build(int, Map, IProgressMonitor) throws CoreException);\n  \n  pointcut cleanOutputFolders(boolean copyBack) :\n    args(copyBack) &&\n    execution(void BatchImageBuilder.cleanOutputFolders(boolean) throws CoreException);\n  \n  pointcut isJavaLikeFileName(String fileName) :\n    args(fileName) &&\n    execution(boolean Util.isJavaLikeFileName(String));  \n  \n  void around(BatchImageBuilder builder, boolean copyBack) throws CoreException :\n    target(builder) &&\n    cleanOutputFolders(copyBack) &&\n    cflow(build()) {\n    \/\/ Suppress the cleaning behaviour but do the extra resource copying if requested\n    if (copyBack)\n      for (int i = 0, l = builder.sourceLocations.length; i < l; i++) {\n        org.eclipse.jdt.internal.core.builder.ClasspathMultiDirectory sourceLocation = builder.sourceLocations[i];\n        if (sourceLocation.hasIndependentOutputFolder)\n          builder.copyExtraResourcesBack(sourceLocation, false);\n      }\n  }\n  \n  boolean around(String fileName) :\n    isJavaLikeFileName(fileName) &&\n    cflow(build()) &&\n    !cflow(cleanOutputFolders(*)) {\n    if (fileName != null && fileName.endsWith(\"scala\"))\n      return false;\n    else\n      return proceed(fileName);\n  }\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"c33c9c32e41c48d2f4a8ce123157d90866d59980","subject":"handling TrackNRestart for Runnable. Refactorization of restart for KCall.","message":"handling TrackNRestart for Runnable.\nRefactorization of restart for KCall.","repos":"awltech\/org.parallelj,christophe-w\/parallelj.runtime","old_file":"org.parallelj\/parallelj\/parallelj-tracknrestart\/src\/main\/java\/org\/parallelj\/tracknrestart\/aspects\/QuartzContextAdapter.aj","new_file":"org.parallelj\/parallelj\/parallelj-tracknrestart\/src\/main\/java\/org\/parallelj\/tracknrestart\/aspects\/QuartzContextAdapter.aj","new_contents":"package org.parallelj.tracknrestart.aspects;\n\nimport java.lang.reflect.Field;\nimport java.lang.reflect.InvocationTargetException;\nimport java.lang.reflect.Method;\nimport java.sql.SQLException;\n\nimport org.apache.log4j.Logger;\nimport org.parallelj.Programs;\nimport org.parallelj.Programs.ProcessHelper;\nimport org.parallelj.internal.kernel.KCall;\nimport org.parallelj.internal.kernel.KProcess;\nimport org.parallelj.internal.reflect.ProgramAdapter.Adapter;\nimport org.parallelj.tracknrestart.annotations.TrackNRestart;\nimport org.parallelj.tracknrestart.listeners.ForEachListener;\nimport org.parallelj.tracknrestart.plugins.TrackNRestartPlugin;\nimport org.quartz.Job;\nimport org.quartz.JobExecutionContext;\nimport org.quartz.JobExecutionException;\nimport org.quartz.JobPersistenceException;\nimport org.parallelj.tracknrestart.ReturnCodes;\n\nprivileged public aspect QuartzContextAdapter percflow (execution(public void Job+.execute(..) throws JobExecutionException)) {\n\t\n\tdeclare precedence :\n\t\torg.parallelj.tracknrestart.aspects.QuartzContextAdapter,\n\t\torg.parallelj.launching.quartz.JobsAdapter;\n\n\tstatic Logger logger = Logger.getLogger(\"org.parallelj.tracknrestart.QuartzContextAdapter\");\n\t\n\tprivate X root;\n\n\tString result = ReturnCodes.SUCCESS.name();\n\t\n\t\/\/---------------------------------------------------------------------------------------------------\n\t\n\tdeclare parents:\n\t\t(@org.parallelj.launching.QuartzExecution *) implements Job;\n\n\tpublic void Job.execute(JobExecutionContext context)\n\t\t\tthrows JobExecutionException {\n\t\t\n\t\tProcessHelper<?> p = null;\n\t\tlogger.debug(\"-----------------------------------------------------------------------------------------------------\");\n\t\tlogger.debug(\"STARTING \/\/J Root Program \"+this.getClass().getName());\n\n\t\tp = Programs.as((Adapter) this);\n\n\t\ttry {\n\t\t\t\/\/TODO voir avec Christophe @IN\n\t\t\tField f = this.getClass().getDeclaredField(\"data1\");\n\t\t\tf.setAccessible(true);\n\t\t\tf.set(this, context.getJobDetail().getJobDataMap().get(\"data1\"));\n\t\t} catch (IllegalArgumentException e) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te.printStackTrace();\n\t\t} catch (IllegalAccessException e) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te.printStackTrace();\n\t\t} catch (SecurityException e) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te.printStackTrace();\n\t\t} catch (NoSuchFieldException e) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te.printStackTrace();\n\t\t}\n\n\t\tp.execute().join();\n\n\t\tlogger.debug(\"ENDING   \/\/J Root Program \"+this.getClass().getName());\n\t\tlogger.debug(\"-----------------------------------------------------------------------------------------------------\");\n\t\tcontext.setResult(String.valueOf(p.getState()));\n\t}\n\n\t\/\/---------------------------------------------------------------------------------------------------\n\t\n\tpublic interface X {};\n\n\tdeclare parents:           \n\t\t(org.quartz.Job+ && !org.quartz.Job) implements X;    \n\n\tdeclare parents:   \n\t\t(org.parallelj.internal.kernel.KCall) implements X;      \n\n\/\/\tdeclare parents:   \n\/\/\t\t(org.parallelj.mirror.Element+) implements X;      \n\n\/\/\tdeclare parents:   \n\/\/\t\t(org.parallelj.internal.kernel.callback.Entry+) implements X; \n\t\n\/\/\tdeclare parents:   \n\/\/\t\t(org.parallelj.internal.kernel.callback.Exit+) implements X; \n\t\n\tprivate ForEachListener X.forEachListener = null;       \n\t\n\tpublic ForEachListener X.getForEachListener() { \n\t\treturn forEachListener;\n\t}\n\t\n\tpublic void X.setForEachListener(ForEachListener forEachListener) {\n\t\tthis.forEachListener = forEachListener;\n\t}\n\t\n\tprivate String X.restartedFireInstanceId = null;       \n\t\n\tpublic String X.getRestartedFireInstanceId() {\n\t\treturn restartedFireInstanceId;\n\t}\n\t\n\tpublic void X.setRestartedFireInstanceId(String restartedFireInstanceId) {\n\t\tthis.restartedFireInstanceId = restartedFireInstanceId;\n\t}\n\t\n\t\/\/---------------------------------------------------------------------------------------------------\n\t\n\t\/\/JobExecutionContext --> Job\n\tbefore(X self, JobExecutionContext jobExecutionContext): \n\t\texecution(public void Job+.execute(..) throws JobExecutionException) \n\t\t&& this(self) \n\t\t&& args(jobExecutionContext) {\n\n\t\t\/\/logger.debug(\"ASPECT BEFORE:execution(public void Job+.execute(..) throws JobExecutionException) && this(self) && args(jobExecutionContext)\");\n\n\t\tself.setRestartedFireInstanceId(jobExecutionContext.getJobDetail().getJobDataMap().getString(TrackNRestartPlugin.RESTARTED_FIRE_INSTANCE_ID));\n\t\tself.setForEachListener((ForEachListener) jobExecutionContext.getJobDetail().getJobDataMap().get(TrackNRestartPlugin.FOR_EACH_LISTENER));\n\t\t\/\/logger.debug(\"job=\"+self); \n\t\t\/\/logger.debug(\"restartedFireInstanceId=\"+self.getRestartedFireInstanceId()); \n\t\t\/\/logger.debug(\"forEachListener=\"+self.getForEachListener());\n\n\t\tthis.root = self;\n\t}\n\n\tafter(X self, JobExecutionContext jobExecutionContext): \n\t\texecution(public void Job+.execute(..) throws JobExecutionException) \n\t\t&& this(self) \n\t\t&& args(jobExecutionContext) {\n\n\t\t\/\/logger.debug(\"ASPECT AFTER:execution(public void Job+.execute(..) throws JobExecutionException) && this(self) && args(jobExecutionContext)\");\n\t\tjobExecutionContext.setResult(result);\n\t}\n\t\n\tafter(X self): \n\t\texecution(protected KCall.new(..)) && this(self) {\n\n\t\t\/\/logger.debug(\"ASPECT AFTER:protected execution(protected KCall.new(..)) && this(self)\");\n\t\t\/\/logger.debug(\"self=\"+self);\n\t\tself.setRestartedFireInstanceId(root.getRestartedFireInstanceId()); \n\t\tself.setForEachListener(root.getForEachListener());\n\t\t\/\/logger.debug(\"restartedFireInstanceId=\"+self.getRestartedFireInstanceId()); \n\t\t\/\/logger.debug(\"forEachListener=\"+self.getForEachListener());\n\t}\n\n\tafter(X self): \n\t\texecution(protected KProcess.new(..)) && this(self) {\n\n\t\t\/\/logger.debug(\"ASPECT AFTER:protected execution(protected KProcess.new(..)) && this(self)\");\n\t\t\/\/logger.debug(\"self=\"+self);\n\t\tself.setRestartedFireInstanceId(root.getRestartedFireInstanceId()); \n\t\tself.setForEachListener(root.getForEachListener());\n\t\t\/\/logger.debug(\"restartedFireInstanceId=\"+self.getRestartedFireInstanceId()); \n\t\t\/\/logger.debug(\"forEachListener=\"+self.getForEachListener());\n\t}\n\n    pointcut enter(KCall _kCall): call(* org.parallelj.internal.kernel.callback.Entry+.enter(KCall)) && args(_kCall);\n    pointcut invoke(): call(public Object Method.invoke(Object, ..)) && !within(QuartzContextAdapter);\n\n\/\/pdx\n\/\/ Runnable program. ----------------------------------------------------------------------------------------------------------------------------------\n\n    public interface Y {};\n    \n  \tprivate Object Y.context = null;\n  \t\n  \tpublic Object Y.getContext() {\n  \t\treturn context;\n  \t}\n  \t\n  \tpublic void Y.setContext(Object context) {\n  \t\tthis.context=context;\n  \t}\n    \n    declare parents:           \n\t\t(java.lang.Runnable+ ) implements X, Y;    \n    \n    \/\/ 1) Transfert from RunnableCall to Runnable. \n  \tafter(Object self) returning (Runnable ret): \n    \t execution(* org.parallelj.internal.kernel.procedure.RunnableProcedure.RunnableCall.toRunnable())\n      && this(self)  {\n    \t\n    \t ((X)ret).setForEachListener(((X)self).getForEachListener());\n    \t ((X)ret).setRestartedFireInstanceId(((X)self).getRestartedFireInstanceId());\n    \t ((Y)ret).setContext(((org.parallelj.internal.kernel.KCall)self).getContext());\n    }\n    \n     \/\/ 2) Interception around call of run.      \n     void around(Object self): call(* run(..))\n     && within(org.parallelj.internal.kernel.procedure.RunnableProcedure.RunnableCall)\n     && within(Runnable+)  && this(self)  {\n    \t \n    \t String restartedFireInstanceId = ((X) self).getRestartedFireInstanceId();\n    \t ForEachListener forEachListener = ((X)self).getForEachListener();\t\n    \t Object program =  ((Y)self).getContext();\n    \t \n    \t if (isToProcess(restartedFireInstanceId,forEachListener,program)) {\n    \t\ttry { \n    \t\t\tproceed(self);\n     \t\t\tif (isTrackNRestartAnnoted(program)) {\n     \t\t\t\tString oid = getOID(program);\n   \t\t\t\t\ttrack(forEachListener, oid, true);\n     \t\t\t}\n    \t\t} catch (Exception e) {\n \t\t\t\tif (isTrackNRestartAnnoted(program)){\n \t\t\t\t\tString oid = getOID(program);\n \t\t\t\t\tif (isTrackNRestartExceptionPermitted(program, e)) {\n\t \t\t\t\t\ttrack(forEachListener, oid, false);\n\t\t\t\t\t} else {\n\t\t\t\t\t\tabortAbruptly();\n\t\t\t\t\t\tthrow new TrackNRestartException(\"Exception thrown (\"+e.getClass().getName()+\") is not in list of permitted exceptions \"+filteredExceptionsAsString(getTrackNRestartAnnotedException(program)));\n\t\t\t\t\t}\n \t\t\t\t}\n    \t\t}\n     \t} else {\n     \t\tif (isTrackNRestartAnnoted(program)) {\n \t\t\t\tString oid = getOID(program);\n \t\t\t\ttrack(forEachListener, oid, true);\n\t\t\t} else {\n\t\t\t\tabortAbruptly();\n\t\t\t\tthrow new TrackNRestartException(\"Unable to get iteration OID while 'tracking' context.\");\n \t\t\t}\n     \t}\n     }\n     \n     \/**\n      * Track the execution (success or failure).\n      * @param forEachListener listener handling Quartz backend.\n      * @param oid unique identifier\n      * @param success boolean indicating if processing is a success or a failure.\n      *\/\n     private void track(ForEachListener forEachListener, String oid, boolean success) {\n\t     try {\n\t\t\t\tforEachListener.forEachInstanceComplete(oid, success);\n\t     } catch (JobPersistenceException e) {\n\t\t\t\tabortAbruptly();\n\t\t\t\tthrow new TrackNRestartException(\"Unable to read status for iteration '\"+ oid + \"'.\", e);\n\t\t} catch (SQLException e) {\n\t\t\t\tabortAbruptly();\n\t\t\t\tthrow new TrackNRestartException(\"Unable to read status for iteration '\"+ oid + \"'.\", e);\n\t\t}\n     }\n    \n \n\/\/ restart part ----------------------------------------------------------------------------------------------------------------------------------------\n     \n     Object around(Object oo, KCall _kCall)  :\n        invoke() && args(oo, ..) && cflow(enter(_kCall)) {\n         \n    \tif (isToProcess( ((X) _kCall).getRestartedFireInstanceId(),((X) _kCall).getForEachListener(), oo)) {\n               return proceed(oo, _kCall);\n        } else {\n               return null;\n        }\n     }\n\n    \/**\n     * Check if an iterable must be processed. This means if the iterable is not already processed or the element was processed in error.\n     * @param restartedFireInstanceId id of the batch to be restarted.\n     * @param forEachListener listener handling request to Quartz. \n     * @param program instance of the program processing the iterable. \n     * @return true iterable has to be processed, false else.\n     *\/\n    private boolean isToProcess(String restartedFireInstanceId,  ForEachListener forEachListener, Object program)   {\n\t\tboolean result = true;\n\t\tif (program != null) {\n\t\t\tif (program.getClass().isAnnotationPresent(TrackNRestart.class)) {\n\t\t\t\tString oid = getOID(program);\n\t\t\t\tif (oid != null) {\n\t\t\t\t\tif (restartedFireInstanceId != null) {\n\t\t\t\t\t\t\/\/ logger.debug(\"Processing in restarting mode for oid : [\"\n\t\t\t\t\t\t\/\/ + oid + \"] ,program : [\" + program +\n\t\t\t\t\t\t\/\/ \"] ,instanceId :[\" +instanceId+ \"]\");\n\t\t\t\t\t\ttry {\n\t\t\t\t\t\t\tresult = !forEachListener.isForEachInstanceIgnorable(restartedFireInstanceId, oid);\n\t\t\t\t\t\t\t\/\/ logger.debug(result ?\n\t\t\t\t\t\t\t\/\/ \"This OID has not been already processed or\" +\n\t\t\t\t\t\t\t\/\/ \" already processed in error, so its processing is not skipped\":\n\t\t\t\t\t\t\t\/\/ \"This OID (\"+oid+\") has been already successfully processed, so its processing is skipped\");\n\t\t\t\t\t\t} catch (JobPersistenceException e) {\n\t\t\t\t\t\t\tabortAbruptly();\n\t\t\t\t\t\t\tthrow new TrackNRestartException(\n\t\t\t\t\t\t\t\t\t\"Unable to read status for iteration '\"\n\t\t\t\t\t\t\t\t\t\t\t+ oid + \"'.\", e);\n\t\t\t\t\t\t} catch (SQLException e) {\n\t\t\t\t\t\t\tabortAbruptly();\n\t\t\t\t\t\t\tthrow new TrackNRestartException(\n\t\t\t\t\t\t\t\t\t\"Unable to read status for iteration '\"\n\t\t\t\t\t\t\t\t\t\t\t+ oid + \"'.\", e);\n\t\t\t\t\t\t}\n\t\t\t\t\t} else {\n\t\t\t\t\t\t\/\/ logger.debug(\"Processing in normal mode (ie not restarting mode) for : [\"\n\t\t\t\t\t\t\/\/ + oid + \"] ,program : [\" + program + \"]\");\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t\treturn result;\n\t}\n    \n    \/**\n     * Get unique identifier returned by the program (the program contains value to be processed).\n     * @param program\n     * @return unique identifier.\n     *\/\n\tprivate String getOID(Object program) {\n\t\tString result = null;\n\t\ttry {\n\t\t\tMethod m = program.getClass().getDeclaredMethod(\"getOID\",\n\t\t\t\t\tnew Class[] {});\n\t\t\treturn (String) m.invoke(program, new Object[] {});\n\t\t} catch (SecurityException e1) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te1.printStackTrace();\n\t\t} catch (NoSuchMethodException e1) {\n\t\t\tabortAbruptly();\n\t\t\tthrow new TrackNRestartException(\n\t\t\t\t\t\"No getOID() method found while program \" + program\n\t\t\t\t\t\t\t+ \" was annotated @TrackNRestart.\", e1);\n\t\t} catch (IllegalArgumentException e) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te.printStackTrace();\n\t\t} catch (IllegalAccessException e) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te.printStackTrace();\n\t\t} catch (InvocationTargetException e) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te.printStackTrace();\n\t\t}\n\t\t\n\t\treturn result;\n\t}\n\t\n\t\/**\n\t * Indicate of the Program contains annotation TrackNRestart.\n\t * @param program\n\t * @return true if program is annoted.\n\t *\/\n\tprivate boolean isTrackNRestartAnnoted(Object program) {\n\t\treturn program.getClass().isAnnotationPresent(TrackNRestart.class);\n\t}\n\n\t\/**\n\t * Check if the raised exception belong to the allowed ones in TrackNRestart annotation.\n\t * @param program\n\t * @param exception raised\n\t * @return true if exception is allowed, false else.\n\t *\/\n\tprivate boolean isTrackNRestartExceptionPermitted(Object program, Exception exception) {\n\t\tboolean result = false;\n\t\tClass<? extends Throwable>[] filteredExceptions =  getTrackNRestartAnnotedException(program);\n\t\tfor (int i = 0; i < filteredExceptions.length; i++) {\n\t\t\t\tif (filteredExceptions[i].isAssignableFrom(exception.getClass())) {\n\t\t\t\t\treturn true;\n\t\t\t}\n\t\t}\n\t\treturn false;\n\t}\n\t\n\t\/**\n\t * Return exceptions defined in TrackNRestart annotation.\n\t * @param program\n\t * @return array of exceptions\n\t *\/\n\tprivate Class<? extends Throwable>[] getTrackNRestartAnnotedException (Object program) {\n\t\treturn program.getClass().getAnnotation(TrackNRestart.class).filteredExceptions();\n\t}\n\t\n\t\n\/\/ tracking part ----------------------------------------------------------------------------------------------------------------------------------------\n   after(Object oo, KCall _kCall) returning :\n    \tinvoke() && args(oo, ..) && cflow(enter(_kCall)) {\n\t\t\n\t\t\/\/logger.debug(\"ASPECT AFTER RETURNING\");\n\t\t\/\/logger.debug(\"_KCall=\"+_kCall);\n\t\ttrack(_kCall, oo, true, null);\n    }\n\n    after(Object oo, KCall _kCall) throwing (InvocationTargetException ite) : \n    \tinvoke() && args(oo, ..) && cflow(enter(_kCall)) {\n\t\t\n\t\t\/\/logger.debug(\"ASPECT AFTER THROWING (InvocationTargetException)\");\n\t\t\/\/logger.debug(\"_KCall=\"+_kCall);\n\t\tthis.result = \"FAILURE\";\n\t\ttrack(_kCall, oo, false, ite);\n    }\n\n    \n\tprivate void track(KCall _kCall, Object program, boolean success,\n\t\t\tInvocationTargetException ite) {\n\t\tString oid = null;\n\n\t\ttry {\n\t\t\tif (program != null) {\n\t\t\t\tClass<? extends Object> clazz = program.getClass();\n\t\t\t\tif (clazz.isAnnotationPresent(TrackNRestart.class)) {\n\t\t\t\t\tMethod m = clazz\n\t\t\t\t\t\t\t.getDeclaredMethod(\"getOID\", new Class[] {});\n\t\t\t\t\toid = (String) m.invoke(program, new Object[] {});\n\t\t\t\t\tif (oid != null) {\n\t\t\t\t\t\tif (success == true) {\n\t\t\t\t\t\t\tpersist(_kCall, success, oid);\n\t\t\t\t\t\t} else {\n\t\t\t\t\t\t\tClass<? extends Throwable>[] filteredExceptions = clazz\n\t\t\t\t\t\t\t\t\t.getAnnotation(TrackNRestart.class)\n\t\t\t\t\t\t\t\t\t.filteredExceptions();\n\t\t\t\t\t\t\tif (isIteCausePermittedInList(ite,\n\t\t\t\t\t\t\t\t\tfilteredExceptions)) {\n\t\t\t\t\t\t\t\tpersist(_kCall, success, oid);\n\t\t\t\t\t\t\t} else {\n\t\t\t\t\t\t\t\tabortAbruptly();\n\t\t\t\t\t\t\t\tthrow new TrackNRestartException(\n\t\t\t\t\t\t\t\t\t\t\"Exception thrown (\"\n\t\t\t\t\t\t\t\t\t\t\t\t+ ite.getCause().getClass()\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t.getName()\n\t\t\t\t\t\t\t\t\t\t\t\t+ \") is not in list of permitted exceptions \"\n\t\t\t\t\t\t\t\t\t\t\t\t+ filteredExceptionsAsString(filteredExceptions));\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t\tif (logger.isDebugEnabled()) {\n\t\t\t\t\t\t\t\/\/ logger.debug(\"oid='\" + oid +\n\t\t\t\t\t\t\t\/\/ \"' persisted with status='\" + (success ?\n\t\t\t\t\t\t\t\/\/ ReturnCodes.SUCCESS : \"FAILURE\") + \"' \"+ (ite ==\n\t\t\t\t\t\t\t\/\/ null ? \"\" : \", cause : \" + ite.getCause()));\n\t\t\t\t\t\t}\n\t\t\t\t\t} else {\n\t\t\t\t\t\tabortAbruptly();\n\t\t\t\t\t\tthrow new TrackNRestartException(\n\t\t\t\t\t\t\t\t\"Unable to get iteration OID while 'tracking' context.\");\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t} catch (NoSuchMethodException e) {\n\t\t\tabortAbruptly();\n\t\t\tthrow new TrackNRestartException(\n\t\t\t\t\t\"No getOID() method found while program \" + program\n\t\t\t\t\t\t\t+ \" was annotated @TrackNRestart.\", e);\n\t\t} catch (SecurityException e) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te.printStackTrace();\n\t\t} catch (IllegalArgumentException e) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te.printStackTrace();\n\t\t} catch (IllegalAccessException e) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te.printStackTrace();\n\t\t} catch (InvocationTargetException e) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te.printStackTrace();\n\t\t} catch (JobPersistenceException e) {\n\t\t\tabortAbruptly();\n\t\t\tthrow new TrackNRestartException(\"Unable to persist status ['\"\n\t\t\t\t\t+ (success ? ReturnCodes.SUCCESS : \"FAILURE\")\n\t\t\t\t\t+ \"'] for iteration '\" + oid + \"'.\", e);\n\t\t} catch (SQLException e) {\n\t\t\tabortAbruptly();\n\t\t\tthrow new TrackNRestartException(\"Unable to persist status ['\"\n\t\t\t\t\t+ (success ? ReturnCodes.SUCCESS : \"FAILURE\")\n\t\t\t\t\t+ \"'] for iteration '\" + oid + \"'.\", e);\n\t\t}\n\t}\n\n\tprivate boolean isIteCausePermittedInList(InvocationTargetException ite,\n\t\t\tClass<? extends Throwable>[] filteredExceptions) {\n\t\tfor (int i = 0; i < filteredExceptions.length; i++) {\n\t\t\tif (filteredExceptions[i].isAssignableFrom(ite.getCause()\n\t\t\t\t\t.getClass()))\n\t\t\t\treturn true;\n\t\t}\n\t\treturn false;\n\t}\n\n\tprivate String filteredExceptionsAsString(\n\t\t\tClass<? extends Throwable>[] filteredExceptions) {\n\t\tStringBuffer sb = new StringBuffer();\n\t\tsb.append(\"[\");\n\t\tfor (int i = 0; i < filteredExceptions.length; i++) {\n\t\t\tif (i > 0)\n\t\t\t\tsb.append(\", \");\n\t\t\tsb.append(filteredExceptions[i].getName());\n\t\t}\n\t\tsb.append(\"]\");\n\t\treturn sb.toString();\n\t}\n\n\tprivate void persist(KCall _kCall, boolean success, String oid)\n\t\t\tthrows JobPersistenceException, SQLException {\n\t\t((X) _kCall).getForEachListener().forEachInstanceComplete(oid, success);\n\t}\n\n\tprivate void abortAbruptly() {\n\t\tthis.result = \"ABORTED\";\n\t\tPrograms.as((Adapter) this.root).abort();\n\t}\n\n}\n","old_contents":"package org.parallelj.tracknrestart.aspects;\n\nimport java.lang.reflect.Field;\nimport java.lang.reflect.InvocationTargetException;\nimport java.lang.reflect.Method;\nimport java.sql.SQLException;\n\nimport org.apache.log4j.Logger;\nimport org.parallelj.Programs;\nimport org.parallelj.Programs.ProcessHelper;\nimport org.parallelj.internal.kernel.KCall;\nimport org.parallelj.internal.kernel.KProcess;\nimport org.parallelj.internal.reflect.ProgramAdapter.Adapter;\nimport org.parallelj.tracknrestart.annotations.TrackNRestart;\nimport org.parallelj.tracknrestart.listeners.ForEachListener;\nimport org.parallelj.tracknrestart.plugins.TrackNRestartPlugin;\nimport org.quartz.Job;\nimport org.quartz.JobExecutionContext;\nimport org.quartz.JobExecutionException;\nimport org.quartz.JobPersistenceException;\nimport org.parallelj.tracknrestart.ReturnCodes;\n\nprivileged public aspect QuartzContextAdapter percflow (execution(public void Job+.execute(..) throws JobExecutionException)) {\n\t\n\tdeclare precedence :\n\t\torg.parallelj.tracknrestart.aspects.QuartzContextAdapter,\n\t\torg.parallelj.launching.quartz.JobsAdapter;\n\n\tstatic Logger logger = Logger.getLogger(\"org.parallelj.tracknrestart.QuartzContextAdapter\");\n\t\n\tprivate X root;\n\n\tString result = ReturnCodes.SUCCESS.name();\n\t\n\t\/\/---------------------------------------------------------------------------------------------------\n\t\n\tdeclare parents:\n\t\t(@org.parallelj.launching.QuartzExecution *) implements Job;\n\n\tpublic void Job.execute(JobExecutionContext context)\n\t\t\tthrows JobExecutionException {\n\t\t\n\t\tProcessHelper<?> p = null;\n\t\tlogger.debug(\"-----------------------------------------------------------------------------------------------------\");\n\t\tlogger.debug(\"STARTING \/\/J Root Program \"+this.getClass().getName());\n\n\t\tp = Programs.as((Adapter) this);\n\n\t\ttry {\n\t\t\t\/\/TODO voir avec Christophe @IN\n\t\t\tField f = this.getClass().getDeclaredField(\"data1\");\n\t\t\tf.setAccessible(true);\n\t\t\tf.set(this, context.getJobDetail().getJobDataMap().get(\"data1\"));\n\t\t} catch (IllegalArgumentException e) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te.printStackTrace();\n\t\t} catch (IllegalAccessException e) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te.printStackTrace();\n\t\t} catch (SecurityException e) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te.printStackTrace();\n\t\t} catch (NoSuchFieldException e) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te.printStackTrace();\n\t\t}\n\n\t\tp.execute().join();\n\n\t\tlogger.debug(\"ENDING   \/\/J Root Program \"+this.getClass().getName());\n\t\tlogger.debug(\"-----------------------------------------------------------------------------------------------------\");\n\t\tcontext.setResult(String.valueOf(p.getState()));\n\t}\n\n\t\/\/---------------------------------------------------------------------------------------------------\n\t\n\tpublic interface X {};\n\n\tdeclare parents:           \n\t\t(org.quartz.Job+ && !org.quartz.Job) implements X;    \n\n\tdeclare parents:   \n\t\t(org.parallelj.internal.kernel.KCall) implements X;      \n\n\/\/\tdeclare parents:   \n\/\/\t\t(org.parallelj.mirror.Element+) implements X;      \n\n\/\/\tdeclare parents:   \n\/\/\t\t(org.parallelj.internal.kernel.callback.Entry+) implements X; \n\t\n\/\/\tdeclare parents:   \n\/\/\t\t(org.parallelj.internal.kernel.callback.Exit+) implements X; \n\t\n\tprivate ForEachListener X.forEachListener = null;       \n\t\n\tpublic ForEachListener X.getForEachListener() { \n\t\treturn forEachListener;\n\t}\n\t\n\tpublic void X.setForEachListener(ForEachListener forEachListener) {\n\t\tthis.forEachListener = forEachListener;\n\t}\n\t\n\tprivate String X.restartedFireInstanceId = null;       \n\t\n\tpublic String X.getRestartedFireInstanceId() {\n\t\treturn restartedFireInstanceId;\n\t}\n\t\n\tpublic void X.setRestartedFireInstanceId(String restartedFireInstanceId) {\n\t\tthis.restartedFireInstanceId = restartedFireInstanceId;\n\t}\n\t\n\t\/\/---------------------------------------------------------------------------------------------------\n\t\n\t\/\/JobExecutionContext --> Job\n\tbefore(X self, JobExecutionContext jobExecutionContext): \n\t\texecution(public void Job+.execute(..) throws JobExecutionException) \n\t\t&& this(self) \n\t\t&& args(jobExecutionContext) {\n\n\t\t\/\/logger.debug(\"ASPECT BEFORE:execution(public void Job+.execute(..) throws JobExecutionException) && this(self) && args(jobExecutionContext)\");\n\n\t\tself.setRestartedFireInstanceId(jobExecutionContext.getJobDetail().getJobDataMap().getString(TrackNRestartPlugin.RESTARTED_FIRE_INSTANCE_ID));\n\t\tself.setForEachListener((ForEachListener) jobExecutionContext.getJobDetail().getJobDataMap().get(TrackNRestartPlugin.FOR_EACH_LISTENER));\n\t\t\/\/logger.debug(\"job=\"+self); \n\t\t\/\/logger.debug(\"restartedFireInstanceId=\"+self.getRestartedFireInstanceId()); \n\t\t\/\/logger.debug(\"forEachListener=\"+self.getForEachListener());\n\n\t\tthis.root = self;\n\t}\n\n\tafter(X self, JobExecutionContext jobExecutionContext): \n\t\texecution(public void Job+.execute(..) throws JobExecutionException) \n\t\t&& this(self) \n\t\t&& args(jobExecutionContext) {\n\n\t\t\/\/logger.debug(\"ASPECT AFTER:execution(public void Job+.execute(..) throws JobExecutionException) && this(self) && args(jobExecutionContext)\");\n\t\tjobExecutionContext.setResult(result);\n\t}\n\t\n\tafter(X self): \n\t\texecution(protected KCall.new(..)) && this(self) {\n\n\t\t\/\/logger.debug(\"ASPECT AFTER:protected execution(protected KCall.new(..)) && this(self)\");\n\t\t\/\/logger.debug(\"self=\"+self);\n\t\tself.setRestartedFireInstanceId(root.getRestartedFireInstanceId()); \n\t\tself.setForEachListener(root.getForEachListener());\n\t\t\/\/logger.debug(\"restartedFireInstanceId=\"+self.getRestartedFireInstanceId()); \n\t\t\/\/logger.debug(\"forEachListener=\"+self.getForEachListener());\n\t}\n\n\tafter(X self): \n\t\texecution(protected KProcess.new(..)) && this(self) {\n\n\t\t\/\/logger.debug(\"ASPECT AFTER:protected execution(protected KProcess.new(..)) && this(self)\");\n\t\t\/\/logger.debug(\"self=\"+self);\n\t\tself.setRestartedFireInstanceId(root.getRestartedFireInstanceId()); \n\t\tself.setForEachListener(root.getForEachListener());\n\t\t\/\/logger.debug(\"restartedFireInstanceId=\"+self.getRestartedFireInstanceId()); \n\t\t\/\/logger.debug(\"forEachListener=\"+self.getForEachListener());\n\t}\n\n    pointcut enter(KCall _kCall): call(* org.parallelj.internal.kernel.callback.Entry+.enter(KCall)) && args(_kCall);\n    pointcut invoke(): call(public Object Method.invoke(Object, ..)) && !within(QuartzContextAdapter);\n\n\/\/ restart part ----------------------------------------------------------------------------------------------------------------------------------------\n    Object around(Object oo, KCall _kCall)  :\n        invoke() && args(oo, ..) && cflow(enter(_kCall)) {\n               \n        if (restart(_kCall, oo)) {\n               return proceed(oo, _kCall);\n        } else {\n               return null;\n        }\n     }\n\n\tprivate boolean restart(KCall _kCall, Object program) {\n\t\tboolean result = true;\n\t\tif (program != null) {\n\t\t\tif (program.getClass().isAnnotationPresent(TrackNRestart.class)) {\n\t\t\t\tString oid = getOID(program);\n\t\t\t\tif (oid != null) {\n\t\t\t\t\tString instanceId = ((X) _kCall)\n\t\t\t\t\t\t\t.getRestartedFireInstanceId();\n\t\t\t\t\tif (instanceId != null) {\n\t\t\t\t\t\t\/\/ logger.debug(\"Processing in restarting mode for oid : [\"\n\t\t\t\t\t\t\/\/ + oid + \"] ,program : [\" + program +\n\t\t\t\t\t\t\/\/ \"] ,instanceId :[\" +instanceId+ \"]\");\n\t\t\t\t\t\ttry {\n\t\t\t\t\t\t\tresult = !((X) _kCall)\n\t\t\t\t\t\t\t\t\t.getForEachListener()\n\t\t\t\t\t\t\t\t\t.isForEachInstanceIgnorable(instanceId, oid);\n\t\t\t\t\t\t\t\/\/ logger.debug(result ?\n\t\t\t\t\t\t\t\/\/ \"This OID has not been already processed or\" +\n\t\t\t\t\t\t\t\/\/ \" already processed in error, so its processing is not skipped\":\n\t\t\t\t\t\t\t\/\/ \"This OID (\"+oid+\") has been already successfully processed, so its processing is skipped\");\n\t\t\t\t\t\t} catch (JobPersistenceException e) {\n\t\t\t\t\t\t\tabortAbruptly();\n\t\t\t\t\t\t\tthrow new TrackNRestartException(\n\t\t\t\t\t\t\t\t\t\"Unable to read status for iteration '\"\n\t\t\t\t\t\t\t\t\t\t\t+ oid + \"'.\", e);\n\t\t\t\t\t\t} catch (SQLException e) {\n\t\t\t\t\t\t\tabortAbruptly();\n\t\t\t\t\t\t\tthrow new TrackNRestartException(\n\t\t\t\t\t\t\t\t\t\"Unable to read status for iteration '\"\n\t\t\t\t\t\t\t\t\t\t\t+ oid + \"'.\", e);\n\t\t\t\t\t\t}\n\t\t\t\t\t} else {\n\t\t\t\t\t\t\/\/ logger.debug(\"Processing in normal mode (ie not restarting mode) for : [\"\n\t\t\t\t\t\t\/\/ + oid + \"] ,program : [\" + program + \"]\");\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t\treturn result;\n\t}\n    \n\tprivate String getOID(Object program) {\n\t\tString result = null;\n\t\ttry {\n\t\t\tMethod m = program.getClass().getDeclaredMethod(\"getOID\",\n\t\t\t\t\tnew Class[] {});\n\t\t\treturn (String) m.invoke(program, new Object[] {});\n\t\t} catch (SecurityException e1) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te1.printStackTrace();\n\t\t} catch (NoSuchMethodException e1) {\n\t\t\tabortAbruptly();\n\t\t\tthrow new TrackNRestartException(\n\t\t\t\t\t\"No getOID() method found while program \" + program\n\t\t\t\t\t\t\t+ \" was annotated @TrackNRestart.\", e1);\n\t\t} catch (IllegalArgumentException e) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te.printStackTrace();\n\t\t} catch (IllegalAccessException e) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te.printStackTrace();\n\t\t} catch (InvocationTargetException e) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te.printStackTrace();\n\t\t}\n\t\treturn result;\n\t}\n\n\/\/ tracking part ----------------------------------------------------------------------------------------------------------------------------------------\n   after(Object oo, KCall _kCall) returning :\n    \tinvoke() && args(oo, ..) && cflow(enter(_kCall)) {\n\t\t\n\t\t\/\/logger.debug(\"ASPECT AFTER RETURNING\");\n\t\t\/\/logger.debug(\"_KCall=\"+_kCall);\n\t\ttrack(_kCall, oo, true, null);\n    }\n\n    after(Object oo, KCall _kCall) throwing (InvocationTargetException ite) : \n    \tinvoke() && args(oo, ..) && cflow(enter(_kCall)) {\n\t\t\n\t\t\/\/logger.debug(\"ASPECT AFTER THROWING (InvocationTargetException)\");\n\t\t\/\/logger.debug(\"_KCall=\"+_kCall);\n\t\tthis.result = \"FAILURE\";\n\t\ttrack(_kCall, oo, false, ite);\n    }\n\n    \n\tprivate void track(KCall _kCall, Object program, boolean success,\n\t\t\tInvocationTargetException ite) {\n\t\tString oid = null;\n\n\t\ttry {\n\t\t\tif (program != null) {\n\t\t\t\tClass<? extends Object> clazz = program.getClass();\n\t\t\t\tif (clazz.isAnnotationPresent(TrackNRestart.class)) {\n\t\t\t\t\tMethod m = clazz\n\t\t\t\t\t\t\t.getDeclaredMethod(\"getOID\", new Class[] {});\n\t\t\t\t\toid = (String) m.invoke(program, new Object[] {});\n\t\t\t\t\tif (oid != null) {\n\t\t\t\t\t\tif (success == true) {\n\t\t\t\t\t\t\tpersist(_kCall, success, oid);\n\t\t\t\t\t\t} else {\n\t\t\t\t\t\t\tClass<? extends Throwable>[] filteredExceptions = clazz\n\t\t\t\t\t\t\t\t\t.getAnnotation(TrackNRestart.class)\n\t\t\t\t\t\t\t\t\t.filteredExceptions();\n\t\t\t\t\t\t\tif (isIteCausePermittedInList(ite,\n\t\t\t\t\t\t\t\t\tfilteredExceptions)) {\n\t\t\t\t\t\t\t\tpersist(_kCall, success, oid);\n\t\t\t\t\t\t\t} else {\n\t\t\t\t\t\t\t\tabortAbruptly();\n\t\t\t\t\t\t\t\tthrow new TrackNRestartException(\n\t\t\t\t\t\t\t\t\t\t\"Exception thrown (\"\n\t\t\t\t\t\t\t\t\t\t\t\t+ ite.getCause().getClass()\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t.getName()\n\t\t\t\t\t\t\t\t\t\t\t\t+ \") is not in list of permitted exceptions \"\n\t\t\t\t\t\t\t\t\t\t\t\t+ filteredExceptionsAsString(filteredExceptions));\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t\tif (logger.isDebugEnabled()) {\n\t\t\t\t\t\t\t\/\/ logger.debug(\"oid='\" + oid +\n\t\t\t\t\t\t\t\/\/ \"' persisted with status='\" + (success ?\n\t\t\t\t\t\t\t\/\/ ReturnCodes.SUCCESS : \"FAILURE\") + \"' \"+ (ite ==\n\t\t\t\t\t\t\t\/\/ null ? \"\" : \", cause : \" + ite.getCause()));\n\t\t\t\t\t\t}\n\t\t\t\t\t} else {\n\t\t\t\t\t\tabortAbruptly();\n\t\t\t\t\t\tthrow new TrackNRestartException(\n\t\t\t\t\t\t\t\t\"Unable to get iteration OID while 'tracking' context.\");\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t} catch (NoSuchMethodException e) {\n\t\t\tabortAbruptly();\n\t\t\tthrow new TrackNRestartException(\n\t\t\t\t\t\"No getOID() method found while program \" + program\n\t\t\t\t\t\t\t+ \" was annotated @TrackNRestart.\", e);\n\t\t} catch (SecurityException e) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te.printStackTrace();\n\t\t} catch (IllegalArgumentException e) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te.printStackTrace();\n\t\t} catch (IllegalAccessException e) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te.printStackTrace();\n\t\t} catch (InvocationTargetException e) {\n\t\t\t\/\/ TODO Auto-generated catch block\n\t\t\te.printStackTrace();\n\t\t} catch (JobPersistenceException e) {\n\t\t\tabortAbruptly();\n\t\t\tthrow new TrackNRestartException(\"Unable to persist status ['\"\n\t\t\t\t\t+ (success ? ReturnCodes.SUCCESS : \"FAILURE\")\n\t\t\t\t\t+ \"'] for iteration '\" + oid + \"'.\", e);\n\t\t} catch (SQLException e) {\n\t\t\tabortAbruptly();\n\t\t\tthrow new TrackNRestartException(\"Unable to persist status ['\"\n\t\t\t\t\t+ (success ? ReturnCodes.SUCCESS : \"FAILURE\")\n\t\t\t\t\t+ \"'] for iteration '\" + oid + \"'.\", e);\n\t\t}\n\t}\n\n\tprivate boolean isIteCausePermittedInList(InvocationTargetException ite,\n\t\t\tClass<? extends Throwable>[] filteredExceptions) {\n\t\tfor (int i = 0; i < filteredExceptions.length; i++) {\n\t\t\tif (filteredExceptions[i].isAssignableFrom(ite.getCause()\n\t\t\t\t\t.getClass()))\n\t\t\t\treturn true;\n\t\t}\n\t\treturn false;\n\t}\n\n\tprivate String filteredExceptionsAsString(\n\t\t\tClass<? extends Throwable>[] filteredExceptions) {\n\t\tStringBuffer sb = new StringBuffer();\n\t\tsb.append(\"[\");\n\t\tfor (int i = 0; i < filteredExceptions.length; i++) {\n\t\t\tif (i > 0)\n\t\t\t\tsb.append(\", \");\n\t\t\tsb.append(filteredExceptions[i].getName());\n\t\t}\n\t\tsb.append(\"]\");\n\t\treturn sb.toString();\n\t}\n\n\tprivate void persist(KCall _kCall, boolean success, String oid)\n\t\t\tthrows JobPersistenceException, SQLException {\n\t\t((X) _kCall).getForEachListener().forEachInstanceComplete(oid, success);\n\t}\n\n\tprivate void abortAbruptly() {\n\t\tthis.result = \"ABORTED\";\n\t\tPrograms.as((Adapter) this.root).abort();\n\t}\n\n}\n","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"6177eb1c71505d2b221c3365690cbb591a93e152","subject":"in heartbeat, tasktrackername had illegal chars","message":"in heartbeat, tasktrackername had illegal chars\n","repos":"Aloja\/AOP4Hadoop","old_file":"src\/1.0.3\/Aspectj.aj","new_file":"src\/1.0.3\/Aspectj.aj","new_contents":"import java.io.*;\nimport java.util.*;\nimport java.lang.management.ManagementFactory;\nimport java.sql.Timestamp;\nimport java.text.SimpleDateFormat;\nimport java.net.InetAddress;\nimport java.lang.ClassLoader;\nimport org.apache.hadoop.io.DataInputBuffer;\nimport org.apache.hadoop.mapred.TaskStatus;\nimport org.apache.hadoop.fs.permission.FsPermission;\nimport org.apache.hadoop.util.Progressable;\nimport org.apache.hadoop.hdfs.protocol.DatanodeInfo;\nimport org.apache.hadoop.util.DataChecksum;\nimport java.net.Socket;\n\n\nimport org.apache.hadoop.security.token.Token;\nimport org.apache.hadoop.security.token.TokenIdentifier;\nimport org.apache.hadoop.hdfs.security.token.block.BlockTokenIdentifier;\n\n\nimport org.apache.hadoop.fs.FSDataInputStream;\nimport org.apache.hadoop.hdfs.DFSClient;\n\nimport org.apache.hadoop.mapred.TaskTrackerStatus;\n\nimport org.apache.commons.logging.Log;\nimport org.apache.commons.logging.LogFactory;\n\n\nimport org.apache.hadoop.conf.Configuration;\n\n\n\n\n\n\n\/**\n *\n * @author Alejandro\n *\/\n\naspect AlojaAspect {\t\t\n\n\tprivate static final Log LOG = LogFactory.getLog(AlojaAspect.class);\n\n\t\/*\n\tTYPES\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\n    public static class Events {\n\n        public static final int JobTracker = 11111;\n        public static final int TaskTracker = 11112;\n        public static final int NameNode = 11113;\n        public static final int SecondaryNameNode = 11114;\n        public static final int DataNode = 11115;\n        public static final int Task = 11116;\n\/\/        public static final int MapTask = 11117;\n\/\/        public static final int ReduceTask = 11118;\n        public static final int MapOutputBuffer = 33333;\n        public static final int MapTaskOutputSize = 44444;\n    }\n\n    public static class Values {\n\n       \t\/\/ Generic\n\t\tpublic static final int End = 0;        \n        public static final int Start = 1;\n        \n        \/\/ Events.TaskTracker \n\t\tpublic static final int RunMapper = 8;\n        public static final int RunReducer = 9;\n        public static final int ReducerCopyPhase = 10;\n        public static final int ReducerSortPhase = 11;\n        public static final int ReducerReducePhase = 12;\n\n\t\t\/\/ Events.JobTracker\n\t\tpublic static final int HeartBeat = 13;\n\n\n\t\t\/\/ Events.MapOutputBuffer\n        public static final int Flush = 1;\n        public static final int SortAndSpill = 2;\n        public static final int Sort = 3;        \n        public static final int CreateSpillIndexFile = 5;\n        \/\/public static final int TotalIndexCacheMemory = 6;\n        public static final int SpillRecordDumped = 7;\n        public static final int Combine = 4;\n    }    \n\n\n\t\/*\n\tFUNCTIONS\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\t\n\tprivate static long getPID() {\n\t\tString name = java.lang.management.ManagementFactory.getRuntimeMXBean().getName();\n\t\treturn Long.parseLong(name.split(\"@\")[0]);\n\t}\n\n\tprivate void generateEvent(Integer key, Integer value) {\n\t\t\/\/2:cpu:app:task:thread:time:type:value\n\t\ttry{\n\t\t\tString hostname = InetAddress.getLocalHost().getHostName();\n\t\t\tlong pid = getPID();\n\t\t\tLOG.info(hostname+\",\"+pid+\",2:\"+hostname+\":2:\"+pid+\":1:\"+System.currentTimeMillis()+\":\"+key+\":\"+value);\n\t\t}\n\t\tcatch (Exception e) {\n\t\t\tLOG.error(e, e);\n\n\t\t}\n\t}\n\n\n\tprivate void generateEvent(Integer key, String value) {\n\t\t\/\/2:cpu:app:task:thread:time:type:value\n\t\ttry{\n\t\t\tString hostname = InetAddress.getLocalHost().getHostName();\n\t\t\tlong pid = getPID();\n\t\t\tLOG.info(hostname+\",\"+pid+\",2:\"+hostname+\":2:\"+pid+\":1:\"+System.currentTimeMillis()+\":\"+key+\":\"+value);\n\t\t}\n\t\tcatch (Exception e) {\n\t\t\tLOG.error(e, e);\n\n\t\t}\n\t}\n\n\n\t\/*private void generateEVent(Integer key[], Integer value) {\n\n\t\tStringBuffer output = new StringBuffer();\n\n\n\t\toutput.append()\n\n\t}*\/\n\n\tprivate void instrumentation(String event, String when) {\n\n\t\tinstrumentation(event, when, \"\");\n\n\t}\n\tprivate void instrumentation(String event, String when, String additional) {\n\t\ttry {\n\t\t\t\/\/Add hostname\n\t\t\tString log = InetAddress.getLocalHost().getHostName();\n\t\t\t\/\/Add PID \n\t\t\tlog += \",\" + getPID();\n\t\t\t\/\/Specify event\n\t\t\tlog += \",\" + when + \",\" + event;\n\t\t\t\/\/Specify event\n\t\t\tlog += additional;\n\t\t\t\/\/LOG.info(log);\n\t\t\t\/\/writeLog(logFile,log);\n\n\n\t\t}\n\t\tcatch (IOException e) {\n\t\t\te.printStackTrace();\n\t\t}\n\t}\n\n\n\t\/*\n\tPOINTCUTS\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\n\t\/\/RegisterDataNode Pointcut\n\n\tpointcut startDataNode(): execution(* org.apache.hadoop.hdfs.server.datanode.DataNode.startDataNode(..));\n\n\t\/\/RegisterNameNode Pointcut\n\n\tpointcut initializeNameNode():  execution(* org.apache.hadoop.hdfs.server.namenode.NameNode.initialize(..));\n\n\t\/\/RegisterSecondaryNamenode Pointcut\n\n\tpointcut initializeSecondaryNameNode(): execution(* org.apache.hadoop.hdfs.server.namenode.SecondaryNameNode.initialize(..));\n\n\t\/\/RegisterTask - CHILD\n\n\t\/\/pointcut initializeChild(): call(* org.apache.hadoop.mapred.Child.initMetrics(..)) && withincode(* org.apache.hadoop.mapred.Child.main(..)); \n\n\tpointcut initializeChild(): execution(* org.apache.hadoop.mapred.Child.main(..)); \n\n\t\/\/Register JobTracker Pointcut\n\n\tpointcut registerJobTracker(): execution(* org.apache.hadoop.mapred.JobTracker.startTracker(..));\n\n\t\/\/HEARTBEAT\n\n\tpointcut heartbeat(TaskTrackerStatus status,boolean restarted,boolean initialContact,boolean acceptNewTasks,short responseId): execution(* org.apache.hadoop.mapred.JobTracker.heartbeat(..)) && args(status, restarted, initialContact, acceptNewTasks,responseId);\n\n\t\/*\n\t\t###########################################################################\n\t\t############################Task###########################################\n\t\t###########################################################################\n\t*\/\n\n\n\tpointcut outputSize(): call (* *.getLen(..)) && withincode(* org.apache.hadoop.mapred.Task.calculateOutputSize());\n\n\t\/*\n\t\t###########################################################################\n\t\t############################MAPPER#########################################\n\t\t###########################################################################\n\t*\/\n\n\t\/\/pointcut maptask(): execution(* org.apache.hadoop.mapred.MapTask.run(..));\n\tpointcut mapper(): call(* org.apache.hadoop.mapred.MapTask.runNewMapper(..)) && withincode(* org.apache.hadoop.mapred.MapTask.run(..));\n\n\n\t\/\/  ############################SORT AND SPILL#################################\n\n\t\/\/Start-End\n\tpointcut taskSortAndSpill(): execution(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\n\tpointcut flush(): execution(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.flush());\n\n\t\/\/Spill File Size\n\tpointcut sortAndSpillSpillFile(int numSpills, long size) : call (* *.getSpillFileForWrite(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(numSpills, size);\n\n\t\/\/SpillIndex File Size\n\tpointcut sortAndSpillSpillIndexFile(int numSpills, long partitions) : call (* *.getSpillIndexFileForWrite(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(numSpills, partitions);\n\n\t\/\/Sort \n\tpointcut sortAndSpillSort(int kvstart, int endPosition, Object reporter): call(* *.sort(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(..,kvstart,endPosition,reporter);\n\n\t\/\/Init Writer\n\t\/\/pointcut sortAndSpillInitWriter() : call (org.apache.hadoop.mapred.IFile.Writer.new(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Close Writer\n\t\/\/pointcut sortAndSpillCloseWriter() : call (void org.apache.hadoop.mapred.IFile.Writer.close(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Write key-value\n\tpointcut sortAndSpillWrite(DataInputBuffer key, DataInputBuffer value): call (* *.append(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(key,value);\n\t\n\t\/\/Combiner\n\tpointcut sortAndSpillCombiner(): call(* *.combine(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Spill Index File\n\tpointcut sortAndSpillSpillIndexWrite(): call(* *.writeToFile(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/*\n\t\t###########################################################################\n\t\t############################REDUCER########################################\n\t\t###########################################################################\n\t*\/\n\n\t\/\/REDUCETASK RUN\n\tpointcut reducer(): execution(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\tpointcut initCodec(): call(* *.initCodec(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\tpointcut setPhase(TaskStatus.Phase phase): call(* *.setPhase(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..)) && args(phase);\n\n\t\n\t\/\/pointcut endCopy(): call(* *.setPhase(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\t\/\/pointcut endSort(): call(* *.getMapOutputKeyClass(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\t\n\n\t\/*\n\t\t###########################################################################\n\t\t############################NETWORK########################################\n\t\t###########################################################################\n\t*\/\n\n\tpointcut defaultBlockSize(): call(* org.apache.hadoop.hdfs.DFSClient.getDefaultBlockSize());\n\t\/\/pointcut blockSize(): call(* org.apache.hadoop.hdfs.DFSClient.getBlockSize(..));\n\tpointcut createDFSFile(String src,FsPermission permission,boolean overwrite,boolean createParent,short replication,long blockSize,Progressable progress, int buffersize): execution (* org.apache.hadoop.hdfs.DFSClient.create(..)) && args(src,permission,overwrite,createParent,replication,blockSize,progress,buffersize);\n\tpointcut runDataStreamer(): execution (* org.apache.hadoop.hdfs.DFSClient.DFSOutputStream.DataStreamer.run());\n\t\/\/pointcut readEntireBufferFromDataNode(byte buf[],int off,int len): execution(* org.apache.hadoop.hdfs.DFSClient.DFSInputStream.read(..)) && args(buf[],off,len);\n\t\/\/pointcut readFromDataNode(): call (* org.apache.hadoop.hdfs.DFSClient.DFSInputStream.blockSeekTo(..)) && withincode(* org.apache.hadoop.hdfs.DFSClient.DFSInputStream.read(..));\n\tpointcut newBlockReader(Socket sock, String file, long blockId, Token<BlockTokenIdentifier> accessToken, long genStamp, long startOffset, long len, int bufferSize, boolean verifyChecksum, String clientName): execution (* org.apache.hadoop.hdfs.DFSClient.BlockReader.newBlockReader(..)) && args(sock,file,blockId,accessToken,genStamp,startOffset,len,bufferSize,verifyChecksum,clientName);\n\n\t\/*\n\tAdvices\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\n\t\/\/ RegiterJobTracker\n\n\tafter() : registerJobTracker(){\n\t\tgenerateEvent(Events.JobTracker, Values.Start);\n\n\t}\n\n\t\/\/RegisterTaskTracker ?\n\n\n\t\/\/RegisterNameNode\n\n\tafter() : initializeNameNode(){\n\t\tgenerateEvent(Events.NameNode, Values.Start);\n\t}\n\n\t\/\/RegisterDataNode \n\n\tafter() : startDataNode(){\n\t\tgenerateEvent(Events.DataNode, Values.Start);\n\t}\n\n\n\t\/\/RegisterSecondaryNamenode\n\n\tafter() : initializeSecondaryNameNode(){\n\t\tgenerateEvent(Events.SecondaryNameNode, Values.Start);\n\t}\n\n\n\t\/\/HEARTBEAT \n\tafter(TaskTrackerStatus status,boolean restarted,boolean initialContact,boolean acceptNewTasks,short responseId) : heartbeat(status, restarted, initialContact, acceptNewTasks,responseId){\n\t\t\/\/ SAMPLE trackername: tracker_vagrant-99-01:localhost\/127.0.0.1:38149\n\t\tgenerateEvent(Events.JobTracker, status.getTrackerName().replace(':','-').replace('\/','_'));\n\t}\n\n\n\t\/*\n\t\t###########################################################################\n\t\t############################Task###########################################\n\t\t###########################################################################\n\t*\/\n\n\t\/\/RegisterTask CHILD \n\tafter() : initializeChild() { \/\/We need the  PID of this task to be registered\n\t\tgenerateEvent(Events.Task, Values.Start);\n\t}\n\n\n\/*\tafter() returning(long size) : outputSize() {\n\t\tString s = \"Task-outputSize\";\n\t\tinstrumentation(s,\"after\",\", size: \" + Long.toString(size));\n\t}\n\n\t\/*\n\t\t###########################################################################\n\t\t############################Mapper#########################################\n\t\t###########################################################################\n\t*\/\n\n\n\t\/*before() : maptask(){\n\t\tgenerateEvent(Events.MapTask, Values.Start);\n\t}*\/\n\n\tbefore() : mapper(){\n\t\tgenerateEvent(Events.TaskTracker, Values.RunMapper);\n\t}\n\n\tafter() : mapper(){\n\t\tgenerateEvent(Events.TaskTracker, Values.End);\n\t}\n\n\n\t\n\n\t\/\/  ############################SORT AND SPILL#################################\n\n\tbefore() : taskSortAndSpill(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.SortAndSpill);\n\t}\n\n\n\tafter() : taskSortAndSpill(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\n\t}\n\n\t\/\/flush\n\n\tbefore() : flush(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.Flush);\n\t}\n\n\tafter() : flush(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\n\t}\n\n\n\n\t\/\/ Spill File Size\n\n\tafter(int numSpills, long size) returning : sortAndSpillSpillFile(numSpills, size){\n\t\tString s = \"sortAndSpillSpillFile\";\n\t\tinstrumentation(s,\"after\",\", numSpills: \" +Integer.toString(numSpills) + \";size: \" + Long.toString((size*numSpills) + size));\n\t}\n\n\t\/\/ SpillIndex File Size\n\n\tafter(int numSpills, long partitions) returning : sortAndSpillSpillIndexFile(numSpills, partitions){\n\t\tString s = \"sortAndSpillSpillIndexFile\";\n\t\tinstrumentation(s,\"after\",\",\" + Long.toString(numSpills * partitions));\n\t}\n\n\/*\n\tbefore(int length) : kvbufferState(length){\n\n\t\tString s = \"kvbufferState\";\n\t\tFile logFile = getFile();\n\t\tinstrumentation(logFile,s,\"before\");\n\t\twriteLog(logFile,Integer.toString(length));\n\t}\n\n*\/\n\n\tbefore(int kvstart, int endPosition, Object reporter) : sortAndSpillSort(kvstart,endPosition,reporter){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.Sort);\n\t\t\/\/instrumentation(s,\"before\",\",\" + Integer.toString(endPosition - kvstart));\n\t}\n\tafter(int kvstart, int endPosition, Object reporter) returning : sortAndSpillSort(kvstart,endPosition,reporter){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\n\t\t\/\/instrumentation(s,\"after\",\",\" + Integer.toString(endPosition - kvstart));\n\t}\n\n\t\/\/ Init writer\n\/*\tafter() returning : sortAndSpillInitWriter(){\n\t\tString s = \"sortAndSpillInitWriter\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\t\/\/ Close writer\n\tafter() returning : sortAndSpillCloseWriter(){\n\t\tString s = \"sortAndSpillCloseWriter\";\n\t\tinstrumentation(s,\"after\");\n\t}\n*\/\n\n\tafter(DataInputBuffer key, DataInputBuffer value) returning : sortAndSpillWrite(key,value){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.SpillRecordDumped);\n\t}\n\n\tbefore() : sortAndSpillCombiner(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.Combine);\n\t}\n\n\tafter() returning : sortAndSpillCombiner(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\t\n\t}\n\n\tbefore() : sortAndSpillSpillIndexWrite(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.CreateSpillIndexFile);\n\t}\n\n\tafter() returning : sortAndSpillSpillIndexWrite(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\n\t}\n\n\t\/*\n\t\t###########################################################################\n\t\t############################REDUCER########################################\n\t\t###########################################################################\n\t*\/\n\n\/*\tbefore() : reducer(){\n\t\tString s = \"Reducer\";\n\t\tinstrumentation(s,\"before\");\n\t}\n*\/\n\n\tbefore() : initCodec() {\n\t\tgenerateEvent(Events.TaskTracker, Values.RunReducer);\n\t}\n\n\n\tafter() returning : initCodec() {\n\t\tgenerateEvent(Events.TaskTracker, Values.ReducerCopyPhase);\n\t}\n\n\tbefore(TaskStatus.Phase phase) : setPhase(phase) { \/\/END OF A PHASE (SORT OR COPY)\n\t\t\tgenerateEvent(Events.TaskTracker, Values.End);\n\t}\n\n\tafter(TaskStatus.Phase phase) returning: setPhase(phase) { \n\t\tif (phase == TaskStatus.Phase.SORT) {\n\t\t\tgenerateEvent(Events.TaskTracker, Values.ReducerSortPhase);\n\t\t}\n\t\telse if (phase == TaskStatus.Phase.REDUCE) {\n\t\t\tgenerateEvent(Events.TaskTracker, Values.ReducerReducePhase);\n\t\t}\n\t}\n\n\tafter() : reducer(){ \/\/END OF REDUCE PHASE\n\t\t\tgenerateEvent(Events.TaskTracker, Values.End);\t}\n\n\t\/*\n\t\t###########################################################################\n\t\t############################NETWORK########################################\n\t\t###########################################################################\n\t*\/\n\n\tafter() returning(long blockSize) : defaultBlockSize() {\n\t\tString s = \"Network-defaultBlockSize\";\n\t\tinstrumentation(s,\"after\",\", size: \" + Long.toString(blockSize));\n\t}\n\t\/\/ after() returning(long blockSize) : blockSize() {\n\t\/\/ \tString s = \"Network-blockSize\";\n\t\/\/ \tFile logFile = getFile();\n\t\/\/ \tinstrumentation(logFile,s,\"after\");\n\t\/\/ \tString log = \", size: \" + Long.toString(blockSize);\n\t\/\/ \twriteLog(logFile,log);\n\t\/\/ }\n\n\tafter(String src,FsPermission permission,boolean overwrite, boolean createParent,short replication,long blockSize,Progressable progress, int buffersize): createDFSFile(src,permission,overwrite,createParent,replication,blockSize,progress,buffersize) {\n\t\tString s = \"Network-CreateDFSFile\";\n\n\t\t\/\/MODIFIED!!!!!!-----!!!!!!!!!!!\n\t\tinstrumentation(s,\"after\",\", path: \" + src + \";permission: \" + permission.toString() + \";overwrite: \" + String.valueOf(overwrite) + \";createParent: \" + String.valueOf(createParent) + \";replication: \" + Short.toString(replication) + \";blockSize: \" + Long.toString(blockSize) + \";buffersize: \" + Integer.toString(buffersize));\n\t}\n\tbefore(): runDataStreamer() {\n\t\tString s = \"DataStreamer\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\t\/\/ before(byte buf[],int off, int len) : readEntireBufferFromDataNode(buf[],off,len){\n\t\/\/ \tString s = \"Network-ReadEntireBuffer\";\n\t\/\/ \tinstrumentation(s,\"after\",\", bufferLength: \" + Integer.toString(len));\n\t\/\/ }\n\n\t\/\/ after() returning(DatanodeInfo datanode) : readFromDataNode(){\n\t\/\/ \tString s = \"Network-fromDataNode\";\n\t\/\/ \tinstrumentation(s,\"after\", \", from : \" + datanode.getHostName());\n\t\/\/ }\n\n\tafter(Socket sock, String file, long blockId, Token<BlockTokenIdentifier> accessToken, long genStamp, long startOffset, long len, int bufferSize, boolean verifyChecksum, String clientName) : newBlockReader(sock,file,blockId,accessToken,genStamp,startOffset,len,bufferSize,verifyChecksum,clientName) {\n\t\tString s = \"Network-NewBlockReader\";\n\t\tString extra = \", DataNode: \" + sock.getInetAddress().getCanonicalHostName();\n\t\textra += \";file: \" + file;\n\t\t\/\/extra += \", length: \" + Long.toString(len) + \"B\";\n\t\textra += \";\" + Long.toString(len);\n\t\textra += \";blockId: \" + Long.toString(blockId);\n\t\textra += \";startOffset: \" + Long.toString(startOffset);\t\t\n\t\tinstrumentation(s,\"after\",extra);\n\t}\n}\n\n\n\n\n","old_contents":"import java.io.*;\nimport java.util.*;\nimport java.lang.management.ManagementFactory;\nimport java.sql.Timestamp;\nimport java.text.SimpleDateFormat;\nimport java.net.InetAddress;\nimport java.lang.ClassLoader;\nimport org.apache.hadoop.io.DataInputBuffer;\nimport org.apache.hadoop.mapred.TaskStatus;\nimport org.apache.hadoop.fs.permission.FsPermission;\nimport org.apache.hadoop.util.Progressable;\nimport org.apache.hadoop.hdfs.protocol.DatanodeInfo;\nimport org.apache.hadoop.util.DataChecksum;\nimport java.net.Socket;\n\n\nimport org.apache.hadoop.security.token.Token;\nimport org.apache.hadoop.security.token.TokenIdentifier;\nimport org.apache.hadoop.hdfs.security.token.block.BlockTokenIdentifier;\n\n\nimport org.apache.hadoop.fs.FSDataInputStream;\nimport org.apache.hadoop.hdfs.DFSClient;\n\nimport org.apache.hadoop.mapred.TaskTrackerStatus;\n\nimport org.apache.commons.logging.Log;\nimport org.apache.commons.logging.LogFactory;\n\n\nimport org.apache.hadoop.conf.Configuration;\n\n\n\n\n\n\n\/**\n *\n * @author Alejandro\n *\/\n\naspect AlojaAspect {\t\t\n\n\tprivate static final Log LOG = LogFactory.getLog(AlojaAspect.class);\n\n\t\/*\n\tTYPES\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\n    public static class Events {\n\n        public static final int JobTracker = 11111;\n        public static final int TaskTracker = 11112;\n        public static final int NameNode = 11113;\n        public static final int SecondaryNameNode = 11114;\n        public static final int DataNode = 11115;\n        public static final int Task = 11116;\n\/\/        public static final int MapTask = 11117;\n\/\/        public static final int ReduceTask = 11118;\n        public static final int MapOutputBuffer = 33333;\n        public static final int MapTaskOutputSize = 44444;\n    }\n\n    public static class Values {\n\n       \t\/\/ Generic\n\t\tpublic static final int End = 0;        \n        public static final int Start = 1;\n        \n        \/\/ Events.TaskTracker \n\t\tpublic static final int RunMapper = 8;\n        public static final int RunReducer = 9;\n        public static final int ReducerCopyPhase = 10;\n        public static final int ReducerSortPhase = 11;\n        public static final int ReducerReducePhase = 12;\n\n\t\t\/\/ Events.JobTracker\n\t\tpublic static final int HeartBeat = 13;\n\n\n\t\t\/\/ Events.MapOutputBuffer\n        public static final int Flush = 1;\n        public static final int SortAndSpill = 2;\n        public static final int Sort = 3;        \n        public static final int CreateSpillIndexFile = 5;\n        \/\/public static final int TotalIndexCacheMemory = 6;\n        public static final int SpillRecordDumped = 7;\n        public static final int Combine = 4;\n    }    \n\n\n\t\/*\n\tFUNCTIONS\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\t\n\tprivate static long getPID() {\n\t\tString name = java.lang.management.ManagementFactory.getRuntimeMXBean().getName();\n\t\treturn Long.parseLong(name.split(\"@\")[0]);\n\t}\n\n\tprivate void generateEvent(Integer key, Integer value) {\n\t\t\/\/2:cpu:app:task:thread:time:type:value\n\t\ttry{\n\t\t\tString hostname = InetAddress.getLocalHost().getHostName();\n\t\t\tlong pid = getPID();\n\t\t\tLOG.info(hostname+\",\"+pid+\",2:\"+hostname+\":2:\"+pid+\":1:\"+System.currentTimeMillis()+\":\"+key+\":\"+value);\n\t\t}\n\t\tcatch (Exception e) {\n\t\t\tLOG.error(e, e);\n\n\t\t}\n\t}\n\n\n\tprivate void generateEvent(Integer key, String value) {\n\t\t\/\/2:cpu:app:task:thread:time:type:value\n\t\ttry{\n\t\t\tString hostname = InetAddress.getLocalHost().getHostName();\n\t\t\tlong pid = getPID();\n\t\t\tLOG.info(hostname+\",\"+pid+\",2:\"+hostname+\":2:\"+pid+\":1:\"+System.currentTimeMillis()+\":\"+key+\":\"+value);\n\t\t}\n\t\tcatch (Exception e) {\n\t\t\tLOG.error(e, e);\n\n\t\t}\n\t}\n\n\n\t\/*private void generateEVent(Integer key[], Integer value) {\n\n\t\tStringBuffer output = new StringBuffer();\n\n\n\t\toutput.append()\n\n\t}*\/\n\n\tprivate void instrumentation(String event, String when) {\n\n\t\tinstrumentation(event, when, \"\");\n\n\t}\n\tprivate void instrumentation(String event, String when, String additional) {\n\t\ttry {\n\t\t\t\/\/Add hostname\n\t\t\tString log = InetAddress.getLocalHost().getHostName();\n\t\t\t\/\/Add PID \n\t\t\tlog += \",\" + getPID();\n\t\t\t\/\/Specify event\n\t\t\tlog += \",\" + when + \",\" + event;\n\t\t\t\/\/Specify event\n\t\t\tlog += additional;\n\t\t\t\/\/LOG.info(log);\n\t\t\t\/\/writeLog(logFile,log);\n\n\n\t\t}\n\t\tcatch (IOException e) {\n\t\t\te.printStackTrace();\n\t\t}\n\t}\n\n\n\t\/*\n\tPOINTCUTS\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\n\t\/\/RegisterDataNode Pointcut\n\n\tpointcut startDataNode(): execution(* org.apache.hadoop.hdfs.server.datanode.DataNode.startDataNode(..));\n\n\t\/\/RegisterNameNode Pointcut\n\n\tpointcut initializeNameNode():  execution(* org.apache.hadoop.hdfs.server.namenode.NameNode.initialize(..));\n\n\t\/\/RegisterSecondaryNamenode Pointcut\n\n\tpointcut initializeSecondaryNameNode(): execution(* org.apache.hadoop.hdfs.server.namenode.SecondaryNameNode.initialize(..));\n\n\t\/\/RegisterTask - CHILD\n\n\t\/\/pointcut initializeChild(): call(* org.apache.hadoop.mapred.Child.initMetrics(..)) && withincode(* org.apache.hadoop.mapred.Child.main(..)); \n\n\tpointcut initializeChild(): execution(* org.apache.hadoop.mapred.Child.main(..)); \n\n\t\/\/Register JobTracker Pointcut\n\n\tpointcut registerJobTracker(): execution(* org.apache.hadoop.mapred.JobTracker.startTracker(..));\n\n\t\/\/HEARTBEAT\n\n\tpointcut heartbeat(TaskTrackerStatus status,boolean restarted,boolean initialContact,boolean acceptNewTasks,short responseId): execution(* org.apache.hadoop.mapred.JobTracker.heartbeat(..)) && args(status, restarted, initialContact, acceptNewTasks,responseId);\n\n\t\/*\n\t\t###########################################################################\n\t\t############################Task###########################################\n\t\t###########################################################################\n\t*\/\n\n\n\tpointcut outputSize(): call (* *.getLen(..)) && withincode(* org.apache.hadoop.mapred.Task.calculateOutputSize());\n\n\t\/*\n\t\t###########################################################################\n\t\t############################MAPPER#########################################\n\t\t###########################################################################\n\t*\/\n\n\t\/\/pointcut maptask(): execution(* org.apache.hadoop.mapred.MapTask.run(..));\n\tpointcut mapper(): call(* org.apache.hadoop.mapred.MapTask.runNewMapper(..)) && withincode(* org.apache.hadoop.mapred.MapTask.run(..));\n\n\n\t\/\/  ############################SORT AND SPILL#################################\n\n\t\/\/Start-End\n\tpointcut taskSortAndSpill(): execution(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\n\tpointcut flush(): execution(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.flush());\n\n\t\/\/Spill File Size\n\tpointcut sortAndSpillSpillFile(int numSpills, long size) : call (* *.getSpillFileForWrite(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(numSpills, size);\n\n\t\/\/SpillIndex File Size\n\tpointcut sortAndSpillSpillIndexFile(int numSpills, long partitions) : call (* *.getSpillIndexFileForWrite(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(numSpills, partitions);\n\n\t\/\/Sort \n\tpointcut sortAndSpillSort(int kvstart, int endPosition, Object reporter): call(* *.sort(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(..,kvstart,endPosition,reporter);\n\n\t\/\/Init Writer\n\t\/\/pointcut sortAndSpillInitWriter() : call (org.apache.hadoop.mapred.IFile.Writer.new(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Close Writer\n\t\/\/pointcut sortAndSpillCloseWriter() : call (void org.apache.hadoop.mapred.IFile.Writer.close(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Write key-value\n\tpointcut sortAndSpillWrite(DataInputBuffer key, DataInputBuffer value): call (* *.append(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(key,value);\n\t\n\t\/\/Combiner\n\tpointcut sortAndSpillCombiner(): call(* *.combine(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Spill Index File\n\tpointcut sortAndSpillSpillIndexWrite(): call(* *.writeToFile(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/*\n\t\t###########################################################################\n\t\t############################REDUCER########################################\n\t\t###########################################################################\n\t*\/\n\n\t\/\/REDUCETASK RUN\n\tpointcut reducer(): execution(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\tpointcut initCodec(): call(* *.initCodec(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\tpointcut setPhase(TaskStatus.Phase phase): call(* *.setPhase(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..)) && args(phase);\n\n\t\n\t\/\/pointcut endCopy(): call(* *.setPhase(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\t\/\/pointcut endSort(): call(* *.getMapOutputKeyClass(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\t\n\n\t\/*\n\t\t###########################################################################\n\t\t############################NETWORK########################################\n\t\t###########################################################################\n\t*\/\n\n\tpointcut defaultBlockSize(): call(* org.apache.hadoop.hdfs.DFSClient.getDefaultBlockSize());\n\t\/\/pointcut blockSize(): call(* org.apache.hadoop.hdfs.DFSClient.getBlockSize(..));\n\tpointcut createDFSFile(String src,FsPermission permission,boolean overwrite,boolean createParent,short replication,long blockSize,Progressable progress, int buffersize): execution (* org.apache.hadoop.hdfs.DFSClient.create(..)) && args(src,permission,overwrite,createParent,replication,blockSize,progress,buffersize);\n\tpointcut runDataStreamer(): execution (* org.apache.hadoop.hdfs.DFSClient.DFSOutputStream.DataStreamer.run());\n\t\/\/pointcut readEntireBufferFromDataNode(byte buf[],int off,int len): execution(* org.apache.hadoop.hdfs.DFSClient.DFSInputStream.read(..)) && args(buf[],off,len);\n\t\/\/pointcut readFromDataNode(): call (* org.apache.hadoop.hdfs.DFSClient.DFSInputStream.blockSeekTo(..)) && withincode(* org.apache.hadoop.hdfs.DFSClient.DFSInputStream.read(..));\n\tpointcut newBlockReader(Socket sock, String file, long blockId, Token<BlockTokenIdentifier> accessToken, long genStamp, long startOffset, long len, int bufferSize, boolean verifyChecksum, String clientName): execution (* org.apache.hadoop.hdfs.DFSClient.BlockReader.newBlockReader(..)) && args(sock,file,blockId,accessToken,genStamp,startOffset,len,bufferSize,verifyChecksum,clientName);\n\n\t\/*\n\tAdvices\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\n\t\/\/ RegiterJobTracker\n\n\tafter() : registerJobTracker(){\n\t\tgenerateEvent(Events.JobTracker, Values.Start);\n\n\t}\n\n\t\/\/RegisterTaskTracker ?\n\n\n\t\/\/RegisterNameNode\n\n\tafter() : initializeNameNode(){\n\t\tgenerateEvent(Events.NameNode, Values.Start);\n\t}\n\n\t\/\/RegisterDataNode \n\n\tafter() : startDataNode(){\n\t\tgenerateEvent(Events.DataNode, Values.Start);\n\t}\n\n\n\t\/\/RegisterSecondaryNamenode\n\n\tafter() : initializeSecondaryNameNode(){\n\t\tgenerateEvent(Events.SecondaryNameNode, Values.Start);\n\t}\n\n\n\t\/\/HEARTBEAT \n\tafter(TaskTrackerStatus status,boolean restarted,boolean initialContact,boolean acceptNewTasks,short responseId) : heartbeat(status, restarted, initialContact, acceptNewTasks,responseId){\n\t\tgenerateEvent(Events.JobTracker, status.getTrackerName());\n\t}\n\n\n\t\/*\n\t\t###########################################################################\n\t\t############################Task###########################################\n\t\t###########################################################################\n\t*\/\n\n\t\/\/RegisterTask CHILD \n\tafter() : initializeChild() { \/\/We need the  PID of this task to be registered\n\t\tgenerateEvent(Events.Task, Values.Start);\n\t}\n\n\n\/*\tafter() returning(long size) : outputSize() {\n\t\tString s = \"Task-outputSize\";\n\t\tinstrumentation(s,\"after\",\", size: \" + Long.toString(size));\n\t}\n\n\t\/*\n\t\t###########################################################################\n\t\t############################Mapper#########################################\n\t\t###########################################################################\n\t*\/\n\n\n\t\/*before() : maptask(){\n\t\tgenerateEvent(Events.MapTask, Values.Start);\n\t}*\/\n\n\tbefore() : mapper(){\n\t\tgenerateEvent(Events.TaskTracker, Values.RunMapper);\n\t}\n\n\tafter() : mapper(){\n\t\tgenerateEvent(Events.TaskTracker, Values.End);\n\t}\n\n\n\t\n\n\t\/\/  ############################SORT AND SPILL#################################\n\n\tbefore() : taskSortAndSpill(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.SortAndSpill);\n\t}\n\n\n\tafter() : taskSortAndSpill(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\n\t}\n\n\t\/\/flush\n\n\tbefore() : flush(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.Flush);\n\t}\n\n\tafter() : flush(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\n\t}\n\n\n\n\t\/\/ Spill File Size\n\n\tafter(int numSpills, long size) returning : sortAndSpillSpillFile(numSpills, size){\n\t\tString s = \"sortAndSpillSpillFile\";\n\t\tinstrumentation(s,\"after\",\", numSpills: \" +Integer.toString(numSpills) + \";size: \" + Long.toString((size*numSpills) + size));\n\t}\n\n\t\/\/ SpillIndex File Size\n\n\tafter(int numSpills, long partitions) returning : sortAndSpillSpillIndexFile(numSpills, partitions){\n\t\tString s = \"sortAndSpillSpillIndexFile\";\n\t\tinstrumentation(s,\"after\",\",\" + Long.toString(numSpills * partitions));\n\t}\n\n\/*\n\tbefore(int length) : kvbufferState(length){\n\n\t\tString s = \"kvbufferState\";\n\t\tFile logFile = getFile();\n\t\tinstrumentation(logFile,s,\"before\");\n\t\twriteLog(logFile,Integer.toString(length));\n\t}\n\n*\/\n\n\tbefore(int kvstart, int endPosition, Object reporter) : sortAndSpillSort(kvstart,endPosition,reporter){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.Sort);\n\t\t\/\/instrumentation(s,\"before\",\",\" + Integer.toString(endPosition - kvstart));\n\t}\n\tafter(int kvstart, int endPosition, Object reporter) returning : sortAndSpillSort(kvstart,endPosition,reporter){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\n\t\t\/\/instrumentation(s,\"after\",\",\" + Integer.toString(endPosition - kvstart));\n\t}\n\n\t\/\/ Init writer\n\/*\tafter() returning : sortAndSpillInitWriter(){\n\t\tString s = \"sortAndSpillInitWriter\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\t\/\/ Close writer\n\tafter() returning : sortAndSpillCloseWriter(){\n\t\tString s = \"sortAndSpillCloseWriter\";\n\t\tinstrumentation(s,\"after\");\n\t}\n*\/\n\n\tafter(DataInputBuffer key, DataInputBuffer value) returning : sortAndSpillWrite(key,value){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.SpillRecordDumped);\n\t}\n\n\tbefore() : sortAndSpillCombiner(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.Combine);\n\t}\n\n\tafter() returning : sortAndSpillCombiner(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\t\n\t}\n\n\tbefore() : sortAndSpillSpillIndexWrite(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.CreateSpillIndexFile);\n\t}\n\n\tafter() returning : sortAndSpillSpillIndexWrite(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\n\t}\n\n\t\/*\n\t\t###########################################################################\n\t\t############################REDUCER########################################\n\t\t###########################################################################\n\t*\/\n\n\/*\tbefore() : reducer(){\n\t\tString s = \"Reducer\";\n\t\tinstrumentation(s,\"before\");\n\t}\n*\/\n\n\tbefore() : initCodec() {\n\t\tgenerateEvent(Events.TaskTracker, Values.RunReducer);\n\t}\n\n\n\tafter() returning : initCodec() {\n\t\tgenerateEvent(Events.TaskTracker, Values.ReducerCopyPhase);\n\t}\n\n\tbefore(TaskStatus.Phase phase) : setPhase(phase) { \/\/END OF A PHASE (SORT OR COPY)\n\t\t\tgenerateEvent(Events.TaskTracker, Values.End);\n\t}\n\n\tafter(TaskStatus.Phase phase) returning: setPhase(phase) { \n\t\tif (phase == TaskStatus.Phase.SORT) {\n\t\t\tgenerateEvent(Events.TaskTracker, Values.ReducerSortPhase);\n\t\t}\n\t\telse if (phase == TaskStatus.Phase.REDUCE) {\n\t\t\tgenerateEvent(Events.TaskTracker, Values.ReducerReducePhase);\n\t\t}\n\t}\n\n\tafter() : reducer(){ \/\/END OF REDUCE PHASE\n\t\t\tgenerateEvent(Events.TaskTracker, Values.End);\t}\n\n\t\/*\n\t\t###########################################################################\n\t\t############################NETWORK########################################\n\t\t###########################################################################\n\t*\/\n\n\tafter() returning(long blockSize) : defaultBlockSize() {\n\t\tString s = \"Network-defaultBlockSize\";\n\t\tinstrumentation(s,\"after\",\", size: \" + Long.toString(blockSize));\n\t}\n\t\/\/ after() returning(long blockSize) : blockSize() {\n\t\/\/ \tString s = \"Network-blockSize\";\n\t\/\/ \tFile logFile = getFile();\n\t\/\/ \tinstrumentation(logFile,s,\"after\");\n\t\/\/ \tString log = \", size: \" + Long.toString(blockSize);\n\t\/\/ \twriteLog(logFile,log);\n\t\/\/ }\n\n\tafter(String src,FsPermission permission,boolean overwrite, boolean createParent,short replication,long blockSize,Progressable progress, int buffersize): createDFSFile(src,permission,overwrite,createParent,replication,blockSize,progress,buffersize) {\n\t\tString s = \"Network-CreateDFSFile\";\n\n\t\t\/\/MODIFIED!!!!!!-----!!!!!!!!!!!\n\t\tinstrumentation(s,\"after\",\", path: \" + src + \";permission: \" + permission.toString() + \";overwrite: \" + String.valueOf(overwrite) + \";createParent: \" + String.valueOf(createParent) + \";replication: \" + Short.toString(replication) + \";blockSize: \" + Long.toString(blockSize) + \";buffersize: \" + Integer.toString(buffersize));\n\t}\n\tbefore(): runDataStreamer() {\n\t\tString s = \"DataStreamer\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\t\/\/ before(byte buf[],int off, int len) : readEntireBufferFromDataNode(buf[],off,len){\n\t\/\/ \tString s = \"Network-ReadEntireBuffer\";\n\t\/\/ \tinstrumentation(s,\"after\",\", bufferLength: \" + Integer.toString(len));\n\t\/\/ }\n\n\t\/\/ after() returning(DatanodeInfo datanode) : readFromDataNode(){\n\t\/\/ \tString s = \"Network-fromDataNode\";\n\t\/\/ \tinstrumentation(s,\"after\", \", from : \" + datanode.getHostName());\n\t\/\/ }\n\n\tafter(Socket sock, String file, long blockId, Token<BlockTokenIdentifier> accessToken, long genStamp, long startOffset, long len, int bufferSize, boolean verifyChecksum, String clientName) : newBlockReader(sock,file,blockId,accessToken,genStamp,startOffset,len,bufferSize,verifyChecksum,clientName) {\n\t\tString s = \"Network-NewBlockReader\";\n\t\tString extra = \", DataNode: \" + sock.getInetAddress().getCanonicalHostName();\n\t\textra += \";file: \" + file;\n\t\t\/\/extra += \", length: \" + Long.toString(len) + \"B\";\n\t\textra += \";\" + Long.toString(len);\n\t\textra += \";blockId: \" + Long.toString(blockId);\n\t\textra += \";startOffset: \" + Long.toString(startOffset);\t\t\n\t\tinstrumentation(s,\"after\",extra);\n\t}\n}\n\n\n\n\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"47817e039caef8d2f07f7da0a4a1e270c61e8d61","subject":"Excluded nested classes.","message":"Excluded nested classes.\n\ngit-svn-id: 4050ee570c0b454ed3c2eee326cdaf8b6ad603bd@38 e65ff1b4-dc2a-11dd-afbb-e3e17473af86\n","repos":"carrotsearch\/jsuffixarrays","old_file":"src\/perf\/org\/jsuffixarrays\/MemoryLogger.aj","new_file":"src\/perf\/org\/jsuffixarrays\/MemoryLogger.aj","new_contents":"package org.jsuffixarrays;\r\n\r\n\/**\r\n * This aspect logs the memory state at entry and exit from methods\r\n * declared in inheriting aspects. The aspect is a singleton, so is generally\r\n * not very useful for multi-threaded applications or whenever more than one instance\r\n * of a given instrumented class is used.\r\n *\/\r\nabstract aspect MemoryLogger issingleton()\r\n{\r\n    \/**\r\n     * Declare classes to track memory from.\r\n     *\/\r\n    abstract pointcut tracedClasses();\r\n\r\n    \/**\r\n     * Override and remove methods for which logging should not occur.\r\n     *\/\r\n    pointcut excludedMethods() : !execution(* *(..));\r\n\r\n    \/**\r\n     * Declare methods to track memory in.\r\n     *\/\r\n    final pointcut tracedMethods() : \r\n        tracedClasses() && execution(* *(..)) && !excludedMethods();\r\n\r\n    \/**\r\n     * \r\n     *\/\r\n    before () : tracedClasses() && tracedMethods()\r\n    {\r\n        update();\r\n    }\r\n\r\n    \/**\r\n     * \r\n     *\/\r\n    after () returning : tracedMethods()\r\n    {\r\n        update();\r\n    }\r\n\r\n    \/**\r\n     * Starting amount of memory from which we will begin measurements.\r\n     * \r\n     * @see #reset()\r\n     *\/\r\n    private static volatile long startingPoint;\r\n    \r\n    \/*\r\n     * \r\n     *\/\r\n    private static volatile long maxMemoryUsed;\r\n\r\n    \/*\r\n     * \r\n     *\/\r\n    private static void update()\r\n    {\r\n        final long now = getUsedMemory();\r\n        if (maxMemoryUsed < now)\r\n        {\r\n            maxMemoryUsed = now;\r\n        }\r\n    }\r\n\r\n    \/*\r\n     * \r\n     *\/\r\n    private static long getUsedMemory()\r\n    {\r\n        final Runtime rt = Runtime.getRuntime();\r\n        return rt.totalMemory() - rt.freeMemory();\r\n    }\r\n\r\n    \/**\r\n     * Reset memory status, preparing for measurement.\r\n     *\/\r\n    public static void reset()\r\n    {\r\n        \/\/ Try to clean the GC. Will not work for parallel GC, but we did our best.\r\n        for (int i = 0; i < 5; i++)\r\n        {\r\n            System.gc();\r\n        }\r\n        \r\n        startingPoint = getUsedMemory();\r\n        maxMemoryUsed = 0;\r\n    }\r\n\r\n    \/**\r\n     * Returns the absolute memory peak recorded so far. \r\n     *\/\r\n    public static long getMemoryPeak()\r\n    {\r\n        return maxMemoryUsed;\r\n    }\r\n\r\n    \/**\r\n     * Returns the maximum memory difference from the last time \r\n     * since {@link #reset()} was called. This value may be negative\r\n     * with certain GCs and scenarios. \r\n     *\/\r\n    public static long getMemoryUsed()\r\n    {\r\n        return maxMemoryUsed - startingPoint;\r\n    }\r\n}\r\n\r\n\/**\r\n * Track memory in {@link Skew} algorithm.\r\n *\/\r\naspect SkewMemLogger extends MemoryLogger\r\n{\r\n    @Override\r\n    pointcut tracedClasses() : within(Skew);\r\n    @Override\r\n    pointcut excludedMethods(): execution(* leq*(..));\r\n}\r\n\r\n\/**\r\n * Track memory in {@link NaiveSort} algorithm.\r\n *\/\r\naspect NaiveSortMemLogger extends MemoryLogger\r\n{\r\n    @Override\r\n    pointcut tracedClasses() : within(NaiveSort);\r\n    @Override\r\n    pointcut excludedMethods(): execution(* compare(..));\r\n}\r\n\r\n\/**\r\n * Track memory in {@link DivSufSort} algorithm.\r\n *\/\r\naspect DivSufSortMemLogger extends MemoryLogger\r\n{\r\n    \/* \r\n     * 3 private methods using stack are excluded, \r\n     * because they use max. 64 * 4 bytes of extra memory for stack.\r\n     *\/\r\n    @Override\r\n    pointcut tracedClasses(): within(DivSufSort) && !within(org.jsuffixarrays.DivSufSort..*);\r\n    @Override\r\n    pointcut excludedMethods(): execution(private * *(..)) ;\r\n}\r\n\r\n\/**\r\n * Track memory in {@link QSufSort} algorithm.\r\n *\/\r\naspect QSUfSortMemLogger extends MemoryLogger\r\n{\r\n    @Override\r\n    pointcut tracedClasses() : within(QSufSort);\r\n    @Override\r\n    pointcut excludedMethods(): execution(private * *(..));\r\n}\r\n\r\n\/**\r\n * Track memory in {@link BPR} algorithm.\r\n *\/\r\naspect BPRMemLogger extends MemoryLogger\r\n{\r\n    @Override\r\n    pointcut tracedClasses() : within(BPR);\r\n    @Override\r\n    pointcut excludedMethods(): execution(private * *(..));\r\n}\r\n\r\n\/**\r\n * Track memory in {@link DeepShallow} algorithm.\r\n *\/\r\naspect DeepShallowMemLogger extends MemoryLogger\r\n{\r\n    @Override\r\n    pointcut tracedClasses() : within(DeepShallow);\r\n    @Override\r\n    pointcut excludedMethods(): execution(private * *(..));\r\n}\r\n    \r\n\/**\r\n * Track memory in {@link SAIS} algorithm.\r\n *\/\r\naspect SaisMemLogger extends MemoryLogger\r\n{\r\n    @Override\r\n    pointcut tracedClasses() : within(SAIS) && !within(org.jsuffixarrays.SAIS..*);\r\n    \r\n    @Override\r\n    pointcut excludedMethods(): execution(private * *(..)) \r\n        && !execution(private * SA_IS(..))\r\n        && !execution(private * induceSA(..));\r\n}\r\n    \r\n\r\n\r\n","old_contents":"package org.jsuffixarrays;\r\n\r\n\/**\r\n * This aspect logs the memory state at entry and exit from methods\r\n * declared in inheriting aspects. The aspect is a singleton, so is generally\r\n * not very useful for multi-threaded applications or whenever more than one instance\r\n * of a given instrumented class is used.\r\n *\/\r\nabstract aspect MemoryLogger issingleton()\r\n{\r\n    \/**\r\n     * Declare classes to track memory from.\r\n     *\/\r\n    abstract pointcut tracedClasses();\r\n\r\n    \/**\r\n     * Override and remove methods for which logging should not occur.\r\n     *\/\r\n    pointcut excludedMethods() : !execution(* *(..));\r\n\r\n    \/**\r\n     * Declare methods to track memory in.\r\n     *\/\r\n    final pointcut tracedMethods() : \r\n        tracedClasses() && execution(* *(..)) && !excludedMethods();\r\n\r\n    \/**\r\n     * \r\n     *\/\r\n    before () : tracedClasses() && tracedMethods()\r\n    {\r\n        update();\r\n    }\r\n\r\n    \/**\r\n     * \r\n     *\/\r\n    after () returning : tracedMethods()\r\n    {\r\n        update();\r\n    }\r\n\r\n    \/**\r\n     * Starting amount of memory from which we will begin measurements.\r\n     * \r\n     * @see #reset()\r\n     *\/\r\n    private static volatile long startingPoint;\r\n    \r\n    \/*\r\n     * \r\n     *\/\r\n    private static volatile long maxMemoryUsed;\r\n\r\n    \/*\r\n     * \r\n     *\/\r\n    private static void update()\r\n    {\r\n        final long now = getUsedMemory();\r\n        if (maxMemoryUsed < now)\r\n        {\r\n            maxMemoryUsed = now;\r\n        }\r\n    }\r\n\r\n    \/*\r\n     * \r\n     *\/\r\n    private static long getUsedMemory()\r\n    {\r\n        final Runtime rt = Runtime.getRuntime();\r\n        return rt.totalMemory() - rt.freeMemory();\r\n    }\r\n\r\n    \/**\r\n     * Reset memory status, preparing for measurement.\r\n     *\/\r\n    public static void reset()\r\n    {\r\n        \/\/ Try to clean the GC. Will not work for parallel GC, but we did our best.\r\n        for (int i = 0; i < 5; i++)\r\n        {\r\n            System.gc();\r\n        }\r\n        \r\n        startingPoint = getUsedMemory();\r\n        maxMemoryUsed = 0;\r\n    }\r\n\r\n    \/**\r\n     * Returns the absolute memory peak recorded so far. \r\n     *\/\r\n    public static long getMemoryPeak()\r\n    {\r\n        return maxMemoryUsed;\r\n    }\r\n\r\n    \/**\r\n     * Returns the maximum memory difference from the last time \r\n     * since {@link #reset()} was called. This value may be negative\r\n     * with certain GCs and scenarios. \r\n     *\/\r\n    public static long getMemoryUsed()\r\n    {\r\n        return maxMemoryUsed - startingPoint;\r\n    }\r\n}\r\n\r\n\/**\r\n * Track memory in {@link Skew} algorithm.\r\n *\/\r\naspect SkewMemLogger extends MemoryLogger\r\n{\r\n    @Override\r\n    pointcut tracedClasses() : within(Skew);\r\n    @Override\r\n    pointcut excludedMethods(): execution(* leq*(..));\r\n}\r\n\r\n\/**\r\n * Track memory in {@link NaiveSort} algorithm.\r\n *\/\r\naspect NaiveSortMemLogger extends MemoryLogger\r\n{\r\n    @Override\r\n    pointcut tracedClasses() : within(NaiveSort);\r\n    @Override\r\n    pointcut excludedMethods(): execution(* compare(..));\r\n}\r\n\r\n\/**\r\n * Track memory in {@link DivSufSort} algorithm.\r\n *\/\r\naspect DivSufSortMemLogger extends MemoryLogger\r\n{\r\n    \/* 3 methods using stack are excluded, because they use max. 64 * 4 bytes of extra memory for stack *\/\r\n    \/\/ TODO: somehow exclude TRBudget class; within(DivSufSort && !DivSufSort.TRBudget) does not work);\r\n    @Override\r\n    pointcut tracedClasses(): within(DivSufSort);\r\n    @Override\r\n    pointcut excludedMethods(): execution(private * *(..)) ;\r\n}\r\n\r\n\/**\r\n * Track memory in {@link QSufSort} algorithm.\r\n *\/\r\naspect QSUfSortMemLogger extends MemoryLogger\r\n{\r\n    @Override\r\n    pointcut tracedClasses() : within(QSufSort);\r\n    @Override\r\n    pointcut excludedMethods(): execution(private * *(..));\r\n}\r\n\r\n\/**\r\n * Track memory in {@link BPR} algorithm.\r\n *\/\r\naspect BPRMemLogger extends MemoryLogger\r\n{\r\n    @Override\r\n    pointcut tracedClasses() : within(BPR);\r\n    @Override\r\n    pointcut excludedMethods(): execution(private * *(..));\r\n}\r\n\r\n\/**\r\n * Track memory in {@link DeepShallow} algorithm.\r\n *\/\r\naspect DeepShallowMemLogger extends MemoryLogger\r\n{\r\n    @Override\r\n    pointcut tracedClasses() : within(DeepShallow);\r\n    @Override\r\n    pointcut excludedMethods(): execution(private * *(..));\r\n}\r\n    \r\n\/**\r\n * Track memory in {@link SAIS} algorithm.\r\n *\/\r\naspect SaisMemLogger extends MemoryLogger\r\n{\r\n    @Override\r\n    pointcut tracedClasses() : within(SAIS) && !within(org.jsuffixarrays.SAIS..*);\r\n    \r\n    @Override\r\n    pointcut excludedMethods(): execution(private * *(..)) \r\n        && !execution(private * SA_IS(..))\r\n        && !execution(private * induceSA(..));\r\n}\r\n    \r\n\r\n\r\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"1560c37441b1bde463674bc2960830b7b34d291a","subject":"Remove unexpected traces on console output","message":"Remove unexpected traces on console output\n","repos":"awltech\/org.parallelj,christophe-w\/parallelj.runtime","old_file":"parallelj-core\/src\/main\/java\/org\/parallelj\/internal\/util\/sm\/impl\/KStateMachines.aj","new_file":"parallelj-core\/src\/main\/java\/org\/parallelj\/internal\/util\/sm\/impl\/KStateMachines.aj","new_contents":"\/*\n *     ParallelJ, framework for parallel computing\n *\n *     Copyright (C) 2010, 2011, 2012 Atos Worldline or third-party contributors as\n *     indicated by the @author tags or express copyright attribution\n *     statements applied by the authors.\n *\n *     This library is free software; you can redistribute it and\/or\n *     modify it under the terms of the GNU Lesser General Public\n *     License as published by the Free Software Foundation; either\n *     version 2.1 of the License.\n *\n *     This library is distributed in the hope that it will be useful,\n *     but WITHOUT ANY WARRANTY; without even the implied warranty of\n *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n *     Lesser General Public License for more details.\n *\n *     You should have received a copy of the GNU Lesser General Public\n *     License along with this library; if not, write to the Free Software\n *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n *\/\npackage org.parallelj.internal.util.sm.impl;\n\nimport javax.xml.bind.annotation.XmlTransient;\n\nimport org.aspectj.lang.reflect.MethodSignature;\nimport org.parallelj.internal.util.sm.StateListener;\nimport org.parallelj.internal.util.sm.impl.KStateMachine.KVertex;\nimport org.parallelj.internal.util.sm.impl.KStateMachine.Occurrence;\n\npublic privileged aspect KStateMachines {\n\n\t\/**\n\t * \n\t *\/\n\tpublic static interface Adapter {\n\n\t}\n\n\t\/**\n\t * Inter type declaration in order to link annotated classes and state\n\t * machine occurrence.\n\t *\/\n\t@XmlTransient\n\tpublic Occurrence Adapter.occurrence;\n\n\tdeclare parents:\n\t\t(@org.parallelj.internal.util.sm.StateMachine *) implements Adapter;\n\n\tpublic static privileged aspect PerMachine pertypewithin(@org.parallelj.internal.util.sm.StateMachine *) {\n\n\t\tKStateMachine machine;\n\n\t\tafter() : staticinitialization(@org.parallelj.internal.util.sm.StateMachine *) {\n\t\t\tthis.machine = new KStateMachine(thisJoinPoint.getSignature()\n\t\t\t\t\t.getDeclaringType());\n\t\t\t\/\/System.out.println(this.machine);\n\t\t}\n\n\t\tafter(Object self): execution((@org.parallelj.internal.util.sm.StateMachine *).new(..)) && this(self) {\n\t\t\t((Adapter) self).occurrence = this.machine.newOccurrence(self);\n\t\t}\n\n\t\tvoid around(Object self): execution(@org.parallelj.internal.util.sm.Trigger * *(..)) && this(self) {\n\t\t\tOccurrence occurrence = ((Adapter) self).occurrence;\n\t\t\tKVertex previous = occurrence.getCurrent();\n\t\t\tKTrigger trigger = this.machine\n\t\t\t\t\t.getTrigger(((MethodSignature) thisJoinPoint.getSignature())\n\t\t\t\t\t\t\t.getName());\n\t\t\toccurrence.trigger(trigger.trigger(occurrence,\n\t\t\t\t\tthisJoinPoint.getArgs()));\n\t\t\tKVertex current = occurrence.getCurrent();\n\t\t\tif (previous != current && current != null) {\n\t\t\t\toccurrence.getSupport().fireStateChanded(current.value);\n\t\t\t}\n\t\t}\n\t}\n\n\tvoid around(Object machine, StateListener listener): execution(* org.parallelj.internal.util.sm.StateMachines.addStateListener(..)) && args(machine, listener, ..) {\n\t\tOccurrence occurrence = ((Adapter) machine).occurrence;\n\t\toccurrence.getSupport().addStateListener(listener);\n\t}\n\n\tvoid around(Object machine, StateListener listener): execution(* org.parallelj.internal.util.sm.StateMachines.removeStateListener(..)) && args(machine, listener, ..) {\n\t\tOccurrence occurrence = ((Adapter) machine).occurrence;\n\t\toccurrence.getSupport().removeStateListener(listener);\n\t}\n\n}\n","old_contents":"\/*\n *     ParallelJ, framework for parallel computing\n *\n *     Copyright (C) 2010, 2011, 2012 Atos Worldline or third-party contributors as\n *     indicated by the @author tags or express copyright attribution\n *     statements applied by the authors.\n *\n *     This library is free software; you can redistribute it and\/or\n *     modify it under the terms of the GNU Lesser General Public\n *     License as published by the Free Software Foundation; either\n *     version 2.1 of the License.\n *\n *     This library is distributed in the hope that it will be useful,\n *     but WITHOUT ANY WARRANTY; without even the implied warranty of\n *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n *     Lesser General Public License for more details.\n *\n *     You should have received a copy of the GNU Lesser General Public\n *     License along with this library; if not, write to the Free Software\n *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n *\/\npackage org.parallelj.internal.util.sm.impl;\n\nimport javax.xml.bind.annotation.XmlTransient;\n\nimport org.aspectj.lang.reflect.MethodSignature;\nimport org.parallelj.internal.util.sm.StateListener;\nimport org.parallelj.internal.util.sm.impl.KStateMachine.KVertex;\nimport org.parallelj.internal.util.sm.impl.KStateMachine.Occurrence;\n\npublic privileged aspect KStateMachines {\n\n\t\/**\n\t * \n\t *\/\n\tpublic static interface Adapter {\n\n\t}\n\n\t\/**\n\t * Inter type declaration in order to link annotated classes and state\n\t * machine occurrence.\n\t *\/\n\t@XmlTransient\n\tpublic Occurrence Adapter.occurrence;\n\n\tdeclare parents:\n\t\t(@org.parallelj.internal.util.sm.StateMachine *) implements Adapter;\n\n\tpublic static privileged aspect PerMachine pertypewithin(@org.parallelj.internal.util.sm.StateMachine *) {\n\n\t\tKStateMachine machine;\n\n\t\tafter() : staticinitialization(@org.parallelj.internal.util.sm.StateMachine *) {\n\t\t\tthis.machine = new KStateMachine(thisJoinPoint.getSignature()\n\t\t\t\t\t.getDeclaringType());\n\t\t\tSystem.out.println(this.machine);\n\t\t}\n\n\t\tafter(Object self): execution((@org.parallelj.internal.util.sm.StateMachine *).new(..)) && this(self) {\n\t\t\t((Adapter) self).occurrence = this.machine.newOccurrence(self);\n\t\t}\n\n\t\tvoid around(Object self): execution(@org.parallelj.internal.util.sm.Trigger * *(..)) && this(self) {\n\t\t\tOccurrence occurrence = ((Adapter) self).occurrence;\n\t\t\tKVertex previous = occurrence.getCurrent();\n\t\t\tKTrigger trigger = this.machine\n\t\t\t\t\t.getTrigger(((MethodSignature) thisJoinPoint.getSignature())\n\t\t\t\t\t\t\t.getName());\n\t\t\toccurrence.trigger(trigger.trigger(occurrence,\n\t\t\t\t\tthisJoinPoint.getArgs()));\n\t\t\tKVertex current = occurrence.getCurrent();\n\t\t\tif (previous != current && current != null) {\n\t\t\t\toccurrence.getSupport().fireStateChanded(current.value);\n\t\t\t}\n\t\t}\n\t}\n\n\tvoid around(Object machine, StateListener listener): execution(* org.parallelj.internal.util.sm.StateMachines.addStateListener(..)) && args(machine, listener, ..) {\n\t\tOccurrence occurrence = ((Adapter) machine).occurrence;\n\t\toccurrence.getSupport().addStateListener(listener);\n\t}\n\n\tvoid around(Object machine, StateListener listener): execution(* org.parallelj.internal.util.sm.StateMachines.removeStateListener(..)) && args(machine, listener, ..) {\n\t\tOccurrence occurrence = ((Adapter) machine).occurrence;\n\t\toccurrence.getSupport().removeStateListener(listener);\n\t}\n\n}\n","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"4a6a05ae9a050882fae8f461aa437971a2dac342","subject":"refactored StatOverallGraph","message":"refactored StatOverallGraph\n","repos":"stieglma\/Schafkopfauswerter","old_file":"src\/StatOverallGraph.aj","new_file":"src\/StatOverallGraph.aj","new_contents":"import java.awt.BasicStroke;\nimport java.awt.Color;\nimport java.awt.Font;\nimport java.awt.GridLayout;\nimport java.awt.LinearGradientPaint;\n\nimport javax.swing.JPanel;\nimport javax.swing.JTabbedPane;\n\nimport de.erichseifert.gral.data.DataTable;\nimport de.erichseifert.gral.plots.BarPlot;\nimport de.erichseifert.gral.plots.PiePlot;\nimport de.erichseifert.gral.ui.InteractivePanel;\nimport de.erichseifert.gral.plots.BarPlot.BarRenderer;\nimport de.erichseifert.gral.plots.PiePlot.PieSliceRenderer;\nimport de.erichseifert.gral.plots.points.PointRenderer;\nimport de.erichseifert.gral.util.GraphicsUtils;\nimport de.erichseifert.gral.util.Insets2D;\nimport de.erichseifert.gral.util.Location;\nimport view.GUI;\nimport view.UIUpdater;\n\npublic privileged aspect StatOverallGraph {\n    \/** Statistics has to be the last feature executed, such that the subfeatures have the correct gui\n     * object before statistics can create the tabbed pane\n     *\/\n    declare precedence : Statistics, StatOverallGraph, StatOverallTxt;\n\n    private static GUI gui;\n\n    private static final Color COLOR1 = Color.GREEN;\n\n    @SuppressWarnings(\"unchecked\")\n    private static DataTable playedTypes = new DataTable(Integer.class, String.class);\n    @SuppressWarnings(\"unchecked\")\n    private static DataTable mostExpsvGame = new DataTable(Integer.class, Integer.class, String.class);\n    @SuppressWarnings(\"unchecked\")\n    private static DataTable wonGames = new DataTable(Integer.class, Double.class, String.class);\n\n    after() returning(GUI gui): call(GUI.new(*)) {\n        StatOverallGraph.gui = gui;\n    }\n\n    after(JTabbedPane tabbedPane): \n\t\t\texecution(public static void StatisticsHelper.StatisticsPaneCreated(JTabbedPane))\n\t\t\t&& args(tabbedPane) {\n        JPanel masterPanel = new JPanel();\n        JPanel leftPanel = new JPanel();\n        JPanel rightPanel = new JPanel();\n        \n        masterPanel.setLayout(new GridLayout(1, 2));\n        leftPanel.setLayout(new GridLayout(2, 1));\n        rightPanel.setLayout(new GridLayout(1, 1));\n        \n        masterPanel.add(leftPanel);\n        masterPanel.add(rightPanel);\n        \n        updateData();\n        leftPanel.add(new InteractivePanel(createExpGameBarPlot()));\n        leftPanel.add(new InteractivePanel(createWonGamesBarPlot()));\n        rightPanel.add(new InteractivePanel(createPlayedTypesPlot()));\n\n        tabbedPane.addTab(\"Gesamtstatistiken (Grafik)\", masterPanel);\n    }\n\n    after() : execution(* UIUpdater.run()) {\n        updateData();\n    }\n\n    private static void updateData() {\n        OverallStatistics data = gui.model.getGameData().getOverallStatistics();\n\n        while (playedTypes.getRowCount() > 0) {\n            playedTypes.removeLast();\n        }\n        playedTypes.add(data.getAnzahlRufspiele(), \"Rufspiele\");\n        playedTypes.add(data.getAnzahlSoli(), \"Soli\");\n        playedTypes.add(data.getAnzahlSoliTout(), \"Soli Tout\");\n        playedTypes.add(data.getAnzahlSoliSie(), \"Soli Sie\");\n        playedTypes.add(data.getAnzahlWeiter(), \"Weiter\");\n\n        while (mostExpsvGame.getRowCount() > 0) {\n            mostExpsvGame.removeLast();\n        }\n        mostExpsvGame.add(1, data.getTeuerstesRufspiel(), \"Rufspiel\");\n        mostExpsvGame.add(2, data.getTeuerstesSolo(), \"Solo\");\n        mostExpsvGame.add(3, data.getTeuerstesSoloTout(), \"Solo Tout\");\n        mostExpsvGame.add(4, data.getTeuerstesSoloSie(), \"Solo Sie\");\n\n        while (wonGames.getRowCount() > 0) {\n            wonGames.removeLast();\n        }\n        wonGames.add(1, data.getGesamtWinPerc(), \"Gesamt\");\n        wonGames.add(2, data.getRufspieleWinPerc(), \"Rufspiele\");\n        wonGames.add(3, data.getSoliGesamtWinPerc(), \"Soli gesamt\");\n        wonGames.add(4, data.getSoliNormalWinPerc(), \"Soli normal\");\n        wonGames.add(5, data.getSoliToutWinPerc(), \"Soli Tout\");\n        wonGames.add(6, data.getSoliSieWinPerc(), \"Soli Sie\");\n    }\n\n    private static PiePlot createPlayedTypesPlot() {\n        PiePlot plot = new PiePlot(playedTypes);\n\n        PointRenderer pointRenderer = plot.getPointRenderer(playedTypes);\n        pointRenderer.setValueVisible(true);\n        pointRenderer.setValueColumn(1);\n\n        \/\/ Format plot\n        plot.getTitle().setText(\"Anzahl gespielter Spieltypen\");\n        \/\/ Change plot size\n        plot.setRadius(0.9);\n        \/\/ Display a legend\n        plot.setLegendVisible(true);\n        \/\/ Add some margin to the plot area\n        plot.setInsets(new Insets2D.Double(20.0, 40.0, 40.0, 40.0));\n\n        PieSliceRenderer pieSliceRenderer = (PieSliceRenderer) plot\n                .getPointRenderer(playedTypes);\n\n        \/\/ Change relative size of inner region\n        pieSliceRenderer.setInnerRadius(0.4);\n        \/\/ Change the width of gaps between segments\n        pieSliceRenderer.setGap(0.2);\n        \/\/ Show labels\n        pieSliceRenderer.setValueVisible(true);\n        pieSliceRenderer.setValueColor(Color.WHITE);\n        pieSliceRenderer.setValueFont(Font.decode(null).deriveFont(Font.BOLD));\n\n        return plot;\n    }\n\n    public BarPlot createExpGameBarPlot() {\n        \/\/ Create new bar plot\n        BarPlot plot = new BarPlot(mostExpsvGame);\n\n        \/\/ Format plot\n        plot.getTitle().setText(\"Teuerstes Spiel pro Spieltyp\");\n        plot.setInsets(new Insets2D.Double(40.0, 40.0, 40.0, 40.0));\n        plot.setBarWidth(0.075);\n\n        \/\/ Format bars\n        PointRenderer pointRenderer = plot.getPointRenderer(mostExpsvGame);\n        BarRenderer barRenderer = (BarRenderer) pointRenderer;\n\n        barRenderer.setColor(new LinearGradientPaint(0f, 0f, 0f, 1f,\n                new float[] { 0.0f, 1.0f }, new Color[] { COLOR1,\n                        GraphicsUtils.deriveBrighter(COLOR1) }));\n        barRenderer.setBorderStroke(new BasicStroke(3f));\n        barRenderer.setBorderColor(new LinearGradientPaint(0f, 0f, 0f, 1f,\n                new float[] { 0.0f, 1.0f }, new Color[] {\n                        GraphicsUtils.deriveBrighter(COLOR1), COLOR1 }));\n\n        pointRenderer.setValueVisible(true);\n        pointRenderer.setValueColumn(2);\n\n        pointRenderer.setValueLocation(Location.CENTER);\n        pointRenderer.setValueColor(GraphicsUtils.deriveDarker(COLOR1));\n        pointRenderer.setValueFont(Font.decode(null).deriveFont(Font.BOLD));\n\n        return plot;\n    }\n\n    public BarPlot createWonGamesBarPlot() {\n        \/\/ Create new bar plot\n        BarPlot plot = new BarPlot(wonGames);\n\n        \/\/ Format plot\n        plot.getTitle().setText(\"Gewonnene Spiele pro Spieltyp (in %)\");\n        plot.setInsets(new Insets2D.Double(40.0, 40.0, 40.0, 40.0));\n        plot.setBarWidth(0.075);\n\n        \/\/ Format bars\n        PointRenderer pointRenderer = plot.getPointRenderer(wonGames);\n        BarRenderer barRenderer = (BarRenderer) pointRenderer;\n\n        barRenderer.setColor(new LinearGradientPaint(0f, 0f, 0f, 1f,\n                new float[] { 0.0f, 1.0f }, new Color[] { COLOR1,\n                        GraphicsUtils.deriveBrighter(COLOR1) }));\n        barRenderer.setBorderStroke(new BasicStroke(3f));\n        barRenderer.setBorderColor(new LinearGradientPaint(0f, 0f, 0f, 1f,\n                new float[] { 0.0f, 1.0f }, new Color[] {\n                        GraphicsUtils.deriveBrighter(COLOR1), COLOR1 }));\n\n        pointRenderer.setValueVisible(true);\n        pointRenderer.setValueColumn(2);\n\n        pointRenderer.setValueLocation(Location.CENTER);\n        pointRenderer.setValueColor(GraphicsUtils.deriveDarker(COLOR1));\n        pointRenderer.setValueFont(Font.decode(null).deriveFont(Font.BOLD));\n\n        return plot;\n    }\n}\n","old_contents":"import java.awt.BasicStroke;\nimport java.awt.Color;\nimport java.awt.Font;\nimport java.awt.GridLayout;\nimport java.awt.LinearGradientPaint;\n\nimport javax.swing.JPanel;\nimport javax.swing.JTabbedPane;\n\nimport de.erichseifert.gral.data.DataTable;\nimport de.erichseifert.gral.plots.BarPlot;\nimport de.erichseifert.gral.plots.PiePlot;\nimport de.erichseifert.gral.ui.InteractivePanel;\nimport de.erichseifert.gral.plots.BarPlot.BarRenderer;\nimport de.erichseifert.gral.plots.PiePlot.PieSliceRenderer;\nimport de.erichseifert.gral.plots.points.PointRenderer;\nimport de.erichseifert.gral.util.GraphicsUtils;\nimport de.erichseifert.gral.util.Insets2D;\nimport de.erichseifert.gral.util.Location;\nimport view.GUI;\nimport view.UIUpdater;\n\npublic privileged aspect StatOverallGraph {\n    \/** Statistics has to be the last feature executed, such that the subfeatures have the correct gui\n     * object before statistics can create the tabbed pane\n     *\/\n    declare precedence : Statistics, StatOverallGraph, StatOverallTxt;\n\n    private static GUI gui;\n    private static JPanel panel = new JPanel();\n\n    private static final Color COLOR1 = Color.GREEN;\n\n    @SuppressWarnings(\"unchecked\")\n    private static DataTable playedTypes = new DataTable(Integer.class, String.class);\n    @SuppressWarnings(\"unchecked\")\n    private static DataTable mostExpsvGame = new DataTable(Integer.class, Integer.class, String.class);\n    @SuppressWarnings(\"unchecked\")\n    private static DataTable wonGames = new DataTable(Integer.class, Double.class, String.class);\n\n    after() returning(GUI gui): call(GUI.new(*)) {\n        StatOverallGraph.gui = gui;\n    }\n\n    after(JTabbedPane tabbedPane): \n\t\t\texecution(public static void StatisticsHelper.StatisticsPaneCreated(JTabbedPane))\n\t\t\t&& args(tabbedPane) {\n        panel.setLayout(new GridLayout(2, 2));\n\n        updateData();\n        panel.add(new InteractivePanel(createExpGameBarPlot()));\n        panel.add(new InteractivePanel(createWonGamesBarPlot()));\n        panel.add(new InteractivePanel(createPlayedTypesPlot()));\n\n        tabbedPane.addTab(\"Gesamtstatistiken (Grafik)\", panel);\n    }\n\n    after() : execution(* UIUpdater.run()) {\n        updateData();\n    }\n\n    private static void updateData() {\n        OverallStatistics data = gui.model.getGameData().getOverallStatistics();\n\n        while (playedTypes.getRowCount() > 0) {\n            playedTypes.removeLast();\n        }\n        playedTypes.add(data.getAnzahlRufspiele(), \"Rufspiele\");\n        playedTypes.add(data.getAnzahlSoli(), \"Soli\");\n        playedTypes.add(data.getAnzahlSoliTout(), \"Soli Tout\");\n        playedTypes.add(data.getAnzahlSoliSie(), \"Soli Sie\");\n        playedTypes.add(data.getAnzahlWeiter(), \"Weiter\");\n\n        while (mostExpsvGame.getRowCount() > 0) {\n            mostExpsvGame.removeLast();\n        }\n        mostExpsvGame.add(1, data.getTeuerstesRufspiel(), \"Rufspiel\");\n        mostExpsvGame.add(2, data.getTeuerstesSolo(), \"Solo\");\n        mostExpsvGame.add(3, data.getTeuerstesSoloTout(), \"Solo Tout\");\n        mostExpsvGame.add(4, data.getTeuerstesSoloSie(), \"Solo Sie\");\n\n        while (wonGames.getRowCount() > 0) {\n            wonGames.removeLast();\n        }\n        wonGames.add(1, data.getGesamtWinPerc(), \"Gesamt\");\n        wonGames.add(2, data.getRufspieleWinPerc(), \"Rufspiele\");\n        wonGames.add(3, data.getSoliGesamtWinPerc(), \"Soli gesamt\");\n        wonGames.add(4, data.getSoliNormalWinPerc(), \"Soli normal\");\n        wonGames.add(5, data.getSoliToutWinPerc(), \"Soli Tout\");\n        wonGames.add(6, data.getSoliSieWinPerc(), \"Soli Sie\");\n    }\n\n    private static PiePlot createPlayedTypesPlot() {\n        PiePlot plot = new PiePlot(playedTypes);\n\n        PointRenderer pointRenderer = plot.getPointRenderer(playedTypes);\n        pointRenderer.setValueVisible(true);\n        pointRenderer.setValueColumn(1);\n\n        \/\/ Format plot\n        plot.getTitle().setText(\"Anzahl gespielter Spieltypen\");\n        \/\/ Change plot size\n        plot.setRadius(0.9);\n        \/\/ Display a legend\n        plot.setLegendVisible(true);\n        \/\/ Add some margin to the plot area\n        plot.setInsets(new Insets2D.Double(20.0, 40.0, 40.0, 40.0));\n\n        PieSliceRenderer pieSliceRenderer = (PieSliceRenderer) plot\n                .getPointRenderer(playedTypes);\n\n        \/\/ Change relative size of inner region\n        pieSliceRenderer.setInnerRadius(0.4);\n        \/\/ Change the width of gaps between segments\n        pieSliceRenderer.setGap(0.2);\n        \/\/ Show labels\n        pieSliceRenderer.setValueVisible(true);\n        pieSliceRenderer.setValueColor(Color.WHITE);\n        pieSliceRenderer.setValueFont(Font.decode(null).deriveFont(Font.BOLD));\n\n        return plot;\n    }\n\n    public BarPlot createExpGameBarPlot() {\n        \/\/ Create new bar plot\n        BarPlot plot = new BarPlot(mostExpsvGame);\n\n        \/\/ Format plot\n        plot.getTitle().setText(\"Teuerstes Spiel pro Spieltyp\");\n        plot.setInsets(new Insets2D.Double(40.0, 40.0, 40.0, 40.0));\n        plot.setBarWidth(0.075);\n\n        \/\/ Format bars\n        PointRenderer pointRenderer = plot.getPointRenderer(mostExpsvGame);\n        BarRenderer barRenderer = (BarRenderer) pointRenderer;\n\n        barRenderer.setColor(new LinearGradientPaint(0f, 0f, 0f, 1f,\n                new float[] { 0.0f, 1.0f }, new Color[] { COLOR1,\n                        GraphicsUtils.deriveBrighter(COLOR1) }));\n        barRenderer.setBorderStroke(new BasicStroke(3f));\n        barRenderer.setBorderColor(new LinearGradientPaint(0f, 0f, 0f, 1f,\n                new float[] { 0.0f, 1.0f }, new Color[] {\n                        GraphicsUtils.deriveBrighter(COLOR1), COLOR1 }));\n\n        pointRenderer.setValueVisible(true);\n        pointRenderer.setValueColumn(2);\n\n        pointRenderer.setValueLocation(Location.CENTER);\n        pointRenderer.setValueColor(GraphicsUtils.deriveDarker(COLOR1));\n        pointRenderer.setValueFont(Font.decode(null).deriveFont(Font.BOLD));\n\n        return plot;\n    }\n\n    public BarPlot createWonGamesBarPlot() {\n        \/\/ Create new bar plot\n        BarPlot plot = new BarPlot(wonGames);\n\n        \/\/ Format plot\n        plot.getTitle().setText(\"Gewonnene Spiele pro Spieltyp (in %)\");\n        plot.setInsets(new Insets2D.Double(40.0, 40.0, 40.0, 40.0));\n        plot.setBarWidth(0.075);\n\n        \/\/ Format bars\n        PointRenderer pointRenderer = plot.getPointRenderer(wonGames);\n        BarRenderer barRenderer = (BarRenderer) pointRenderer;\n\n        barRenderer.setColor(new LinearGradientPaint(0f, 0f, 0f, 1f,\n                new float[] { 0.0f, 1.0f }, new Color[] { COLOR1,\n                        GraphicsUtils.deriveBrighter(COLOR1) }));\n        barRenderer.setBorderStroke(new BasicStroke(3f));\n        barRenderer.setBorderColor(new LinearGradientPaint(0f, 0f, 0f, 1f,\n                new float[] { 0.0f, 1.0f }, new Color[] {\n                        GraphicsUtils.deriveBrighter(COLOR1), COLOR1 }));\n\n        pointRenderer.setValueVisible(true);\n        pointRenderer.setValueColumn(2);\n\n        pointRenderer.setValueLocation(Location.CENTER);\n        pointRenderer.setValueColor(GraphicsUtils.deriveDarker(COLOR1));\n        pointRenderer.setValueFont(Font.decode(null).deriveFont(Font.BOLD));\n\n        return plot;\n    }\n}\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"d40e9bd8f0dd1b72b939cb67f95322234076991f","subject":"System.exit(0) in case of strong failure","message":"System.exit(0) in case of strong failure\n","repos":"selig\/qea","old_file":"code\/qea\/src\/benchmark\/competition\/java\/javaMOP\/JavaMOPThreeAspect.aj","new_file":"code\/qea\/src\/benchmark\/competition\/java\/javaMOP\/JavaMOPThreeAspect.aj","new_contents":"package benchmark.competition.java.javaMOP;\n\nimport monitoring.impl.MonitorFactory;\nimport monitoring.intf.Monitor;\nimport properties.Property;\nimport properties.competition.JavaMOP;\nimport structure.impl.other.Verdict;\nimport structure.intf.QEA;\n\npublic aspect JavaMOPThreeAspect {\n\n\tprivate final Monitor monitor;\n\n\tprivate final int A = 1;\n\tprivate final int B = 2;\n\tprivate final int C = 3;\n\n\tpublic JavaMOPThreeAspect() {\n\t\tQEA qea = new JavaMOP().make(Property.JAVAMOP_THREE);\n\t\tmonitor = MonitorFactory.create(qea);\n\t}\n\n\tpointcut A() : call(void CThread2.A());\n\n\tpointcut B() : call(void CThread2.B());\n\n\tpointcut C() : call(void CThread2.C());\n\n\tbefore() : A() {\n\t\tVerdict verdict;\n\t\tsynchronized (monitor) {\n\t\t\tverdict = monitor.step(A);\n\t\t}\n\t\tif (verdict == Verdict.FAILURE) {\n\t\t\tSystem.err\n\t\t\t\t\t.println(\"Violation in JavaMOP 3. The functions A(), B(), C() must be called equal times.\");\n\t\t\tSystem.exit(0);\n\t\t}\n\t}\n\n\tbefore() : B() {\n\t\tVerdict verdict;\n\t\tsynchronized (monitor) {\n\t\t\tverdict = monitor.step(B);\n\t\t}\n\t\tif (verdict == Verdict.FAILURE) {\n\t\t\tSystem.err\n\t\t\t\t\t.println(\"Violation in JavaMOP 3. The functions A(), B(), C() must be called equal times.\");\n\t\t\tSystem.exit(0);\n\t\t}\n\t}\n\n\tbefore() : C() {\n\t\tVerdict verdict;\n\t\tsynchronized (monitor) {\n\t\t\tverdict = monitor.step(C);\n\t\t}\n\t\tif (verdict == Verdict.FAILURE) {\n\t\t\tSystem.err\n\t\t\t\t\t.println(\"Violation in JavaMOP 3. The functions A(), B(), C() must be called equal times.\");\n\t\t\tSystem.exit(0);\n\t\t}\n\t}\n\n\tpointcut endOfProgram() : execution(void SRSTest.main(String[]));\n\n\tafter() : endOfProgram() {\n\t\tVerdict verdict = monitor.end();\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\n\t\t\tSystem.err\n\t\t\t\t\t.println(\"Violation in JavaMOP 3. The functions A(), B(), C() must be called equal times.\");\n\t\t} else {\n\t\t\tSystem.err.println(\"Property JavaMOP 3 satisfied\");\n\t\t}\n\t}\n}\n","old_contents":"package benchmark.competition.java.javaMOP;\n\nimport monitoring.impl.MonitorFactory;\nimport monitoring.intf.Monitor;\nimport properties.Property;\nimport properties.competition.JavaMOP;\nimport structure.impl.other.Verdict;\nimport structure.intf.QEA;\n\npublic aspect JavaMOPThreeAspect {\n\n\tprivate final Monitor monitor;\n\n\tprivate final int A = 1;\n\tprivate final int B = 2;\n\tprivate final int C = 3;\n\n\tpublic JavaMOPThreeAspect() {\n\t\tQEA qea = new JavaMOP().make(Property.JAVAMOP_THREE);\n\t\tmonitor = MonitorFactory.create(qea);\n\t}\n\t\n\tpointcut A() : call(void CThread2.A());\n\t\n\tpointcut B() : call(void CThread2.B());\n\t\n\tpointcut C() : call(void CThread2.C());\n\t\n\tbefore() : A() {\n\t\tVerdict verdict;\n\t\tsynchronized (monitor) {\n\t\t\tverdict = monitor.step(A);\n\t\t}\n\t\tif (verdict == Verdict.FAILURE) {\n\t\t\tSystem.err\n\t\t\t.println(\"Violation in JavaMOP 3. The functions A(), B(), C() must be called equal times.\");\n\t\t}\n\t}\n\t\n\tbefore() : B() {\n\t\tVerdict verdict;\n\t\tsynchronized (monitor) {\n\t\t\tverdict = monitor.step(B);\n\t\t}\n\t\tif (verdict == Verdict.FAILURE) {\n\t\t\tSystem.err\n\t\t\t.println(\"Violation in JavaMOP 3. The functions A(), B(), C() must be called equal times.\");\n\t\t}\n\t}\n\t\n\tbefore() : C() {\n\t\tVerdict verdict;\n\t\tsynchronized (monitor) {\n\t\t\tverdict = monitor.step(C);\n\t\t}\n\t\tif (verdict == Verdict.FAILURE) {\n\t\t\tSystem.err\n\t\t\t.println(\"Violation in JavaMOP 3. The functions A(), B(), C() must be called equal times.\");\n\t\t}\n\t}\n\t\n\n\tpointcut endOfProgram() : execution(void SRSTest.main(String[]));\n\n\tafter() : endOfProgram() {\n\t\tVerdict verdict = monitor.end();\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\n\t\t\tSystem.err\n\t\t\t\t\t.println(\"Violation in JavaMOP 3. The functions A(), B(), C() must be called equal times.\");\n\t\t} else {\n\t\t\tSystem.err.println(\"Property JavaMOP 3 satisfied\");\n\t\t}\n\t}\n}\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"310a8492dddba73a9a6df4c2d5288c4ea0abe43b","subject":"Corrected grammar and layout issues in Javadoc.","message":"Corrected grammar and layout issues in Javadoc.\n\n\ngit-svn-id: b619a0c99665f88f1afe72824344cefe9a1c8c90@15327 fd5a2b45-1f63-4059-99e9-3c7cb7fd75c8\n","repos":"cbeams-archive\/spring-framework-2.5.x,cbeams-archive\/spring-framework-2.5.x,cbeams-archive\/spring-framework-2.5.x,cbeams-archive\/spring-framework-2.5.x","old_file":"aspectj\/src\/org\/springframework\/beans\/factory\/aspectj\/AnnotationBeanConfigurerAspect.aj","new_file":"aspectj\/src\/org\/springframework\/beans\/factory\/aspectj\/AnnotationBeanConfigurerAspect.aj","new_contents":"\/*\n * Copyright 2002-2007 the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.springframework.beans.factory.aspectj;\n\nimport java.io.ObjectStreamException;\nimport java.io.Serializable;\n\nimport org.springframework.beans.factory.annotation.AnnotationBeanWiringInfoResolver;\nimport org.springframework.beans.factory.annotation.Configurable;\n\n\/**\n * Concrete aspect that uses the {@link Configurable }\n * annotation to identify which classes need autowiring.\n *\n * <p>The bean name to look up will be taken from the\n * <code>&#64;Configurable<\/code> annotation if specified, otherwise the\n * default bean name to look up will be the FQN of the class being configured.\n * \n * <h2>Implementation details:<\/h2> \n *\n * <p>This aspect advises object creation for <code>&#64;Configurable<\/code>\n * class instances. There are two cases that needs to be handled:\n *\n * <ol>\n *   <li>Normal object creation via the '<code>new<\/code>' operator: this is\n *       taken care of by advising <code>initialization()<\/code> join points.<\/li>\n *   <li>Object creation through deserialization: since no constructor is\n *       invoked during deserialization, the aspect needs to advise a method that a\n *       deserialization mechanism is going to invoke. Ideally, we should not\n *       require user classes to implement any specific method. This implies that\n *       we need to <i>introduce<\/i> the chosen method. We should also handle the cases\n *       where the chosen method is already implemented in classes (in which case,\n *       the user's implementation for that method should take precedence over the \n *       introduced implementation). There are a few choices for the chosen method:\n *       <ul>\n *       <li>readObject(ObjectOutputStream): Java requires that the method must be\n *           <code>private<\/p>. Since aspects cannot introduce a private member, \n *           while preserving its name, this option is ruled out.<\/li>\n * \t\t <li>readResolve(): Java doesn't pose any restriction on an access specifier. \n *           Problem solved! There is one (minor) limitation of this approach in \n *           that if a user class already has this method, that method must be \n *           <code>public<\/code>. However, this shouldn't be a big burden, since\n *           use cases that need classes to implement readResolve() (custom enums, \n *           for example) are unlikely to be marked as &#64;Configurable, and\n *           in any case asking to make that method <code>public<\/code> should not\n *           pose any undue burden.<\/li>\n *       <\/ul>\n *       The minor collaboration needed by user classes (i.e., that the \n *       implementation of <code>readResolve()<\/code>, if any, must be \n *       <code>public<\/code>) can be lifted as well if we were to use an \n *       experimental feature in AspectJ - the <code>hasmethod()<\/code> PCD.<\/li>\n * <\/ol>\n *\n * @author Rod Johnson\n * @author Ramnivas Laddad\n * @author Adrian Colyer\n * @since 2.0\n * @see org.springframework.beans.factory.annotation.Configurable\n * @see org.springframework.beans.factory.annotation.AnnotationBeanWiringInfoResolver\n *\/\npublic aspect AnnotationBeanConfigurerAspect extends AbstractBeanConfigurerAspect {\n\n\t\/**\n\t * Create a new instance of the <code>AnnotationBeanConfigurerAspect<\/code>\n\t * aspect that uses an {@link AnnotationBeanWiringInfoResolver}.\n\t *\/\n\tpublic AnnotationBeanConfigurerAspect() {\n\t\tsetBeanWiringInfoResolver(new AnnotationBeanWiringInfoResolver());\n\t}\n\n\n\t\/**\n\t * The initialization of a new object where the class of the object\n\t * to be constructed is annotated with the <code>&#64;Configurable<\/code>\n\t * annotation.\n\t * \n\t * <p>Besides selecting the normal construction using <code>initialize()<\/code>,\n\t * it also picks out the <code>readResolve()<\/code> method in <code>Serializable+<\/code>.\n\t * \n\t * <p>Additionally, this pointcut filters out any creation that does not\n\t * correspond to the most specific class of the object (and not any of the\n\t * base classes in the hierarchy). This avoids repeated re-configuration of\n\t * a bean with a base type that is also annotated with the\n\t * <code>&#64;Configurable<\/code> annotation (see SPR-2485).\n\t *  \n\t * <p>See implementation detail in aspect's documentation.\n\t *\/\n\tprotected pointcut beanCreation(Object beanInstance) :\n\t\t ( mostSpecificInitializer() ||\n\t\t   configurableObjectResolution() )\n\t\t && this(beanInstance);\n\n\t\/**\n\t * The initialization of a new object where the class of the object\n\t * to be constructed is annotated with the <code>&#64;Configurable<\/code>\n\t * annotation.\n\t * \n\t * <p>This pointcut selects the initialization corresponding to\n\t * a constructor of the top-most class that has <code>&#64;Configurable<\/code>.\n\t * Any constructor of such base class will not have properties\n\t * injected to be used in the constructor. This design decision is \n\t * guided by the fact that such base class' constructors should not be\n\t * expecting to be injected since a non-<code>&#64;Configurable<\/code> subtype\n\t * will easily invalidate any such expectation.\n\t *\/\n\tprotected pointcut beanInitialization(Object beanInstance) :\n\t\tinitialization((@Configurable *)+.new(..)) && this(beanInstance); \n\n\t\/**\n\t * Are dependencies to be injected prior to the construction of an object?\n\t *\/\n\tprotected boolean preConstructionConfiguration(Object beanInstance) {\n\t\tConfigurable configurable = beanInstance.getClass().getAnnotation(Configurable.class);\n\t\treturn configurable.preConstruction();\n\t}\n\t\n\t\/**\n\t * Matches the most-specific initialization join point \n\t * (most concrete class) for the initialization of an instance\n\t * of an <code>&#64;Configurable<\/code> type.\n\t *\/\n\tprivate pointcut mostSpecificInitializer() :\n\t\tinitialization((@Configurable *)+.new(..)) && \n\t\tif(thisJoinPoint.getSignature().getDeclaringType() == thisJoinPoint.getThis().getClass());\n\t\n\t\/**\n\t * Matches the readResolve execution join point for a serializable\n\t * type that is also <code>&#64;Configurable<\/code>.\n\t *\/\n\tprivate pointcut configurableObjectResolution() :\n\t\texecution(Object ConfigurableDeserializationSupport+.readResolve() throws ObjectStreamException) &&\n\t\t@this(Configurable);\n\t\t\n\t\/**\n\t * Declare any class implementing Serializable annotated with\n\t * <code>&#64;Configurable<\/code> as also implementing ConfigurableDeserializationSupport.\n\t * This allows us to introduce the readResolve() method and select it with the \n\t * beanCreation() pointcut.\n\t * \n\t * <p>Here is an improved version that uses the hasmethod() pointcut and lifts\n\t * even the minor requirement on user classes:\n\t *\n\t * <pre class=\"code\">declare parents: &#64;Configurable Serializable+\n\t *\t\t            && !hasmethod(Object readResolve() throws ObjectStreamException) \n\t *\t\t            implements ConfigurableDeserializationSupport;\n\t * <\/pre>\n     *\n\t *\/\n\tdeclare parents: @Configurable Serializable+ \n\t\t\t       implements ConfigurableDeserializationSupport;\n\n\n\t\/**\n\t * A marker interface to which the <code>readResolve()<\/code> is introduced.\n\t *\/\n\tinterface ConfigurableDeserializationSupport extends Serializable {\n\t}\n\n\n\t\/**\n\t * Introduce the <code>readResolve()<\/code> method so that we can advise its\n\t * execution to configure the object.\n\t * \n\t * <p>Note if a method with the same signature already exists in a\n\t * <code>Serializable<\/code> class annotated with <code>&#64;Configurable<\/code>,\n\t * that implementation will take precedence (a good thing, since we are\n\t * merely interested in an opportunity to detect deserialization.)\n\t *\/\n\tpublic Object ConfigurableDeserializationSupport.readResolve() throws ObjectStreamException {\n\t\treturn this;\n\t}\n\n}","old_contents":"\/*\n * Copyright 2002-2007 the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.springframework.beans.factory.aspectj;\n\nimport java.io.ObjectStreamException;\nimport java.io.Serializable;\n\nimport org.springframework.beans.factory.annotation.AnnotationBeanWiringInfoResolver;\nimport org.springframework.beans.factory.annotation.Configurable;\n\n\/**\n * Concrete aspect that uses the {@link Configurable }\n * annotation to identify which classes need autowiring.\n *\n * <p>The bean name to look up will be taken from the\n * <code>&#64;Configurable<\/code> annotation if specified, otherwise the\n * default bean name to look up will be the FQN of the class being configured.\n * \n * <h2>Implementation details:<\/h2> \n *\n * <p>This aspect advises object creation for <code>&#64;Configurable<\/code>\n * class instances. There are two cases that needs to be handled:\n *\n * <ol>\n *   <li>Normal object creation via the '<code>new<\/code>' operator: this is\n *       taken care of by advising <code>initialization()<\/code> join points.<\/li>\n *   <li>Object creation through deserialization: since no constructor is\n *       invoked during deserialization, the aspect needs to advise a method that a\n *       deserialization mechanism is going to invoke. Ideally, we should not\n *       require user classes to implement any specific method. This implies that\n *       we need to <i>introduce<\/i> the chosen method. We should also handle the cases\n *       where the chosen method is already implemented in classes (in which case,\n *       the users implementation for that method should take precedence over the \n *       introduced implementation). There are a few choices for the chosen method:\n *       <ul>\n *       <li>readObject(ObjectOutputStream): Java requires that the method must be\n *           <code>private<\/p>. Since aspects cannot introduce a private member, \n *           while preserving its name, this option is ruled out.<\/li>\n * \t\t <li>readResolve(): Java doesn't pose any restriction on access specifier. \n *           Problem solved! There is one (minor) limitation of this approach in \n *           that if a user class already has this method, that method must be \n *           <code>public<\/code>. However, this shouldn't be a big burden, since\n *           use cases that need classes to implement readResolve() (custom enums, \n *           for example) are unlikely to be marked as &#64;Configurable<\/li>, and\n *           in any case asking to make that method <code>public<\/code> should not\n *           pose any undue burden. \n *       <\/ul>\n *       The minor collaboration needed by user classes (the implementation of\n *       <code>readResolve()<\/code>, if any, must be <code>public<\/code>) can be\n *       lifted as well if we were to use experimental feature in AspectJ - the\n *       <code>hasmethod()<\/code> PCD.\n * <\/ol>\n *\n * @author Rod Johnson\n * @author Ramnivas Laddad\n * @author Adrian Colyer\n * @since 2.0\n * @see org.springframework.beans.factory.annotation.Configurable\n * @see org.springframework.beans.factory.annotation.AnnotationBeanWiringInfoResolver\n *\/\npublic aspect AnnotationBeanConfigurerAspect extends AbstractBeanConfigurerAspect {\n\n\t\/**\n\t * Create a new instance of the <code>AnnotationBeanConfigurerAspect<\/code>\n\t * aspect that uses an {@link AnnotationBeanWiringInfoResolver}.\n\t *\/\n\tpublic AnnotationBeanConfigurerAspect() {\n\t\tsetBeanWiringInfoResolver(new AnnotationBeanWiringInfoResolver());\n\t}\n\n\n\t\/**\n\t * The initialization of a new object where the class of the object\n\t * to be constructed is annotated with the <code>&#64;Configurable<\/code>\n\t * annotation.\n\t * \n\t * <p>Besides selecting the normal construction using <code>initialize()<\/code>,\n\t * it also picks out the <code>readResolve()<\/code> method in <code>Serializable+<\/code>.\n\t * \n\t * <p>Additionally, this pointcut filters out any creation that does not\n\t * correspond to the most specific class of the object (and not any of the\n\t * base classes in the hierarchy). This avoids repeated re-configuration of\n\t * a bean with a base type that is also annotated with the\n\t * <code>&#64;Configurable<\/code> annotation (see SPR-2485).\n\t *  \n\t * <p>See implementation detail in aspect's documentation.\n\t *\/\n\tprotected pointcut beanCreation(Object beanInstance) :\n\t\t ( mostSpecificInitializer() ||\n\t\t   configurableObjectResolution() )\n\t\t && this(beanInstance);\n\n\t\/**\n\t * The initialization of a new object where the class of the object\n\t * to be constructed is annotated with the <code>&#64;Configurable<\/code>\n\t * annotation.\n\t * \n\t * <p>This pointcut selects the initialization corresponding to\n\t * a constructor of the top-most class that has <code>&#64;Configurable<\/code>.\n\t * Any constructor of such base class will not have properties\n\t * injected to be used in the constructor. This design decision is \n\t * guided by the fact that such base class' constructors should not be\n\t * expecting to be injected since a non-<code>&#64;Configurable<\/code> subtype\n\t * will easily invalidate any such expectation.\n\t *\/\n\tprotected pointcut beanInitialization(Object beanInstance) :\n\t\tinitialization((@Configurable *)+.new(..)) && this(beanInstance); \n\n\t\/**\n\t * Are dependencies to be injected prior to the construction of an object?\n\t *\/\n\tprotected boolean preConstructionConfiguration(Object beanInstance) {\n\t\tConfigurable configurable = beanInstance.getClass().getAnnotation(Configurable.class);\n\t\treturn configurable.preConstruction();\n\t}\n\t\n\t\/**\n\t * Matches the most-specific initialization join point \n\t * (most concrete class) for the initialization of an instance\n\t * of an <code>&#64;Configurable<\/code> type.\n\t *\/\n\tprivate pointcut mostSpecificInitializer() :\n\t\tinitialization((@Configurable *)+.new(..)) && \n\t\tif(thisJoinPoint.getSignature().getDeclaringType() == thisJoinPoint.getThis().getClass());\n\t\n\t\/**\n\t * Matches the readResolve execution join point for a serializable\n\t * type that is also <code>&#64;Configurable<\/code>.\n\t *\/\n\tprivate pointcut configurableObjectResolution() :\n\t\texecution(Object ConfigurableDeserializationSupport+.readResolve() throws ObjectStreamException) &&\n\t\t@this(Configurable);\n\t\t\n\t\/**\n\t * Declare any class implementing Serializable annotated with\n\t * <code>&#64;Configurable<\/code> as also implementing ConfigurableDeserializationSupport.\n\t * This allows us to introduce the readResolve() method and select it with the \n\t * beanCreation() pointcut.\n\t * \n\t * <p>Here is an improved version that uses the hasmethod() pointcut and lifts\n\t * even the minor requirement on user classes:\n\t *\n\t * <pre class=\"code\">declare parents: &#64;Configurable Serializable+\n\t *\t\t            && !hasmethod(Object readResolve() throws ObjectStreamException) \n\t *\t\t            implements ConfigurableDeserializationSupport;\n\t * <\/pre>\n     *\n\t *\/\n\tdeclare parents: @Configurable Serializable+ \n\t\t\t       implements ConfigurableDeserializationSupport;\n\n\n\t\/**\n\t * A marker interface to which the <code>readResolve()<\/code> is introduced.\n\t *\/\n\tinterface ConfigurableDeserializationSupport extends Serializable {\n\t}\n\n\n\t\/**\n\t * Introduce the <code>readResolve()<\/code> method so that we can advise its\n\t * execution to configure the object.\n\t * \n\t * <p>Note if a method with the same signature already exists in a\n\t * <code>Serializable<\/code> class annotated with <code>&#64;Configurable<\/code>,\n\t * that implementation will take precedence (a good thing, since we are\n\t * merely interested in an opportunity to detect deserialization.)\n\t *\/\n\tpublic Object ConfigurableDeserializationSupport.readResolve() throws ObjectStreamException {\n\t\treturn this;\n\t}\n\n}","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"724a1995356a9e3bd375112709ec87ab81b685d7","subject":"Restrict method visibility","message":"Restrict method visibility\n","repos":"astefanutti\/metrics-aspectj","old_file":"lib\/src\/main\/aspect\/fr\/stefanutti\/metrics\/aspectj\/AbstractMetricAspect.aj","new_file":"lib\/src\/main\/aspect\/fr\/stefanutti\/metrics\/aspectj\/AbstractMetricAspect.aj","new_contents":"\/**\n * Copyright (C) 2013 Antonin Stefanutti (antonin.stefanutti@gmail.com)\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *         http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage fr.stefanutti.metrics.aspectj;\n\n\nimport com.codahale.metrics.Metric;\nimport com.codahale.metrics.MetricRegistry;\nimport com.codahale.metrics.annotation.ExceptionMetered;\nimport com.codahale.metrics.annotation.Gauge;\nimport com.codahale.metrics.annotation.Metered;\nimport com.codahale.metrics.annotation.Timed;\n\nimport java.lang.annotation.Annotation;\nimport java.lang.reflect.InvocationTargetException;\nimport java.lang.reflect.Method;\n\nabstract aspect AbstractMetricAspect {\n\n    protected interface MetricFactory {\n        Metric metric(MetricRegistry registry, String name, boolean absolute);\n    }\n\n    protected static String metricAnnotationName(Annotation annotation) {\n        if (Gauge.class.isInstance(annotation))\n            return ((Gauge) annotation).name();\n        else if (ExceptionMetered.class.isInstance(annotation))\n            return ((ExceptionMetered) annotation).name();\n        else if (Metered.class.isInstance(annotation))\n            return ((Metered) annotation).name();\n        else if (Timed.class.isInstance(annotation))\n            return ((Timed) annotation).name();\n        else\n            throw new IllegalArgumentException(\"Unsupported Metrics annotation [\" + annotation.getClass().getName() + \"]\");\n    }\n\n    protected static boolean metricAnnotationAbsolute(Annotation annotation) {\n        if (Gauge.class.isInstance(annotation))\n            return ((Gauge) annotation).absolute();\n        else if (ExceptionMetered.class.isInstance(annotation))\n            return ((ExceptionMetered) annotation).absolute();\n        else if (Metered.class.isInstance(annotation))\n            return ((Metered) annotation).absolute();\n        else if (Timed.class.isInstance(annotation))\n            return ((Timed) annotation).absolute();\n        else\n            throw new IllegalArgumentException(\"Unsupported Metrics annotation [\" + annotation.getClass().getName() + \"]\");\n    }\n\n    protected static class ForwardingGauge implements com.codahale.metrics.Gauge<Object> {\n\n        final Method method;\n        final Object object;\n\n        protected ForwardingGauge(Method method, Object object) {\n            this.method = method;\n            this.object = object;\n            method.setAccessible(true);\n        }\n\n        @Override\n        public Object getValue() {\n            \/\/ TODO: use more efficient technique than reflection\n            return invokeMethod(method, object);\n        }\n    }\n\n    private static Object invokeMethod(Method method, Object object) {\n        try {\n            return method.invoke(object);\n        } catch (IllegalAccessException cause) {\n            throw new IllegalStateException(\"Error while calling method [\" + method + \"]\", cause);\n        } catch (InvocationTargetException cause) {\n            throw new IllegalStateException(\"Error while calling method [\" + method + \"]\", cause);\n        }\n    }\n}\n","old_contents":"\/**\n * Copyright (C) 2013 Antonin Stefanutti (antonin.stefanutti@gmail.com)\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *         http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage fr.stefanutti.metrics.aspectj;\n\n\nimport com.codahale.metrics.Metric;\nimport com.codahale.metrics.MetricRegistry;\nimport com.codahale.metrics.annotation.ExceptionMetered;\nimport com.codahale.metrics.annotation.Gauge;\nimport com.codahale.metrics.annotation.Metered;\nimport com.codahale.metrics.annotation.Timed;\n\nimport java.lang.annotation.Annotation;\nimport java.lang.reflect.InvocationTargetException;\nimport java.lang.reflect.Method;\n\nabstract aspect AbstractMetricAspect {\n\n    protected interface MetricFactory {\n        Metric metric(MetricRegistry registry, String name, boolean absolute);\n    }\n\n    protected static String metricAnnotationName(Annotation annotation) {\n        if (Gauge.class.isInstance(annotation))\n            return ((Gauge) annotation).name();\n        else if (ExceptionMetered.class.isInstance(annotation))\n            return ((ExceptionMetered) annotation).name();\n        else if (Metered.class.isInstance(annotation))\n            return ((Metered) annotation).name();\n        else if (Timed.class.isInstance(annotation))\n            return ((Timed) annotation).name();\n        else\n            throw new IllegalArgumentException(\"Unsupported Metrics annotation [\" + annotation.getClass().getName() + \"]\");\n    }\n\n    protected static boolean metricAnnotationAbsolute(Annotation annotation) {\n        if (Gauge.class.isInstance(annotation))\n            return ((Gauge) annotation).absolute();\n        else if (ExceptionMetered.class.isInstance(annotation))\n            return ((ExceptionMetered) annotation).absolute();\n        else if (Metered.class.isInstance(annotation))\n            return ((Metered) annotation).absolute();\n        else if (Timed.class.isInstance(annotation))\n            return ((Timed) annotation).absolute();\n        else\n            throw new IllegalArgumentException(\"Unsupported Metrics annotation [\" + annotation.getClass().getName() + \"]\");\n    }\n\n    \/\/ TODO: should be made private (impact unit tests that use reflection to call the getValue() method)\n    public static class ForwardingGauge implements com.codahale.metrics.Gauge<Object> {\n\n        final Method method;\n        final Object object;\n\n        protected ForwardingGauge(Method method, Object object) {\n            this.method = method;\n            this.object = object;\n            method.setAccessible(true);\n        }\n\n        @Override\n        public Object getValue() {\n            \/\/ TODO: use more efficient technique than reflection\n            return invokeMethod(method, object);\n        }\n    }\n\n    private static Object invokeMethod(Method method, Object object) {\n        try {\n            return method.invoke(object);\n        } catch (IllegalAccessException cause) {\n            throw new IllegalStateException(\"Error while calling method [\" + method + \"]\", cause);\n        } catch (InvocationTargetException cause) {\n            throw new IllegalStateException(\"Error while calling method [\" + method + \"]\", cause);\n        }\n    }\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"719ecf89e1c40f52236db327402429bb4658ff99","subject":"Fixed broken logic to disable GPS if fix doesn't come soon enough","message":"Fixed broken logic to disable GPS if fix doesn't come soon enough\n","repos":"treejames\/ignition,mttkay\/ignition,Applied-Duality\/ignition,hongnguyenpro\/ignition,beni55\/ignition","old_file":"ignition-location\/ignition-location-lib\/src\/com\/github\/ignition\/location\/IgnitedLocationManager.aj","new_file":"ignition-location\/ignition-location-lib\/src\/com\/github\/ignition\/location\/IgnitedLocationManager.aj","new_contents":"\/*\n * Copyright 2011 Google Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * This code has been modified by Stefano Dacchille.\n *\/\n\npackage com.github.ignition.location;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\n\nimport android.app.Activity;\nimport android.app.PendingIntent;\nimport android.content.BroadcastReceiver;\nimport android.content.Context;\nimport android.content.Intent;\nimport android.content.IntentFilter;\nimport android.content.SharedPreferences;\nimport android.content.SharedPreferences.Editor;\nimport android.location.Criteria;\nimport android.location.Location;\nimport android.location.LocationListener;\nimport android.location.LocationManager;\nimport android.os.AsyncTask;\nimport android.os.BatteryManager;\nimport android.os.Bundle;\nimport android.os.Handler;\nimport android.util.Log;\n\nimport com.github.ignition.location.annotations.IgnitedLocation;\nimport com.github.ignition.location.annotations.IgnitedLocationActivity;\nimport com.github.ignition.location.receivers.IgnitedLocationChangedReceiver;\nimport com.github.ignition.location.receivers.IgnitedPassiveLocationChangedReceiver;\nimport com.github.ignition.location.tasks.IgnitedLastKnownLocationAsyncTask;\nimport com.github.ignition.location.templates.ILastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLocationUpdateRequester;\nimport com.github.ignition.location.templates.OnIgnitedLocationChangedListener;\nimport com.github.ignition.location.utils.PlatformSpecificImplementationFactory;\nimport com.github.ignition.support.IgnitedDiagnostics;\n\n@SuppressAjWarnings\npublic aspect IgnitedLocationManager {\n    public static final String LOG_TAG = IgnitedLocationManager.class.getSimpleName();\n\n    declare parents : (@IgnitedLocationActivity *) implements OnIgnitedLocationChangedListener;\n\n    private Criteria defaultCriteria, lowPowerCriteria;\n    protected IgnitedAbstractLocationUpdateRequester locationUpdateRequester;\n    protected PendingIntent locationListenerPendingIntent, locationListenerPassivePendingIntent;\n    protected LocationManager locationManager;\n    protected IgnitedLocationListener bestInactiveLocationProviderListener;\n\n    private Context context;\n    private volatile Location currentLocation;\n\n    private AsyncTask<Void, Void, Location> ignitedLastKnownLocationTask;\n    private SharedPreferences prefs;\n    private Handler handler;\n\n    private long locationUpdatesInterval, passiveLocationUpdatesInterval;\n    private int locationUpdatesDistanceDiff;\n    private int passiveLocationUpdatesDistanceDiff;\n    private boolean requestLocationUpdates;\n    private boolean locationUpdatesDisabled = true;\n    \n    \/\/ Switch to another provider if gps doesn't return a location quickly enough.\n    private Runnable removeGpsUpdates = new Runnable() {\n        @Override\n        public void run() {\n            Log.d(LOG_TAG,\n                    \"It looks like GPS isn't available at this time (i.e.: maybe you're indoors). Removing GPS location updates and requesting network updates.\");\n\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, lowPowerCriteria());\n        }\n    };\n\n    \/**\n     * If the Location Provider we're using to receive location updates is disabled while the app is\n     * running, this Receiver will be notified, allowing us to re-register our Location Receivers\n     * using the best available Location Provider is still available.\n     *\/\n    protected BroadcastReceiver locationProviderDisabledReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            boolean providerDisabled = !intent.getBooleanExtra(\n                    LocationManager.KEY_PROVIDER_ENABLED, false);\n            \/\/ Re-register the location listeners using the best available\n            \/\/ Location Provider.\n            if (providerDisabled) {\n                disableLocationUpdates(false);\n                requestLocationUpdates(context, null);\n            }\n        }\n    };\n\n    \/**\n     * If the battery state is low disable the passive location update receiver.\n     *\/\n    protected BroadcastReceiver refreshLocationUpdatesReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, lowPowerCriteria());\n        }\n    };\n\n    after(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onCreate(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n\n        \/\/ Get a reference to the Context\n        this.context = context;\n        \/\/ Set pref file\n        prefs = context.getSharedPreferences(IgnitedLocationConstants.SHARED_PREFERENCE_FILE,\n                Context.MODE_PRIVATE);\n        \/\/ Get references to the managers\n        locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);\n        handler = new Handler();\n\n        \/\/ Specify the Criteria to use when requesting location updates while\n        \/\/ the application is Active\n        if (defaultCriteria == null) {\n            defaultCriteria = new Criteria();\n        }\n        \/\/ Use gps if it's enabled and if battery level is at least 15%\n        boolean useGps = prefs.getBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS,\n                IgnitedLocationConstants.USE_GPS_DEFAULT);\n        if (useGps) {\n            defaultCriteria.setAccuracy(Criteria.ACCURACY_FINE);\n        } else {\n            defaultCriteria.setPowerRequirement(Criteria.POWER_LOW);\n        }\n\n        \/\/ Setup the location update Pending Intent\n        Intent activeIntent = new Intent(IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_ACTION);\n        locationListenerPendingIntent = PendingIntent.getBroadcast(context, 0, activeIntent,\n                PendingIntent.FLAG_UPDATE_CURRENT);\n        \/\/ Setup the passive location update Pending Intent\n        Intent passiveIntent = new Intent(context, IgnitedPassiveLocationChangedReceiver.class);\n        locationListenerPassivePendingIntent = PendingIntent.getBroadcast(context, 0,\n                passiveIntent, PendingIntent.FLAG_UPDATE_CURRENT);\n\n        \/\/ Instantiate a Location Update Requester class based on the available\n        \/\/ platform version. This will be used to request location updates.\n        locationUpdateRequester = PlatformSpecificImplementationFactory\n                .getLocationUpdateRequester(context);\n    }\n\n    private boolean isBatteryOk() {\n        IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);\n        Intent intent = context.registerReceiver(null, filter);\n        double currentLevel = 100.0;\n        if (intent != null) {\n            currentLevel = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1);\n        }\n\n        return currentLevel >= prefs.getInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                IgnitedLocationConstants.MIN_BATTERY_LEVEL_DEFAULT);\n    }\n\n    before(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onResume(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n        \/\/ Get a reference to the Context if this context is null\n        if (this.context == null) {\n            this.context = context;\n        }\n\n        saveToPreferences(context, ignitedAnnotation);\n\n        Log.d(LOG_TAG, \"Retrieving last known location...\");\n        \/\/ Get the last known location. This isn't directly affecting the UI, so put it on a\n        \/\/ worker thread.\n        ignitedLastKnownLocationTask = new IgnitedLastKnownLocationAsyncTask(\n                context, locationUpdatesDistanceDiff, locationUpdatesInterval);\n        ignitedLastKnownLocationTask.execute();\n    }\n\n    \/**\n     * Save last settings to preferences.\n     * \n     * @param context\n     * @param locationAnnotation\n     *\/\n    private void saveToPreferences(Context context, IgnitedLocationActivity locationAnnotation) {\n        requestLocationUpdates = locationAnnotation.requestLocationUpdates();\n        locationUpdatesDistanceDiff = locationAnnotation.locationUpdatesDistanceDiff();\n        locationUpdatesInterval = locationAnnotation.locationUpdatesInterval();\n        passiveLocationUpdatesDistanceDiff = locationAnnotation\n                .passiveLocationUpdatesDistanceDiff();\n        passiveLocationUpdatesInterval = locationAnnotation.passiveLocationUpdatesInterval();\n        boolean enablePassiveLocationUpdates = locationAnnotation.enablePassiveUpdates();\n        boolean useGps = locationAnnotation.useGps();\n\n        Editor editor = prefs.edit();\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_LOCATION_UPDATES,\n                requestLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                enablePassiveLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS, useGps);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_DISTANCE_DIFF,\n                locationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_INTERVAL,\n                locationUpdatesInterval);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_DISTANCE_DIFF,\n                passiveLocationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_INTERVAL,\n                passiveLocationUpdatesInterval);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_RUN_ONCE, true);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                locationAnnotation.minBatteryLevel());\n        editor.putLong(IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                locationAnnotation.waitForGpsFix());\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                locationAnnotation.showWaitForLocationDialog());\n        editor.commit();\n\n    }\n\n    before(Activity activity, IgnitedLocationActivity ignitedAnnotation) : execution(* Activity.onPause(..)) \n        && @this(ignitedAnnotation) && this(activity)\n        && within(@IgnitedLocationActivity *) && if (ignitedAnnotation.requestLocationUpdates()) {\n\n        disableLocationUpdates(true);\n\n        handler.removeCallbacks(removeGpsUpdates);\n\n        boolean finishing = activity.isFinishing();\n        if (finishing) {\n            if (ignitedLastKnownLocationTask != null && ignitedLastKnownLocationTask.getStatus() != AsyncTask.Status.FINISHED) {\n                ignitedLastKnownLocationTask.cancel(true);\n            } else {\n                PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            }\n\n            context = null;\n        }\n    }\n\n    \/\/ after() : execution(* Activity.onDestroy(..)) && @this(IgnitedLocationActivity)\n    \/\/ && within(@IgnitedLocationActivity *) {\n    \/\/ }\n\n    Location around() : get(@IgnitedLocation Location *) {\n        return currentLocation;\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && within(IgnitedPassiveLocationChangedReceiver) && !adviceexecution() {\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, long): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude());\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && (within(IgnitedLocationChangedReceiver) || within(IgnitedAbstractLastLocationFinder)\n                || within(IgnitedLastKnownLocationAsyncTask)) && !adviceexecution() {\n\n        if (context == null) {\n            return;\n        }\n        final Activity activity = (Activity) context;\n        boolean showWaitForLocationDialog = prefs.getBoolean(\n                IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                IgnitedLocationConstants.SHOW_WAIT_FOR_LOCATION_DIALOG_DEFAULT);\n        if (freshLocation == null && showWaitForLocationDialog) {\n            activity.showDialog(R.id.ign_loc_dialog_wait_for_fix);\n            return;\n        }\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, long): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude());\n        boolean keepRequestingLocationUpdates = ((OnIgnitedLocationChangedListener) context)\n                .onIgnitedLocationChanged(currentLocation);\n        Bundle extras = freshLocation.getExtras();\n        if (!keepRequestingLocationUpdates) {\n            disableLocationUpdates(true);\n            PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            return;\n        } else if (requestLocationUpdates\n                && !extras.containsKey(ILastLocationFinder.LAST_LOCATION_TOO_OLD_EXTRA)) {\n            \/\/ If we requested location updates, turn them on here.\n            requestLocationUpdates(context, null);\n        }\n\n        \/\/ If gps is enabled location comes from gps, remove runnable that removes gps updates\n        boolean lastLocation = extras.containsKey(IgnitedLocationConstants.IGNITED_LAST_LOCATION_EXTRA);\n        if (!lastLocation && defaultCriteria.getAccuracy() == Criteria.ACCURACY_FINE\n                && currentLocation.getProvider().equals(LocationManager.GPS_PROVIDER)) {\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n    }\n\n    \/**\n     * Start listening for location updates.\n     *\/\n    protected void requestLocationUpdates(Context context, Criteria criteria) {\n        if (!locationUpdatesDisabled) {\n            return;\n        }\n        Criteria locationUpdateCriteria = criteria;\n        if (criteria == null) {\n            if (isBatteryOk()) {\n                locationUpdateCriteria = defaultCriteria;\n            } else {\n                locationUpdateCriteria = lowPowerCriteria();\n            }\n        }\n        Log.d(LOG_TAG, \"Disabling passive location updates\");\n        locationManager.removeUpdates(locationListenerPassivePendingIntent);\n\n        Log.d(LOG_TAG, \"Requesting location updates\");\n        \/\/ Normal updates while activity is visible.\n        locationUpdateRequester.requestLocationUpdates(locationUpdatesInterval,\n                locationUpdatesDistanceDiff, locationUpdateCriteria, locationListenerPendingIntent);\n\n        \/\/ Register a receiver that listens for when the provider I'm using has\n        \/\/ been disabled.\n        IntentFilter locationProviderDisabledIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_PROVIDER_DISABLED_ACTION);\n        context.registerReceiver(locationProviderDisabledReceiver,\n                locationProviderDisabledIntentFilter);\n\n        IntentFilter refreshLocationUpdatesIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.UPDATE_LOCATION_UPDATES_CRITERIA_ACTION);\n        context.registerReceiver(refreshLocationUpdatesReceiver, refreshLocationUpdatesIntentFilter);\n\n        \/\/ Register a receiver that listens for when a better provider than I'm\n        \/\/ using becomes available.\n        String bestProvider = locationManager.getBestProvider(locationUpdateCriteria, false);\n        String bestAvailableProvider = locationManager.getBestProvider(locationUpdateCriteria, true);\n        if (bestProvider != null && !bestProvider.equals(bestAvailableProvider)) {\n            bestInactiveLocationProviderListener = new IgnitedLocationListener(context);\n            locationManager.requestLocationUpdates(bestProvider, 0, 0,\n                    bestInactiveLocationProviderListener, context.getMainLooper());\n        }\n\n        if (bestAvailableProvider.equals(LocationManager.GPS_PROVIDER)) {\n            Log.d(LOG_TAG, \"Posting delayed remove GPS updates message\");\n            \/\/ Post a runnable that will remove gps updates if no gps location is returned after 1\n            \/\/ minute in order to avoid draining the battery.\n            handler.postDelayed(removeGpsUpdates, prefs.getLong(\n                    IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                    IgnitedLocationConstants.WAIT_FOR_GPS_FIX_INTERVAL_DEFAULT));\n        }\n\n        locationUpdatesDisabled = false;\n    }\n\n    \/**\n     * Stop listening for location updates\n     * \n     * @param enablePassiveLocationUpdates\n     *\/\n    protected void disableLocationUpdates(boolean requestPassiveLocationUpdates) {\n        if (locationUpdatesDisabled) {\n            return;\n        }\n\n        Log.d(LOG_TAG, \"Disabling location updates\");\n        context.unregisterReceiver(locationProviderDisabledReceiver);\n        context.unregisterReceiver(refreshLocationUpdatesReceiver);\n\n        locationUpdateRequester.removeLocationUpdates();\n        if (bestInactiveLocationProviderListener != null) {\n            locationManager.removeUpdates(bestInactiveLocationProviderListener);\n        }\n\n        boolean finishing = ((Activity) context).isFinishing();\n\n        if (requestPassiveLocationUpdates && !finishing) {\n            requestPassiveLocationUpdates();\n        }\n\n        locationUpdatesDisabled = true;\n    }\n\n    private void requestPassiveLocationUpdates() {\n        if (IgnitedDiagnostics.SUPPORTS_FROYO\n                && prefs.getBoolean(\n                        IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                        IgnitedLocationConstants.ENABLE_PASSIVE_LOCATION_UPDATES_DEFAULT)) {\n            Log.d(LOG_TAG, \"Requesting passive location updates\");\n            \/\/ Passive location updates from 3rd party apps when the Activity isn't\n            \/\/ visible. Only for Android 2.2+.\n            locationUpdateRequester.requestPassiveLocationUpdates(passiveLocationUpdatesInterval,\n                    passiveLocationUpdatesDistanceDiff, locationListenerPassivePendingIntent);\n        }\n    }\n\n    public boolean isLocationUpdatesDisabled() {\n        return locationUpdatesDisabled;\n    }\n\n    public Criteria lowPowerCriteria() {\n        if (lowPowerCriteria == null) {\n            lowPowerCriteria = new Criteria();\n            lowPowerCriteria.setPowerRequirement(Criteria.POWER_LOW);\n            lowPowerCriteria.setAccuracy(Criteria.NO_REQUIREMENT);\n        }\n        return lowPowerCriteria;\n    }\n\n    \/**\n     * If the best Location Provider (usually GPS) is not available when we request location\n     * updates, this listener will be notified if \/ when it becomes available. It calls\n     * requestLocationUpdates to re-register the location listeners using the better Location\n     * Provider.\n     *\/\n    private class IgnitedLocationListener implements LocationListener {\n        private Context context;\n\n        public IgnitedLocationListener(Context appContext) {\n            this.context = appContext;\n        }\n\n        @Override\n        public void onLocationChanged(Location l) {\n        }\n\n        @Override\n        public void onProviderDisabled(String provider) {\n        }\n\n        @Override\n        public void onStatusChanged(String provider, int status, Bundle extras) {\n        }\n\n        @Override\n        public void onProviderEnabled(String provider) {\n            \/\/ Re-register the location listeners using the better Location\n            \/\/ Provider.\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, null);\n        }\n    }\n\n}\n","old_contents":"\/*\n * Copyright 2011 Google Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * This code has been modified by Stefano Dacchille.\n *\/\n\npackage com.github.ignition.location;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\n\nimport android.app.Activity;\nimport android.app.PendingIntent;\nimport android.content.BroadcastReceiver;\nimport android.content.Context;\nimport android.content.Intent;\nimport android.content.IntentFilter;\nimport android.content.SharedPreferences;\nimport android.content.SharedPreferences.Editor;\nimport android.location.Criteria;\nimport android.location.Location;\nimport android.location.LocationListener;\nimport android.location.LocationManager;\nimport android.os.AsyncTask;\nimport android.os.BatteryManager;\nimport android.os.Bundle;\nimport android.os.Handler;\nimport android.util.Log;\n\nimport com.github.ignition.location.annotations.IgnitedLocation;\nimport com.github.ignition.location.annotations.IgnitedLocationActivity;\nimport com.github.ignition.location.receivers.IgnitedLocationChangedReceiver;\nimport com.github.ignition.location.receivers.IgnitedPassiveLocationChangedReceiver;\nimport com.github.ignition.location.tasks.IgnitedLastKnownLocationAsyncTask;\nimport com.github.ignition.location.templates.ILastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLocationUpdateRequester;\nimport com.github.ignition.location.templates.OnIgnitedLocationChangedListener;\nimport com.github.ignition.location.utils.PlatformSpecificImplementationFactory;\nimport com.github.ignition.support.IgnitedDiagnostics;\n\n@SuppressAjWarnings\npublic aspect IgnitedLocationManager {\n    public static final String LOG_TAG = IgnitedLocationManager.class.getSimpleName();\n\n    declare parents : (@IgnitedLocationActivity *) implements OnIgnitedLocationChangedListener;\n\n    private Criteria defaultCriteria, lowPowerCriteria;\n    protected IgnitedAbstractLocationUpdateRequester locationUpdateRequester;\n    protected PendingIntent locationListenerPendingIntent, locationListenerPassivePendingIntent;\n    protected LocationManager locationManager;\n    protected IgnitedLocationListener bestInactiveLocationProviderListener;\n\n    private Context context;\n    private volatile Location currentLocation;\n\n    private AsyncTask<Void, Void, Location> ignitedLastKnownLocationTask;\n    private SharedPreferences prefs;\n    private Handler handler;\n\n    private long locationUpdatesInterval, passiveLocationUpdatesInterval;\n    private int locationUpdatesDistanceDiff;\n    private int passiveLocationUpdatesDistanceDiff;\n    private boolean requestLocationUpdates;\n    private boolean locationUpdatesDisabled = true;\n    \n    \/\/ Switch to another provider if gps doesn't return a location quickly enough.\n    private Runnable removeGpsUpdates = new Runnable() {\n        @Override\n        public void run() {\n            Log.d(LOG_TAG,\n                    \"It looks like GPS isn't available at this time (i.e.: maybe you're indoors). Removing GPS location updates and requesting network updates.\");\n\n            disableLocationUpdates(false);\n            requestLocationUpdates(context);\n        }\n    };\n\n    \/**\n     * If the Location Provider we're using to receive location updates is disabled while the app is\n     * running, this Receiver will be notified, allowing us to re-register our Location Receivers\n     * using the best available Location Provider is still available.\n     *\/\n    protected BroadcastReceiver locationProviderDisabledReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            boolean providerDisabled = !intent.getBooleanExtra(\n                    LocationManager.KEY_PROVIDER_ENABLED, false);\n            \/\/ Re-register the location listeners using the best available\n            \/\/ Location Provider.\n            if (providerDisabled) {\n                disableLocationUpdates(false);\n                requestLocationUpdates(context);\n            }\n        }\n    };\n\n    \/**\n     * If the battery state is low disable the passive location update receiver.\n     *\/\n    protected BroadcastReceiver refreshLocationUpdatesReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            disableLocationUpdates(false);\n            requestLocationUpdates(context);\n        }\n    };\n\n    after(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onCreate(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n\n        \/\/ Get a reference to the Context\n        this.context = context;\n        \/\/ Set pref file\n        prefs = context.getSharedPreferences(IgnitedLocationConstants.SHARED_PREFERENCE_FILE,\n                Context.MODE_PRIVATE);\n        \/\/ Get references to the managers\n        locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);\n        handler = new Handler();\n\n        \/\/ Specify the Criteria to use when requesting location updates while\n        \/\/ the application is Active\n        if (defaultCriteria == null) {\n            defaultCriteria = new Criteria();\n        }\n        \/\/ Use gps if it's enabled and if battery level is at least 15%\n        boolean useGps = prefs.getBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS,\n                IgnitedLocationConstants.USE_GPS_DEFAULT);\n        if (useGps) {\n            defaultCriteria.setAccuracy(Criteria.ACCURACY_FINE);\n        } else {\n            defaultCriteria.setPowerRequirement(Criteria.POWER_LOW);\n        }\n\n        \/\/ Setup the location update Pending Intent\n        Intent activeIntent = new Intent(IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_ACTION);\n        locationListenerPendingIntent = PendingIntent.getBroadcast(context, 0, activeIntent,\n                PendingIntent.FLAG_UPDATE_CURRENT);\n        \/\/ Setup the passive location update Pending Intent\n        Intent passiveIntent = new Intent(context, IgnitedPassiveLocationChangedReceiver.class);\n        locationListenerPassivePendingIntent = PendingIntent.getBroadcast(context, 0,\n                passiveIntent, PendingIntent.FLAG_UPDATE_CURRENT);\n\n        \/\/ Instantiate a Location Update Requester class based on the available\n        \/\/ platform version. This will be used to request location updates.\n        locationUpdateRequester = PlatformSpecificImplementationFactory\n                .getLocationUpdateRequester(context);\n    }\n\n    private boolean isBatteryOk() {\n        IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);\n        Intent intent = context.registerReceiver(null, filter);\n        double currentLevel = 100.0;\n        if (intent != null) {\n            currentLevel = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1);\n        }\n\n        return currentLevel >= prefs.getInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                IgnitedLocationConstants.MIN_BATTERY_LEVEL_DEFAULT);\n    }\n\n    before(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onResume(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n        \/\/ Get a reference to the Context if this context is null\n        if (this.context == null) {\n            this.context = context;\n        }\n\n        saveToPreferences(context, ignitedAnnotation);\n\n        Log.d(LOG_TAG, \"Retrieving last known location...\");\n        \/\/ Get the last known location. This isn't directly affecting the UI, so put it on a\n        \/\/ worker thread.\n        ignitedLastKnownLocationTask = new IgnitedLastKnownLocationAsyncTask(\n                context, locationUpdatesDistanceDiff, locationUpdatesInterval);\n        ignitedLastKnownLocationTask.execute();\n    }\n\n    \/**\n     * Save last settings to preferences.\n     * \n     * @param context\n     * @param locationAnnotation\n     *\/\n    private void saveToPreferences(Context context, IgnitedLocationActivity locationAnnotation) {\n        requestLocationUpdates = locationAnnotation.requestLocationUpdates();\n        locationUpdatesDistanceDiff = locationAnnotation.locationUpdatesDistanceDiff();\n        locationUpdatesInterval = locationAnnotation.locationUpdatesInterval();\n        passiveLocationUpdatesDistanceDiff = locationAnnotation\n                .passiveLocationUpdatesDistanceDiff();\n        passiveLocationUpdatesInterval = locationAnnotation.passiveLocationUpdatesInterval();\n        boolean enablePassiveLocationUpdates = locationAnnotation.enablePassiveUpdates();\n        boolean useGps = locationAnnotation.useGps();\n\n        Editor editor = prefs.edit();\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_LOCATION_UPDATES,\n                requestLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                enablePassiveLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS, useGps);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_DISTANCE_DIFF,\n                locationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_INTERVAL,\n                locationUpdatesInterval);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_DISTANCE_DIFF,\n                passiveLocationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_INTERVAL,\n                passiveLocationUpdatesInterval);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_RUN_ONCE, true);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                locationAnnotation.minBatteryLevel());\n        editor.putLong(IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                locationAnnotation.waitForGpsFix());\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                locationAnnotation.showWaitForLocationDialog());\n        editor.commit();\n\n    }\n\n    before(Activity activity, IgnitedLocationActivity ignitedAnnotation) : execution(* Activity.onPause(..)) \n        && @this(ignitedAnnotation) && this(activity)\n        && within(@IgnitedLocationActivity *) && if (ignitedAnnotation.requestLocationUpdates()) {\n\n        disableLocationUpdates(true);\n\n        handler.removeCallbacks(removeGpsUpdates);\n\n        boolean finishing = activity.isFinishing();\n        if (finishing) {\n            if (ignitedLastKnownLocationTask != null && ignitedLastKnownLocationTask.getStatus() != AsyncTask.Status.FINISHED) {\n                ignitedLastKnownLocationTask.cancel(true);\n            } else {\n                PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            }\n\n            context = null;\n        }\n    }\n\n    \/\/ after() : execution(* Activity.onDestroy(..)) && @this(IgnitedLocationActivity)\n    \/\/ && within(@IgnitedLocationActivity *) {\n    \/\/ }\n\n    Location around() : get(@IgnitedLocation Location *) {\n        return currentLocation;\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && within(IgnitedPassiveLocationChangedReceiver) && !adviceexecution() {\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, long): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude());\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && (within(IgnitedLocationChangedReceiver) || within(IgnitedAbstractLastLocationFinder)\n                || within(IgnitedLastKnownLocationAsyncTask)) && !adviceexecution() {\n\n        if (context == null) {\n            return;\n        }\n        final Activity activity = (Activity) context;\n        boolean showWaitForLocationDialog = prefs.getBoolean(\n                IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                IgnitedLocationConstants.SHOW_WAIT_FOR_LOCATION_DIALOG_DEFAULT);\n        if (freshLocation == null && showWaitForLocationDialog) {\n            activity.showDialog(R.id.ign_loc_dialog_wait_for_fix);\n            return;\n        }\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, long): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude());\n        boolean keepRequestingLocationUpdates = ((OnIgnitedLocationChangedListener) context)\n                .onIgnitedLocationChanged(currentLocation);\n        Bundle extras = freshLocation.getExtras();\n        if (!keepRequestingLocationUpdates) {\n            disableLocationUpdates(true);\n            PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            return;\n        } else if (requestLocationUpdates\n                && !extras.containsKey(ILastLocationFinder.LAST_LOCATION_TOO_OLD_EXTRA)) {\n            \/\/ If we requested location updates, turn them on here.\n            requestLocationUpdates(context);\n        }\n\n        \/\/ If gps is enabled location comes from gps, remove runnable that removes gps updates\n        boolean lastLocation = extras.containsKey(IgnitedLocationConstants.IGNITED_LAST_LOCATION_EXTRA);\n        if (!lastLocation && defaultCriteria.getAccuracy() == Criteria.ACCURACY_FINE\n                && currentLocation.getProvider().equals(LocationManager.GPS_PROVIDER)) {\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n    }\n\n    \/**\n     * Start listening for location updates.\n     *\/\n    protected void requestLocationUpdates(Context context) {\n        if (!locationUpdatesDisabled) {\n            return;\n        }\n        Criteria locationUpdateCriteria;\n        if (isBatteryOk()) {\n            locationUpdateCriteria = defaultCriteria;\n        } else {\n            locationUpdateCriteria = lowPowerCriteria();\n        }\n\n        Log.d(LOG_TAG, \"Disabling passive location updates\");\n        locationManager.removeUpdates(locationListenerPassivePendingIntent);\n\n        Log.d(LOG_TAG, \"Requesting location updates\");\n        \/\/ Normal updates while activity is visible.\n        locationUpdateRequester.requestLocationUpdates(locationUpdatesInterval,\n                locationUpdatesDistanceDiff, locationUpdateCriteria, locationListenerPendingIntent);\n\n        \/\/ Register a receiver that listens for when the provider I'm using has\n        \/\/ been disabled.\n        IntentFilter locationProviderDisabledIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_PROVIDER_DISABLED_ACTION);\n        context.registerReceiver(locationProviderDisabledReceiver,\n                locationProviderDisabledIntentFilter);\n\n        IntentFilter refreshLocationUpdatesIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.UPDATE_LOCATION_UPDATES_CRITERIA_ACTION);\n        context.registerReceiver(refreshLocationUpdatesReceiver, refreshLocationUpdatesIntentFilter);\n\n        \/\/ Register a receiver that listens for when a better provider than I'm\n        \/\/ using becomes available.\n        String bestProvider = locationManager.getBestProvider(locationUpdateCriteria, false);\n        String bestAvailableProvider = locationManager.getBestProvider(locationUpdateCriteria, true);\n        if (bestProvider != null && !bestProvider.equals(bestAvailableProvider)) {\n            bestInactiveLocationProviderListener = new IgnitedLocationListener(context);\n            locationManager.requestLocationUpdates(bestProvider, 0, 0,\n                    bestInactiveLocationProviderListener, context.getMainLooper());\n        }\n\n        if (bestAvailableProvider.equals(LocationManager.GPS_PROVIDER)) {\n            Log.d(LOG_TAG, \"Posting delayed remove GPS updates message\");\n            \/\/ Post a runnable that will remove gps updates if no gps location is returned after 1\n            \/\/ minute in order to avoid draining the battery.\n            handler.postDelayed(removeGpsUpdates, prefs.getLong(\n                    IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                    IgnitedLocationConstants.WAIT_FOR_GPS_FIX_INTERVAL_DEFAULT));\n        }\n\n        locationUpdatesDisabled = false;\n    }\n\n    \/**\n     * Stop listening for location updates\n     * \n     * @param enablePassiveLocationUpdates\n     *\/\n    protected void disableLocationUpdates(boolean requestPassiveLocationUpdates) {\n        if (locationUpdatesDisabled) {\n            return;\n        }\n\n        Log.d(LOG_TAG, \"Disabling location updates\");\n        context.unregisterReceiver(locationProviderDisabledReceiver);\n        context.unregisterReceiver(refreshLocationUpdatesReceiver);\n\n        locationUpdateRequester.removeLocationUpdates();\n        if (bestInactiveLocationProviderListener != null) {\n            locationManager.removeUpdates(bestInactiveLocationProviderListener);\n        }\n\n        boolean finishing = ((Activity) context).isFinishing();\n\n        if (requestPassiveLocationUpdates && !finishing) {\n            requestPassiveLocationUpdates();\n        }\n\n        locationUpdatesDisabled = true;\n    }\n\n    private void requestPassiveLocationUpdates() {\n        if (IgnitedDiagnostics.SUPPORTS_FROYO\n                && prefs.getBoolean(\n                        IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                        IgnitedLocationConstants.ENABLE_PASSIVE_LOCATION_UPDATES_DEFAULT)) {\n            Log.d(LOG_TAG, \"Requesting passive location updates\");\n            \/\/ Passive location updates from 3rd party apps when the Activity isn't\n            \/\/ visible. Only for Android 2.2+.\n            locationUpdateRequester.requestPassiveLocationUpdates(passiveLocationUpdatesInterval,\n                    passiveLocationUpdatesDistanceDiff, locationListenerPassivePendingIntent);\n        }\n    }\n\n    public boolean isLocationUpdatesDisabled() {\n        return locationUpdatesDisabled;\n    }\n\n    public Criteria lowPowerCriteria() {\n        if (lowPowerCriteria == null) {\n            lowPowerCriteria = new Criteria();\n            lowPowerCriteria.setPowerRequirement(Criteria.POWER_LOW);\n            lowPowerCriteria.setAccuracy(Criteria.NO_REQUIREMENT);\n        }\n        return lowPowerCriteria;\n    }\n\n    \/**\n     * If the best Location Provider (usually GPS) is not available when we request location\n     * updates, this listener will be notified if \/ when it becomes available. It calls\n     * requestLocationUpdates to re-register the location listeners using the better Location\n     * Provider.\n     *\/\n    private class IgnitedLocationListener implements LocationListener {\n        private Context context;\n\n        public IgnitedLocationListener(Context appContext) {\n            this.context = appContext;\n        }\n\n        @Override\n        public void onLocationChanged(Location l) {\n        }\n\n        @Override\n        public void onProviderDisabled(String provider) {\n        }\n\n        @Override\n        public void onStatusChanged(String provider, int status, Bundle extras) {\n        }\n\n        @Override\n        public void onProviderEnabled(String provider) {\n            \/\/ Re-register the location listeners using the better Location\n            \/\/ Provider.\n            disableLocationUpdates(false);\n            requestLocationUpdates(context);\n        }\n    }\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"41660db25e36702b8c1206327cac3873b35133cf","subject":"cleaned up aspect","message":"cleaned up aspect\n","repos":"spring-projects\/spring-data-graph","old_file":"src\/main\/java\/org\/springframework\/datastore\/graph\/neo4j\/spi\/node\/Neo4jNodeBacking.aj","new_file":"src\/main\/java\/org\/springframework\/datastore\/graph\/neo4j\/spi\/node\/Neo4jNodeBacking.aj","new_contents":"package org.springframework.datastore.graph.neo4j.spi.node;\n\nimport org.aspectj.lang.JoinPoint;\nimport org.aspectj.lang.reflect.FieldSignature;\nimport org.neo4j.graphdb.DynamicRelationshipType;\nimport org.neo4j.graphdb.Node;\nimport org.neo4j.graphdb.Relationship;\nimport org.neo4j.graphdb.RelationshipType;\nimport org.neo4j.graphdb.traversal.TraversalDescription;\nimport org.neo4j.graphdb.traversal.Traverser;\nimport org.springframework.beans.factory.annotation.Autowired;\nimport org.springframework.datastore.graph.api.GraphEntity;\nimport org.springframework.datastore.graph.api.NodeBacked;\nimport org.springframework.datastore.graph.api.RelationshipBacked;\nimport org.springframework.datastore.graph.neo4j.fieldaccess.*;\nimport org.springframework.datastore.graph.neo4j.support.GraphDatabaseContext;\nimport org.springframework.persistence.support.AbstractTypeAnnotatingMixinFields;\n\nimport java.lang.reflect.Field;\n\nimport static org.springframework.datastore.graph.neo4j.fieldaccess.DoReturn.unwrap;\n\n\/**\n * Aspect to turn an object annotated with GraphEntity into a graph entity using Neo4J.\n * Delegates all field access (except for fields assumed to be transient)\n * to an underlying Neo4 graph node.\n * \n * @author Rod Johnson\n *\/\npublic aspect Neo4jNodeBacking extends AbstractTypeAnnotatingMixinFields<GraphEntity, NodeBacked> {\n    private GraphDatabaseContext graphDatabaseContext;\n    private DelegatingFieldAccessorFactory fieldAccessorFactory;\n\n    @Autowired\n\tpublic void init(GraphDatabaseContext ctx) {\n        this.graphDatabaseContext = ctx;\n        this.fieldAccessorFactory = new DelegatingFieldAccessorFactory(ctx);\n\t}\n\n\t\/\/-------------------------------------------------------------------------\n\t\/\/ Advise user-defined constructors of NodeBacked objects to create a new Neo4J backing node\n\t\/\/-------------------------------------------------------------------------\n\tpointcut arbitraryUserConstructorOfNodeBackedObject(NodeBacked entity) : \n\t\texecution((@GraphEntity *).new(..)) &&\n\t\t!execution((@GraphEntity *).new(Node)) &&\n\t\tthis(entity);  \/\/ && !cflow(execution(* fromStateInternal(..));\n\t\n\t\n\t\/\/ Create a new node in the Graph if no Node was passed in a constructor\n\tbefore(NodeBacked entity) : arbitraryUserConstructorOfNodeBackedObject(entity) {\n        entity.underlyingState=new DetachableEntityStateAccessors(new DefaultEntityStateAccessors<NodeBacked,Node>(null,entity,entity.getClass(),graphDatabaseContext));\n        if (graphDatabaseContext.transactionIsRunning()) {\n            entity.underlyingState.createAndAssignNode();\n        } else {\n            log.warn(\"New Nodebacked created outside of transaction \"+ entity.getClass());\n        }\n\t}\n\n    \/\/ Introduced field\n\tprivate Node NodeBacked.underlyingNode;\n    private EntityStateAccessors<NodeBacked> NodeBacked.underlyingState;\n\n\tpublic void NodeBacked.setUnderlyingNode(Node n) {\n\t\tthis.underlyingNode = n;\n        if (this.underlyingState==null) {\n            this.underlyingState=new DetachableEntityStateAccessors(new DefaultEntityStateAccessors<NodeBacked,Node>(n,this,this.getClass(),Neo4jNodeBacking.aspectOf().graphDatabaseContext));\n        } else {\n            this.underlyingState.setNode(n);\n        }\n\t}\n\t\n\tpublic Node NodeBacked.getUnderlyingNode() {\n\t\treturn underlyingNode;\n\t}\n\t\n    public boolean NodeBacked.hasUnderlyingNode() {\n        return underlyingNode!=null;\n    }\n\n\tpublic Relationship NodeBacked.relateTo(NodeBacked nb, RelationshipType type) {\n\t\treturn this.underlyingNode.createRelationshipTo(nb.getUnderlyingNode(), type);\n\t}\n\n\tpublic Long NodeBacked.getNodeId() {\n        if (!hasUnderlyingNode()) return null;\n\t\treturn underlyingNode.getId();\n\t}\n\n    public  Iterable<? extends NodeBacked> NodeBacked.find(final Class<? extends NodeBacked> targetType, TraversalDescription traversalDescription) {\n        if (!hasUnderlyingNode()) throw new IllegalStateException(\"No node attached to \" + this);\n        final Traverser traverser = traversalDescription.traverse(this.getUnderlyingNode());\n        return new NodeBackedNodeIterableWrapper(traverser, targetType, Neo4jNodeBacking.aspectOf().graphDatabaseContext);\n    }\n    \/* todo Andy Clement\n    public Iterable<? extends NodeBacked> NodeBacked.traverse(TraversalDescription traversalDescription) {\n        final Class<? extends NodeBacked> target = this.getClass();\n        return this.traverse(target,traversalDescription);\n    }\n    *\/\n\n    \/* todo Andy Clement\n    public <R extends RelationshipBacked, N extends NodeBacked> R NodeBacked.relateTo(N node, Class<R> relationshipType, String type) {\n        Relationship rel = this.getUnderlyingNode().createRelationshipTo(node.getUnderlyingNode(), DynamicRelationshipType.withName(type));\n        Neo4jNodeBacking.aspectOf().relationshipEntityInstantiator.createEntityFromState(rel, relationshipType);\n    }\n    *\/\n    public RelationshipBacked NodeBacked.relateTo(NodeBacked node, Class<? extends RelationshipBacked> relationshipType, String type) {\n        Relationship rel = this.getUnderlyingNode().createRelationshipTo(node.getUnderlyingNode(), DynamicRelationshipType.withName(type));\n        return Neo4jNodeBacking.aspectOf().graphDatabaseContext.createEntityFromState(rel, relationshipType);\n    }\n\n    public RelationshipBacked NodeBacked.getRelationshipTo(NodeBacked node, Class<? extends RelationshipBacked> relationshipType, String type) {\n        Node myNode=this.getUnderlyingNode();\n        Node otherNode=node.getUnderlyingNode();\n        for (Relationship rel : this.getUnderlyingNode().getRelationships(DynamicRelationshipType.withName(type))) {\n            if (rel.getOtherNode(myNode).equals(otherNode)) return Neo4jNodeBacking.aspectOf().graphDatabaseContext.createEntityFromState(rel, relationshipType);\n        }\n        return null;\n    }\n\n\tpublic final boolean NodeBacked.equals(Object obj) {\n        if (obj == this) return true;\n        if (!hasUnderlyingNode()) return false;\n\t\tif (obj instanceof NodeBacked) {\n\t\t\treturn this.getUnderlyingNode().equals(((NodeBacked) obj).getUnderlyingNode());\n\t\t}\n\t\treturn false;\n\t}\n\t\n\tpublic final int NodeBacked.hashCode() {\n        if (!hasUnderlyingNode()) return System.identityHashCode(this);\n\t\treturn getUnderlyingNode().hashCode();\n\t}\n\n    Object around(NodeBacked entity): entityFieldGet(entity) {\n        Object result=entity.underlyingState.getValue(field(thisJoinPoint));\n        if (result instanceof DoReturn) return unwrap(result);\n        return proceed(entity);\n    }\n\n    Object around(NodeBacked entity, Object newVal) : entityFieldSet(entity, newVal) {\n        Object result=entity.underlyingState.setValue(field(thisJoinPoint),newVal);\n        if (result instanceof DoReturn) return unwrap(result);\n        return proceed(entity,result);\n\t}\n\n    Field field(JoinPoint joinPoint) {\n        FieldSignature fieldSignature = (FieldSignature)joinPoint.getSignature();\n        return fieldSignature.getField();\n    }\n}\n","old_contents":"package org.springframework.datastore.graph.neo4j.spi.node;\n\nimport org.aspectj.lang.reflect.FieldSignature;\nimport org.neo4j.graphdb.DynamicRelationshipType;\nimport org.neo4j.graphdb.Node;\nimport org.neo4j.graphdb.Relationship;\nimport org.neo4j.graphdb.RelationshipType;\nimport org.neo4j.graphdb.traversal.TraversalDescription;\nimport org.neo4j.graphdb.traversal.Traverser;\nimport org.springframework.beans.factory.annotation.Autowired;\nimport org.springframework.datastore.graph.api.GraphEntity;\nimport org.springframework.datastore.graph.api.NodeBacked;\nimport org.springframework.datastore.graph.api.RelationshipBacked;\nimport org.springframework.datastore.graph.neo4j.fieldaccess.*;\nimport org.springframework.datastore.graph.neo4j.support.GraphDatabaseContext;\nimport org.springframework.persistence.support.AbstractTypeAnnotatingMixinFields;\n\nimport java.lang.reflect.Field;\n\nimport static org.springframework.datastore.graph.neo4j.fieldaccess.DoReturn.unwrap;\n\n\/**\n * Aspect to turn an object annotated with GraphEntity into a graph entity using Neo4J.\n * Delegates all field access (except for fields assumed to be transient)\n * to an underlying Neo4 graph node.\n * \n * @author Rod Johnson\n *\/\npublic aspect Neo4jNodeBacking extends AbstractTypeAnnotatingMixinFields<GraphEntity, NodeBacked> {\n    private GraphDatabaseContext graphDatabaseContext;\n    private DelegatingFieldAccessorFactory fieldAccessorFactory;\n\n    @Autowired\n\tpublic void init(GraphDatabaseContext ctx) {\n        this.graphDatabaseContext = ctx;\n        this.fieldAccessorFactory = new DelegatingFieldAccessorFactory(ctx);\n\t}\n\n\t\/\/-------------------------------------------------------------------------\n\t\/\/ Advise user-defined constructors of NodeBacked objects to create a new Neo4J backing node\n\t\/\/-------------------------------------------------------------------------\n\tpointcut arbitraryUserConstructorOfNodeBackedObject(NodeBacked entity) : \n\t\texecution((@GraphEntity *).new(..)) &&\n\t\t!execution((@GraphEntity *).new(Node)) &&\n\t\tthis(entity);  \/\/ && !cflow(execution(* fromStateInternal(..));\n\t\n\t\n\t\/\/ Create a new node in the Graph if no Node was passed in a constructor\n\tbefore(NodeBacked entity) : arbitraryUserConstructorOfNodeBackedObject(entity) {\n        entity.underlyingState=new DetachableEntityStateAccessors(new DefaultEntityStateAccessors<NodeBacked,Node>(null,entity,entity.getClass(),graphDatabaseContext));\n        if (graphDatabaseContext.transactionIsRunning()) {\n            entity.underlyingState.createAndAssignNode();\n        } else {\n            log.warn(\"New Nodebacked created outside of transaction \"+ entity.getClass());\n        }\n\t}\n\n    \/\/ Introduced field\n\tprivate Node NodeBacked.underlyingNode;\n    private EntityStateAccessors<NodeBacked> NodeBacked.underlyingState;\n\n\tpublic void NodeBacked.setUnderlyingNode(Node n) {\n\t\tthis.underlyingNode = n;\n        if (this.underlyingState==null) {\n            this.underlyingState=new DetachableEntityStateAccessors(new DefaultEntityStateAccessors<NodeBacked,Node>(n,this,this.getClass(),Neo4jNodeBacking.aspectOf().graphDatabaseContext));\n        } else {\n            this.underlyingState.setNode(n);\n        }\n\t}\n\t\n\tpublic Node NodeBacked.getUnderlyingNode() {\n\t\treturn underlyingNode;\n\t}\n\t\n    public boolean NodeBacked.hasUnderlyingNode() {\n        return underlyingNode!=null;\n    }\n\n\tpublic Relationship NodeBacked.relateTo(NodeBacked nb, RelationshipType type) {\n\t\treturn this.underlyingNode.createRelationshipTo(nb.getUnderlyingNode(), type);\n\t}\n\n\tpublic Long NodeBacked.getNodeId() {\n        if (!hasUnderlyingNode()) return null;\n\t\treturn underlyingNode.getId();\n\t}\n\n    public  Iterable<? extends NodeBacked> NodeBacked.find(final Class<? extends NodeBacked> targetType, TraversalDescription traversalDescription) {\n        if (!hasUnderlyingNode()) throw new IllegalStateException(\"No node attached to \" + this);\n        final Traverser traverser = traversalDescription.traverse(this.getUnderlyingNode());\n        return new NodeBackedNodeIterableWrapper(traverser, targetType, Neo4jNodeBacking.aspectOf().graphDatabaseContext);\n    }\n    \/* todo Andy Clement\n    public Iterable<? extends NodeBacked> NodeBacked.traverse(TraversalDescription traversalDescription) {\n        final Class<? extends NodeBacked> target = this.getClass();\n        return this.traverse(target,traversalDescription);\n    }\n    *\/\n\n    \/* todo Andy Clement\n    public <R extends RelationshipBacked, N extends NodeBacked> R NodeBacked.relateTo(N node, Class<R> relationshipType, String type) {\n        Relationship rel = this.getUnderlyingNode().createRelationshipTo(node.getUnderlyingNode(), DynamicRelationshipType.withName(type));\n        Neo4jNodeBacking.aspectOf().relationshipEntityInstantiator.createEntityFromState(rel, relationshipType);\n    }\n    *\/\n    public RelationshipBacked NodeBacked.relateTo(NodeBacked node, Class<? extends RelationshipBacked> relationshipType, String type) {\n        Relationship rel = this.getUnderlyingNode().createRelationshipTo(node.getUnderlyingNode(), DynamicRelationshipType.withName(type));\n        return Neo4jNodeBacking.aspectOf().graphDatabaseContext.createEntityFromState(rel, relationshipType);\n    }\n\n    public RelationshipBacked NodeBacked.getRelationshipTo(NodeBacked node, Class<? extends RelationshipBacked> relationshipType, String type) {\n        Node myNode=this.getUnderlyingNode();\n        Node otherNode=node.getUnderlyingNode();\n        for (Relationship rel : this.getUnderlyingNode().getRelationships(DynamicRelationshipType.withName(type))) {\n            if (rel.getOtherNode(myNode).equals(otherNode)) return Neo4jNodeBacking.aspectOf().graphDatabaseContext.createEntityFromState(rel, relationshipType);\n        }\n        return null;\n    }\n\n\tpublic final boolean NodeBacked.equals(Object obj) {\n        if (obj == this) return true;\n        if (!hasUnderlyingNode()) return false;\n\t\tif (obj instanceof NodeBacked) {\n\t\t\treturn this.getUnderlyingNode().equals(((NodeBacked) obj).getUnderlyingNode());\n\t\t}\n\t\treturn false;\n\t}\n\t\n\tpublic final int NodeBacked.hashCode() {\n        if (!hasUnderlyingNode()) return System.identityHashCode(this);\n\t\treturn getUnderlyingNode().hashCode();\n\t}\n\n    Object around(NodeBacked entity): entityFieldGet(entity) {\n        FieldSignature fieldSignature = (FieldSignature) thisJoinPoint.getSignature();\n        Field field = fieldSignature.getField();\n\n        Object result=entity.underlyingState.getValue(field);\n        if (result instanceof DoReturn) return unwrap(result);\n        return proceed(entity);\n    }\n\n    Object around(NodeBacked entity, Object newVal) : entityFieldSet(entity, newVal) {\n        FieldSignature fieldSignature=(FieldSignature) thisJoinPoint.getSignature();\n        Field field = fieldSignature.getField();\n        Object result=entity.underlyingState.setValue(field,newVal);\n        if (result instanceof DoReturn) return unwrap(result);\n        return proceed(entity,result);\n\t}\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"cba60164383139ac98e04e6066444beda75f93ec","subject":"Added TT registration","message":"Added TT registration\n","repos":"Aloja\/AOP4Hadoop","old_file":"src\/1.0.3\/Aspectj.aj","new_file":"src\/1.0.3\/Aspectj.aj","new_contents":"","old_contents":"","returncode":0,"stderr":"unknown","license":"apache-2.0","lang":"AspectJ"}
{"commit":"676fa91b4809b32e42230154b6f5d7285f69de76","subject":"When a Program is lanched using Launch class, attributes annotated with @Out are not in the Result...","message":"When a Program is lanched using Launch class, attributes annotated with @Out are not in the Result...\n\nSee https:\/\/github.com\/XA-Labs\/org.parallelj\/issues\/78\n","repos":"christophe-w\/parallelj.runtime,awltech\/org.parallelj","old_file":"parallelj-launching\/src\/main\/java\/org\/parallelj\/launching\/quartz\/ProgramJobsAdapter.aj","new_file":"parallelj-launching\/src\/main\/java\/org\/parallelj\/launching\/quartz\/ProgramJobsAdapter.aj","new_contents":"\/*\n *     ParallelJ, framework for parallel computing\n *\n *     Copyright (C) 2010, 2011, 2012 Atos Worldline or third-party contributors as\n *     indicated by the @author tags or express copyright attribution\n *     statements applied by the authors.\n *\n *     This library is free software; you can redistribute it and\/or\n *     modify it under the terms of the GNU Lesser General Public\n *     License as published by the Free Software Foundation; either\n *     version 2.1 of the License.\n *\n *     This library is distributed in the hope that it will be useful,\n *     but WITHOUT ANY WARRANTY; without even the implied warranty of\n *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n *     Lesser General Public License for more details.\n *\n *     You should have received a copy of the GNU Lesser General Public\n *     License along with this library; if not, write to the Free Software\n *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n *\/\npackage org.parallelj.launching.quartz;\n\nimport java.util.HashMap;\nimport java.util.HashSet;\nimport java.util.Map;\nimport java.util.Set;\nimport java.util.concurrent.ExecutorService;\nimport java.util.concurrent.Executors;\n\nimport org.parallelj.Programs;\nimport org.parallelj.Programs.ProcessHelper;\nimport org.parallelj.internal.kernel.KProcess;\nimport org.parallelj.internal.kernel.KProcessor;\nimport org.parallelj.internal.kernel.KProgram;\nimport org.parallelj.internal.kernel.procedure.CallableProcedure;\nimport org.parallelj.internal.kernel.procedure.RunnableProcedure;\nimport org.parallelj.internal.reflect.ProgramAdapter.Adapter;\nimport org.parallelj.launching.LaunchingMessageKind;\nimport org.parallelj.launching.ReturnCodes;\nimport org.parallelj.mirror.ProgramType;\nimport org.quartz.Job;\nimport org.quartz.JobDataMap;\nimport org.quartz.JobExecutionContext;\nimport org.quartz.JobExecutionException;\n\n\/**\n * Implements the Job.execute(..) method\n * \n * \n *\/\nprivileged public aspect ProgramJobsAdapter {\n\n\t\/*\n\t * The Aspect JobsAdapter must be passed before this.\n\t *\/\n\tdeclare precedence :\n\t\torg.parallelj.internal.kernel.Identifiers,\n\t\torg.parallelj.internal.reflect.ProgramAdapter,\n\t\torg.parallelj.internal.util.sm.impl.KStateMachines,\n\t\torg.parallelj.internal.util.sm.impl.KStateMachines.PerMachine,\n\t\torg.parallelj.Executables$PerExecutable,\n\t\torg.parallelj.internal.reflect.ProgramAdapter.PerProgram,\n\t\torg.parallelj.internal.log.Logs,\n\t\torg.parallelj.launching.quartz.JobsAdapter;\n\n\t\/*\n\t * Add the interface IProceduresInError to the KProcessor\n\t*\/\n\tprivate interface IProceduresInError {\n\t\tpublic void addProcedureInError(String name, Exception exception);\n\t}\n\tpublic Map<String, Set<String>> IProceduresInError.proceduresInError=new HashMap<String, Set<String>>();\n\t\n\tpublic synchronized void IProceduresInError.addProcedureInError(String name, Exception exception) {\n\t\tSet<String> exceptions = ((IProceduresInError)this).proceduresInError.get(name);\n\t\tif (exceptions==null) {\n\t\t\t\/\/ This is the first \"name\" Procedure in error\n\t\t\texceptions = new HashSet<String>();\n\t\t}\n\t\tif (!exceptions.contains(exception.getClass().getCanonicalName())) {\n\t\t\texceptions.add(exception.getClass().getCanonicalName());\n\t\t}\n\t\t((IProceduresInError)this).proceduresInError.put(name, exceptions);\n\t}\n\t\n\tdeclare parents: org.parallelj.internal.kernel.KProcessor implements IProceduresInError;\n\n\t\/**\n\t * Launch a Program and initialize the Result as a JobDataMap.\n\t * \n\t * @param self\n\t * @param context\n\t * @throws JobExecutionException\n\t *\/\n\tvoid around(Job self, JobExecutionContext context)\n\t\t\tthrows JobExecutionException : \n\t\texecution( public void  Job+.execute(..) throws JobExecutionException) \n\t\t\t&& (within(@org.parallelj.Program *) || within(JobsAdapter)) \n\t\t\t\t&& args(context) && this(self) {\n\t\tJobDataMap jobDataMap = new JobDataMap();\n\t\tcontext.setResult(jobDataMap);\n\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.SUCCESS);\n\n\t\tproceed(self, context);\n\n\t\ttry {\n\t\t\t\/\/ Initialize an ExecutorService with the Capacity of the Program\n\t\t\tProcessHelper<?> processHelper = Programs.as((Adapter) self);\n\t\t\tif (processHelper == null) {\n\t\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.NOTSTARTED);\n\t\t\t\tthrow new JobExecutionException(LaunchingMessageKind.ELAUNCH0003.getFormatedMessage(self));\n\t\t\t}\n\t\t\tProgramType programType = processHelper.getProcess().getProgram();\n\t\t\tExecutorService service = null;\n\t\t\t\/\/ If an executorService was specified, we use it\n\n\t\t\tif (context.getJobDetail().getJobDataMap().get(Launch.DEFAULT_EXECUTOR_KEY) != null) {\n\t\t\t\tservice = (ExecutorService)context.getJobDetail().getJobDataMap().get(Launch.DEFAULT_EXECUTOR_KEY);\n\t\t\t} else \n\t\t\tif (programType instanceof KProgram) {\n\t\t\t\tshort programCapacity = ((KProgram) programType)\n\t\t\t\t\t\t.getCapacity();\n\t\t\t\tservice = (programCapacity == Short.MAX_VALUE) ? Executors\n\t\t\t\t\t\t.newCachedThreadPool() : Executors\n\t\t\t\t\t\t.newFixedThreadPool(programCapacity);\n\t\t\t} else {\n\t\t\t\tservice = Executors\n\t\t\t\t\t\t.newCachedThreadPool();\n\t\t\t}\n\n\t\t\t\/\/ Launch the program with the initialized ExecutorService\n\t\t\tprocessHelper.execute(service).join();\n\t\t\t\n\t\t\tKProcessor rootProcessor = ((KProcessor)processHelper.getProcess().getProcessor());\n\t\t\tIProceduresInError procedures = (IProceduresInError)rootProcessor;\n\t\t\tif(procedures.proceduresInError.size()>0) {\n\t\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.FAILURE);\n\t\t\t}\n\t\t\n\t\t\tProgramFieldsBinder.getProgramOutputFields(self, context);\n\t\t\tservice.shutdown();\n\t\t\t\n\t\t\tif (procedures.proceduresInError.size()>0){\n\t\t\t\tjobDataMap.put(QuartzUtils.PROCEDURES_IN_ERROR, procedures.proceduresInError);\n\t\t\t\tthrow new JobExecutionException();\n\t\t\t}\n\t\t} catch (IllegalAccessException e) {\n\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.FAILURE);\n\t\t\tthrow new JobExecutionException(e);\n\t\t} catch (NoSuchFieldException e) {\n\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.FAILURE);\n\t\t\tthrow new JobExecutionException(e);\n\t\t}\n\t}\n\t\n\t\/\/ Interception around Runnable execution      \n\tvoid around(Object self): call(void complete())\n\t\t&& target(org.parallelj.internal.kernel.procedure.RunnableProcedure.RunnableCall)\n\t\t&& this(self)  {\n\t\t \n\t\tRunnableProcedure.RunnableCall runnable = (RunnableProcedure.RunnableCall)thisJoinPoint.getTarget();\n\t\tRunnableProcedure procedure = (RunnableProcedure)runnable.getProcedure();\n\t\tif (procedure.getHandler() == null\n\t\t\t\t&& runnable.getException() != null) {\n\t\t\t\/\/ There is an error !!!\n\t\t\tKProcess process = runnable.getProcess();\n\t\t\tKProcessor rootProcessor = process.getProcessor();\/\/.getRootProcessor();\n\t\t\t((IProceduresInError)rootProcessor).addProcedureInError(procedure.getType(), runnable.getException());\n\t\t}\n\t\tproceed(self);\n\t}\n\n\t\/\/ Interception around Callable execution      \n\tvoid around(Object self): call(void complete())\n\t\t&& target(org.parallelj.internal.kernel.procedure.CallableProcedure.CallableCall)\n\t\t&& this(self)  {\n\n\t\tCallableProcedure.CallableCall callable = (CallableProcedure.CallableCall)thisJoinPoint.getTarget();\n\t\tCallableProcedure procedure = (CallableProcedure)callable.getProcedure(); \n\t\t\t\n\t\tif (\n\t\t\t\tprocedure.getHandler() == null\n\t\t\t\t&& callable.getException() != null\n\t\t\t\t) {\n\t\t\t\/\/ There is an error !!!\n\t\t\tKProcess process = callable.getProcess();\n\t\t\tKProcessor rootProcessor = process.getProcessor();\/\/.getRootProcessor();\n\t\t\t((IProceduresInError)rootProcessor).addProcedureInError(procedure.getType(), callable.getException());\n\t\t}\n\t\tproceed(self);\n\t}\n\t \n\t\/*\n\t * Allow to get the procedures in error of a Process (the root Process !!!)\n\t *\/\n\tpublic static synchronized Map<String, Set<String>> getProceduresInErrors(\n\t\t\torg.parallelj.mirror.Process process) {\n\t\tKProcessor rootProcessor = ((KProcessor) process.getProcessor());\n\t\tIProceduresInError procedures = (IProceduresInError) rootProcessor;\n\t\treturn procedures.proceduresInError;\n\t}\n}\n","old_contents":"\/*\n *     ParallelJ, framework for parallel computing\n *\n *     Copyright (C) 2010, 2011, 2012 Atos Worldline or third-party contributors as\n *     indicated by the @author tags or express copyright attribution\n *     statements applied by the authors.\n *\n *     This library is free software; you can redistribute it and\/or\n *     modify it under the terms of the GNU Lesser General Public\n *     License as published by the Free Software Foundation; either\n *     version 2.1 of the License.\n *\n *     This library is distributed in the hope that it will be useful,\n *     but WITHOUT ANY WARRANTY; without even the implied warranty of\n *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n *     Lesser General Public License for more details.\n *\n *     You should have received a copy of the GNU Lesser General Public\n *     License along with this library; if not, write to the Free Software\n *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n *\/\npackage org.parallelj.launching.quartz;\n\nimport java.util.HashMap;\nimport java.util.HashSet;\nimport java.util.Map;\nimport java.util.Set;\nimport java.util.concurrent.ExecutorService;\nimport java.util.concurrent.Executors;\n\nimport org.parallelj.Programs;\nimport org.parallelj.Programs.ProcessHelper;\nimport org.parallelj.internal.kernel.KProcess;\nimport org.parallelj.internal.kernel.KProcessor;\nimport org.parallelj.internal.kernel.KProgram;\nimport org.parallelj.internal.kernel.procedure.CallableProcedure;\nimport org.parallelj.internal.kernel.procedure.RunnableProcedure;\nimport org.parallelj.internal.reflect.ProgramAdapter.Adapter;\nimport org.parallelj.launching.LaunchingMessageKind;\nimport org.parallelj.launching.ReturnCodes;\nimport org.parallelj.mirror.ProgramType;\nimport org.quartz.Job;\nimport org.quartz.JobDataMap;\nimport org.quartz.JobExecutionContext;\nimport org.quartz.JobExecutionException;\n\n\/**\n * Implements the Job.execute(..) method\n * \n * \n *\/\nprivileged public aspect ProgramJobsAdapter {\n\n\t\/*\n\t * The Aspect JobsAdapter must be passed before this.\n\t *\/\n\tdeclare precedence :\n\t\torg.parallelj.internal.kernel.Identifiers,\n\t\torg.parallelj.internal.reflect.ProgramAdapter,\n\t\torg.parallelj.internal.util.sm.impl.KStateMachines,\n\t\torg.parallelj.internal.util.sm.impl.KStateMachines.PerMachine,\n\t\torg.parallelj.Executables$PerExecutable,\n\t\torg.parallelj.internal.reflect.ProgramAdapter.PerProgram,\n\t\torg.parallelj.internal.log.Logs,\n\t\torg.parallelj.launching.quartz.JobsAdapter;\n\n\t\/*\n\t * Add the interface IProceduresInError to the KProcessor\n\t*\/\n\tprivate interface IProceduresInError {\n\t\tpublic void addProcedureInError(String name, Exception exception);\n\t}\n\tpublic Map<String, Set<String>> IProceduresInError.proceduresInError=new HashMap<String, Set<String>>();\n\t\n\tpublic synchronized void IProceduresInError.addProcedureInError(String name, Exception exception) {\n\t\tSet<String> exceptions = ((IProceduresInError)this).proceduresInError.get(name);\n\t\tif (exceptions==null) {\n\t\t\t\/\/ This is the first \"name\" Procedure in error\n\t\t\texceptions = new HashSet<String>();\n\t\t}\n\t\tif (!exceptions.contains(exception.getClass().getCanonicalName())) {\n\t\t\texceptions.add(exception.getClass().getCanonicalName());\n\t\t}\n\t\t((IProceduresInError)this).proceduresInError.put(name, exceptions);\n\t}\n\t\n\tdeclare parents: org.parallelj.internal.kernel.KProcessor implements IProceduresInError;\n\n\t\/**\n\t * Launch a Program and initialize the Result as a JobDataMap.\n\t * \n\t * @param self\n\t * @param context\n\t * @throws JobExecutionException\n\t *\/\n\tvoid around(Job self, JobExecutionContext context)\n\t\t\tthrows JobExecutionException : \n\t\texecution( public void  Job+.execute(..) throws JobExecutionException) \n\t\t\t&& (within(@org.parallelj.Program *) || within(JobsAdapter)) \n\t\t\t\t&& args(context) && this(self) {\n\t\tJobDataMap jobDataMap = new JobDataMap();\n\t\tcontext.setResult(jobDataMap);\n\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.SUCCESS);\n\n\t\tproceed(self, context);\n\n\t\ttry {\n\t\t\t\/\/ Initialize an ExecutorService with the Capacity of the Program\n\t\t\tProcessHelper<?> processHelper = Programs.as((Adapter) self);\n\t\t\tif (processHelper == null) {\n\t\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.NOTSTARTED);\n\t\t\t\tthrow new JobExecutionException(LaunchingMessageKind.ELAUNCH0003.getFormatedMessage(self));\n\t\t\t}\n\t\t\tProgramType programType = processHelper.getProcess().getProgram();\n\t\t\tExecutorService service = null;\n\t\t\t\/\/ If an executorService was specified, we use it\n\n\t\t\tif (context.getJobDetail().getJobDataMap().get(Launch.DEFAULT_EXECUTOR_KEY) != null) {\n\t\t\t\tservice = (ExecutorService)context.getJobDetail().getJobDataMap().get(Launch.DEFAULT_EXECUTOR_KEY);\n\t\t\t} else \n\t\t\tif (programType instanceof KProgram) {\n\t\t\t\tshort programCapacity = ((KProgram) programType)\n\t\t\t\t\t\t.getCapacity();\n\t\t\t\tservice = (programCapacity == Short.MAX_VALUE) ? Executors\n\t\t\t\t\t\t.newCachedThreadPool() : Executors\n\t\t\t\t\t\t.newFixedThreadPool(programCapacity);\n\t\t\t} else {\n\t\t\t\tservice = Executors\n\t\t\t\t\t\t.newCachedThreadPool();\n\t\t\t}\n\n\t\t\t\/\/ Launch the program with the initialized ExecutorService\n\t\t\tprocessHelper.execute(service).join();\n\t\t\t\n\t\t\tKProcessor rootProcessor = ((KProcessor)processHelper.getProcess().getProcessor());\n\t\t\tIProceduresInError procedures = (IProceduresInError)rootProcessor;\n\t\t\tif(procedures.proceduresInError.size()>0) {\n\t\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.FAILURE);\n\t\t\t}\n\t\t\n\t\t\tProgramFieldsBinder.getProgramOutputFields(this, context);\n\t\t\tservice.shutdown();\n\t\t\t\n\t\t\tif (procedures.proceduresInError.size()>0){\n\t\t\t\tjobDataMap.put(QuartzUtils.PROCEDURES_IN_ERROR, procedures.proceduresInError);\n\t\t\t\tthrow new JobExecutionException();\n\t\t\t}\n\t\t} catch (IllegalAccessException e) {\n\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.FAILURE);\n\t\t\tthrow new JobExecutionException(e);\n\t\t} catch (NoSuchFieldException e) {\n\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.FAILURE);\n\t\t\tthrow new JobExecutionException(e);\n\t\t}\n\t}\n\t\n\t\/\/ Interception around Runnable execution      \n\tvoid around(Object self): call(void complete())\n\t\t&& target(org.parallelj.internal.kernel.procedure.RunnableProcedure.RunnableCall)\n\t\t&& this(self)  {\n\t\t \n\t\tRunnableProcedure.RunnableCall runnable = (RunnableProcedure.RunnableCall)thisJoinPoint.getTarget();\n\t\tRunnableProcedure procedure = (RunnableProcedure)runnable.getProcedure();\n\t\tif (procedure.getHandler() == null\n\t\t\t\t&& runnable.getException() != null) {\n\t\t\t\/\/ There is an error !!!\n\t\t\tKProcess process = runnable.getProcess();\n\t\t\tKProcessor rootProcessor = process.getProcessor();\/\/.getRootProcessor();\n\t\t\t((IProceduresInError)rootProcessor).addProcedureInError(procedure.getType(), runnable.getException());\n\t\t}\n\t\tproceed(self);\n\t}\n\n\t\/\/ Interception around Callable execution      \n\tvoid around(Object self): call(void complete())\n\t\t&& target(org.parallelj.internal.kernel.procedure.CallableProcedure.CallableCall)\n\t\t&& this(self)  {\n\n\t\tCallableProcedure.CallableCall callable = (CallableProcedure.CallableCall)thisJoinPoint.getTarget();\n\t\tCallableProcedure procedure = (CallableProcedure)callable.getProcedure(); \n\t\t\t\n\t\tif (\n\t\t\t\tprocedure.getHandler() == null\n\t\t\t\t&& callable.getException() != null\n\t\t\t\t) {\n\t\t\t\/\/ There is an error !!!\n\t\t\tKProcess process = callable.getProcess();\n\t\t\tKProcessor rootProcessor = process.getProcessor();\/\/.getRootProcessor();\n\t\t\t((IProceduresInError)rootProcessor).addProcedureInError(procedure.getType(), callable.getException());\n\t\t}\n\t\tproceed(self);\n\t}\n\t \n\t\/*\n\t * Allow to get the procedures in error of a Process (the root Process !!!)\n\t *\/\n\tpublic static synchronized Map<String, Set<String>> getProceduresInErrors(\n\t\t\torg.parallelj.mirror.Process process) {\n\t\tKProcessor rootProcessor = ((KProcessor) process.getProcessor());\n\t\tIProceduresInError procedures = (IProceduresInError) rootProcessor;\n\t\treturn procedures.proceduresInError;\n\t}\n}\n","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"14e66d21f79400242a3eb1a1fc2bb00979a57e84","subject":"Javadoc fix: @SpringConfigured -> @Configurable","message":"Javadoc fix: @SpringConfigured -> @Configurable\n\n\ngit-svn-id: b619a0c99665f88f1afe72824344cefe9a1c8c90@9316 fd5a2b45-1f63-4059-99e9-3c7cb7fd75c8\n","repos":"cbeams-archive\/spring-framework-2.5.x,cbeams-archive\/spring-framework-2.5.x,cbeams-archive\/spring-framework-2.5.x,cbeams-archive\/spring-framework-2.5.x","old_file":"aspectj\/src\/org\/springframework\/beans\/factory\/aspectj\/AnnotationBeanConfigurerAspect.aj","new_file":"aspectj\/src\/org\/springframework\/beans\/factory\/aspectj\/AnnotationBeanConfigurerAspect.aj","new_contents":"\/*\n * Copyright 2002-2006 the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n \npackage org.springframework.beans.factory.aspectj;\n\nimport org.springframework.beans.factory.annotation.Configurable;\nimport org.springframework.beans.factory.annotation.AnnotationBeanWiringInfoResolver;\n\n\/**\n * Concrete aspect that uses the Configurable annotation to identify\n * which classes need autowiring. The bean name to look up will be\n * taken from the Configurable annotation if specified, otherwise\n * the default will be the FQN of the class being configured.\n *\n * @author Rod Johnson\n * @since 2.0\n * @see org.springframework.beans.factory.annotation.Configurable\n * @see org.springframework.beans.factory.annotation.AnnotationBeanWiringInfoResolver\n *\/\npublic aspect AnnotationBeanConfigurerAspect extends AbstractBeanConfigurerAspect {\n\t\n\tpublic AnnotationBeanConfigurerAspect() {\n\t\tsetBeanWiringInfoResolver(new AnnotationBeanWiringInfoResolver());\n\t}\n\n\t\/**\n\t * The creation of a new bean (an object with the @Configurable annotation)\n\t *\/\n\tprotected pointcut beanCreation(Object beanInstance) :\n\t\tinitialization((@Configurable *).new(..)) && this(beanInstance);\n\n}\n","old_contents":"\/*\n * Copyright 2002-2006 the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n \npackage org.springframework.beans.factory.aspectj;\n\nimport org.springframework.beans.factory.annotation.Configurable;\nimport org.springframework.beans.factory.annotation.AnnotationBeanWiringInfoResolver;\n\n\/**\n * Concrete aspect that uses the Configurable annotation to identify\n * which classes need autowiring. The bean name to look up will be\n * taken from the Configurable annotation if specified, otherwise\n * the default will be the FQN of the class being configured.\n *\n * @author Rod Johnson\n * @since 2.0\n * @see org.springframework.beans.factory.annotation.Configurable\n * @see org.springframework.beans.factory.annotation.AnnotationBeanWiringInfoResolver\n *\/\npublic aspect AnnotationBeanConfigurerAspect extends AbstractBeanConfigurerAspect {\n\t\n\tpublic AnnotationBeanConfigurerAspect() {\n\t\tsetBeanWiringInfoResolver(new AnnotationBeanWiringInfoResolver());\n\t}\n\n\t\/**\n\t * The creation of a new bean (an object with the @SpringConfigured annotation)\n\t *\/\n\tprotected pointcut beanCreation(Object beanInstance) :\n\t\tinitialization((@Configurable *).new(..)) && this(beanInstance);\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"fc8794c389e99e550b8c34fe00b5ce6512de6031","subject":"Fixed #2884.","message":"Fixed #2884.\n\ngit-svn-id: f4ecfe233223879a4a16cd7937f11b5152963d8e@20439 5e8d7ff9-d8ef-0310-90f0-a4852d11357a\n","repos":"pilipolio\/scala-ide,Duhemm\/scala-ide,scala-ide\/scala-ide,dragos\/scala-ide,mlangc\/scala-ide,Duhemm\/scala-ide,Duhemm\/scala-ide,romanowski\/scala-ide,pilipolio\/scala-ide,sschaef\/scala-ide,pilipolio\/scala-ide,romanowski\/scala-ide,stephenh\/scala-ide,mlangc\/scala-ide,Kwestor\/scala-ide,dragos\/scala-ide,Duhemm\/scala-ide,romanowski\/scala-ide,Kwestor\/scala-ide,sschaef\/scala-ide,romanowski\/scala-ide,mlangc\/scala-ide,andrey-ilinykh\/scala-ide,Kwestor\/scala-ide,andrey-ilinykh\/scala-ide,scala-ide\/scala-ide,andrey-ilinykh\/scala-ide,sschaef\/scala-ide,stephenh\/scala-ide,scala-ide\/scala-ide,pilipolio\/scala-ide,wpopielarski\/scala-ide,wpopielarski\/scala-ide,mlangc\/scala-ide,aleksi-lukkarinen\/scala-ide,andrey-ilinykh\/scala-ide,aleksi-lukkarinen\/scala-ide,stephenh\/scala-ide,scala-ide\/scala-ide,stephenh\/scala-ide,aleksi-lukkarinen\/scala-ide,wpopielarski\/scala-ide,dragos\/scala-ide,Kwestor\/scala-ide,wpopielarski\/scala-ide,dragos\/scala-ide,aleksi-lukkarinen\/scala-ide,sschaef\/scala-ide","old_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/core\/NameLookupAspect.aj","new_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/core\/NameLookupAspect.aj","new_contents":"\/*\n * Copyright 2005-2010 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.core;\n\nimport org.eclipse.jdt.core.ICompilationUnit;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IPackageFragment;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.internal.core.IJavaElementRequestor;\nimport org.eclipse.jdt.internal.core.NameLookup;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaCompilationUnit;\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaElement;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect NameLookupAspect {\n  pointcut seekTypesInSourcePackage(\n    NameLookup nl,\n    String name,\n    IPackageFragment pkg,\n    int firstDot,\n    boolean partialMatch,\n    String topLevelTypeName,\n    int acceptFlags,\n    IJavaElementRequestor requestor) :\n    execution(void NameLookup.seekTypesInSourcePackage(\n      String,\n      IPackageFragment,\n      int,\n      boolean,\n      String,\n      int,\n      IJavaElementRequestor)) &&\n    target(nl) &&\n    args(\n      name,\n      pkg,\n      firstDot,\n      partialMatch,\n      topLevelTypeName,\n      acceptFlags,\n      requestor);\n       \n  void around(\n    NameLookup nl,\n    String name,\n    IPackageFragment pkg,\n    int firstDot,\n    boolean partialMatch,\n    String topLevelTypeName,\n    int acceptFlags,\n    IJavaElementRequestor requestor) :\n      seekTypesInSourcePackage(\n        nl,\n        name,\n        pkg,\n        firstDot,\n        partialMatch,\n        topLevelTypeName,\n        acceptFlags,\n        requestor) {\n\n    long start = -1;\n    if (NameLookup.VERBOSE)\n      start = System.currentTimeMillis();\n    try {\n      if (!partialMatch) {\n        try {\n          IJavaElement[] compilationUnits = pkg.getChildren();\n          for (int i = 0, length = compilationUnits.length; i < length; i++) {\n            if (requestor.isCanceled())\n              return;\n            IJavaElement cu = compilationUnits[i];\n            String cuName = cu.getElementName();\n            int lastDot = cuName.lastIndexOf('.');\n            boolean isScala = cu instanceof IScalaCompilationUnit;\n            if (!isScala && (lastDot != topLevelTypeName.length() || !topLevelTypeName.regionMatches(0, cuName, 0, lastDot)))\n              continue;\n            IType type = ((ICompilationUnit) cu).getType(topLevelTypeName);\n            type = nl.getMemberType(type, name, firstDot);\n            if ((isScala && (type instanceof IScalaElement)) || (!isScala && nl.acceptType(type, acceptFlags, true\/*a source type*\/))) { \/\/ accept type checks for existence unless cu is Scala\n              requestor.acceptType(type);\n              break;  \/\/ since an exact match was requested, no other matching type can exist\n            }\n          }\n        } catch (JavaModelException e) {\n          \/\/ package doesn't exist -> ignore\n        }\n      } else {\n        try {\n          String cuPrefix = firstDot == -1 ? name : name.substring(0, firstDot);\n          IJavaElement[] compilationUnits = pkg.getChildren();\n          for (int i = 0, length = compilationUnits.length; i < length; i++) {\n            if (requestor.isCanceled())\n              return;\n            IJavaElement cu = compilationUnits[i];\n            if (!(cu instanceof IScalaCompilationUnit) && !cu.getElementName().toLowerCase().startsWith(cuPrefix))\n              continue;\n            try {\n              IType[] types = ((ICompilationUnit) cu).getTypes();\n              for (int j = 0, typeLength = types.length; j < typeLength; j++)\n                nl.seekTypesInTopLevelType(name, firstDot, types[j], requestor, acceptFlags);\n            } catch (JavaModelException e) {\n              \/\/ cu doesn't exist -> ignore\n            }\n          }\n        } catch (JavaModelException e) {\n          \/\/ package doesn't exist -> ignore\n        }\n      }\n    } finally {\n      if (NameLookup.VERBOSE)\n        nl.timeSpentInSeekTypesInSourcePackage += System.currentTimeMillis()-start;\n    }\n  }\n}\n","old_contents":"\/*\n * Copyright 2005-2010 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.core;\n\nimport org.eclipse.jdt.core.ICompilationUnit;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IPackageFragment;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.internal.core.IJavaElementRequestor;\nimport org.eclipse.jdt.internal.core.NameLookup;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaCompilationUnit;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect NameLookupAspect {\n  pointcut seekTypesInSourcePackage(\n    NameLookup nl,\n    String name,\n    IPackageFragment pkg,\n    int firstDot,\n    boolean partialMatch,\n    String topLevelTypeName,\n    int acceptFlags,\n    IJavaElementRequestor requestor) :\n    execution(void NameLookup.seekTypesInSourcePackage(\n      String,\n      IPackageFragment,\n      int,\n      boolean,\n      String,\n      int,\n      IJavaElementRequestor)) &&\n    target(nl) &&\n    args(\n      name,\n      pkg,\n      firstDot,\n      partialMatch,\n      topLevelTypeName,\n      acceptFlags,\n      requestor);\n       \n  void around(\n    NameLookup nl,\n    String name,\n    IPackageFragment pkg,\n    int firstDot,\n    boolean partialMatch,\n    String topLevelTypeName,\n    int acceptFlags,\n    IJavaElementRequestor requestor) :\n      seekTypesInSourcePackage(\n        nl,\n        name,\n        pkg,\n        firstDot,\n        partialMatch,\n        topLevelTypeName,\n        acceptFlags,\n        requestor) {\n\n    long start = -1;\n    if (NameLookup.VERBOSE)\n      start = System.currentTimeMillis();\n    try {\n      if (!partialMatch) {\n        try {\n          IJavaElement[] compilationUnits = pkg.getChildren();\n          for (int i = 0, length = compilationUnits.length; i < length; i++) {\n            if (requestor.isCanceled())\n              return;\n            IJavaElement cu = compilationUnits[i];\n            String cuName = cu.getElementName();\n            int lastDot = cuName.lastIndexOf('.');\n            if (!(cu instanceof IScalaCompilationUnit) && (lastDot != topLevelTypeName.length() || !topLevelTypeName.regionMatches(0, cuName, 0, lastDot)))\n              continue;\n            IType type = ((ICompilationUnit) cu).getType(topLevelTypeName);\n            type = nl.getMemberType(type, name, firstDot);\n            if (nl.acceptType(type, acceptFlags, true\/*a source type*\/)) { \/\/ accept type checks for existence\n              requestor.acceptType(type);\n              break;  \/\/ since an exact match was requested, no other matching type can exist\n            }\n          }\n        } catch (JavaModelException e) {\n          \/\/ package doesn't exist -> ignore\n        }\n      } else {\n        try {\n          String cuPrefix = firstDot == -1 ? name : name.substring(0, firstDot);\n          IJavaElement[] compilationUnits = pkg.getChildren();\n          for (int i = 0, length = compilationUnits.length; i < length; i++) {\n            if (requestor.isCanceled())\n              return;\n            IJavaElement cu = compilationUnits[i];\n            if (!(cu instanceof IScalaCompilationUnit) && !cu.getElementName().toLowerCase().startsWith(cuPrefix))\n              continue;\n            try {\n              IType[] types = ((ICompilationUnit) cu).getTypes();\n              for (int j = 0, typeLength = types.length; j < typeLength; j++)\n                nl.seekTypesInTopLevelType(name, firstDot, types[j], requestor, acceptFlags);\n            } catch (JavaModelException e) {\n              \/\/ cu doesn't exist -> ignore\n            }\n          }\n        } catch (JavaModelException e) {\n          \/\/ package doesn't exist -> ignore\n        }\n      }\n    } finally {\n      if (NameLookup.VERBOSE)\n        nl.timeSpentInSeekTypesInSourcePackage += System.currentTimeMillis()-start;\n    }\n  }\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"7a0aab04c6cbc55905787ab396a0b05a527c9593","subject":"Fixed #1000548. Added extra input check.","message":"Fixed #1000548. Added extra input check.\n","repos":"Duhemm\/scala-ide,romanowski\/scala-ide,stephenh\/scala-ide,scala-ide\/scala-ide,dragos\/scala-ide,romanowski\/scala-ide,mlangc\/scala-ide,wpopielarski\/scala-ide,pilipolio\/scala-ide,stephenh\/scala-ide,wpopielarski\/scala-ide,pilipolio\/scala-ide,scala-ide\/scala-ide,romanowski\/scala-ide,Duhemm\/scala-ide,aleksi-lukkarinen\/scala-ide,wpopielarski\/scala-ide,sschaef\/scala-ide,andrey-ilinykh\/scala-ide,scala-ide\/scala-ide,stephenh\/scala-ide,dragos\/scala-ide,Kwestor\/scala-ide,Duhemm\/scala-ide,Kwestor\/scala-ide,mlangc\/scala-ide,andrey-ilinykh\/scala-ide,mlangc\/scala-ide,Duhemm\/scala-ide,aleksi-lukkarinen\/scala-ide,sschaef\/scala-ide,sschaef\/scala-ide,Kwestor\/scala-ide,Kwestor\/scala-ide,sschaef\/scala-ide,andrey-ilinykh\/scala-ide,romanowski\/scala-ide,aleksi-lukkarinen\/scala-ide,aleksi-lukkarinen\/scala-ide,pilipolio\/scala-ide,scala-ide\/scala-ide,andrey-ilinykh\/scala-ide,stephenh\/scala-ide,pilipolio\/scala-ide,wpopielarski\/scala-ide,dragos\/scala-ide,mlangc\/scala-ide,dragos\/scala-ide","old_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/cfprovider\/ClassFileProviderAspect.aj","new_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/cfprovider\/ClassFileProviderAspect.aj","new_contents":"\/*\n * Copyright 2005-2010 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.cfprovider;\n\nimport java.util.HashSet;\n\nimport org.eclipse.core.filebuffers.FileBuffers;\nimport org.eclipse.core.filebuffers.ITextFileBuffer;\nimport org.eclipse.core.filebuffers.ITextFileBufferManager;\nimport org.eclipse.core.filebuffers.LocationKind;\nimport org.eclipse.core.resources.IResource;\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.core.IBuffer;\nimport org.eclipse.jdt.core.IClassFile;\nimport org.eclipse.jdt.core.IImportDeclaration;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IOpenable;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.ITypeRoot;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.core.dom.CompilationUnit;\nimport org.eclipse.jdt.core.search.TypeNameMatch;\nimport org.eclipse.jdt.internal.compiler.CompilationResult;\nimport org.eclipse.jdt.internal.compiler.ast.ASTNode;\nimport org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.ImportReference;\nimport org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.TypeReference;\nimport org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;\nimport org.eclipse.jdt.internal.compiler.env.IBinaryType;\nimport org.eclipse.jdt.internal.compiler.env.ICompilationUnit;\nimport org.eclipse.jdt.internal.compiler.env.IGenericType;\nimport org.eclipse.jdt.internal.compiler.env.ISourceImport;\nimport org.eclipse.jdt.internal.compiler.env.ISourceType;\nimport org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer;\nimport org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding;\nimport org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding;\nimport org.eclipse.jdt.internal.compiler.parser.Parser;\nimport org.eclipse.jdt.internal.compiler.parser.SourceTypeConverter;\nimport org.eclipse.jdt.internal.core.BinaryType;\nimport org.eclipse.jdt.internal.core.ClassFile;\nimport org.eclipse.jdt.internal.core.CompilationUnitElementInfo;\nimport org.eclipse.jdt.internal.core.ImportDeclaration;\nimport org.eclipse.jdt.internal.core.JavaElement;\nimport org.eclipse.jdt.internal.core.BufferManager;\nimport org.eclipse.jdt.internal.core.NameLookup;\nimport org.eclipse.jdt.internal.core.Openable;\nimport org.eclipse.jdt.internal.core.PackageFragment;\nimport org.eclipse.jdt.internal.core.SearchableEnvironment;\nimport org.eclipse.jdt.internal.core.SourceMapper;\nimport org.eclipse.jdt.internal.core.SourceType;\nimport org.eclipse.jdt.internal.core.SourceTypeElementInfo;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyResolver;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyType;\nimport org.eclipse.jdt.internal.core.util.Util;\nimport org.eclipse.jdt.internal.corext.util.OpenTypeHistory;\nimport org.eclipse.jdt.internal.ui.filters.InnerClassFilesFilter;\nimport org.eclipse.jdt.ui.SharedASTProvider;\nimport org.eclipse.jface.viewers.Viewer;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaClassFile;\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaElement;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect ClassFileProviderAspect {\n\n  pointcut classFileCreations(PackageFragment parent, String name) : \n    call(protected ClassFile.new(PackageFragment, String)) &&\n    within(org.eclipse.jdt..*) &&\n    args(parent, name);\n  \n  pointcut getTypeName(ClassFile cf) :\n    execution(public String ClassFile.getTypeName()) &&\n    target(cf);\n\n  \/\/ For 3.6\n  pointcut mapSource(ClassFile cf, SourceMapper mapper, IBinaryType info, IClassFile owner) :\n    execution(IBuffer ClassFile.mapSource(SourceMapper, IBinaryType, IClassFile)) &&\n    target(cf) &&\n    target(IScalaClassFile) &&\n    args(mapper, info, owner);\n\n  \/\/ For 3.5\n  pointcut mapSource2(ClassFile cf, SourceMapper mapper, IBinaryType info) :\n    execution(IBuffer ClassFile.mapSource(SourceMapper, IBinaryType)) &&\n    target(cf) &&\n    target(IScalaClassFile) &&\n    args(mapper, info);\n\n  pointcut getSourceFileName(BinaryType bt) :\n    execution(String BinaryType.getSourceFileName(IBinaryType)) &&\n    target(bt);\n  \n  pointcut select(Viewer viewer, Object parentElement, Object element) :\n    execution(boolean InnerClassFilesFilter.select(Viewer, Object, Object)) &&\n    args(viewer, parentElement, element);\n  \n  pointcut getChildren(BinaryType bt) :\n    execution(IJavaElement[] BinaryType.getChildren()) &&\n    target(bt);\n  \n  pointcut getAST(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) : \n    execution(CompilationUnit SharedASTProvider.getAST(ITypeRoot, SharedASTProvider.WAIT_FLAG, IProgressMonitor)) &&\n    args(element, waitFlag, progressMonitor);\n  \n  pointcut resolve(HierarchyResolver hr, IGenericType suppliedType) :\n    execution(void HierarchyResolver.resolve(IGenericType)) &&\n    target(hr) &&\n    args(suppliedType);\n  \n  pointcut remember(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    execution(void HierarchyResolver.remember(IType, ReferenceBinding)) &&\n    target(hr) &&\n    args(type, typeBinding);\n  \n  pointcut acceptType(IType type, int acceptFlags, boolean isSourceType) :\n    execution(boolean NameLookup.acceptType(IType, int, boolean)) &&\n    args(type, acceptFlags, isSourceType);\n  \n  pointcut find(SearchableEnvironment se, String typeName, String packageName) :\n    execution(NameEnvironmentAnswer find(String, String)) &&\n    target(se) &&\n    args(typeName, packageName);\n  \n  pointcut convert(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) :\n    execution(CompilationUnitDeclaration SourceTypeConverter.convert(ISourceType[], CompilationResult)) &&\n    target(stc) &&\n    args(sourceTypes, compilationResult);\n  \n  pointcut getAncestor(JavaElement je, int ancestorType) :\n    execution(IJavaElement JavaElement.getAncestor(int)) &&\n    target(je) &&\n    args(ancestorType);\n  \n  pointcut isContainerDirty(TypeNameMatch match) :\n    execution(boolean OpenTypeHistory.isContainerDirty(TypeNameMatch)) &&\n    args(match);\n  \n  ClassFile around(PackageFragment parent, String name) : \n    classFileCreations(parent, name) {\n\n    ClassFile javaClassFile = proceed(parent, name);\n    byte[] bytes;\n    \n    try {\n      bytes = javaClassFile.getBytes();\n    } catch(Throwable t) {\n      return javaClassFile; \n    }\n    \n    for (IClassFileProvider provider : ClassFileProviderRegistry.getInstance().getProviders()) {\n      ClassFile cf = provider.create(bytes, parent, name);\n      if (cf != null)\n        return cf;\n    }\n    \n    return javaClassFile;\n  }\n  \n  IBuffer around(ClassFile cf, SourceMapper mapper, IBinaryType info, IClassFile owner) :\n    mapSource(cf, mapper, info, owner) {\n    return mapSourceSubst(cf, mapper, info);\n  }\n\n  IBuffer around(ClassFile cf, SourceMapper mapper, IBinaryType info) :\n    mapSource2(cf, mapper, info) {\n    return mapSourceSubst(cf, mapper, info);\n  }\n\n  IBuffer mapSourceSubst(ClassFile cf, SourceMapper mapper, IBinaryType info) {\n    char[] contents = mapper.findSource(cf.getType(), info);\n    IBuffer buffer;\n    if (contents != null) {\n      buffer = BufferManager.createBuffer(cf);\n      buffer.setContents(contents);\n    } else {\n      buffer = BufferManager.createNullBuffer(cf);\n    }\n    BufferManager bufManager = cf.getBufferManager();\n    bufManager.addBuffer(buffer);\n    buffer.addBufferChangedListener(cf);\n    return buffer;\n  }\n\n  String around(ClassFile cf) :\n    getTypeName(cf) {\n    if(cf instanceof IScalaClassFile) {\n      int lastDollar = cf.name.lastIndexOf('$');\n      return (lastDollar == -1 || lastDollar == cf.name.length()-1) ? cf.name : Util.localTypeName(cf.name, lastDollar, cf.name.length());\n    } else\n      return proceed(cf);\n  }\n  \n  boolean around(Viewer viewer, Object parentElement, Object element) :\n    select(viewer, parentElement, element) {\n    if (element instanceof IScalaClassFile) {\n      IClassFile classFile = (IClassFile) element;\n      String name = classFile.getElementName(); \n      int dollarIndex = name.indexOf('$');\n      return dollarIndex == -1 || dollarIndex == name.length()-7; \/\/ Trailing '$' implies object rather than inner class \n    }\n    return proceed(viewer, parentElement, element);\n  }\n  \n  IJavaElement[] around(BinaryType bt) throws JavaModelException :\n    getChildren(bt) && \n    target(BinaryType) {\n    ClassFile cf = (ClassFile)bt.parent;\n    if (cf instanceof IScalaClassFile)\n      return cf.getChildren();\n    else\n      return proceed(bt);\n  }\n  \n  CompilationUnit around(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) :\n    getAST(element, waitFlag, progressMonitor) {\n      if (element instanceof IScalaElement)\n        return null;\n      else\n        return proceed(element, waitFlag, progressMonitor);\n  }\n  \n  void around(HierarchyResolver hr, IGenericType suppliedType) :\n    resolve(hr, suppliedType) {\n    if (!suppliedType.isBinaryType()) {\n      IType tpe = ((SourceTypeElementInfo)suppliedType).getHandle();\n      IClassFile cf = tpe.getClassFile();\n      if (cf instanceof IScalaClassFile) {\n        hr.resolve(new Openable[]{(Openable)cf}, new HashSet(), null);\n        return;\n      }\n    }\n      \n    proceed(hr, suppliedType);\n  }\n  \n  void around(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    remember(hr, type, typeBinding) {\n    if (((IOpenable)type.getCompilationUnit()).isOpen()) {\n      try {\n        IGenericType genericType = (IGenericType)((JavaElement)type).getElementInfo();\n        hr.remember(genericType, typeBinding);\n      } catch (JavaModelException e) {\n        \/\/ cannot happen since element is open\n        return;\n      }\n    } else {\n      if (typeBinding == null) return;\n\n      TypeDeclaration typeDeclaration = ((SourceTypeBinding)typeBinding).scope.referenceType();\n\n      \/\/ simple super class name\n      char[] superclassName = null;\n      TypeReference superclass;\n      if ((typeDeclaration.bits & ASTNode.IsAnonymousType) != 0) {\n        superclass = typeDeclaration.allocation.type;\n      } else {\n        superclass = typeDeclaration.superclass;\n      }\n      if (superclass != null) {\n        char[][] typeName = superclass.getTypeName();\n        superclassName = typeName == null ? null : typeName[typeName.length-1];\n      }\n\n      \/\/ simple super interface names\n      char[][] superInterfaceNames = null;\n      TypeReference[] superInterfaces = typeDeclaration.superInterfaces;\n      if (superInterfaces != null) {\n        int length = superInterfaces.length;\n        superInterfaceNames = new char[length][];\n        for (int i = 0; i < length; i++) {\n          TypeReference superInterface = superInterfaces[i];\n          char[][] typeName = superInterface.getTypeName();\n          superInterfaceNames[i] = typeName[typeName.length-1];\n        }\n      }\n\n      HierarchyType hierarchyType = new HierarchyType(\n        type,\n        typeDeclaration.name,\n        typeDeclaration.binding.modifiers,\n        superclassName,\n        superInterfaceNames);\n      hr.remember(hierarchyType, typeDeclaration.binding);\n    }\n  }\n  \n  String around(BinaryType bt) :\n    getSourceFileName(bt) {\n    IJavaElement parent = bt.getTypeRoot(); \n    if (parent instanceof IScalaClassFile) {\n      return ((IScalaClassFile)parent).getSourceFileName();\n    }\n    else\n      return proceed(bt);\n  }\n  \n  boolean around(IType type, int acceptFlags, boolean isSourceType) :\n    acceptType(type, acceptFlags, isSourceType) {\n    if (!isSourceType && (type instanceof SourceType)) {\n      IJavaElement parent = type.getParent(); \n      if (parent instanceof IScalaClassFile)\n        return proceed(type, acceptFlags, true);\n    }\n    \n    return proceed(type, acceptFlags, isSourceType);\n  }\n  \n  CompilationUnitDeclaration around(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) throws JavaModelException :\n    convert(stc, sourceTypes, compilationResult) {\n    stc.unit = new CompilationUnitDeclaration(stc.problemReporter, compilationResult, 0);\n    \/\/ not filled at this point\n\n    if (sourceTypes.length == 0 || sourceTypes[0] == null) return stc.unit;\n    SourceTypeElementInfo topLevelTypeInfo = (SourceTypeElementInfo) sourceTypes[0];\n    org.eclipse.jdt.core.ICompilationUnit cuHandle = topLevelTypeInfo.getHandle().getCompilationUnit();\n    stc.cu = (ICompilationUnit) cuHandle;\n\n    CompilationUnitElementInfo cuei = null;\n    Object info = ((JavaElement)stc.cu).getElementInfo();\n    if (info instanceof CompilationUnitElementInfo)\n      cuei = (CompilationUnitElementInfo)info;\n    \n    \n    if (stc.has1_5Compliance && cuei != null && cuei.annotationNumber > 10) { \/\/ experimental value\n      \/\/ if more than 10 annotations, diet parse as this is faster\n      return new Parser(stc.problemReporter, true).dietParse(stc.cu, compilationResult);\n    }\n\n    \/* only positions available *\/\n    int start = topLevelTypeInfo.getNameSourceStart();\n    int end = topLevelTypeInfo.getNameSourceEnd();\n\n    \/* convert package and imports *\/\n    String[] packageName = ((PackageFragment) cuHandle.getParent()).names;\n    if (packageName.length > 0)\n      \/\/ if its null then it is defined in the default package\n      stc.unit.currentPackage =\n        stc.createImportReference(packageName, start, end, false, ClassFileConstants.AccDefault);\n    IImportDeclaration[] importDeclarations = topLevelTypeInfo.getHandle().getCompilationUnit().getImports();\n    int importCount = importDeclarations.length;\n    stc.unit.imports = new ImportReference[importCount];\n    for (int i = 0; i < importCount; i++) {\n      ImportDeclaration importDeclaration = (ImportDeclaration) importDeclarations[i];\n      ISourceImport sourceImport = (ISourceImport) importDeclaration.getElementInfo();\n      String nameWithoutStar = importDeclaration.getNameWithoutStar();\n      stc.unit.imports[i] = stc.createImportReference(\n        Util.splitOn('.', nameWithoutStar, 0, nameWithoutStar.length()),\n        sourceImport.getDeclarationSourceStart(),\n        sourceImport.getDeclarationSourceEnd(),\n        importDeclaration.isOnDemand(),\n        sourceImport.getModifiers());\n    }\n    \/* convert type(s) *\/\n    try {\n      int typeCount = sourceTypes.length;\n      final TypeDeclaration[] types = new TypeDeclaration[typeCount];\n      \/*\n       * We used a temporary types collection to prevent this.unit.types from being null during a call to\n       * convert(...) when the source is syntactically incorrect and the parser is flushing the unit's types.\n       * See https:\/\/bugs.eclipse.org\/bugs\/show_bug.cgi?id=97466\n       *\/\n      for (int i = 0; i < typeCount; i++) {\n        SourceTypeElementInfo typeInfo = (SourceTypeElementInfo) sourceTypes[i];\n        types[i] = stc.convert((SourceType) typeInfo.getHandle(), compilationResult);\n      }\n      stc.unit.types = types;\n      return stc.unit;\n    } catch (SourceTypeConverter.AnonymousMemberFound e) {\n      return new Parser(stc.problemReporter, true).parse(stc.cu, compilationResult);\n    }\n  }\n  \n  IJavaElement around(JavaElement je, int ancestorType) :\n    getAncestor(je, ancestorType) {\n    IJavaElement element = je;\n    while (element != null) {\n      if (element.getElementType() == ancestorType)\n        return element;\n      else if (element instanceof IScalaClassFile && ancestorType == IJavaElement.COMPILATION_UNIT)\n        return ((JavaElement)element).getCompilationUnit();\n      element= element.getParent();\n    }\n    return null;\n  }\n\n  boolean around(TypeNameMatch match) :\n    isContainerDirty(match) {\n    org.eclipse.jdt.core.ICompilationUnit cu = match.getType().getCompilationUnit();\n    if (cu == null) {\n      return false;\n    }\n    IResource resource= cu.getResource();\n    if (resource == null)\n      return false;\n    \n    ITextFileBufferManager manager= FileBuffers.getTextFileBufferManager();\n    ITextFileBuffer textFileBuffer= manager.getTextFileBuffer(resource.getFullPath(), LocationKind.IFILE);\n    if (textFileBuffer != null) {\n      return textFileBuffer.isDirty();\n    }\n    return false;\n  }\n}\n","old_contents":"\/*\n * Copyright 2005-2010 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.cfprovider;\n\nimport java.util.HashSet;\n\nimport org.eclipse.core.filebuffers.FileBuffers;\nimport org.eclipse.core.filebuffers.ITextFileBuffer;\nimport org.eclipse.core.filebuffers.ITextFileBufferManager;\nimport org.eclipse.core.filebuffers.LocationKind;\nimport org.eclipse.core.resources.IResource;\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.core.IBuffer;\nimport org.eclipse.jdt.core.IClassFile;\nimport org.eclipse.jdt.core.IImportDeclaration;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IOpenable;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.ITypeRoot;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.core.dom.CompilationUnit;\nimport org.eclipse.jdt.core.search.TypeNameMatch;\nimport org.eclipse.jdt.internal.compiler.CompilationResult;\nimport org.eclipse.jdt.internal.compiler.ast.ASTNode;\nimport org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.ImportReference;\nimport org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.TypeReference;\nimport org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;\nimport org.eclipse.jdt.internal.compiler.env.IBinaryType;\nimport org.eclipse.jdt.internal.compiler.env.ICompilationUnit;\nimport org.eclipse.jdt.internal.compiler.env.IGenericType;\nimport org.eclipse.jdt.internal.compiler.env.ISourceImport;\nimport org.eclipse.jdt.internal.compiler.env.ISourceType;\nimport org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer;\nimport org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding;\nimport org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding;\nimport org.eclipse.jdt.internal.compiler.parser.Parser;\nimport org.eclipse.jdt.internal.compiler.parser.SourceTypeConverter;\nimport org.eclipse.jdt.internal.core.BinaryType;\nimport org.eclipse.jdt.internal.core.ClassFile;\nimport org.eclipse.jdt.internal.core.CompilationUnitElementInfo;\nimport org.eclipse.jdt.internal.core.ImportDeclaration;\nimport org.eclipse.jdt.internal.core.JavaElement;\nimport org.eclipse.jdt.internal.core.BufferManager;\nimport org.eclipse.jdt.internal.core.NameLookup;\nimport org.eclipse.jdt.internal.core.Openable;\nimport org.eclipse.jdt.internal.core.PackageFragment;\nimport org.eclipse.jdt.internal.core.SearchableEnvironment;\nimport org.eclipse.jdt.internal.core.SourceMapper;\nimport org.eclipse.jdt.internal.core.SourceType;\nimport org.eclipse.jdt.internal.core.SourceTypeElementInfo;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyResolver;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyType;\nimport org.eclipse.jdt.internal.core.util.Util;\nimport org.eclipse.jdt.internal.corext.util.OpenTypeHistory;\nimport org.eclipse.jdt.internal.ui.filters.InnerClassFilesFilter;\nimport org.eclipse.jdt.ui.SharedASTProvider;\nimport org.eclipse.jface.viewers.Viewer;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaClassFile;\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaElement;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect ClassFileProviderAspect {\n\n  pointcut classFileCreations(PackageFragment parent, String name) : \n    call(protected ClassFile.new(PackageFragment, String)) &&\n    within(org.eclipse.jdt..*) &&\n    args(parent, name);\n  \n  pointcut getTypeName(ClassFile cf) :\n    execution(public String ClassFile.getTypeName()) &&\n    target(cf);\n\n  \/\/ For 3.6\n  pointcut mapSource(ClassFile cf, SourceMapper mapper, IBinaryType info, IClassFile owner) :\n    execution(IBuffer ClassFile.mapSource(SourceMapper, IBinaryType, IClassFile)) &&\n    target(cf) &&\n    target(IScalaClassFile) &&\n    args(mapper, info, owner);\n\n  \/\/ For 3.5\n  pointcut mapSource2(ClassFile cf, SourceMapper mapper, IBinaryType info) :\n    execution(IBuffer ClassFile.mapSource(SourceMapper, IBinaryType)) &&\n    target(cf) &&\n    target(IScalaClassFile) &&\n    args(mapper, info);\n\n  pointcut getSourceFileName(BinaryType bt) :\n    execution(String BinaryType.getSourceFileName(IBinaryType)) &&\n    target(bt);\n  \n  pointcut select(Viewer viewer, Object parentElement, Object element) :\n    execution(boolean InnerClassFilesFilter.select(Viewer, Object, Object)) &&\n    args(viewer, parentElement, element);\n  \n  pointcut getChildren(BinaryType bt) :\n    execution(IJavaElement[] BinaryType.getChildren()) &&\n    target(bt);\n  \n  pointcut getAST(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) : \n    execution(CompilationUnit SharedASTProvider.getAST(ITypeRoot, SharedASTProvider.WAIT_FLAG, IProgressMonitor)) &&\n    args(element, waitFlag, progressMonitor);\n  \n  pointcut resolve(HierarchyResolver hr, IGenericType suppliedType) :\n    execution(void HierarchyResolver.resolve(IGenericType)) &&\n    target(hr) &&\n    args(suppliedType);\n  \n  pointcut remember(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    execution(void HierarchyResolver.remember(IType, ReferenceBinding)) &&\n    target(hr) &&\n    args(type, typeBinding);\n  \n  pointcut acceptType(IType type, int acceptFlags, boolean isSourceType) :\n    execution(boolean NameLookup.acceptType(IType, int, boolean)) &&\n    args(type, acceptFlags, isSourceType);\n  \n  pointcut find(SearchableEnvironment se, String typeName, String packageName) :\n    execution(NameEnvironmentAnswer find(String, String)) &&\n    target(se) &&\n    args(typeName, packageName);\n  \n  pointcut convert(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) :\n    execution(CompilationUnitDeclaration SourceTypeConverter.convert(ISourceType[], CompilationResult)) &&\n    target(stc) &&\n    args(sourceTypes, compilationResult);\n  \n  pointcut getAncestor(JavaElement je, int ancestorType) :\n    execution(IJavaElement JavaElement.getAncestor(int)) &&\n    target(je) &&\n    args(ancestorType);\n  \n  pointcut isContainerDirty(TypeNameMatch match) :\n    execution(boolean OpenTypeHistory.isContainerDirty(TypeNameMatch)) &&\n    args(match);\n  \n  ClassFile around(PackageFragment parent, String name) : \n    classFileCreations(parent, name) {\n\n    ClassFile javaClassFile = proceed(parent, name);\n    byte[] bytes;\n    \n    try {\n      bytes = javaClassFile.getBytes();\n    } catch(Throwable t) {\n      return javaClassFile; \n    }\n    \n    for (IClassFileProvider provider : ClassFileProviderRegistry.getInstance().getProviders()) {\n      ClassFile cf = provider.create(bytes, parent, name);\n      if (cf != null)\n        return cf;\n    }\n    \n    return javaClassFile;\n  }\n  \n  IBuffer around(ClassFile cf, SourceMapper mapper, IBinaryType info, IClassFile owner) :\n    mapSource(cf, mapper, info, owner) {\n    return mapSourceSubst(cf, mapper, info);\n  }\n\n  IBuffer around(ClassFile cf, SourceMapper mapper, IBinaryType info) :\n    mapSource2(cf, mapper, info) {\n    return mapSourceSubst(cf, mapper, info);\n  }\n\n  IBuffer mapSourceSubst(ClassFile cf, SourceMapper mapper, IBinaryType info) {\n    char[] contents = mapper.findSource(cf.getType(), info);\n    IBuffer buffer;\n    if (contents != null) {\n      buffer = BufferManager.createBuffer(cf);\n      buffer.setContents(contents);\n    } else {\n      buffer = BufferManager.createNullBuffer(cf);\n    }\n    BufferManager bufManager = cf.getBufferManager();\n    bufManager.addBuffer(buffer);\n    buffer.addBufferChangedListener(cf);\n    return buffer;\n  }\n\n  String around(ClassFile cf) :\n    getTypeName(cf) {\n    if(cf instanceof IScalaClassFile) {\n      int lastDollar = cf.name.lastIndexOf('$');\n      return (lastDollar == -1 || lastDollar == cf.name.length()-1) ? cf.name : Util.localTypeName(cf.name, lastDollar, cf.name.length());\n    } else\n      return proceed(cf);\n  }\n  \n  boolean around(Viewer viewer, Object parentElement, Object element) :\n    select(viewer, parentElement, element) {\n    if (element instanceof IScalaClassFile) {\n      IClassFile classFile = (IClassFile) element;\n      String name = classFile.getElementName(); \n      int dollarIndex = name.indexOf('$');\n      return dollarIndex == -1 || dollarIndex == name.length()-7; \/\/ Trailing '$' implies object rather than inner class \n    }\n    return proceed(viewer, parentElement, element);\n  }\n  \n  IJavaElement[] around(BinaryType bt) throws JavaModelException :\n    getChildren(bt) && \n    target(BinaryType) {\n    ClassFile cf = (ClassFile)bt.parent;\n    if (cf instanceof IScalaClassFile)\n      return cf.getChildren();\n    else\n      return proceed(bt);\n  }\n  \n  CompilationUnit around(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) :\n    getAST(element, waitFlag, progressMonitor) {\n      if (element instanceof IScalaElement)\n        return null;\n      else\n        return proceed(element, waitFlag, progressMonitor);\n  }\n  \n  void around(HierarchyResolver hr, IGenericType suppliedType) :\n    resolve(hr, suppliedType) {\n    if (!suppliedType.isBinaryType()) {\n      IType tpe = ((SourceTypeElementInfo)suppliedType).getHandle();\n      IClassFile cf = tpe.getClassFile();\n      if (cf instanceof IScalaClassFile) {\n        hr.resolve(new Openable[]{(Openable)cf}, new HashSet(), null);\n        return;\n      }\n    }\n      \n    proceed(hr, suppliedType);\n  }\n  \n  void around(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    remember(hr, type, typeBinding) {\n    if (((IOpenable)type.getCompilationUnit()).isOpen()) {\n      try {\n        IGenericType genericType = (IGenericType)((JavaElement)type).getElementInfo();\n        hr.remember(genericType, typeBinding);\n      } catch (JavaModelException e) {\n        \/\/ cannot happen since element is open\n        return;\n      }\n    } else {\n      if (typeBinding == null) return;\n\n      TypeDeclaration typeDeclaration = ((SourceTypeBinding)typeBinding).scope.referenceType();\n\n      \/\/ simple super class name\n      char[] superclassName = null;\n      TypeReference superclass;\n      if ((typeDeclaration.bits & ASTNode.IsAnonymousType) != 0) {\n        superclass = typeDeclaration.allocation.type;\n      } else {\n        superclass = typeDeclaration.superclass;\n      }\n      if (superclass != null) {\n        char[][] typeName = superclass.getTypeName();\n        superclassName = typeName == null ? null : typeName[typeName.length-1];\n      }\n\n      \/\/ simple super interface names\n      char[][] superInterfaceNames = null;\n      TypeReference[] superInterfaces = typeDeclaration.superInterfaces;\n      if (superInterfaces != null) {\n        int length = superInterfaces.length;\n        superInterfaceNames = new char[length][];\n        for (int i = 0; i < length; i++) {\n          TypeReference superInterface = superInterfaces[i];\n          char[][] typeName = superInterface.getTypeName();\n          superInterfaceNames[i] = typeName[typeName.length-1];\n        }\n      }\n\n      HierarchyType hierarchyType = new HierarchyType(\n        type,\n        typeDeclaration.name,\n        typeDeclaration.binding.modifiers,\n        superclassName,\n        superInterfaceNames);\n      hr.remember(hierarchyType, typeDeclaration.binding);\n    }\n  }\n  \n  String around(BinaryType bt) :\n    getSourceFileName(bt) {\n    IJavaElement parent = bt.getTypeRoot(); \n    if (parent instanceof IScalaClassFile) {\n      return ((IScalaClassFile)parent).getSourceFileName();\n    }\n    else\n      return proceed(bt);\n  }\n  \n  boolean around(IType type, int acceptFlags, boolean isSourceType) :\n    acceptType(type, acceptFlags, isSourceType) {\n    if (!isSourceType && (type instanceof SourceType)) {\n      IJavaElement parent = type.getParent(); \n      if (parent instanceof IScalaClassFile)\n        return proceed(type, acceptFlags, true);\n    }\n    \n    return proceed(type, acceptFlags, isSourceType);\n  }\n  \n  CompilationUnitDeclaration around(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) throws JavaModelException :\n    convert(stc, sourceTypes, compilationResult) {\n    stc.unit = new CompilationUnitDeclaration(stc.problemReporter, compilationResult, 0);\n    \/\/ not filled at this point\n\n    if (sourceTypes.length == 0) return stc.unit;\n    SourceTypeElementInfo topLevelTypeInfo = (SourceTypeElementInfo) sourceTypes[0];\n    org.eclipse.jdt.core.ICompilationUnit cuHandle = topLevelTypeInfo.getHandle().getCompilationUnit();\n    stc.cu = (ICompilationUnit) cuHandle;\n\n    CompilationUnitElementInfo cuei = null;\n    Object info = ((JavaElement)stc.cu).getElementInfo();\n    if (info instanceof CompilationUnitElementInfo)\n      cuei = (CompilationUnitElementInfo)info;\n    \n    \n    if (stc.has1_5Compliance && cuei != null && cuei.annotationNumber > 10) { \/\/ experimental value\n      \/\/ if more than 10 annotations, diet parse as this is faster\n      return new Parser(stc.problemReporter, true).dietParse(stc.cu, compilationResult);\n    }\n\n    \/* only positions available *\/\n    int start = topLevelTypeInfo.getNameSourceStart();\n    int end = topLevelTypeInfo.getNameSourceEnd();\n\n    \/* convert package and imports *\/\n    String[] packageName = ((PackageFragment) cuHandle.getParent()).names;\n    if (packageName.length > 0)\n      \/\/ if its null then it is defined in the default package\n      stc.unit.currentPackage =\n        stc.createImportReference(packageName, start, end, false, ClassFileConstants.AccDefault);\n    IImportDeclaration[] importDeclarations = topLevelTypeInfo.getHandle().getCompilationUnit().getImports();\n    int importCount = importDeclarations.length;\n    stc.unit.imports = new ImportReference[importCount];\n    for (int i = 0; i < importCount; i++) {\n      ImportDeclaration importDeclaration = (ImportDeclaration) importDeclarations[i];\n      ISourceImport sourceImport = (ISourceImport) importDeclaration.getElementInfo();\n      String nameWithoutStar = importDeclaration.getNameWithoutStar();\n      stc.unit.imports[i] = stc.createImportReference(\n        Util.splitOn('.', nameWithoutStar, 0, nameWithoutStar.length()),\n        sourceImport.getDeclarationSourceStart(),\n        sourceImport.getDeclarationSourceEnd(),\n        importDeclaration.isOnDemand(),\n        sourceImport.getModifiers());\n    }\n    \/* convert type(s) *\/\n    try {\n      int typeCount = sourceTypes.length;\n      final TypeDeclaration[] types = new TypeDeclaration[typeCount];\n      \/*\n       * We used a temporary types collection to prevent this.unit.types from being null during a call to\n       * convert(...) when the source is syntactically incorrect and the parser is flushing the unit's types.\n       * See https:\/\/bugs.eclipse.org\/bugs\/show_bug.cgi?id=97466\n       *\/\n      for (int i = 0; i < typeCount; i++) {\n        SourceTypeElementInfo typeInfo = (SourceTypeElementInfo) sourceTypes[i];\n        types[i] = stc.convert((SourceType) typeInfo.getHandle(), compilationResult);\n      }\n      stc.unit.types = types;\n      return stc.unit;\n    } catch (SourceTypeConverter.AnonymousMemberFound e) {\n      return new Parser(stc.problemReporter, true).parse(stc.cu, compilationResult);\n    }\n  }\n  \n  IJavaElement around(JavaElement je, int ancestorType) :\n    getAncestor(je, ancestorType) {\n    IJavaElement element = je;\n    while (element != null) {\n      if (element.getElementType() == ancestorType)\n        return element;\n      else if (element instanceof IScalaClassFile && ancestorType == IJavaElement.COMPILATION_UNIT)\n        return ((JavaElement)element).getCompilationUnit();\n      element= element.getParent();\n    }\n    return null;\n  }\n\n  boolean around(TypeNameMatch match) :\n    isContainerDirty(match) {\n    org.eclipse.jdt.core.ICompilationUnit cu = match.getType().getCompilationUnit();\n    if (cu == null) {\n      return false;\n    }\n    IResource resource= cu.getResource();\n    if (resource == null)\n      return false;\n    \n    ITextFileBufferManager manager= FileBuffers.getTextFileBufferManager();\n    ITextFileBuffer textFileBuffer= manager.getTextFileBuffer(resource.getFullPath(), LocationKind.IFILE);\n    if (textFileBuffer != null) {\n      return textFileBuffer.isDirty();\n    }\n    return false;\n  }\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"6f005be62d71b7cf5224feee6779ef84ab86d785","subject":"[uncleanup] Adding back junk.","message":"[uncleanup] Adding back junk.\n","repos":"xwiki\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform,pbondoer\/xwiki-platform","old_file":"xwiki-platform-core\/xwiki-platform-legacy\/xwiki-platform-legacy-oldcore\/src\/main\/aspect\/compatibility\/com\/xpn\/xwiki\/XWikiCompatibilityAspect.aj","new_file":"xwiki-platform-core\/xwiki-platform-legacy\/xwiki-platform-legacy-oldcore\/src\/main\/aspect\/compatibility\/com\/xpn\/xwiki\/XWikiCompatibilityAspect.aj","new_contents":"\/*\n * See the NOTICE file distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This is free software; you can redistribute it and\/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF site: http:\/\/www.fsf.org.\n *\/\npackage com.xpn.xwiki;\n\nimport java.io.UnsupportedEncodingException;\nimport java.io.File;\nimport java.net.URL;\nimport java.net.URLEncoder;\nimport java.util.ArrayList;\nimport java.util.HashMap;\nimport java.util.List;\nimport java.util.Map;\n\nimport org.apache.commons.lang3.StringUtils;\nimport org.xwiki.cache.CacheException;\nimport org.xwiki.cache.config.CacheConfiguration;\nimport org.xwiki.cache.eviction.LRUEvictionConfiguration;\nimport org.xwiki.context.Execution;\nimport org.xwiki.context.ExecutionContext;\nimport org.xwiki.rendering.syntax.Syntax;\nimport org.xwiki.xml.XMLUtils;\nimport org.xwiki.model.reference.EntityReference;\nimport org.xwiki.model.reference.EntityReferenceResolver;\nimport org.xwiki.model.reference.DocumentReference;\nimport org.xwiki.model.reference.WikiReference;\nimport org.xwiki.model.EntityType;\nimport org.xwiki.url.XWikiEntityURL;\n\nimport com.xpn.xwiki.cache.api.XWikiCache;\nimport com.xpn.xwiki.cache.api.XWikiCacheService;\nimport com.xpn.xwiki.cache.api.internal.XWikiCacheServiceStub;\nimport com.xpn.xwiki.cache.api.internal.XWikiCacheStub;\nimport com.xpn.xwiki.doc.XWikiDocument;\nimport com.xpn.xwiki.notify.XWikiNotificationManager;\nimport com.xpn.xwiki.objects.BaseObject;\nimport com.xpn.xwiki.objects.classes.BaseClass;\nimport com.xpn.xwiki.objects.classes.PropertyClass;\nimport com.xpn.xwiki.plugin.query.QueryPlugin;\nimport com.xpn.xwiki.plugin.query.XWikiCriteria;\nimport com.xpn.xwiki.plugin.query.XWikiQuery;\nimport com.xpn.xwiki.util.Util;\nimport com.xpn.xwiki.web.Utils;\nimport com.xpn.xwiki.web.XWikiMessageTool;\nimport com.xpn.xwiki.web.XWikiRequest;\n\n\/**\n * Add a backward compatibility layer to the {@link com.xpn.xwiki.XWiki} class.\n * \n * @version $Id$\n *\/\npublic privileged aspect XWikiCompatibilityAspect\n{\n    private static Map XWiki.threadMap = new HashMap();\n\n    private XWikiNotificationManager XWiki.notificationManager;\n\n    private EntityReferenceResolver<EntityReference> XWiki.defaultReferenceEntityReferenceResolver = Utils.getComponent(\n        EntityReferenceResolver.TYPE_REFERENCE);\n\n    \/**\n     * Transform a text in a URL compatible text\n     *\n     * @param content text to transform\n     * @return encoded result\n     * @deprecated replaced by Util#encodeURI since 1.3M2\n     *\/\n    @Deprecated\n    public String XWiki.getURLEncoded(String content)\n    {\n        try {\n            return URLEncoder.encode(content, this.getEncoding());\n        } catch (UnsupportedEncodingException e) {\n            return content;\n        }\n    }\n\n    \/**\n     * @return true for multi-wiki\/false for mono-wiki\n     * @deprecated replaced by {@link XWiki#isVirtualMode()} since 1.4M1.\n     *\/\n    @Deprecated\n    public boolean XWiki.isVirtual()\n    {\n        return this.isVirtualMode();\n    }\n\n    \/**\n     * @deprecated Removed since it isn't used; since 1.5M1.\n     *\/\n    @Deprecated\n    public static Map XWiki.getThreadMap()\n    {\n        return XWiki.threadMap;\n    }\n\n    \/**\n     * @deprecated Removed since it isn't used; since 1.5M1.\n     *\/\n    @Deprecated\n    public static void XWiki.setThreadMap(Map threadMap)\n    {\n        XWiki.threadMap = threadMap;\n    }\n\n    \/**\n     * @return the cache service.\n     * @deprecated replaced by {@link XWiki#getCacheFactory(XWikiContext)} or\n     *             {@link XWiki#getLocalCacheFactory(XWikiContext)} since 1.5M2.\n     *\/\n    @Deprecated\n    public XWikiCacheService XWiki.getCacheService()\n    {\n        return new XWikiCacheServiceStub(getCacheFactory(), getLocalCacheFactory());\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getVirtualWikiCache(XWikiContext)} since 1.5M2.\n     *\/\n    @Deprecated\n    public XWikiCache XWiki.getVirtualWikiMap()\n    {\n        return new XWikiCacheStub(this.virtualWikiMap);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpaceCopyright(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebCopyright(XWikiContext context)\n    {\n        return this.getSpaceCopyright(context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, String defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, String, String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, String space, String defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, space, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsLong(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public long XWiki.getWebPreferenceAsLong(String preference, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsLong(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsLong(String, long, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public long XWiki.getWebPreferenceAsLong(String preference, long defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsLong(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsInt(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.getWebPreferenceAsInt(String preference, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsInt(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsInt(String, int, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.getWebPreferenceAsInt(String preference, int defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsInt(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#copySpaceBetweenWikis(String, String, String, String, XWikiContext)} since\n     *             2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.copyWikiWeb(String space, String sourceWiki, String targetWiki, String language, XWikiContext context)\n        throws XWikiException\n    {\n        return this.copySpaceBetweenWikis(space, sourceWiki, targetWiki, language, context);\n    }\n\n    \/**\n     * @deprecated replaced by\n     *             {@link XWiki#copySpaceBetweenWikis(String, String, String, String, boolean, XWikiContext)} since\n     *             2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.copyWikiWeb(String space, String sourceWiki, String targetWiki, String language, boolean clean,\n        XWikiContext context) throws XWikiException\n    {\n        return this.copySpaceBetweenWikis(space, sourceWiki, targetWiki, language, clean, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getDefaultSpace(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getDefaultWeb(XWikiContext context)\n    {\n        return this.getDefaultSpace(context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#skipDefaultSpaceInURLs(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public boolean XWiki.useDefaultWeb(XWikiContext context)\n    {\n        return this.skipDefaultSpaceInURLs(context);\n    }\n\n    \/**\n     * @deprecated use {@link XWikiMessageTool#get(String, List)} instead. You can access message tool using\n     *             {@link XWikiContext#getMessageTool()}.\n     *\/\n    @Deprecated\n    public String XWiki.getMessage(String item, XWikiContext context)\n    {\n        XWikiMessageTool msg = context.getMessageTool();\n        if (msg == null) {\n            return item;\n        } else {\n            return msg.get(item);\n        }\n    }\n\n    \/**\n     * @deprecated Removed since it isn't used; since 3.1M2.\n     *\/\n    @Deprecated\n    public String XWiki.getHTMLArea(String content, XWikiContext context)\n    {\n        StringBuilder result = new StringBuilder();\n\n        String scontent = XMLUtils.escape(content);\n        scontent = scontent.replaceAll(\"\\r?+\\n\", \"<br class=\\\"htmlarea\\\"\/>\");\n\n        result.append(\"<textarea name=\\\"content\\\" id=\\\"content\\\" rows=\\\"25\\\" cols=\\\"80\\\">\");\n        result.append(scontent);\n        result.append(\"<\/textarea>\");\n\n        return result.toString();\n    }\n\n    @Deprecated\n    public XWikiNotificationManager XWiki.getNotificationManager()\n    {\n        if (this.notificationManager == null) {\n          this.notificationManager = new XWikiNotificationManager();\n        }\n\n        return this.notificationManager;\n    }\n\n    @Deprecated\n    public void XWiki.setNotificationManager(XWikiNotificationManager notificationManager)\n    {\n        this.notificationManager = notificationManager;\n    }\n    \n    @Deprecated\n    public String XWiki.displaySearch(String fieldname, String className, XWikiCriteria criteria, XWikiContext context)\n        throws XWikiException\n    {\n        return displaySearch(fieldname, className, \"\", criteria, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearch(String fieldname, String className, XWikiContext context) throws XWikiException\n    {\n        return displaySearch(fieldname, className, \"\", new XWikiCriteria(), context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearch(String fieldname, String className, String prefix, XWikiCriteria criteria,\n        XWikiContext context) throws XWikiException\n    {\n        BaseClass bclass = getDocument(className, context).getXClass();\n        PropertyClass pclass = (PropertyClass) bclass.get(fieldname);\n        if (criteria == null) {\n            criteria = new XWikiCriteria();\n        }\n\n        if (pclass == null) {\n            return \"\";\n        } else {\n            return pclass.displaySearch(fieldname, prefix + className + \"_\", criteria, context);\n        }\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchColumns(String className, XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        return displaySearchColumns(className, \"\", query, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchColumns(String className, String prefix, XWikiQuery query, XWikiContext context)\n        throws XWikiException\n    {\n        BaseClass bclass = getDocument(className, context).getXClass();\n\n        if (query == null) {\n            query = new XWikiQuery();\n        }\n\n        return bclass.displaySearchColumns(className + \"_\" + prefix, query, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchOrder(String className, XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        return displaySearchOrder(className, \"\", query, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchOrder(String className, String prefix, XWikiQuery query, XWikiContext context)\n        throws XWikiException\n    {\n        BaseClass bclass = getDocument(className, context).getXClass();\n\n        if (query == null) {\n            query = new XWikiQuery();\n        }\n\n        return bclass.displaySearchOrder(className + \"_\" + prefix, query, context);\n    }\n\n    @Deprecated\n    public <T> List<T> XWiki.search(XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        QueryPlugin qp = (QueryPlugin) getPlugin(\"query\", context);\n        if (qp == null) {\n            return null;\n        }\n\n        return qp.search(query);\n    }\n\n    @Deprecated\n    public XWikiQuery XWiki.createQueryFromRequest(String className, XWikiContext context) throws XWikiException\n    {\n        return new XWikiQuery(context.getRequest(), className, context);\n    }\n\n    @Deprecated\n    public String XWiki.searchAsTable(XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        QueryPlugin qp = (QueryPlugin) getPlugin(\"query\", context);\n        if (qp == null) {\n            return null;\n        }\n\n        List<String> list = qp.search(query);\n        String result = \"{table}\\r\\n\";\n        List<String> headerColumns = new ArrayList<String>();\n        List<String> displayProperties = query.getDisplayProperties();\n        for (String propname : displayProperties) {\n            PropertyClass pclass = getPropertyClassFromName(propname, context);\n            if (pclass != null) {\n                headerColumns.add(pclass.getPrettyName());\n            } else {\n                if (propname.startsWith(\"doc.\")) {\n                    propname = propname.substring(4);\n                    headerColumns.add(XWikiDocument.getInternalPropertyName(propname, context));\n                } else {\n                    headerColumns.add(propname);\n                }\n\n            }\n        }\n\n        result += StringUtils.join(headerColumns.toArray(), \" | \") + \"\\r\\n\";\n        for (String docname : list) {\n            List<String> rowColumns = new ArrayList<String>();\n            XWikiDocument doc = getDocument(docname, context);\n            for (String propname : displayProperties) {\n                PropertyClass pclass = getPropertyClassFromName(propname, context);\n                if (pclass == null) {\n                    if (propname.startsWith(\"doc.\")) {\n                        propname = propname.substring(4);\n                    }\n                    String value = doc.getInternalProperty(propname);\n                    rowColumns.add((value == null) ? \" \" : value);\n                } else {\n                    BaseObject bobj = doc.getObject(pclass.getObject().getName());\n                    rowColumns.add(doc.display(pclass.getName(), \"view\", bobj, context));\n                }\n            }\n            result += StringUtils.join(rowColumns.toArray(), \" | \") + \"\\r\\n\";\n        }\n\n        result += \"{table}\\r\\n\";\n\n        return result;\n    }\n\n    @Deprecated\n    public String XWiki.getDocLanguagePreference(XWikiContext context)\n    {\n        return getLanguagePreference(context);\n    }\n\n    @Deprecated\n    public void XWiki.flushCache()\n    {\n        Execution execution = Utils.getComponent(Execution.class);\n\n        ExecutionContext ec = execution.getContext();\n\n        flushCache(ec != null ? (XWikiContext) ec.getProperty(\"xwikicontext\") : null);\n    }\n\n    \/**\n     * @deprecated use WikiManager plugin instead\n     *\/\n    @Deprecated\n    public int XWiki.createNewWiki(String wikiName, String wikiUrl, String wikiAdmin, String baseWikiName,\n        String description, String wikilanguage, boolean failOnExist, XWikiContext context) throws XWikiException\n    {\n        String database = context.getDatabase();\n        wikiName = wikiName.toLowerCase();\n\n        try {\n            XWikiDocument userdoc = getDocument(wikiAdmin, context);\n\n            \/\/ User does not exist\n            if (userdoc.isNew()) {\n                if (LOGGER.isErrorEnabled()) {\n                    LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"user does not exist\");\n                }\n                return -2;\n            }\n\n            \/\/ User is not active\n            if (!(userdoc.getIntValue(\"XWiki.XWikiUsers\", \"active\") == 1)) {\n                if (LOGGER.isErrorEnabled()) {\n                    LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"user is not active\");\n                }\n                return -3;\n            }\n\n            String wikiForbiddenList = Param(\"xwiki.virtual.reserved_wikis\");\n            if (Util.contains(wikiName, wikiForbiddenList, \", \")) {\n                if (LOGGER.isErrorEnabled()) {\n                    LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"wiki name is forbidden\");\n                }\n                return -4;\n            }\n\n            String wikiServerPage = \"XWikiServer\" + wikiName.substring(0, 1).toUpperCase() + wikiName.substring(1);\n            \/\/ Verify is server page already exist\n            XWikiDocument serverdoc = getDocument(SYSTEM_SPACE, wikiServerPage, context);\n            if (serverdoc.isNew()) {\n                \/\/ clear entry in virtual wiki cache\n                this.virtualWikiMap.remove(wikiUrl);\n\n                \/\/ Create Wiki Server page\n                serverdoc.setStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"server\", wikiUrl);\n                serverdoc.setStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"owner\", wikiAdmin);\n                if (description != null) {\n                    serverdoc.setLargeStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"description\", description);\n                }\n                if (wikilanguage != null) {\n                    serverdoc.setStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"language\", wikilanguage);\n                }\n                if (!getDefaultDocumentSyntax().equals(Syntax.XWIKI_1_0.toIdString())) {\n                    serverdoc.setContent(\"{{include document=\\\"XWiki.XWikiServerForm\\\"\/}}\\n\");\n                    serverdoc.setSyntax(Syntax.XWIKI_2_0);\n                } else {\n                    serverdoc.setContent(\"#includeForm(\\\"XWiki.XWikiServerForm\\\")\\n\");\n                    serverdoc.setSyntax(Syntax.XWIKI_1_0);\n                }\n                serverdoc.setParentReference(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE);\n                saveDocument(serverdoc, context);\n            } else {\n                \/\/ If we are not allowed to continue if server page already exists\n                if (failOnExist) {\n                    if (LOGGER.isErrorEnabled()) {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki server page already exists\");\n                    }\n                    return -5;\n                } else if (LOGGER.isWarnEnabled()) {\n                    LOGGER.warn(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"wiki server page already exists\");\n                }\n            }\n\n            \/\/ Create wiki database\n            try {\n                context.setDatabase(getDatabase());\n                getStore().createWiki(wikiName, context);\n            } catch (XWikiException e) {\n                if (LOGGER.isErrorEnabled()) {\n                    if (e.getCode() == 10010) {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki database already exists\");\n                    } else if (e.getCode() == 10011) {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki database creation failed\");\n                    } else {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki database creation threw exception\", e);\n                    }\n                }\n            } catch (Exception e) {\n                LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                    + \"wiki database creation threw exception\", e);\n            }\n\n            try {\n                updateDatabase(wikiName, true, false, context);\n            } catch (Exception e) {\n                LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                    + \"wiki database shema update threw exception\", e);\n                return -6;\n            }\n\n            \/\/ Copy base wiki\n            int nb = copyWiki(baseWikiName, wikiName, wikilanguage, context);\n            \/\/ Save the number of docs copied in the context\n            context.put(\"nbdocs\", Integer.valueOf(nb));\n\n            \/\/ Create user page in his wiki\n            \/\/ Let's not create it anymore.. this makes the creator loose\n            \/\/ super admin rights on his wiki\n            \/\/ copyDocument(wikiAdmin, getDatabase(), wikiName, wikilanguage, context);\n\n            \/\/ Modify rights in user wiki\n            context.setDatabase(wikiName);\n            \/*\n             * XWikiDocument wikiprefdoc = getDocument(\"XWiki.XWikiPreferences\", context);\n             * wikiprefdoc.setStringValue(\"XWiki.XWikiGlobalRights\", \"users\", wikiAdmin);\n             * wikiprefdoc.setStringValue(\"XWiki.XWikiGlobalRights\", \"levels\", \"admin, edit\");\n             * wikiprefdoc.setIntValue(\"XWiki.XWikiGlobalRights\", \"allow\", 1); saveDocument(wikiprefdoc, context);\n             *\/\n            return 1;\n        } catch (Exception e) {\n            LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                + \"wiki creation threw exception\", e);\n            return -10;\n        } finally {\n            context.setDatabase(database);\n        }\n    }\n\n    \/**\n     * Get the XWiki temporary filesystem directory (cleaned up automatically by XWiki).\n     *\n     * @param context\n     * @return temporary directory\n     * @since 1.1 Milestone 4\n     * @deprecated starting with 4.2M1 use {@link org.xwiki.environment.Environment#getTemporaryDirectory()}\n     *\/\n    @Deprecated\n    public File XWiki.getTempDirectory(XWikiContext context)\n    {\n        return this.environment.getTemporaryDirectory();\n    }\n\n    \/**\n     * Get a new directory in the xwiki work directory\n     *\n     * @param subdir desired directory name\n     * @param context\n     * @return work subdirectory\n     * @since 1.1 Milestone 4\n     * @deprecated starting with 4.2M1 use {@link org.xwiki.environment.Environment#getPermanentDirectory()}\n     *\/\n    @Deprecated\n    public File XWiki.getWorkSubdirectory(String subdir, XWikiContext context)\n    {\n        File fdir = new File(this.environment.getPermanentDirectory().getAbsolutePath(), subdir);\n        if (!fdir.exists()) {\n            fdir.mkdir();\n        }\n\n        return fdir;\n    }\n\n    \/**\n     * Get the XWiki work directory\n     *\n     * @param context\n     * @return work directory\n     * @since 1.1 Milestone 4\n     * @deprecated starting with 4.2M1 use {@link org.xwiki.environment.Environment#getPermanentDirectory()}\n     *\/\n    @Deprecated\n    public File XWiki.getWorkDirectory(XWikiContext context)\n    {\n        return this.environment.getPermanentDirectory();\n    }\n\n    \/**\n     * @deprecated starting with 5.1M1 use {@code org.xwiki.url.XWikiURLFactory} instead and starting with 5.3M1 use\n     *             {@link ResourceFactory}\n     *\/\n    @Deprecated\n    public XWikiDocument XWiki.getDocumentFromPath(String path, XWikiContext context) throws XWikiException\n    {\n        return getDocument(getDocumentReferenceFromPath(path, context), context);\n    }\n\n    \/**\n     * @since 2.3M1\n     * @deprecated starting with 5.1M1 use {@code org.xwiki.url.XWikiURLFactory} instead and starting with 5.3M1 use\n     *             {@link ResourceFactory}\n     *\/\n    @Deprecated\n    public DocumentReference XWiki.getDocumentReferenceFromPath(String path, XWikiContext context)\n    {\n        \/\/ TODO: Remove this and use XWikiURLFactory instead in XWikiAction and all entry points.\n        List<String> segments = new ArrayList<String>();\n        for (String segment : path.split(\"\/\", -1)) {\n            segments.add(Util.decodeURI(segment, context));\n        }\n        \/\/ Remove the first segment if it's empty to cater for cases when the path starts with \"\/\"\n        if (segments.size() > 0 && segments.get(0).length() == 0) {\n            segments.remove(0);\n        }\n\n        XWikiEntityURL entityURL = buildEntityURLFromPathSegments(new WikiReference(context.getDatabase()), segments);\n\n        return new DocumentReference(entityURL.getEntityReference().extractReference(EntityType.DOCUMENT));\n    }\n\n    \/**\n     * @deprecated since 2.3M1 use {@link #getDocumentReferenceFromPath(String, XWikiContext)} instead\n     *\/\n    @Deprecated\n    public String XWiki.getDocumentNameFromPath(String path, XWikiContext context)\n    {\n        return this.localStringEntityReferenceSerializer.serialize(getDocumentReferenceFromPath(path, context));\n    }\n\n    \/**\n     * @deprecated since 2.3M1 use {@link #getDocumentReferenceFromPath(String, XWikiContext)} instead\n     *\/\n    @Deprecated\n    public String XWiki.getDocumentName(XWikiRequest request, XWikiContext context)\n    {\n        return this.localStringEntityReferenceSerializer.serialize(getDocumentReference(request, context));\n    }\n\n    \/**\n     * @deprecated starting with 5.1M1 use {@code org.xwiki.url.XWikiURLFactory} instead and starting with 5.3M1 use\n     *             {@link ResourceFactory}\n     *\/\n    @Deprecated\n    private XWikiEntityURL XWiki.buildEntityURLFromPathSegments(WikiReference wikiReference, List<String> pathSegments)\n    {\n        XWikiEntityURL entityURL;\n\n        \/\/ Rules based on counting the url segments:\n        \/\/ - 0 segments (e.g. \"\"): default document reference, \"view\" action\n        \/\/ - 1 segment (e.g. \"\/\", \"\/Document\"): default space, specified document (and default if empty), \"view\" action\n        \/\/ - 2 segments (e.g. \"\/Space\/\", \"\/Space\/Document\"): specified space, document (and default doc if empty),\n        \/\/   \"view\" action\n        \/\/ - 3 segments (e.g. \"\/action\/Space\/Document\"): specified space, document (and default doc if empty),\n        \/\/   specified action\n        \/\/ - 4 segments (e.g. \"\/download\/Space\/Document\/attachment\"): specified space, document and attachment (and\n        \/\/   default doc if empty), \"download\" action\n        \/\/ - 4 segments or more (e.g. \"\/action\/Space\/Document\/whatever\/else\"): specified space, document (and default\n        \/\/     doc if empty), specified \"action\" (if action != \"download\"), trailing segments ignored\n\n        String spaceName = null;\n        String pageName = null;\n        String attachmentName = null;\n        String action = \"view\";\n\n        if (pathSegments.size() == 1) {\n            pageName = pathSegments.get(0);\n        } else if (pathSegments.size() == 2) {\n            spaceName = pathSegments.get(0);\n            pageName = pathSegments.get(1);\n        } else if (pathSegments.size() >= 3) {\n            action = pathSegments.get(0);\n            spaceName = pathSegments.get(1);\n            pageName = pathSegments.get(2);\n            if (action.equals(\"download\") && pathSegments.size() >= 4) {\n                attachmentName = pathSegments.get(3);\n            }\n        }\n\n        \/\/ Normalize the extracted space\/page to resolve empty\/null values and replace them with default values.\n        EntityReference reference = wikiReference;\n        EntityType entityType = EntityType.DOCUMENT;\n        if (!StringUtils.isEmpty(spaceName)) {\n            reference = new EntityReference(spaceName, EntityType.SPACE, reference);\n        }\n        if (!StringUtils.isEmpty(pageName)) {\n            reference = new EntityReference(pageName, EntityType.DOCUMENT, reference);\n        }\n        if (!StringUtils.isEmpty(attachmentName)) {\n            reference = new EntityReference(attachmentName, EntityType.ATTACHMENT, reference);\n            entityType = EntityType.ATTACHMENT;\n        }\n        reference = this.defaultReferenceEntityReferenceResolver.resolve(reference, entityType);\n\n        entityURL = new XWikiEntityURL(reference);\n        entityURL.setAction(action);\n\n        return entityURL;\n    }\n\n    \/**\n     * Extracts the name of the wiki from a context's request. In some cases, including autowww, the main wiki may be\n     * returned instead of what was requested, as a result of some assumptions. Even so, the resulting wiki name is not\n     * guaranteed to exist, it is just what XWiki understood from the request.\n     *\n     * @param context the context which contains the request\n     * @return the name of the wiki that was requested\n     * @throws XWikiException if problems occur\n     * @deprecated starting with 5.2M1 use {@link ResourceFactory} instead\n     *\/\n    @Deprecated\n    public String XWiki.getRequestWikiName(XWikiContext context) throws XWikiException\n    {\n        \/\/ Host is full.host.name in DNS-based multiwiki, and wikiname in path-based multiwiki.\n        String host = \"\";\n        \/\/ Canonical name of the wiki (database).\n        String wikiName = \"\";\n        \/\/ wikiDefinition should be the document holding the definition of the virtual wiki, a document in the main\n        \/\/ wiki with a XWiki.XWikiServerClass object attached to it\n        DocumentReference wikiDefinition;\n\n        XWikiRequest request = context.getRequest();\n        try {\n            URL requestURL = context.getURL();\n            host = requestURL.getHost();\n        } catch (Exception e) {\n        }\n\n        \/\/ In path-based multi-wiki, the wiki name is an element of the request path.\n        \/\/ The url is in the form \/xwiki (app name)\/wiki (servlet name)\/wikiname\/\n        if (\"1\".equals(this.Param(\"xwiki.virtual.usepath\", \"1\"))) {\n            String uri = request.getRequestURI();\n            if (LOGGER.isDebugEnabled()) {\n                LOGGER.debug(\"Request uri is: \" + uri);\n            }\n            \/\/ Remove the (eventual) context path from the URI, usually \/xwiki\n            uri = stripSegmentFromPath(uri, request.getContextPath());\n            \/\/ Remove the (eventual) servlet path from the URI, usually \/wiki\n            String servletPath = request.getServletPath();\n            uri = stripSegmentFromPath(uri, servletPath);\n\n            if (servletPath.equals(\"\/\" + this.Param(\"xwiki.virtual.usepath.servletpath\", \"wiki\"))) {\n                \/\/ Requested path corresponds to a path-based wiki, now the wiki name is between the first and\n                \/\/ second \"\/\"\n                host = StringUtils.substringBefore(StringUtils.removeStart(uri, \"\/\"), \"\/\");\n            }\n        }\n\n        if (StringUtils.isEmpty(host) || host.equals(context.getMainXWiki())) {\n            \/\/ Can't find any wiki name, return the main wiki\n            return context.getMainXWiki();\n        }\n\n        \/\/ Try to use the full domain name\/path wiki name and see if it corresponds to any existing wiki descriptors\n        wikiDefinition = this.findWikiServer(host, context);\n\n        if (wikiDefinition == null) {\n            \/\/ No definition found based on the full domain name\/path wiki name, try to use the first part of the domain\n            \/\/ name as the wiki name\n            String servername = StringUtils.substringBefore(host, \".\");\n\n            \/\/ Note: Starting 5.0M2, the autowww behavior is default and the ability to disable it is now removed.\n            if (\"0\".equals(this.Param(\"xwiki.virtual.autowww\"))) {\n                LOGGER.warn(String.format(\"%s %s\", \"'xwiki.virtual.autowww' is no longer supported.\",\n                    \"Please update your configuration and\/or see XWIKI-8877 for more details.\"));\n            }\n\n            \/\/ As a convenience, we do not require the creation of an xwiki:XWiki.XWikiServerXwiki page for the main\n            \/\/ wiki and automatically go to the main wiki in certain cases:\n            \/\/ - \"www.<anyDomain>.<domainExtension>\" - if it starts with www, we first check if a subwiki with that\n            \/\/ name exists; if yes, the go to the \"www\" subwiki, if not, go to the main wiki\n            \/\/ - \"localhost\"\n            \/\/ - IP address\n            if (\"www\".equals(servername)) {\n                \/\/ Check that \"www\" is not actually the name of an existing subwiki.\n                wikiDefinition = this.findWikiServer(servername, context);\n                if (wikiDefinition == null) {\n                    \/\/ Not the case, use the main wiki.\n                    return context.getMainXWiki();\n                }\n            } else if (\"localhost\".equals(host) || host.matches(\"[0-9]{1,3}(?:\\\\.[0-9]{1,3}){3}\")) {\n                \/\/ Direct access to the main wiki.\n                return context.getMainXWiki();\n            }\n\n            \/\/ Use the name from the subdomain\n            wikiName = servername;\n\n            if (!context.isMainWiki(wikiName)\n                && !\"1\".equals(context.getWiki().Param(\"xwiki.virtual.failOnWikiDoesNotExist\", \"0\"))) {\n                \/\/ Check if the wiki really exists\n                if (!exists(getServerWikiPage(wikiName), context)) {\n                    \/\/ Fallback on main wiki\n                    wikiName = context.getMainXWiki();\n                }\n            }\n        } else {\n            \/\/ Use the name from the located wiki descriptor\n            wikiName = StringUtils.removeStart(wikiDefinition.getName(), \"XWikiServer\").toLowerCase();\n        }\n\n        return wikiName;\n    }\n\n    \/**\n     * Searches for the document containing the definition of the virtual wiki corresponding to the specified hostname.\n     *\n     * @param host the hostname, as specified in the request (for example: {@code forge.xwiki.org})\n     * @param context the current context\n     * @return the name of the document containing the wiki definition, or {@code null} if no wiki corresponds to the\n     *         hostname\n     * @throws XWikiException if a problem occurs while searching the storage\n     *\/\n    private DocumentReference XWiki.findWikiServer(String host, XWikiContext context) throws XWikiException\n    {\n        ensureVirtualWikiMapExists();\n        DocumentReference wikiName = this.virtualWikiMap.get(host);\n\n        if (wikiName == null) {\n            \/\/ Not loaded yet, search for it in the main wiki\n            String hql =\n                \", BaseObject as obj, StringProperty as prop WHERE obj.name=doc.fullName\"\n                    + \" AND doc.space='XWiki' AND doc.name LIKE 'XWikiServer%'\"\n                    + \" AND obj.className='XWiki.XWikiServerClass' AND prop.id.id = obj.id\"\n                    + \" AND prop.id.name = 'server' AND prop.value=?\";\n            List<String> parameters = new ArrayList<String>(1);\n            parameters.add(host);\n            try {\n                List<DocumentReference> list =\n                    context.getWiki().getStore().searchDocumentReferences(hql, parameters, context);\n                if ((list != null) && (list.size() > 0)) {\n                    wikiName = list.get(0);\n                }\n\n                this.virtualWikiMap.set(host, wikiName);\n            } catch (XWikiException e) {\n                LOGGER.warn(\"Error when searching for wiki name from URL host [\" + host + \"]\", e);\n            }\n        }\n\n        return wikiName;\n    }\n\n    private void XWiki.ensureVirtualWikiMapExists() throws XWikiException\n    {\n        synchronized (this) {\n            if (this.virtualWikiMap == null) {\n                int iCapacity = 1000;\n                try {\n                    String capacity = Param(\"xwiki.virtual.cache.capacity\");\n                    if (capacity != null) {\n                        iCapacity = Integer.parseInt(capacity);\n                    }\n                } catch (Exception e) {\n                }\n                try {\n                    CacheConfiguration configuration = new CacheConfiguration();\n                    configuration.setConfigurationId(\"xwiki.virtualwikimap\");\n                    LRUEvictionConfiguration lru = new LRUEvictionConfiguration();\n                    lru.setMaxEntries(iCapacity);\n                    configuration.put(LRUEvictionConfiguration.CONFIGURATIONID, lru);\n\n                    this.virtualWikiMap = getCacheFactory().newCache(configuration);\n                } catch (CacheException e) {\n                    throw new XWikiException(XWikiException.MODULE_XWIKI_CACHE,\n                        XWikiException.ERROR_CACHE_INITIALIZING, \"Failed to create new cache\", e);\n                }\n            }\n        }\n    }\n\n    \/**\n     * @deprecated replaced by {@link #setUserDefaultGroup(String fullwikiname, XWikiContext context)}\n     * @param context\n     * @param fullwikiname\n     * @throws XWikiException\n     *\/\n    @Deprecated\n    public void XWiki.SetUserDefaultGroup(XWikiContext context, String fullwikiname) throws XWikiException\n    {\n        this.setUserDefaultGroup(fullwikiname, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link #protectUserPage(String,String,XWikiDocument,XWikiContext)}\n     * @param context\n     * @param fullwikiname\n     * @param userRights\n     * @param doc\n     * @throws XWikiException\n     *\/\n    @Deprecated\n    public void XWiki.ProtectUserPage(XWikiContext context, String fullwikiname, String userRights, XWikiDocument doc)\n        throws XWikiException\n    {\n        this.protectUserPage(fullwikiname, userRights, doc, context);\n    }\n}\n","old_contents":"\/*\n * See the NOTICE file distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This is free software; you can redistribute it and\/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF site: http:\/\/www.fsf.org.\n *\/\npackage com.xpn.xwiki;\n\nimport java.io.UnsupportedEncodingException;\nimport java.io.File;\nimport java.net.URL;\nimport java.net.URLEncoder;\nimport java.util.ArrayList;\nimport java.util.HashMap;\nimport java.util.List;\nimport java.util.Map;\n\nimport org.apache.commons.lang3.StringUtils;\nimport org.xwiki.cache.CacheException;\nimport org.xwiki.cache.config.CacheConfiguration;\nimport org.xwiki.cache.eviction.LRUEvictionConfiguration;\nimport org.xwiki.context.Execution;\nimport org.xwiki.context.ExecutionContext;\nimport org.xwiki.rendering.syntax.Syntax;\nimport org.xwiki.xml.XMLUtils;\nimport org.xwiki.model.reference.EntityReference;\nimport org.xwiki.model.reference.EntityReferenceResolver;\nimport org.xwiki.model.reference.DocumentReference;\nimport org.xwiki.model.reference.WikiReference;\nimport org.xwiki.model.EntityType;\nimport org.xwiki.url.XWikiEntityURL;\n\nimport com.xpn.xwiki.cache.api.XWikiCache;\nimport com.xpn.xwiki.cache.api.XWikiCacheService;\nimport com.xpn.xwiki.cache.api.internal.XWikiCacheServiceStub;\nimport com.xpn.xwiki.cache.api.internal.XWikiCacheStub;\nimport com.xpn.xwiki.doc.XWikiDocument;\nimport com.xpn.xwiki.notify.XWikiNotificationManager;\nimport com.xpn.xwiki.objects.BaseObject;\nimport com.xpn.xwiki.objects.classes.BaseClass;\nimport com.xpn.xwiki.objects.classes.PropertyClass;\nimport com.xpn.xwiki.plugin.query.QueryPlugin;\nimport com.xpn.xwiki.plugin.query.XWikiCriteria;\nimport com.xpn.xwiki.plugin.query.XWikiQuery;\nimport com.xpn.xwiki.util.Util;\nimport com.xpn.xwiki.web.Utils;\nimport com.xpn.xwiki.web.XWikiMessageTool;\nimport com.xpn.xwiki.web.XWikiRequest;\n\n\/**\n * Add a backward compatibility layer to the {@link com.xpn.xwiki.XWiki} class.\n * \n * @version $Id$\n *\/\npublic privileged aspect XWikiCompatibilityAspect\n{\n    private static Map XWiki.threadMap = new HashMap();\n\n    private XWikiNotificationManager XWiki.notificationManager;\n\n    private EntityReferenceResolver<EntityReference> XWiki.defaultReferenceEntityReferenceResolver = Utils.getComponent(\n        EntityReferenceResolver.TYPE_REFERENCE);\n\n    \/**\n     * Transform a text in a URL compatible text\n     *\n     * @param content text to transform\n     * @return encoded result\n     * @deprecated replaced by Util#encodeURI since 1.3M2\n     *\/\n    @Deprecated\n    public String XWiki.getURLEncoded(String content)\n    {\n        try {\n            return URLEncoder.encode(content, this.getEncoding());            \n        } catch (UnsupportedEncodingException e) {\n            return content;\n        }\n    }\n    \n    \/**\n     * @return true for multi-wiki\/false for mono-wiki\n     * @deprecated replaced by {@link XWiki#isVirtualMode()} since 1.4M1.\n     *\/\n    @Deprecated\n    public boolean XWiki.isVirtual()\n    {\n        return this.isVirtualMode();\n    }\n\n    \/**\n     * @deprecated Removed since it isn't used; since 1.5M1.\n     *\/\n    @Deprecated\n    public static Map XWiki.getThreadMap()\n    {\n        return XWiki.threadMap;\n    }\n\n    \/**\n     * @deprecated Removed since it isn't used; since 1.5M1.\n     *\/\n    @Deprecated\n    public static void XWiki.setThreadMap(Map threadMap)\n    {\n        XWiki.threadMap = threadMap;\n    }\n\n    \/**\n     * @return the cache service.\n     * @deprecated replaced by {@link XWiki#getCacheFactory(XWikiContext)} or\n     *             {@link XWiki#getLocalCacheFactory(XWikiContext)} since 1.5M2.\n     *\/\n    @Deprecated\n    public XWikiCacheService XWiki.getCacheService()\n    {\n        return new XWikiCacheServiceStub(getCacheFactory(), getLocalCacheFactory());\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getVirtualWikiCache(XWikiContext)} since 1.5M2.\n     *\/\n    @Deprecated\n    public XWikiCache XWiki.getVirtualWikiMap()\n    {\n        return new XWikiCacheStub(this.virtualWikiMap);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpaceCopyright(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebCopyright(XWikiContext context)\n    {\n        return this.getSpaceCopyright(context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, String defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, String, String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, String space, String defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, space, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsLong(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public long XWiki.getWebPreferenceAsLong(String preference, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsLong(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsLong(String, long, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public long XWiki.getWebPreferenceAsLong(String preference, long defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsLong(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsInt(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.getWebPreferenceAsInt(String preference, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsInt(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsInt(String, int, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.getWebPreferenceAsInt(String preference, int defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsInt(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#copySpaceBetweenWikis(String, String, String, String, XWikiContext)} since\n     *             2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.copyWikiWeb(String space, String sourceWiki, String targetWiki, String language, XWikiContext context)\n        throws XWikiException\n    {\n        return this.copySpaceBetweenWikis(space, sourceWiki, targetWiki, language, context);\n    }\n\n    \/**\n     * @deprecated replaced by\n     *             {@link XWiki#copySpaceBetweenWikis(String, String, String, String, boolean, XWikiContext)} since\n     *             2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.copyWikiWeb(String space, String sourceWiki, String targetWiki, String language, boolean clean,\n        XWikiContext context) throws XWikiException\n    {\n        return this.copySpaceBetweenWikis(space, sourceWiki, targetWiki, language, clean, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getDefaultSpace(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getDefaultWeb(XWikiContext context)\n    {\n        return this.getDefaultSpace(context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#skipDefaultSpaceInURLs(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public boolean XWiki.useDefaultWeb(XWikiContext context)\n    {\n        return this.skipDefaultSpaceInURLs(context);\n    }\n\n    \/**\n     * @deprecated use {@link XWikiMessageTool#get(String, List)} instead. You can access message tool using\n     *             {@link XWikiContext#getMessageTool()}.\n     *\/\n    @Deprecated\n    public String XWiki.getMessage(String item, XWikiContext context)\n    {\n        XWikiMessageTool msg = context.getMessageTool();\n        if (msg == null) {\n            return item;\n        } else {\n            return msg.get(item);\n        }\n    }\n\n    \/**\n     * @deprecated Removed since it isn't used; since 3.1M2.\n     *\/\n    @Deprecated\n    public String XWiki.getHTMLArea(String content, XWikiContext context)\n    {\n        StringBuilder result = new StringBuilder();\n\n        String scontent = XMLUtils.escape(content);\n        scontent = scontent.replaceAll(\"\\r?+\\n\", \"<br class=\\\"htmlarea\\\"\/>\");\n\n        result.append(\"<textarea name=\\\"content\\\" id=\\\"content\\\" rows=\\\"25\\\" cols=\\\"80\\\">\");\n        result.append(scontent);\n        result.append(\"<\/textarea>\");\n\n        return result.toString();\n    }\n\n    @Deprecated\n    public XWikiNotificationManager XWiki.getNotificationManager()\n    {\n        if (this.notificationManager == null) {\n          this.notificationManager = new XWikiNotificationManager();\n        }\n\n        return this.notificationManager;\n    }\n\n    @Deprecated\n    public void XWiki.setNotificationManager(XWikiNotificationManager notificationManager)\n    {\n        this.notificationManager = notificationManager;\n    }\n    \n    @Deprecated\n    public String XWiki.displaySearch(String fieldname, String className, XWikiCriteria criteria, XWikiContext context)\n        throws XWikiException\n    {\n        return displaySearch(fieldname, className, \"\", criteria, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearch(String fieldname, String className, XWikiContext context) throws XWikiException\n    {\n        return displaySearch(fieldname, className, \"\", new XWikiCriteria(), context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearch(String fieldname, String className, String prefix, XWikiCriteria criteria,\n        XWikiContext context) throws XWikiException\n    {\n        BaseClass bclass = getDocument(className, context).getXClass();\n        PropertyClass pclass = (PropertyClass) bclass.get(fieldname);\n        if (criteria == null) {\n            criteria = new XWikiCriteria();\n        }\n\n        if (pclass == null) {\n            return \"\";\n        } else {\n            return pclass.displaySearch(fieldname, prefix + className + \"_\", criteria, context);\n        }\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchColumns(String className, XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        return displaySearchColumns(className, \"\", query, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchColumns(String className, String prefix, XWikiQuery query, XWikiContext context)\n        throws XWikiException\n    {\n        BaseClass bclass = getDocument(className, context).getXClass();\n\n        if (query == null) {\n            query = new XWikiQuery();\n        }\n\n        return bclass.displaySearchColumns(className + \"_\" + prefix, query, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchOrder(String className, XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        return displaySearchOrder(className, \"\", query, context);\n    }\n\n    @Deprecated\n    public String XWiki.displaySearchOrder(String className, String prefix, XWikiQuery query, XWikiContext context)\n        throws XWikiException\n    {\n        BaseClass bclass = getDocument(className, context).getXClass();\n\n        if (query == null) {\n            query = new XWikiQuery();\n        }\n\n        return bclass.displaySearchOrder(className + \"_\" + prefix, query, context);\n    }\n\n    @Deprecated\n    public <T> List<T> XWiki.search(XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        QueryPlugin qp = (QueryPlugin) getPlugin(\"query\", context);\n        if (qp == null) {\n            return null;\n        }\n\n        return qp.search(query);\n    }\n\n    @Deprecated\n    public XWikiQuery XWiki.createQueryFromRequest(String className, XWikiContext context) throws XWikiException\n    {\n        return new XWikiQuery(context.getRequest(), className, context);\n    }\n\n    @Deprecated\n    public String XWiki.searchAsTable(XWikiQuery query, XWikiContext context) throws XWikiException\n    {\n        QueryPlugin qp = (QueryPlugin) getPlugin(\"query\", context);\n        if (qp == null) {\n            return null;\n        }\n\n        List<String> list = qp.search(query);\n        String result = \"{table}\\r\\n\";\n        List<String> headerColumns = new ArrayList<String>();\n        List<String> displayProperties = query.getDisplayProperties();\n        for (String propname : displayProperties) {\n            PropertyClass pclass = getPropertyClassFromName(propname, context);\n            if (pclass != null) {\n                headerColumns.add(pclass.getPrettyName());\n            } else {\n                if (propname.startsWith(\"doc.\")) {\n                    propname = propname.substring(4);\n                    headerColumns.add(XWikiDocument.getInternalPropertyName(propname, context));\n                } else {\n                    headerColumns.add(propname);\n                }\n\n            }\n        }\n\n        result += StringUtils.join(headerColumns.toArray(), \" | \") + \"\\r\\n\";\n        for (String docname : list) {\n            List<String> rowColumns = new ArrayList<String>();\n            XWikiDocument doc = getDocument(docname, context);\n            for (String propname : displayProperties) {\n                PropertyClass pclass = getPropertyClassFromName(propname, context);\n                if (pclass == null) {\n                    if (propname.startsWith(\"doc.\")) {\n                        propname = propname.substring(4);\n                    }\n                    String value = doc.getInternalProperty(propname);\n                    rowColumns.add((value == null) ? \" \" : value);\n                } else {\n                    BaseObject bobj = doc.getObject(pclass.getObject().getName());\n                    rowColumns.add(doc.display(pclass.getName(), \"view\", bobj, context));\n                }\n            }\n            result += StringUtils.join(rowColumns.toArray(), \" | \") + \"\\r\\n\";\n        }\n\n        result += \"{table}\\r\\n\";\n\n        return result;\n    }\n\n    @Deprecated\n    public String XWiki.getDocLanguagePreference(XWikiContext context)\n    {\n        return getLanguagePreference(context);\n    }\n\n    @Deprecated\n    public void XWiki.flushCache()\n    {\n        Execution execution = Utils.getComponent(Execution.class);\n\n        ExecutionContext ec = execution.getContext();\n\n        flushCache(ec != null ? (XWikiContext) ec.getProperty(\"xwikicontext\") : null);\n    }\n\n    \/**\n     * @deprecated use WikiManager plugin instead\n     *\/\n    @Deprecated\n    public int XWiki.createNewWiki(String wikiName, String wikiUrl, String wikiAdmin, String baseWikiName,\n        String description, String wikilanguage, boolean failOnExist, XWikiContext context) throws XWikiException\n    {\n        String database = context.getDatabase();\n        wikiName = wikiName.toLowerCase();\n\n        try {\n            XWikiDocument userdoc = getDocument(wikiAdmin, context);\n\n            \/\/ User does not exist\n            if (userdoc.isNew()) {\n                if (LOGGER.isErrorEnabled()) {\n                    LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"user does not exist\");\n                }\n                return -2;\n            }\n\n            \/\/ User is not active\n            if (!(userdoc.getIntValue(\"XWiki.XWikiUsers\", \"active\") == 1)) {\n                if (LOGGER.isErrorEnabled()) {\n                    LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"user is not active\");\n                }\n                return -3;\n            }\n\n            String wikiForbiddenList = Param(\"xwiki.virtual.reserved_wikis\");\n            if (Util.contains(wikiName, wikiForbiddenList, \", \")) {\n                if (LOGGER.isErrorEnabled()) {\n                    LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"wiki name is forbidden\");\n                }\n                return -4;\n            }\n\n            String wikiServerPage = \"XWikiServer\" + wikiName.substring(0, 1).toUpperCase() + wikiName.substring(1);\n            \/\/ Verify is server page already exist\n            XWikiDocument serverdoc = getDocument(SYSTEM_SPACE, wikiServerPage, context);\n            if (serverdoc.isNew()) {\n                \/\/ clear entry in virtual wiki cache\n                this.virtualWikiMap.remove(wikiUrl);\n\n                \/\/ Create Wiki Server page\n                serverdoc.setStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"server\", wikiUrl);\n                serverdoc.setStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"owner\", wikiAdmin);\n                if (description != null) {\n                    serverdoc.setLargeStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"description\", description);\n                }\n                if (wikilanguage != null) {\n                    serverdoc.setStringValue(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE, \"language\", wikilanguage);\n                }\n                if (!getDefaultDocumentSyntax().equals(Syntax.XWIKI_1_0.toIdString())) {\n                    serverdoc.setContent(\"{{include document=\\\"XWiki.XWikiServerForm\\\"\/}}\\n\");\n                    serverdoc.setSyntax(Syntax.XWIKI_2_0);\n                } else {\n                    serverdoc.setContent(\"#includeForm(\\\"XWiki.XWikiServerForm\\\")\\n\");\n                    serverdoc.setSyntax(Syntax.XWIKI_1_0);\n                }\n                serverdoc.setParentReference(VIRTUAL_WIKI_DEFINITION_CLASS_REFERENCE);\n                saveDocument(serverdoc, context);\n            } else {\n                \/\/ If we are not allowed to continue if server page already exists\n                if (failOnExist) {\n                    if (LOGGER.isErrorEnabled()) {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki server page already exists\");\n                    }\n                    return -5;\n                } else if (LOGGER.isWarnEnabled()) {\n                    LOGGER.warn(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                        + \"wiki server page already exists\");\n                }\n            }\n\n            \/\/ Create wiki database\n            try {\n                context.setDatabase(getDatabase());\n                getStore().createWiki(wikiName, context);\n            } catch (XWikiException e) {\n                if (LOGGER.isErrorEnabled()) {\n                    if (e.getCode() == 10010) {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki database already exists\");\n                    } else if (e.getCode() == 10011) {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki database creation failed\");\n                    } else {\n                        LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                            + \"wiki database creation threw exception\", e);\n                    }\n                }\n            } catch (Exception e) {\n                LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                    + \"wiki database creation threw exception\", e);\n            }\n\n            try {\n                updateDatabase(wikiName, true, false, context);\n            } catch (Exception e) {\n                LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                    + \"wiki database shema update threw exception\", e);\n                return -6;\n            }\n\n            \/\/ Copy base wiki\n            int nb = copyWiki(baseWikiName, wikiName, wikilanguage, context);\n            \/\/ Save the number of docs copied in the context\n            context.put(\"nbdocs\", Integer.valueOf(nb));\n\n            \/\/ Create user page in his wiki\n            \/\/ Let's not create it anymore.. this makes the creator loose\n            \/\/ super admin rights on his wiki\n            \/\/ copyDocument(wikiAdmin, getDatabase(), wikiName, wikilanguage, context);\n\n            \/\/ Modify rights in user wiki\n            context.setDatabase(wikiName);\n            \/*\n             * XWikiDocument wikiprefdoc = getDocument(\"XWiki.XWikiPreferences\", context);\n             * wikiprefdoc.setStringValue(\"XWiki.XWikiGlobalRights\", \"users\", wikiAdmin);\n             * wikiprefdoc.setStringValue(\"XWiki.XWikiGlobalRights\", \"levels\", \"admin, edit\");\n             * wikiprefdoc.setIntValue(\"XWiki.XWikiGlobalRights\", \"allow\", 1); saveDocument(wikiprefdoc, context);\n             *\/\n            return 1;\n        } catch (Exception e) {\n            LOGGER.error(\"Wiki creation (\" + wikiName + \",\" + wikiUrl + \",\" + wikiAdmin + \") failed: \"\n                + \"wiki creation threw exception\", e);\n            return -10;\n        } finally {\n            context.setDatabase(database);\n        }\n    }\n\n    \/**\n     * Get the XWiki temporary filesystem directory (cleaned up automatically by XWiki).\n     *\n     * @param context\n     * @return temporary directory\n     * @since 1.1 Milestone 4\n     * @deprecated starting with 4.2M1 use {@link org.xwiki.environment.Environment#getTemporaryDirectory()}\n     *\/\n    @Deprecated\n    public File XWiki.getTempDirectory(XWikiContext context)\n    {\n        return this.environment.getTemporaryDirectory();\n    }\n\n    \/**\n     * Get a new directory in the xwiki work directory\n     *\n     * @param subdir desired directory name\n     * @param context\n     * @return work subdirectory\n     * @since 1.1 Milestone 4\n     * @deprecated starting with 4.2M1 use {@link org.xwiki.environment.Environment#getPermanentDirectory()}\n     *\/\n    @Deprecated\n    public File XWiki.getWorkSubdirectory(String subdir, XWikiContext context)\n    {\n        File fdir = new File(this.environment.getPermanentDirectory().getAbsolutePath(), subdir);\n        if (!fdir.exists()) {\n            fdir.mkdir();\n        }\n\n        return fdir;\n    }\n\n    \/**\n     * Get the XWiki work directory\n     *\n     * @param context\n     * @return work directory\n     * @since 1.1 Milestone 4\n     * @deprecated starting with 4.2M1 use {@link org.xwiki.environment.Environment#getPermanentDirectory()}\n     *\/\n    @Deprecated\n    public File XWiki.getWorkDirectory(XWikiContext context)\n    {\n        return this.environment.getPermanentDirectory();\n    }\n\n    \/**\n     * @deprecated starting with 5.1M1 use {@code org.xwiki.url.XWikiURLFactory} instead and starting with 5.3M1 use\n     *             {@link ResourceFactory}\n     *\/\n    @Deprecated\n    public XWikiDocument XWiki.getDocumentFromPath(String path, XWikiContext context) throws XWikiException\n    {\n        return getDocument(getDocumentReferenceFromPath(path, context), context);\n    }\n\n    \/**\n     * @since 2.3M1\n     * @deprecated starting with 5.1M1 use {@code org.xwiki.url.XWikiURLFactory} instead and starting with 5.3M1 use\n     *             {@link ResourceFactory}\n     *\/\n    @Deprecated\n    public DocumentReference XWiki.getDocumentReferenceFromPath(String path, XWikiContext context)\n    {\n        \/\/ TODO: Remove this and use XWikiURLFactory instead in XWikiAction and all entry points.\n        List<String> segments = new ArrayList<String>();\n        for (String segment : path.split(\"\/\", -1)) {\n            segments.add(Util.decodeURI(segment, context));\n        }\n        \/\/ Remove the first segment if it's empty to cater for cases when the path starts with \"\/\"\n        if (segments.size() > 0 && segments.get(0).length() == 0) {\n            segments.remove(0);\n        }\n\n        XWikiEntityURL entityURL = buildEntityURLFromPathSegments(new WikiReference(context.getDatabase()), segments);\n\n        return new DocumentReference(entityURL.getEntityReference().extractReference(EntityType.DOCUMENT));\n    }\n\n    \/**\n     * @deprecated since 2.3M1 use {@link #getDocumentReferenceFromPath(String, XWikiContext)} instead\n     *\/\n    @Deprecated\n    public String XWiki.getDocumentNameFromPath(String path, XWikiContext context)\n    {\n        return this.localStringEntityReferenceSerializer.serialize(getDocumentReferenceFromPath(path, context));\n    }\n\n    \/**\n     * @deprecated since 2.3M1 use {@link #getDocumentReferenceFromPath(String, XWikiContext)} instead\n     *\/\n    @Deprecated\n    public String XWiki.getDocumentName(XWikiRequest request, XWikiContext context)\n    {\n        return this.localStringEntityReferenceSerializer.serialize(getDocumentReference(request, context));\n    }\n\n    \/**\n     * @deprecated starting with 5.1M1 use {@code org.xwiki.url.XWikiURLFactory} instead and starting with 5.3M1 use\n     *             {@link ResourceFactory}\n     *\/\n    @Deprecated\n    private XWikiEntityURL XWiki.buildEntityURLFromPathSegments(WikiReference wikiReference, List<String> pathSegments)\n    {\n        XWikiEntityURL entityURL;\n\n        \/\/ Rules based on counting the url segments:\n        \/\/ - 0 segments (e.g. \"\"): default document reference, \"view\" action\n        \/\/ - 1 segment (e.g. \"\/\", \"\/Document\"): default space, specified document (and default if empty), \"view\" action\n        \/\/ - 2 segments (e.g. \"\/Space\/\", \"\/Space\/Document\"): specified space, document (and default doc if empty),\n        \/\/   \"view\" action\n        \/\/ - 3 segments (e.g. \"\/action\/Space\/Document\"): specified space, document (and default doc if empty),\n        \/\/   specified action\n        \/\/ - 4 segments (e.g. \"\/download\/Space\/Document\/attachment\"): specified space, document and attachment (and\n        \/\/   default doc if empty), \"download\" action\n        \/\/ - 4 segments or more (e.g. \"\/action\/Space\/Document\/whatever\/else\"): specified space, document (and default\n        \/\/     doc if empty), specified \"action\" (if action != \"download\"), trailing segments ignored\n\n        String spaceName = null;\n        String pageName = null;\n        String attachmentName = null;\n        String action = \"view\";\n\n        if (pathSegments.size() == 1) {\n            pageName = pathSegments.get(0);\n        } else if (pathSegments.size() == 2) {\n            spaceName = pathSegments.get(0);\n            pageName = pathSegments.get(1);\n        } else if (pathSegments.size() >= 3) {\n            action = pathSegments.get(0);\n            spaceName = pathSegments.get(1);\n            pageName = pathSegments.get(2);\n            if (action.equals(\"download\") && pathSegments.size() >= 4) {\n                attachmentName = pathSegments.get(3);\n            }\n        }\n\n        \/\/ Normalize the extracted space\/page to resolve empty\/null values and replace them with default values.\n        EntityReference reference = wikiReference;\n        EntityType entityType = EntityType.DOCUMENT;\n        if (!StringUtils.isEmpty(spaceName)) {\n            reference = new EntityReference(spaceName, EntityType.SPACE, reference);\n        }\n        if (!StringUtils.isEmpty(pageName)) {\n            reference = new EntityReference(pageName, EntityType.DOCUMENT, reference);\n        }\n        if (!StringUtils.isEmpty(attachmentName)) {\n            reference = new EntityReference(attachmentName, EntityType.ATTACHMENT, reference);\n            entityType = EntityType.ATTACHMENT;\n        }\n        reference = this.defaultReferenceEntityReferenceResolver.resolve(reference, entityType);\n\n        entityURL = new XWikiEntityURL(reference);\n        entityURL.setAction(action);\n\n        return entityURL;\n    }\n\n    \/**\n     * Extracts the name of the wiki from a context's request. In some cases, including autowww, the main wiki may be\n     * returned instead of what was requested, as a result of some assumptions. Even so, the resulting wiki name is not\n     * guaranteed to exist, it is just what XWiki understood from the request.\n     *\n     * @param context the context which contains the request\n     * @return the name of the wiki that was requested\n     * @throws XWikiException if problems occur\n     * @deprecated starting with 5.2M1 use {@link ResourceFactory} instead\n     *\/\n    @Deprecated\n    public String XWiki.getRequestWikiName(XWikiContext context) throws XWikiException\n    {\n        \/\/ Host is full.host.name in DNS-based multiwiki, and wikiname in path-based multiwiki.\n        String host = \"\";\n        \/\/ Canonical name of the wiki (database).\n        String wikiName = \"\";\n        \/\/ wikiDefinition should be the document holding the definition of the virtual wiki, a document in the main\n        \/\/ wiki with a XWiki.XWikiServerClass object attached to it\n        DocumentReference wikiDefinition;\n\n        XWikiRequest request = context.getRequest();\n        try {\n            URL requestURL = context.getURL();\n            host = requestURL.getHost();\n        } catch (Exception e) {\n        }\n\n        \/\/ In path-based multi-wiki, the wiki name is an element of the request path.\n        \/\/ The url is in the form \/xwiki (app name)\/wiki (servlet name)\/wikiname\/\n        if (\"1\".equals(this.Param(\"xwiki.virtual.usepath\", \"1\"))) {\n            String uri = request.getRequestURI();\n            if (LOGGER.isDebugEnabled()) {\n                LOGGER.debug(\"Request uri is: \" + uri);\n            }\n            \/\/ Remove the (eventual) context path from the URI, usually \/xwiki\n            uri = stripSegmentFromPath(uri, request.getContextPath());\n            \/\/ Remove the (eventual) servlet path from the URI, usually \/wiki\n            String servletPath = request.getServletPath();\n            uri = stripSegmentFromPath(uri, servletPath);\n\n            if (servletPath.equals(\"\/\" + this.Param(\"xwiki.virtual.usepath.servletpath\", \"wiki\"))) {\n                \/\/ Requested path corresponds to a path-based wiki, now the wiki name is between the first and\n                \/\/ second \"\/\"\n                host = StringUtils.substringBefore(StringUtils.removeStart(uri, \"\/\"), \"\/\");\n            }\n        }\n\n        if (StringUtils.isEmpty(host) || host.equals(context.getMainXWiki())) {\n            \/\/ Can't find any wiki name, return the main wiki\n            return context.getMainXWiki();\n        }\n\n        \/\/ Try to use the full domain name\/path wiki name and see if it corresponds to any existing wiki descriptors\n        wikiDefinition = this.findWikiServer(host, context);\n\n        if (wikiDefinition == null) {\n            \/\/ No definition found based on the full domain name\/path wiki name, try to use the first part of the domain\n            \/\/ name as the wiki name\n            String servername = StringUtils.substringBefore(host, \".\");\n\n            \/\/ Note: Starting 5.0M2, the autowww behavior is default and the ability to disable it is now removed.\n            if (\"0\".equals(this.Param(\"xwiki.virtual.autowww\"))) {\n                LOGGER.warn(String.format(\"%s %s\", \"'xwiki.virtual.autowww' is no longer supported.\",\n                    \"Please update your configuration and\/or see XWIKI-8877 for more details.\"));\n            }\n\n            \/\/ As a convenience, we do not require the creation of an xwiki:XWiki.XWikiServerXwiki page for the main\n            \/\/ wiki and automatically go to the main wiki in certain cases:\n            \/\/ - \"www.<anyDomain>.<domainExtension>\" - if it starts with www, we first check if a subwiki with that\n            \/\/ name exists; if yes, the go to the \"www\" subwiki, if not, go to the main wiki\n            \/\/ - \"localhost\"\n            \/\/ - IP address\n            if (\"www\".equals(servername)) {\n                \/\/ Check that \"www\" is not actually the name of an existing subwiki.\n                wikiDefinition = this.findWikiServer(servername, context);\n                if (wikiDefinition == null) {\n                    \/\/ Not the case, use the main wiki.\n                    return context.getMainXWiki();\n                }\n            } else if (\"localhost\".equals(host) || host.matches(\"[0-9]{1,3}(?:\\\\.[0-9]{1,3}){3}\")) {\n                \/\/ Direct access to the main wiki.\n                return context.getMainXWiki();\n            }\n\n            \/\/ Use the name from the subdomain\n            wikiName = servername;\n\n            if (!context.isMainWiki(wikiName)\n                && !\"1\".equals(context.getWiki().Param(\"xwiki.virtual.failOnWikiDoesNotExist\", \"0\"))) {\n                \/\/ Check if the wiki really exists\n                if (!exists(getServerWikiPage(wikiName), context)) {\n                    \/\/ Fallback on main wiki\n                    wikiName = context.getMainXWiki();\n                }\n            }\n        } else {\n            \/\/ Use the name from the located wiki descriptor\n            wikiName = StringUtils.removeStart(wikiDefinition.getName(), \"XWikiServer\").toLowerCase();\n        }\n\n        return wikiName;\n    }\n\n    \/**\n     * Searches for the document containing the definition of the virtual wiki corresponding to the specified hostname.\n     *\n     * @param host the hostname, as specified in the request (for example: {@code forge.xwiki.org})\n     * @param context the current context\n     * @return the name of the document containing the wiki definition, or {@code null} if no wiki corresponds to the\n     *         hostname\n     * @throws XWikiException if a problem occurs while searching the storage\n     *\/\n    private DocumentReference XWiki.findWikiServer(String host, XWikiContext context) throws XWikiException\n    {\n        ensureVirtualWikiMapExists();\n        DocumentReference wikiName = this.virtualWikiMap.get(host);\n\n        if (wikiName == null) {\n            \/\/ Not loaded yet, search for it in the main wiki\n            String hql =\n                \", BaseObject as obj, StringProperty as prop WHERE obj.name=doc.fullName\"\n                    + \" AND doc.space='XWiki' AND doc.name LIKE 'XWikiServer%'\"\n                    + \" AND obj.className='XWiki.XWikiServerClass' AND prop.id.id = obj.id\"\n                    + \" AND prop.id.name = 'server' AND prop.value=?\";\n            List<String> parameters = new ArrayList<String>(1);\n            parameters.add(host);\n            try {\n                List<DocumentReference> list =\n                    context.getWiki().getStore().searchDocumentReferences(hql, parameters, context);\n                if ((list != null) && (list.size() > 0)) {\n                    wikiName = list.get(0);\n                }\n\n                this.virtualWikiMap.set(host, wikiName);\n            } catch (XWikiException e) {\n                LOGGER.warn(\"Error when searching for wiki name from URL host [\" + host + \"]\", e);\n            }\n        }\n\n        return wikiName;\n    }\n\n    private void XWiki.ensureVirtualWikiMapExists() throws XWikiException\n    {\n        synchronized (this) {\n            if (this.virtualWikiMap == null) {\n                int iCapacity = 1000;\n                try {\n                    String capacity = Param(\"xwiki.virtual.cache.capacity\");\n                    if (capacity != null) {\n                        iCapacity = Integer.parseInt(capacity);\n                    }\n                } catch (Exception e) {\n                }\n                try {\n                    CacheConfiguration configuration = new CacheConfiguration();\n                    configuration.setConfigurationId(\"xwiki.virtualwikimap\");\n                    LRUEvictionConfiguration lru = new LRUEvictionConfiguration();\n                    lru.setMaxEntries(iCapacity);\n                    configuration.put(LRUEvictionConfiguration.CONFIGURATIONID, lru);\n\n                    this.virtualWikiMap = getCacheFactory().newCache(configuration);\n                } catch (CacheException e) {\n                    throw new XWikiException(XWikiException.MODULE_XWIKI_CACHE,\n                        XWikiException.ERROR_CACHE_INITIALIZING, \"Failed to create new cache\", e);\n                }\n            }\n        }\n    }\n}\n","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"b1138c56d0b4ee447ba7d50e1e8631141f92044a","subject":"XWIKI-7585: Cannot delete and recreate the same document in the same request * Fix invalid usage of aspect...","message":"XWIKI-7585: Cannot delete and recreate the same document in the same request\n* Fix invalid usage of aspect...\n","repos":"xwiki\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,xwiki\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform,pbondoer\/xwiki-platform","old_file":"xwiki-platform-core\/xwiki-platform-legacy\/xwiki-platform-legacy-oldcore\/src\/main\/aspect\/compatibility\/com\/xpn\/xwiki\/XWikiContextCompatibilityAspect.aj","new_file":"xwiki-platform-core\/xwiki-platform-legacy\/xwiki-platform-legacy-oldcore\/src\/main\/aspect\/compatibility\/com\/xpn\/xwiki\/XWikiContextCompatibilityAspect.aj","new_contents":"\/*\n * See the NOTICE file distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This is free software; you can redistribute it and\/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF site: http:\/\/www.fsf.org.\n *\n *\/\npackage compatibility.com.xpn.xwiki;\n \nimport com.xpn.xwiki.XWikiContext;\nimport com.xpn.xwiki.doc.XWikiDocumentArchive;\n\n\/**\n * Add a backward compatibility layer to the {@link com.xpn.xwiki.XWikiContext} class.\n * \n * @version $Id$\n *\/\npublic privileged aspect XWikiContextCompatibilityAspect\n{\n    \/**\n     * @return true it's main wiki's context, false otherwise.\n     * @deprecated replaced by {@link XWikiContext#isMainWiki()} since 1.4M1.\n     *\/\n    @Deprecated\n    public boolean XWikiContext.isVirtual()\n    {\n        return !this.isMainWiki();\n    }\n\n    \/**\n     * @param virtual true it's main wiki's context, false otherwise.\n     * @deprecated this methods is now useless because the virtuality of a wiki is resolved with a\n     *             comparison between {@link XWikiContext#getDatabase()} and\n     *             {@link XWikiContext#getMainXWiki()} since 1.4M1.\n     *\/\n    @Deprecated\n    public void XWikiContext.setVirtual(boolean virtual)\n    {\n        \/\/ this.virtual = virtual;\n    }\n\n    \/**\n     * Add a {@link XWikiDocumentArchive document archive} in a cache associated with this context, so that future\n     * access requests for the same document archive don't go through the database again.\n     *\n     * @param key the key used to identify a document archive in the cache\n     * @param archive the {@link XWikiDocumentArchive document archive} to cache\n     *\/\n    @Deprecated\n    public void XWikiContext.addDocumentArchive(String key, XWikiDocumentArchive archive)\n    {\n        \/\/ Don't do anything, see XWIKI-7585\n    }\n\n    \/**\n     * Get the cached {@link XWikiDocumentArchive document archive} from the context, if any.\n     *\n     * @param key the key used to identify a document archive in the cache\n     * @return the document archive, if it does exist in the context cache, or {@code null} otherwise\n     * @see #addDocumentArchive(String, XWikiDocumentArchive)\n     *\/\n    @Deprecated\n    public XWikiDocumentArchive XWikiContext.getDocumentArchive(String key)\n    {\n        \/\/ Act as if the cache is empty, see XWIKI-7585\n        return null;\n    }\n\n    \/**\n     * Remove the cached {@link XWikiDocumentArchive document archive} from the context.\n     *\n     * @param key the key used to identify a document archive in the cache\n     * @see #addDocumentArchive(String, XWikiDocumentArchive)\n     *\/\n    @Deprecated\n    public void XWikiContext.removeDocumentArchive(String key)\n    {\n        \/\/ Don't do anything, see XWIKI-7585\n    }\n\n    \/**\n     * Empty the document archive cache.\n     *\n     * @see #addDocumentArchive(String, XWikiDocumentArchive)\n     *\/\n    @Deprecated\n    public void XWikiContext.flushArchiveCache()\n    {\n        \/\/ Don't do anything, see XWIKI-7585\n    }\n}\n","old_contents":"\/*\n * See the NOTICE file distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This is free software; you can redistribute it and\/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF site: http:\/\/www.fsf.org.\n *\n *\/\npackage compatibility.com.xpn.xwiki;\n \nimport com.xpn.xwiki.XWikiContext;\n\n\/**\n * Add a backward compatibility layer to the {@link com.xpn.xwiki.XWikiContext} class.\n * \n * @version $Id$\n *\/\npublic privileged aspect XWikiContextCompatibilityAspect\n{\n    \/**\n     * @return true it's main wiki's context, false otherwise.\n     * @deprecated replaced by {@link XWikiContext#isMainWiki()} since 1.4M1.\n     *\/\n    @Deprecated\n    public boolean XWikiContext.isVirtual()\n    {\n        return !this.isMainWiki();\n    }\n\n    \/**\n     * @param virtual true it's main wiki's context, false otherwise.\n     * @deprecated this methods is now useless because the virtuality of a wiki is resolved with a\n     *             comparison between {@link XWikiContext#getDatabase()} and\n     *             {@link XWikiContext#getMainXWiki()} since 1.4M1.\n     *\/\n    @Deprecated\n    public void XWikiContext.setVirtual(boolean virtual)\n    {\n        \/\/ this.virtual = virtual;\n    }\n\n    \/**\n     * Add a {@link XWikiDocumentArchive document archive} in a cache associated with this context, so that future\n     * access requests for the same document archive don't go through the database again.\n     *\n     * @param key the key used to identify a document archive in the cache\n     * @param archive the {@link XWikiDocumentArchive document archive} to cache\n     *\/\n    @Deprecated\n    public void addDocumentArchive(String key, XWikiDocumentArchive archive)\n    {\n        \/\/ Don't do anything, see XWIKI-7585\n    }\n\n    \/**\n     * Get the cached {@link XWikiDocumentArchive document archive} from the context, if any.\n     *\n     * @param key the key used to identify a document archive in the cache\n     * @return the document archive, if it does exist in the context cache, or {@code null} otherwise\n     * @see #addDocumentArchive(String, XWikiDocumentArchive)\n     *\/\n    @Deprecated\n    public XWikiDocumentArchive getDocumentArchive(String key)\n    {\n        \/\/ Don't do anything, see XWIKI-7585\n    }\n\n    \/**\n     * Remove the cached {@link XWikiDocumentArchive document archive} from the context.\n     *\n     * @param key the key used to identify a document archive in the cache\n     * @see #addDocumentArchive(String, XWikiDocumentArchive)\n     *\/\n    @Deprecated\n    public void removeDocumentArchive(String key)\n    {\n        \/\/ Don't do anything, see XWIKI-7585\n    }\n\n    \/**\n     * Empty the document archive cache.\n     *\n     * @see #addDocumentArchive(String, XWikiDocumentArchive)\n     *\/\n    @Deprecated\n    public void flushArchiveCache()\n    {\n        \/\/ Don't do anything, see XWIKI-7585\n    }\n}\n","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"1b8028a3001c1efb1a70f947b0d0787d7c05909d","subject":"Cleaning of TnR QuartzContextAdapter aspect","message":"Cleaning of TnR QuartzContextAdapter aspect\n","repos":"christophe-w\/parallelj.runtime,awltech\/org.parallelj","old_file":"org.parallelj\/parallelj\/parallelj-tracknrestart\/src\/main\/java\/org\/parallelj\/tracknrestart\/aspects\/QuartzContextAdapter.aj","new_file":"org.parallelj\/parallelj\/parallelj-tracknrestart\/src\/main\/java\/org\/parallelj\/tracknrestart\/aspects\/QuartzContextAdapter.aj","new_contents":"package org.parallelj.tracknrestart.aspects;\n\nimport java.lang.reflect.InvocationTargetException;\nimport java.lang.reflect.Method;\nimport java.sql.SQLException;\n\nimport org.apache.log4j.Logger;\nimport org.parallelj.Programs;\nimport org.parallelj.Programs.ProcessHelper;\nimport org.parallelj.internal.kernel.KCall;\nimport org.parallelj.internal.kernel.KProcess;\nimport org.parallelj.internal.reflect.ProgramAdapter.Adapter;\nimport org.parallelj.tracknrestart.ReturnCodes;\nimport org.parallelj.tracknrestart.annotations.TrackNRestart;\nimport org.parallelj.tracknrestart.databinding.ProgramFieldsBinder;\nimport org.parallelj.tracknrestart.listeners.ForEachListener;\nimport org.parallelj.tracknrestart.plugins.TrackNRestartPluginAll;\nimport org.quartz.Job;\nimport org.quartz.JobDataMap;\nimport org.quartz.JobExecutionContext;\nimport org.quartz.JobExecutionException;\nimport org.quartz.JobPersistenceException;\n\nprivileged public aspect QuartzContextAdapter percflow (execution(public void Job+.execute(..) throws JobExecutionException)) {\n\t\n\tpublic static final String RETURN_CODE = \"RETURN_CODE\";\n\n\tdeclare precedence :\n\t\torg.parallelj.tracknrestart.aspects.QuartzContextAdapter,\n\t\torg.parallelj.launching.quartz.JobsAdapter;\n\n\tstatic Logger logger = Logger.getLogger(\"org.parallelj.tracknrestart\");\n\t\n\tprivate X root;\n\n\tString result = ReturnCodes.SUCCESS.name();\n\t\n\t\/\/---------------------------------------------------------------------------------------------------\n\t\n\tdeclare parents:\n\t\t(@org.parallelj.launching.QuartzExecution *) implements Job;\n\n\tpublic void Job.execute(JobExecutionContext context) throws JobExecutionException {\n\t\t\n\t\ttry {\n\t\t\tlogger.debug(\"-----------------------------------------------------------------------------------------------------\");\n\t\t\tlogger.debug(\"STARTING \/\/J Root Program \"+this.getClass().getName());\n\t\n\t\t\tProcessHelper<?> p = null;\n\t\t\tcontext.setResult(new JobDataMap());\n\n\t\t\tp = Programs.as((Adapter) this).execute().join();\n\n\t\t\tProgramFieldsBinder.getProgramOutputFields(this, context);\n\n\t\t\tX xx = (X)this;\n\t\t\tif (xx.exceptionThrown != null){\n\t\t\t\tthrow new JobExecutionException(xx.exceptionThrown);\n\t\t\t}\n\t\t} catch (IllegalAccessException e) {\n\t\t\tthrow new JobExecutionException(e);\n\t\t} catch (NoSuchFieldException e) {\n\t\t\tthrow new JobExecutionException(e);\n\t\t} finally {\n\t\t\tlogger.debug(\"ENDING   \/\/J Root Program \"+this.getClass().getName());\n\t\t\tlogger.debug(\"-----------------------------------------------------------------------------------------------------\");\n\t\t}\n\t}\n\n\t\/\/---------------------------------------------------------------------------------------------------\n\t\n\tpublic interface X {};\n\n\tdeclare parents:           \n\t\t(org.quartz.Job+ && !org.quartz.Job) implements X;    \n\n\tdeclare parents:   \n\t\t(org.parallelj.internal.kernel.KCall) implements X;      \n\n\tprivate Throwable X.exceptionThrown = null;\n\n\tprivate ForEachListener X.forEachListener = null;       \n\t\n\tpublic ForEachListener X.getForEachListener() { \n\t\treturn forEachListener;\n\t}\n\t\n\tpublic void X.setForEachListener(ForEachListener forEachListener) {\n\t\tthis.forEachListener = forEachListener;\n\t}\n\t\n\tprivate String X.restartedFireInstanceId = null;       \n\t\n\tpublic String X.getRestartedFireInstanceId() {\n\t\treturn restartedFireInstanceId;\n\t}\n\t\n\tpublic void X.setRestartedFireInstanceId(String restartedFireInstanceId) {\n\t\tthis.restartedFireInstanceId = restartedFireInstanceId;\n\t}\n\t\n\t\/\/---------------------------------------------------------------------------------------------------\n\t\n\t\/\/JobExecutionContext --> Job\n\tbefore(X self, JobExecutionContext jobExecutionContext): \n\t\texecution(public void Job+.execute(..) throws JobExecutionException) \n\t\t&& this(self) \n\t\t&& args(jobExecutionContext) {\n\n\t\tself.setRestartedFireInstanceId(jobExecutionContext.getJobDetail().getJobDataMap().getString(TrackNRestartPluginAll.RESTARTED_FIRE_INSTANCE_ID));\n\t\tself.setForEachListener((ForEachListener) jobExecutionContext.getJobDetail().getJobDataMap().get(TrackNRestartPluginAll.FOR_EACH_LISTENER));\n\n\t\tthis.root = self;\n\t}\n\n\tafter(X self, JobExecutionContext jobExecutionContext): \n\t\texecution(public void Job+.execute(..) throws JobExecutionException) \n\t\t&& this(self) \n\t\t&& args(jobExecutionContext) {\n\n\t\tObject oResult = jobExecutionContext.getResult();\n\t\tif (oResult instanceof JobDataMap){\n\t\t\tJobDataMap resultAsJobDataMap = (JobDataMap) oResult;\n\t\t\tresultAsJobDataMap.put(RETURN_CODE, this.result);\n\t\t} else {\n\t\t\tjobExecutionContext.setResult(this.result);\n\t\t}\n\t}\n\t\n\tafter(X self): \n\t\texecution(protected KCall.new(..)) && this(self) {\n\n\t\tself.setRestartedFireInstanceId(root.getRestartedFireInstanceId()); \n\t\tself.setForEachListener(root.getForEachListener());\n\t}\n\n\tafter(X self): \n\t\texecution(protected KProcess.new(..)) && this(self) {\n\n\t\tself.setRestartedFireInstanceId(root.getRestartedFireInstanceId()); \n\t\tself.setForEachListener(root.getForEachListener());\n\t}\n\n    pointcut enter(KCall _kCall): call(* org.parallelj.internal.kernel.callback.Entry+.enter(KCall)) && args(_kCall);\n    pointcut invoke(): call(public Object Method.invoke(Object, ..)) && !within(QuartzContextAdapter);\n\n\/\/ Runnable program. ----------------------------------------------------------------------------------------------------------------------------------\n\n    public interface Y {};\n    \n  \tprivate Object Y.context = null;\n  \t\n  \tpublic Object Y.getContext() {\n  \t\treturn context;\n  \t}\n  \t\n  \tpublic void Y.setContext(Object context) {\n  \t\tthis.context=context;\n  \t}\n    \n    declare parents:           \n\t\t(java.lang.Runnable+ ) implements X, Y;    \n    \n    \/\/ 1) Transfert from RunnableCall to Runnable. \n  \tafter(Object self) returning (Runnable ret): \n    \t execution(* org.parallelj.internal.kernel.procedure.RunnableProcedure.RunnableCall.toRunnable())\n      && this(self)  {\n    \t\n    \t ((X)ret).setForEachListener(((X)self).getForEachListener());\n    \t ((X)ret).setRestartedFireInstanceId(((X)self).getRestartedFireInstanceId());\n    \t ((Y)ret).setContext(((org.parallelj.internal.kernel.KCall)self).getContext());\n    }\n    \n     \/\/ 2) Interception around call of run.      \n     void around(Object self): call(* run(..))\n     && within(org.parallelj.internal.kernel.procedure.RunnableProcedure.RunnableCall)\n     && within(Runnable+)  && this(self)  {\n    \t \n    \t String restartedFireInstanceId = ((X) self).getRestartedFireInstanceId();\n    \t ForEachListener forEachListener = ((X)self).getForEachListener();\t\n    \t Object program =  ((Y)self).getContext();\n    \t \n    \t if (isToProcess(restartedFireInstanceId,forEachListener,program)) {\n    \t\ttry { \n    \t\t\tproceed(self);\n     \t\t\tif (isTrackNRestartAnnoted(program)) {\n     \t\t\t\tString oid = getOID(program);\n   \t\t\t\t\ttrack(forEachListener, oid, true);\n     \t\t\t}\n    \t\t} catch (Exception e) {\n \t\t\t\tif (isTrackNRestartAnnoted(program)){\n \t\t\t\t\tString oid = getOID(program);\n \t\t\t\t\tif (isTrackNRestartExceptionPermitted(program, e)) {\n \t\t\t\t\t\tthis.result = ReturnCodes.FAILURE.name();\n\t \t\t\t\t\ttrack(forEachListener, oid, false);\n\t\t\t\t\t} else {\n\t\t\t\t\t\tabortAbruptly(new TrackNRestartException(\"Exception thrown (\"+e.getClass().getName()+\") is not in list of permitted exceptions \"+filteredExceptionsAsString(getTrackNRestartAnnotedException(program))));\n\t\t\t\t\t}\n \t\t\t\t}\n    \t\t}\n     \t} else {\n     \t\tif (isTrackNRestartAnnoted(program)) {\n \t\t\t\tString oid = getOID(program);\n \t\t\t\ttrack(forEachListener, oid, true);\n\t\t\t} else {\n\t\t\t\tabortAbruptly(new TrackNRestartException(\"Unable to get iteration OID while 'tracking' context.\"));\n \t\t\t}\n     \t}\n     }\n     \n     \/**\n      * Track the execution (success or failure).\n      * @param forEachListener listener handling Quartz backend.\n      * @param oid unique identifier\n      * @param success boolean indicating if processing is a success or a failure.\n      *\/\n     private void track(ForEachListener forEachListener, String oid, boolean success) {\n\t     try {\n\t\t\t\tforEachListener.forEachInstanceComplete(oid, success);\n\t     } catch (JobPersistenceException e) {\n\t\t\t\tabortAbruptly(new TrackNRestartException(\"Unable to read status for iteration '\"+ oid + \"'.\", e));\n\t\t} catch (SQLException e) {\n\t\t\t\tabortAbruptly(new TrackNRestartException(\"Unable to read status for iteration '\"+ oid + \"'.\", e));\n\t\t}\n     }\n    \n \n\/\/ restart part ----------------------------------------------------------------------------------------------------------------------------------------\n     \n     Object around(Object oo, KCall _kCall)  :\n        invoke() && args(oo, ..) && cflow(enter(_kCall)) {\n         \n    \tif (isToProcess( ((X) _kCall).getRestartedFireInstanceId(),((X) _kCall).getForEachListener(), oo)) {\n               return proceed(oo, _kCall);\n        } else {\n               return null;\n        }\n     }\n\n    \/**\n     * Check if an iterable must be processed. This means if the iterable is not already processed or the element was processed in error.\n     * @param restartedFireInstanceId id of the batch to be restarted.\n     * @param forEachListener listener handling request to Quartz. \n     * @param program instance of the program processing the iterable. \n     * @return true iterable has to be processed, false else.\n     *\/\n    private boolean isToProcess(String restartedFireInstanceId,  ForEachListener forEachListener, Object program)   {\n\t\tboolean result = true;\n\t\tif (program != null) {\n\t\t\tif (program.getClass().isAnnotationPresent(TrackNRestart.class)) {\n\t\t\t\tString oid = getOID(program);\n\t\t\t\tif (oid != null) {\n\t\t\t\t\tif (restartedFireInstanceId != null) {\n\t\t\t\t\t\t\/\/ logger.debug(\"Processing in restarting mode for oid : [\"\n\t\t\t\t\t\t\/\/ + oid + \"] ,program : [\" + program +\n\t\t\t\t\t\t\/\/ \"] ,instanceId :[\" +instanceId+ \"]\");\n\t\t\t\t\t\ttry {\n\t\t\t\t\t\t\tresult = !forEachListener.isForEachInstanceIgnorable(restartedFireInstanceId, oid);\n\t\t\t\t\t\t\t\/\/ logger.debug(result ?\n\t\t\t\t\t\t\t\/\/ \"This OID has not been already processed or\" +\n\t\t\t\t\t\t\t\/\/ \" already processed in error, so its processing is not skipped\":\n\t\t\t\t\t\t\t\/\/ \"This OID (\"+oid+\") has been already successfully processed, so its processing is skipped\");\n\t\t\t\t\t\t} catch (JobPersistenceException e) {\n\t\t\t\t\t\t\tabortAbruptly(new TrackNRestartException(\"Unable to read status for iteration '\"+ oid + \"'.\", e));\n\t\t\t\t\t\t} catch (SQLException e) {\n\t\t\t\t\t\t\tabortAbruptly(new TrackNRestartException(\"Unable to read status for iteration '\"+ oid + \"'.\", e));\n\t\t\t\t\t\t}\n\t\t\t\t\t} else {\n\t\t\t\t\t\t\/\/ logger.debug(\"Processing in normal mode (ie not restarting mode) for : [\"\n\t\t\t\t\t\t\/\/ + oid + \"] ,program : [\" + program + \"]\");\n\t\t\t\t\t}\n\t\t\t\t} else {\n\t\t\t\t\tabortAbruptly(new TrackNRestartException(\"Unable to get iteration OID while 'restarting' context.\"));\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t\treturn result;\n\t}\n    \n    \/**\n     * Get unique identifier returned by the program (the program contains value to be processed).\n     * @param program\n     * @return unique identifier.\n     *\/\n\tprivate String getOID(Object program) {\n\t\tString result = null;\n\t\ttry {\n\t\t\tMethod m = program.getClass().getDeclaredMethod(\"getOID\", new Class[] {});\n\t\t\treturn (String) m.invoke(program, new Object[] {});\n\t\t} catch (SecurityException e) {\n\t\t\tabortAbruptly(new TrackNRestartException(e));\n\t\t} catch (NoSuchMethodException e) {\n\t\t\tabortAbruptly(new TrackNRestartException(\"No getOID() method found while program \" + program + \" was annotated @TrackNRestart.\", e));\n\t\t} catch (IllegalArgumentException e) {\n\t\t\tabortAbruptly(new TrackNRestartException(e));\n\t\t} catch (IllegalAccessException e) {\n\t\t\tabortAbruptly(new TrackNRestartException(e));\n\t\t} catch (InvocationTargetException e) {\n\t\t\tabortAbruptly(new TrackNRestartException(e));\n\t\t}\n\t\t\n\t\treturn result;\n\t}\n\t\n\t\/**\n\t * Indicate of the Program contains annotation TrackNRestart.\n\t * @param program\n\t * @return true if program is annoted.\n\t *\/\n\tprivate boolean isTrackNRestartAnnoted(Object program) {\n\t\treturn program.getClass().isAnnotationPresent(TrackNRestart.class);\n\t}\n\n\t\/**\n\t * Check if the raised exception belong to the allowed ones in TrackNRestart annotation.\n\t * @param program\n\t * @param exception raised\n\t * @return true if exception is allowed, false else.\n\t *\/\n\tprivate boolean isTrackNRestartExceptionPermitted(Object program, Exception exception) {\n\t\tboolean result = false;\n\t\tClass<? extends Throwable>[] filteredExceptions =  getTrackNRestartAnnotedException(program);\n\t\tfor (int i = 0; i < filteredExceptions.length; i++) {\n\t\t\t\tif (filteredExceptions[i].isAssignableFrom(exception.getClass())) {\n\t\t\t\t\treturn true;\n\t\t\t}\n\t\t}\n\t\treturn false;\n\t}\n\t\n\t\/**\n\t * Return exceptions defined in TrackNRestart annotation.\n\t * @param program\n\t * @return array of exceptions\n\t *\/\n\tprivate Class<? extends Throwable>[] getTrackNRestartAnnotedException (Object program) {\n\t\treturn program.getClass().getAnnotation(TrackNRestart.class).filteredExceptions();\n\t}\n\t\n\t\n\/\/ tracking part ----------------------------------------------------------------------------------------------------------------------------------------\n   after(Object oo, KCall _kCall) returning :\n    \tinvoke() && args(oo, ..) && cflow(enter(_kCall)) {\n\t\t\n\t\ttrack(_kCall, oo, true, null);\n    }\n\n    after(Object oo, KCall _kCall) throwing (InvocationTargetException ite) : \n    \tinvoke() && args(oo, ..) && cflow(enter(_kCall)) {\n\t\t\n\t\tthis.result = ReturnCodes.FAILURE.name();\n\t\ttrack(_kCall, oo, false, ite);\n    }\n\n    \n\tprivate void track(KCall _kCall, Object program, boolean success,\n\t\t\tInvocationTargetException ite) {\n\t\tString oid = null;\n\n\t\ttry {\n\t\t\tif (program != null) {\n\t\t\t\tClass<? extends Object> clazz = program.getClass();\n\t\t\t\tif (clazz.isAnnotationPresent(TrackNRestart.class)) {\n\t\t\t\t\toid = getOID(program);\n\t\t\t\t\tif (oid != null) {\n\t\t\t\t\t\tif (success == true) {\n\t\t\t\t\t\t\tpersist(_kCall, success, oid);\n\t\t\t\t\t\t} else {\n\t\t\t\t\t\t\tClass<? extends Throwable>[] filteredExceptions = clazz\n\t\t\t\t\t\t\t\t\t.getAnnotation(TrackNRestart.class)\n\t\t\t\t\t\t\t\t\t.filteredExceptions();\n\t\t\t\t\t\t\tif (isIteCausePermittedInList(ite,\n\t\t\t\t\t\t\t\t\tfilteredExceptions)) {\n\t\t\t\t\t\t\t\tpersist(_kCall, success, oid);\n\t\t\t\t\t\t\t} else {\n\t\t\t\t\t\t\t\tabortAbruptly(\n\t\t\t\t\t\t\t\t\t\tnew TrackNRestartException(\n\t\t\t\t\t\t\t\t\t\t\t\t\"Exception thrown (\"\n\t\t\t\t\t\t\t\t\t\t\t\t+ ite.getCause().getClass().getName()\n\t\t\t\t\t\t\t\t\t\t\t\t+ \") is not in list of permitted exceptions \"\n\t\t\t\t\t\t\t\t\t\t\t\t+ filteredExceptionsAsString(filteredExceptions)));\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t\t\/\/if (logger.isDebugEnabled()) {\n\t\t\t\t\t\t\t\/\/ logger.debug(\"oid='\" + oid +\n\t\t\t\t\t\t\t\/\/ \"' persisted with status='\" + (success ?\n\t\t\t\t\t\t\t\/\/ ReturnCodes.SUCCESS : ReturnCodes.FAILURE) + \"' \"+ (ite ==\n\t\t\t\t\t\t\t\/\/ null ? \"\" : \", cause : \" + ite.getCause()));\n\t\t\t\t\t\t\/\/}\n\t\t\t\t\t} else {\n\t\t\t\t\t\tabortAbruptly(new TrackNRestartException(\"Unable to get iteration OID while 'tracking' context.\"));\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t} catch (JobPersistenceException e) {\n\t\t\tabortAbruptly(new TrackNRestartException(\"Unable to persist status ['\" + (success ? ReturnCodes.SUCCESS : ReturnCodes.FAILURE) + \"'] for iteration '\" + oid + \"'.\", e));\n\t\t} catch (SQLException e) {\n\t\t\tabortAbruptly(new TrackNRestartException(\"Unable to persist status ['\" + (success ? ReturnCodes.SUCCESS : ReturnCodes.FAILURE) + \"'] for iteration '\" + oid + \"'.\", e));\n\t\t}\n\t}\n\n\tprivate boolean isIteCausePermittedInList(InvocationTargetException ite,\n\t\t\tClass<? extends Throwable>[] filteredExceptions) {\n\t\tfor (int i = 0; i < filteredExceptions.length; i++) {\n\t\t\tif (filteredExceptions[i].isAssignableFrom(ite.getCause()\n\t\t\t\t\t.getClass()))\n\t\t\t\treturn true;\n\t\t}\n\t\treturn false;\n\t}\n\n\tprivate String filteredExceptionsAsString(\n\t\t\tClass<? extends Throwable>[] filteredExceptions) {\n\t\tStringBuffer sb = new StringBuffer();\n\t\tsb.append(\"[\");\n\t\tfor (int i = 0; i < filteredExceptions.length; i++) {\n\t\t\tif (i > 0)\n\t\t\t\tsb.append(\", \");\n\t\t\tsb.append(filteredExceptions[i].getName());\n\t\t}\n\t\tsb.append(\"]\");\n\t\treturn sb.toString();\n\t}\n\n\tprivate void persist(KCall _kCall, boolean success, String oid)\n\t\t\tthrows JobPersistenceException, SQLException {\n\t\t((X) _kCall).getForEachListener().forEachInstanceComplete(oid, success);\n\t}\n\n\tprivate void abortAbruptly(Throwable t) {\n\t\tthis.result = \"ABORTED\";\n\t\tPrograms.as((Adapter) this.root).abort();\n\t\tthis.root.exceptionThrown = t;\n\t}\n\n}\n","old_contents":"package org.parallelj.tracknrestart.aspects;\n\nimport java.lang.reflect.InvocationTargetException;\nimport java.lang.reflect.Method;\nimport java.sql.SQLException;\n\nimport org.apache.log4j.Logger;\nimport org.parallelj.Programs;\nimport org.parallelj.Programs.ProcessHelper;\nimport org.parallelj.internal.kernel.KCall;\nimport org.parallelj.internal.kernel.KProcess;\nimport org.parallelj.internal.reflect.ProgramAdapter.Adapter;\nimport org.parallelj.tracknrestart.ReturnCodes;\nimport org.parallelj.tracknrestart.annotations.TrackNRestart;\nimport org.parallelj.tracknrestart.databinding.ProgramFieldsBinder;\nimport org.parallelj.tracknrestart.listeners.ForEachListener;\nimport org.parallelj.tracknrestart.plugins.TrackNRestartPluginAll;\nimport org.quartz.Job;\nimport org.quartz.JobDataMap;\nimport org.quartz.JobExecutionContext;\nimport org.quartz.JobExecutionException;\nimport org.quartz.JobPersistenceException;\n\nprivileged public aspect QuartzContextAdapter percflow (execution(public void Job+.execute(..) throws JobExecutionException)) {\n\t\n\tpublic static final String RETURN_CODE = \"RETURN_CODE\";\n\n\tdeclare precedence :\n\t\torg.parallelj.tracknrestart.aspects.QuartzContextAdapter,\n\t\torg.parallelj.launching.quartz.JobsAdapter;\n\n\tstatic Logger logger = Logger.getLogger(\"org.parallelj.tracknrestart\");\n\t\n\tprivate X root;\n\n\tString result = ReturnCodes.SUCCESS.name();\n\t\n\/\/\tThrowable exceptionThrown = null;\n\t\n\t\/\/---------------------------------------------------------------------------------------------------\n\t\n\tdeclare parents:\n\t\t(@org.parallelj.launching.QuartzExecution *) implements Job;\n\n\tpublic void Job.execute(JobExecutionContext context) throws JobExecutionException {\n\t\t\n\t\ttry {\n\t\t\tlogger.debug(\"-----------------------------------------------------------------------------------------------------\");\n\t\t\tlogger.debug(\"STARTING \/\/J Root Program \"+this.getClass().getName());\n\t\n\t\t\tProcessHelper<?> p = null;\n\/\/\t\t\tcontext.setResult(new String());\n\/\/\t\t\tcontext.setResult(new HashMap<String, Serializable>());\n\t\t\tcontext.setResult(new JobDataMap());\n\/\/\t\t\tProgramFieldsBinder.setProgramInputFields(this, context);\n\t\t\tp = Programs.as((Adapter) this).execute().join();\n\t\t\tProgramFieldsBinder.getProgramOutputFields(this, context);\n\n\t\t\tX xx = (X)this;\n\t\t\tif (xx.exceptionThrown != null){\n\t\t\t\tthrow new JobExecutionException(xx.exceptionThrown);\n\t\t\t}\n\t\t} catch (IllegalAccessException e) {\n\t\t\tthrow new JobExecutionException(e);\n\t\t} catch (NoSuchFieldException e) {\n\t\t\tthrow new JobExecutionException(e);\n\t\t} finally {\n\t\t\tlogger.debug(\"ENDING   \/\/J Root Program \"+this.getClass().getName());\n\t\t\tlogger.debug(\"-----------------------------------------------------------------------------------------------------\");\n\t\t}\n\/\/\t\tcontext.setResult(String.valueOf(p.getState()));\n\t}\n\n\t\/\/---------------------------------------------------------------------------------------------------\n\t\n\tpublic interface X {};\n\n\tdeclare parents:           \n\t\t(org.quartz.Job+ && !org.quartz.Job) implements X;    \n\n\tdeclare parents:   \n\t\t(org.parallelj.internal.kernel.KCall) implements X;      \n\n\tprivate Throwable X.exceptionThrown = null;\n\n\tprivate ForEachListener X.forEachListener = null;       \n\t\n\tpublic ForEachListener X.getForEachListener() { \n\t\treturn forEachListener;\n\t}\n\t\n\tpublic void X.setForEachListener(ForEachListener forEachListener) {\n\t\tthis.forEachListener = forEachListener;\n\t}\n\t\n\tprivate String X.restartedFireInstanceId = null;       \n\t\n\tpublic String X.getRestartedFireInstanceId() {\n\t\treturn restartedFireInstanceId;\n\t}\n\t\n\tpublic void X.setRestartedFireInstanceId(String restartedFireInstanceId) {\n\t\tthis.restartedFireInstanceId = restartedFireInstanceId;\n\t}\n\t\n\t\/\/---------------------------------------------------------------------------------------------------\n\t\n\t\/\/JobExecutionContext --> Job\n\tbefore(X self, JobExecutionContext jobExecutionContext): \n\t\texecution(public void Job+.execute(..) throws JobExecutionException) \n\t\t&& this(self) \n\t\t&& args(jobExecutionContext) {\n\n\t\t\/\/logger.debug(\"ASPECT BEFORE:execution(public void Job+.execute(..) throws JobExecutionException) && this(self) && args(jobExecutionContext)\");\n\n\t\tself.setRestartedFireInstanceId(jobExecutionContext.getJobDetail().getJobDataMap().getString(TrackNRestartPluginAll.RESTARTED_FIRE_INSTANCE_ID));\n\t\tself.setForEachListener((ForEachListener) jobExecutionContext.getJobDetail().getJobDataMap().get(TrackNRestartPluginAll.FOR_EACH_LISTENER));\n\t\t\/\/logger.debug(\"job=\"+self); \n\t\t\/\/logger.debug(\"restartedFireInstanceId=\"+self.getRestartedFireInstanceId()); \n\t\t\/\/logger.debug(\"forEachListener=\"+self.getForEachListener());\n\n\t\tthis.root = self;\n\t}\n\n\tafter(X self, JobExecutionContext jobExecutionContext): \n\t\texecution(public void Job+.execute(..) throws JobExecutionException) \n\t\t&& this(self) \n\t\t&& args(jobExecutionContext) {\n\n\t\t\/\/logger.debug(\"ASPECT AFTER:execution(public void Job+.execute(..) throws JobExecutionException) && this(self) && args(jobExecutionContext)\");\n\n\t\tObject oResult = jobExecutionContext.getResult();\n\t\tif (oResult instanceof JobDataMap){\n\t\t\tJobDataMap resultAsJobDataMap = (JobDataMap) oResult;\n\t\t\tresultAsJobDataMap.put(RETURN_CODE, this.result);\n\t\t} else {\n\t\t\tjobExecutionContext.setResult(this.result);\n\t\t}\n\t}\n\t\n\tafter(X self): \n\t\texecution(protected KCall.new(..)) && this(self) {\n\n\t\t\/\/logger.debug(\"ASPECT AFTER:protected execution(protected KCall.new(..)) && this(self)\");\n\t\t\/\/logger.debug(\"self=\"+self);\n\t\tself.setRestartedFireInstanceId(root.getRestartedFireInstanceId()); \n\t\tself.setForEachListener(root.getForEachListener());\n\t\t\/\/logger.debug(\"restartedFireInstanceId=\"+self.getRestartedFireInstanceId()); \n\t\t\/\/logger.debug(\"forEachListener=\"+self.getForEachListener());\n\t}\n\n\tafter(X self): \n\t\texecution(protected KProcess.new(..)) && this(self) {\n\n\t\t\/\/logger.debug(\"ASPECT AFTER:protected execution(protected KProcess.new(..)) && this(self)\");\n\t\t\/\/logger.debug(\"self=\"+self);\n\t\tself.setRestartedFireInstanceId(root.getRestartedFireInstanceId()); \n\t\tself.setForEachListener(root.getForEachListener());\n\t\t\/\/logger.debug(\"restartedFireInstanceId=\"+self.getRestartedFireInstanceId()); \n\t\t\/\/logger.debug(\"forEachListener=\"+self.getForEachListener());\n\t}\n\n    pointcut enter(KCall _kCall): call(* org.parallelj.internal.kernel.callback.Entry+.enter(KCall)) && args(_kCall);\n    pointcut invoke(): call(public Object Method.invoke(Object, ..)) && !within(QuartzContextAdapter);\n\n\/\/ Runnable program. ----------------------------------------------------------------------------------------------------------------------------------\n\n    public interface Y {};\n    \n  \tprivate Object Y.context = null;\n  \t\n  \tpublic Object Y.getContext() {\n  \t\treturn context;\n  \t}\n  \t\n  \tpublic void Y.setContext(Object context) {\n  \t\tthis.context=context;\n  \t}\n    \n    declare parents:           \n\t\t(java.lang.Runnable+ ) implements X, Y;    \n    \n    \/\/ 1) Transfert from RunnableCall to Runnable. \n  \tafter(Object self) returning (Runnable ret): \n    \t execution(* org.parallelj.internal.kernel.procedure.RunnableProcedure.RunnableCall.toRunnable())\n      && this(self)  {\n    \t\n    \t ((X)ret).setForEachListener(((X)self).getForEachListener());\n    \t ((X)ret).setRestartedFireInstanceId(((X)self).getRestartedFireInstanceId());\n    \t ((Y)ret).setContext(((org.parallelj.internal.kernel.KCall)self).getContext());\n    }\n    \n     \/\/ 2) Interception around call of run.      \n     void around(Object self): call(* run(..))\n     && within(org.parallelj.internal.kernel.procedure.RunnableProcedure.RunnableCall)\n     && within(Runnable+)  && this(self)  {\n    \t \n    \t String restartedFireInstanceId = ((X) self).getRestartedFireInstanceId();\n    \t ForEachListener forEachListener = ((X)self).getForEachListener();\t\n    \t Object program =  ((Y)self).getContext();\n    \t \n    \t if (isToProcess(restartedFireInstanceId,forEachListener,program)) {\n    \t\ttry { \n    \t\t\tproceed(self);\n     \t\t\tif (isTrackNRestartAnnoted(program)) {\n     \t\t\t\tString oid = getOID(program);\n   \t\t\t\t\ttrack(forEachListener, oid, true);\n     \t\t\t}\n    \t\t} catch (Exception e) {\n \t\t\t\tif (isTrackNRestartAnnoted(program)){\n \t\t\t\t\tString oid = getOID(program);\n \t\t\t\t\tif (isTrackNRestartExceptionPermitted(program, e)) {\n \t\t\t\t\t\tthis.result = ReturnCodes.FAILURE.name();\n\t \t\t\t\t\ttrack(forEachListener, oid, false);\n\t\t\t\t\t} else {\n\t\t\t\t\t\tabortAbruptly(new TrackNRestartException(\"Exception thrown (\"+e.getClass().getName()+\") is not in list of permitted exceptions \"+filteredExceptionsAsString(getTrackNRestartAnnotedException(program))));\n\t\t\t\t\t}\n \t\t\t\t}\n    \t\t}\n     \t} else {\n     \t\tif (isTrackNRestartAnnoted(program)) {\n \t\t\t\tString oid = getOID(program);\n \t\t\t\ttrack(forEachListener, oid, true);\n\t\t\t} else {\n\t\t\t\tabortAbruptly(new TrackNRestartException(\"Unable to get iteration OID while 'tracking' context.\"));\n \t\t\t}\n     \t}\n     }\n     \n     \/**\n      * Track the execution (success or failure).\n      * @param forEachListener listener handling Quartz backend.\n      * @param oid unique identifier\n      * @param success boolean indicating if processing is a success or a failure.\n      *\/\n     private void track(ForEachListener forEachListener, String oid, boolean success) {\n\t     try {\n\t\t\t\tforEachListener.forEachInstanceComplete(oid, success);\n\t     } catch (JobPersistenceException e) {\n\t\t\t\tabortAbruptly(new TrackNRestartException(e));\n\/\/\t\t\t\tthrow new TrackNRestartException(\"Unable to read status for iteration '\"+ oid + \"'.\", e);\n\t\t} catch (SQLException e) {\n\t\t\t\tabortAbruptly(new TrackNRestartException(e));\n\/\/\t\t\t\tthrow new TrackNRestartException(\"Unable to read status for iteration '\"+ oid + \"'.\", e);\n\t\t}\n     }\n    \n \n\/\/ restart part ----------------------------------------------------------------------------------------------------------------------------------------\n     \n     Object around(Object oo, KCall _kCall)  :\n        invoke() && args(oo, ..) && cflow(enter(_kCall)) {\n         \n    \tif (isToProcess( ((X) _kCall).getRestartedFireInstanceId(),((X) _kCall).getForEachListener(), oo)) {\n               return proceed(oo, _kCall);\n        } else {\n               return null;\n        }\n     }\n\n    \/**\n     * Check if an iterable must be processed. This means if the iterable is not already processed or the element was processed in error.\n     * @param restartedFireInstanceId id of the batch to be restarted.\n     * @param forEachListener listener handling request to Quartz. \n     * @param program instance of the program processing the iterable. \n     * @return true iterable has to be processed, false else.\n     *\/\n    private boolean isToProcess(String restartedFireInstanceId,  ForEachListener forEachListener, Object program)   {\n\t\tboolean result = true;\n\t\tif (program != null) {\n\t\t\tif (program.getClass().isAnnotationPresent(TrackNRestart.class)) {\n\t\t\t\tString oid = getOID(program);\n\t\t\t\tif (oid != null) {\n\t\t\t\t\tif (restartedFireInstanceId != null) {\n\t\t\t\t\t\t\/\/ logger.debug(\"Processing in restarting mode for oid : [\"\n\t\t\t\t\t\t\/\/ + oid + \"] ,program : [\" + program +\n\t\t\t\t\t\t\/\/ \"] ,instanceId :[\" +instanceId+ \"]\");\n\t\t\t\t\t\ttry {\n\t\t\t\t\t\t\tresult = !forEachListener.isForEachInstanceIgnorable(restartedFireInstanceId, oid);\n\t\t\t\t\t\t\t\/\/ logger.debug(result ?\n\t\t\t\t\t\t\t\/\/ \"This OID has not been already processed or\" +\n\t\t\t\t\t\t\t\/\/ \" already processed in error, so its processing is not skipped\":\n\t\t\t\t\t\t\t\/\/ \"This OID (\"+oid+\") has been already successfully processed, so its processing is skipped\");\n\t\t\t\t\t\t} catch (JobPersistenceException e) {\n\t\t\t\t\t\t\tabortAbruptly(new TrackNRestartException(e));\n\/\/\t\t\t\t\t\t\tthrow new TrackNRestartException(\n\/\/\t\t\t\t\t\t\t\t\t\"Unable to read status for iteration '\"\n\/\/\t\t\t\t\t\t\t\t\t\t\t+ oid + \"'.\", e);\n\t\t\t\t\t\t} catch (SQLException e) {\n\t\t\t\t\t\t\tabortAbruptly(new TrackNRestartException(e));\n\/\/\t\t\t\t\t\t\tthrow new TrackNRestartException(\n\/\/\t\t\t\t\t\t\t\t\t\"Unable to read status for iteration '\"\n\/\/\t\t\t\t\t\t\t\t\t\t\t+ oid + \"'.\", e);\n\t\t\t\t\t\t}\n\t\t\t\t\t} else {\n\t\t\t\t\t\t\/\/ logger.debug(\"Processing in normal mode (ie not restarting mode) for : [\"\n\t\t\t\t\t\t\/\/ + oid + \"] ,program : [\" + program + \"]\");\n\t\t\t\t\t}\n\t\t\t\t} else {\n\t\t\t\t\tabortAbruptly(new TrackNRestartException(\"Unable to get iteration OID while 'restarting' context.\"));\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t\treturn result;\n\t}\n    \n    \/**\n     * Get unique identifier returned by the program (the program contains value to be processed).\n     * @param program\n     * @return unique identifier.\n     *\/\n\tprivate String getOID(Object program) {\n\t\tString result = null;\n\t\ttry {\n\t\t\tMethod m = program.getClass().getDeclaredMethod(\"getOID\", new Class[] {});\n\t\t\treturn (String) m.invoke(program, new Object[] {});\n\t\t} catch (SecurityException e) {\n\t\t\tabortAbruptly(new TrackNRestartException(e));\n\t\t} catch (NoSuchMethodException e) {\n\t\t\tabortAbruptly(e);\n\/\/\t\t\tthrow new TrackNRestartException(\n\/\/\t\t\t\t\t\"No getOID() method found while program \" + program\n\/\/\t\t\t\t\t\t\t+ \" was annotated @TrackNRestart.\", e1);\n\t\t} catch (IllegalArgumentException e) {\n\t\t\tabortAbruptly(new TrackNRestartException(e));\n\t\t} catch (IllegalAccessException e) {\n\t\t\tabortAbruptly(new TrackNRestartException(e));\n\t\t} catch (InvocationTargetException e) {\n\t\t\tabortAbruptly(new TrackNRestartException(e));\n\t\t}\n\t\t\n\t\treturn result;\n\t}\n\t\n\t\/**\n\t * Indicate of the Program contains annotation TrackNRestart.\n\t * @param program\n\t * @return true if program is annoted.\n\t *\/\n\tprivate boolean isTrackNRestartAnnoted(Object program) {\n\t\treturn program.getClass().isAnnotationPresent(TrackNRestart.class);\n\t}\n\n\t\/**\n\t * Check if the raised exception belong to the allowed ones in TrackNRestart annotation.\n\t * @param program\n\t * @param exception raised\n\t * @return true if exception is allowed, false else.\n\t *\/\n\tprivate boolean isTrackNRestartExceptionPermitted(Object program, Exception exception) {\n\t\tboolean result = false;\n\t\tClass<? extends Throwable>[] filteredExceptions =  getTrackNRestartAnnotedException(program);\n\t\tfor (int i = 0; i < filteredExceptions.length; i++) {\n\t\t\t\tif (filteredExceptions[i].isAssignableFrom(exception.getClass())) {\n\t\t\t\t\treturn true;\n\t\t\t}\n\t\t}\n\t\treturn false;\n\t}\n\t\n\t\/**\n\t * Return exceptions defined in TrackNRestart annotation.\n\t * @param program\n\t * @return array of exceptions\n\t *\/\n\tprivate Class<? extends Throwable>[] getTrackNRestartAnnotedException (Object program) {\n\t\treturn program.getClass().getAnnotation(TrackNRestart.class).filteredExceptions();\n\t}\n\t\n\t\n\/\/ tracking part ----------------------------------------------------------------------------------------------------------------------------------------\n   after(Object oo, KCall _kCall) returning :\n    \tinvoke() && args(oo, ..) && cflow(enter(_kCall)) {\n\t\t\n\t\t\/\/logger.debug(\"ASPECT AFTER RETURNING\");\n\t\t\/\/logger.debug(\"_KCall=\"+_kCall);\n\t\ttrack(_kCall, oo, true, null);\n    }\n\n    after(Object oo, KCall _kCall) throwing (InvocationTargetException ite) : \n    \tinvoke() && args(oo, ..) && cflow(enter(_kCall)) {\n\t\t\n\t\t\/\/logger.debug(\"ASPECT AFTER THROWING (InvocationTargetException)\");\n\t\t\/\/logger.debug(\"_KCall=\"+_kCall);\n\t\tthis.result = ReturnCodes.FAILURE.name();\n\t\ttrack(_kCall, oo, false, ite);\n    }\n\n    \n\tprivate void track(KCall _kCall, Object program, boolean success,\n\t\t\tInvocationTargetException ite) {\n\t\tString oid = null;\n\n\t\ttry {\n\t\t\tif (program != null) {\n\t\t\t\tClass<? extends Object> clazz = program.getClass();\n\t\t\t\tif (clazz.isAnnotationPresent(TrackNRestart.class)) {\n\t\t\t\t\toid = getOID(program);\n\t\t\t\t\tif (oid != null) {\n\t\t\t\t\t\tif (success == true) {\n\t\t\t\t\t\t\tpersist(_kCall, success, oid);\n\t\t\t\t\t\t} else {\n\t\t\t\t\t\t\tClass<? extends Throwable>[] filteredExceptions = clazz\n\t\t\t\t\t\t\t\t\t.getAnnotation(TrackNRestart.class)\n\t\t\t\t\t\t\t\t\t.filteredExceptions();\n\t\t\t\t\t\t\tif (isIteCausePermittedInList(ite,\n\t\t\t\t\t\t\t\t\tfilteredExceptions)) {\n\t\t\t\t\t\t\t\tpersist(_kCall, success, oid);\n\t\t\t\t\t\t\t} else {\n\t\t\t\t\t\t\t\tabortAbruptly(\n\t\t\t\t\t\t\t\t\t\tnew TrackNRestartException(\n\t\t\t\t\t\t\t\t\t\t\t\t\"Exception thrown (\"\n\t\t\t\t\t\t\t\t\t\t\t\t+ ite.getCause().getClass().getName()\n\t\t\t\t\t\t\t\t\t\t\t\t+ \") is not in list of permitted exceptions \"\n\t\t\t\t\t\t\t\t\t\t\t\t+ filteredExceptionsAsString(filteredExceptions)));\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t\t\/\/if (logger.isDebugEnabled()) {\n\t\t\t\t\t\t\t\/\/ logger.debug(\"oid='\" + oid +\n\t\t\t\t\t\t\t\/\/ \"' persisted with status='\" + (success ?\n\t\t\t\t\t\t\t\/\/ ReturnCodes.SUCCESS : ReturnCodes.FAILURE) + \"' \"+ (ite ==\n\t\t\t\t\t\t\t\/\/ null ? \"\" : \", cause : \" + ite.getCause()));\n\t\t\t\t\t\t\/\/}\n\t\t\t\t\t} else {\n\t\t\t\t\t\tabortAbruptly(new TrackNRestartException(\"Unable to get iteration OID while 'tracking' context.\"));\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t} catch (JobPersistenceException e) {\n\t\t\tabortAbruptly(new TrackNRestartException(e));\n\/\/\t\t\tthrow new TrackNRestartException(\"Unable to persist status ['\"\n\/\/\t\t\t\t\t+ (success ? ReturnCodes.SUCCESS : ReturnCodes.FAILURE)\n\/\/\t\t\t\t\t+ \"'] for iteration '\" + oid + \"'.\", e);\n\t\t} catch (SQLException e) {\n\t\t\tabortAbruptly(new TrackNRestartException(e));\n\/\/\t\t\tthrow new TrackNRestartException(\"Unable to persist status ['\"\n\/\/\t\t\t\t\t+ (success ? ReturnCodes.SUCCESS : ReturnCodes.FAILURE)\n\/\/\t\t\t\t\t+ \"'] for iteration '\" + oid + \"'.\", e);\n\t\t}\n\t}\n\n\tprivate boolean isIteCausePermittedInList(InvocationTargetException ite,\n\t\t\tClass<? extends Throwable>[] filteredExceptions) {\n\t\tfor (int i = 0; i < filteredExceptions.length; i++) {\n\t\t\tif (filteredExceptions[i].isAssignableFrom(ite.getCause()\n\t\t\t\t\t.getClass()))\n\t\t\t\treturn true;\n\t\t}\n\t\treturn false;\n\t}\n\n\tprivate String filteredExceptionsAsString(\n\t\t\tClass<? extends Throwable>[] filteredExceptions) {\n\t\tStringBuffer sb = new StringBuffer();\n\t\tsb.append(\"[\");\n\t\tfor (int i = 0; i < filteredExceptions.length; i++) {\n\t\t\tif (i > 0)\n\t\t\t\tsb.append(\", \");\n\t\t\tsb.append(filteredExceptions[i].getName());\n\t\t}\n\t\tsb.append(\"]\");\n\t\treturn sb.toString();\n\t}\n\n\tprivate void persist(KCall _kCall, boolean success, String oid)\n\t\t\tthrows JobPersistenceException, SQLException {\n\t\t((X) _kCall).getForEachListener().forEachInstanceComplete(oid, success);\n\t}\n\n\tprivate void abortAbruptly(Throwable t) {\n\t\tthis.result = \"ABORTED\";\n\t\tPrograms.as((Adapter) this.root).abort();\n\t\tthis.root.exceptionThrown = t;\n\t}\n\n}\n","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"764c4345780810bc6f0fd6d6e13dceafc6b8d2e4","subject":"XWIKI-10321: Limit the impact on some APIs","message":"XWIKI-10321: Limit the impact on some APIs\n","repos":"xwiki\/xwiki-platform,xwiki\/xwiki-platform,xwiki\/xwiki-platform,xwiki\/xwiki-platform,xwiki\/xwiki-platform","old_file":"xwiki-platform-core\/xwiki-platform-legacy\/xwiki-platform-legacy-oldcore\/src\/main\/aspect\/com\/xpn\/xwiki\/util\/UtilCompatibilityAspect.aj","new_file":"xwiki-platform-core\/xwiki-platform-legacy\/xwiki-platform-legacy-oldcore\/src\/main\/aspect\/com\/xpn\/xwiki\/util\/UtilCompatibilityAspect.aj","new_contents":"\/*\n * See the NOTICE file distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This is free software; you can redistribute it and\/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF site: http:\/\/www.fsf.org.\n *\/\npackage com.xpn.xwiki.util;\n\nimport java.io.Reader;\nimport java.io.File;\nimport java.io.InputStream;\nimport java.io.IOException;\nimport java.util.List;\nimport org.xwiki.security.authorization.ContextualAuthorizationManager;\nimport org.xwiki.security.authorization.Right;\n\nimport com.xpn.xwiki.XWiki;\nimport com.xpn.xwiki.web.Utils;\nimport org.apache.oro.text.regex.MalformedPatternException;\nimport org.apache.commons.io.FileUtils;\nimport org.apache.commons.io.IOUtils;\n\n\/**\n * Add a backward compatibility layer to the {@link com.xpn.xwiki.util.Util} class.\n * \n * @version $Id$\n *\/\npublic privileged aspect UtilCompatibilityAspect\n{\n    \/**\n     * @deprecated use {@link #getUniqueMatches(String, String, int)} instead\n     *\/\n    @Deprecated\n    public List<String> Util.getMatches(String content, String spattern, int group)\n        throws MalformedPatternException\n    {\n        return this.getUniqueMatches(content, spattern, group);\n    }\n\n    \/** @deprecated Use {@link org.apache.commons.io.FileUtils#readFileToString(File, String)} *\/\n    @Deprecated\n    public static String Util.getFileContent(File file) throws IOException\n    {\n        ContextualAuthorizationManager authorization = Utils.getComponent(ContextualAuthorizationManager.class);\n        if (!authorization.hasAccess(Right.PROGRAM)) {\n            throw new IOException(\"Access denied.\");\n        }\n        return FileUtils.readFileToString(file, XWiki.DEFAULT_ENCODING);\n    }\n\n    \/** @deprecated Use {@link org.apache.commons.io.IOUtils#toString(Reader)} *\/\n    @Deprecated\n    public static String Util.getFileContent(Reader reader) throws IOException\n    {\n        ContextualAuthorizationManager authorization = Utils.getComponent(ContextualAuthorizationManager.class);\n        if (!authorization.hasAccess(Right.PROGRAM)) {\n            throw new IOException(\"Access denied.\");\n        }\n        return IOUtils.toString(reader);\n    }\n\n    \/** @deprecated Use {@link org.apache.commons.io.FileUtils#readFileToByteArray(File)} *\/\n    @Deprecated\n    public static byte[] Util.getFileContentAsBytes(File file) throws IOException\n    {\n        ContextualAuthorizationManager authorization = Utils.getComponent(ContextualAuthorizationManager.class);\n        if (!authorization.hasAccess(Right.PROGRAM)) {\n            throw new IOException(\"Access denied.\");\n        }\n        return FileUtils.readFileToByteArray(file);\n    }\n\n    \/** @deprecated Use {@link org.apache.commons.io.IOUtils#toByteArray(InputStream)} *\/\n    @Deprecated\n    public static byte[] Util.getFileContentAsBytes(InputStream is) throws IOException\n    {\n        ContextualAuthorizationManager authorization = Utils.getComponent(ContextualAuthorizationManager.class);\n        if (!authorization.hasAccess(Right.PROGRAM)) {\n            throw new IOException(\"Access denied.\");\n        }\n        return IOUtils.toByteArray(is);\n    }\n}\n","old_contents":"\/*\n * See the NOTICE file distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This is free software; you can redistribute it and\/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF site: http:\/\/www.fsf.org.\n *\/\npackage com.xpn.xwiki.util;\n\nimport java.io.Reader;\nimport java.io.File;\nimport java.io.InputStream;\nimport java.io.IOException;\nimport java.util.List;\n\nimport com.xpn.xwiki.XWiki;\nimport org.apache.oro.text.regex.MalformedPatternException;\nimport org.apache.commons.io.FileUtils;\nimport org.apache.commons.io.IOUtils;\n\n\/**\n * Add a backward compatibility layer to the {@link com.xpn.xwiki.util.Util} class.\n * \n * @version $Id$\n *\/\npublic privileged aspect UtilCompatibilityAspect\n{\n    \/**\n     * @deprecated use {@link #getUniqueMatches(String, String, int)} instead\n     *\/\n    @Deprecated\n    public List<String> Util.getMatches(String content, String spattern, int group)\n        throws MalformedPatternException\n    {\n        return this.getUniqueMatches(content, spattern, group);\n    }\n\n    \/** @deprecated Use {@link org.apache.commons.io.FileUtils#readFileToString(File, String)} *\/\n    @Deprecated\n    public static String Util.getFileContent(File file) throws IOException\n    {\n        return FileUtils.readFileToString(file, XWiki.DEFAULT_ENCODING);\n    }\n\n    \/** @deprecated Use {@link org.apache.commons.io.IOUtils#toString(Reader)} *\/\n    @Deprecated\n    public static String Util.getFileContent(Reader reader) throws IOException\n    {\n        return IOUtils.toString(reader);\n    }\n\n    \/** @deprecated Use {@link org.apache.commons.io.FileUtils#readFileToByteArray(File)} *\/\n    @Deprecated\n    public static byte[] Util.getFileContentAsBytes(File file) throws IOException\n    {\n        return FileUtils.readFileToByteArray(file);\n    }\n\n    \/** @deprecated Use {@link org.apache.commons.io.IOUtils#toByteArray(InputStream)} *\/\n    @Deprecated\n    public static byte[] Util.getFileContentAsBytes(InputStream is) throws IOException\n    {\n        return IOUtils.toByteArray(is);\n    }\n}\n","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"3b3888ec9d8793ff4f1b49c069e90c73fb08f312","subject":"*Event id fixed for unlock event","message":"*Event id fixed for unlock event","repos":"selig\/qea","old_file":"code\/qea\/src\/benchmark\/competition\/java\/jUnitRV_MMT\/monitoring\/JUnitRV_MMTThreeAspect.aj","new_file":"code\/qea\/src\/benchmark\/competition\/java\/jUnitRV_MMT\/monitoring\/JUnitRV_MMTThreeAspect.aj","new_contents":"package benchmark.competition.java.jUnitRV_MMT.monitoring;\r\n\r\nimport java.util.concurrent.locks.Lock;\r\n\r\nimport monitoring.impl.MonitorFactory;\r\nimport monitoring.intf.Monitor;\r\nimport properties.Property;\r\nimport properties.competition.JavaRV_mmt;\r\nimport structure.impl.other.Verdict;\r\nimport structure.intf.QEA;\r\nimport benchmark.competition.java.jUnitRV_MMT.ExampleLocking;\r\n\r\npublic aspect JUnitRV_MMTThreeAspect {\r\n\r\n\tprivate final Monitor monitor;\r\n\r\n\tprivate final int RUN = 1;\r\n\tprivate final int LOCK_TRUE = 2;\r\n\tprivate final int UNLOCK = 3;\r\n\tprivate final int ACTION = 4;\r\n\r\n\tpublic JUnitRV_MMTThreeAspect() {\r\n\t\tQEA qea = new JavaRV_mmt().make(Property.JAVARV_MMT_THREE);\r\n\t\tmonitor = MonitorFactory.create(qea);\r\n\t}\r\n\r\n\tpointcut run(ExampleLocking thread) : execution(void ExampleLocking.run())\r\n\t\t&& target(thread);\r\n\r\n\tpointcut action(ExampleLocking thread) : call(void ExampleLocking.action())\r\n\t\t&& target(thread);\r\n\r\n\tbefore(ExampleLocking thread) : run(thread) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(RUN, thread);\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [thread=\"\r\n\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n\tboolean around(Lock lockObj, ExampleLocking thread) :\r\n\t\t\tcall(boolean Lock.tryLock())\r\n\t\t\t&& cflow(call(boolean ExampleLocking.lock())) && target(lockObj)\r\n\t\t\t&& this(thread) {\r\n\r\n\t\tboolean result = false;\r\n\t\t\/\/ We perform the lock and the monitor step as an atomic action\r\n\t\t\/\/ i.e. whilst holding the lockObj, so that we cannot be interrupted\r\n\t\tsynchronized (lockObj) {\r\n\t\t\tresult = proceed(lockObj, thread);\t\t\r\n\t\t\tif (result) {\r\n\t\t\t\tVerdict verdict = null;\r\n\t\t\t\t\/\/ Ordering between lockObj and monitor important\r\n\t\t\t\tsynchronized (monitor) {\r\n\t\t\t\t\tverdict = monitor.step(LOCK_TRUE, thread);\r\n\t\t\t\t}\r\n\t\t\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\t\t\tSystem.err\r\n\t\t\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [thread=\"\r\n\t\t\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t\t\t}\r\n\t\r\n\t\t\t}\r\n\t\t}\r\n\t\treturn result;\r\n\t};\r\n\r\n\tvoid around(Lock lockObj, ExampleLocking thread) :\r\n\t\tcall(void Lock.unlock()) && cflow(call(void ExampleLocking.unlock()))\r\n\t\t&& target(lockObj) && this(thread) {\r\n\r\n\t\t\/\/ We perform the unlock and the monitor step as an atomic action\r\n\t\t\/\/ i.e. whilst holding the lockObj, so that we cannot be interrupted\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (lockObj) {\r\n\t\t\tproceed(lockObj, thread);\t\r\n\t\t\t\/\/ Ordering between lockObj and monitor important\r\n\t\t\tsynchronized (monitor) {\r\n\t\t\t\tverdict = monitor.step(UNLOCK, thread);\r\n\t\t\t}\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [thread=\"\r\n\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n\tbefore(ExampleLocking thread) : action(thread) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(ACTION, thread);\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [id=\"\r\n\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n}\r\n","old_contents":"package benchmark.competition.java.jUnitRV_MMT.monitoring;\r\n\r\nimport java.util.concurrent.locks.Lock;\r\n\r\nimport monitoring.impl.MonitorFactory;\r\nimport monitoring.intf.Monitor;\r\nimport properties.Property;\r\nimport properties.competition.JavaRV_mmt;\r\nimport structure.impl.other.Verdict;\r\nimport structure.intf.QEA;\r\nimport benchmark.competition.java.jUnitRV_MMT.ExampleLocking;\r\n\r\npublic aspect JUnitRV_MMTThreeAspect {\r\n\r\n\tprivate final Monitor monitor;\r\n\r\n\tprivate final int RUN = 1;\r\n\tprivate final int LOCK_TRUE = 2;\r\n\tprivate final int UNLOCK = 3;\r\n\tprivate final int ACTION = 4;\r\n\r\n\tpublic JUnitRV_MMTThreeAspect() {\r\n\t\tQEA qea = new JavaRV_mmt().make(Property.JAVARV_MMT_THREE);\r\n\t\tmonitor = MonitorFactory.create(qea);\r\n\t}\r\n\r\n\tpointcut run(ExampleLocking thread) : execution(void ExampleLocking.run())\r\n\t\t&& target(thread);\r\n\r\n\tpointcut action(ExampleLocking thread) : call(void ExampleLocking.action())\r\n\t\t&& target(thread);\r\n\r\n\tbefore(ExampleLocking thread) : run(thread) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(RUN, thread);\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [thread=\"\r\n\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n\tboolean around(Lock lockObj, ExampleLocking thread) :\r\n\t\t\tcall(boolean Lock.tryLock())\r\n\t\t\t&& cflow(call(boolean ExampleLocking.lock())) && target(lockObj)\r\n\t\t\t&& this(thread) {\r\n\r\n\t\tboolean result = false;\r\n\t\t\/\/ We perform the lock and the monitor step as an atomic action\r\n\t\t\/\/ i.e. whilst holding the lockObj, so that we cannot be interrupted\r\n\t\tsynchronized (lockObj) {\r\n\t\t\tresult = proceed(lockObj, thread);\t\t\r\n\t\t\tif (result) {\r\n\t\t\t\tVerdict verdict = null;\r\n\t\t\t\t\/\/ Ordering between lockObj and monitor important\r\n\t\t\t\tsynchronized (monitor) {\r\n\t\t\t\t\tverdict = monitor.step(LOCK_TRUE, thread);\r\n\t\t\t\t}\r\n\t\t\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\t\t\tSystem.err\r\n\t\t\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [thread=\"\r\n\t\t\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t\t\t}\r\n\t\r\n\t\t\t}\r\n\t\t}\r\n\t\treturn result;\r\n\t};\r\n\r\n\tvoid around(Lock lockObj, ExampleLocking thread) :\r\n\t\tcall(void Lock.unlock()) && cflow(call(void ExampleLocking.unlock()))\r\n\t\t&& target(lockObj) && this(thread) {\r\n\r\n\t\t\/\/ We perform the unlock and the monitor step as an atomic action\r\n\t\t\/\/ i.e. whilst holding the lockObj, so that we cannot be interrupted\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (lockObj) {\r\n\t\t\tproceed(lockObj, thread);\t\r\n\t\t\t\/\/ Ordering between lockObj and monitor important\r\n\t\t\tsynchronized (monitor) {\r\n\t\t\t\tverdict = monitor.step(LOCK_TRUE, thread);\r\n\t\t\t}\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [thread=\"\r\n\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n\tbefore(ExampleLocking thread) : action(thread) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(ACTION, thread);\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [id=\"\r\n\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t}\r\n\t};\r\n\r\n}\r\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"061b2463070e4a2150012d47e5a650bc5ef851ca","subject":"Add @AjSuppressWarnings on static mocks","message":"Add @AjSuppressWarnings on static mocks\n\nIssue: SPR-12447\n","repos":"spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework","old_file":"spring-aspects\/src\/main\/java\/org\/springframework\/mock\/staticmock\/AnnotationDrivenStaticEntityMockingControl.aj","new_file":"spring-aspects\/src\/main\/java\/org\/springframework\/mock\/staticmock\/AnnotationDrivenStaticEntityMockingControl.aj","new_contents":"\/*\n * Copyright 2002-2014 the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.springframework.mock.staticmock;\n\nimport org.aspectj.lang.annotation.RequiredTypes;\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\n\n\/**\n * Annotation-based aspect to use in test builds to enable mocking of static methods\n * on JPA-annotated {@code @Entity} classes, as used by Spring Roo for so-called\n * <em>finder methods<\/em>.\n *\n * <p>Mocking will occur within the call stack of any {@code public} method in a\n * class (typically a test class) that is annotated with {@code @MockStaticEntityMethods}.\n * Thus mocking is not limited to {@code @Test} methods. Furthermore, new mock\n * state will be created for the invocation of each such public method, even when\n * the method is invoked from another such public method.\n *\n * <p>This aspect also provides static methods to simplify the programming model for\n * setting expectations and entering playback mode.\n *\n * <h3>Usage<\/h3>\n * <ol>\n * <li>Annotate a test class with {@code @MockStaticEntityMethods}.\n * <li>In each test method, the {@code AnnotationDrivenStaticEntityMockingControl}\n * will begin in <em>recording<\/em> mode.\n * <li>Invoke static methods on JPA-annotated {@code @Entity} classes, with each\n * recording-mode invocation being followed by an invocation of either\n * {@link #expectReturn(Object)} or {@link #expectThrow(Throwable)} on the\n * {@code AnnotationDrivenStaticEntityMockingControl}.\n * <li>Invoke the {@link #playback()} method.\n * <li>Call the code you wish to test that uses the static methods on the\n * JPA-annotated {@code @Entity} classes.\n * <li>Verification will occur automatically after the test method has executed\n * and returned. However, mock verification will not occur if the test method\n * throws an exception.\n * <\/ol>\n *\n * <h3>Programmatic Control of the Mock<\/h3>\n * <p>For scenarios where it would be convenient to programmatically <em>verify<\/em>\n * the recorded expectations or <em>reset<\/em> the state of the mock, consider\n * using combinations of {@link #verify()} and {@link #reset()}.\n *\n * @author Rod Johnson\n * @author Ramnivas Laddad\n * @author Sam Brannen\n * @see MockStaticEntityMethods\n *\/\n@RequiredTypes(\"javax.persistence.Entity\")\npublic aspect AnnotationDrivenStaticEntityMockingControl extends AbstractMethodMockingControl {\n\n\t\/**\n\t * Expect the supplied {@link Object} to be returned by the previous static\n\t * method invocation.\n\t * @see #playback()\n\t *\/\n\tpublic static void expectReturn(Object retVal) {\n\t\tAnnotationDrivenStaticEntityMockingControl.aspectOf().expectReturnInternal(retVal);\n\t}\n\n\t\/**\n\t * Expect the supplied {@link Throwable} to be thrown by the previous static\n\t * method invocation.\n\t * @see #playback()\n\t *\/\n\tpublic static void expectThrow(Throwable throwable) {\n\t\tAnnotationDrivenStaticEntityMockingControl.aspectOf().expectThrowInternal(throwable);\n\t}\n\n\t\/**\n\t * Stop recording mock expectations and enter <em>playback<\/em> mode.\n\t * @see #expectReturn(Object)\n\t * @see #expectThrow(Throwable)\n\t *\/\n\tpublic static void playback() {\n\t\tAnnotationDrivenStaticEntityMockingControl.aspectOf().playbackInternal();\n\t}\n\n\t\/**\n\t * Verify that all expectations have been fulfilled.\n\t * @since 4.0.2\n\t * @see #reset()\n\t *\/\n\tpublic static void verify() {\n\t\tAnnotationDrivenStaticEntityMockingControl.aspectOf().verifyInternal();\n\t}\n\n\t\/**\n\t * Reset the state of the mock and enter <em>recording<\/em> mode.\n\t * @since 4.0.2\n\t * @see #verify()\n\t *\/\n\tpublic static void reset() {\n\t\tAnnotationDrivenStaticEntityMockingControl.aspectOf().resetInternal();\n\t}\n\n\t\/\/ Apparently, the following pointcut was originally defined to only match\n\t\/\/ methods directly annotated with @Test (in order to allow methods in\n\t\/\/ @MockStaticEntityMethods classes to invoke each other without creating a\n\t\/\/ new mocking environment); however, this is no longer the case. The current\n\t\/\/ pointcut applies to all public methods in @MockStaticEntityMethods classes.\n\t@SuppressAjWarnings(\"adviceDidNotMatch\")\n\tprotected pointcut mockStaticsTestMethod() : execution(public * (@MockStaticEntityMethods *).*(..));\n\n\t@SuppressAjWarnings(\"adviceDidNotMatch\")\n\tprotected pointcut methodToMock() : execution(public static * (@javax.persistence.Entity *).*(..));\n\n}\n","old_contents":"\/*\n * Copyright 2002-2014 the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.springframework.mock.staticmock;\n\nimport org.aspectj.lang.annotation.RequiredTypes;\n\n\/**\n * Annotation-based aspect to use in test builds to enable mocking of static methods\n * on JPA-annotated {@code @Entity} classes, as used by Spring Roo for so-called\n * <em>finder methods<\/em>.\n *\n * <p>Mocking will occur within the call stack of any {@code public} method in a\n * class (typically a test class) that is annotated with {@code @MockStaticEntityMethods}.\n * Thus mocking is not limited to {@code @Test} methods. Furthermore, new mock\n * state will be created for the invocation of each such public method, even when\n * the method is invoked from another such public method.\n *\n * <p>This aspect also provides static methods to simplify the programming model for\n * setting expectations and entering playback mode.\n *\n * <h3>Usage<\/h3>\n * <ol>\n * <li>Annotate a test class with {@code @MockStaticEntityMethods}.\n * <li>In each test method, the {@code AnnotationDrivenStaticEntityMockingControl}\n * will begin in <em>recording<\/em> mode.\n * <li>Invoke static methods on JPA-annotated {@code @Entity} classes, with each\n * recording-mode invocation being followed by an invocation of either\n * {@link #expectReturn(Object)} or {@link #expectThrow(Throwable)} on the\n * {@code AnnotationDrivenStaticEntityMockingControl}.\n * <li>Invoke the {@link #playback()} method.\n * <li>Call the code you wish to test that uses the static methods on the\n * JPA-annotated {@code @Entity} classes.\n * <li>Verification will occur automatically after the test method has executed\n * and returned. However, mock verification will not occur if the test method\n * throws an exception.\n * <\/ol>\n *\n * <h3>Programmatic Control of the Mock<\/h3>\n * <p>For scenarios where it would be convenient to programmatically <em>verify<\/em>\n * the recorded expectations or <em>reset<\/em> the state of the mock, consider\n * using combinations of {@link #verify()} and {@link #reset()}.\n *\n * @author Rod Johnson\n * @author Ramnivas Laddad\n * @author Sam Brannen\n * @see MockStaticEntityMethods\n *\/\n@RequiredTypes(\"javax.persistence.Entity\")\npublic aspect AnnotationDrivenStaticEntityMockingControl extends AbstractMethodMockingControl {\n\n\t\/**\n\t * Expect the supplied {@link Object} to be returned by the previous static\n\t * method invocation.\n\t * @see #playback()\n\t *\/\n\tpublic static void expectReturn(Object retVal) {\n\t\tAnnotationDrivenStaticEntityMockingControl.aspectOf().expectReturnInternal(retVal);\n\t}\n\n\t\/**\n\t * Expect the supplied {@link Throwable} to be thrown by the previous static\n\t * method invocation.\n\t * @see #playback()\n\t *\/\n\tpublic static void expectThrow(Throwable throwable) {\n\t\tAnnotationDrivenStaticEntityMockingControl.aspectOf().expectThrowInternal(throwable);\n\t}\n\n\t\/**\n\t * Stop recording mock expectations and enter <em>playback<\/em> mode.\n\t * @see #expectReturn(Object)\n\t * @see #expectThrow(Throwable)\n\t *\/\n\tpublic static void playback() {\n\t\tAnnotationDrivenStaticEntityMockingControl.aspectOf().playbackInternal();\n\t}\n\n\t\/**\n\t * Verify that all expectations have been fulfilled.\n\t * @since 4.0.2\n\t * @see #reset()\n\t *\/\n\tpublic static void verify() {\n\t\tAnnotationDrivenStaticEntityMockingControl.aspectOf().verifyInternal();\n\t}\n\n\t\/**\n\t * Reset the state of the mock and enter <em>recording<\/em> mode.\n\t * @since 4.0.2\n\t * @see #verify()\n\t *\/\n\tpublic static void reset() {\n\t\tAnnotationDrivenStaticEntityMockingControl.aspectOf().resetInternal();\n\t}\n\n\t\/\/ Apparently, the following pointcut was originally defined to only match\n\t\/\/ methods directly annotated with @Test (in order to allow methods in\n\t\/\/ @MockStaticEntityMethods classes to invoke each other without creating a\n\t\/\/ new mocking environment); however, this is no longer the case. The current\n\t\/\/ pointcut applies to all public methods in @MockStaticEntityMethods classes.\n\tprotected pointcut mockStaticsTestMethod() : execution(public * (@MockStaticEntityMethods *).*(..));\n\n\tprotected pointcut methodToMock() : execution(public static * (@javax.persistence.Entity *).*(..));\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"dd73ba36aa7fd42f1ede7193da227b1cf597aca7","subject":"Make pointcut pick up subclasses of ScalaJavaBuilder.","message":"Make pointcut pick up subclasses of ScalaJavaBuilder.\n\nThis fixes a problem at a customer (cleaning output folders, leading to\nempty output folders after successful builds), but I could not reproduce\nlocally. Confirmed it works for said customer, so rolling back to main\nproject.\n\nFixed #1001995\n\n(cherry picked from commit bcd85b3a3af3b00b3cb195b2561c1c880feac0b9)","repos":"stephenh\/scala-ide,pilipolio\/scala-ide,dragos\/scala-ide,sschaef\/scala-ide,Kwestor\/scala-ide,stephenh\/scala-ide,mlangc\/scala-ide,mlangc\/scala-ide,sschaef\/scala-ide,aleksi-lukkarinen\/scala-ide,pilipolio\/scala-ide,aleksi-lukkarinen\/scala-ide,andrey-ilinykh\/scala-ide,Kwestor\/scala-ide,scala-ide\/scala-ide,Duhemm\/scala-ide,romanowski\/scala-ide,andrey-ilinykh\/scala-ide,dragos\/scala-ide,pilipolio\/scala-ide,wpopielarski\/scala-ide,andrey-ilinykh\/scala-ide,romanowski\/scala-ide,stephenh\/scala-ide,aleksi-lukkarinen\/scala-ide,scala-ide\/scala-ide,dragos\/scala-ide,pilipolio\/scala-ide,stephenh\/scala-ide,Duhemm\/scala-ide,Duhemm\/scala-ide,mlangc\/scala-ide,sschaef\/scala-ide,sschaef\/scala-ide,Duhemm\/scala-ide,Kwestor\/scala-ide,andrey-ilinykh\/scala-ide,scala-ide\/scala-ide,wpopielarski\/scala-ide,scala-ide\/scala-ide,dragos\/scala-ide,wpopielarski\/scala-ide,wpopielarski\/scala-ide,romanowski\/scala-ide,romanowski\/scala-ide,aleksi-lukkarinen\/scala-ide,mlangc\/scala-ide,Kwestor\/scala-ide","old_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/builderoptions\/ScalaJavaBuilderAspect.aj","new_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/builderoptions\/ScalaJavaBuilderAspect.aj","new_contents":"\/*\n * Copyright 2005-2010 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.builderoptions;\n\nimport org.eclipse.core.resources.IResource;\n\nimport java.util.Map;\n\nimport org.eclipse.core.resources.IProject;\nimport org.eclipse.core.resources.IResource;\nimport org.eclipse.core.runtime.CoreException;\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.internal.core.builder.BatchImageBuilder;\nimport org.eclipse.jdt.internal.core.builder.JavaBuilder;\n\/\/import org.eclipse.jdt.internal.core.builder.ClasspathMultiDirectory;\nimport org.eclipse.jdt.internal.core.util.Util;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect ScalaJavaBuilderAspect {\n  pointcut build() :\n    execution(IProject[] ScalaJavaBuilder+.build(int, Map, IProgressMonitor) throws CoreException);\n  \n  pointcut cleanOutputFolders(boolean copyBack) :\n    args(copyBack) &&\n    execution(void BatchImageBuilder.cleanOutputFolders(boolean) throws CoreException);\n  \n  pointcut isJavaLikeFileName(String fileName) :\n    args(fileName) &&\n    execution(boolean Util.isJavaLikeFileName(String));  \n  \n  pointcut filterExtraResource(IResource resource) :\n    args(resource) &&\n    execution(boolean JavaBuilder.filterExtraResource(IResource));\n  \n  void around(BatchImageBuilder builder, boolean copyBack) throws CoreException :\n    target(builder) &&\n    cleanOutputFolders(copyBack) &&\n    cflow(build()) {\n    \/\/ Suppress the cleaning behaviour but do the extra resource copying if requested\n    if (copyBack)\n      for (int i = 0, l = builder.sourceLocations.length; i < l; i++) {\n        org.eclipse.jdt.internal.core.builder.ClasspathMultiDirectory sourceLocation = builder.sourceLocations[i];\n        if (sourceLocation.hasIndependentOutputFolder)\n          builder.copyExtraResourcesBack(sourceLocation, false);\n      }\n  }\n  \n  boolean around(String fileName) :\n    isJavaLikeFileName(fileName) &&\n    cflow(build()) &&\n    !cflow(cleanOutputFolders(*)) {\n    if (fileName != null && fileName.endsWith(\"scala\"))\n      return false;\n    else\n      return proceed(fileName);\n  }\n  \n  boolean around(IResource resource) :\n    filterExtraResource(resource) &&\n    cflow(build()) {\n    return resource.getName().endsWith(\".scala\") || proceed(resource);\n  }\n}\n","old_contents":"\/*\n * Copyright 2005-2010 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.builderoptions;\n\nimport org.eclipse.core.resources.IResource;\n\nimport java.util.Map;\n\nimport org.eclipse.core.resources.IProject;\nimport org.eclipse.core.resources.IResource;\nimport org.eclipse.core.runtime.CoreException;\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.internal.core.builder.BatchImageBuilder;\nimport org.eclipse.jdt.internal.core.builder.JavaBuilder;\n\/\/import org.eclipse.jdt.internal.core.builder.ClasspathMultiDirectory;\nimport org.eclipse.jdt.internal.core.util.Util;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect ScalaJavaBuilderAspect {\n  pointcut build() :\n    execution(IProject[] ScalaJavaBuilder.build(int, Map, IProgressMonitor) throws CoreException);\n  \n  pointcut cleanOutputFolders(boolean copyBack) :\n    args(copyBack) &&\n    execution(void BatchImageBuilder.cleanOutputFolders(boolean) throws CoreException);\n  \n  pointcut isJavaLikeFileName(String fileName) :\n    args(fileName) &&\n    execution(boolean Util.isJavaLikeFileName(String));  \n  \n  pointcut filterExtraResource(IResource resource) :\n    args(resource) &&\n    execution(boolean JavaBuilder.filterExtraResource(IResource));\n  \n  void around(BatchImageBuilder builder, boolean copyBack) throws CoreException :\n    target(builder) &&\n    cleanOutputFolders(copyBack) &&\n    cflow(build()) {\n    \/\/ Suppress the cleaning behaviour but do the extra resource copying if requested\n    if (copyBack)\n      for (int i = 0, l = builder.sourceLocations.length; i < l; i++) {\n        org.eclipse.jdt.internal.core.builder.ClasspathMultiDirectory sourceLocation = builder.sourceLocations[i];\n        if (sourceLocation.hasIndependentOutputFolder)\n          builder.copyExtraResourcesBack(sourceLocation, false);\n      }\n  }\n  \n  boolean around(String fileName) :\n    isJavaLikeFileName(fileName) &&\n    cflow(build()) &&\n    !cflow(cleanOutputFolders(*)) {\n    if (fileName != null && fileName.endsWith(\"scala\"))\n      return false;\n    else\n      return proceed(fileName);\n  }\n  \n  boolean around(IResource resource) :\n    filterExtraResource(resource) &&\n    cflow(build()) {\n    return resource.getName().endsWith(\".scala\") || proceed(resource);\n  }\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"b79c64431cfd7a4169be4965dffc9923d0f6757d","subject":"* update aspects","message":"* update aspects","repos":"agentlab\/ru.agentlab.maia","old_file":"plugins\/ru.agentlab.maia.context\/aj-src\/ru\/agentlab\/maia\/context\/aj\/AMaiaContextFactory.aj","new_file":"plugins\/ru.agentlab.maia.context\/aj-src\/ru\/agentlab\/maia\/context\/aj\/AMaiaContextFactory.aj","new_contents":"package ru.agentlab.maia.context.aj;\n\nimport ru.agentlab.maia.context.IMaiaContext;\nimport ru.agentlab.maia.context.IMaiaContextFactory;\n\n\/**\n * Abstract aspect with pointcuts of {@link IMaiaContextFactory} methods\n * \n * @author Shishkin Dmitriy\n *\n *\/\npublic abstract aspect AMaiaContextFactory {\n\n\t\/**\n\t * When actual IMaiaContextFactory object is created\n\t *\/\n\tpublic pointcut onConstruct() : \n\t\texecution(IMaiaContextFactory+.new(..));\n\n\t\/**\n\t * When {@link IMaiaContextFactory} begin to create new {@link IMaiaContext}\n\t * \n\t * @param factory\n\t *            - factory that create new context\n\t * @param name\n\t *            - name for new context\n\t *\/\n\tpublic pointcut onCreateContext(IMaiaContextFactory factory) : \n\t\texecution(IMaiaContext IMaiaContextFactory+.createContext()) && \n\t\ttarget(factory) && \n\t\targs();\n\n}","old_contents":"package ru.agentlab.maia.context.aj;\n\nimport ru.agentlab.maia.context.IMaiaContext;\nimport ru.agentlab.maia.context.IMaiaContextFactory;\n\n\/**\n * Abstract aspect with pointcuts of {@link IMaiaContextFactory} methods\n * \n * @author Shishkin Dmitriy\n *\n *\/\npublic abstract aspect AMaiaContextFactory {\n\n\t\/**\n\t * When actual IMaiaContextFactory object is created\n\t *\/\n\tpublic pointcut onConstruct() : \n\t\texecution(IMaiaContextFactory+.new(..));\n\n\t\/**\n\t * When {@link IMaiaContextFactory} begin to create new child\n\t * {@link IMaiaContext}\n\t * \n\t * @param factory\n\t *            - factory that create new context\n\t * @param parent\n\t *            - parent context for newly created context\n\t * @param name\n\t *            - name for new context\n\t *\/\n\tpublic pointcut onCreateChildContext(IMaiaContextFactory factory,\n\t\t\tIMaiaContext parent, String name) : \n\t\texecution(IMaiaContext IMaiaContextFactory+.createChild(IMaiaContext, String)) && \n\t\ttarget(factory) && \n\t\targs(parent, name);\n\n\t\/**\n\t * When {@link IMaiaContextFactory} begin to create new {@link IMaiaContext}\n\t * \n\t * @param factory\n\t *            - factory that create new context\n\t * @param name\n\t *            - name for new context\n\t *\/\n\tpublic pointcut onCreateContext(IMaiaContextFactory factory, String name) : \n\t\texecution(IMaiaContext IMaiaContextFactory+.createContext(String)) && \n\t\ttarget(factory) && \n\t\targs(name);\n\n}","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"d2e4976ac7a4b43b23420c5fda53f9d7af56c21e","subject":"update pointcut name","message":"update pointcut name\n\ngit-svn-id: 611fcff3babe92294e93aa7369573f5fe3352ff6@1089 468f3c8c-1912-47de-8909-53fc7abe8733\n","repos":"EntitypediaGames\/games-common,EntitypediaGames\/games-common","old_file":"src\/main\/java\/org\/entitypedia\/games\/common\/mixins\/JacksonMixinSetupAspect.aj","new_file":"src\/main\/java\/org\/entitypedia\/games\/common\/mixins\/JacksonMixinSetupAspect.aj","new_contents":"package org.entitypedia.games.common.mixins;\r\n\r\nimport com.fasterxml.jackson.databind.ObjectMapper;\r\nimport org.aspectj.lang.JoinPoint;\r\nimport org.aspectj.lang.reflect.MethodSignature;\r\nimport org.entitypedia.games.common.util.HibernateAwareObjectMapper;\r\nimport org.entitypedia.games.common.util.MapperSavingJackson2HttpMessageConverter;\r\nimport org.slf4j.Logger;\r\nimport org.slf4j.LoggerFactory;\r\nimport org.springframework.beans.factory.InitializingBean;\r\nimport org.springframework.security.access.intercept.aspectj.MethodInvocationAdapter;\r\nimport org.springframework.security.access.prepost.PreInvocationAttribute;\r\nimport org.springframework.security.access.prepost.PreInvocationAuthorizationAdvice;\r\nimport org.springframework.security.access.prepost.PrePostInvocationAttributeFactory;\r\nimport org.springframework.security.core.context.SecurityContextHolder;\r\n\r\nimport java.lang.reflect.Constructor;\r\nimport java.lang.reflect.InvocationTargetException;\r\nimport java.lang.reflect.Method;\r\nimport java.util.ArrayList;\r\nimport java.util.Arrays;\r\nimport java.util.List;\r\n\r\n\/**\r\n * Applies mixins from annotations to Jackson Mapper.\r\n *\r\n * @author <a rel=\"author\" href=\"http:\/\/autayeu.com\/\">Aliaksandr Autayeu<\/a>\r\n *\/\r\npublic aspect JacksonMixinSetupAspect implements InitializingBean {\r\n\r\n    private static final Logger log = LoggerFactory.getLogger(JacksonMixinSetupAspect.class);\r\n\r\n    private PreInvocationAuthorizationAdvice preAdvice;\r\n\r\n    private PrePostInvocationAttributeFactory attributeFactory;\r\n\r\n    private MapperSavingJackson2HttpMessageConverter converter;\r\n\r\n    private Constructor<MethodInvocationAdapter> constructor;\r\n\r\n    private final static ThreadLocal<ObjectMapper> tlObjectMapper = new ThreadLocal<ObjectMapper>() {\r\n        @Override protected ObjectMapper initialValue() {\r\n            return null;\r\n        }\r\n    };\r\n    private final static ThreadLocal<List<JacksonMixin>> tlMixins = new ThreadLocal<List<JacksonMixin>>() {\r\n        @Override\r\n        protected List<JacksonMixin> initialValue() {\r\n            return new ArrayList<JacksonMixin>(4);\r\n        }\r\n    };\r\n\r\n    @Override\r\n    public void afterPropertiesSet() throws Exception {\r\n        \/\/ hack package local constructor...\r\n        constructor = MethodInvocationAdapter.class.getDeclaredConstructor(JoinPoint.class);\r\n        constructor.setAccessible(true);\r\n\r\n        if (null == preAdvice) {\r\n            throw new IllegalArgumentException(\"org.springframework.security.access.expression.method.ExpressionBasedPreInvocationAdvice required!\");\r\n        }\r\n        if (null == attributeFactory) {\r\n            throw new IllegalArgumentException(\"org.springframework.security.access.expression.method.ExpressionBasedAnnotationAttributeFactory required!\");\r\n        }\r\n        if (null == converter) {\r\n            throw new IllegalArgumentException(\"org.entitypedia.games.common.util.MapperSavingJackson2HttpMessageConverter required!\");\r\n        }\r\n    }\r\n\r\n    pointcut controllerExecution(): execution(@JacksonMixins * org.entitypedia.games..api.controller..*(..));\r\n    after() returning: controllerExecution() {\r\n        \/\/ this prepares mixins for the filtering mapper.\r\n\r\n        \/\/ one needs to check the control flow of the annotated method to ensure\r\n        \/\/ there is no other mixins-annotated method being called inside the body\r\n        \/\/ e.g. createGame calls readCrossword, both annotated\r\n        \/\/ and the latter overwrites the mixins of the former\r\n        \/\/ in this case warning is printed\r\n\r\n        \/\/ jackson allows only one mixin per class... can't accumulate mixins over complex call trees\r\n\r\n        \/\/ mixins clear in writeInternal. therefore they might get stuck if method does not render JSON\r\n        \/\/ e.g. updateFocus calls readGame for access control and mixins get stuck.\r\n        \/\/ in this case warning is printed too, but it has little meaning\r\n\r\n        if (thisJoinPoint.getSignature() instanceof MethodSignature) {\r\n            MethodSignature signature = (MethodSignature) thisJoinPoint.getSignature();\r\n            \/\/ gets interface method\r\n            Method method = signature.getMethod();\r\n            if (null != method) {\r\n                JacksonMixins annotation = method.getAnnotation(JacksonMixins.class);\r\n                if (null != annotation && null != annotation.value() && 0 < annotation.value().length) {\r\n                    List<JacksonMixin> mixins = tlMixins.get();\r\n                    if (0 < mixins.size()) {\r\n                        if (log.isWarnEnabled()) {\r\n                            log.warn(\"{} is overwriting mixins {}\", thisJoinPoint, Arrays.toString(mixinsToStringArray(mixins)));\r\n                        }\r\n                    }\r\n                    mixins.clear();\r\n\r\n                    for (int i = 0; i < annotation.value().length; i++) {\r\n                        JacksonMixin mixin = annotation.value()[i];\r\n                        boolean apply = true;\r\n                        if (!\"\".equals(mixin.condition())) {\r\n                            \/\/ evaluate condition\r\n                            PreInvocationAttribute attribute = attributeFactory.createPreInvocationAttribute(null, null, mixin.condition());\r\n                            try {\r\n                                apply = preAdvice.before(\r\n                                        SecurityContextHolder.getContext().getAuthentication(),\r\n                                        constructor.newInstance(thisJoinPoint),\r\n                                        attribute);\r\n                            } catch (InstantiationException e) {\r\n                                throw new RuntimeException(e);\r\n                            } catch (IllegalAccessException e) {\r\n                                throw new RuntimeException(e);\r\n                            } catch (InvocationTargetException e) {\r\n                                throw new RuntimeException(e);\r\n                            }\r\n                        }\r\n                        if (apply) {\r\n                            mixins.add(mixin);\r\n                        }\r\n                    }\r\n\r\n                    if (0 < mixins.size()) {\r\n                        if (log.isDebugEnabled()) {\r\n                            log.debug(\"{} prepared mixins {}\", thisJoinPoint, Arrays.toString(mixinsToStringArray(mixins)));\r\n                        }\r\n                    } else {\r\n                        log.debug(\"{} cleared mixins\", thisJoinPoint);\r\n                    }\r\n                }\r\n            }\r\n        }\r\n    }\r\n\r\n    private String[] mixinsToStringArray(List<JacksonMixin> mixins) {\r\n        String[] result = new String[mixins.size()];\r\n        for (int i = 0; i < mixins.size(); i++) {\r\n            result[i] = mixins.get(i).target().getSimpleName() + \"=\" + mixins.get(i).mixin().getSimpleName();\r\n        }\r\n        return result;\r\n    }\r\n\r\n    pointcut writeInternalExecution(): execution(* org.entitypedia.games.common.util.MapperSavingJackson2HttpMessageConverter.writeInternal(..));\r\n    Object around(): writeInternalExecution() {\r\n        List<JacksonMixin> mixins = tlMixins.get();\r\n        if (0 < mixins.size()) {\r\n            \/\/ set up mapper\r\n            ObjectMapper mapper = new HibernateAwareObjectMapper();\r\n            for (JacksonMixin mixin : mixins) {\r\n                mapper.addMixInAnnotations(mixin.target(), mixin.mixin());\r\n            }\r\n\r\n            log.debug(\"Applying mixins {} to {}\", Arrays.toString(mixinsToStringArray(mixins)), converter);\r\n            tlObjectMapper.set(converter.getObjectMapper());\r\n            converter.setObjectMapper(mapper);\r\n        }\r\n\r\n        Object result = proceed();\r\n\r\n        if (0 < mixins.size()) {\r\n            \/\/ restore mapper\r\n            log.debug(\"Removing mixins from {}\", converter);\r\n            converter.setObjectMapper(tlObjectMapper.get());\r\n\r\n            \/\/ clean up vars\r\n            tlObjectMapper.set(null);\r\n            mixins.clear();\r\n        }\r\n\r\n        return result;\r\n    }\r\n\r\n    public void setConverter(MapperSavingJackson2HttpMessageConverter converter) {\r\n        this.converter = converter;\r\n    }\r\n\r\n    public void setAttributeFactory(PrePostInvocationAttributeFactory attributeFactory) {\r\n        this.attributeFactory = attributeFactory;\r\n    }\r\n\r\n    public void setPreAdvice(PreInvocationAuthorizationAdvice preAdvice) {\r\n        this.preAdvice = preAdvice;\r\n    }\r\n}\r\n","old_contents":"package org.entitypedia.games.common.mixins;\r\n\r\nimport com.fasterxml.jackson.databind.ObjectMapper;\r\nimport org.aspectj.lang.JoinPoint;\r\nimport org.aspectj.lang.reflect.MethodSignature;\r\nimport org.entitypedia.games.common.util.HibernateAwareObjectMapper;\r\nimport org.entitypedia.games.common.util.MapperSavingJackson2HttpMessageConverter;\r\nimport org.slf4j.Logger;\r\nimport org.slf4j.LoggerFactory;\r\nimport org.springframework.beans.factory.InitializingBean;\r\nimport org.springframework.security.access.intercept.aspectj.MethodInvocationAdapter;\r\nimport org.springframework.security.access.prepost.PreInvocationAttribute;\r\nimport org.springframework.security.access.prepost.PreInvocationAuthorizationAdvice;\r\nimport org.springframework.security.access.prepost.PrePostInvocationAttributeFactory;\r\nimport org.springframework.security.core.context.SecurityContextHolder;\r\n\r\nimport java.lang.reflect.Constructor;\r\nimport java.lang.reflect.InvocationTargetException;\r\nimport java.lang.reflect.Method;\r\nimport java.util.ArrayList;\r\nimport java.util.Arrays;\r\nimport java.util.List;\r\n\r\n\/**\r\n * Applies mixins from annotations to Jackson Mapper.\r\n *\r\n * @author <a rel=\"author\" href=\"http:\/\/autayeu.com\/\">Aliaksandr Autayeu<\/a>\r\n *\/\r\npublic aspect JacksonMixinSetupAspect implements InitializingBean {\r\n\r\n    private static final Logger log = LoggerFactory.getLogger(JacksonMixinSetupAspect.class);\r\n\r\n    private PreInvocationAuthorizationAdvice preAdvice;\r\n\r\n    private PrePostInvocationAttributeFactory attributeFactory;\r\n\r\n    private MapperSavingJackson2HttpMessageConverter converter;\r\n\r\n    private Constructor<MethodInvocationAdapter> constructor;\r\n\r\n    private final static ThreadLocal<ObjectMapper> tlObjectMapper = new ThreadLocal<ObjectMapper>() {\r\n        @Override protected ObjectMapper initialValue() {\r\n            return null;\r\n        }\r\n    };\r\n    private final static ThreadLocal<List<JacksonMixin>> tlMixins = new ThreadLocal<List<JacksonMixin>>() {\r\n        @Override\r\n        protected List<JacksonMixin> initialValue() {\r\n            return new ArrayList<JacksonMixin>(4);\r\n        }\r\n    };\r\n\r\n    @Override\r\n    public void afterPropertiesSet() throws Exception {\r\n        \/\/ hack package local constructor...\r\n        constructor = MethodInvocationAdapter.class.getDeclaredConstructor(JoinPoint.class);\r\n        constructor.setAccessible(true);\r\n\r\n        if (null == preAdvice) {\r\n            throw new IllegalArgumentException(\"org.springframework.security.access.expression.method.ExpressionBasedPreInvocationAdvice required!\");\r\n        }\r\n        if (null == attributeFactory) {\r\n            throw new IllegalArgumentException(\"org.springframework.security.access.expression.method.ExpressionBasedAnnotationAttributeFactory required!\");\r\n        }\r\n        if (null == converter) {\r\n            throw new IllegalArgumentException(\"org.entitypedia.games.common.util.MapperSavingJackson2HttpMessageConverter required!\");\r\n        }\r\n    }\r\n\r\n    pointcut serviceExecution(): execution(@JacksonMixins * org.entitypedia.games..api.controller..*(..));\r\n    after() returning: serviceExecution() {\r\n        \/\/ this prepares mixins for the filtering mapper.\r\n\r\n        \/\/ one needs to check the control flow of the annotated method to ensure\r\n        \/\/ there is no other mixins-annotated method being called inside the body\r\n        \/\/ e.g. createGame calls readCrossword, both annotated\r\n        \/\/ and the latter overwrites the mixins of the former\r\n        \/\/ in this case warning is printed\r\n\r\n        \/\/ jackson allows only one mixin per class... can't accumulate mixins over complex call trees\r\n\r\n        \/\/ mixins clear in writeInternal. therefore they might get stuck if method does not render JSON\r\n        \/\/ e.g. updateFocus calls readGame for access control and mixins get stuck.\r\n        \/\/ in this case warning is printed too, but it has little meaning\r\n\r\n        if (thisJoinPoint.getSignature() instanceof MethodSignature) {\r\n            MethodSignature signature = (MethodSignature) thisJoinPoint.getSignature();\r\n            \/\/ gets interface method\r\n            Method method = signature.getMethod();\r\n            if (null != method) {\r\n                JacksonMixins annotation = method.getAnnotation(JacksonMixins.class);\r\n                if (null != annotation && null != annotation.value() && 0 < annotation.value().length) {\r\n                    List<JacksonMixin> mixins = tlMixins.get();\r\n                    if (0 < mixins.size()) {\r\n                        if (log.isWarnEnabled()) {\r\n                            log.warn(\"{} is overwriting mixins {}\", thisJoinPoint, Arrays.toString(mixinsToStringArray(mixins)));\r\n                        }\r\n                    }\r\n                    mixins.clear();\r\n\r\n                    for (int i = 0; i < annotation.value().length; i++) {\r\n                        JacksonMixin mixin = annotation.value()[i];\r\n                        boolean apply = true;\r\n                        if (!\"\".equals(mixin.condition())) {\r\n                            \/\/ evaluate condition\r\n                            PreInvocationAttribute attribute = attributeFactory.createPreInvocationAttribute(null, null, mixin.condition());\r\n                            try {\r\n                                apply = preAdvice.before(\r\n                                        SecurityContextHolder.getContext().getAuthentication(),\r\n                                        constructor.newInstance(thisJoinPoint),\r\n                                        attribute);\r\n                            } catch (InstantiationException e) {\r\n                                throw new RuntimeException(e);\r\n                            } catch (IllegalAccessException e) {\r\n                                throw new RuntimeException(e);\r\n                            } catch (InvocationTargetException e) {\r\n                                throw new RuntimeException(e);\r\n                            }\r\n                        }\r\n                        if (apply) {\r\n                            mixins.add(mixin);\r\n                        }\r\n                    }\r\n\r\n                    if (0 < mixins.size()) {\r\n                        if (log.isDebugEnabled()) {\r\n                            log.debug(\"{} prepared mixins {}\", thisJoinPoint, Arrays.toString(mixinsToStringArray(mixins)));\r\n                        }\r\n                    } else {\r\n                        log.debug(\"{} cleared mixins\", thisJoinPoint);\r\n                    }\r\n                }\r\n            }\r\n        }\r\n    }\r\n\r\n    private String[] mixinsToStringArray(List<JacksonMixin> mixins) {\r\n        String[] result = new String[mixins.size()];\r\n        for (int i = 0; i < mixins.size(); i++) {\r\n            result[i] = mixins.get(i).target().getSimpleName() + \"=\" + mixins.get(i).mixin().getSimpleName();\r\n        }\r\n        return result;\r\n    }\r\n\r\n    pointcut writeInternalExecution(): execution(* org.entitypedia.games.common.util.MapperSavingJackson2HttpMessageConverter.writeInternal(..));\r\n    Object around(): writeInternalExecution() {\r\n        List<JacksonMixin> mixins = tlMixins.get();\r\n        if (0 < mixins.size()) {\r\n            \/\/ set up mapper\r\n            ObjectMapper mapper = new HibernateAwareObjectMapper();\r\n            for (JacksonMixin mixin : mixins) {\r\n                mapper.addMixInAnnotations(mixin.target(), mixin.mixin());\r\n            }\r\n\r\n            log.debug(\"Applying mixins {} to {}\", Arrays.toString(mixinsToStringArray(mixins)), converter);\r\n            tlObjectMapper.set(converter.getObjectMapper());\r\n            converter.setObjectMapper(mapper);\r\n        }\r\n\r\n        Object result = proceed();\r\n\r\n        if (0 < mixins.size()) {\r\n            \/\/ restore mapper\r\n            log.debug(\"Removing mixins from {}\", converter);\r\n            converter.setObjectMapper(tlObjectMapper.get());\r\n\r\n            \/\/ clean up vars\r\n            tlObjectMapper.set(null);\r\n            mixins.clear();\r\n        }\r\n\r\n        return result;\r\n    }\r\n\r\n    public void setConverter(MapperSavingJackson2HttpMessageConverter converter) {\r\n        this.converter = converter;\r\n    }\r\n\r\n    public void setAttributeFactory(PrePostInvocationAttributeFactory attributeFactory) {\r\n        this.attributeFactory = attributeFactory;\r\n    }\r\n\r\n    public void setPreAdvice(PreInvocationAuthorizationAdvice preAdvice) {\r\n        this.preAdvice = preAdvice;\r\n    }\r\n}\r\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"4a378264daf0ab5d84b7a878add64b8099b23865","subject":"Allow to specify more than one Program to use the same ExecutorService","message":"Allow to specify more than one Program to use the same ExecutorService\n","repos":"christophe-w\/parallelj.runtime,awltech\/org.parallelj","old_file":"parallelj-launching\/src\/main\/java\/org\/parallelj\/launching\/internal\/LaunchManagement.aj","new_file":"parallelj-launching\/src\/main\/java\/org\/parallelj\/launching\/internal\/LaunchManagement.aj","new_contents":"\/*\n *     ParallelJ, framework for parallel computing\n *\n *     Copyright (C) 2010, 2011, 2012 Atos Worldline or third-party contributors as\n *     indicated by the @author tags or express copyright attribution\n *     statements applied by the authors.\n *\n *     This library is free software; you can redistribute it and\/or\n *     modify it under the terms of the GNU Lesser General Public\n *     License as published by the Free Software Foundation; either\n *     version 2.1 of the License.\n *\n *     This library is distributed in the hope that it will be useful,\n *     but WITHOUT ANY WARRANTY; without even the implied warranty of\n *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n *     Lesser General Public License for more details.\n *\n *     You should have received a copy of the GNU Lesser General Public\n *     License along with this library; if not, write to the Free Software\n *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n *\/\npackage org.parallelj.launching.internal;\n\nimport java.util.Map;\nimport java.util.concurrent.ConcurrentHashMap;\nimport java.util.concurrent.ExecutorService;\n\nimport org.parallelj.Programs;\nimport org.parallelj.internal.conf.ConfigurationService;\nimport org.parallelj.internal.conf.ParalleljConfigurationManager;\nimport org.parallelj.internal.conf.pojos.CExecutor;\nimport org.parallelj.internal.conf.pojos.CExecutors;\nimport org.parallelj.internal.conf.pojos.ParalleljConfiguration;\nimport org.parallelj.internal.kernel.KProcessor;\nimport org.parallelj.internal.kernel.procedure.CallableProcedure.CallableCall.CallableCallRunnable;\nimport org.parallelj.internal.kernel.procedure.RunnableProcedure.RunnableCall.RunnableCallRunnable;\nimport org.parallelj.internal.kernel.procedure.SubProcessProcedure.SubProcessCall.SubProcessRunnable;\nimport org.parallelj.internal.reflect.ProcessHelperImpl;\nimport org.parallelj.internal.reflect.ProgramAdapter.Adapter;\nimport org.parallelj.launching.Launch;\nimport org.parallelj.launching.LaunchException;\nimport org.parallelj.launching.LaunchingMessageKind;\nimport org.parallelj.launching.ProgramReturnCodes;\nimport org.parallelj.mirror.ExecutorServiceKind;\nimport org.parallelj.mirror.ParallelJThreadFactory;\n\n\/**\n * Implements the synchLaunch(..) and aSynchLaunch(..) methods of Launch.\n * \n * \n *\/\nprivileged aspect LaunchManagement { \n\t\n\tprivate static Map<KProcessor, LaunchImpl> phl = new ConcurrentHashMap<>(); \n\t\n\tstatic privileged public aspect LaunchAdapter percflow(launchInstance() ) {\n\t\n\t\tdeclare precedence :\n\t\t\torg.parallelj.internal.kernel.Identifiers,\n\t\t\torg.parallelj.internal.reflect.ProgramAdapter,\n\t\t\torg.parallelj.internal.util.sm.impl.KStateMachines,\n\t\t\torg.parallelj.internal.util.sm.impl.KStateMachines.PerMachine,\n\t\t\torg.parallelj.Executables$PerExecutable,\n\t\t\torg.parallelj.internal.reflect.ProgramAdapter.PerProgram,\n\t\t\torg.parallelj.internal.log.Logs;\n\t\n\t\tpointcut launchInstance() : execution(* Launch+.*(..));\n\t\n\t\tinterface IKProcessorLaunch {}\n\t\tLaunchImpl IKProcessorLaunch.launch;\n\t\tdeclare parents: KProcessor implements IKProcessorLaunch;\n\t\t\n\t\tinterface ILaunchExecutors {}\n\t\tMap<String, ExecutorService> ILaunchExecutors.executors = new ConcurrentHashMap<>();\n\t\tExecutorService ILaunchExecutors.defaultExecutor = null;\n\t\tdeclare parents: LaunchImpl implements ILaunchExecutors;\n\t\t\n\t\tprivate LaunchingObservable observable = new LaunchingObservable();\n\t\t\n\t\tboolean stopExecutorServiceAfterExecution = false;\n\t\n\t\tprivate static class AsyncThread implements Runnable {\n\t\n\t\t\tprivate LaunchAdapter launchAdapter;\n\t\t\tprivate LaunchImpl<?> launch;\n\t\n\t\t\tpublic AsyncThread(LaunchImpl<?> launch, LaunchAdapter launchAdapter) {\n\t\t\t\tthis.launch = launch;\n\t\t\t\tthis.launchAdapter = launchAdapter;\n\t\t\t}\n\t\n\t\t\t@Override\n\t\t\tpublic void run() {\n\t\t\t\tthis.launchAdapter.internalSyncLaunch(this.launch);\n\t\t\t}\n\t\t}\n\t\t\n\t\t@SuppressWarnings({ \"rawtypes\", \"unchecked\" })\n\t\tLaunch around(LaunchImpl launch) throws LaunchException: \n\t\t\t\t\texecution(public Launch Launch+.synchLaunch(..) throws LaunchException)\n\t\t\t\t\t\t&& this(launch) {\n\t\t\tproceed(launch);\n\t\t\tlaunch.processHelper = Programs.as(launch.jobInstance);\n\t\t\tlaunch.getLaunchResult().setStatusCode(ProgramReturnCodes.RUNNING);\n\t\t\tthis.observable.prepareLaunching(launch);\n\t\n\t\t\treturn internalSyncLaunch(launch);\n\t\t}\n\t\n\t\t@SuppressWarnings({ \"rawtypes\", \"unchecked\" })\n\t\tLaunch around(LaunchImpl launch) throws LaunchException: \n\t\t\t\t\texecution(public Launch Launch+.aSynchLaunch() throws LaunchException)\n\t\t\t\t\t\t&& this(launch) {\n\t\t\tproceed(launch);\n\t\t\tlaunch.processHelper = Programs.as(launch.jobInstance);\n\t\t\tlaunch.getLaunchResult().setStatusCode(ProgramReturnCodes.RUNNING);\n\t\t\tthis.observable.prepareLaunching(launch);\n\t\t\tif (launch.getExecutorService()!=null) {\n\t\t\t\tlaunch.getExecutorService().execute(new AsyncThread(launch, this));\n\t\t\t} else {\n\t\t\t\tParallelJThreadFactory.getInstance().newThread(new AsyncThread(launch, this)).start();\n\t \t\t}\n\t\t\treturn launch;\n\t\t}\n\t\n\t\t@SuppressWarnings(\"rawtypes\")\n\t\tprivate Launch<?> internalSyncLaunch(LaunchImpl<?> launch) {\n\t\t\tLaunchingMessageKind.ILAUNCH0002.format(launch.getJobInstance()\n\t\t\t\t\t.getClass().getCanonicalName(), launch.getLaunchId());\n\t\t\tinitializeExecutors(launch);\n\t\t\tProcessHelperImpl processHelper = (ProcessHelperImpl)launch.getProcessHelper();\n\t\t\tKProcessor processor = processHelper.processor;\n\t\t\tif (processor == null) {\n\t\t\t\tif ( ((ILaunchExecutors)launch).defaultExecutor!=null) {\n\t\t\t\t\tprocessor = new KProcessor(((ILaunchExecutors)launch).defaultExecutor);\n\t\t\t\t} else {\n\t\t\t\t\tprocessor = new KProcessor(launch.getExecutorService());\n\t\t\t\t}\n\t\t\t\t((IKProcessorLaunch)processor).launch = launch;\n\t\t\t\tphl.put(processor, launch);\n\t\t\t}\n\t\t\tprocessor.execute(processHelper.process);\n\t\t\tlaunch.getProcessHelper().join();\n\t\t\tthis.observable.finalizeLaunching(launch);\n\t\t\tlaunch.complete();\n\t\t\tcleanExecutors(launch);\n\t\t\tphl.remove(processor);\n\t\t\t\n\t\t\tif (launch.getLaunchResult().getStatusCode()!=ProgramReturnCodes.FAILURE\n\t\t\t\t\t&&launch.getLaunchResult().getStatusCode()!=ProgramReturnCodes.ABORTED) {\n\t\t\t\tlaunch.getLaunchResult().setStatusCode(ProgramReturnCodes.SUCCESS);\n\t\t\t}\n\t\t\tLaunchingMessageKind.ILAUNCH0003.format(launch.getJobInstance()\n\t\t\t\t\t.getClass().getCanonicalName(), launch.getLaunchId(), launch\n\t\t\t\t\t.getLaunchResult().getStatusCode(), launch.getLaunchResult()\n\t\t\t\t\t.getReturnCode());\n\t\t\treturn launch;\n\t\t}\n\t\t\n\t\tprivate void initializeExecutors(LaunchImpl<?> launch) {\n\t\t\tParalleljConfiguration configuration = (ParalleljConfiguration) ConfigurationService\n\t\t\t\t\t.getConfigurationService().getConfigurationManager()\n\t\t\t\t\t.get(ParalleljConfigurationManager.class)\n\t\t\t\t\t.getConfiguration();\n\t\t\tMap<String, ExecutorService> executors = ((ILaunchExecutors) launch).executors;\n\t\t\tCExecutors cExecutors = configuration != null ? configuration\n\t\t\t\t\t.getExecutorServices() : null;\n\t\t\tif (cExecutors != null) {\n\t\t\t\tif (cExecutors.getDefaultServiceType() != null\n\t\t\t\t\t\t|| cExecutors.getDefaultPoolSize() != null\n\t\t\t\t\t\t|| cExecutors.getDefaultServiceClass() != null) {\n\t\t\t\t\ttry {\n\t\t\t\t\t\tExecutorService defaultService = ExecutorServiceKind\n\t\t\t\t\t\t\t\t.valueOf(\n\t\t\t\t\t\t\t\t\t\tcExecutors.getDefaultServiceType()\n\t\t\t\t\t\t\t\t\t\t\t\t.value()).create(\n\t\t\t\t\t\t\t\t\t\tcExecutors.getDefaultPoolSize()\n\t\t\t\t\t\t\t\t\t\t\t\t.intValue(),\n\t\t\t\t\t\t\t\t\t\tcExecutors.getDefaultServiceClass());\n\t\t\t\t\t\t((ILaunchExecutors) launch).defaultExecutor = defaultService;\n\t\t\t\t\t} catch (InstantiationException | IllegalAccessException\n\t\t\t\t\t\t\t| ClassNotFoundException e) {\n\t\t\t\t\t\t\/\/ Do nothing..\n\t\t\t\t\t} catch (Exception e) {\n\t\t\t\t\t\tLaunchingMessageKind.ELAUNCH0011.format(e);\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\tif (cExecutors.getExecutorService() != null) {\n\t\t\t\t\tfor (CExecutor cExecutor : cExecutors.getExecutorService()) {\n\t\t\t\t\t\tString[] names = cExecutor.getProgramName().split(\",\");\n\t\t\t\t\t\tboolean instanciate = false;\n\t\t\t\t\t\tfor (String name : names) {\n\t\t\t\t\t\t\tif (name.length() > 0 && name.trim().length() > 0) {\n\t\t\t\t\t\t\t\tinstanciate = true;\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t\tif (instanciate) {\n\t\t\t\t\t\t\tExecutorService executor = null;\n\t\t\t\t\t\t\tif (cExecutor.getServiceType() != null) {\n\t\t\t\t\t\t\t\tString type = cExecutor.getServiceType()\n\t\t\t\t\t\t\t\t\t\t.value();\n\t\t\t\t\t\t\t\ttry {\n\t\t\t\t\t\t\t\t\tint size = cExecutor.getPoolSize() != null ? cExecutor\n\t\t\t\t\t\t\t\t\t\t\t.getPoolSize().intValue() : 0;\n\t\t\t\t\t\t\t\t\texecutor = ExecutorServiceKind\n\t\t\t\t\t\t\t\t\t\t\t.valueOf(type)\n\t\t\t\t\t\t\t\t\t\t\t.create(size,\n\t\t\t\t\t\t\t\t\t\t\t\t\tcExecutor.getServiceClass());\n\t\t\t\t\t\t\t\t\tboolean foundProgram = false;\n\t\t\t\t\t\t\t\t\tfor (String name : names) {\n\t\t\t\t\t\t\t\t\t\tif (name.length() > 0 && name.trim().length() > 0) {\n\t\t\t\t\t\t\t\t\t\t\texecutors.put(\n\t\t\t\t\t\t\t\t\t\t\t\t\tname,\n\t\t\t\t\t\t\t\t\t\t\t\t\texecutor);\n\t\t\t\t\t\t\t\t\t\t\tfoundProgram = true;\n\t\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t\tif (!foundProgram) {\n\t\t\t\t\t\t\t\t\t\texecutor.shutdown();\n\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t} catch (InstantiationException\n\t\t\t\t\t\t\t\t\t\t| IllegalAccessException\n\t\t\t\t\t\t\t\t\t\t| ClassNotFoundException e) {\n\t\t\t\t\t\t\t\t\t\/\/ Do Nothing..\n\t\t\t\t\t\t\t\t} catch (Exception e) {\n\t\t\t\t\t\t\t\t\tLaunchingMessageKind.ELAUNCH0012.format(e);\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\n\t\tprivate void cleanExecutors(LaunchImpl<?> launch) {\n\t\t\tMap<String, ExecutorService> executors = ((ILaunchExecutors)launch).executors;\n\t\t\tfor (String key : executors.keySet()) {\n\t\t\t\texecutors.get(key).shutdown();\n\t\t\t\texecutors.remove(key);\n\t\t\t}\n\t\t\tif (((ILaunchExecutors)launch).defaultExecutor!=null) {\n\t\t\t\t((ILaunchExecutors)launch).defaultExecutor.shutdown();\n\t\t\t}\n\t\t}\n\t}\n\n\t@SuppressWarnings(\"rawtypes\")\n\tvoid around(KProcessor kProcessor, SubProcessRunnable runnable):execution(public void submit(..))\n\t\t&& args(runnable)\n\t\t&&this(kProcessor){\n\t\n\t\tAdapter context = (Adapter)runnable.getSubProcessCall().getProcess().getContext();\n\t\tLaunchImpl launch = phl.get(kProcessor);\n\t\tif (launch!=null) {\n\t\t\tExecutorService service = launch.executors.get(context.getClass().getCanonicalName());\n\t\t\tif (service!=null) {\n\t\t\t\tkProcessor.submit(runnable, service);\n\t\t\t} else {\n\t\t\t\tproceed(kProcessor, runnable);\n\t\t\t}\n\t\t} else {\n\t\t\tproceed(kProcessor, runnable);\n\t\t}\n}\n\n\t@SuppressWarnings(\"rawtypes\")\n\tvoid around(KProcessor kProcessor, CallableCallRunnable runnable):execution(public void submit(..))\n\t\t&& args(runnable)\n\t\t&&this(kProcessor){\n\t\t\n\t\tAdapter context = (Adapter)runnable.getCallableCall().getProcess().getContext();\n\t\tLaunchImpl launch = phl.get(kProcessor);\n\t\tif (launch!=null) {\n\t\t\tExecutorService service = launch.executors.get(context.getClass().getCanonicalName());\n\t\t\tif (service!=null) {\n\t\t\t\tkProcessor.submit(runnable, service);\n\t\t\t} else {\n\t\t\t\tproceed(kProcessor, runnable);\n\t\t\t}\n\t\t} else {\n\t\t\tproceed(kProcessor, runnable);\n\t\t}\n\t}\n\t\n\t@SuppressWarnings(\"rawtypes\")\n\tvoid around(KProcessor kProcessor, RunnableCallRunnable runnable):execution(public void submit(..))\n\t\t&& args(runnable)\n\t\t&&this(kProcessor) {\n\t\t\n\t\tAdapter context = (Adapter)runnable.getRunnableCall().getProcess().getContext();\n\t\tLaunchImpl launch = phl.get(kProcessor);\n\t\tif (launch!=null) {\n\t\t\tExecutorService service = launch.executors.get(context.getClass().getCanonicalName());\n\t\t\tif (service!=null) {\n\t\t\t\tkProcessor.submit(runnable, service);\n\t\t\t} else {\n\t\t\t\tproceed(kProcessor, runnable);\n\t\t\t}\n\t\t} else {\n\t\t\tproceed(kProcessor, runnable);\n\t\t}\n\t}\n}\n","old_contents":"\/*\n *     ParallelJ, framework for parallel computing\n *\n *     Copyright (C) 2010, 2011, 2012 Atos Worldline or third-party contributors as\n *     indicated by the @author tags or express copyright attribution\n *     statements applied by the authors.\n *\n *     This library is free software; you can redistribute it and\/or\n *     modify it under the terms of the GNU Lesser General Public\n *     License as published by the Free Software Foundation; either\n *     version 2.1 of the License.\n *\n *     This library is distributed in the hope that it will be useful,\n *     but WITHOUT ANY WARRANTY; without even the implied warranty of\n *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n *     Lesser General Public License for more details.\n *\n *     You should have received a copy of the GNU Lesser General Public\n *     License along with this library; if not, write to the Free Software\n *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n *\/\npackage org.parallelj.launching.internal;\n\nimport java.util.Map;\nimport java.util.concurrent.ConcurrentHashMap;\nimport java.util.concurrent.ExecutorService;\n\nimport org.parallelj.Programs;\nimport org.parallelj.internal.conf.ConfigurationService;\nimport org.parallelj.internal.conf.ParalleljConfigurationManager;\nimport org.parallelj.internal.conf.pojos.CExecutor;\nimport org.parallelj.internal.conf.pojos.CExecutors;\nimport org.parallelj.internal.conf.pojos.ParalleljConfiguration;\nimport org.parallelj.internal.kernel.KProcessor;\nimport org.parallelj.internal.kernel.procedure.CallableProcedure.CallableCall.CallableCallRunnable;\nimport org.parallelj.internal.kernel.procedure.RunnableProcedure.RunnableCall.RunnableCallRunnable;\nimport org.parallelj.internal.kernel.procedure.SubProcessProcedure.SubProcessCall.SubProcessRunnable;\nimport org.parallelj.internal.reflect.ProcessHelperImpl;\nimport org.parallelj.internal.reflect.ProgramAdapter.Adapter;\nimport org.parallelj.launching.Launch;\nimport org.parallelj.launching.LaunchException;\nimport org.parallelj.launching.LaunchingMessageKind;\nimport org.parallelj.launching.ProgramReturnCodes;\nimport org.parallelj.mirror.ExecutorServiceKind;\nimport org.parallelj.mirror.ParallelJThreadFactory;\n\n\/**\n * Implements the synchLaunch(..) and aSynchLaunch(..) methods of Launch.\n * \n * \n *\/\nprivileged aspect LaunchManagement { \n\t\n\tprivate static Map<KProcessor, LaunchImpl> phl = new ConcurrentHashMap<>(); \n\t\n\tstatic privileged public aspect LaunchAdapter percflow(launchInstance() ) {\n\t\n\t\tdeclare precedence :\n\t\t\torg.parallelj.internal.kernel.Identifiers,\n\t\t\torg.parallelj.internal.reflect.ProgramAdapter,\n\t\t\torg.parallelj.internal.util.sm.impl.KStateMachines,\n\t\t\torg.parallelj.internal.util.sm.impl.KStateMachines.PerMachine,\n\t\t\torg.parallelj.Executables$PerExecutable,\n\t\t\torg.parallelj.internal.reflect.ProgramAdapter.PerProgram,\n\t\t\torg.parallelj.internal.log.Logs;\n\t\n\t\tpointcut launchInstance() : execution(* Launch+.*(..));\n\t\n\t\tinterface IKProcessorLaunch {}\n\t\tLaunchImpl IKProcessorLaunch.launch;\n\t\tdeclare parents: KProcessor implements IKProcessorLaunch;\n\t\t\n\t\tinterface ILaunchExecutors {}\n\t\tMap<String, ExecutorService> ILaunchExecutors.executors = new ConcurrentHashMap<>();\n\t\tExecutorService ILaunchExecutors.defaultExecutor = null;\n\t\tdeclare parents: LaunchImpl implements ILaunchExecutors;\n\t\t\n\t\tprivate LaunchingObservable observable = new LaunchingObservable();\n\t\t\n\t\tboolean stopExecutorServiceAfterExecution = false;\n\t\n\t\tprivate static class AsyncThread implements Runnable {\n\t\n\t\t\tprivate LaunchAdapter launchAdapter;\n\t\t\tprivate LaunchImpl<?> launch;\n\t\n\t\t\tpublic AsyncThread(LaunchImpl<?> launch, LaunchAdapter launchAdapter) {\n\t\t\t\tthis.launch = launch;\n\t\t\t\tthis.launchAdapter = launchAdapter;\n\t\t\t}\n\t\n\t\t\t@Override\n\t\t\tpublic void run() {\n\t\t\t\tthis.launchAdapter.internalSyncLaunch(this.launch);\n\t\t\t}\n\t\t}\n\t\t\n\t\t@SuppressWarnings({ \"rawtypes\", \"unchecked\" })\n\t\tLaunch around(LaunchImpl launch) throws LaunchException: \n\t\t\t\t\texecution(public Launch Launch+.synchLaunch(..) throws LaunchException)\n\t\t\t\t\t\t&& this(launch) {\n\t\t\tproceed(launch);\n\t\t\tlaunch.processHelper = Programs.as(launch.jobInstance);\n\t\t\tlaunch.getLaunchResult().setStatusCode(ProgramReturnCodes.RUNNING);\n\t\t\tthis.observable.prepareLaunching(launch);\n\t\n\t\t\treturn internalSyncLaunch(launch);\n\t\t}\n\t\n\t\t@SuppressWarnings({ \"rawtypes\", \"unchecked\" })\n\t\tLaunch around(LaunchImpl launch) throws LaunchException: \n\t\t\t\t\texecution(public Launch Launch+.aSynchLaunch() throws LaunchException)\n\t\t\t\t\t\t&& this(launch) {\n\t\t\tproceed(launch);\n\t\t\tlaunch.processHelper = Programs.as(launch.jobInstance);\n\t\t\tlaunch.getLaunchResult().setStatusCode(ProgramReturnCodes.RUNNING);\n\t\t\tthis.observable.prepareLaunching(launch);\n\t\t\tif (launch.getExecutorService()!=null) {\n\t\t\t\tlaunch.getExecutorService().execute(new AsyncThread(launch, this));\n\t\t\t} else {\n\t\t\t\tParallelJThreadFactory.getInstance().newThread(new AsyncThread(launch, this)).start();\n\t \t\t}\n\t\t\treturn launch;\n\t\t}\n\t\n\t\t@SuppressWarnings(\"rawtypes\")\n\t\tprivate Launch<?> internalSyncLaunch(LaunchImpl<?> launch) {\n\t\t\tLaunchingMessageKind.ILAUNCH0002.format(launch.getJobInstance()\n\t\t\t\t\t.getClass().getCanonicalName(), launch.getLaunchId());\n\t\t\tinitializeExecutors(launch);\n\t\t\tProcessHelperImpl processHelper = (ProcessHelperImpl)launch.getProcessHelper();\n\t\t\tKProcessor processor = processHelper.processor;\n\t\t\tif (processor == null) {\n\t\t\t\tif ( ((ILaunchExecutors)launch).defaultExecutor!=null) {\n\t\t\t\t\tprocessor = new KProcessor(((ILaunchExecutors)launch).defaultExecutor);\n\t\t\t\t} else {\n\t\t\t\t\tprocessor = new KProcessor(launch.getExecutorService());\n\t\t\t\t}\n\t\t\t\t((IKProcessorLaunch)processor).launch = launch;\n\t\t\t\tphl.put(processor, launch);\n\t\t\t}\n\t\t\tprocessor.execute(processHelper.process);\n\t\t\tlaunch.getProcessHelper().join();\n\t\t\tthis.observable.finalizeLaunching(launch);\n\t\t\tlaunch.complete();\n\t\t\tcleanExecutors(launch);\n\t\t\tphl.remove(processor);\n\t\t\t\n\t\t\tif (launch.getLaunchResult().getStatusCode()!=ProgramReturnCodes.FAILURE\n\t\t\t\t\t&&launch.getLaunchResult().getStatusCode()!=ProgramReturnCodes.ABORTED) {\n\t\t\t\tlaunch.getLaunchResult().setStatusCode(ProgramReturnCodes.SUCCESS);\n\t\t\t}\n\t\t\tLaunchingMessageKind.ILAUNCH0003.format(launch.getJobInstance()\n\t\t\t\t\t.getClass().getCanonicalName(), launch.getLaunchId(), launch\n\t\t\t\t\t.getLaunchResult().getStatusCode(), launch.getLaunchResult()\n\t\t\t\t\t.getReturnCode());\n\t\t\treturn launch;\n\t\t}\n\t\t\n\t\tprivate void initializeExecutors(LaunchImpl<?> launch) {\n\t\t\tParalleljConfiguration configuration = (ParalleljConfiguration) ConfigurationService\n\t\t\t\t\t.getConfigurationService().getConfigurationManager()\n\t\t\t\t\t.get(ParalleljConfigurationManager.class).getConfiguration();\n\t\t\tMap<String, ExecutorService> executors = ((ILaunchExecutors)launch).executors;\n\t\t\tCExecutors cExecutors = configuration!=null?configuration.getExecutorServices():null;\n\t\t\tif (cExecutors != null) {\n\t\t\t\tif(cExecutors.getDefaultServiceType()!=null || cExecutors.getDefaultPoolSize()!=null||cExecutors.getDefaultServiceClass()!=null) {\n\t\t\t\t\ttry {\n\t\t\t\t\t\tExecutorService defaultService = ExecutorServiceKind.valueOf(cExecutors.getDefaultServiceType().value()).create(cExecutors.getDefaultPoolSize().intValue(), cExecutors.getDefaultServiceClass());\n\t\t\t\t\t\t((ILaunchExecutors)launch).defaultExecutor=defaultService;\n\t\t\t\t\t} catch (InstantiationException | IllegalAccessException\n\t\t\t\t\t\t\t| ClassNotFoundException e) {\n\t\t\t\t\t\t\/\/ Do nothing..\n\t\t\t\t\t} catch (Exception e) {\n\t\t\t\t\t\tLaunchingMessageKind.ELAUNCH0011.format(e);\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\tif(cExecutors.getExecutorService() != null) {\n\t\t\t\t\tfor(CExecutor cExecutor:cExecutors.getExecutorService()) {\n\t\t\t\t\t\tif (executors.get(cExecutor.getProgramName()) == null) {\n\t\t\t\t\t\t\tString type = cExecutor.getServiceType().value();\n\t\t\t\t\t\t\ttry {\n\t\t\t\t\t\t\t\tint size = cExecutor.getPoolSize()!=null?cExecutor.getPoolSize().intValue():0;\n\t\t\t\t\t\t\t\tExecutorService executor = ExecutorServiceKind.valueOf(type).create(size, cExecutor.getServiceClass());\n\t\t\t\t\t\t\t\texecutors.put(cExecutor.getProgramName(), executor);\n\t\t\t\t\t\t\t} catch (InstantiationException | IllegalAccessException\n\t\t\t\t\t\t\t\t\t| ClassNotFoundException e) {\n\t\t\t\t\t\t\t\t\/\/ Do Nothing..\n\t\t\t\t\t\t\t} catch (Exception e) {\n\t\t\t\t\t\t\t\tLaunchingMessageKind.ELAUNCH0012.format(e);\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\n\t\tprivate void cleanExecutors(LaunchImpl<?> launch) {\n\t\t\tMap<String, ExecutorService> executors = ((ILaunchExecutors)launch).executors;\n\t\t\tfor (String key : executors.keySet()) {\n\t\t\t\texecutors.get(key).shutdown();\n\t\t\t\texecutors.remove(key);\n\t\t\t}\n\t\t\tif (((ILaunchExecutors)launch).defaultExecutor!=null) {\n\t\t\t\t((ILaunchExecutors)launch).defaultExecutor.shutdown();\n\t\t\t}\n\t\t}\n\t}\n\n\t@SuppressWarnings(\"rawtypes\")\n\tvoid around(KProcessor kProcessor, SubProcessRunnable runnable):execution(public void submit(..))\n\t\t&& args(runnable)\n\t\t&&this(kProcessor){\n\t\n\t\tAdapter context = (Adapter)runnable.getSubProcessCall().getProcess().getContext();\n\t\tLaunchImpl launch = phl.get(kProcessor);\n\t\tif (launch!=null) {\n\t\t\tExecutorService service = launch.executors.get(context.getClass().getCanonicalName());\n\t\t\tif (service!=null) {\n\t\t\t\tkProcessor.submit(runnable, service);\n\t\t\t} else {\n\t\t\t\tproceed(kProcessor, runnable);\n\t\t\t}\n\t\t} else {\n\t\t\tproceed(kProcessor, runnable);\n\t\t}\n}\n\n\t@SuppressWarnings(\"rawtypes\")\n\tvoid around(KProcessor kProcessor, CallableCallRunnable runnable):execution(public void submit(..))\n\t\t&& args(runnable)\n\t\t&&this(kProcessor){\n\t\t\n\t\tAdapter context = (Adapter)runnable.getCallableCall().getProcess().getContext();\n\t\tLaunchImpl launch = phl.get(kProcessor);\n\t\tif (launch!=null) {\n\t\t\tExecutorService service = launch.executors.get(context.getClass().getCanonicalName());\n\t\t\tif (service!=null) {\n\t\t\t\tkProcessor.submit(runnable, service);\n\t\t\t} else {\n\t\t\t\tproceed(kProcessor, runnable);\n\t\t\t}\n\t\t} else {\n\t\t\tproceed(kProcessor, runnable);\n\t\t}\n\t}\n\t\n\t@SuppressWarnings(\"rawtypes\")\n\tvoid around(KProcessor kProcessor, RunnableCallRunnable runnable):execution(public void submit(..))\n\t\t&& args(runnable)\n\t\t&&this(kProcessor) {\n\t\t\n\t\tAdapter context = (Adapter)runnable.getRunnableCall().getProcess().getContext();\n\t\tLaunchImpl launch = phl.get(kProcessor);\n\t\tif (launch!=null) {\n\t\t\tExecutorService service = launch.executors.get(context.getClass().getCanonicalName());\n\t\t\tif (service!=null) {\n\t\t\t\tkProcessor.submit(runnable, service);\n\t\t\t} else {\n\t\t\t\tproceed(kProcessor, runnable);\n\t\t\t}\n\t\t} else {\n\t\t\tproceed(kProcessor, runnable);\n\t\t}\n\t}\n}\n","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"61dc2c5b76b2095057bdd336f47932d3dcd6e6fb","subject":"Disable the patch to internalCreateAST. Backport with care: truly experimental.","message":"Disable the patch to internalCreateAST. Backport with care: truly experimental.\n","repos":"romanowski\/scala-ide,romanowski\/scala-ide,andrey-ilinykh\/scala-ide,mlangc\/scala-ide,dragos\/scala-ide,aleksi-lukkarinen\/scala-ide,sschaef\/scala-ide,stephenh\/scala-ide,pilipolio\/scala-ide,wpopielarski\/scala-ide,mlangc\/scala-ide,Duhemm\/scala-ide,scala-ide\/scala-ide,dragos\/scala-ide,wpopielarski\/scala-ide,sschaef\/scala-ide,stephenh\/scala-ide,andrey-ilinykh\/scala-ide,Kwestor\/scala-ide,sschaef\/scala-ide,stephenh\/scala-ide,pilipolio\/scala-ide,Duhemm\/scala-ide,Duhemm\/scala-ide,scala-ide\/scala-ide,aleksi-lukkarinen\/scala-ide,Kwestor\/scala-ide,Kwestor\/scala-ide,wpopielarski\/scala-ide,Duhemm\/scala-ide,andrey-ilinykh\/scala-ide,aleksi-lukkarinen\/scala-ide,scala-ide\/scala-ide,dragos\/scala-ide,sschaef\/scala-ide,romanowski\/scala-ide,scala-ide\/scala-ide,pilipolio\/scala-ide,pilipolio\/scala-ide,stephenh\/scala-ide,Kwestor\/scala-ide,wpopielarski\/scala-ide,aleksi-lukkarinen\/scala-ide,andrey-ilinykh\/scala-ide,romanowski\/scala-ide,dragos\/scala-ide,mlangc\/scala-ide,mlangc\/scala-ide","old_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/core\/DOMAspect.aj","new_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/core\/DOMAspect.aj","new_contents":"\/*\n * Copyright 2005-2010 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.core;\n\nimport java.util.Locale;\nimport java.util.Map;\n\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.core.ICompilationUnit;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.core.compiler.CharOperation;\nimport org.eclipse.jdt.core.dom.AST;\nimport org.eclipse.jdt.core.dom.ASTNode;\nimport org.eclipse.jdt.core.dom.ASTParser;\nimport org.eclipse.jdt.internal.compiler.CompilationResult;\nimport org.eclipse.jdt.internal.compiler.DefaultErrorHandlingPolicies;\nimport org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.AbstractVariableDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.AnnotationMethodDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.Argument;\nimport org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.ConstructorDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.Expression;\nimport org.eclipse.jdt.internal.compiler.ast.MethodDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.QualifiedAllocationExpression;\nimport org.eclipse.jdt.internal.compiler.ast.Statement;\nimport org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.TypeParameter;\nimport org.eclipse.jdt.internal.compiler.ast.TypeReference;\nimport org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;\nimport org.eclipse.jdt.internal.compiler.env.AccessRestriction;\nimport org.eclipse.jdt.internal.compiler.env.IBinaryType;\nimport org.eclipse.jdt.internal.compiler.env.INameEnvironment;\nimport org.eclipse.jdt.internal.compiler.env.ISourceType;\nimport org.eclipse.jdt.internal.compiler.impl.CompilerOptions;\nimport org.eclipse.jdt.internal.compiler.impl.ITypeRequestor;\nimport org.eclipse.jdt.internal.compiler.lookup.LookupEnvironment;\nimport org.eclipse.jdt.internal.compiler.lookup.PackageBinding;\nimport org.eclipse.jdt.internal.compiler.parser.SourceTypeConverter;\nimport org.eclipse.jdt.internal.compiler.problem.DefaultProblemFactory;\nimport org.eclipse.jdt.internal.compiler.problem.ProblemReporter;\nimport org.eclipse.jdt.internal.core.DefaultWorkingCopyOwner;\nimport org.eclipse.jdt.internal.core.JavaProject;\nimport org.eclipse.jdt.internal.core.SourceAnnotationMethodInfo;\nimport org.eclipse.jdt.internal.core.SourceMethod;\nimport org.eclipse.jdt.internal.core.SourceMethodElementInfo;\nimport org.eclipse.jdt.internal.core.SourceType;\nimport org.eclipse.jdt.internal.core.SourceTypeElementInfo;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaCompilationUnit;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect DOMAspect {\n  pointcut internalCreateAST(ASTParser parser, IProgressMonitor monitor) :\n    execution(ASTNode ASTParser.internalCreateAST(IProgressMonitor)) &&\n    args(monitor) &&\n    target(parser);\n  \n  pointcut convert(SourceTypeConverter stc, SourceMethod methodHandle, SourceMethodElementInfo methodInfo, CompilationResult compilationResult) :\n    execution(AbstractMethodDeclaration SourceTypeConverter.convert(SourceMethod, SourceMethodElementInfo, CompilationResult)) &&\n    args(methodHandle, methodInfo, compilationResult) &&\n    target(stc);\n\/*  \n  ASTNode around(ASTParser parser, IProgressMonitor monitor) :\n    internalCreateAST(parser, monitor) {\n    try {\n      if (!(parser.typeRoot instanceof IScalaCompilationUnit))\n        return proceed(parser, monitor);\n      \n      ICompilationUnit cu = (ICompilationUnit)parser.typeRoot;\n      org.eclipse.jdt.internal.compiler.env.ICompilationUnit sourceUnit = (org.eclipse.jdt.internal.compiler.env.ICompilationUnit)cu;\n      \n      IType[] topLevelTypes = cu.getTypes();\n      int length = topLevelTypes.length;\n      if (length == 0)\n        throw new IllegalStateException();\n      \n      SourceTypeElementInfo[] topLevelInfos = new SourceTypeElementInfo[length];\n      for (int i = 0; i < length; i++) {\n        topLevelInfos[i] = (SourceTypeElementInfo) ((SourceType)topLevelTypes[i]).getElementInfo();\n      }\n      char[] fileName = ((ISourceType)topLevelInfos[0]).getFileName();\n      \n      CompilationResult result = new CompilationResult(fileName, 1, 1, 100);\n\n      JavaProject javaProject = (JavaProject)cu.getJavaProject(); \n      Map compilerOptions0 = javaProject.getOptions(true);\n      CompilerOptions compilerOptions = new CompilerOptions(compilerOptions0);\n      compilerOptions.storeAnnotations = true;\n      \n      ProblemReporter problemReporter =\n        new ProblemReporter(\n          DefaultErrorHandlingPolicies.proceedWithAllProblems(),\n          compilerOptions,\n          new DefaultProblemFactory(Locale.getDefault()));\n      \n      int flags = SourceTypeConverter.FIELD_AND_METHOD | SourceTypeConverter.MEMBER_TYPE;\n      \n      CompilationUnitDeclaration unit =\n        SourceTypeConverter.buildCompilationUnit(topLevelInfos, flags, problemReporter, result);\n      \n      INameEnvironment ne = javaProject.newSearchableNameEnvironment(DefaultWorkingCopyOwner.PRIMARY);\n      final LookupEnvironment le = new LookupEnvironment(null, compilerOptions, problemReporter, ne);\n      ITypeRequestor typeRequestor = new ITypeRequestor() {\n        public void accept(IBinaryType binaryType, PackageBinding packageBinding, AccessRestriction accessRestriction) {\n          le.createBinaryTypeFrom(binaryType, packageBinding, accessRestriction);\n        }\n        public void accept(org.eclipse.jdt.internal.compiler.env.ICompilationUnit unit, AccessRestriction accessRestriction) {}\n        public void accept(ISourceType[] sourceType, PackageBinding packageBinding, AccessRestriction accessRestriction) {}\n      };\n      le.typeRequestor = typeRequestor;\n      \n      le.buildTypeBindings(unit, null);\n      le.completeTypeBindings();\n      fixTypes(unit.types);\n      \n      AST ast = AST.newAST(AST.JLS3);\n      ast.setFlag(AST.RESOLVED_BINDINGS);\n      ast.setDefaultNodeFlag(ASTNode.ORIGINAL);\n\n      org.eclipse.jdt.core.dom.ASTConverter converter =\n        new org.eclipse.jdt.core.dom.ASTConverter(compilerOptions0, true, monitor);\n      \n      org.eclipse.jdt.core.dom.BindingResolver resolver =\n        new org.eclipse.jdt.core.dom.DefaultBindingResolver(\n          unit.scope,\n          DefaultWorkingCopyOwner.PRIMARY,\n          new org.eclipse.jdt.core.dom.DefaultBindingResolver.BindingTables(),\n          true);\n      ast.setBindingResolver(resolver);\n      converter.setAST(ast);\n      \n      ASTNode node = converter.convert(unit, sourceUnit.getContents());\n      return node;\n    } catch (JavaModelException ex) {\n      throw new IllegalArgumentException(ex);\n    }\n  }\n  \n  private void fixTypes(TypeDeclaration[] types) {\n    for(int i = 0, iLimit = types.length; i < iLimit ; ++i) {\n      TypeDeclaration tpe = types[i];\n      if (tpe != null) {\n        if (tpe.binding != null) tpe.binding.getAnnotationTagBits();\n        if (tpe.scope != null) {\n          tpe.scope.buildFields();\n          tpe.scope.buildMethods();\n        }\n        fixFields(tpe.fields);\n        fixMethods(tpe.methods);\n        fixTypes(tpe.memberTypes);\n      }\n    }\n  }*\/\n  \n  private void fixMethods(AbstractMethodDeclaration[] methods) {\n    if (methods == null)\n      return;\n    \n    for(int i = 0, iLimit = methods.length; i < iLimit; ++i) {\n      AbstractMethodDeclaration m = methods[i];\n      m.bodyStart = m.declarationSourceStart;\n      m.bodyEnd = m.declarationSourceEnd;\n      if (m.binding != null) {\n        m.binding.getAnnotationTagBits();\n      }\n    }\n  }\n  \n  private void fixFields(AbstractVariableDeclaration[] fields) {\n    if (fields == null)\n      return;\n    \n    for(int i = 0, iLimit = fields.length; i < iLimit; ++i) {\n      AbstractVariableDeclaration f = fields[i];\n      f.declarationEnd = f.declarationSourceEnd;\n    }\n  }\n\n  AbstractMethodDeclaration around(SourceTypeConverter stc, SourceMethod methodHandle, SourceMethodElementInfo methodInfo, CompilationResult compilationResult) throws JavaModelException :\n    convert(stc, methodHandle, methodInfo, compilationResult) {\n    AbstractMethodDeclaration method;\n\n    \/* only source positions available *\/\n    int start = methodInfo.getNameSourceStart();\n    int end = methodInfo.getNameSourceEnd();\n\n    \/\/ convert 1.5 specific constructs only if compliance is 1.5 or above\n    TypeParameter[] typeParams = null;\n    if (stc.has1_5Compliance) {\n      \/* convert type parameters *\/\n      char[][] typeParameterNames = methodInfo.getTypeParameterNames();\n      if (typeParameterNames != null) {\n        int parameterCount = typeParameterNames.length;\n        if (parameterCount > 0) { \/\/ method's type parameters must be null if no type parameter\n          char[][][] typeParameterBounds = methodInfo.getTypeParameterBounds();\n          typeParams = new TypeParameter[parameterCount];\n          for (int i = 0; i < parameterCount; i++) {\n            typeParams[i] = stc.createTypeParameter(typeParameterNames[i], typeParameterBounds[i], start, end);\n          }\n        }\n      }\n    }\n\n    int modifiers = methodInfo.getModifiers();\n    if (methodInfo.isConstructor()) {\n      ConstructorDeclaration decl = new ConstructorDeclaration(compilationResult);\n      decl.bits &= ~org.eclipse.jdt.internal.compiler.ast.ASTNode.IsDefaultConstructor;\n      method = decl;\n      decl.typeParameters = typeParams;\n    } else {\n      MethodDeclaration decl;\n      if (methodInfo.isAnnotationMethod()) {\n        AnnotationMethodDeclaration annotationMethodDeclaration = new AnnotationMethodDeclaration(compilationResult);\n\n        \/* conversion of default value *\/\n        SourceAnnotationMethodInfo annotationMethodInfo = (SourceAnnotationMethodInfo) methodInfo;\n        boolean hasDefaultValue = annotationMethodInfo.defaultValueStart != -1 || annotationMethodInfo.defaultValueEnd != -1;\n        if ((stc.flags & SourceTypeConverter.FIELD_INITIALIZATION) != 0) {\n          if (hasDefaultValue) {\n            char[] defaultValueSource = CharOperation.subarray(stc.getSource(), annotationMethodInfo.defaultValueStart, annotationMethodInfo.defaultValueEnd+1);\n            if (defaultValueSource != null) {\n                Expression expression =  stc.parseMemberValue(defaultValueSource);\n                if (expression != null) {\n                  annotationMethodDeclaration.defaultValue = expression;\n                }\n            } else {\n              \/\/ could not retrieve the default value\n              hasDefaultValue = false;\n            }\n          }\n        }\n        if (hasDefaultValue)\n          modifiers |= ClassFileConstants.AccAnnotationDefault;\n        decl = annotationMethodDeclaration;\n      } else {\n        decl = new MethodDeclaration(compilationResult);\n      }\n\n      \/\/ convert return type\n      decl.returnType = stc.createTypeReference(methodInfo.getReturnTypeName(), start, end);\n\n      \/\/ type parameters\n      decl.typeParameters = typeParams;\n\n      method = decl;\n    }\n    method.selector = methodHandle.getElementName().toCharArray();\n    boolean isVarargs = (modifiers & ClassFileConstants.AccVarargs) != 0;\n    method.modifiers = modifiers & ~ClassFileConstants.AccVarargs;\n    method.sourceStart = start;\n    method.sourceEnd = end;\n    method.declarationSourceStart = methodInfo.getDeclarationSourceStart();\n    method.declarationSourceEnd = methodInfo.getDeclarationSourceEnd();\n\n    \/\/ convert 1.5 specific constructs only if compliance is 1.5 or above\n    if (stc.has1_5Compliance) {\n      \/* convert annotations *\/\n      method.annotations = stc.convertAnnotations(methodHandle);\n    }\n\n    \/* convert arguments *\/\n    String[] argumentTypeSignatures = methodHandle.getParameterTypes();\n    char[][] argumentNames = methodInfo.getArgumentNames();\n    int argumentCount = argumentTypeSignatures == null ? 0 : argumentTypeSignatures.length;\n    if (argumentCount > 0) {\n      long position = ((long) start << 32) + end;\n      method.arguments = new Argument[argumentCount];\n      for (int i = 0; i < argumentCount; i++) {\n        TypeReference typeReference = stc.createTypeReference(argumentTypeSignatures[i], start, end);\n        if (isVarargs && i == argumentCount-1) {\n          typeReference.bits |= org.eclipse.jdt.internal.compiler.ast.ASTNode.IsVarArgs;\n        }\n        method.arguments[i] =\n          new Argument(\n            argumentNames[i],\n            position,\n            typeReference,\n            ClassFileConstants.AccDefault);\n        \/\/ do not care whether was final or not\n      }\n    }\n\n    \/* convert thrown exceptions *\/\n    char[][] exceptionTypeNames = methodInfo.getExceptionTypeNames();\n    int exceptionCount = exceptionTypeNames == null ? 0 : exceptionTypeNames.length;\n    if (exceptionCount > 0) {\n      method.thrownExceptions = new TypeReference[exceptionCount];\n      for (int i = 0; i < exceptionCount; i++) {\n        method.thrownExceptions[i] =\n          stc.createTypeReference(exceptionTypeNames[i], start, end);\n      }\n    }\n\n    \/* convert local and anonymous types *\/\n    if ((stc.flags & SourceTypeConverter.LOCAL_TYPE) != 0) {\n      IJavaElement[] children = methodInfo.getChildren();\n      int typesLength = 0;\n      int childrenLength = children.length;\n      for (int i = 0; i < childrenLength; ++i)\n        if (children[i] instanceof SourceType)\n          ++typesLength;\n      \n      if (typesLength != 0) {\n        Statement[] statements = new Statement[typesLength];\n        int typeIndex = 0;\n        for (int i = 0; i < childrenLength; i++) {\n          if (children[i] instanceof SourceType) {\n            SourceType type = (SourceType) children[i];\n            TypeDeclaration localType = stc.convert(type, compilationResult);\n            if ((localType.bits & org.eclipse.jdt.internal.compiler.ast.ASTNode.IsAnonymousType) != 0) {\n              QualifiedAllocationExpression expression = new QualifiedAllocationExpression(localType);\n              expression.type = localType.superclass;\n              localType.superclass = null;\n              localType.superInterfaces = null;\n              localType.allocation = expression;\n              statements[typeIndex] = expression;\n            } else {\n              statements[typeIndex] = localType;\n            }\n            ++typeIndex;\n          }\n        }\n        method.statements = statements;\n      }\n    }\n\n    return method;\n  }\n}\n","old_contents":"\/*\n * Copyright 2005-2010 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.core;\n\nimport java.util.Locale;\nimport java.util.Map;\n\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.core.ICompilationUnit;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.core.compiler.CharOperation;\nimport org.eclipse.jdt.core.dom.AST;\nimport org.eclipse.jdt.core.dom.ASTNode;\nimport org.eclipse.jdt.core.dom.ASTParser;\nimport org.eclipse.jdt.internal.compiler.CompilationResult;\nimport org.eclipse.jdt.internal.compiler.DefaultErrorHandlingPolicies;\nimport org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.AbstractVariableDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.AnnotationMethodDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.Argument;\nimport org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.ConstructorDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.Expression;\nimport org.eclipse.jdt.internal.compiler.ast.MethodDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.QualifiedAllocationExpression;\nimport org.eclipse.jdt.internal.compiler.ast.Statement;\nimport org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.TypeParameter;\nimport org.eclipse.jdt.internal.compiler.ast.TypeReference;\nimport org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;\nimport org.eclipse.jdt.internal.compiler.env.AccessRestriction;\nimport org.eclipse.jdt.internal.compiler.env.IBinaryType;\nimport org.eclipse.jdt.internal.compiler.env.INameEnvironment;\nimport org.eclipse.jdt.internal.compiler.env.ISourceType;\nimport org.eclipse.jdt.internal.compiler.impl.CompilerOptions;\nimport org.eclipse.jdt.internal.compiler.impl.ITypeRequestor;\nimport org.eclipse.jdt.internal.compiler.lookup.LookupEnvironment;\nimport org.eclipse.jdt.internal.compiler.lookup.PackageBinding;\nimport org.eclipse.jdt.internal.compiler.parser.SourceTypeConverter;\nimport org.eclipse.jdt.internal.compiler.problem.DefaultProblemFactory;\nimport org.eclipse.jdt.internal.compiler.problem.ProblemReporter;\nimport org.eclipse.jdt.internal.core.DefaultWorkingCopyOwner;\nimport org.eclipse.jdt.internal.core.JavaProject;\nimport org.eclipse.jdt.internal.core.SourceAnnotationMethodInfo;\nimport org.eclipse.jdt.internal.core.SourceMethod;\nimport org.eclipse.jdt.internal.core.SourceMethodElementInfo;\nimport org.eclipse.jdt.internal.core.SourceType;\nimport org.eclipse.jdt.internal.core.SourceTypeElementInfo;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaCompilationUnit;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect DOMAspect {\n  pointcut internalCreateAST(ASTParser parser, IProgressMonitor monitor) :\n    execution(ASTNode ASTParser.internalCreateAST(IProgressMonitor)) &&\n    args(monitor) &&\n    target(parser);\n  \n  pointcut convert(SourceTypeConverter stc, SourceMethod methodHandle, SourceMethodElementInfo methodInfo, CompilationResult compilationResult) :\n    execution(AbstractMethodDeclaration SourceTypeConverter.convert(SourceMethod, SourceMethodElementInfo, CompilationResult)) &&\n    args(methodHandle, methodInfo, compilationResult) &&\n    target(stc);\n  \n  ASTNode around(ASTParser parser, IProgressMonitor monitor) :\n    internalCreateAST(parser, monitor) {\n    try {\n      if (!(parser.typeRoot instanceof IScalaCompilationUnit))\n        return proceed(parser, monitor);\n      \n      ICompilationUnit cu = (ICompilationUnit)parser.typeRoot;\n      org.eclipse.jdt.internal.compiler.env.ICompilationUnit sourceUnit = (org.eclipse.jdt.internal.compiler.env.ICompilationUnit)cu;\n      \n      IType[] topLevelTypes = cu.getTypes();\n      int length = topLevelTypes.length;\n      if (length == 0)\n        throw new IllegalStateException();\n      \n      SourceTypeElementInfo[] topLevelInfos = new SourceTypeElementInfo[length];\n      for (int i = 0; i < length; i++) {\n        topLevelInfos[i] = (SourceTypeElementInfo) ((SourceType)topLevelTypes[i]).getElementInfo();\n      }\n      char[] fileName = ((ISourceType)topLevelInfos[0]).getFileName();\n      \n      CompilationResult result = new CompilationResult(fileName, 1, 1, 100);\n\n      JavaProject javaProject = (JavaProject)cu.getJavaProject(); \n      Map compilerOptions0 = javaProject.getOptions(true);\n      CompilerOptions compilerOptions = new CompilerOptions(compilerOptions0);\n      compilerOptions.storeAnnotations = true;\n      \n      ProblemReporter problemReporter =\n        new ProblemReporter(\n          DefaultErrorHandlingPolicies.proceedWithAllProblems(),\n          compilerOptions,\n          new DefaultProblemFactory(Locale.getDefault()));\n      \n      int flags = SourceTypeConverter.FIELD_AND_METHOD | SourceTypeConverter.MEMBER_TYPE;\n      \n      CompilationUnitDeclaration unit =\n        SourceTypeConverter.buildCompilationUnit(topLevelInfos, flags, problemReporter, result);\n      \n      INameEnvironment ne = javaProject.newSearchableNameEnvironment(DefaultWorkingCopyOwner.PRIMARY);\n      final LookupEnvironment le = new LookupEnvironment(null, compilerOptions, problemReporter, ne);\n      ITypeRequestor typeRequestor = new ITypeRequestor() {\n        public void accept(IBinaryType binaryType, PackageBinding packageBinding, AccessRestriction accessRestriction) {\n          le.createBinaryTypeFrom(binaryType, packageBinding, accessRestriction);\n        }\n        public void accept(org.eclipse.jdt.internal.compiler.env.ICompilationUnit unit, AccessRestriction accessRestriction) {}\n        public void accept(ISourceType[] sourceType, PackageBinding packageBinding, AccessRestriction accessRestriction) {}\n      };\n      le.typeRequestor = typeRequestor;\n      \n      le.buildTypeBindings(unit, null);\n      le.completeTypeBindings();\n      fixTypes(unit.types);\n      \n      AST ast = AST.newAST(AST.JLS3);\n      ast.setFlag(AST.RESOLVED_BINDINGS);\n      ast.setDefaultNodeFlag(ASTNode.ORIGINAL);\n\n      org.eclipse.jdt.core.dom.ASTConverter converter =\n        new org.eclipse.jdt.core.dom.ASTConverter(compilerOptions0, true, monitor);\n      \n      org.eclipse.jdt.core.dom.BindingResolver resolver =\n        new org.eclipse.jdt.core.dom.DefaultBindingResolver(\n          unit.scope,\n          DefaultWorkingCopyOwner.PRIMARY,\n          new org.eclipse.jdt.core.dom.DefaultBindingResolver.BindingTables(),\n          true);\n      ast.setBindingResolver(resolver);\n      converter.setAST(ast);\n      \n      ASTNode node = converter.convert(unit, sourceUnit.getContents());\n      return node;\n    } catch (JavaModelException ex) {\n      throw new IllegalArgumentException(ex);\n    }\n  }\n  \n  private void fixTypes(TypeDeclaration[] types) {\n    for(int i = 0, iLimit = types.length; i < iLimit ; ++i) {\n      TypeDeclaration tpe = types[i];\n      if (tpe != null) {\n        if (tpe.binding != null) tpe.binding.getAnnotationTagBits();\n        if (tpe.scope != null) {\n          tpe.scope.buildFields();\n          tpe.scope.buildMethods();\n        }\n        fixFields(tpe.fields);\n        fixMethods(tpe.methods);\n        fixTypes(tpe.memberTypes);\n      }\n    }\n  }\n  \n  private void fixMethods(AbstractMethodDeclaration[] methods) {\n    if (methods == null)\n      return;\n    \n    for(int i = 0, iLimit = methods.length; i < iLimit; ++i) {\n      AbstractMethodDeclaration m = methods[i];\n      m.bodyStart = m.declarationSourceStart;\n      m.bodyEnd = m.declarationSourceEnd;\n      if (m.binding != null) {\n        m.binding.getAnnotationTagBits();\n      }\n    }\n  }\n  \n  private void fixFields(AbstractVariableDeclaration[] fields) {\n    if (fields == null)\n      return;\n    \n    for(int i = 0, iLimit = fields.length; i < iLimit; ++i) {\n      AbstractVariableDeclaration f = fields[i];\n      f.declarationEnd = f.declarationSourceEnd;\n    }\n  }\n\n  AbstractMethodDeclaration around(SourceTypeConverter stc, SourceMethod methodHandle, SourceMethodElementInfo methodInfo, CompilationResult compilationResult) throws JavaModelException :\n    convert(stc, methodHandle, methodInfo, compilationResult) {\n    AbstractMethodDeclaration method;\n\n    \/* only source positions available *\/\n    int start = methodInfo.getNameSourceStart();\n    int end = methodInfo.getNameSourceEnd();\n\n    \/\/ convert 1.5 specific constructs only if compliance is 1.5 or above\n    TypeParameter[] typeParams = null;\n    if (stc.has1_5Compliance) {\n      \/* convert type parameters *\/\n      char[][] typeParameterNames = methodInfo.getTypeParameterNames();\n      if (typeParameterNames != null) {\n        int parameterCount = typeParameterNames.length;\n        if (parameterCount > 0) { \/\/ method's type parameters must be null if no type parameter\n          char[][][] typeParameterBounds = methodInfo.getTypeParameterBounds();\n          typeParams = new TypeParameter[parameterCount];\n          for (int i = 0; i < parameterCount; i++) {\n            typeParams[i] = stc.createTypeParameter(typeParameterNames[i], typeParameterBounds[i], start, end);\n          }\n        }\n      }\n    }\n\n    int modifiers = methodInfo.getModifiers();\n    if (methodInfo.isConstructor()) {\n      ConstructorDeclaration decl = new ConstructorDeclaration(compilationResult);\n      decl.bits &= ~org.eclipse.jdt.internal.compiler.ast.ASTNode.IsDefaultConstructor;\n      method = decl;\n      decl.typeParameters = typeParams;\n    } else {\n      MethodDeclaration decl;\n      if (methodInfo.isAnnotationMethod()) {\n        AnnotationMethodDeclaration annotationMethodDeclaration = new AnnotationMethodDeclaration(compilationResult);\n\n        \/* conversion of default value *\/\n        SourceAnnotationMethodInfo annotationMethodInfo = (SourceAnnotationMethodInfo) methodInfo;\n        boolean hasDefaultValue = annotationMethodInfo.defaultValueStart != -1 || annotationMethodInfo.defaultValueEnd != -1;\n        if ((stc.flags & SourceTypeConverter.FIELD_INITIALIZATION) != 0) {\n          if (hasDefaultValue) {\n            char[] defaultValueSource = CharOperation.subarray(stc.getSource(), annotationMethodInfo.defaultValueStart, annotationMethodInfo.defaultValueEnd+1);\n            if (defaultValueSource != null) {\n                Expression expression =  stc.parseMemberValue(defaultValueSource);\n                if (expression != null) {\n                  annotationMethodDeclaration.defaultValue = expression;\n                }\n            } else {\n              \/\/ could not retrieve the default value\n              hasDefaultValue = false;\n            }\n          }\n        }\n        if (hasDefaultValue)\n          modifiers |= ClassFileConstants.AccAnnotationDefault;\n        decl = annotationMethodDeclaration;\n      } else {\n        decl = new MethodDeclaration(compilationResult);\n      }\n\n      \/\/ convert return type\n      decl.returnType = stc.createTypeReference(methodInfo.getReturnTypeName(), start, end);\n\n      \/\/ type parameters\n      decl.typeParameters = typeParams;\n\n      method = decl;\n    }\n    method.selector = methodHandle.getElementName().toCharArray();\n    boolean isVarargs = (modifiers & ClassFileConstants.AccVarargs) != 0;\n    method.modifiers = modifiers & ~ClassFileConstants.AccVarargs;\n    method.sourceStart = start;\n    method.sourceEnd = end;\n    method.declarationSourceStart = methodInfo.getDeclarationSourceStart();\n    method.declarationSourceEnd = methodInfo.getDeclarationSourceEnd();\n\n    \/\/ convert 1.5 specific constructs only if compliance is 1.5 or above\n    if (stc.has1_5Compliance) {\n      \/* convert annotations *\/\n      method.annotations = stc.convertAnnotations(methodHandle);\n    }\n\n    \/* convert arguments *\/\n    String[] argumentTypeSignatures = methodHandle.getParameterTypes();\n    char[][] argumentNames = methodInfo.getArgumentNames();\n    int argumentCount = argumentTypeSignatures == null ? 0 : argumentTypeSignatures.length;\n    if (argumentCount > 0) {\n      long position = ((long) start << 32) + end;\n      method.arguments = new Argument[argumentCount];\n      for (int i = 0; i < argumentCount; i++) {\n        TypeReference typeReference = stc.createTypeReference(argumentTypeSignatures[i], start, end);\n        if (isVarargs && i == argumentCount-1) {\n          typeReference.bits |= org.eclipse.jdt.internal.compiler.ast.ASTNode.IsVarArgs;\n        }\n        method.arguments[i] =\n          new Argument(\n            argumentNames[i],\n            position,\n            typeReference,\n            ClassFileConstants.AccDefault);\n        \/\/ do not care whether was final or not\n      }\n    }\n\n    \/* convert thrown exceptions *\/\n    char[][] exceptionTypeNames = methodInfo.getExceptionTypeNames();\n    int exceptionCount = exceptionTypeNames == null ? 0 : exceptionTypeNames.length;\n    if (exceptionCount > 0) {\n      method.thrownExceptions = new TypeReference[exceptionCount];\n      for (int i = 0; i < exceptionCount; i++) {\n        method.thrownExceptions[i] =\n          stc.createTypeReference(exceptionTypeNames[i], start, end);\n      }\n    }\n\n    \/* convert local and anonymous types *\/\n    if ((stc.flags & SourceTypeConverter.LOCAL_TYPE) != 0) {\n      IJavaElement[] children = methodInfo.getChildren();\n      int typesLength = 0;\n      int childrenLength = children.length;\n      for (int i = 0; i < childrenLength; ++i)\n        if (children[i] instanceof SourceType)\n          ++typesLength;\n      \n      if (typesLength != 0) {\n        Statement[] statements = new Statement[typesLength];\n        int typeIndex = 0;\n        for (int i = 0; i < childrenLength; i++) {\n          if (children[i] instanceof SourceType) {\n            SourceType type = (SourceType) children[i];\n            TypeDeclaration localType = stc.convert(type, compilationResult);\n            if ((localType.bits & org.eclipse.jdt.internal.compiler.ast.ASTNode.IsAnonymousType) != 0) {\n              QualifiedAllocationExpression expression = new QualifiedAllocationExpression(localType);\n              expression.type = localType.superclass;\n              localType.superclass = null;\n              localType.superInterfaces = null;\n              localType.allocation = expression;\n              statements[typeIndex] = expression;\n            } else {\n              statements[typeIndex] = localType;\n            }\n            ++typeIndex;\n          }\n        }\n        method.statements = statements;\n      }\n    }\n\n    return method;\n  }\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"d8702b5e63cb2ddbbf9c46dd521260e8f6496b7a","subject":"Changed log model for new aloja DB format","message":"Changed log model for new aloja DB format\n","repos":"Aloja\/AOP4Hadoop","old_file":"src\/1.0.3\/Aspectj.aj","new_file":"src\/1.0.3\/Aspectj.aj","new_contents":"import java.io.*;\nimport java.util.*;\nimport java.lang.management.ManagementFactory;\nimport java.sql.Timestamp;\nimport java.text.SimpleDateFormat;\nimport java.net.InetAddress;\nimport java.lang.ClassLoader;\nimport org.apache.hadoop.io.DataInputBuffer;\nimport org.apache.hadoop.mapred.TaskStatus;\nimport org.apache.hadoop.fs.permission.FsPermission;\nimport org.apache.hadoop.util.Progressable;\nimport org.apache.hadoop.hdfs.protocol.DatanodeInfo;\nimport org.apache.hadoop.util.DataChecksum;\nimport java.net.Socket;\n\n\nimport org.apache.hadoop.security.token.Token;\nimport org.apache.hadoop.security.token.TokenIdentifier;\nimport org.apache.hadoop.hdfs.security.token.block.BlockTokenIdentifier;\n\n\nimport org.apache.hadoop.fs.FSDataInputStream;\nimport org.apache.hadoop.hdfs.DFSClient;\n\nimport org.apache.hadoop.mapred.TaskTrackerStatus;\n\nimport org.apache.commons.logging.Log;\nimport org.apache.commons.logging.LogFactory;\n\n\nimport org.apache.hadoop.conf.Configuration;\n\n\n\n\n\n\n\/**\n *\n * @author Alejandro\n *\/\n\naspect AlojaAspect {\t\t\n\n\tprivate static final Log LOG = LogFactory.getLog(AlojaAspect.class);\n\n\t\/*\n\tTYPES\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\n    public static class Events {\n\n        public static final int JobTracker = 11111;\n        public static final int TaskTracker = 11112;\n        public static final int NameNode = 11113;\n        public static final int SecondaryNameNode = 11114;\n        public static final int DataNode = 11115;\n        public static final int Task = 11116;\n        public static final int HeartBeat = 11119;\n\/\/        public static final int MapTask = 11117;\n\/\/        public static final int ReduceTask = 11118;\n        public static final int MapOutputBuffer = 33333;\n        public static final int MapTaskOutputSize = 44444;\n    }\n\n    public static class Values {\n\n       \t\/\/ Generic\n\t\tpublic static final int End = 0;        \n        public static final int Start = 1;\n        \n        \/\/ Events.TaskTracker \n\t\tpublic static final int RunMapper = 8;\n        public static final int RunReducer = 9;\n        public static final int ReducerCopyPhase = 10;\n        public static final int ReducerSortPhase = 11;\n        public static final int ReducerReducePhase = 12;\n\n\t\t\/\/ Events.MapOutputBuffer\n        public static final int Flush = 1;\n        public static final int SortAndSpill = 2;\n        public static final int Sort = 3;        \n        public static final int CreateSpillIndexFile = 5;\n        \/\/public static final int TotalIndexCacheMemory = 6;\n        public static final int SpillRecordDumped = 7;\n        public static final int Combine = 4;\n    }    \n\n\n\t\/*\n\tFUNCTIONS\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\t\n\tprivate static long getPID() {\n\t\tString name = java.lang.management.ManagementFactory.getRuntimeMXBean().getName();\n\t\treturn Long.parseLong(name.split(\"@\")[0]);\n\t}\n\n\tprivate void generateEvent(Integer key, Integer value) {\n\t\t\/\/2:cpu:app:task:thread:time:type:value\n\t\ttry{\n\t\t\tString hostname = InetAddress.getLocalHost().getHostName();\n\t\t\tlong pid = getPID();\n\t\t\t\/\/LOG.info(hostname+\",\"+pid+\",2:\"+hostname+\":2:\"+pid+\":1:\"+System.currentTimeMillis()+\":\"+key+\":\"+value);\n\t\t\tLOG.info(\"AOPLOG,\"+pid+\",\"+System.currentTimeMillis()+\",\"+key+\",\"+value);\n\t\t}\n\t\tcatch (Exception e) {\n\t\t\tLOG.error(e, e);\n\n\t\t}\n\t}\n\n\n\tprivate void generateEvent(Integer key, String value) {\n\t\t\/\/2:cpu:app:task:thread:time:type:value\n\t\ttry{\n\t\t\tString hostname = InetAddress.getLocalHost().getHostName();\n\t\t\tlong pid = getPID();\n\t\t\t\/\/LOG.info(hostname+\",\"+pid+\",2:\"+hostname+\":2:\"+pid+\":1:\"+System.currentTimeMillis()+\":\"+key+\":\"+value);\n\t\t\tLOG.info(hostname+\",\"+pid+\",\"+System.currentTimeMillis()+\",\"+key+\",\"+value);\n\t\t}\n\t\tcatch (Exception e) {\n\t\t\tLOG.error(e, e);\n\n\t\t}\n\t}\n\n\n\t\/*private void generateEVent(Integer key[], Integer value) {\n\n\t\tStringBuffer output = new StringBuffer();\n\n\n\t\toutput.append()\n\n\t}*\/\n\n\tprivate void instrumentation(String event, String when) {\n\n\t\tinstrumentation(event, when, \"\");\n\n\t}\n\tprivate void instrumentation(String event, String when, String additional) {\n\t\ttry {\n\t\t\t\/\/Add hostname\n\t\t\tString log = InetAddress.getLocalHost().getHostName();\n\t\t\t\/\/Add PID \n\t\t\tlog += \",\" + getPID();\n\t\t\t\/\/Specify event\n\t\t\tlog += \",\" + when + \",\" + event;\n\t\t\t\/\/Specify event\n\t\t\tlog += additional;\n\t\t\t\/\/LOG.info(log);\n\t\t\t\/\/writeLog(logFile,log);\n\n\n\t\t}\n\t\tcatch (IOException e) {\n\t\t\te.printStackTrace();\n\t\t}\n\t}\n\n\n\t\/*\n\tPOINTCUTS\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\n\t\/\/RegisterDataNode Pointcut\n\n\tpointcut startDataNode(): execution(* org.apache.hadoop.hdfs.server.datanode.DataNode.startDataNode(..));\n\n\t\/\/RegisterNameNode Pointcut\n\n\tpointcut initializeNameNode():  execution(* org.apache.hadoop.hdfs.server.namenode.NameNode.initialize(..));\n\n\t\/\/RegisterSecondaryNamenode Pointcut\n\n\tpointcut initializeSecondaryNameNode(): execution(* org.apache.hadoop.hdfs.server.namenode.SecondaryNameNode.initialize(..));\n\n\t\/\/RegisterTask - CHILD\n\n\t\/\/pointcut initializeChild(): call(* org.apache.hadoop.mapred.Child.initMetrics(..)) && withincode(* org.apache.hadoop.mapred.Child.main(..)); \n\n\tpointcut initializeChild(): execution(* org.apache.hadoop.mapred.Child.main(..)); \n\n\t\/\/Register JobTracker Pointcut\n\n\tpointcut registerJobTracker(): execution(* org.apache.hadoop.mapred.JobTracker.startTracker(..));\n\n\t\/\/HEARTBEAT\n\n\tpointcut heartbeat(TaskTrackerStatus status,boolean restarted,boolean initialContact,boolean acceptNewTasks,short responseId): execution(* org.apache.hadoop.mapred.JobTracker.heartbeat(..)) && args(status, restarted, initialContact, acceptNewTasks,responseId);\n\n\t\/*\n\t\t###########################################################################\n\t\t############################Task###########################################\n\t\t###########################################################################\n\t*\/\n\n\n\tpointcut outputSize(): call (* *.getLen(..)) && withincode(* org.apache.hadoop.mapred.Task.calculateOutputSize());\n\n\t\/*\n\t\t###########################################################################\n\t\t############################MAPPER#########################################\n\t\t###########################################################################\n\t*\/\n\n\t\/\/pointcut maptask(): execution(* org.apache.hadoop.mapred.MapTask.run(..));\n\tpointcut mapper(): call(* org.apache.hadoop.mapred.MapTask.runNewMapper(..)) && withincode(* org.apache.hadoop.mapred.MapTask.run(..));\n\n\n\t\/\/  ############################SORT AND SPILL#################################\n\n\t\/\/Start-End\n\tpointcut taskSortAndSpill(): execution(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\n\tpointcut flush(): execution(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.flush());\n\n\t\/\/Spill File Size\n\tpointcut sortAndSpillSpillFile(int numSpills, long size) : call (* *.getSpillFileForWrite(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(numSpills, size);\n\n\t\/\/SpillIndex File Size\n\tpointcut sortAndSpillSpillIndexFile(int numSpills, long partitions) : call (* *.getSpillIndexFileForWrite(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(numSpills, partitions);\n\n\t\/\/Sort \n\tpointcut sortAndSpillSort(int kvstart, int endPosition, Object reporter): call(* *.sort(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(..,kvstart,endPosition,reporter);\n\n\t\/\/Init Writer\n\t\/\/pointcut sortAndSpillInitWriter() : call (org.apache.hadoop.mapred.IFile.Writer.new(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Close Writer\n\t\/\/pointcut sortAndSpillCloseWriter() : call (void org.apache.hadoop.mapred.IFile.Writer.close(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Write key-value\n\tpointcut sortAndSpillWrite(DataInputBuffer key, DataInputBuffer value): call (* *.append(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(key,value);\n\t\n\t\/\/Combiner\n\tpointcut sortAndSpillCombiner(): call(* *.combine(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Spill Index File\n\tpointcut sortAndSpillSpillIndexWrite(): call(* *.writeToFile(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/*\n\t\t###########################################################################\n\t\t############################REDUCER########################################\n\t\t###########################################################################\n\t*\/\n\n\t\/\/REDUCETASK RUN\n\tpointcut reducer(): execution(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\tpointcut initCodec(): call(* *.initCodec(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\tpointcut setPhase(TaskStatus.Phase phase): call(* *.setPhase(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..)) && args(phase);\n\n\t\n\t\/\/pointcut endCopy(): call(* *.setPhase(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\t\/\/pointcut endSort(): call(* *.getMapOutputKeyClass(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\t\n\n\t\/*\n\t\t###########################################################################\n\t\t############################NETWORK########################################\n\t\t###########################################################################\n\t*\/\n\n\tpointcut defaultBlockSize(): call(* org.apache.hadoop.hdfs.DFSClient.getDefaultBlockSize());\n\t\/\/pointcut blockSize(): call(* org.apache.hadoop.hdfs.DFSClient.getBlockSize(..));\n\tpointcut createDFSFile(String src,FsPermission permission,boolean overwrite,boolean createParent,short replication,long blockSize,Progressable progress, int buffersize): execution (* org.apache.hadoop.hdfs.DFSClient.create(..)) && args(src,permission,overwrite,createParent,replication,blockSize,progress,buffersize);\n\tpointcut runDataStreamer(): execution (* org.apache.hadoop.hdfs.DFSClient.DFSOutputStream.DataStreamer.run());\n\t\/\/pointcut readEntireBufferFromDataNode(byte buf[],int off,int len): execution(* org.apache.hadoop.hdfs.DFSClient.DFSInputStream.read(..)) && args(buf[],off,len);\n\t\/\/pointcut readFromDataNode(): call (* org.apache.hadoop.hdfs.DFSClient.DFSInputStream.blockSeekTo(..)) && withincode(* org.apache.hadoop.hdfs.DFSClient.DFSInputStream.read(..));\n\tpointcut newBlockReader(Socket sock, String file, long blockId, Token<BlockTokenIdentifier> accessToken, long genStamp, long startOffset, long len, int bufferSize, boolean verifyChecksum, String clientName): execution (* org.apache.hadoop.hdfs.DFSClient.BlockReader.newBlockReader(..)) && args(sock,file,blockId,accessToken,genStamp,startOffset,len,bufferSize,verifyChecksum,clientName);\n\n\t\/*\n\tAdvices\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\n\t\/\/ RegiterJobTracker\n\n\tafter() : registerJobTracker(){\n\t\tgenerateEvent(Events.JobTracker, Values.Start);\n\n\t}\n\n\t\/\/RegisterTaskTracker ?\n\n\n\t\/\/RegisterNameNode\n\n\tafter() : initializeNameNode(){\n\t\tgenerateEvent(Events.NameNode, Values.Start);\n\t}\n\n\t\/\/RegisterDataNode \n\n\tafter() : startDataNode(){\n\t\tgenerateEvent(Events.DataNode, Values.Start);\n\t}\n\n\n\t\/\/RegisterSecondaryNamenode\n\n\tafter() : initializeSecondaryNameNode(){\n\t\tgenerateEvent(Events.SecondaryNameNode, Values.Start);\n\t}\n\n\n\t\/\/HEARTBEAT \n\tafter(TaskTrackerStatus status,boolean restarted,boolean initialContact,boolean acceptNewTasks,short responseId) : heartbeat(status, restarted, initialContact, acceptNewTasks,responseId){\n\t\t\/\/ SAMPLE trackername: tracker_vagrant-99-01:localhost\/127.0.0.1:38149\n\t\tgenerateEvent(Events.HeartBeat, status.getTrackerName().replace(':','-').replace('\/','_'));\n\t}\n\n\n\t\/*\n\t\t###########################################################################\n\t\t############################Task###########################################\n\t\t###########################################################################\n\t*\/\n\n\t\/\/RegisterTask CHILD \n\tafter() : initializeChild() { \/\/We need the  PID of this task to be registered\n\t\tgenerateEvent(Events.Task, Values.Start);\n\t}\n\n\n\/*\tafter() returning(long size) : outputSize() {\n\t\tString s = \"Task-outputSize\";\n\t\tinstrumentation(s,\"after\",\", size: \" + Long.toString(size));\n\t}\n\n\t\/*\n\t\t###########################################################################\n\t\t############################Mapper#########################################\n\t\t###########################################################################\n\t*\/\n\n\n\t\/*before() : maptask(){\n\t\tgenerateEvent(Events.MapTask, Values.Start);\n\t}*\/\n\n\tbefore() : mapper(){\n\t\tgenerateEvent(Events.TaskTracker, Values.RunMapper);\n\t}\n\n\tafter() : mapper(){\n\t\tgenerateEvent(Events.TaskTracker, Values.End);\n\t}\n\n\n\t\n\n\t\/\/  ############################SORT AND SPILL#################################\n\n\tbefore() : taskSortAndSpill(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.SortAndSpill);\n\t}\n\n\n\tafter() : taskSortAndSpill(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\n\t}\n\n\t\/\/flush\n\n\tbefore() : flush(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.Flush);\n\t}\n\n\tafter() : flush(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\n\t}\n\n\n\n\t\/\/ Spill File Size\n\n\tafter(int numSpills, long size) returning : sortAndSpillSpillFile(numSpills, size){\n\t\tString s = \"sortAndSpillSpillFile\";\n\t\tinstrumentation(s,\"after\",\", numSpills: \" +Integer.toString(numSpills) + \";size: \" + Long.toString((size*numSpills) + size));\n\t}\n\n\t\/\/ SpillIndex File Size\n\n\tafter(int numSpills, long partitions) returning : sortAndSpillSpillIndexFile(numSpills, partitions){\n\t\tString s = \"sortAndSpillSpillIndexFile\";\n\t\tinstrumentation(s,\"after\",\",\" + Long.toString(numSpills * partitions));\n\t}\n\n\/*\n\tbefore(int length) : kvbufferState(length){\n\n\t\tString s = \"kvbufferState\";\n\t\tFile logFile = getFile();\n\t\tinstrumentation(logFile,s,\"before\");\n\t\twriteLog(logFile,Integer.toString(length));\n\t}\n\n*\/\n\n\tbefore(int kvstart, int endPosition, Object reporter) : sortAndSpillSort(kvstart,endPosition,reporter){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.Sort);\n\t\t\/\/instrumentation(s,\"before\",\",\" + Integer.toString(endPosition - kvstart));\n\t}\n\tafter(int kvstart, int endPosition, Object reporter) returning : sortAndSpillSort(kvstart,endPosition,reporter){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\n\t\t\/\/instrumentation(s,\"after\",\",\" + Integer.toString(endPosition - kvstart));\n\t}\n\n\t\/\/ Init writer\n\/*\tafter() returning : sortAndSpillInitWriter(){\n\t\tString s = \"sortAndSpillInitWriter\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\t\/\/ Close writer\n\tafter() returning : sortAndSpillCloseWriter(){\n\t\tString s = \"sortAndSpillCloseWriter\";\n\t\tinstrumentation(s,\"after\");\n\t}\n*\/\n\n\tafter(DataInputBuffer key, DataInputBuffer value) returning : sortAndSpillWrite(key,value){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.SpillRecordDumped);\n\t}\n\n\tbefore() : sortAndSpillCombiner(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.Combine);\n\t}\n\n\tafter() returning : sortAndSpillCombiner(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\t\n\t}\n\n\tbefore() : sortAndSpillSpillIndexWrite(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.CreateSpillIndexFile);\n\t}\n\n\tafter() returning : sortAndSpillSpillIndexWrite(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\n\t}\n\n\t\/*\n\t\t###########################################################################\n\t\t############################REDUCER########################################\n\t\t###########################################################################\n\t*\/\n\n\/*\tbefore() : reducer(){\n\t\tString s = \"Reducer\";\n\t\tinstrumentation(s,\"before\");\n\t}\n*\/\n\n\tbefore() : initCodec() {\n\t\tgenerateEvent(Events.TaskTracker, Values.RunReducer);\n\t}\n\n\n\tafter() returning : initCodec() {\n\t\tgenerateEvent(Events.TaskTracker, Values.ReducerCopyPhase);\n\t}\n\n\tbefore(TaskStatus.Phase phase) : setPhase(phase) { \/\/END OF A PHASE (SORT OR COPY)\n\t\t\tgenerateEvent(Events.TaskTracker, Values.End);\n\t}\n\n\tafter(TaskStatus.Phase phase) returning: setPhase(phase) { \n\t\tif (phase == TaskStatus.Phase.SORT) {\n\t\t\tgenerateEvent(Events.TaskTracker, Values.ReducerSortPhase);\n\t\t}\n\t\telse if (phase == TaskStatus.Phase.REDUCE) {\n\t\t\tgenerateEvent(Events.TaskTracker, Values.ReducerReducePhase);\n\t\t}\n\t}\n\n\tafter() : reducer(){ \/\/END OF REDUCE PHASE\n\t\t\tgenerateEvent(Events.TaskTracker, Values.End);\t}\n\n\t\/*\n\t\t###########################################################################\n\t\t############################NETWORK########################################\n\t\t###########################################################################\n\t*\/\n\n\tafter() returning(long blockSize) : defaultBlockSize() {\n\t\tString s = \"Network-defaultBlockSize\";\n\t\tinstrumentation(s,\"after\",\", size: \" + Long.toString(blockSize));\n\t}\n\t\/\/ after() returning(long blockSize) : blockSize() {\n\t\/\/ \tString s = \"Network-blockSize\";\n\t\/\/ \tFile logFile = getFile();\n\t\/\/ \tinstrumentation(logFile,s,\"after\");\n\t\/\/ \tString log = \", size: \" + Long.toString(blockSize);\n\t\/\/ \twriteLog(logFile,log);\n\t\/\/ }\n\n\tafter(String src,FsPermission permission,boolean overwrite, boolean createParent,short replication,long blockSize,Progressable progress, int buffersize): createDFSFile(src,permission,overwrite,createParent,replication,blockSize,progress,buffersize) {\n\t\tString s = \"Network-CreateDFSFile\";\n\n\t\t\/\/MODIFIED!!!!!!-----!!!!!!!!!!!\n\t\tinstrumentation(s,\"after\",\", path: \" + src + \";permission: \" + permission.toString() + \";overwrite: \" + String.valueOf(overwrite) + \";createParent: \" + String.valueOf(createParent) + \";replication: \" + Short.toString(replication) + \";blockSize: \" + Long.toString(blockSize) + \";buffersize: \" + Integer.toString(buffersize));\n\t}\n\tbefore(): runDataStreamer() {\n\t\tString s = \"DataStreamer\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\t\/\/ before(byte buf[],int off, int len) : readEntireBufferFromDataNode(buf[],off,len){\n\t\/\/ \tString s = \"Network-ReadEntireBuffer\";\n\t\/\/ \tinstrumentation(s,\"after\",\", bufferLength: \" + Integer.toString(len));\n\t\/\/ }\n\n\t\/\/ after() returning(DatanodeInfo datanode) : readFromDataNode(){\n\t\/\/ \tString s = \"Network-fromDataNode\";\n\t\/\/ \tinstrumentation(s,\"after\", \", from : \" + datanode.getHostName());\n\t\/\/ }\n\n\tafter(Socket sock, String file, long blockId, Token<BlockTokenIdentifier> accessToken, long genStamp, long startOffset, long len, int bufferSize, boolean verifyChecksum, String clientName) : newBlockReader(sock,file,blockId,accessToken,genStamp,startOffset,len,bufferSize,verifyChecksum,clientName) {\n\t\tString s = \"Network-NewBlockReader\";\n\t\tString extra = \", DataNode: \" + sock.getInetAddress().getCanonicalHostName();\n\t\textra += \";file: \" + file;\n\t\t\/\/extra += \", length: \" + Long.toString(len) + \"B\";\n\t\textra += \";\" + Long.toString(len);\n\t\textra += \";blockId: \" + Long.toString(blockId);\n\t\textra += \";startOffset: \" + Long.toString(startOffset);\t\t\n\t\tinstrumentation(s,\"after\",extra);\n\t}\n}\n\n\n\n\n","old_contents":"import java.io.*;\nimport java.util.*;\nimport java.lang.management.ManagementFactory;\nimport java.sql.Timestamp;\nimport java.text.SimpleDateFormat;\nimport java.net.InetAddress;\nimport java.lang.ClassLoader;\nimport org.apache.hadoop.io.DataInputBuffer;\nimport org.apache.hadoop.mapred.TaskStatus;\nimport org.apache.hadoop.fs.permission.FsPermission;\nimport org.apache.hadoop.util.Progressable;\nimport org.apache.hadoop.hdfs.protocol.DatanodeInfo;\nimport org.apache.hadoop.util.DataChecksum;\nimport java.net.Socket;\n\n\nimport org.apache.hadoop.security.token.Token;\nimport org.apache.hadoop.security.token.TokenIdentifier;\nimport org.apache.hadoop.hdfs.security.token.block.BlockTokenIdentifier;\n\n\nimport org.apache.hadoop.fs.FSDataInputStream;\nimport org.apache.hadoop.hdfs.DFSClient;\n\nimport org.apache.hadoop.mapred.TaskTrackerStatus;\n\nimport org.apache.commons.logging.Log;\nimport org.apache.commons.logging.LogFactory;\n\n\nimport org.apache.hadoop.conf.Configuration;\n\n\n\n\n\n\n\/**\n *\n * @author Alejandro\n *\/\n\naspect AlojaAspect {\t\t\n\n\tprivate static final Log LOG = LogFactory.getLog(AlojaAspect.class);\n\n\t\/*\n\tTYPES\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\n    public static class Events {\n\n        public static final int JobTracker = 11111;\n        public static final int TaskTracker = 11112;\n        public static final int NameNode = 11113;\n        public static final int SecondaryNameNode = 11114;\n        public static final int DataNode = 11115;\n        public static final int Task = 11116;\n        public static final int HeartBeat = 11119;\n\/\/        public static final int MapTask = 11117;\n\/\/        public static final int ReduceTask = 11118;\n        public static final int MapOutputBuffer = 33333;\n        public static final int MapTaskOutputSize = 44444;\n    }\n\n    public static class Values {\n\n       \t\/\/ Generic\n\t\tpublic static final int End = 0;        \n        public static final int Start = 1;\n        \n        \/\/ Events.TaskTracker \n\t\tpublic static final int RunMapper = 8;\n        public static final int RunReducer = 9;\n        public static final int ReducerCopyPhase = 10;\n        public static final int ReducerSortPhase = 11;\n        public static final int ReducerReducePhase = 12;\n\n\t\t\/\/ Events.MapOutputBuffer\n        public static final int Flush = 1;\n        public static final int SortAndSpill = 2;\n        public static final int Sort = 3;        \n        public static final int CreateSpillIndexFile = 5;\n        \/\/public static final int TotalIndexCacheMemory = 6;\n        public static final int SpillRecordDumped = 7;\n        public static final int Combine = 4;\n    }    \n\n\n\t\/*\n\tFUNCTIONS\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\t\n\tprivate static long getPID() {\n\t\tString name = java.lang.management.ManagementFactory.getRuntimeMXBean().getName();\n\t\treturn Long.parseLong(name.split(\"@\")[0]);\n\t}\n\n\tprivate void generateEvent(Integer key, Integer value) {\n\t\t\/\/2:cpu:app:task:thread:time:type:value\n\t\ttry{\n\t\t\tString hostname = InetAddress.getLocalHost().getHostName();\n\t\t\tlong pid = getPID();\n\t\t\tLOG.info(hostname+\",\"+pid+\",2:\"+hostname+\":2:\"+pid+\":1:\"+System.currentTimeMillis()+\":\"+key+\":\"+value);\n\t\t}\n\t\tcatch (Exception e) {\n\t\t\tLOG.error(e, e);\n\n\t\t}\n\t}\n\n\n\tprivate void generateEvent(Integer key, String value) {\n\t\t\/\/2:cpu:app:task:thread:time:type:value\n\t\ttry{\n\t\t\tString hostname = InetAddress.getLocalHost().getHostName();\n\t\t\tlong pid = getPID();\n\t\t\tLOG.info(hostname+\",\"+pid+\",2:\"+hostname+\":2:\"+pid+\":1:\"+System.currentTimeMillis()+\":\"+key+\":\"+value);\n\t\t}\n\t\tcatch (Exception e) {\n\t\t\tLOG.error(e, e);\n\n\t\t}\n\t}\n\n\n\t\/*private void generateEVent(Integer key[], Integer value) {\n\n\t\tStringBuffer output = new StringBuffer();\n\n\n\t\toutput.append()\n\n\t}*\/\n\n\tprivate void instrumentation(String event, String when) {\n\n\t\tinstrumentation(event, when, \"\");\n\n\t}\n\tprivate void instrumentation(String event, String when, String additional) {\n\t\ttry {\n\t\t\t\/\/Add hostname\n\t\t\tString log = InetAddress.getLocalHost().getHostName();\n\t\t\t\/\/Add PID \n\t\t\tlog += \",\" + getPID();\n\t\t\t\/\/Specify event\n\t\t\tlog += \",\" + when + \",\" + event;\n\t\t\t\/\/Specify event\n\t\t\tlog += additional;\n\t\t\t\/\/LOG.info(log);\n\t\t\t\/\/writeLog(logFile,log);\n\n\n\t\t}\n\t\tcatch (IOException e) {\n\t\t\te.printStackTrace();\n\t\t}\n\t}\n\n\n\t\/*\n\tPOINTCUTS\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\n\t\/\/RegisterDataNode Pointcut\n\n\tpointcut startDataNode(): execution(* org.apache.hadoop.hdfs.server.datanode.DataNode.startDataNode(..));\n\n\t\/\/RegisterNameNode Pointcut\n\n\tpointcut initializeNameNode():  execution(* org.apache.hadoop.hdfs.server.namenode.NameNode.initialize(..));\n\n\t\/\/RegisterSecondaryNamenode Pointcut\n\n\tpointcut initializeSecondaryNameNode(): execution(* org.apache.hadoop.hdfs.server.namenode.SecondaryNameNode.initialize(..));\n\n\t\/\/RegisterTask - CHILD\n\n\t\/\/pointcut initializeChild(): call(* org.apache.hadoop.mapred.Child.initMetrics(..)) && withincode(* org.apache.hadoop.mapred.Child.main(..)); \n\n\tpointcut initializeChild(): execution(* org.apache.hadoop.mapred.Child.main(..)); \n\n\t\/\/Register JobTracker Pointcut\n\n\tpointcut registerJobTracker(): execution(* org.apache.hadoop.mapred.JobTracker.startTracker(..));\n\n\t\/\/HEARTBEAT\n\n\tpointcut heartbeat(TaskTrackerStatus status,boolean restarted,boolean initialContact,boolean acceptNewTasks,short responseId): execution(* org.apache.hadoop.mapred.JobTracker.heartbeat(..)) && args(status, restarted, initialContact, acceptNewTasks,responseId);\n\n\t\/*\n\t\t###########################################################################\n\t\t############################Task###########################################\n\t\t###########################################################################\n\t*\/\n\n\n\tpointcut outputSize(): call (* *.getLen(..)) && withincode(* org.apache.hadoop.mapred.Task.calculateOutputSize());\n\n\t\/*\n\t\t###########################################################################\n\t\t############################MAPPER#########################################\n\t\t###########################################################################\n\t*\/\n\n\t\/\/pointcut maptask(): execution(* org.apache.hadoop.mapred.MapTask.run(..));\n\tpointcut mapper(): call(* org.apache.hadoop.mapred.MapTask.runNewMapper(..)) && withincode(* org.apache.hadoop.mapred.MapTask.run(..));\n\n\n\t\/\/  ############################SORT AND SPILL#################################\n\n\t\/\/Start-End\n\tpointcut taskSortAndSpill(): execution(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\n\tpointcut flush(): execution(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.flush());\n\n\t\/\/Spill File Size\n\tpointcut sortAndSpillSpillFile(int numSpills, long size) : call (* *.getSpillFileForWrite(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(numSpills, size);\n\n\t\/\/SpillIndex File Size\n\tpointcut sortAndSpillSpillIndexFile(int numSpills, long partitions) : call (* *.getSpillIndexFileForWrite(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(numSpills, partitions);\n\n\t\/\/Sort \n\tpointcut sortAndSpillSort(int kvstart, int endPosition, Object reporter): call(* *.sort(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(..,kvstart,endPosition,reporter);\n\n\t\/\/Init Writer\n\t\/\/pointcut sortAndSpillInitWriter() : call (org.apache.hadoop.mapred.IFile.Writer.new(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Close Writer\n\t\/\/pointcut sortAndSpillCloseWriter() : call (void org.apache.hadoop.mapred.IFile.Writer.close(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Write key-value\n\tpointcut sortAndSpillWrite(DataInputBuffer key, DataInputBuffer value): call (* *.append(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill()) && args(key,value);\n\t\n\t\/\/Combiner\n\tpointcut sortAndSpillCombiner(): call(* *.combine(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/\/Spill Index File\n\tpointcut sortAndSpillSpillIndexWrite(): call(* *.writeToFile(..)) && withincode(* org.apache.hadoop.mapred.MapTask.MapOutputBuffer.sortAndSpill());\n\n\t\/*\n\t\t###########################################################################\n\t\t############################REDUCER########################################\n\t\t###########################################################################\n\t*\/\n\n\t\/\/REDUCETASK RUN\n\tpointcut reducer(): execution(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\tpointcut initCodec(): call(* *.initCodec(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\tpointcut setPhase(TaskStatus.Phase phase): call(* *.setPhase(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..)) && args(phase);\n\n\t\n\t\/\/pointcut endCopy(): call(* *.setPhase(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\t\/\/pointcut endSort(): call(* *.getMapOutputKeyClass(..)) && withincode(* org.apache.hadoop.mapred.ReduceTask.run(..));\n\t\n\n\t\/*\n\t\t###########################################################################\n\t\t############################NETWORK########################################\n\t\t###########################################################################\n\t*\/\n\n\tpointcut defaultBlockSize(): call(* org.apache.hadoop.hdfs.DFSClient.getDefaultBlockSize());\n\t\/\/pointcut blockSize(): call(* org.apache.hadoop.hdfs.DFSClient.getBlockSize(..));\n\tpointcut createDFSFile(String src,FsPermission permission,boolean overwrite,boolean createParent,short replication,long blockSize,Progressable progress, int buffersize): execution (* org.apache.hadoop.hdfs.DFSClient.create(..)) && args(src,permission,overwrite,createParent,replication,blockSize,progress,buffersize);\n\tpointcut runDataStreamer(): execution (* org.apache.hadoop.hdfs.DFSClient.DFSOutputStream.DataStreamer.run());\n\t\/\/pointcut readEntireBufferFromDataNode(byte buf[],int off,int len): execution(* org.apache.hadoop.hdfs.DFSClient.DFSInputStream.read(..)) && args(buf[],off,len);\n\t\/\/pointcut readFromDataNode(): call (* org.apache.hadoop.hdfs.DFSClient.DFSInputStream.blockSeekTo(..)) && withincode(* org.apache.hadoop.hdfs.DFSClient.DFSInputStream.read(..));\n\tpointcut newBlockReader(Socket sock, String file, long blockId, Token<BlockTokenIdentifier> accessToken, long genStamp, long startOffset, long len, int bufferSize, boolean verifyChecksum, String clientName): execution (* org.apache.hadoop.hdfs.DFSClient.BlockReader.newBlockReader(..)) && args(sock,file,blockId,accessToken,genStamp,startOffset,len,bufferSize,verifyChecksum,clientName);\n\n\t\/*\n\tAdvices\n\t######################################################################################################################################\n\t######################################################################################################################################\n\t*\/\n\n\t\/\/ RegiterJobTracker\n\n\tafter() : registerJobTracker(){\n\t\tgenerateEvent(Events.JobTracker, Values.Start);\n\n\t}\n\n\t\/\/RegisterTaskTracker ?\n\n\n\t\/\/RegisterNameNode\n\n\tafter() : initializeNameNode(){\n\t\tgenerateEvent(Events.NameNode, Values.Start);\n\t}\n\n\t\/\/RegisterDataNode \n\n\tafter() : startDataNode(){\n\t\tgenerateEvent(Events.DataNode, Values.Start);\n\t}\n\n\n\t\/\/RegisterSecondaryNamenode\n\n\tafter() : initializeSecondaryNameNode(){\n\t\tgenerateEvent(Events.SecondaryNameNode, Values.Start);\n\t}\n\n\n\t\/\/HEARTBEAT \n\tafter(TaskTrackerStatus status,boolean restarted,boolean initialContact,boolean acceptNewTasks,short responseId) : heartbeat(status, restarted, initialContact, acceptNewTasks,responseId){\n\t\t\/\/ SAMPLE trackername: tracker_vagrant-99-01:localhost\/127.0.0.1:38149\n\t\tgenerateEvent(Events.HeartBeat, status.getTrackerName().replace(':','-').replace('\/','_'));\n\t}\n\n\n\t\/*\n\t\t###########################################################################\n\t\t############################Task###########################################\n\t\t###########################################################################\n\t*\/\n\n\t\/\/RegisterTask CHILD \n\tafter() : initializeChild() { \/\/We need the  PID of this task to be registered\n\t\tgenerateEvent(Events.Task, Values.Start);\n\t}\n\n\n\/*\tafter() returning(long size) : outputSize() {\n\t\tString s = \"Task-outputSize\";\n\t\tinstrumentation(s,\"after\",\", size: \" + Long.toString(size));\n\t}\n\n\t\/*\n\t\t###########################################################################\n\t\t############################Mapper#########################################\n\t\t###########################################################################\n\t*\/\n\n\n\t\/*before() : maptask(){\n\t\tgenerateEvent(Events.MapTask, Values.Start);\n\t}*\/\n\n\tbefore() : mapper(){\n\t\tgenerateEvent(Events.TaskTracker, Values.RunMapper);\n\t}\n\n\tafter() : mapper(){\n\t\tgenerateEvent(Events.TaskTracker, Values.End);\n\t}\n\n\n\t\n\n\t\/\/  ############################SORT AND SPILL#################################\n\n\tbefore() : taskSortAndSpill(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.SortAndSpill);\n\t}\n\n\n\tafter() : taskSortAndSpill(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\n\t}\n\n\t\/\/flush\n\n\tbefore() : flush(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.Flush);\n\t}\n\n\tafter() : flush(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\n\t}\n\n\n\n\t\/\/ Spill File Size\n\n\tafter(int numSpills, long size) returning : sortAndSpillSpillFile(numSpills, size){\n\t\tString s = \"sortAndSpillSpillFile\";\n\t\tinstrumentation(s,\"after\",\", numSpills: \" +Integer.toString(numSpills) + \";size: \" + Long.toString((size*numSpills) + size));\n\t}\n\n\t\/\/ SpillIndex File Size\n\n\tafter(int numSpills, long partitions) returning : sortAndSpillSpillIndexFile(numSpills, partitions){\n\t\tString s = \"sortAndSpillSpillIndexFile\";\n\t\tinstrumentation(s,\"after\",\",\" + Long.toString(numSpills * partitions));\n\t}\n\n\/*\n\tbefore(int length) : kvbufferState(length){\n\n\t\tString s = \"kvbufferState\";\n\t\tFile logFile = getFile();\n\t\tinstrumentation(logFile,s,\"before\");\n\t\twriteLog(logFile,Integer.toString(length));\n\t}\n\n*\/\n\n\tbefore(int kvstart, int endPosition, Object reporter) : sortAndSpillSort(kvstart,endPosition,reporter){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.Sort);\n\t\t\/\/instrumentation(s,\"before\",\",\" + Integer.toString(endPosition - kvstart));\n\t}\n\tafter(int kvstart, int endPosition, Object reporter) returning : sortAndSpillSort(kvstart,endPosition,reporter){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\n\t\t\/\/instrumentation(s,\"after\",\",\" + Integer.toString(endPosition - kvstart));\n\t}\n\n\t\/\/ Init writer\n\/*\tafter() returning : sortAndSpillInitWriter(){\n\t\tString s = \"sortAndSpillInitWriter\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\t\/\/ Close writer\n\tafter() returning : sortAndSpillCloseWriter(){\n\t\tString s = \"sortAndSpillCloseWriter\";\n\t\tinstrumentation(s,\"after\");\n\t}\n*\/\n\n\tafter(DataInputBuffer key, DataInputBuffer value) returning : sortAndSpillWrite(key,value){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.SpillRecordDumped);\n\t}\n\n\tbefore() : sortAndSpillCombiner(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.Combine);\n\t}\n\n\tafter() returning : sortAndSpillCombiner(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\t\n\t}\n\n\tbefore() : sortAndSpillSpillIndexWrite(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.CreateSpillIndexFile);\n\t}\n\n\tafter() returning : sortAndSpillSpillIndexWrite(){\n\t\tgenerateEvent(Events.MapOutputBuffer, Values.End);\n\t}\n\n\t\/*\n\t\t###########################################################################\n\t\t############################REDUCER########################################\n\t\t###########################################################################\n\t*\/\n\n\/*\tbefore() : reducer(){\n\t\tString s = \"Reducer\";\n\t\tinstrumentation(s,\"before\");\n\t}\n*\/\n\n\tbefore() : initCodec() {\n\t\tgenerateEvent(Events.TaskTracker, Values.RunReducer);\n\t}\n\n\n\tafter() returning : initCodec() {\n\t\tgenerateEvent(Events.TaskTracker, Values.ReducerCopyPhase);\n\t}\n\n\tbefore(TaskStatus.Phase phase) : setPhase(phase) { \/\/END OF A PHASE (SORT OR COPY)\n\t\t\tgenerateEvent(Events.TaskTracker, Values.End);\n\t}\n\n\tafter(TaskStatus.Phase phase) returning: setPhase(phase) { \n\t\tif (phase == TaskStatus.Phase.SORT) {\n\t\t\tgenerateEvent(Events.TaskTracker, Values.ReducerSortPhase);\n\t\t}\n\t\telse if (phase == TaskStatus.Phase.REDUCE) {\n\t\t\tgenerateEvent(Events.TaskTracker, Values.ReducerReducePhase);\n\t\t}\n\t}\n\n\tafter() : reducer(){ \/\/END OF REDUCE PHASE\n\t\t\tgenerateEvent(Events.TaskTracker, Values.End);\t}\n\n\t\/*\n\t\t###########################################################################\n\t\t############################NETWORK########################################\n\t\t###########################################################################\n\t*\/\n\n\tafter() returning(long blockSize) : defaultBlockSize() {\n\t\tString s = \"Network-defaultBlockSize\";\n\t\tinstrumentation(s,\"after\",\", size: \" + Long.toString(blockSize));\n\t}\n\t\/\/ after() returning(long blockSize) : blockSize() {\n\t\/\/ \tString s = \"Network-blockSize\";\n\t\/\/ \tFile logFile = getFile();\n\t\/\/ \tinstrumentation(logFile,s,\"after\");\n\t\/\/ \tString log = \", size: \" + Long.toString(blockSize);\n\t\/\/ \twriteLog(logFile,log);\n\t\/\/ }\n\n\tafter(String src,FsPermission permission,boolean overwrite, boolean createParent,short replication,long blockSize,Progressable progress, int buffersize): createDFSFile(src,permission,overwrite,createParent,replication,blockSize,progress,buffersize) {\n\t\tString s = \"Network-CreateDFSFile\";\n\n\t\t\/\/MODIFIED!!!!!!-----!!!!!!!!!!!\n\t\tinstrumentation(s,\"after\",\", path: \" + src + \";permission: \" + permission.toString() + \";overwrite: \" + String.valueOf(overwrite) + \";createParent: \" + String.valueOf(createParent) + \";replication: \" + Short.toString(replication) + \";blockSize: \" + Long.toString(blockSize) + \";buffersize: \" + Integer.toString(buffersize));\n\t}\n\tbefore(): runDataStreamer() {\n\t\tString s = \"DataStreamer\";\n\t\tinstrumentation(s,\"after\");\n\t}\n\n\t\/\/ before(byte buf[],int off, int len) : readEntireBufferFromDataNode(buf[],off,len){\n\t\/\/ \tString s = \"Network-ReadEntireBuffer\";\n\t\/\/ \tinstrumentation(s,\"after\",\", bufferLength: \" + Integer.toString(len));\n\t\/\/ }\n\n\t\/\/ after() returning(DatanodeInfo datanode) : readFromDataNode(){\n\t\/\/ \tString s = \"Network-fromDataNode\";\n\t\/\/ \tinstrumentation(s,\"after\", \", from : \" + datanode.getHostName());\n\t\/\/ }\n\n\tafter(Socket sock, String file, long blockId, Token<BlockTokenIdentifier> accessToken, long genStamp, long startOffset, long len, int bufferSize, boolean verifyChecksum, String clientName) : newBlockReader(sock,file,blockId,accessToken,genStamp,startOffset,len,bufferSize,verifyChecksum,clientName) {\n\t\tString s = \"Network-NewBlockReader\";\n\t\tString extra = \", DataNode: \" + sock.getInetAddress().getCanonicalHostName();\n\t\textra += \";file: \" + file;\n\t\t\/\/extra += \", length: \" + Long.toString(len) + \"B\";\n\t\textra += \";\" + Long.toString(len);\n\t\textra += \";blockId: \" + Long.toString(blockId);\n\t\textra += \";startOffset: \" + Long.toString(startOffset);\t\t\n\t\tinstrumentation(s,\"after\",extra);\n\t}\n}\n\n\n\n\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"155ebd614a838a7eeb01543224f92837575722a4","subject":"Add ActorContext interposition.","message":"Add ActorContext interposition.\n","repos":"NetSys\/demi-applications,NetSys\/demi-applications,NetSys\/demi,NetSys\/demi-applications","old_file":"src\/main\/aspectj\/WeaveActor.aj","new_file":"src\/main\/aspectj\/WeaveActor.aj","new_contents":"package sample;\n\nimport static java.lang.Thread.sleep;\n\nimport akka.dispatch.verification.Instrumenter;\n\nimport akka.actor.ActorRef;\nimport akka.actor.Actor;\nimport akka.actor.Props;\nimport akka.actor.ActorCell;\nimport akka.actor.ActorSystem;\nimport akka.actor.ActorContext;\n\nimport akka.pattern.AskSupport;\n\nimport akka.dispatch.Envelope;\nimport akka.dispatch.MessageQueue;\nimport akka.dispatch.MessageDispatcher;\n\nimport scala.concurrent.impl.CallbackRunnable;\n\n\n\nprivileged public aspect WeaveActor {\n\n  Instrumenter inst = Instrumenter.apply();\n    \n  pointcut enqueueOperation(MessageQueue me, ActorRef receiver, Envelope handle): \n  execution(public * akka.dispatch.MessageQueue.enqueue(ActorRef, Envelope)) &&\n  args(receiver, handle) && this(me);\n  \n  Object around(MessageQueue me, ActorRef receiver, Envelope handle):\n  enqueueOperation(me, receiver, handle) {\n\treturn proceed(me, receiver, handle);\n  }\n  \n  \n  \n  before(ActorCell me, Object msg):\n  execution(* akka.actor.ActorCell.receiveMessage(Object)) &&\n  args(msg, ..) && this(me) {\n\tinst.beforeMessageReceive(me);\n  }\n  \n  after(ActorCell me, Object msg):\n  execution(* akka.actor.ActorCell.receiveMessage(Object)) &&\n  args(msg, ..) && this(me) {\n\tinst.afterMessageReceive(me);\n  }\n\n\n\n  pointcut dispatchOperation(MessageDispatcher me, ActorCell receiver, Envelope handle): \n  execution(* akka.dispatch.MessageDispatcher.dispatch(..)) &&\n  args(receiver, handle, ..) && this(me);\n\n  Object around(MessageDispatcher me, ActorCell receiver, Envelope handle):\n  dispatchOperation(me, receiver, handle) {\n  \tif (inst.aroundDispatch(me, receiver, handle))\n   \t\treturn proceed(me, receiver, handle);\n   \telse\n   \t\treturn null;\n  }\n  \n  \n  after(ActorSystem me, Props props) returning(ActorRef actor):\n  execution(ActorRef akka.actor.ActorSystem.actorOf(Props)) &&\n  args(props) && this(me) {\n  \tinst.new_actor(me, props, actor);\n  }\n  \n  \n  after(ActorSystem me, Props props, String name) returning(ActorRef actor):\n  execution(ActorRef akka.actor.ActorSystem.actorOf(Props, String)) &&\n  args(props, name) && this(me) {\n  \tinst.new_actor(me, props, name, actor);\n  }\n\n  \n  after(ActorContext me, Props props) returning(ActorRef actor):\n  execution(ActorRef akka.actor.ActorSystem.actorOf(Props)) &&\n  args(props) && this(me) {\n  \tinst.new_actor(me.system(), props, actor);\n  }\n  \n  \n  after(ActorContext me, Props props, String name) returning(ActorRef actor):\n  execution(ActorRef akka.actor.ActorSystem.actorOf(Props, String)) &&\n  args(props, name) && this(me) {\n  \tinst.new_actor(me.system(), props, name, actor);\n  }\n\n\n}\n","old_contents":"package sample;\n\nimport static java.lang.Thread.sleep;\n\nimport akka.dispatch.verification.Instrumenter;\n\nimport akka.actor.ActorRef;\nimport akka.actor.Actor;\nimport akka.actor.Props;\nimport akka.actor.ActorCell;\nimport akka.actor.ActorSystem;\n\nimport akka.pattern.AskSupport;\n\nimport akka.dispatch.Envelope;\nimport akka.dispatch.MessageQueue;\nimport akka.dispatch.MessageDispatcher;\n\nimport scala.concurrent.impl.CallbackRunnable;\n\n\n\nprivileged public aspect WeaveActor {\n\n  Instrumenter inst = Instrumenter.apply();\n    \n  pointcut enqueueOperation(MessageQueue me, ActorRef receiver, Envelope handle): \n  execution(public * akka.dispatch.MessageQueue.enqueue(ActorRef, Envelope)) &&\n  args(receiver, handle) && this(me);\n  \n  Object around(MessageQueue me, ActorRef receiver, Envelope handle):\n  enqueueOperation(me, receiver, handle) {\n\treturn proceed(me, receiver, handle);\n  }\n  \n  \n  \n  before(ActorCell me, Object msg):\n  execution(* akka.actor.ActorCell.receiveMessage(Object)) &&\n  args(msg, ..) && this(me) {\n\tinst.beforeMessageReceive(me);\n  }\n  \n  after(ActorCell me, Object msg):\n  execution(* akka.actor.ActorCell.receiveMessage(Object)) &&\n  args(msg, ..) && this(me) {\n\tinst.afterMessageReceive(me);\n  }\n\n\n\n  pointcut dispatchOperation(MessageDispatcher me, ActorCell receiver, Envelope handle): \n  execution(* akka.dispatch.MessageDispatcher.dispatch(..)) &&\n  args(receiver, handle, ..) && this(me);\n\n  Object around(MessageDispatcher me, ActorCell receiver, Envelope handle):\n  dispatchOperation(me, receiver, handle) {\n  \tif (inst.aroundDispatch(me, receiver, handle))\n   \t\treturn proceed(me, receiver, handle);\n   \telse\n   \t\treturn null;\n  }\n  \n  \n  after(ActorSystem me, Props props) returning(ActorRef actor):\n  execution(ActorRef akka.actor.ActorSystem.actorOf(Props)) &&\n  args(props) && this(me) {\n  \tinst.new_actor(me, props, actor);\n  }\n  \n  \n  after(ActorSystem me, Props props, String name) returning(ActorRef actor):\n  execution(ActorRef akka.actor.ActorSystem.actorOf(Props, String)) &&\n  args(props, name) && this(me) {\n  \tinst.new_actor(me, props, name, actor);\n  }\n\n\n}\n","returncode":0,"stderr":"","license":"bsd-2-clause","lang":"AspectJ"}
{"commit":"be3a0bdd953de6fbedc988eacea8f1121df840a5","subject":"put in brackets :p","message":"put in brackets :p\n","repos":"eigengo\/monitor,DataDog\/monitor,eigengo\/monitor,DataDog\/monitor","old_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/ActorCellMonitoringAspect.aj","new_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/ActorCellMonitoringAspect.aj","new_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.actor.*;\nimport akka.japi.Creator;\nimport org.eigengo.monitor.agent.AgentConfiguration;\nimport org.eigengo.monitor.output.CounterInterface;\nimport scala.Option;\n\nimport java.util.ArrayList;\nimport java.util.List;\nimport java.util.concurrent.atomic.AtomicInteger;\nimport java.util.concurrent.atomic.AtomicLong;\nimport java.util.concurrent.ConcurrentHashMap;\n\n\/**\n * Contains advices for monitoring behaviour of an actor; typically imprisoned in an {@code ActorCell}.\n *\/\npublic aspect ActorCellMonitoringAspect extends AbstractMonitoringAspect issingleton() {\n    private AkkaAgentConfiguration agentConfiguration;\n    private final CounterInterface counterInterface;\n    private final Option<String> anonymousActorClassName = Option.empty();\n    \/\/ we sample based on actor type (i.e. a sampling rate of 'n' for a filter means 'every nth actor with type k, for each type k that matches that filter')\n    private final ConcurrentHashMap<Option<String>, AtomicLong> samplingCounters  = new ConcurrentHashMap<Option<String>, AtomicLong>();\n    \/\/ we count actors by actor type (any 'anonymous' or 'generic' actors are treated as the same type)\n    private final ConcurrentHashMap<Option<String>, AtomicInteger> numberOfActors = new ConcurrentHashMap<Option<String>, AtomicInteger>();\n    private final ConcurrentHashMap<ActorPath, String> pathTags                   = new ConcurrentHashMap<ActorPath, String>();\n\n    \/**\n     * Constructs this aspect\n     *\/\n    public ActorCellMonitoringAspect() {\n        AgentConfiguration<AkkaAgentConfiguration> configuration = getAgentConfiguration(\"akka\", AkkaAgentConfigurationJapi.apply());\n        this.agentConfiguration = configuration.agent();\n        this.counterInterface = createCounterInterface(configuration.common());\n    }\n\n    \/**\n     * Advises the {@code ActorCell.receiveMessage(message: Object): Unit}\n     * We proceed with the pointcut if the actor is to be included in the monitoring *and* this is\n     * the 'multiple-of-n'th time we've seen a message for an actor with a sample rate of n.\n     *\n     * Currently, we sample queue size, the fact that the message is delivered, the simple name of the class of the\n     * message, and the time taken to complete the actor's reactive action.\n     *\n     * @param actorCell the ActorCell where the actor that receives the message \"lives\"\n     * @param msg the incoming message\n     *\/\n    Object around(ActorCell actorCell, Object msg) : Pointcuts.actorCellReceiveMessage(actorCell, msg) {\n        final ActorPath actorPath = actorCell.self().path();\n        final Option<String> className = getActorClassName(actorCell, actorPath);\n        final PathAndClass pathAndClass = new PathAndClass(actorPath, className);\n        if (!includeActorPath(pathAndClass) || !sampleMessage(pathAndClass)) return proceed(actorCell, msg);\n\n        int samplingRate = getSampleRate(pathAndClass);\n\n        \/\/ we tag by actor name\n        final String[] tags = getTags(actorPath, className);\n\n        \/\/ record the queue size\n        this.counterInterface.recordGaugeValue(Aspects.queueSize(), actorCell.numberOfMessages(), tags);\n        \/\/ record the message, general and specific\n        this.counterInterface.incrementCounter(Aspects.delivered(), samplingRate, tags);\n        this.counterInterface.incrementCounter(Aspects.delivered(msg), samplingRate, tags);\n\n        \/\/ measure the time. we're using the ``nanoTime`` call to access the high-precision timer.\n        \/\/ since we're not really interested in wall time, but just some increasing measure of\n        \/\/ elapsed time\n        Object result = null;\n        final long start = System.nanoTime();\n        \/\/ result will always be ``null``, because target returns ``Unit``\n        result = proceed(actorCell, msg);\n        \/\/ ns or \u00b5s is too fine. ms will do for now.\n        final long duration = (System.nanoTime() - start) \/ 1000000;\n\n        \/\/ record the actor duration\n        this.counterInterface.recordExecutionTime(Aspects.actorDuration(), (int)duration, tags);\n\n        \/\/ return null would do the trick, but we want to be _proper_.\n        return result;\n    }\n\n    \/**\n     * Advises the {@code ActorCell.handleInvokeFailure(_, failure: Throwable): Unit}\n     *\n     * @param actorCell the ActorCell where the error spreads from\n     * @param failure the exception that escaped from the {@code receive} method\n     *\/\n    before(ActorCell actorCell, Throwable failure) : Pointcuts.actorCellHandleInvokeFailure(actorCell, failure) {\n        \/\/ record the error, general and specific\n        String[] tags = getTags(actorCell.self().path(), getActorClassName(actorCell, actorCell.self().path()));\n        this.counterInterface.incrementCounter(Aspects.actorError(), tags);\n        this.counterInterface.incrementCounter(Aspects.actorError(failure), tags);\n    }\n\n    \/**\n     * Advises the {@code EventStream.publish(event: Any): Unit}\n     *\n     * @param event the received event\n     *\/\n    before(Object event) : Pointcuts.eventStreamPublish(event) {\n        if (event instanceof UnhandledMessage) {\n            UnhandledMessage unhandledMessage = (UnhandledMessage)event;\n            String[] tags = getTags(unhandledMessage.recipient().path(), this.anonymousActorClassName);\n            this.counterInterface.incrementCounter(Aspects.undelivered(), tags);\n            this.counterInterface.incrementCounter(Aspects.undelivered(unhandledMessage.getMessage()), tags);\n        }\n    }\n\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorRefFactory} implementations\n     *\n     * @param props the {@code Props} instance used in the call\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after(Props props) returning (ActorRef actor) : Pointcuts.anyActorOf(props) {\n        recordActorCount(actor.path(), props, CountType.Increment);\n    }\n\n    \/**\n     * Advises the {@code LocalActorRef.stop} method\n     *\n     * @param actorCell the {@code ActorCell} of the actor being stopped\n     *\/\n    after(ActorCell actorCell) : Pointcuts.actorCellInternalStop(actorCell) {\n        recordActorCount(actorCell.self().path(), actorCell.props(), CountType.Decrement);\n    }\n\n    \/**\n     * Records the actor count increment or decrement\n     *\n     * @param path the ActorPath being created or destroyed\n     * @param props the Props of the actor at the {@code path}\n     * @param countType the increment or decrement\n     *\/\n     private void recordActorCount(ActorPath path, Props props, CountType countType) {\n         final Option<String> className = getActorClassName(props, path);\n         final PathAndClass pac = new PathAndClass(path, getActorClassName(props, path));\n         if (!includeActorPath(pac)) return;\n\n         final String[] tags = getTags(path, className);\n         this.numberOfActors.putIfAbsent(className, new AtomicInteger(0));\n         \/\/ increment and get the current number of actors of this type (if the value was 0, then this returns 1 -- which is correct)\n         final int currentNumberOfActors;\n         switch (countType) {\n             case Increment:\n                 currentNumberOfActors = this.numberOfActors.get(className).incrementAndGet();\n                 break;\n             case Decrement:\n                 currentNumberOfActors = this.numberOfActors.get(className).decrementAndGet();\n                 break;\n             default:\n                 currentNumberOfActors = 0;\n                 break;\n         }\n\n         this.counterInterface.recordGaugeValue(Aspects.actorCount(), currentNumberOfActors, tags);\n     }\n\n    \/**\n     * Injects the new {@code AkkaAgentConfiguration} instance.\n     *\n     * @param agentConfiguration the new configuration\n     *\/\n    synchronized final void setAgentConfiguration(AkkaAgentConfiguration agentConfiguration) {\n        this.agentConfiguration = agentConfiguration;\n    }\n\n    \/**\n     * The count type for exhaustive matching\n     *\/\n    private static enum CountType {\n        Increment, Decrement\n    }\n\n    \/**\n     * Decide whether to include this ActorCell in our measurements\n     *\n     * @param pathAndClass the PAC container\n     * @return whether to include the given actor in the metrics\n     *\/\n    private boolean includeActorPath(final PathAndClass pathAndClass) {\n        \/\/ do not monitor our own output code\n        if (pathAndClass.actorClassName().isDefined()) {\n            if (pathAndClass.actorClassName().get().startsWith(\"org.eigengo.monitor.output\")) return false;\n        }\n\n        \/\/ include actor if it's in 'included' list\n        if (this.agentConfiguration.included().accept(pathAndClass)) return true;\n        \/\/ exclude actor if excluded (i.e. is in 'excluded' list, or excludeAllNotIncluded = true, and actor is not included)\n        if (this.agentConfiguration.excluded().accept(pathAndClass)) return false;\n\n        \/\/ skip system actor checks if we wish to monitor them\n        if (this.agentConfiguration.includeSystemAgents()) return true;\n\n        String userOrSystem = pathAndClass.actorPath().getElements().iterator().next();\n        return \"user\".equals(userOrSystem);\n    }\n\n    \/**\n     * Lookup the sample rate for an actor from the configuration\n     *\n     * @param pathAndClass the PAC container\n     * @return the sampling rate as non-negative integer\n     *\/\n    private int getSampleRate(final PathAndClass pathAndClass) {\n        return this.agentConfiguration.sampling().getRate(pathAndClass);\n    }\n\n    \/**\n     * Decide whether to sample an actor on a particular occasion\n     *\n     * @param pathAndClass the PAC container\n     * @return {@code true} if we should sample this actor\n     *\/\n    private boolean sampleMessage(final PathAndClass pathAndClass) {\n        final Option<String> className = pathAndClass.actorClassName();\n        int sampleRate = getSampleRate(pathAndClass);\n        if (sampleRate == 1) return true;\n\n        this.samplingCounters.putIfAbsent(className, new AtomicLong(0));\n        long timesSeenSoFar = this.samplingCounters.get(className).incrementAndGet();\n        return (timesSeenSoFar % sampleRate == 1); \/\/ == 1 to log first value (incrementAndGet returns updated value)\n    }\n\n    \/**\n     * Formats the given {@code path} in a way that can be used for tagging. For example, for\n     * path <code>akka:\/\/default\/user\/a\/b\/c<\/code>, it returns <code>akka.path:\/default\/user\/a\/b\/c<\/code>\n     *\n     * @param path the path\n     * @return the tag-ready path\n     *\/\n    private String actorPathToString(ActorPath path) {\n        StringBuilder sb = new StringBuilder();\n        sb.append(\"akka.path:\/\");\n        sb.append(path.address().system());\n        for (String element : path.getElements()) {\n            sb.append(\"\/\");\n            sb.append(element);\n        }\n        return sb.toString();\n    }\n\n    \/**\n     * Decides whether {@code path} represents the \"root\" of the user actors\n     *\n     * @param path the actor path\n     * @return {@code true} if root of user actors\n     *\/\n    private boolean isUserRoot(ActorPath path) {\n        return \"user\".equals(path.elements().mkString(\"\/\"));\n    }\n\n    \/**\n     * Computes the tags for the given {@code actorPath} and {@code actor} instances.\n     *\n     * @param actorPath the actor path; never {@code null}\n     * @param actorClassName the actor instance; may be {@code null}\n     * @return non-{@code null} array of tags\n     *\/\n    private String[] getTags(final ActorPath actorPath, final Option<String> actorClassName) {\n        List<String> tags = new ArrayList<String>();\n\n        \/\/ TODO: Improve detection of routed actors. This only detects \"root\" unnamed actors\n        String lastPathElement = actorPath.elements().last();\n        if (lastPathElement.startsWith(\"$\")) {\n            \/\/ this is routed actor.\n            final ActorPath parent = actorPath.parent();\n            if (isUserRoot(parent)) {\n                \/\/ the parent is akka:\/\/xxx\/user\n                tags.add(actorPathToString(actorPath));\n            } else {\n                \/\/ the parent is some other actor, akka:\/\/xxx\/user\/foo\n                tags.add(actorPathToString(parent));\n                if (this.agentConfiguration.includeRoutees()) tags.add(actorPathToString(actorPath));\n            }\n        } else {\n            \/\/ there is no supervisor\n            tags.add(actorPathToString(actorPath));\n        }\n        if (actorClassName.isDefined()) {\n            tags.add(String.format(\"akka.type:%s.%s\", actorPath.address().system(), actorClassName.get()));\n        }\n\n        return tags.toArray(new String[tags.size()]);\n    }\n\n    \/**\n     * returns the canonical name of the actor type associated with an ActorCell\n     *\n     * @param actorCell the actor cell to get the name for\n     * @return the Option of actor class, never {@code null}.\n     *\/\n    private Option<String> getActorClassName(final ActorCell actorCell, final ActorPath actorPath) {\n        return getActorClassName(actorCell.props(), actorPath);\n    }\n\n    \/**\n     * Returns the canonical name of the actor type associated with a Props instance\n     *\n     * Returns null if props.actorClass does not have a canonical name (i.e., if\n     * it is a local or anonymous class)\n     *\n     * Notably, when the actor class is anonymous, the {@code getCanonicalName} returns {@code null},\n     * which we deal with here.\n     *\n     * @param props the ActorRef {@code Props} instance\n     * @return the Option of actor class, never {@code null}.\n     *\/\n    private Option<String> getActorClassName(final Props props, final ActorPath actorPath) {\n        final String canonicalName = props.actorClass().getCanonicalName();\n        if (this.pathTags.containsKey(actorPath)) return Option.apply(this.pathTags.get(actorPath));\n        if (canonicalName == null \/*if actor is anonymous*\/||\/*OR actor is generic*\/\n                canonicalName.endsWith(\"akka.actor.Actor\")) return this.anonymousActorClassName;\n        return Option.apply(canonicalName);\n    }\n\n    \/**\n     * Catches actors created by the japi.Creator.create(), at a point when their type is visible to the runtime.\n     * We use the visibility of the type at this one pointcut to create a map from the actor path to its type,\n     * which we then access within the other pointcuts (notably on actor death and message receipt) to get the\n     * 'real' type at those points.\n     *\n     * Since the 'ActorRefFactory.actorOf' method is guaranteed to be called on the creation of any actors after the\n     * initialisation of the actorSystem itself, and since we consider anonymous\/untyped actors in our count, we also\n     * decrement the count of 'anonymous' actors here, for we know their type to be invisible to other pointcuts, and\n     * that the element mapping path to type will not have been created (i.e. we generally assume actor paths are unique,\n     * and that the actorOf advice will access the 'pathTags' map before we've inserted this new value). This approach\n     * may not be robust enough -- in particular, with regards the second assumption.\n     *\n     * Regardless, we still double check that the map element doesn't already exist. If it does, we make the assumption\n     * that it was created 'a while ago', and that the path referred to an actor of the same type.\n     *\n     * @param actor the Actor returned by the {@code Creator.create()} method\n     * *\/\n    after() returning(final Actor actor) : Pointcuts.actorCreator() {\n        final String className = actor.getClass().getCanonicalName();\n        final ActorPath actorPath = actor.self().path();\n        if (this.pathTags.containsKey(actorPath)) return;\n        \/\/ add the path -> type pair to the pathTags map\n        this.pathTags.putIfAbsent(actorPath, className);\n\n        \/\/ safe increment of the count of actors of this type\n        this.numberOfActors.putIfAbsent(Option.apply(className), new AtomicInteger(0));\n        int currentNumberOfActors = this.numberOfActors.get(Option.apply(className)).incrementAndGet();\n        this.counterInterface.recordGaugeValue(Aspects.actorCount(), currentNumberOfActors, getTags(actorPath, Option.apply(className)));\n\n        \/\/ safe decrement of the count of anonymous\/untyped actors\n        this.numberOfActors.putIfAbsent(this.anonymousActorClassName, new AtomicInteger(0));\n                \/\/ reuse of int for (almost-?)invisible performance improvement\n        currentNumberOfActors = this.numberOfActors.get(this.anonymousActorClassName).decrementAndGet();\n        this.counterInterface.recordGaugeValue(Aspects.actorCount(), currentNumberOfActors, getTags(actorPath, Option.apply(className)));\n    }\n\n}\n","old_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.actor.*;\nimport akka.japi.Creator;\nimport org.eigengo.monitor.agent.AgentConfiguration;\nimport org.eigengo.monitor.output.CounterInterface;\nimport scala.Option;\n\nimport java.util.ArrayList;\nimport java.util.List;\nimport java.util.concurrent.atomic.AtomicInteger;\nimport java.util.concurrent.atomic.AtomicLong;\nimport java.util.concurrent.ConcurrentHashMap;\n\n\/**\n * Contains advices for monitoring behaviour of an actor; typically imprisoned in an {@code ActorCell}.\n *\/\npublic aspect ActorCellMonitoringAspect extends AbstractMonitoringAspect issingleton() {\n    private AkkaAgentConfiguration agentConfiguration;\n    private final CounterInterface counterInterface;\n    private final Option<String> anonymousActorClassName = Option.empty();\n    \/\/ we sample based on actor type (i.e. a sampling rate of 'n' for a filter means 'every nth actor with type k, for each type k that matches that filter')\n    private final ConcurrentHashMap<Option<String>, AtomicLong> samplingCounters  = new ConcurrentHashMap<Option<String>, AtomicLong>();\n    \/\/ we count actors by actor type (any 'anonymous' or 'generic' actors are treated as the same type)\n    private final ConcurrentHashMap<Option<String>, AtomicInteger> numberOfActors = new ConcurrentHashMap<Option<String>, AtomicInteger>();\n    private final ConcurrentHashMap<ActorPath, String> pathTags                   = new ConcurrentHashMap<ActorPath, String>();\n\n    \/**\n     * Constructs this aspect\n     *\/\n    public ActorCellMonitoringAspect() {\n        AgentConfiguration<AkkaAgentConfiguration> configuration = getAgentConfiguration(\"akka\", AkkaAgentConfigurationJapi.apply());\n        this.agentConfiguration = configuration.agent();\n        this.counterInterface = createCounterInterface(configuration.common());\n    }\n\n    \/**\n     * Advises the {@code ActorCell.receiveMessage(message: Object): Unit}\n     * We proceed with the pointcut if the actor is to be included in the monitoring *and* this is\n     * the 'multiple-of-n'th time we've seen a message for an actor with a sample rate of n.\n     *\n     * Currently, we sample queue size, the fact that the message is delivered, the simple name of the class of the\n     * message, and the time taken to complete the actor's reactive action.\n     *\n     * @param actorCell the ActorCell where the actor that receives the message \"lives\"\n     * @param msg the incoming message\n     *\/\n    Object around(ActorCell actorCell, Object msg) : Pointcuts.actorCellReceiveMessage(actorCell, msg) {\n        final ActorPath actorPath = actorCell.self().path();\n        final Option<String> className = getActorClassName(actorCell, actorPath);\n        final PathAndClass pathAndClass = new PathAndClass(actorPath, className);\n        if (!includeActorPath(pathAndClass) || !sampleMessage(pathAndClass)) return proceed(actorCell, msg);\n\n        int samplingRate = getSampleRate(pathAndClass);\n\n        \/\/ we tag by actor name\n        final String[] tags = getTags(actorPath, className);\n\n        \/\/ record the queue size\n        this.counterInterface.recordGaugeValue(Aspects.queueSize(), actorCell.numberOfMessages(), tags);\n        \/\/ record the message, general and specific\n        this.counterInterface.incrementCounter(Aspects.delivered(), samplingRate, tags);\n        this.counterInterface.incrementCounter(Aspects.delivered(msg), samplingRate, tags);\n\n        \/\/ measure the time. we're using the ``nanoTime`` call to access the high-precision timer.\n        \/\/ since we're not really interested in wall time, but just some increasing measure of\n        \/\/ elapsed time\n        Object result = null;\n        final long start = System.nanoTime();\n        \/\/ result will always be ``null``, because target returns ``Unit``\n        result = proceed(actorCell, msg);\n        \/\/ ns or \u00b5s is too fine. ms will do for now.\n        final long duration = (System.nanoTime() - start) \/ 1000000;\n\n        \/\/ record the actor duration\n        this.counterInterface.recordExecutionTime(Aspects.actorDuration(), (int)duration, tags);\n\n        \/\/ return null would do the trick, but we want to be _proper_.\n        return result;\n    }\n\n    \/**\n     * Advises the {@code ActorCell.handleInvokeFailure(_, failure: Throwable): Unit}\n     *\n     * @param actorCell the ActorCell where the error spreads from\n     * @param failure the exception that escaped from the {@code receive} method\n     *\/\n    before(ActorCell actorCell, Throwable failure) : Pointcuts.actorCellHandleInvokeFailure(actorCell, failure) {\n        \/\/ record the error, general and specific\n        String[] tags = getTags(actorCell.self().path(), getActorClassName(actorCell, actorCell.self().path()));\n        this.counterInterface.incrementCounter(Aspects.actorError(), tags);\n        this.counterInterface.incrementCounter(Aspects.actorError(failure), tags);\n    }\n\n    \/**\n     * Advises the {@code EventStream.publish(event: Any): Unit}\n     *\n     * @param event the received event\n     *\/\n    before(Object event) : Pointcuts.eventStreamPublish(event) {\n        if (event instanceof UnhandledMessage) {\n            UnhandledMessage unhandledMessage = (UnhandledMessage)event;\n            String[] tags = getTags(unhandledMessage.recipient().path(), this.anonymousActorClassName);\n            this.counterInterface.incrementCounter(Aspects.undelivered(), tags);\n            this.counterInterface.incrementCounter(Aspects.undelivered(unhandledMessage.getMessage()), tags);\n        }\n    }\n\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorRefFactory} implementations\n     *\n     * @param props the {@code Props} instance used in the call\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after(Props props) returning (ActorRef actor) : Pointcuts.anyActorOf(props) {\n        recordActorCount(actor.path(), props, CountType.Increment);\n    }\n\n    \/**\n     * Advises the {@code LocalActorRef.stop} method\n     *\n     * @param actorCell the {@code ActorCell} of the actor being stopped\n     *\/\n    after(ActorCell actorCell) : Pointcuts.actorCellInternalStop(actorCell) {\n        recordActorCount(actorCell.self().path(), actorCell.props(), CountType.Decrement);\n    }\n\n    \/**\n     * Records the actor count increment or decrement\n     *\n     * @param path the ActorPath being created or destroyed\n     * @param props the Props of the actor at the {@code path}\n     * @param countType the increment or decrement\n     *\/\n     private void recordActorCount(ActorPath path, Props props, CountType countType) {\n         final Option<String> className = getActorClassName(props, path);\n         final PathAndClass pac = new PathAndClass(path, getActorClassName(props, path));\n         if (!includeActorPath(pac)) return;\n\n         final String[] tags = getTags(path, className);\n         this.numberOfActors.putIfAbsent(className, new AtomicInteger(0));\n         \/\/ increment and get the current number of actors of this type (if the value was 0, then this returns 1 -- which is correct)\n         final int currentNumberOfActors;\n         switch (countType) {\n             case Increment:\n                 currentNumberOfActors = this.numberOfActors.get(className).incrementAndGet();\n                 break;\n             case Decrement:\n                 currentNumberOfActors = this.numberOfActors.get(className).decrementAndGet();\n                 break;\n             default:\n                 currentNumberOfActors = 0;\n                 break;\n         }\n\n         this.counterInterface.recordGaugeValue(Aspects.actorCount(), currentNumberOfActors, tags);\n     }\n\n    \/**\n     * Injects the new {@code AkkaAgentConfiguration} instance.\n     *\n     * @param agentConfiguration the new configuration\n     *\/\n    synchronized final void setAgentConfiguration(AkkaAgentConfiguration agentConfiguration) {\n        this.agentConfiguration = agentConfiguration;\n    }\n\n    \/**\n     * The count type for exhaustive matching\n     *\/\n    private static enum CountType {\n        Increment, Decrement\n    }\n\n    \/**\n     * Decide whether to include this ActorCell in our measurements\n     *\n     * @param pathAndClass the PAC container\n     * @return whether to include the given actor in the metrics\n     *\/\n    private boolean includeActorPath(final PathAndClass pathAndClass) {\n        \/\/ do not monitor our own output code\n        if (pathAndClass.actorClassName().isDefined()) {\n            if (pathAndClass.actorClassName().get().startsWith(\"org.eigengo.monitor.output\")) return false;\n        }\n\n        \/\/ include actor if it's in 'included' list\n        if (this.agentConfiguration.included().accept(pathAndClass)) return true;\n        \/\/ exclude actor if excluded (i.e. is in 'excluded' list, or excludeAllNotIncluded = true, and actor is not included)\n        if (this.agentConfiguration.excluded().accept(pathAndClass)) return false;\n\n        \/\/ skip system actor checks if we wish to monitor them\n        if (this.agentConfiguration.includeSystemAgents()) return true;\n\n        String userOrSystem = pathAndClass.actorPath().getElements().iterator().next();\n        return \"user\".equals(userOrSystem);\n    }\n\n    \/**\n     * Lookup the sample rate for an actor from the configuration\n     *\n     * @param pathAndClass the PAC container\n     * @return the sampling rate as non-negative integer\n     *\/\n    private int getSampleRate(final PathAndClass pathAndClass) {\n        return this.agentConfiguration.sampling().getRate(pathAndClass);\n    }\n\n    \/**\n     * Decide whether to sample an actor on a particular occasion\n     *\n     * @param pathAndClass the PAC container\n     * @return {@code true} if we should sample this actor\n     *\/\n    private boolean sampleMessage(final PathAndClass pathAndClass) {\n        final Option<String> className = pathAndClass.actorClassName();\n        int sampleRate = getSampleRate(pathAndClass);\n        if (sampleRate == 1) return true;\n\n        this.samplingCounters.putIfAbsent(className, new AtomicLong(0));\n        long timesSeenSoFar = this.samplingCounters.get(className).incrementAndGet();\n        return (timesSeenSoFar % sampleRate == 1); \/\/ == 1 to log first value (incrementAndGet returns updated value)\n    }\n\n    \/**\n     * Formats the given {@code path} in a way that can be used for tagging. For example, for\n     * path <code>akka:\/\/default\/user\/a\/b\/c<\/code>, it returns <code>akka.path:\/default\/user\/a\/b\/c<\/code>\n     *\n     * @param path the path\n     * @return the tag-ready path\n     *\/\n    private String actorPathToString(ActorPath path) {\n        StringBuilder sb = new StringBuilder();\n        sb.append(\"akka.path:\/\");\n        sb.append(path.address().system());\n        for (String element : path.getElements()) {\n            sb.append(\"\/\");\n            sb.append(element);\n        }\n        return sb.toString();\n    }\n\n    \/**\n     * Decides whether {@code path} represents the \"root\" of the user actors\n     *\n     * @param path the actor path\n     * @return {@code true} if root of user actors\n     *\/\n    private boolean isUserRoot(ActorPath path) {\n        return \"user\".equals(path.elements().mkString(\"\/\"));\n    }\n\n    \/**\n     * Computes the tags for the given {@code actorPath} and {@code actor} instances.\n     *\n     * @param actorPath the actor path; never {@code null}\n     * @param actorClassName the actor instance; may be {@code null}\n     * @return non-{@code null} array of tags\n     *\/\n    private String[] getTags(final ActorPath actorPath, final Option<String> actorClassName) {\n        List<String> tags = new ArrayList<String>();\n\n        \/\/ TODO: Improve detection of routed actors. This only detects \"root\" unnamed actors\n        String lastPathElement = actorPath.elements().last();\n        if (lastPathElement.startsWith(\"$\")) {\n            \/\/ this is routed actor.\n            final ActorPath parent = actorPath.parent();\n            if (isUserRoot(parent)) {\n                \/\/ the parent is akka:\/\/xxx\/user\n                tags.add(actorPathToString(actorPath));\n            } else {\n                \/\/ the parent is some other actor, akka:\/\/xxx\/user\/foo\n                tags.add(actorPathToString(parent));\n                if (this.agentConfiguration.includeRoutees()) tags.add(actorPathToString(actorPath));\n            }\n        } else {\n            \/\/ there is no supervisor\n            tags.add(actorPathToString(actorPath));\n        }\n        if (actorClassName.isDefined()) {\n            tags.add(String.format(\"akka.type:%s.%s\", actorPath.address().system(), actorClassName.get()));\n        }\n\n        return tags.toArray(new String[tags.size()]);\n    }\n\n    \/**\n     * returns the canonical name of the actor type associated with an ActorCell\n     *\n     * @param actorCell the actor cell to get the name for\n     * @return the Option of actor class, never {@code null}.\n     *\/\n    private Option<String> getActorClassName(final ActorCell actorCell, final ActorPath actorPath) {\n        return getActorClassName(actorCell.props(), actorPath);\n    }\n\n    \/**\n     * Returns the canonical name of the actor type associated with a Props instance\n     *\n     * Returns null if props.actorClass does not have a canonical name (i.e., if\n     * it is a local or anonymous class)\n     *\n     * Notably, when the actor class is anonymous, the {@code getCanonicalName} returns {@code null},\n     * which we deal with here.\n     *\n     * @param props the ActorRef {@code Props} instance\n     * @return the Option of actor class, never {@code null}.\n     *\/\n    private Option<String> getActorClassName(final Props props, final ActorPath actorPath) {\n        final String canonicalName = props.actorClass().getCanonicalName();\n        if (this.pathTags.containsKey(actorPath)) return Option.apply(this.pathTags.get(actorPath));\n        if (canonicalName == null \/*if actor is anonymous*\/||\/*OR actor is generic*\/\n                canonicalName.endsWith(\"akka.actor.Actor\")) return this.anonymousActorClassName;\n        return Option.apply(canonicalName);\n    }\n\n    \/**\n     * Catches actors created by the japi.Creator.create(), at a point when their type is visible to the runtime.\n     * We use the visibility of the type at this one pointcut to create a map from the actor path to its type,\n     * which we then access within the other pointcuts (notably on actor death and message receipt) to get the\n     * 'real' type at those points.\n     *\n     * Since the 'ActorRefFactory.actorOf' method is guaranteed to be called on the creation of any actors after the\n     * initialisation of the actorSystem itself, and since we consider anonymous\/untyped actors in our count, we also\n     * decrement the count of 'anonymous' actors here, for we know their type to be invisible to other pointcuts, and\n     * that the element mapping path to type will not have been created (i.e. we generally assume actor paths are unique,\n     * and that the actorOf advice will access the 'pathTags' map before we've inserted this new value). This approach\n     * may not be robust enough -- in particular, with regards the second assumption.\n     *\n     * Regardless, we still double check that the map element doesn't already exist. If it does, we make the assumption\n     * that it was created 'a while ago', and that the path referred to an actor of the same type.\n     *\n     * @param actor the Actor returned by the {@code Creator.create()} method\n     * *\/\n    after() returning(final Actor actor) : Pointcuts.actorCreator() {\n        final String className = actor.getClass().getCanonicalName();\n        final ActorPath actorPath = actor.self().path();\n        if this.pathTags.containsKey(actorPath) return;\n        \/\/ add the path -> type pair to the pathTags map\n        this.pathTags.putIfAbsent(actorPath, className);\n\n        \/\/ safe increment of the count of actors of this type\n        this.numberOfActors.putIfAbsent(Option.apply(className), new AtomicInteger(0));\n        int currentNumberOfActors = this.numberOfActors.get(Option.apply(className)).incrementAndGet();\n        this.counterInterface.recordGaugeValue(Aspects.actorCount(), currentNumberOfActors, getTags(actorPath, Option.apply(className)));\n\n        \/\/ safe decrement of the count of anonymous\/untyped actors\n        this.numberOfActors.putIfAbsent(this.anonymousActorClassName, new AtomicInteger(0));\n                \/\/ reuse of int for (almost-?)invisible performance improvement\n        currentNumberOfActors = this.numberOfActors.get(this.anonymousActorClassName).decrementAndGet();\n        this.counterInterface.recordGaugeValue(Aspects.actorCount(), currentNumberOfActors, getTags(actorPath, Option.apply(className)));\n    }\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"a03e4861996f04d797f0fe39e93127953310c9bf","subject":"add license","message":"add license\n","repos":"mebigfatguy\/hashshmash","old_file":"aj\/com\/mebigfatguy\/hashshmash\/HashCollector.aj","new_file":"aj\/com\/mebigfatguy\/hashshmash\/HashCollector.aj","new_contents":"\/*\n * hashshmash - An aspect to record HashMap\/Set allocations\n * Copyright 2013 MeBigFatGuy.com\n * Copyright 2013 Dave Brosius\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *    http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing,\n * software distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and limitations\n * under the License.\n *\/\npackage com.mebigfatguy.hashshmash;\n\nimport java.io.BufferedWriter;\nimport java.io.File;\nimport java.io.FileOutputStream;\nimport java.io.OutputStreamWriter;\nimport java.io.PrintWriter;\nimport java.lang.reflect.Field;\nimport java.text.SimpleDateFormat;\nimport java.util.Date;\nimport java.util.HashMap;\nimport java.util.HashSet;\nimport java.util.Map;\nimport java.util.Map.Entry;\nimport java.util.Set;\nimport java.util.concurrent.ConcurrentHashMap;\n\npublic aspect HashCollector {\n    \n    private static final Journaller journaller = new Journaller();\n\n    after() returning (Map<?,?> m): call(HashMap.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashMapDetails details = new HashMapDetails(m, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    after() returning (Set<?> s): call(HashSet.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashSetDetails details = new HashSetDetails(s, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    before(): execution(public static void *.main(String[])) {\n        Class<?> c = HashCollector.class;\n    }\n}\n\nfinal class Journaller implements Runnable {\n    \n    private static final int SLEEP_TIME = 5 * 1000;\n    \n    private Field tableField;\n    private ConcurrentHashMap<HashDetails, HashDetails> hDetails = new ConcurrentHashMap<HashDetails, HashDetails>();\n    private PrintWriter writer;\n    private boolean operational = false;\n\n    public Journaller() {\n        try {\n            System.out.println(\"*************************\");\n            System.out.println(\"HASHSHMASH ASPECT ENABLED\");\n            System.out.println(\"*************************\");\n            \n            tableField = HashMap.class.getDeclaredField(\"table\");\n            tableField.setAccessible(true);\n              \n            File dir = new File(System.getProperty(\"user.home\"), \".hashshmash\");\n            dir.mkdirs();  \n            \n            writer = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(new File(dir, new Date().toString() + \".txt\")))));\n            \n            Thread t = new Thread(this);\n            t.setDaemon(true);\n            operational = true;\n            t.start();\n        } catch (Exception e) {\n        }\n    }\n    \n    public void add(HashDetails details) {\n        if (operational)\n            hDetails.put(details,  details);\n    }\n    \n    public void run() {\n        try {\n            while (!Thread.interrupted()) {\n                Thread.sleep(SLEEP_TIME);\n                \n                for (HashDetails details : hDetails.keySet()) {\n                    try {\n                        Map<?, ?> map = details.getMap();\n                        if (map != null) {\n                            int newSize = details.getMap().size();\n                            if (newSize == details.size) {\n                                Entry<?, ?>[] table = (Entry<?, ?>[])tableField.get(map);\n                                details.totalSlots = table.length;\n                                for (Entry<?, ?> e : table) {\n                                    if (e != null) {\n                                        details.usedSlots++;\n                                    }\n                                }\n                                writer.println(details);\n                                hDetails.remove(details);\n                            } else\n                                details.size = newSize;\n                        } else {\n                            hDetails.remove(details);\n                        }\n                    } catch (Exception e) {\n                        \/\/might get ConcurrentModificationException or such, just ignore\n                    }\n                }\n                writer.flush();\n            }\n        } catch (InterruptedException ie) {    \n        }\n    }\n}\n\nabstract class HashDetails {\n    private static SimpleDateFormat FORMATTER = new SimpleDateFormat(\"MM\/dd\/yyyy HH:mm:ss-SSS\");\n    \n    public Date allocTime;\n    public String caller;\n    public int size;\n    public int usedSlots;\n    public int totalSlots;\n    \n    public abstract Map<?,?> getMap();\n    \n    public abstract String getDetailType();\n    \n    public String toString() {\n        return getDetailType() + \"\\t\" + FORMATTER.format(allocTime) + \"\\t\" + caller + \"\\t\" + getMap().size() + \"\\t\" + totalSlots + \"\\t\" + usedSlots;\n    }\n}\n\nclass HashMapDetails extends HashDetails {\n    public Map<?, ?> map;\n\n    public HashMapDetails(Map<?, ?> m, Date d, String c) {\n        map = m;\n        allocTime = d;\n        caller = c;\n        size = map.size();\n    }\n    \n    public Map<?,?> getMap() {\n        return map;\n    }\n    \n    public String getDetailType() {\n        return map.getClass().getSimpleName();\n    }\n}\n\nclass HashSetDetails extends HashDetails {\n    private static Field MAP_FIELD;\n    static {\n        try {\n            MAP_FIELD = HashSet.class.getDeclaredField(\"map\");\n            MAP_FIELD.setAccessible(true);\n        } catch (Exception e) {\n            MAP_FIELD = null;\n        }\n    }\n    \n    public Set<?> set;\n\n    public HashSetDetails(Set<?> s, Date d, String c) {\n        set = s;\n        allocTime = d;\n        caller = c;\n        size = set.size();\n    }\n    \n    public Map<?,?> getMap() {\n        try {\n            if (MAP_FIELD == null)\n                return null;\n            \n            return (Map<?,?>) MAP_FIELD.get(set);\n        } catch (Exception e) {\n            return null;\n        }\n    }\n    \n    public String getDetailType() {\n        return set.getClass().getSimpleName();\n    }\n}\n","old_contents":"package com.mebigfatguy.hashshmash;\n\nimport java.io.BufferedWriter;\nimport java.io.File;\nimport java.io.FileOutputStream;\nimport java.io.OutputStreamWriter;\nimport java.io.PrintWriter;\nimport java.lang.reflect.Field;\nimport java.text.SimpleDateFormat;\nimport java.util.Date;\nimport java.util.HashMap;\nimport java.util.HashSet;\nimport java.util.Map;\nimport java.util.Map.Entry;\nimport java.util.Set;\nimport java.util.concurrent.ConcurrentHashMap;\n\npublic aspect HashCollector {\n    \n    private static final Journaller journaller = new Journaller();\n\n    after() returning (Map<?,?> m): call(HashMap.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashMapDetails details = new HashMapDetails(m, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    after() returning (Set<?> s): call(HashSet.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashSetDetails details = new HashSetDetails(s, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    before(): execution(public static void *.main(String[])) {\n        Class<?> c = HashCollector.class;\n    }\n}\n\nfinal class Journaller implements Runnable {\n    \n    private static final int SLEEP_TIME = 5 * 1000;\n    \n    private Field tableField;\n    private ConcurrentHashMap<HashDetails, HashDetails> hDetails = new ConcurrentHashMap<HashDetails, HashDetails>();\n    private PrintWriter writer;\n    private boolean operational = false;\n\n    public Journaller() {\n        try {\n            System.out.println(\"*************************\");\n            System.out.println(\"HASHSHMASH ASPECT ENABLED\");\n            System.out.println(\"*************************\");\n            \n            tableField = HashMap.class.getDeclaredField(\"table\");\n            tableField.setAccessible(true);\n              \n            File dir = new File(System.getProperty(\"user.home\"), \".hashshmash\");\n            dir.mkdirs();  \n            \n            writer = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(new File(dir, new Date().toString() + \".txt\")))));\n            \n            Thread t = new Thread(this);\n            t.setDaemon(true);\n            operational = true;\n            t.start();\n        } catch (Exception e) {\n        }\n    }\n    \n    public void add(HashDetails details) {\n        if (operational)\n            hDetails.put(details,  details);\n    }\n    \n    public void run() {\n        try {\n            while (!Thread.interrupted()) {\n                Thread.sleep(SLEEP_TIME);\n                \n                for (HashDetails details : hDetails.keySet()) {\n                    try {\n                        Map<?, ?> map = details.getMap();\n                        if (map != null) {\n                            int newSize = details.getMap().size();\n                            if (newSize == details.size) {\n                                Entry<?, ?>[] table = (Entry<?, ?>[])tableField.get(map);\n                                details.totalSlots = table.length;\n                                for (Entry<?, ?> e : table) {\n                                    if (e != null) {\n                                        details.usedSlots++;\n                                    }\n                                }\n                                writer.println(details);\n                                hDetails.remove(details);\n                            } else\n                                details.size = newSize;\n                        } else {\n                            hDetails.remove(details);\n                        }\n                    } catch (Exception e) {\n                        \/\/might get ConcurrentModificationException or such, just ignore\n                    }\n                }\n                writer.flush();\n            }\n        } catch (InterruptedException ie) {    \n        }\n    }\n}\n\nabstract class HashDetails {\n    private static SimpleDateFormat FORMATTER = new SimpleDateFormat(\"MM\/dd\/yyyy HH:mm:ss-SSS\");\n    \n    public Date allocTime;\n    public String caller;\n    public int size;\n    public int usedSlots;\n    public int totalSlots;\n    \n    public abstract Map<?,?> getMap();\n    \n    public abstract String getDetailType();\n    \n    public String toString() {\n        return getDetailType() + \"\\t\" + FORMATTER.format(allocTime) + \"\\t\" + caller + \"\\t\" + getMap().size() + \"\\t\" + totalSlots + \"\\t\" + usedSlots;\n    }\n}\n\nclass HashMapDetails extends HashDetails {\n    public Map<?, ?> map;\n\n    public HashMapDetails(Map<?, ?> m, Date d, String c) {\n        map = m;\n        allocTime = d;\n        caller = c;\n        size = map.size();\n    }\n    \n    public Map<?,?> getMap() {\n        return map;\n    }\n    \n    public String getDetailType() {\n        return map.getClass().getSimpleName();\n    }\n}\n\nclass HashSetDetails extends HashDetails {\n    private static Field MAP_FIELD;\n    static {\n        try {\n            MAP_FIELD = HashSet.class.getDeclaredField(\"map\");\n            MAP_FIELD.setAccessible(true);\n        } catch (Exception e) {\n            MAP_FIELD = null;\n        }\n    }\n    \n    public Set<?> set;\n\n    public HashSetDetails(Set<?> s, Date d, String c) {\n        set = s;\n        allocTime = d;\n        caller = c;\n        size = set.size();\n    }\n    \n    public Map<?,?> getMap() {\n        try {\n            if (MAP_FIELD == null)\n                return null;\n            \n            return (Map<?,?>) MAP_FIELD.get(set);\n        } catch (Exception e) {\n            return null;\n        }\n    }\n    \n    public String getDetailType() {\n        return set.getClass().getSimpleName();\n    }\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"66a01b0fa7bce40c1bdc8bebee131975cd22992e","subject":"pretty up the report file","message":"pretty up the report file\n","repos":"mebigfatguy\/hashshmash","old_file":"aj\/com\/mebigfatguy\/hashshmash\/HashCollector.aj","new_file":"aj\/com\/mebigfatguy\/hashshmash\/HashCollector.aj","new_contents":"package com.mebigfatguy.hashshmash;\n\nimport java.io.BufferedWriter;\nimport java.io.File;\nimport java.io.FileOutputStream;\nimport java.io.OutputStreamWriter;\nimport java.io.PrintWriter;\nimport java.lang.reflect.Field;\nimport java.text.SimpleDateFormat;\nimport java.util.Date;\nimport java.util.HashMap;\nimport java.util.Map;\nimport java.util.Map.Entry;\nimport java.util.concurrent.ConcurrentHashMap;\n\npublic aspect HashCollector {\n    \n    private static final Journaller journaller = new Journaller();\n\n    after() returning (Map m): call(HashMap.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashMapDetails details = new HashMapDetails(m, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n}\n\nfinal class Journaller implements Runnable {\n    \n    private static final int SLEEP_TIME = 10 * 1000;\n    \n    private Field tableField;\n    private ConcurrentHashMap<HashMapDetails, HashMapDetails> hmDetails = new ConcurrentHashMap<HashMapDetails, HashMapDetails>();\n    private PrintWriter writer;\n    private SimpleDateFormat formatter;\n\n    public Journaller() {\n        try {\n            tableField = HashMap.class.getDeclaredField(\"table\");\n            tableField.setAccessible(true);\n              \n            formatter = new SimpleDateFormat(\"MM\/dd\/yyyy HH:mm:ss\");\n            File dir = new File(System.getProperty(\"user.home\"), \".hashshmash\");\n            dir.mkdirs();  \n            \n            writer = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(new File(dir, new Date().toString() + \".txt\")))));\n            \n            Thread t = new Thread(this);\n            t.setDaemon(true);\n            t.start();\n        } catch (Exception e) {\n        }\n    }\n    \n    public void add(HashMapDetails details) {\n        hmDetails.put(details,  details);\n    }\n    \n    public void run() {\n        try {\n            while (!Thread.interrupted()) {\n                Thread.sleep(SLEEP_TIME);\n                \n                for (HashMapDetails details : hmDetails.keySet()) {\n                    try {\n                        int newSize = details.map.size();\n                        if (newSize == details.size) {\n                            Entry<?, ?>[] table = (Entry<?, ?>[])tableField.get(details.map);\n                            details.totalSlots = table.length;\n                            for (Entry<?, ?> e : table) {\n                                if (e != null) {\n                                    details.usedSlots++;\n                                }\n                            }\n                            writer.println(formatter.format(details.allocTime) + \"\\t\" + details.caller + \"\\t\" + details.map.size() + \"\\t\" + details.totalSlots + \"\\t\" + details.usedSlots);\n                            hmDetails.remove(details);\n                        } else {\n                            details.size = newSize;\n                        }\n                    } catch (Exception e) {\n                        \/\/might get ConcurrentModificationException or such, just ignore\n                    }\n                }\n                writer.flush();\n            }\n        } catch (InterruptedException ie) {    \n        }\n    }\n}\n\nclass HashMapDetails {\n    public Map<?, ?> map;\n    public Date allocTime;\n    public String caller;\n    public int size;\n    public int usedSlots;\n    public int totalSlots;\n\n    public HashMapDetails(Map<?, ?> m, Date d, String c) {\n        map = m;\n        allocTime = d;\n        caller = c;\n        size = map.size();\n    }\n}\n","old_contents":"package com.mebigfatguy.hashshmash;\n\nimport java.io.BufferedWriter;\nimport java.io.File;\nimport java.io.FileOutputStream;\nimport java.io.OutputStreamWriter;\nimport java.io.PrintWriter;\nimport java.lang.reflect.Field;\nimport java.util.Date;\nimport java.util.HashMap;\nimport java.util.Map;\nimport java.util.Map.Entry;\nimport java.util.concurrent.ConcurrentHashMap;\n\nimport org.aspectj.lang.Signature;\n\npublic aspect HashCollector {\n    \n    private static final Journaller journaller = new Journaller();\n\n    after() returning (Map m): call(HashMap.new(..)) {\n        Signature sig = thisJoinPointStaticPart.getSignature();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashMapDetails details = new HashMapDetails(m, System.currentTimeMillis(), sig + \":\" + line);\n        journaller.add(details);\n    }\n}\n\nfinal class Journaller implements Runnable {\n    \n    private static final int SLEEP_TIME = 10 * 1000;\n    \n    private Field tableField;\n    private ConcurrentHashMap<HashMapDetails, HashMapDetails> hmDetails = new ConcurrentHashMap<HashMapDetails, HashMapDetails>();\n    private PrintWriter writer;\n\n    public Journaller() {\n        try {\n            tableField = HashMap.class.getDeclaredField(\"table\");\n            tableField.setAccessible(true);\n                        \n            File dir = new File(System.getProperty(\"user.home\"), \".hashshmash\");\n            dir.mkdirs();\n            \n            writer = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(new File(dir, new Date().toString() + \".txt\")))));\n            \n            Thread t = new Thread(this);\n            t.setDaemon(true);\n            t.start();\n        } catch (Exception e) {\n        }\n    }\n    \n    public void add(HashMapDetails details) {\n        hmDetails.put(details,  details);\n    }\n    \n    public void run() {\n        try {\n            while (!Thread.interrupted()) {\n                Thread.sleep(SLEEP_TIME);\n                \n                for (HashMapDetails details : hmDetails.keySet()) {\n                    try {\n                        int newSize = details.map.size();\n                        if (newSize == details.size) {\n                            Entry<?, ?>[] table = (Entry<?, ?>[])tableField.get(details.map);\n                            details.totalSlots = table.length;\n                            for (Entry<?, ?> e : table) {\n                                if (e != null) {\n                                    details.usedSlots++;\n                                }\n                            }\n                            writer.println(details.allocTime + \"\\t\" + details.caller + \"\\t\" + details.map.size() + \"\\t\" + details.totalSlots + \"\\t\" + details.usedSlots);\n                            hmDetails.remove(details);\n                        } else {\n                            details.size = newSize;\n                        }\n                    } catch (Exception e) {\n                        \/\/might get ConcurrentModificationException or such, just ignore\n                    }\n                }\n                writer.flush();\n            }\n        } catch (InterruptedException ie) {    \n        }\n    }\n}\n\nclass HashMapDetails {\n    public Map<?, ?> map;\n    public long allocTime;\n    public String caller;\n    public int size;\n    public int usedSlots;\n    public int totalSlots;\n\n    public HashMapDetails(Map<?, ?> m, long t, String c) {\n        map = m;\n        allocTime = t;\n        caller = c;\n        size = map.size();\n    }\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"10d5c09efeb308bb69273f82a1fdfc8e4da261a6","subject":"'new.' -> ''","message":"'new.' -> ''\n","repos":"eigengo\/monitor,DataDog\/monitor,eigengo\/monitor,DataDog\/monitor","old_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/ActorCellMonitoringAspect.aj","new_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/ActorCellMonitoringAspect.aj","new_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.actor.*;\nimport org.eigengo.monitor.agent.AgentConfiguration;\nimport org.eigengo.monitor.output.CounterInterface;\nimport scala.Option;\n\nimport java.util.ArrayList;\nimport java.util.List;\nimport java.util.concurrent.atomic.AtomicLong;\nimport java.util.concurrent.ConcurrentHashMap;\n\n\/**\n * Contains advices for monitoring behaviour of an actor; typically imprisoned in an {@code ActorCell}.\n *\/\npublic aspect ActorCellMonitoringAspect extends AbstractMonitoringAspect issingleton() {\n    private AkkaAgentConfiguration agentConfiguration;\n    private final CounterInterface counterInterface;\n    private final Option<String> noActorClazz = Option.empty();\n    private final ConcurrentHashMap<Option<String>, AtomicLong> samplingCounters;\n    private final ConcurrentHashMap<Option<String>, AtomicLong> numberOfActors;\n\n\n    \/**\n     * Constructs this aspect\n     *\/\n    public ActorCellMonitoringAspect() {\n        AgentConfiguration<AkkaAgentConfiguration> configuration = getAgentConfiguration(\"akka\", AkkaAgentConfigurationJapi.apply());\n        this.agentConfiguration = configuration.agent();\n        this.counterInterface = createCounterInterface(configuration.common());\n        this.samplingCounters = new ConcurrentHashMap<Option<String>, AtomicLong>();\n        this.numberOfActors = new ConcurrentHashMap<Option<String>, AtomicLong>();\n    }\n\n    \/**\n     * Injects the new {@code AkkaAgentConfiguration} instance.\n     *\n     * @param agentConfiguration the new configuration\n     *\/\n    synchronized final void setAgentConfiguration(AkkaAgentConfiguration agentConfiguration) {\n        this.agentConfiguration = agentConfiguration;\n    }\n\n    \/\/ decide whether to include this ActorCell in our measurements\n    private boolean includeActorPath(final PathAndClass pathAndClass) {\n        if (!this.agentConfiguration.incuded().accept(pathAndClass)) return false;\n        if (this.agentConfiguration.excluded().accept(pathAndClass)) return false;\n\n        if (this.agentConfiguration.includeSystemAgents()) return true;\n\n        String userOrSystem = pathAndClass.actorPath().getElements().iterator().next();\n        return \"user\".equals(userOrSystem);\n    }\n\n    \/\/ get the sample rate for an actor\n    private int getSampleRate(final PathAndClass pathAndClass) {\n        return this.agentConfiguration.sampling().getRate(pathAndClass);\n    }\n\n    \/\/ decide whether to sample an actor on a particular occasion\n    private final boolean sampleMessage(final PathAndClass pathAndClass) {\n        int sampleRate = getSampleRate(pathAndClass);\n        if (sampleRate == 1) return true;\n\n        this.samplingCounters.putIfAbsent(pathAndClass.actorClassName(), new AtomicLong(0));\n        long timesSeenSoFar = this.samplingCounters.get(pathAndClass.actorClassName()).incrementAndGet();\n        return (timesSeenSoFar % sampleRate == 1); \/\/ == 1 to log first value (incrementAndGet returns updated value)\n    }\n\n    \/\/ get the tags for the cell\n    private String[] getTags(final ActorPath actorPath, final Actor actor) {\n        List<String> tags = new ArrayList<String>();\n\n        \/\/ TODO: Improve detection of routed actors. This relies only on the naming :(.\n        String lastPathElement = actorPath.elements().last();\n        if (lastPathElement.startsWith(\"$\")) {\n            \/\/ this is routed actor.\n            tags.add(actorPath.parent().toString());\n            if (this.agentConfiguration.includeRoutees()) tags.add(actorPath.toString());\n        } else {\n            \/\/ there is no supervisor\n            tags.add(actorPath.toString());\n        }\n        if (actor != null) {\n            tags.add(String.format(\"akka:%s.%s\", actor.context().system().name(), actor.getClass().getCanonicalName()));\n        }\n\n        return tags.toArray(new String[tags.size()]);\n    }\n\n    \/**\n     * Advises the {@code ActorCell.receiveMessage(message: Object): Unit}\n     * We proceed with the pointcut if the actor is to be included in the monitoring *and* this is\n     * the 'multiple-of-n'th time we've seen a message for an actor with a sample rate of n.\n     *\n     * Currently, we sample queue size, the fact that the message is delivered, the simple name of the class of the\n     * message, and the time taken to complete the actor's reactive action.\n     *\n     * @param actorCell the ActorCell where the actor that receives the message \"lives\"\n     * @param msg the incoming message\n     *\/\n    Object around(ActorCell actorCell, Object msg) : Pointcuts.actorCellReceiveMessage(actorCell, msg) {\n        final ActorPath actorPath = actorCell.self().path();\n        final PathAndClass pathAndClass = new PathAndClass(actorPath, Option.apply(actorCell.actor().getClass().getCanonicalName()));\n        if (!includeActorPath(pathAndClass) || !sampleMessage(pathAndClass)) return proceed(actorCell, msg);\n\n        int samplingRate = getSampleRate(pathAndClass);\n\n        \/\/ we tag by actor name\n        final String[] tags = getTags(actorPath, actorCell.actor());\n\n        \/\/ record the queue size\n        this.counterInterface.recordGaugeValue(\"akka.queue.size\", actorCell.numberOfMessages(), tags);\n        \/\/ record the message, general and specific\n        this.counterInterface.incrementCounter(\"akka.actor.delivered\", samplingRate, tags);\n        this.counterInterface.incrementCounter(\"akka.actor.delivered.\" + msg.getClass().getSimpleName(), samplingRate, tags);\n\n        \/\/ measure the time. we're using the ``nanoTime`` call to access the high-precision timer.\n        \/\/ since we're not really interested in wall time, but just some increasing measure of\n        \/\/ elapsed time\n        Object result = null;\n        final long start = System.nanoTime();\n        \/\/ result will always be ``null``, because target returns ``Unit``\n        result = proceed(actorCell, msg);\n        \/\/ ns or \u00b5s is too fine. ms will do for now.\n        final long duration = (System.nanoTime() - start) \/ 1000000;\n\n        \/\/ record the actor duration\n        this.counterInterface.recordExecutionTime(\"akka.actor.duration\", (int)duration, tags);\n\n        \/\/ return null would do the trick, but we want to be _proper_.\n        return result;\n    }\n\n    \/**\n     * Advises the {@code ActorCell.handleInvokeFailure(_, failure: Throwable): Unit}\n     *\n     * @param actorCell the ActorCell where the error spreads from\n     * @param failure the exception that escaped from the {@code receive} method\n     *\/\n    before(ActorCell actorCell, Throwable failure) : Pointcuts.actorCellHandleInvokeFailure(actorCell, failure) {\n        \/\/ record the error, general and specific\n        String[] tags = getTags(actorCell.self().path(), actorCell.actor());\n        this.counterInterface.incrementCounter(\"akka.actor.error\", tags);\n        this.counterInterface.incrementCounter(String.format(\"akka.actor.error.%s\", failure.getMessage()), tags);\n    }\n\n    \/**\n     * Advises the {@code EventStream.publish(event: Any): Unit}\n     *\n     * @param event the received event\n     *\/\n    before(Object event) : Pointcuts.eventStreamPublish(event) {\n        if (event instanceof UnhandledMessage) {\n            UnhandledMessage unhandledMessage = (UnhandledMessage)event;\n            String[] tags = getTags(unhandledMessage.recipient().path(), null);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered\", tags);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered.\" + unhandledMessage.getMessage().getClass().getSimpleName(), tags);\n        }\n    }\n\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorCell} and {@code ActorSystem}\n     *\n     * @param props the {@code Props} instance used in the call\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after(Props props) returning (ActorRef actor): Pointcuts.anyActorOf(props) {\n        recordActorCreation(props, actor);\n    }\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorCell} and {@code ActorSystem} when actor is named in construction\n     *\n     * @param props the {@code Props} instance used in the call\n     * @param actorName the {@code String} used to name the actor at creation site\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after(Props props, String actorName) returning (ActorRef actor): Pointcuts.namedActorOf(props, actorName) {\n        recordActorCreation(props, actor);\n    }\n\n    \/\/ method containing the recording logic for advising actor creation\n    void recordActorCreation(Props props, ActorRef actor) {\n        if (!includeActorPath(new PathAndClass(actor.path(), this.noActorClazz))) return;\n        final String uncheckedClassName = props.actorClass().getCanonicalName();\n        final Option<String> className = Option.apply(uncheckedClassName);\n\n        this.numberOfActors.putIfAbsent(className, new AtomicLong(0));\n        \/\/ increment and get the current number of actors of this type (if the value was 0, then this returns 1 -- which is correct)\n        final long value = this.numberOfActors.get(className).incrementAndGet();\n\n        System.out.println(\"+++++\"+className + \" : \" + value);\n        \/\/ record the current number of actors of this type\n        this.counterInterface.recordGaugeValue(\"akka.actor.count\", (int)value, uncheckedClassName);\n    }\n\n    \/**\n     * Advises the {@code LocalActorRef.stop} method\n     *\n     *\n     * @param actorCell the {@code ActorCell} of the actor being stopped\n     *\/\n    after(ActorCell actorCell) : Pointcuts.actorCellInternalStop(actorCell) {\n        if (!includeActorPath(new PathAndClass(actorCell.self().path(), this.noActorClazz))) return;\n        final String uncheckedClassName = actorCell.props().actorClass().getCanonicalName();\n        final Option<String> className = Option.apply(uncheckedClassName);\n\n        this.numberOfActors.putIfAbsent(className, new AtomicLong(0));\n        final long value = this.numberOfActors.get(className).decrementAndGet();\n\n        System.out.println(\"-----\"+className + \" : \" + value);\n        this.counterInterface.recordGaugeValue(\"akka.actor.count\", (int)value, uncheckedClassName);\n    }\n\n}","old_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.actor.*;\nimport org.eigengo.monitor.agent.AgentConfiguration;\nimport org.eigengo.monitor.output.CounterInterface;\nimport scala.Option;\n\nimport java.util.ArrayList;\nimport java.util.List;\nimport java.util.concurrent.atomic.AtomicLong;\nimport java.util.concurrent.ConcurrentHashMap;\n\n\/**\n * Contains advices for monitoring behaviour of an actor; typically imprisoned in an {@code ActorCell}.\n *\/\npublic aspect ActorCellMonitoringAspect extends AbstractMonitoringAspect issingleton() {\n    private AkkaAgentConfiguration agentConfiguration;\n    private final CounterInterface counterInterface;\n    private final Option<String> noActorClazz = Option.empty();\n    private final ConcurrentHashMap<Option<String>, AtomicLong> samplingCounters;\n    private final ConcurrentHashMap<Option<String>, AtomicLong> numberOfActors;\n\n\n    \/**\n     * Constructs this aspect\n     *\/\n    public ActorCellMonitoringAspect() {\n        AgentConfiguration<AkkaAgentConfiguration> configuration = getAgentConfiguration(\"akka\", AkkaAgentConfigurationJapi.apply());\n        this.agentConfiguration = configuration.agent();\n        this.counterInterface = createCounterInterface(configuration.common());\n        this.samplingCounters = new ConcurrentHashMap<Option<String>, AtomicLong>();\n        this.numberOfActors = new ConcurrentHashMap<Option<String>, AtomicLong>();\n    }\n\n    \/**\n     * Injects the new {@code AkkaAgentConfiguration} instance.\n     *\n     * @param agentConfiguration the new configuration\n     *\/\n    synchronized final void setAgentConfiguration(AkkaAgentConfiguration agentConfiguration) {\n        this.agentConfiguration = agentConfiguration;\n    }\n\n    \/\/ decide whether to include this ActorCell in our measurements\n    private boolean includeActorPath(final PathAndClass pathAndClass) {\n        if (!this.agentConfiguration.incuded().accept(pathAndClass)) return false;\n        if (this.agentConfiguration.excluded().accept(pathAndClass)) return false;\n\n        if (this.agentConfiguration.includeSystemAgents()) return true;\n\n        String userOrSystem = pathAndClass.actorPath().getElements().iterator().next();\n        return \"user\".equals(userOrSystem);\n    }\n\n    \/\/ get the sample rate for an actor\n    private int getSampleRate(final PathAndClass pathAndClass) {\n        return this.agentConfiguration.sampling().getRate(pathAndClass);\n    }\n\n    \/\/ decide whether to sample an actor on a particular occasion\n    private final boolean sampleMessage(final PathAndClass pathAndClass) {\n        int sampleRate = getSampleRate(pathAndClass);\n        if (sampleRate == 1) return true;\n\n        this.samplingCounters.putIfAbsent(pathAndClass.actorClassName(), new AtomicLong(0));\n        long timesSeenSoFar = this.samplingCounters.get(pathAndClass.actorClassName()).incrementAndGet();\n        return (timesSeenSoFar % sampleRate == 1); \/\/ == 1 to log first value (incrementAndGet returns updated value)\n    }\n\n    \/\/ get the tags for the cell\n    private String[] getTags(final ActorPath actorPath, final Actor actor) {\n        List<String> tags = new ArrayList<String>();\n\n        \/\/ TODO: Improve detection of routed actors. This relies only on the naming :(.\n        String lastPathElement = actorPath.elements().last();\n        if (lastPathElement.startsWith(\"$\")) {\n            \/\/ this is routed actor.\n            tags.add(actorPath.parent().toString());\n            if (this.agentConfiguration.includeRoutees()) tags.add(actorPath.toString());\n        } else {\n            \/\/ there is no supervisor\n            tags.add(actorPath.toString());\n        }\n        if (actor != null) {\n            tags.add(String.format(\"akka:%s.%s\", actor.context().system().name(), actor.getClass().getCanonicalName()));\n        }\n\n        return tags.toArray(new String[tags.size()]);\n    }\n\n    \/**\n     * Advises the {@code ActorCell.receiveMessage(message: Object): Unit}\n     * We proceed with the pointcut if the actor is to be included in the monitoring *and* this is\n     * the 'multiple-of-n'th time we've seen a message for an actor with a sample rate of n.\n     *\n     * Currently, we sample queue size, the fact that the message is delivered, the simple name of the class of the\n     * message, and the time taken to complete the actor's reactive action.\n     *\n     * @param actorCell the ActorCell where the actor that receives the message \"lives\"\n     * @param msg the incoming message\n     *\/\n    Object around(ActorCell actorCell, Object msg) : Pointcuts.actorCellReceiveMessage(actorCell, msg) {\n        final ActorPath actorPath = actorCell.self().path();\n        final PathAndClass pathAndClass = new PathAndClass(actorPath, Option.apply(actorCell.actor().getClass().getCanonicalName()));\n        if (!includeActorPath(pathAndClass) || !sampleMessage(pathAndClass)) return proceed(actorCell, msg);\n\n        int samplingRate = getSampleRate(pathAndClass);\n\n        \/\/ we tag by actor name\n        final String[] tags = getTags(actorPath, actorCell.actor());\n\n        \/\/ record the queue size\n        this.counterInterface.recordGaugeValue(\"akka.queue.size\", actorCell.numberOfMessages(), tags);\n        \/\/ record the message, general and specific\n        this.counterInterface.incrementCounter(\"akka.actor.delivered\", samplingRate, tags);\n        this.counterInterface.incrementCounter(\"akka.actor.delivered.\" + msg.getClass().getSimpleName(), samplingRate, tags);\n\n        \/\/ measure the time. we're using the ``nanoTime`` call to access the high-precision timer.\n        \/\/ since we're not really interested in wall time, but just some increasing measure of\n        \/\/ elapsed time\n        Object result = null;\n        final long start = System.nanoTime();\n        \/\/ result will always be ``null``, because target returns ``Unit``\n        result = proceed(actorCell, msg);\n        \/\/ ns or \u00b5s is too fine. ms will do for now.\n        final long duration = (System.nanoTime() - start) \/ 1000000;\n\n        \/\/ record the actor duration\n        this.counterInterface.recordExecutionTime(\"akka.actor.duration\", (int)duration, tags);\n\n        \/\/ return null would do the trick, but we want to be _proper_.\n        return result;\n    }\n\n    \/**\n     * Advises the {@code ActorCell.handleInvokeFailure(_, failure: Throwable): Unit}\n     *\n     * @param actorCell the ActorCell where the error spreads from\n     * @param failure the exception that escaped from the {@code receive} method\n     *\/\n    before(ActorCell actorCell, Throwable failure) : Pointcuts.actorCellHandleInvokeFailure(actorCell, failure) {\n        \/\/ record the error, general and specific\n        String[] tags = getTags(actorCell.self().path(), actorCell.actor());\n        this.counterInterface.incrementCounter(\"akka.actor.error\", tags);\n        this.counterInterface.incrementCounter(String.format(\"akka.actor.error.%s\", failure.getMessage()), tags);\n    }\n\n    \/**\n     * Advises the {@code EventStream.publish(event: Any): Unit}\n     *\n     * @param event the received event\n     *\/\n    before(Object event) : Pointcuts.eventStreamPublish(event) {\n        if (event instanceof UnhandledMessage) {\n            UnhandledMessage unhandledMessage = (UnhandledMessage)event;\n            String[] tags = getTags(unhandledMessage.recipient().path(), null);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered\", tags);\n            this.counterInterface.incrementCounter(\"akka.actor.undelivered.\" + unhandledMessage.getMessage().getClass().getSimpleName(), tags);\n        }\n    }\n\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorCell} and {@code ActorSystem}\n     *\n     * @param props the {@code Props} instance used in the call\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after(Props props) returning (ActorRef actor): Pointcuts.anyActorOf(props) {\n        recordActorCreation(props, actor);\n    }\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorCell} and {@code ActorSystem} when actor is named in construction\n     *\n     * @param props the {@code Props} instance used in the call\n     * @param actorName the {@code String} used to name the actor at creation site\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after(Props props, String actorName) returning (ActorRef actor): Pointcuts.namedActorOf(props, actorName) {\n        recordActorCreation(props, actor);\n    }\n\n    \/\/ method containing the recording logic for advising actor creation\n    void recordActorCreation(Props props, ActorRef actor) {\n        if (!includeActorPath(new PathAndClass(actor.path(), this.noActorClazz))) return;\n        final String uncheckedClassName = props.actorClass().getCanonicalName();\n        final Option<String> className = Option.apply(uncheckedClassName);\n\n        this.numberOfActors.putIfAbsent(className, new AtomicLong(0));\n        \/\/ increment and get the current number of actors of this type (if the value was 0, then this returns 1 -- which is correct)\n        final long value = this.numberOfActors.get(className).incrementAndGet();\n\n        System.out.println(\"+++++\"+className + \" : \" + value);\n        \/\/ record the current number of actors of this type\n        this.counterInterface.recordGaugeValue(\"akka.actor.new.count\", (int)value, uncheckedClassName);\n    }\n\n    \/**\n     * Advises the {@code LocalActorRef.stop} method\n     *\n     *\n     * @param actorCell the {@code ActorCell} of the actor being stopped\n     *\/\n    after(ActorCell actorCell) : Pointcuts.actorCellInternalStop(actorCell) {\n        if (!includeActorPath(new PathAndClass(actorCell.self().path(), this.noActorClazz))) return;\n        final String uncheckedClassName = actorCell.props().actorClass().getCanonicalName();\n        final Option<String> className = Option.apply(uncheckedClassName);\n\n        this.numberOfActors.putIfAbsent(className, new AtomicLong(0));\n        final long value = this.numberOfActors.get(className).decrementAndGet();\n\n        System.out.println(\"-----\"+className + \" : \" + value);\n        this.counterInterface.recordGaugeValue(\"akka.actor.count\", (int)value, uncheckedClassName);\n    }\n\n}","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"ddfb2d3c58d898349a32e640e78074e4b67f066c","subject":"+ remove unneeded catch for exceptions inside AbstractCacheAspect.aj","message":"+ remove unneeded catch for exceptions inside AbstractCacheAspect.aj\n","repos":"spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework","old_file":"org.springframework.aspects\/src\/main\/java\/org\/springframework\/cache\/aspectj\/AbstractCacheAspect.aj","new_file":"org.springframework.aspects\/src\/main\/java\/org\/springframework\/cache\/aspectj\/AbstractCacheAspect.aj","new_contents":"\/*\r\n * Copyright 2002-2011 the original author or authors.\r\n *\r\n * Licensed under the Apache License, Version 2.0 (the \"License\");\r\n * you may not use this file except in compliance with the License.\r\n * You may obtain a copy of the License at\r\n *\r\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\r\n *\r\n * Unless required by applicable law or agreed to in writing, software\r\n * distributed under the License is distributed on an \"AS IS\" BASIS,\r\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n * See the License for the specific language governing permissions and\r\n * limitations under the License.\r\n *\/\r\n\r\npackage org.springframework.cache.aspectj;\r\n\r\nimport java.lang.reflect.Method;\r\nimport java.util.concurrent.Callable;\r\n\r\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\r\nimport org.aspectj.lang.reflect.MethodSignature;\r\nimport org.springframework.cache.interceptor.CacheAspectSupport;\r\nimport org.springframework.cache.interceptor.CacheOperationSource;\r\n\r\n\/**\r\n * Abstract superaspect for AspectJ cache aspects. Concrete\r\n * subaspects will implement the <code>cacheMethodExecution()<\/code>\r\n * pointcut using a strategy such as Java 5 annotations.\r\n *\r\n * <p>Suitable for use inside or outside the Spring IoC container.\r\n * Set the \"cacheManager\" property appropriately, allowing\r\n * use of any cache implementation supported by Spring.\r\n *\r\n * <p><b>NB:<\/b> If a method implements an interface that is itself\r\n * cache annotated, the relevant Spring cache definition\r\n * will <i>not<\/i> be resolved.\r\n *\r\n * @author Costin Leau\r\n * @since 3.1\r\n *\/\r\npublic abstract aspect AbstractCacheAspect extends CacheAspectSupport {\r\n\r\n\tprotected AbstractCacheAspect() {\r\n\t}\r\n\r\n\t\/**\r\n\t * Construct object using the given caching metadata retrieval strategy.\r\n\t * @param cos {@link CacheOperationSource} implementation, retrieving Spring\r\n\t * cache metadata for each joinpoint.\r\n\t *\/\r\n\tprotected AbstractCacheAspect(CacheOperationSource... cos) {\r\n\t\tsetCacheOperationSources(cos);\r\n\t}\r\n\r\n\t@SuppressAjWarnings(\"adviceDidNotMatch\")\r\n\tObject around(final Object cachedObject) : cacheMethodExecution(cachedObject){\r\n\t\tMethodSignature methodSignature = (MethodSignature) thisJoinPoint.getSignature();\r\n\t\tMethod method = methodSignature.getMethod();\r\n\r\n\t\tCallable<Object> ajInvocation = new Callable<Object>() {\r\n\t\t\tpublic Object call() {\r\n\t\t\t\treturn proceed(cachedObject);\r\n\t\t\t}\r\n\t\t};\r\n\r\n\t\treturn execute(ajInvocation, thisJoinPoint.getTarget(), method, thisJoinPoint.getArgs());\r\n\t}\r\n\r\n\t\/**\r\n\t * Concrete subaspects must implement this pointcut, to identify\r\n\t * cached methods. For each selected joinpoint, {@link CacheOperationDefinition}\r\n\t * will be retrieved using Spring's {@link CacheOperationSource} interface.\r\n\t *\/\r\n\tprotected abstract pointcut cacheMethodExecution(Object cachedObject);\r\n\r\n}\r\n","old_contents":"\/*\r\n * Copyright 2002-2011 the original author or authors.\r\n *\r\n * Licensed under the Apache License, Version 2.0 (the \"License\");\r\n * you may not use this file except in compliance with the License.\r\n * You may obtain a copy of the License at\r\n *\r\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\r\n *\r\n * Unless required by applicable law or agreed to in writing, software\r\n * distributed under the License is distributed on an \"AS IS\" BASIS,\r\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n * See the License for the specific language governing permissions and\r\n * limitations under the License.\r\n *\/\r\n\r\npackage org.springframework.cache.aspectj;\r\n\r\nimport java.lang.reflect.Method;\r\nimport java.util.concurrent.Callable;\r\n\r\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\r\nimport org.aspectj.lang.reflect.MethodSignature;\r\nimport org.springframework.cache.interceptor.CacheAspectSupport;\r\nimport org.springframework.cache.interceptor.CacheOperationSource;\r\n\r\n\/**\r\n * Abstract superaspect for AspectJ cache aspects. Concrete\r\n * subaspects will implement the <code>cacheMethodExecution()<\/code>\r\n * pointcut using a strategy such as Java 5 annotations.\r\n *\r\n * <p>Suitable for use inside or outside the Spring IoC container.\r\n * Set the \"cacheManager\" property appropriately, allowing\r\n * use of any cache implementation supported by Spring.\r\n *\r\n * <p><b>NB:<\/b> If a method implements an interface that is itself\r\n * cache annotated, the relevant Spring cache definition\r\n * will <i>not<\/i> be resolved.\r\n *\r\n * @author Costin Leau\r\n * @since 3.1\r\n *\/\r\npublic abstract aspect AbstractCacheAspect extends CacheAspectSupport {\r\n\r\n\tprotected AbstractCacheAspect() {\r\n\t}\r\n\r\n\t\/**\r\n\t * Construct object using the given caching metadata retrieval strategy.\r\n\t * @param cos {@link CacheOperationSource} implementation, retrieving Spring\r\n\t * cache metadata for each joinpoint.\r\n\t *\/\r\n\tprotected AbstractCacheAspect(CacheOperationSource... cos) {\r\n\t\tsetCacheOperationSources(cos);\r\n\t}\r\n\r\n\t@SuppressAjWarnings(\"adviceDidNotMatch\")\r\n\tObject around(final Object cachedObject) : cacheMethodExecution(cachedObject){\r\n\t\tMethodSignature methodSignature = (MethodSignature) thisJoinPoint.getSignature();\r\n\t\tMethod method = methodSignature.getMethod();\r\n\r\n\t\tCallable<Object> ajInvocation = new Callable<Object>() {\r\n\t\t\tpublic Object call() {\r\n\t\t\t\treturn proceed(cachedObject);\r\n\t\t\t}\r\n\t\t};\r\n\r\n\t\ttry {\r\n\t\t\treturn execute(ajInvocation, thisJoinPoint.getTarget(), method, thisJoinPoint.getArgs());\r\n\t\t}\r\n\t\tcatch (Exception ex) {\r\n\t\t\tthrow new UnsupportedOperationException(\"Should not throw exception\", ex);\r\n\t\t}\r\n\t}\r\n\r\n\t\/**\r\n\t * Concrete subaspects must implement this pointcut, to identify\r\n\t * cached methods. For each selected joinpoint, {@link CacheOperationDefinition}\r\n\t * will be retrieved using Spring's {@link CacheOperationSource} interface.\r\n\t *\/\r\n\tprotected abstract pointcut cacheMethodExecution(Object cachedObject);\r\n\r\n}\r\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"37b66ebab7c4eb0427d36c72da539de5f8ccf41a","subject":"Make sure the single update request is aborted onPause()","message":"Make sure the single update request is aborted onPause()","repos":"Applied-Duality\/ignition,treejames\/ignition,hongnguyenpro\/ignition,beni55\/ignition,mttkay\/ignition","old_file":"ignition-location\/ignition-location-lib\/src\/com\/github\/ignition\/location\/IgnitedLocationManager.aj","new_file":"ignition-location\/ignition-location-lib\/src\/com\/github\/ignition\/location\/IgnitedLocationManager.aj","new_contents":"\/*\n * Copyright 2011 Google Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * This code has been modified by Stefano Dacchille.\n *\/\n\npackage com.github.ignition.location;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\n\nimport android.app.Activity;\nimport android.app.PendingIntent;\nimport android.content.BroadcastReceiver;\nimport android.content.Context;\nimport android.content.Intent;\nimport android.content.IntentFilter;\nimport android.content.SharedPreferences;\nimport android.content.SharedPreferences.Editor;\nimport android.location.Criteria;\nimport android.location.Location;\nimport android.location.LocationListener;\nimport android.location.LocationManager;\nimport android.os.AsyncTask;\nimport android.os.BatteryManager;\nimport android.os.Bundle;\nimport android.os.Handler;\nimport android.util.Log;\n\nimport com.github.ignition.location.annotations.IgnitedLocation;\nimport com.github.ignition.location.annotations.IgnitedLocationActivity;\nimport com.github.ignition.location.receivers.IgnitedLocationChangedReceiver;\nimport com.github.ignition.location.receivers.IgnitedPassiveLocationChangedReceiver;\nimport com.github.ignition.location.tasks.IgnitedLastKnownLocationAsyncTask;\nimport com.github.ignition.location.templates.ILastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLocationUpdateRequester;\nimport com.github.ignition.location.templates.OnIgnitedLocationChangedListener;\nimport com.github.ignition.location.utils.PlatformSpecificImplementationFactory;\nimport com.github.ignition.support.IgnitedDiagnostics;\n\n@SuppressAjWarnings\npublic aspect IgnitedLocationManager {\n    public static final String LOG_TAG = IgnitedLocationManager.class.getSimpleName();\n\n    declare parents : (@IgnitedLocationActivity *) implements OnIgnitedLocationChangedListener;\n\n    private Criteria defaultCriteria, lowPowerCriteria;\n    protected IgnitedAbstractLocationUpdateRequester locationUpdateRequester;\n    protected PendingIntent locationListenerPendingIntent, locationListenerPassivePendingIntent;\n    protected LocationManager locationManager;\n    protected IgnitedLocationListener bestInactiveLocationProviderListener;\n\n    private Context context;\n    private volatile Location currentLocation;\n\n    private IgnitedLastKnownLocationAsyncTask ignitedLastKnownLocationTask;\n    private SharedPreferences prefs;\n    private Handler handler;\n\n    private long locationUpdatesInterval, passiveLocationUpdatesInterval;\n    private int locationUpdatesDistanceDiff;\n    private int passiveLocationUpdatesDistanceDiff;\n    private boolean requestLocationUpdates;\n    private boolean locationUpdatesDisabled = true;\n    private boolean waitForFixDialogShown = false;\n\n    \/\/ Switch to another provider if gps doesn't return a location quickly enough.\n    private Runnable removeGpsUpdates = new Runnable() {\n        @Override\n        public void run() {\n            Log.d(LOG_TAG,\n                    \"It looks like GPS isn't available at this time (i.e.: maybe you're indoors). Removing GPS location updates and requesting network updates.\");\n\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, lowPowerCriteria());\n        }\n    };\n\n    \/**\n     * If the Location Provider we're using to receive location updates is disabled while the app is\n     * running, this Receiver will be notified, allowing us to re-register our Location Receivers\n     * using the best available Location Provider is still available.\n     *\/\n    protected BroadcastReceiver locationProviderDisabledReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            boolean providerDisabled = !intent.getBooleanExtra(\n                    LocationManager.KEY_PROVIDER_ENABLED, false);\n            \/\/ Re-register the location listeners using the best available\n            \/\/ Location Provider.\n            if (providerDisabled) {\n                disableLocationUpdates(false);\n                requestLocationUpdates(context, null);\n            }\n        }\n    };\n\n    \/**\n     * If the battery state is low disable the passive location update receiver.\n     *\/\n    protected BroadcastReceiver refreshLocationUpdatesReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, null);\n        }\n    };\n\n    after(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onCreate(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n\n        \/\/ Get a reference to the Context\n        this.context = context;\n        \/\/ Set pref file\n        prefs = context.getSharedPreferences(IgnitedLocationConstants.SHARED_PREFERENCE_FILE,\n                Context.MODE_PRIVATE);\n        \/\/ Get references to the managers\n        locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);\n        handler = new Handler();\n\n        \/\/ Specify the Criteria to use when requesting location updates while\n        \/\/ the application is Active\n        if (defaultCriteria == null) {\n            defaultCriteria = new Criteria();\n        }\n        \/\/ Use gps if it's enabled and if battery level is at least 15%\n        boolean useGps = prefs.getBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS,\n                IgnitedLocationConstants.USE_GPS_DEFAULT);\n        if (useGps) {\n            defaultCriteria.setAccuracy(Criteria.ACCURACY_FINE);\n        } else {\n            defaultCriteria.setPowerRequirement(Criteria.POWER_LOW);\n        }\n\n        \/\/ Setup the location update Pending Intent\n        Intent activeIntent = new Intent(IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_ACTION);\n        locationListenerPendingIntent = PendingIntent.getBroadcast(context, 0, activeIntent,\n                PendingIntent.FLAG_UPDATE_CURRENT);\n        \/\/ Setup the passive location update Pending Intent\n        Intent passiveIntent = new Intent(context, IgnitedPassiveLocationChangedReceiver.class);\n        locationListenerPassivePendingIntent = PendingIntent.getBroadcast(context, 0,\n                passiveIntent, PendingIntent.FLAG_UPDATE_CURRENT);\n\n        \/\/ Instantiate a Location Update Requester class based on the available\n        \/\/ platform version. This will be used to request location updates.\n        locationUpdateRequester = PlatformSpecificImplementationFactory\n                .getLocationUpdateRequester(context);\n    }\n\n    private boolean isBatteryOk() {\n        IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);\n        Intent intent = context.registerReceiver(null, filter);\n        double currentLevel = 100.0;\n        if (intent != null) {\n            currentLevel = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1);\n        }\n\n        return currentLevel >= prefs.getInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                IgnitedLocationConstants.MIN_BATTERY_LEVEL_FOR_GPS_DEFAULT);\n    }\n\n    before(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onResume(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n        \/\/ Get a reference to the Context if this context is null\n        if (this.context == null) {\n            this.context = context;\n        }\n\n        saveToPreferences(context, ignitedAnnotation);\n\n        Log.d(LOG_TAG, \"Retrieving last known location...\");\n        \/\/ Get the last known location. This isn't directly affecting the UI, so put it on a\n        \/\/ worker thread.\n        ignitedLastKnownLocationTask = new IgnitedLastKnownLocationAsyncTask(context,\n                locationUpdatesDistanceDiff, locationUpdatesInterval);\n        ignitedLastKnownLocationTask.execute();\n    }\n\n    \/**\n     * Save last settings to preferences.\n     * \n     * @param context\n     * @param locationAnnotation\n     *\/\n    private void saveToPreferences(Context context, IgnitedLocationActivity locationAnnotation) {\n        requestLocationUpdates = locationAnnotation.requestLocationUpdates();\n        locationUpdatesDistanceDiff = locationAnnotation.locationUpdatesDistanceDiff();\n        locationUpdatesInterval = locationAnnotation.locationUpdatesInterval();\n        passiveLocationUpdatesDistanceDiff = locationAnnotation\n                .passiveLocationUpdatesDistanceDiff();\n        passiveLocationUpdatesInterval = locationAnnotation.passiveLocationUpdatesInterval();\n        boolean enablePassiveLocationUpdates = locationAnnotation.enablePassiveUpdates();\n        boolean useGps = locationAnnotation.useGps();\n\n        Editor editor = prefs.edit();\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_LOCATION_UPDATES,\n                requestLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                enablePassiveLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS, useGps);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_DISTANCE_DIFF,\n                locationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_INTERVAL,\n                locationUpdatesInterval);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_DISTANCE_DIFF,\n                passiveLocationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_INTERVAL,\n                passiveLocationUpdatesInterval);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_RUN_ONCE, true);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                locationAnnotation.minBatteryLevelForGps());\n        editor.putLong(IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                locationAnnotation.waitForGpsFixInterval());\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                locationAnnotation.showWaitForLocationDialog());\n        editor.commit();\n\n    }\n\n    before(Activity activity, IgnitedLocationActivity ignitedAnnotation) : execution(* Activity.onPause(..)) \n        && @this(ignitedAnnotation) && this(activity) && within(@IgnitedLocationActivity *) {\n\n        if (ignitedAnnotation.requestLocationUpdates()) {\n            disableLocationUpdates(true);\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n\n        if (ignitedLastKnownLocationTask != null) {\n            if (ignitedLastKnownLocationTask.getStatus() != AsyncTask.Status.FINISHED) {\n                Log.d(LOG_TAG, \"Cancel last location task\");\n                ignitedLastKnownLocationTask.cancel(true);\n            }\n            ignitedLastKnownLocationTask.getLastLocationFinder().cancel();\n        }\n\n        boolean finishing = activity.isFinishing();\n        if (finishing) {\n            context = null;\n        }\n    }\n\n    Location around() : get(@IgnitedLocation Location *) {\n        return currentLocation;\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && within(IgnitedPassiveLocationChangedReceiver) && !adviceexecution() {\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, lng\/acc): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude() + \"\/\"\n                + currentLocation.getAccuracy());\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && (within(IgnitedLocationChangedReceiver) || within(IgnitedAbstractLastLocationFinder)\n                || within(IgnitedLastKnownLocationAsyncTask)) && !adviceexecution() {\n\n        if (context == null) {\n            return;\n        }\n        final Activity activity = (Activity) context;\n        boolean showWaitForLocationDialog = prefs.getBoolean(\n                IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                IgnitedLocationConstants.SHOW_WAIT_FOR_LOCATION_DIALOG_DEFAULT);\n        if (freshLocation == null) {\n            \/\/ TODO Migrate this to DialogFragment at some point\n            if (showWaitForLocationDialog) {\n                activity.showDialog(R.id.ign_loc_dialog_wait_for_fix);\n                waitForFixDialogShown = true;\n            }\n            return;\n        }\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, lng\/acc): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude() + \"\/\" + currentLocation.getAccuracy());\n        \/\/ TODO Migrate this to DialogFragment at some point\n        if (waitForFixDialogShown) {\n            activity.removeDialog(R.id.ign_loc_dialog_wait_for_fix);\n            waitForFixDialogShown = false;\n        }\n        boolean keepRequestingLocationUpdates = ((OnIgnitedLocationChangedListener) context)\n                .onIgnitedLocationChanged(currentLocation);\n        Bundle extras = freshLocation.getExtras();\n        \/\/ a) If location updates shouldn't be requested anymore turn them off.\n        \/\/ b) Don't turn location updates on if last location is too old, since the single location\n        \/\/ update is running.\n        if (!keepRequestingLocationUpdates) {\n            disableLocationUpdates(true);\n            \/\/ PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            return;\n        } else if (requestLocationUpdates\n                && (extras == null || !extras.containsKey(ILastLocationFinder.LAST_LOCATION_TOO_OLD_OR_INACCURATE_EXTRA))) {\n            \/\/ If we requested location updates, turn them on here.\n            requestLocationUpdates(context, null);\n        }\n\n        \/\/ If gps is enabled location comes from gps, remove runnable that removes gps updates\n        boolean lastLocation = extras != null && extras.containsKey(IgnitedLocationConstants.IGNITED_LAST_LOCATION_EXTRA);\n        if (!lastLocation && defaultCriteria.getAccuracy() == Criteria.ACCURACY_FINE\n                && currentLocation.getProvider().equals(LocationManager.GPS_PROVIDER)) {\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n    }\n\n    \/**\n     * Start listening for location updates.\n     *\/\n    protected void requestLocationUpdates(Context context, Criteria criteria) {\n        if (!locationUpdatesDisabled) {\n            return;\n        }\n        Criteria locationUpdateCriteria = criteria;\n        if (criteria == null) {\n            if (isBatteryOk()) {\n                locationUpdateCriteria = defaultCriteria;\n            } else {\n                locationUpdateCriteria = lowPowerCriteria();\n            }\n        }\n        Log.d(LOG_TAG, \"Disabling passive location updates\");\n        locationManager.removeUpdates(locationListenerPassivePendingIntent);\n\n        Log.d(LOG_TAG, \"Requesting location updates\");\n        \/\/ Normal updates while activity is visible.\n        locationUpdateRequester.requestLocationUpdates(locationUpdatesInterval,\n                locationUpdatesDistanceDiff, locationUpdateCriteria, locationListenerPendingIntent);\n\n        \/\/ Register a receiver that listens for when the provider I'm using has\n        \/\/ been disabled.\n        IntentFilter locationProviderDisabledIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_PROVIDER_DISABLED_ACTION);\n        context.registerReceiver(locationProviderDisabledReceiver,\n                locationProviderDisabledIntentFilter);\n\n        IntentFilter refreshLocationUpdatesIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.UPDATE_LOCATION_UPDATES_CRITERIA_ACTION);\n        context.registerReceiver(refreshLocationUpdatesReceiver, refreshLocationUpdatesIntentFilter);\n\n        \/\/ Register a receiver that listens for when a better provider than I'm\n        \/\/ using becomes available.\n        String bestProvider = locationManager.getBestProvider(locationUpdateCriteria, false);\n        String bestAvailableProvider = locationManager.getBestProvider(locationUpdateCriteria, true);\n        if (bestProvider != null && !bestProvider.equals(bestAvailableProvider)) {\n            bestInactiveLocationProviderListener = new IgnitedLocationListener(context);\n            locationManager.requestLocationUpdates(bestProvider, 0, 0,\n                    bestInactiveLocationProviderListener, context.getMainLooper());\n        }\n\n        if (bestAvailableProvider.equals(LocationManager.GPS_PROVIDER)) {\n            Log.d(LOG_TAG, \"Posting delayed remove GPS updates message\");\n            \/\/ Post a runnable that will remove gps updates if no gps location is returned after 1\n            \/\/ minute in order to avoid draining the battery.\n            handler.postDelayed(removeGpsUpdates, prefs.getLong(\n                    IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                    IgnitedLocationConstants.WAIT_FOR_GPS_FIX_INTERVAL_DEFAULT));\n        }\n\n        locationUpdatesDisabled = false;\n    }\n\n    \/**\n     * Stop listening for location updates\n     * \n     * @param enablePassiveLocationUpdates\n     *\/\n    protected void disableLocationUpdates(boolean requestPassiveLocationUpdates) {\n        if (locationUpdatesDisabled) {\n            return;\n        }\n\n        Log.d(LOG_TAG, \"Disabling location updates\");\n        context.unregisterReceiver(locationProviderDisabledReceiver);\n        context.unregisterReceiver(refreshLocationUpdatesReceiver);\n\n        locationUpdateRequester.removeLocationUpdates();\n        if (bestInactiveLocationProviderListener != null) {\n            locationManager.removeUpdates(bestInactiveLocationProviderListener);\n        }\n\n        boolean finishing = ((Activity) context).isFinishing();\n\n        if (requestPassiveLocationUpdates && !finishing) {\n            requestPassiveLocationUpdates();\n        }\n\n        locationUpdatesDisabled = true;\n    }\n\n    private void requestPassiveLocationUpdates() {\n        if (IgnitedDiagnostics.SUPPORTS_FROYO\n                && prefs.getBoolean(\n                        IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                        IgnitedLocationConstants.ENABLE_PASSIVE_LOCATION_UPDATES_DEFAULT)) {\n            Log.d(LOG_TAG, \"Requesting passive location updates\");\n            \/\/ Passive location updates from 3rd party apps when the Activity isn't\n            \/\/ visible. Only for Android 2.2+.\n            locationUpdateRequester.requestPassiveLocationUpdates(passiveLocationUpdatesInterval,\n                    passiveLocationUpdatesDistanceDiff, locationListenerPassivePendingIntent);\n        }\n    }\n\n    public boolean isLocationUpdatesDisabled() {\n        return locationUpdatesDisabled;\n    }\n\n    public Criteria lowPowerCriteria() {\n        if (lowPowerCriteria == null) {\n            lowPowerCriteria = new Criteria();\n            lowPowerCriteria.setPowerRequirement(Criteria.POWER_LOW);\n            lowPowerCriteria.setAccuracy(Criteria.NO_REQUIREMENT);\n        }\n        return lowPowerCriteria;\n    }\n\n    \/**\n     * If the best Location Provider (usually GPS) is not available when we request location\n     * updates, this listener will be notified if \/ when it becomes available. It calls\n     * requestLocationUpdates to re-register the location listeners using the better Location\n     * Provider.\n     *\/\n    private class IgnitedLocationListener implements LocationListener {\n        private Context context;\n\n        public IgnitedLocationListener(Context appContext) {\n            this.context = appContext;\n        }\n\n        @Override\n        public void onLocationChanged(Location l) {\n        }\n\n        @Override\n        public void onProviderDisabled(String provider) {\n        }\n\n        @Override\n        public void onStatusChanged(String provider, int status, Bundle extras) {\n        }\n\n        @Override\n        public void onProviderEnabled(String provider) {\n            \/\/ Re-register the location listeners using the better Location\n            \/\/ Provider.\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, null);\n        }\n    }\n\n}\n","old_contents":"\/*\n * Copyright 2011 Google Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * This code has been modified by Stefano Dacchille.\n *\/\n\npackage com.github.ignition.location;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\n\nimport android.app.Activity;\nimport android.app.PendingIntent;\nimport android.content.BroadcastReceiver;\nimport android.content.Context;\nimport android.content.Intent;\nimport android.content.IntentFilter;\nimport android.content.SharedPreferences;\nimport android.content.SharedPreferences.Editor;\nimport android.location.Criteria;\nimport android.location.Location;\nimport android.location.LocationListener;\nimport android.location.LocationManager;\nimport android.os.BatteryManager;\nimport android.os.Bundle;\nimport android.os.Handler;\nimport android.util.Log;\n\nimport com.github.ignition.location.annotations.IgnitedLocation;\nimport com.github.ignition.location.annotations.IgnitedLocationActivity;\nimport com.github.ignition.location.receivers.IgnitedLocationChangedReceiver;\nimport com.github.ignition.location.receivers.IgnitedPassiveLocationChangedReceiver;\nimport com.github.ignition.location.tasks.IgnitedLastKnownLocationAsyncTask;\nimport com.github.ignition.location.templates.ILastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLocationUpdateRequester;\nimport com.github.ignition.location.templates.OnIgnitedLocationChangedListener;\nimport com.github.ignition.location.utils.PlatformSpecificImplementationFactory;\nimport com.github.ignition.support.IgnitedDiagnostics;\n\n@SuppressAjWarnings\npublic aspect IgnitedLocationManager {\n    public static final String LOG_TAG = IgnitedLocationManager.class.getSimpleName();\n\n    declare parents : (@IgnitedLocationActivity *) implements OnIgnitedLocationChangedListener;\n\n    private Criteria defaultCriteria, lowPowerCriteria;\n    protected IgnitedAbstractLocationUpdateRequester locationUpdateRequester;\n    protected PendingIntent locationListenerPendingIntent, locationListenerPassivePendingIntent;\n    protected LocationManager locationManager;\n    protected IgnitedLocationListener bestInactiveLocationProviderListener;\n\n    private Context context;\n    private volatile Location currentLocation;\n\n    private IgnitedLastKnownLocationAsyncTask ignitedLastKnownLocationTask;\n    private SharedPreferences prefs;\n    private Handler handler;\n\n    private long locationUpdatesInterval, passiveLocationUpdatesInterval;\n    private int locationUpdatesDistanceDiff;\n    private int passiveLocationUpdatesDistanceDiff;\n    private boolean requestLocationUpdates;\n    private boolean locationUpdatesDisabled = true;\n    private boolean waitForFixDialogShown = false;\n\n    \/\/ Switch to another provider if gps doesn't return a location quickly enough.\n    private Runnable removeGpsUpdates = new Runnable() {\n        @Override\n        public void run() {\n            Log.d(LOG_TAG,\n                    \"It looks like GPS isn't available at this time (i.e.: maybe you're indoors). Removing GPS location updates and requesting network updates.\");\n\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, lowPowerCriteria());\n        }\n    };\n\n    \/**\n     * If the Location Provider we're using to receive location updates is disabled while the app is\n     * running, this Receiver will be notified, allowing us to re-register our Location Receivers\n     * using the best available Location Provider is still available.\n     *\/\n    protected BroadcastReceiver locationProviderDisabledReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            boolean providerDisabled = !intent.getBooleanExtra(\n                    LocationManager.KEY_PROVIDER_ENABLED, false);\n            \/\/ Re-register the location listeners using the best available\n            \/\/ Location Provider.\n            if (providerDisabled) {\n                disableLocationUpdates(false);\n                requestLocationUpdates(context, null);\n            }\n        }\n    };\n\n    \/**\n     * If the battery state is low disable the passive location update receiver.\n     *\/\n    protected BroadcastReceiver refreshLocationUpdatesReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, null);\n        }\n    };\n\n    after(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onCreate(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n\n        \/\/ Get a reference to the Context\n        this.context = context;\n        \/\/ Set pref file\n        prefs = context.getSharedPreferences(IgnitedLocationConstants.SHARED_PREFERENCE_FILE,\n                Context.MODE_PRIVATE);\n        \/\/ Get references to the managers\n        locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);\n        handler = new Handler();\n\n        \/\/ Specify the Criteria to use when requesting location updates while\n        \/\/ the application is Active\n        if (defaultCriteria == null) {\n            defaultCriteria = new Criteria();\n        }\n        \/\/ Use gps if it's enabled and if battery level is at least 15%\n        boolean useGps = prefs.getBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS,\n                IgnitedLocationConstants.USE_GPS_DEFAULT);\n        if (useGps) {\n            defaultCriteria.setAccuracy(Criteria.ACCURACY_FINE);\n        } else {\n            defaultCriteria.setPowerRequirement(Criteria.POWER_LOW);\n        }\n\n        \/\/ Setup the location update Pending Intent\n        Intent activeIntent = new Intent(IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_ACTION);\n        locationListenerPendingIntent = PendingIntent.getBroadcast(context, 0, activeIntent,\n                PendingIntent.FLAG_UPDATE_CURRENT);\n        \/\/ Setup the passive location update Pending Intent\n        Intent passiveIntent = new Intent(context, IgnitedPassiveLocationChangedReceiver.class);\n        locationListenerPassivePendingIntent = PendingIntent.getBroadcast(context, 0,\n                passiveIntent, PendingIntent.FLAG_UPDATE_CURRENT);\n\n        \/\/ Instantiate a Location Update Requester class based on the available\n        \/\/ platform version. This will be used to request location updates.\n        locationUpdateRequester = PlatformSpecificImplementationFactory\n                .getLocationUpdateRequester(context);\n    }\n\n    private boolean isBatteryOk() {\n        IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);\n        Intent intent = context.registerReceiver(null, filter);\n        double currentLevel = 100.0;\n        if (intent != null) {\n            currentLevel = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1);\n        }\n\n        return currentLevel >= prefs.getInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                IgnitedLocationConstants.MIN_BATTERY_LEVEL_FOR_GPS_DEFAULT);\n    }\n\n    before(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onResume(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n        \/\/ Get a reference to the Context if this context is null\n        if (this.context == null) {\n            this.context = context;\n        }\n\n        saveToPreferences(context, ignitedAnnotation);\n\n        Log.d(LOG_TAG, \"Retrieving last known location...\");\n        \/\/ Get the last known location. This isn't directly affecting the UI, so put it on a\n        \/\/ worker thread.\n        ignitedLastKnownLocationTask = new IgnitedLastKnownLocationAsyncTask(context,\n                locationUpdatesDistanceDiff, locationUpdatesInterval);\n        ignitedLastKnownLocationTask.execute();\n    }\n\n    \/**\n     * Save last settings to preferences.\n     * \n     * @param context\n     * @param locationAnnotation\n     *\/\n    private void saveToPreferences(Context context, IgnitedLocationActivity locationAnnotation) {\n        requestLocationUpdates = locationAnnotation.requestLocationUpdates();\n        locationUpdatesDistanceDiff = locationAnnotation.locationUpdatesDistanceDiff();\n        locationUpdatesInterval = locationAnnotation.locationUpdatesInterval();\n        passiveLocationUpdatesDistanceDiff = locationAnnotation\n                .passiveLocationUpdatesDistanceDiff();\n        passiveLocationUpdatesInterval = locationAnnotation.passiveLocationUpdatesInterval();\n        boolean enablePassiveLocationUpdates = locationAnnotation.enablePassiveUpdates();\n        boolean useGps = locationAnnotation.useGps();\n\n        Editor editor = prefs.edit();\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_LOCATION_UPDATES,\n                requestLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                enablePassiveLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS, useGps);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_DISTANCE_DIFF,\n                locationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_INTERVAL,\n                locationUpdatesInterval);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_DISTANCE_DIFF,\n                passiveLocationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_INTERVAL,\n                passiveLocationUpdatesInterval);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_RUN_ONCE, true);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                locationAnnotation.minBatteryLevelForGps());\n        editor.putLong(IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                locationAnnotation.waitForGpsFixInterval());\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                locationAnnotation.showWaitForLocationDialog());\n        editor.commit();\n\n    }\n\n    before(Activity activity, IgnitedLocationActivity ignitedAnnotation) : execution(* Activity.onPause(..)) \n        && @this(ignitedAnnotation) && this(activity) && within(@IgnitedLocationActivity *) {\n\n        if (ignitedAnnotation.requestLocationUpdates()) {\n            disableLocationUpdates(true);\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n\n        if (ignitedLastKnownLocationTask != null) {\n            ignitedLastKnownLocationTask.cancel(true);\n        }\n\n        boolean finishing = activity.isFinishing();\n        if (finishing) {\n            context = null;\n        }\n    }\n\n    Location around() : get(@IgnitedLocation Location *) {\n        return currentLocation;\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && within(IgnitedPassiveLocationChangedReceiver) && !adviceexecution() {\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, lng\/acc): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude() + \"\/\"\n                + currentLocation.getAccuracy());\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && (within(IgnitedLocationChangedReceiver) || within(IgnitedAbstractLastLocationFinder)\n                || within(IgnitedLastKnownLocationAsyncTask)) && !adviceexecution() {\n\n        if (context == null) {\n            return;\n        }\n        final Activity activity = (Activity) context;\n        boolean showWaitForLocationDialog = prefs.getBoolean(\n                IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                IgnitedLocationConstants.SHOW_WAIT_FOR_LOCATION_DIALOG_DEFAULT);\n        if (freshLocation == null) {\n            \/\/ TODO Migrate this to DialogFragment at some point\n            if (showWaitForLocationDialog) {\n                activity.showDialog(R.id.ign_loc_dialog_wait_for_fix);\n                waitForFixDialogShown = true;\n            }\n            return;\n        }\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, lng\/acc): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude() + \"\/\" + currentLocation.getAccuracy());\n        \/\/ TODO Migrate this to DialogFragment at some point\n        if (waitForFixDialogShown) {\n            activity.removeDialog(R.id.ign_loc_dialog_wait_for_fix);\n            waitForFixDialogShown = false;\n        }\n        boolean keepRequestingLocationUpdates = ((OnIgnitedLocationChangedListener) context)\n                .onIgnitedLocationChanged(currentLocation);\n        Bundle extras = freshLocation.getExtras();\n        \/\/ a) If location updates shouldn't be requested anymore turn them off.\n        \/\/ b) Don't turn location updates on if last location is too old, since the single location\n        \/\/ update is running.\n        if (!keepRequestingLocationUpdates) {\n            disableLocationUpdates(true);\n            \/\/ PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            return;\n        } else if (requestLocationUpdates\n                && (extras == null || !extras.containsKey(ILastLocationFinder.LAST_LOCATION_TOO_OLD_OR_INACCURATE_EXTRA))) {\n            \/\/ If we requested location updates, turn them on here.\n            requestLocationUpdates(context, null);\n        }\n\n        \/\/ If gps is enabled location comes from gps, remove runnable that removes gps updates\n        boolean lastLocation = extras != null && extras.containsKey(IgnitedLocationConstants.IGNITED_LAST_LOCATION_EXTRA);\n        if (!lastLocation && defaultCriteria.getAccuracy() == Criteria.ACCURACY_FINE\n                && currentLocation.getProvider().equals(LocationManager.GPS_PROVIDER)) {\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n    }\n\n    \/**\n     * Start listening for location updates.\n     *\/\n    protected void requestLocationUpdates(Context context, Criteria criteria) {\n        if (!locationUpdatesDisabled) {\n            return;\n        }\n        Criteria locationUpdateCriteria = criteria;\n        if (criteria == null) {\n            if (isBatteryOk()) {\n                locationUpdateCriteria = defaultCriteria;\n            } else {\n                locationUpdateCriteria = lowPowerCriteria();\n            }\n        }\n        Log.d(LOG_TAG, \"Disabling passive location updates\");\n        locationManager.removeUpdates(locationListenerPassivePendingIntent);\n\n        Log.d(LOG_TAG, \"Requesting location updates\");\n        \/\/ Normal updates while activity is visible.\n        locationUpdateRequester.requestLocationUpdates(locationUpdatesInterval,\n                locationUpdatesDistanceDiff, locationUpdateCriteria, locationListenerPendingIntent);\n\n        \/\/ Register a receiver that listens for when the provider I'm using has\n        \/\/ been disabled.\n        IntentFilter locationProviderDisabledIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_PROVIDER_DISABLED_ACTION);\n        context.registerReceiver(locationProviderDisabledReceiver,\n                locationProviderDisabledIntentFilter);\n\n        IntentFilter refreshLocationUpdatesIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.UPDATE_LOCATION_UPDATES_CRITERIA_ACTION);\n        context.registerReceiver(refreshLocationUpdatesReceiver, refreshLocationUpdatesIntentFilter);\n\n        \/\/ Register a receiver that listens for when a better provider than I'm\n        \/\/ using becomes available.\n        String bestProvider = locationManager.getBestProvider(locationUpdateCriteria, false);\n        String bestAvailableProvider = locationManager.getBestProvider(locationUpdateCriteria, true);\n        if (bestProvider != null && !bestProvider.equals(bestAvailableProvider)) {\n            bestInactiveLocationProviderListener = new IgnitedLocationListener(context);\n            locationManager.requestLocationUpdates(bestProvider, 0, 0,\n                    bestInactiveLocationProviderListener, context.getMainLooper());\n        }\n\n        if (bestAvailableProvider.equals(LocationManager.GPS_PROVIDER)) {\n            Log.d(LOG_TAG, \"Posting delayed remove GPS updates message\");\n            \/\/ Post a runnable that will remove gps updates if no gps location is returned after 1\n            \/\/ minute in order to avoid draining the battery.\n            handler.postDelayed(removeGpsUpdates, prefs.getLong(\n                    IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                    IgnitedLocationConstants.WAIT_FOR_GPS_FIX_INTERVAL_DEFAULT));\n        }\n\n        locationUpdatesDisabled = false;\n    }\n\n    \/**\n     * Stop listening for location updates\n     * \n     * @param enablePassiveLocationUpdates\n     *\/\n    protected void disableLocationUpdates(boolean requestPassiveLocationUpdates) {\n        if (locationUpdatesDisabled) {\n            return;\n        }\n\n        Log.d(LOG_TAG, \"Disabling location updates\");\n        context.unregisterReceiver(locationProviderDisabledReceiver);\n        context.unregisterReceiver(refreshLocationUpdatesReceiver);\n\n        locationUpdateRequester.removeLocationUpdates();\n        if (bestInactiveLocationProviderListener != null) {\n            locationManager.removeUpdates(bestInactiveLocationProviderListener);\n        }\n\n        boolean finishing = ((Activity) context).isFinishing();\n\n        if (requestPassiveLocationUpdates && !finishing) {\n            requestPassiveLocationUpdates();\n        }\n\n        locationUpdatesDisabled = true;\n    }\n\n    private void requestPassiveLocationUpdates() {\n        if (IgnitedDiagnostics.SUPPORTS_FROYO\n                && prefs.getBoolean(\n                        IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                        IgnitedLocationConstants.ENABLE_PASSIVE_LOCATION_UPDATES_DEFAULT)) {\n            Log.d(LOG_TAG, \"Requesting passive location updates\");\n            \/\/ Passive location updates from 3rd party apps when the Activity isn't\n            \/\/ visible. Only for Android 2.2+.\n            locationUpdateRequester.requestPassiveLocationUpdates(passiveLocationUpdatesInterval,\n                    passiveLocationUpdatesDistanceDiff, locationListenerPassivePendingIntent);\n        }\n    }\n\n    public boolean isLocationUpdatesDisabled() {\n        return locationUpdatesDisabled;\n    }\n\n    public Criteria lowPowerCriteria() {\n        if (lowPowerCriteria == null) {\n            lowPowerCriteria = new Criteria();\n            lowPowerCriteria.setPowerRequirement(Criteria.POWER_LOW);\n            lowPowerCriteria.setAccuracy(Criteria.NO_REQUIREMENT);\n        }\n        return lowPowerCriteria;\n    }\n\n    \/**\n     * If the best Location Provider (usually GPS) is not available when we request location\n     * updates, this listener will be notified if \/ when it becomes available. It calls\n     * requestLocationUpdates to re-register the location listeners using the better Location\n     * Provider.\n     *\/\n    private class IgnitedLocationListener implements LocationListener {\n        private Context context;\n\n        public IgnitedLocationListener(Context appContext) {\n            this.context = appContext;\n        }\n\n        @Override\n        public void onLocationChanged(Location l) {\n        }\n\n        @Override\n        public void onProviderDisabled(String provider) {\n        }\n\n        @Override\n        public void onStatusChanged(String provider, int status, Bundle extras) {\n        }\n\n        @Override\n        public void onProviderEnabled(String provider) {\n            \/\/ Re-register the location listeners using the better Location\n            \/\/ Provider.\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, null);\n        }\n    }\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"83113286e9e013d31099639366d350dd89197c0f","subject":"add imports for Linked versions","message":"add imports for Linked versions\n","repos":"mebigfatguy\/hashshmash","old_file":"aj\/com\/mebigfatguy\/hashshmash\/HashCollector.aj","new_file":"aj\/com\/mebigfatguy\/hashshmash\/HashCollector.aj","new_contents":"\/*\n * hashshmash - An aspect to record HashMap\/Set allocations\n * Copyright 2013 MeBigFatGuy.com\n * Copyright 2013 Dave Brosius\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *    http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing,\n * software distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and limitations\n * under the License.\n *\/\npackage com.mebigfatguy.hashshmash;\n\nimport java.io.BufferedWriter;\nimport java.io.File;\nimport java.io.FileOutputStream;\nimport java.io.OutputStreamWriter;\nimport java.io.PrintWriter;\nimport java.lang.reflect.Field;\nimport java.text.SimpleDateFormat;\nimport java.util.Date;\nimport java.util.HashMap;\nimport java.util.HashSet;\nimport java.util.LinkedHashMap;\nimport java.util.LinkedHashSet;\nimport java.util.Map;\nimport java.util.Map.Entry;\nimport java.util.Set;\nimport java.util.concurrent.ConcurrentHashMap;\n\npublic aspect HashCollector {\n    \n    private static final Journaller journaller = new Journaller();\n\n    after() returning (Map<?,?> m): call(HashMap.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashMapDetails details = new HashMapDetails(m, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    after() returning (Map<?,?> m): call(LinkedHashMap.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashMapDetails details = new LinkedHashMapDetails(m, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    after() returning (Set<?> s): call(HashSet.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashSetDetails details = new HashSetDetails(s, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    after() returning (Set<?> s): call(LinkedHashSet.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashSetDetails details = new LinkedHashSetDetails(s, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    before(): execution(public static void *.main(String[])) {\n        Class<?> c = HashCollector.class;\n    }\n}\n\nfinal class Journaller implements Runnable {\n    \n    private static final int SLEEP_TIME = 5 * 1000;\n    \n    private Field tableField;\n    private ConcurrentHashMap<HashDetails, HashDetails> hDetails = new ConcurrentHashMap<HashDetails, HashDetails>();\n    private PrintWriter writer;\n    private boolean operational = false;\n\n    public Journaller() {\n        try {\n            System.out.println(\"*************************\");\n            System.out.println(\"HASHSHMASH ASPECT ENABLED\");\n            System.out.println(\"*************************\");\n            \n            tableField = HashMap.class.getDeclaredField(\"table\");\n            tableField.setAccessible(true);\n              \n            File dir = new File(System.getProperty(\"user.home\"), \".hashshmash\");\n            dir.mkdirs();  \n            \n            writer = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(new File(dir, new Date().toString() + \".txt\")))));\n            \n            Thread t = new Thread(this);\n            t.setDaemon(true);\n            operational = true;\n            t.start();\n        } catch (Exception e) {\n        }\n    }\n    \n    public void add(HashDetails details) {\n        if (operational)\n            hDetails.put(details,  details);\n    }\n    \n    public void run() {\n        try {\n            while (!Thread.interrupted()) {\n                Thread.sleep(SLEEP_TIME);\n                \n                for (HashDetails details : hDetails.keySet()) {\n                    try {\n                        Map<?, ?> map = details.getMap();\n                        if (map != null) {\n                            int newSize = details.getMap().size();\n                            if (newSize == details.size) {\n                                Entry<?, ?>[] table = (Entry<?, ?>[])tableField.get(map);\n                                details.totalSlots = table.length;\n                                for (Entry<?, ?> e : table) {\n                                    if (e != null) {\n                                        details.usedSlots++;\n                                    }\n                                }\n                                writer.println(details);\n                                hDetails.remove(details);\n                            } else\n                                details.size = newSize;\n                        } else {\n                            hDetails.remove(details);\n                        }\n                    } catch (Exception e) {\n                        \/\/might get ConcurrentModificationException or such, just ignore\n                    }\n                }\n                writer.flush();\n            }\n        } catch (InterruptedException ie) {    \n        }\n    }\n}\n\nabstract class HashDetails {\n    private static SimpleDateFormat FORMATTER = new SimpleDateFormat(\"MM\/dd\/yyyy HH:mm:ss-SSS\");\n    \n    public Date allocTime;\n    public String caller;\n    public int size;\n    public int usedSlots;\n    public int totalSlots;\n    \n    public abstract Map<?,?> getMap();\n    \n    public abstract String getDetailType();\n    \n    public String toString() {\n        return getDetailType() + \"\\t\" + FORMATTER.format(allocTime) + \"\\t\" + caller + \"\\t\" + getMap().size() + \"\\t\" + totalSlots + \"\\t\" + usedSlots;\n    }\n}\n\nclass HashMapDetails extends HashDetails {\n    public Map<?, ?> map;\n\n    public HashMapDetails(Map<?, ?> m, Date d, String c) {\n        map = m;\n        allocTime = d;\n        caller = c;\n        size = map.size();\n    }\n    \n    public Map<?,?> getMap() {\n        return map;\n    }\n    \n    public String getDetailType() {\n        return map.getClass().getSimpleName();\n    }\n}\n\nclass LinkedHashMapDetails extends HashMapDetails {\n    public Map<?, ?> map;\n\n    public LinkedHashMapDetails(Map<?, ?> m, Date d, String c) {\n       super(m, d, c);\n    }\n    \n    public String getDetailType() {\n        return map.getClass().getSimpleName();\n    }\n}\n\nclass HashSetDetails extends HashDetails {\n    private static Field MAP_FIELD;\n    static {\n        try {\n            MAP_FIELD = HashSet.class.getDeclaredField(\"map\");\n            MAP_FIELD.setAccessible(true);\n        } catch (Exception e) {\n            MAP_FIELD = null;\n        }\n    }\n    \n    public Set<?> set;\n\n    public HashSetDetails(Set<?> s, Date d, String c) {\n        set = s;\n        allocTime = d;\n        caller = c;\n        size = set.size();\n    }\n    \n    public Map<?,?> getMap() {\n        try {\n            if (MAP_FIELD == null)\n                return null;\n            \n            return (Map<?,?>) MAP_FIELD.get(set);\n        } catch (Exception e) {\n            return null;\n        }\n    }\n    \n    public String getDetailType() {\n        return set.getClass().getSimpleName();\n    }\n}\n\nclass LinkedHashSetDetails extends HashSetDetails {\n    public Map<?, ?> map;\n\n    public LinkedHashSetDetails(Set<?> s, Date d, String c) {\n       super(s, d, c);\n    }\n    \n    public String getDetailType() {\n        return map.getClass().getSimpleName();\n    }\n}\n","old_contents":"\/*\n * hashshmash - An aspect to record HashMap\/Set allocations\n * Copyright 2013 MeBigFatGuy.com\n * Copyright 2013 Dave Brosius\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *    http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing,\n * software distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and limitations\n * under the License.\n *\/\npackage com.mebigfatguy.hashshmash;\n\nimport java.io.BufferedWriter;\nimport java.io.File;\nimport java.io.FileOutputStream;\nimport java.io.OutputStreamWriter;\nimport java.io.PrintWriter;\nimport java.lang.reflect.Field;\nimport java.text.SimpleDateFormat;\nimport java.util.Date;\nimport java.util.HashMap;\nimport java.util.HashSet;\nimport java.util.Map;\nimport java.util.Map.Entry;\nimport java.util.Set;\nimport java.util.concurrent.ConcurrentHashMap;\n\npublic aspect HashCollector {\n    \n    private static final Journaller journaller = new Journaller();\n\n    after() returning (Map<?,?> m): call(HashMap.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashMapDetails details = new HashMapDetails(m, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    after() returning (Map<?,?> m): call(LinkedHashMap.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashMapDetails details = new LinkedHashMapDetails(m, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    after() returning (Set<?> s): call(HashSet.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashSetDetails details = new HashSetDetails(s, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    after() returning (Set<?> s): call(LinkedHashSet.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashSetDetails details = new LinkedHashSetDetails(s, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    before(): execution(public static void *.main(String[])) {\n        Class<?> c = HashCollector.class;\n    }\n}\n\nfinal class Journaller implements Runnable {\n    \n    private static final int SLEEP_TIME = 5 * 1000;\n    \n    private Field tableField;\n    private ConcurrentHashMap<HashDetails, HashDetails> hDetails = new ConcurrentHashMap<HashDetails, HashDetails>();\n    private PrintWriter writer;\n    private boolean operational = false;\n\n    public Journaller() {\n        try {\n            System.out.println(\"*************************\");\n            System.out.println(\"HASHSHMASH ASPECT ENABLED\");\n            System.out.println(\"*************************\");\n            \n            tableField = HashMap.class.getDeclaredField(\"table\");\n            tableField.setAccessible(true);\n              \n            File dir = new File(System.getProperty(\"user.home\"), \".hashshmash\");\n            dir.mkdirs();  \n            \n            writer = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(new File(dir, new Date().toString() + \".txt\")))));\n            \n            Thread t = new Thread(this);\n            t.setDaemon(true);\n            operational = true;\n            t.start();\n        } catch (Exception e) {\n        }\n    }\n    \n    public void add(HashDetails details) {\n        if (operational)\n            hDetails.put(details,  details);\n    }\n    \n    public void run() {\n        try {\n            while (!Thread.interrupted()) {\n                Thread.sleep(SLEEP_TIME);\n                \n                for (HashDetails details : hDetails.keySet()) {\n                    try {\n                        Map<?, ?> map = details.getMap();\n                        if (map != null) {\n                            int newSize = details.getMap().size();\n                            if (newSize == details.size) {\n                                Entry<?, ?>[] table = (Entry<?, ?>[])tableField.get(map);\n                                details.totalSlots = table.length;\n                                for (Entry<?, ?> e : table) {\n                                    if (e != null) {\n                                        details.usedSlots++;\n                                    }\n                                }\n                                writer.println(details);\n                                hDetails.remove(details);\n                            } else\n                                details.size = newSize;\n                        } else {\n                            hDetails.remove(details);\n                        }\n                    } catch (Exception e) {\n                        \/\/might get ConcurrentModificationException or such, just ignore\n                    }\n                }\n                writer.flush();\n            }\n        } catch (InterruptedException ie) {    \n        }\n    }\n}\n\nabstract class HashDetails {\n    private static SimpleDateFormat FORMATTER = new SimpleDateFormat(\"MM\/dd\/yyyy HH:mm:ss-SSS\");\n    \n    public Date allocTime;\n    public String caller;\n    public int size;\n    public int usedSlots;\n    public int totalSlots;\n    \n    public abstract Map<?,?> getMap();\n    \n    public abstract String getDetailType();\n    \n    public String toString() {\n        return getDetailType() + \"\\t\" + FORMATTER.format(allocTime) + \"\\t\" + caller + \"\\t\" + getMap().size() + \"\\t\" + totalSlots + \"\\t\" + usedSlots;\n    }\n}\n\nclass HashMapDetails extends HashDetails {\n    public Map<?, ?> map;\n\n    public HashMapDetails(Map<?, ?> m, Date d, String c) {\n        map = m;\n        allocTime = d;\n        caller = c;\n        size = map.size();\n    }\n    \n    public Map<?,?> getMap() {\n        return map;\n    }\n    \n    public String getDetailType() {\n        return map.getClass().getSimpleName();\n    }\n}\n\nclass LinkedHashMapDetails extends HashMapDetails {\n    public Map<?, ?> map;\n\n    public LinkedHashMapDetails(Map<?, ?> m, Date d, String c) {\n       super(m, d, c);\n    }\n    \n    public String getDetailType() {\n        return map.getClass().getSimpleName();\n    }\n}\n\nclass HashSetDetails extends HashDetails {\n    private static Field MAP_FIELD;\n    static {\n        try {\n            MAP_FIELD = HashSet.class.getDeclaredField(\"map\");\n            MAP_FIELD.setAccessible(true);\n        } catch (Exception e) {\n            MAP_FIELD = null;\n        }\n    }\n    \n    public Set<?> set;\n\n    public HashSetDetails(Set<?> s, Date d, String c) {\n        set = s;\n        allocTime = d;\n        caller = c;\n        size = set.size();\n    }\n    \n    public Map<?,?> getMap() {\n        try {\n            if (MAP_FIELD == null)\n                return null;\n            \n            return (Map<?,?>) MAP_FIELD.get(set);\n        } catch (Exception e) {\n            return null;\n        }\n    }\n    \n    public String getDetailType() {\n        return set.getClass().getSimpleName();\n    }\n}\n\nclass LinkedHashSetDetails extends HashSetDetails {\n    public Map<?, ?> map;\n\n    public LinkedHashSetDetails(Set<?> s, Date d, String c) {\n       super(s, d, c);\n    }\n    \n    public String getDetailType() {\n        return map.getClass().getSimpleName();\n    }\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"44c41960d9e6ec24a9b0bc3db0faef34662db388","subject":"System.exit(0) added in case of strong failure","message":"System.exit(0) added in case of strong failure\n","repos":"selig\/qea","old_file":"code\/qea\/src\/benchmark\/competition\/java\/javaMOP\/monitoring\/JavaMOPTwoAspect.aj","new_file":"code\/qea\/src\/benchmark\/competition\/java\/javaMOP\/monitoring\/JavaMOPTwoAspect.aj","new_contents":"package benchmark.competition.java.javaMOP.monitoring;\n\nimport java.util.concurrent.locks.Lock;\n\nimport monitoring.impl.MonitorFactory;\nimport monitoring.intf.Monitor;\nimport properties.Property;\nimport properties.competition.JavaMOP;\nimport structure.impl.other.Verdict;\nimport structure.intf.QEA;\nimport benchmark.competition.java.javaMOP.LockTest;\n\npublic aspect JavaMOPTwoAspect {\n\n\tprivate final Monitor monitor;\n\n\tprivate final int LOCK = 1;\n\tprivate final int UNLOCK = 2;\n\n\tpublic JavaMOPTwoAspect() {\n\t\tQEA qea = new JavaMOP().make(Property.JAVAMOP_TWO);\n\t\tmonitor = MonitorFactory.create(qea);\n\t}\n\n\tpointcut lockPC(Thread thread, Lock lockObj) : call(void Lock.lock())\n\t\t&& target(lockObj) && this(thread);\n\n\tpointcut unlockPC(Thread thread, Lock lockObj) : call(void Lock.unlock())\n\t\t&& target(lockObj) && this(thread);\n\n\tbefore(Thread thread, Lock lockObj) : lockPC(thread, lockObj) {\n\t\tVerdict verdict = null;\n\t\tsynchronized (monitor) {\n\t\t\tverdict = monitor.step(LOCK, thread, lockObj);\n\t\t}\n\t\tif (verdict == Verdict.FAILURE) {\n\t\t\tSystem.err\n\t\t\t\t\t.println(\"Violation in JavaMOP 2. [thread=\"\n\t\t\t\t\t\t\t+ thread\n\t\t\t\t\t\t\t+ \", lock=\"\n\t\t\t\t\t\t\t+ lockObj\n\t\t\t\t\t\t\t+ \"]. A thread should release a lock as many times as it acquires the lock.\");\n\t\t\tSystem.exit(0);\n\t\t}\n\t}\n\n\tbefore(Thread thread, Lock lockObj) : unlockPC(thread, lockObj) {\n\t\tVerdict verdict = null;\n\t\tsynchronized (monitor) {\n\t\t\tverdict = monitor.step(UNLOCK, thread, lockObj);\n\t\t}\n\t\tif (verdict == Verdict.FAILURE) {\n\t\t\tSystem.err\n\t\t\t\t\t.println(\"Violation in JavaMOP 2. [thread=\"\n\t\t\t\t\t\t\t+ thread\n\t\t\t\t\t\t\t+ \", lock=\"\n\t\t\t\t\t\t\t+ lockObj\n\t\t\t\t\t\t\t+ \"]. A thread should release a lock as many times as it acquires the lock.\");\n\t\t\tSystem.exit(0);\n\t\t}\n\t}\n\n\tpointcut endOfProgram() : execution(void LockTest.main(String[]));\n\n\tafter() : endOfProgram() {\n\t\tVerdict verdict = monitor.end();\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\n\t\t\tSystem.err\n\t\t\t\t\t.println(\"Violation in JavaMOP 2. A thread should release a lock as many times as it acquires the lock.\");\n\t\t} else {\n\t\t\tSystem.err.println(\"Property JavaMOP 2 satisfied\");\n\t\t}\n\t}\n}\n","old_contents":"package benchmark.competition.java.javaMOP.monitoring;\n\nimport java.util.concurrent.locks.Lock;\n\nimport monitoring.impl.MonitorFactory;\nimport monitoring.intf.Monitor;\nimport properties.Property;\nimport properties.competition.JavaMOP;\nimport structure.impl.other.Verdict;\nimport structure.intf.QEA;\nimport benchmark.competition.java.javaMOP.LockTest;\n\npublic aspect JavaMOPTwoAspect {\n\n\tprivate final Monitor monitor;\n\n\tprivate final int LOCK = 1;\n\tprivate final int UNLOCK = 2;\n\n\tpublic JavaMOPTwoAspect() {\n\t\tQEA qea = new JavaMOP().make(Property.JAVAMOP_TWO);\n\t\tmonitor = MonitorFactory.create(qea);\n\t}\n\n\tpointcut lockPC(Thread thread, Lock lockObj) : call(void Lock.lock())\n\t\t&& target(lockObj) && this(thread);\n\n\tpointcut unlockPC(Thread thread, Lock lockObj) : call(void Lock.unlock())\n\t\t&& target(lockObj) && this(thread);\n\n\tbefore(Thread thread, Lock lockObj) : lockPC(thread, lockObj) {\n\t\tVerdict verdict = null;\n\t\tsynchronized (monitor) {\n\t\t\tverdict = monitor.step(LOCK, thread, lockObj);\n\t\t}\n\t\tif (verdict == Verdict.FAILURE) {\n\t\t\tSystem.err\n\t\t\t\t\t.println(\"Violation in JavaMOP 2. [thread=\"\n\t\t\t\t\t\t\t+ thread\n\t\t\t\t\t\t\t+ \", lock=\"\n\t\t\t\t\t\t\t+ lockObj\n\t\t\t\t\t\t\t+ \"]. A thread should release a lock as many times as it acquires the lock.\");\n\t\t}\n\t}\n\n\tbefore(Thread thread, Lock lockObj) : unlockPC(thread, lockObj) {\n\t\tVerdict verdict = null;\n\t\tsynchronized (monitor) {\n\t\t\tverdict = monitor.step(UNLOCK, thread, lockObj);\n\t\t}\n\t\tif (verdict == Verdict.FAILURE) {\n\t\t\tSystem.err\n\t\t\t\t\t.println(\"Violation in JavaMOP 2. [thread=\"\n\t\t\t\t\t\t\t+ thread\n\t\t\t\t\t\t\t+ \", lock=\"\n\t\t\t\t\t\t\t+ lockObj\n\t\t\t\t\t\t\t+ \"]. A thread should release a lock as many times as it acquires the lock.\");\n\t\t}\n\t}\n\n\tpointcut endOfProgram() : execution(void LockTest.main(String[]));\n\n\tafter() : endOfProgram() {\n\t\tVerdict verdict = monitor.end();\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\n\t\t\tSystem.err\n\t\t\t\t\t.println(\"Violation in JavaMOP 2. A thread should release a lock as many times as it acquires the lock.\");\n\t\t} else {\n\t\t\tSystem.err.println(\"Property JavaMOP 2 satisfied\");\n\t\t}\n\t}\n}\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"beed5bd842d592934282ba08be7a4250873ba0b7","subject":"package rename","message":"package rename\n","repos":"inbloom\/secure-data-service,inbloom\/secure-data-service,inbloom\/secure-data-service,inbloom\/secure-data-service,inbloom\/secure-data-service","old_file":"sli\/common\/sli-common\/src\/main\/java\/org\/slc\/sli\/common\/util\/performance\/PerformanceTrackingAspect.aj","new_file":"sli\/common\/sli-common\/src\/main\/java\/org\/slc\/sli\/common\/util\/performance\/PerformanceTrackingAspect.aj","new_contents":"package org.slc.sli.common.util.performance;\n\nimport org.aspectj.lang.ProceedingJoinPoint;\nimport org.aspectj.lang.annotation.AfterReturning;\nimport org.aspectj.lang.annotation.Around;\nimport org.aspectj.lang.annotation.Aspect;\nimport org.aspectj.lang.annotation.Pointcut;\nimport org.slc.sli.util.threadutil.ThreadLocalStorage;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\n\/**\n * Aspect for common performance measurements\n *\n * @author ifaybyshev\n *\n *\/\n@Aspect\nabstract public class PerformanceTrackingAspect {\n\n\tprotected Logger performanceLog = LoggerFactory.getLogger(\"PerformanceLogger\");\n\n\tprotected Logger log = LoggerFactory.getLogger(PerformanceTrackingAspect.class);\n\n\tprotected ThreadLocalStorage store = new ThreadLocalStorage(String.valueOf(System.currentTimeMillis()));\n\n\t\/\/ storing a field\/value into the store\n\t@Pointcut(\"@annotation(org.slc.sli.util.performance.PutResultInContext)\")\n\tpublic void putResultInContext() {\n\t}\n\n\t@AfterReturning(pointcut = \"@annotation(returnName)\", argNames = \"returnName\", returning = \"returnValue\")\n\tpublic void handleStoringReturnPointcut(String returnValue,\n\t\t\tPutResultInContext returnName) {\n\t\tlog.info(\"StoreReturnPointcut -- Storing a field Into Performance Local Store: \"\n\t\t\t\t+ returnName.returnName() + \" = \" + returnValue);\n\t\tstore.put(returnName.returnName(), returnValue);\n\t}\n\n\t@Pointcut(\"@annotation(org.slc.sli.util.performance.Profiled)\")\n\tpublic void profiled() {\n\t}\n\n\t@Around(\"profiled()\")\n\tpublic Object handleProfiledAnnotation(ProceedingJoinPoint pjp)\n\t\t\tthrows Throwable {\n\t\tlong start = System.currentTimeMillis();\n\n\t\tObject output = pjp.proceed();\n\n\t\tthis.profileMethod(pjp, start);\n\n\t\treturn output;\n\t}\n\n\tpublic void profileMethod(ProceedingJoinPoint pjp, long start) {\n\t\tthis.sendPerformanceMessage(pjp.getThis().getClass().getName() + \".\"\n\t\t\t\t+ pjp.getSignature().getName(), start, System.currentTimeMillis());\n\t}\n\n\tprotected void sendPerformanceMessage(String callerName,\n\t\t\tlong startTimestamp, long endTimestamp) {\n\t\t\/\/ send message to performance store\n\t\tperformanceLog.info(\"<ingestionPerformance>\" + \"<caller>\" + callerName\n\t\t\t\t+ \"<\/caller>\" + \"<timing>\" + \"<startTimestamp>\"\n\t\t\t\t+ startTimestamp + \"<\/startTimestamp>\" + \"<endTimestamp>\"\n\t\t\t\t+ endTimestamp + \"<\/endTimestamp>\" + \"<elapsedMs>\"\n\t\t\t\t+ (endTimestamp - startTimestamp) + \"<\/elapsedMs>\"\n\t\t\t\t+ \"<\/timing>\" + \"<\/ingestionPerformance>\");\n\t}\n\n}\n","old_contents":"package org.slc.sli.util.performance;\n\nimport org.aspectj.lang.ProceedingJoinPoint;\nimport org.aspectj.lang.annotation.AfterReturning;\nimport org.aspectj.lang.annotation.Around;\nimport org.aspectj.lang.annotation.Aspect;\nimport org.aspectj.lang.annotation.Pointcut;\nimport org.slc.sli.util.threadutil.ThreadLocalStorage;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\n\/**\n * Aspect for common performance measurements\n * \n * @author ifaybyshev\n * \n *\/\n@Aspect\nabstract public class PerformanceTrackingAspect {\n\n\tprotected Logger performanceLog = LoggerFactory.getLogger(\"PerformanceLogger\");\n\n\tprotected Logger log = LoggerFactory.getLogger(PerformanceTrackingAspect.class);\n\n\tprotected ThreadLocalStorage store = new ThreadLocalStorage(String.valueOf(System.currentTimeMillis()));\n\n\t\/\/ storing a field\/value into the store\n\t@Pointcut(\"@annotation(org.slc.sli.util.performance.PutResultInContext)\")\n\tpublic void putResultInContext() {\n\t}\n\n\t@AfterReturning(pointcut = \"@annotation(returnName)\", argNames = \"returnName\", returning = \"returnValue\")\n\tpublic void handleStoringReturnPointcut(String returnValue,\n\t\t\tPutResultInContext returnName) {\n\t\tlog.info(\"StoreReturnPointcut -- Storing a field Into Performance Local Store: \"\n\t\t\t\t+ returnName.returnName() + \" = \" + returnValue);\n\t\tstore.put(returnName.returnName(), returnValue);\n\t}\n\n\t@Pointcut(\"@annotation(org.slc.sli.util.performance.Profiled)\")\n\tpublic void profiled() {\n\t}\n\n\t@Around(\"profiled()\")\n\tpublic Object handleProfiledAnnotation(ProceedingJoinPoint pjp)\n\t\t\tthrows Throwable {\n\t\tlong start = System.currentTimeMillis();\n\n\t\tObject output = pjp.proceed();\n\n\t\tthis.profileMethod(pjp, start);\n\n\t\treturn output;\n\t}\n\n\tpublic void profileMethod(ProceedingJoinPoint pjp, long start) {\n\t\tthis.sendPerformanceMessage(pjp.getThis().getClass().getName() + \".\"\n\t\t\t\t+ pjp.getSignature().getName(), start, System.currentTimeMillis());\n\t}\n\n\tprotected void sendPerformanceMessage(String callerName,\n\t\t\tlong startTimestamp, long endTimestamp) {\n\t\t\/\/ send message to performance store\n\t\tperformanceLog.info(\"<ingestionPerformance>\" + \"<caller>\" + callerName\n\t\t\t\t+ \"<\/caller>\" + \"<timing>\" + \"<startTimestamp>\"\n\t\t\t\t+ startTimestamp + \"<\/startTimestamp>\" + \"<endTimestamp>\"\n\t\t\t\t+ endTimestamp + \"<\/endTimestamp>\" + \"<elapsedMs>\"\n\t\t\t\t+ (endTimestamp - startTimestamp) + \"<\/elapsedMs>\"\n\t\t\t\t+ \"<\/timing>\" + \"<\/ingestionPerformance>\");\n\t}\n\n}","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"1bb583bc416c334bf35d42bcac22bbbb2a8c91bb","subject":"fixed bug in statistics calculation","message":"fixed bug in statistics calculation\n","repos":"stieglma\/Schafkopfauswerter","old_file":"src\/StatPlayerWiseGraph.aj","new_file":"src\/StatPlayerWiseGraph.aj","new_contents":"import java.awt.BasicStroke;\nimport java.awt.Color;\nimport java.awt.Font;\nimport java.awt.GridLayout;\nimport java.awt.LinearGradientPaint;\n\nimport javax.swing.JPanel;\nimport javax.swing.JTabbedPane;\n\nimport model.SystemValues.Games;\nimport model.SystemValues.Players;\nimport view.GUI;\nimport view.UIUpdater;\nimport de.erichseifert.gral.data.DataTable;\nimport de.erichseifert.gral.plots.BarPlot;\nimport de.erichseifert.gral.plots.BarPlot.BarRenderer;\nimport de.erichseifert.gral.plots.PiePlot;\nimport de.erichseifert.gral.plots.PiePlot.PieSliceRenderer;\nimport de.erichseifert.gral.plots.points.PointRenderer;\nimport de.erichseifert.gral.ui.InteractivePanel;\nimport de.erichseifert.gral.util.GraphicsUtils;\nimport de.erichseifert.gral.util.Insets2D;\nimport de.erichseifert.gral.util.Location;\n\npublic privileged aspect StatPlayerWiseGraph {\n    \/**\n     * Statistics has to be the last feature executed, such that the subfeatures\n     * have the correct gui object before statistics can create the tabbed pane\n     *\/\n    declare precedence : Statistics, StatPlayerWiseGraph, StatPlayerWiseTxt, StatOverallGraph, StatOverallTxt;\n\n    private static GUI gui;\n\n    private static final JTabbedPane playersTabs = new JTabbedPane();\n    private static final Color COLOR1 = Color.GREEN;\n\n    private static DataTable playedTypes[] = new DataTable[4];\n    private static DataTable wonGames[] = new DataTable[4];\n\n    after() returning(GUI gui): call(GUI.new(*)) {\n        StatPlayerWiseGraph.gui = gui;\n    }\n\n    @SuppressWarnings(\"unchecked\")\n    after(JTabbedPane tabbedPane): \n                        execution(public static void StatisticsHelper.StatisticsPaneCreated(JTabbedPane))\n                        && args(tabbedPane) {\n\n        for (int i = 0; i < Players.values().length; i++) {\n            playedTypes[i] = new DataTable(Integer.class, String.class);\n            wonGames[i] = new DataTable(Integer.class, Double.class,String.class);\n        }\n\n        for (Players player : Players.values()) {\n            playersTabs.addTab(player.toString(), createPlayersPanel(player));\n        }\n        tabbedPane.addTab(\"Einzelstatistiken\", playersTabs);\n    }\n\n    private JPanel createPlayersPanel(Players player) {\n        JPanel containerPanel = new JPanel();\n        containerPanel.setLayout(new GridLayout(2, 2));\n\n        containerPanel.add(new InteractivePanel(createWonGamesBarPlot(player)));\n        containerPanel.add(new InteractivePanel(createPlayedTypesPlot(player)));\n        return containerPanel;\n    }\n\n    after() : execution(* UIUpdater.run()) {\n        updateData();\n        for (Players player : Players.values()) {\n            playersTabs.setTitleAt(player.ordinal(), player.toString());\n        }\n    }\n\n    private static void updateData() {\n        for (Players player : Players.values()) {\n            PlayerWiseStatistics data = gui.model.getGameData().getPlayerWiseStatistics(player);\n\n            int curPlayer = player.ordinal();\n\n            while (playedTypes[curPlayer].getRowCount() > 0) {\n                playedTypes[curPlayer].removeLast();\n            }\n            playedTypes[curPlayer].add(data.getGamesPlayedPerType()[Games.RUFSPIEL.ordinal()], \"Rufspiele\");\n            playedTypes[curPlayer].add(data.getGamesPlayedPerType()[Games.SOLO.ordinal()], \"Soli\");\n            playedTypes[curPlayer].add(data.getGamesPlayedPerType()[Games.TOUT.ordinal()], \"Soli Tout\");\n            playedTypes[curPlayer].add(data.getGamesPlayedPerType()[Games.SIE.ordinal()],\"Soli Sie\");\n            playedTypes[curPlayer].add(data.getGamesPlayedPerType()[Games.WEITER.ordinal()], \"Weiter\");\n\n            \/\/ percentage of won games by gametype\n            int soliCompleteAmount = data.getGamesPlayedPerType()[Games.SOLO.ordinal()]\n                    + data.getGamesPlayedPerType()[Games.SIE.ordinal()]\n                    + data.getGamesPlayedPerType()[Games.TOUT.ordinal()];\n            int soliCompleteAmountWon = data.getGamesWonPerType()[Games.SOLO.ordinal()]\n                    + data.getGamesWonPerType()[Games.SIE.ordinal()]\n                    + data.getGamesWonPerType()[Games.TOUT.ordinal()];\n            double soliGesamtWonPerc = (soliCompleteAmount > 0\n                    ? (double) soliCompleteAmountWon \/ soliCompleteAmount\n                    : 0.0) * 100;\n\n            while (wonGames[curPlayer].getRowCount() > 0) {\n                wonGames[curPlayer].removeLast();\n            }\n            wonGames[curPlayer].add(1, data.getGamesWonPerc(), \"Gesamt\");\n            wonGames[curPlayer].add(2, data.getGamesWonPerTypePerc()[Games.RUFSPIEL.ordinal()], \"Rufspiele\");\n            wonGames[curPlayer].add(3, soliGesamtWonPerc, \"Soli gesamt\");\n            wonGames[curPlayer].add(4, data.getGamesWonPerTypePerc()[Games.SOLO.ordinal()], \"Soli normal\");\n            wonGames[curPlayer].add(5, data.getGamesWonPerTypePerc()[Games.TOUT.ordinal()], \"Soli Tout\");\n            wonGames[curPlayer].add(6, data.getGamesWonPerTypePerc()[Games.SIE.ordinal()], \"Soli Sie\");\n        }\n    }\n\n    private static PiePlot createPlayedTypesPlot(Players player) {\n        int playerIndex = player.ordinal();\n\n        PiePlot plot = new PiePlot(playedTypes[playerIndex]);\n\n        PointRenderer pointRenderer = plot\n                .getPointRenderer(playedTypes[playerIndex]);\n        pointRenderer.setValueVisible(true);\n        pointRenderer.setValueColumn(1);\n\n        \/\/ Format plot\n        plot.getTitle().setText(\"Anzahl gespielter Spieltypen\");\n        \/\/ Change plot size\n        plot.setRadius(0.9);\n        \/\/ Display a legend\n        plot.setLegendVisible(true);\n        \/\/ Add some margin to the plot area\n        plot.setInsets(new Insets2D.Double(20.0, 40.0, 40.0, 40.0));\n\n        PieSliceRenderer pieSliceRenderer = (PieSliceRenderer) plot\n                .getPointRenderer(playedTypes[playerIndex]);\n\n        \/\/ Change relative size of inner region\n        pieSliceRenderer.setInnerRadius(0.4);\n        \/\/ Change the width of gaps between segments\n        pieSliceRenderer.setGap(0.2);\n        \/\/ Show labels\n        pieSliceRenderer.setValueVisible(true);\n        pieSliceRenderer.setValueColor(Color.WHITE);\n        pieSliceRenderer.setValueFont(Font.decode(null).deriveFont(Font.BOLD));\n\n        return plot;\n    }\n\n    public BarPlot createWonGamesBarPlot(Players player) {\n        int playerIndex = player.ordinal();\n\n        \/\/ Create new bar plot\n        BarPlot plot = new BarPlot(wonGames);\n\n        \/\/ Format plot\n        plot.getTitle().setText(\"Gewonnene Spiele pro Spieltyp (in %)\");\n        plot.setInsets(new Insets2D.Double(40.0, 40.0, 40.0, 40.0));\n        plot.setBarWidth(0.075);\n\n        \/\/ Format bars\n        PointRenderer pointRenderer = plot.getPointRenderer(wonGames[playerIndex]);\n        BarRenderer barRenderer = (BarRenderer) pointRenderer;\n\n        barRenderer.setColor(new LinearGradientPaint(0f, 0f, 0f, 1f,\n                new float[] { 0.0f, 1.0f }, new Color[] { COLOR1,\n                        GraphicsUtils.deriveBrighter(COLOR1) }));\n        barRenderer.setBorderStroke(new BasicStroke(3f));\n        barRenderer.setBorderColor(new LinearGradientPaint(0f, 0f, 0f, 1f,\n                new float[] { 0.0f, 1.0f }, new Color[] {\n                        GraphicsUtils.deriveBrighter(COLOR1), COLOR1 }));\n\n        pointRenderer.setValueVisible(true);\n        pointRenderer.setValueColumn(2);\n\n        pointRenderer.setValueLocation(Location.CENTER);\n        pointRenderer.setValueColor(GraphicsUtils.deriveDarker(COLOR1));\n        pointRenderer.setValueFont(Font.decode(null).deriveFont(Font.BOLD));\n\n        return plot;\n    }\n}","old_contents":"import java.awt.BasicStroke;\nimport java.awt.Color;\nimport java.awt.Font;\nimport java.awt.GridLayout;\nimport java.awt.LinearGradientPaint;\n\nimport javax.swing.JPanel;\nimport javax.swing.JTabbedPane;\n\nimport model.SystemValues.Games;\nimport model.SystemValues.Players;\nimport view.GUI;\nimport view.UIUpdater;\nimport de.erichseifert.gral.data.DataTable;\nimport de.erichseifert.gral.plots.BarPlot;\nimport de.erichseifert.gral.plots.BarPlot.BarRenderer;\nimport de.erichseifert.gral.plots.PiePlot;\nimport de.erichseifert.gral.plots.PiePlot.PieSliceRenderer;\nimport de.erichseifert.gral.plots.points.PointRenderer;\nimport de.erichseifert.gral.ui.InteractivePanel;\nimport de.erichseifert.gral.util.GraphicsUtils;\nimport de.erichseifert.gral.util.Insets2D;\nimport de.erichseifert.gral.util.Location;\n\npublic privileged aspect StatPlayerWiseGraph {\n    \/**\n     * Statistics has to be the last feature executed, such that the subfeatures\n     * have the correct gui object before statistics can create the tabbed pane\n     *\/\n    declare precedence : Statistics, StatPlayerWiseGraph, StatPlayerWiseTxt, StatOverallGraph, StatOverallTxt;\n\n    private static GUI gui;\n\n    private static final JTabbedPane playersTabs = new JTabbedPane();\n    private static final Color COLOR1 = Color.GREEN;\n\n    private static DataTable playedTypes[] = new DataTable[4];\n    private static DataTable wonGames[] = new DataTable[4];\n\n    after() returning(GUI gui): call(GUI.new(*)) {\n        StatPlayerWiseGraph.gui = gui;\n    }\n\n    @SuppressWarnings(\"unchecked\")\n    after(JTabbedPane tabbedPane): \n                        execution(public static void StatisticsHelper.StatisticsPaneCreated(JTabbedPane))\n                        && args(tabbedPane) {\n\n        for (int i = 0; i < Players.values().length; i++) {\n            playedTypes[i] = new DataTable(Integer.class, String.class);\n            wonGames[i] = new DataTable(Integer.class, Double.class,String.class);\n        }\n\n        updateData();\n;\n        for (Players player : Players.values()) {\n            playersTabs.addTab(player.toString(), createPlayersPanel(player));\n        }\n        tabbedPane.addTab(\"Einzelstatistiken\", playersTabs);\n    }\n\n    private JPanel createPlayersPanel(Players player) {\n        JPanel containerPanel = new JPanel();\n        containerPanel.setLayout(new GridLayout(2, 2));\n\n        containerPanel.add(new InteractivePanel(createWonGamesBarPlot(player)));\n        containerPanel.add(new InteractivePanel(createPlayedTypesPlot(player)));\n        return containerPanel;\n    }\n\n    after() : execution(* UIUpdater.run()) {\n        updateData();\n        for (Players player : Players.values()) {\n            playersTabs.setTitleAt(player.ordinal(), player.toString());\n        }\n    }\n\n    private static void updateData() {\n        for (Players player : Players.values()) {\n            PlayerWiseStatistics data = gui.model.getGameData().getPlayerWiseStatistics(player);\n\n            int curPlayer = player.ordinal();\n\n            while (playedTypes[curPlayer].getRowCount() > 0) {\n                playedTypes[curPlayer].removeLast();\n            }\n            playedTypes[curPlayer].add(data.getGamesPlayedPerType()[Games.RUFSPIEL.ordinal()], \"Rufspiele\");\n            playedTypes[curPlayer].add(data.getGamesPlayedPerType()[Games.SOLO.ordinal()], \"Soli\");\n            playedTypes[curPlayer].add(data.getGamesPlayedPerType()[Games.TOUT.ordinal()], \"Soli Tout\");\n            playedTypes[curPlayer].add(data.getGamesPlayedPerType()[Games.SIE.ordinal()],\"Soli Sie\");\n            playedTypes[curPlayer].add(data.getGamesPlayedPerType()[Games.WEITER.ordinal()], \"Weiter\");\n\n            \/\/ percentage of won games by gametype\n            int soliCompleteAmount = data.getGamesPlayedPerType()[Games.SOLO.ordinal()]\n                    + data.getGamesPlayedPerType()[Games.SIE.ordinal()]\n                    + data.getGamesPlayedPerType()[Games.TOUT.ordinal()];\n            int soliCompleteAmountWon = data.getGamesWonPerType()[Games.SOLO.ordinal()]\n                    + data.getGamesWonPerType()[Games.SIE.ordinal()]\n                    + data.getGamesWonPerType()[Games.TOUT.ordinal()];\n            double soliGesamtWonPerc = soliCompleteAmount > 0\n                    ? (double) soliCompleteAmountWon \/ soliCompleteAmount\n                    : 0.0;\n\n            while (wonGames[curPlayer].getRowCount() > 0) {\n                wonGames[curPlayer].removeLast();\n            }\n            wonGames[curPlayer].add(1, data.getGamesWonPerc(), \"Gesamt\");\n            wonGames[curPlayer].add(2, data.getGamesWonPerTypePerc()[Games.RUFSPIEL.ordinal()], \"Rufspiele\");\n            wonGames[curPlayer].add(3, soliGesamtWonPerc, \"Soli gesamt\");\n            wonGames[curPlayer].add(4, data.getGamesWonPerTypePerc()[Games.SOLO.ordinal()], \"Soli normal\");\n            wonGames[curPlayer].add(5, data.getGamesWonPerTypePerc()[Games.TOUT.ordinal()], \"Soli Tout\");\n            wonGames[curPlayer].add(6, data.getGamesWonPerTypePerc()[Games.SIE.ordinal()], \"Soli Sie\");\n        }\n    }\n\n    private static PiePlot createPlayedTypesPlot(Players player) {\n        int playerIndex = player.ordinal();\n\n        PiePlot plot = new PiePlot(playedTypes[playerIndex]);\n\n        PointRenderer pointRenderer = plot\n                .getPointRenderer(playedTypes[playerIndex]);\n        pointRenderer.setValueVisible(true);\n        pointRenderer.setValueColumn(1);\n\n        \/\/ Format plot\n        plot.getTitle().setText(\"Anzahl gespielter Spieltypen\");\n        \/\/ Change plot size\n        plot.setRadius(0.9);\n        \/\/ Display a legend\n        plot.setLegendVisible(true);\n        \/\/ Add some margin to the plot area\n        plot.setInsets(new Insets2D.Double(20.0, 40.0, 40.0, 40.0));\n\n        PieSliceRenderer pieSliceRenderer = (PieSliceRenderer) plot\n                .getPointRenderer(playedTypes[playerIndex]);\n\n        \/\/ Change relative size of inner region\n        pieSliceRenderer.setInnerRadius(0.4);\n        \/\/ Change the width of gaps between segments\n        pieSliceRenderer.setGap(0.2);\n        \/\/ Show labels\n        pieSliceRenderer.setValueVisible(true);\n        pieSliceRenderer.setValueColor(Color.WHITE);\n        pieSliceRenderer.setValueFont(Font.decode(null).deriveFont(Font.BOLD));\n\n        return plot;\n    }\n\n    public BarPlot createWonGamesBarPlot(Players player) {\n        int playerIndex = player.ordinal();\n\n        \/\/ Create new bar plot\n        BarPlot plot = new BarPlot(wonGames);\n\n        \/\/ Format plot\n        plot.getTitle().setText(\"Gewonnene Spiele pro Spieltyp (in %)\");\n        plot.setInsets(new Insets2D.Double(40.0, 40.0, 40.0, 40.0));\n        plot.setBarWidth(0.075);\n\n        \/\/ Format bars\n        PointRenderer pointRenderer = plot.getPointRenderer(wonGames[playerIndex]);\n        BarRenderer barRenderer = (BarRenderer) pointRenderer;\n\n        barRenderer.setColor(new LinearGradientPaint(0f, 0f, 0f, 1f,\n                new float[] { 0.0f, 1.0f }, new Color[] { COLOR1,\n                        GraphicsUtils.deriveBrighter(COLOR1) }));\n        barRenderer.setBorderStroke(new BasicStroke(3f));\n        barRenderer.setBorderColor(new LinearGradientPaint(0f, 0f, 0f, 1f,\n                new float[] { 0.0f, 1.0f }, new Color[] {\n                        GraphicsUtils.deriveBrighter(COLOR1), COLOR1 }));\n\n        pointRenderer.setValueVisible(true);\n        pointRenderer.setValueColumn(2);\n\n        pointRenderer.setValueLocation(Location.CENTER);\n        pointRenderer.setValueColor(GraphicsUtils.deriveDarker(COLOR1));\n        pointRenderer.setValueFont(Font.decode(null).deriveFont(Font.BOLD));\n\n        return plot;\n    }\n}","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"da799e8224cdb12f852c136431fdadc0f4a055b9","subject":"commit 46c49b79ea575837e15bae84b034d54682cd158b Author: Iyappan Srinivasan <iyappans@yahoo-inc.com> Date:   Fri Jul 23 05:52:01 2010 +0000","message":"commit 46c49b79ea575837e15bae84b034d54682cd158b\nAuthor: Iyappan Srinivasan <iyappans@yahoo-inc.com>\nDate:   Fri Jul 23 05:52:01 2010 +0000\n\n    MAPREDUCE-1955 https:\/\/issues.apache.org\/jira\/secure\/attachment\/12450264\/1955-ydist-security-patch.txt\n\n\ngit-svn-id: 7e7a2d564dde2945c3a26e08d1235fcc0cb7aba1@1077581 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"aseldawy\/spatialhadoop,ShortMap\/ShortMap,aseldawy\/spatialhadoop,aseldawy\/spatialhadoop,aseldawy\/spatialhadoop,ShortMap\/ShortMap,ShortMap\/ShortMap,ShortMap\/ShortMap,ShortMap\/ShortMap,ShortMap\/ShortMap,aseldawy\/spatialhadoop,aseldawy\/spatialhadoop,ShortMap\/ShortMap,aseldawy\/spatialhadoop,ShortMap\/ShortMap,aseldawy\/spatialhadoop,ShortMap\/ShortMap,aseldawy\/spatialhadoop","old_file":"src\/test\/system\/aop\/org\/apache\/hadoop\/mapred\/JobInProgressAspect.aj","new_file":"src\/test\/system\/aop\/org\/apache\/hadoop\/mapred\/JobInProgressAspect.aj","new_contents":"\/**\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements.  See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership.  The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * \"License\"); you may not use this file except in compliance\n * with the License.  You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.apache.hadoop.mapred;\n\nimport java.io.IOException;\nimport org.apache.hadoop.mapreduce.test.system.JobInfo;\n\n\/**\n * Aspect to add a utility method in the JobInProgress for easing up the\n * construction of the JobInfo object.\n *\/\nprivileged aspect JobInProgressAspect {\n\n  \/**\n   * Returns a read only view of the JobInProgress object which is used by the\n   * client.\n   * \n   * @return JobInfo of the current JobInProgress object\n   *\/\n  public JobInfo JobInProgress.getJobInfo() {\n    String historyLoc = getHistoryPath();\n    JobInfoImpl jobInfoImpl;\n    if (tasksInited) {\n      jobInfoImpl = new JobInfoImpl(\n          this.getJobID(), this.isSetupLaunched(), this.isSetupFinished(), this\n              .isCleanupLaunched(), this.runningMaps(), this.runningReduces(),\n          this.pendingMaps(), this.pendingReduces(), this.finishedMaps(), this\n              .finishedReduces(), this.getStatus(), historyLoc, this\n              .getBlackListedTrackers(), false, this.numMapTasks,\n          this.numReduceTasks, this.isHistoryFileCopied());\n    } else {\n      jobInfoImpl = new JobInfoImpl(\n          this.getJobID(), false, false, false, 0, 0, this.pendingMaps(), this\n              .pendingReduces(), this.finishedMaps(), this.finishedReduces(),\n          this.getStatus(), historyLoc, this.getBlackListedTrackers(), this\n              .isComplete(), this.numMapTasks, this.numReduceTasks, \n              this.isHistoryFileCopied());\n    }\n    jobInfoImpl.setFinishTime(getJobFinishTime());\n    jobInfoImpl.setLaunchTime(getJobLaunchTime());\n    jobInfoImpl.setNumSlotsPerReduce(getJobNumSlotsPerReduce());\n    jobInfoImpl.setNumSlotsPerMap(getJobNumSlotsPerMap());\n    return jobInfoImpl;\n  }\n  \n  private long JobInProgress.getJobFinishTime() {\n    long finishTime = 0;\n    if (this.isComplete()) {\n      finishTime = this.getFinishTime();\n    }\n    return finishTime;\n  }\n\n  private long JobInProgress.getJobLaunchTime() {\n    long LaunchTime = 0;\n    if (this.isComplete()) {\n      LaunchTime = this.getLaunchTime();\n    }\n    return LaunchTime;\n  }\n\n  private int JobInProgress.getJobNumSlotsPerReduce() {\n    int numSlotsPerReduce = 0;\n    if (this.isComplete()) {\n      numSlotsPerReduce = this.getNumSlotsPerReduce();\n    }\n    return numSlotsPerReduce;\n  }\n\n  private int JobInProgress.getJobNumSlotsPerMap() {\n    int numSlotsPerMap = 0;\n    if (this.isComplete()) {\n      numSlotsPerMap = this.getNumSlotsPerMap();\n    }\n    return numSlotsPerMap;\n }\n\n\n  private String JobInProgress.getHistoryPath() {\n    String historyLoc = \"\";\n    if(this.isComplete()) {\n      historyLoc = this.getHistoryFile();\n    } else {\n      String historyFileName = null;\n      try {\n        historyFileName  = JobHistory.JobInfo.getJobHistoryFileName(conf, \n            jobId);\n      } catch(IOException e) {\n      }\n      if(historyFileName != null) {\n        historyLoc = JobHistory.JobInfo.getJobHistoryLogLocation(\n            historyFileName).toString();\n      }\n    }\n    return historyLoc;\n  }\n\n}\n","old_contents":"\/**\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements.  See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership.  The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * \"License\"); you may not use this file except in compliance\n * with the License.  You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.apache.hadoop.mapred;\n\nimport java.io.IOException;\nimport org.apache.hadoop.mapreduce.test.system.JobInfo;\n\n\/**\n * Aspect to add a utility method in the JobInProgress for easing up the\n * construction of the JobInfo object.\n *\/\nprivileged aspect JobInProgressAspect {\n\n  \/**\n   * Returns a read only view of the JobInProgress object which is used by the\n   * client.\n   * \n   * @return JobInfo of the current JobInProgress object\n   *\/\n  public JobInfo JobInProgress.getJobInfo() {\n    String historyLoc = getHistoryPath();\n    JobInfoImpl jobInfoImpl;\n    if (tasksInited.get()) {\n      jobInfoImpl = new JobInfoImpl(\n          this.getJobID(), this.isSetupLaunched(), this.isSetupFinished(), this\n              .isCleanupLaunched(), this.runningMaps(), this.runningReduces(),\n          this.pendingMaps(), this.pendingReduces(), this.finishedMaps(), this\n              .finishedReduces(), this.getStatus(), historyLoc, this\n              .getBlackListedTrackers(), false, this.numMapTasks,\n          this.numReduceTasks, this.isHistoryFileCopied());\n    } else {\n      jobInfoImpl = new JobInfoImpl(\n          this.getJobID(), false, false, false, 0, 0, this.pendingMaps(), this\n              .pendingReduces(), this.finishedMaps(), this.finishedReduces(),\n          this.getStatus(), historyLoc, this.getBlackListedTrackers(), this\n              .isComplete(), this.numMapTasks, this.numReduceTasks, \n              this.isHistoryFileCopied());\n    }\n    jobInfoImpl.setFinishTime(getJobFinishTime());\n    jobInfoImpl.setLaunchTime(getJobLaunchTime());\n    jobInfoImpl.setNumSlotsPerReduce(getJobNumSlotsPerReduce());\n    jobInfoImpl.setNumSlotsPerMap(getJobNumSlotsPerMap());\n    return jobInfoImpl;\n  }\n  \n  private long JobInProgress.getJobFinishTime() {\n    long finishTime = 0;\n    if (this.isComplete()) {\n      finishTime = this.getFinishTime();\n    }\n    return finishTime;\n  }\n\n  private long JobInProgress.getJobLaunchTime() {\n    long LaunchTime = 0;\n    if (this.isComplete()) {\n      LaunchTime = this.getLaunchTime();\n    }\n    return LaunchTime;\n  }\n\n  private int JobInProgress.getJobNumSlotsPerReduce() {\n    int numSlotsPerReduce = 0;\n    if (this.isComplete()) {\n      numSlotsPerReduce = this.getNumSlotsPerReduce();\n    }\n    return numSlotsPerReduce;\n  }\n\n  private int JobInProgress.getJobNumSlotsPerMap() {\n    int numSlotsPerMap = 0;\n    if (this.isComplete()) {\n      numSlotsPerMap = this.getNumSlotsPerMap();\n    }\n    return numSlotsPerMap;\n }\n\n\n  private String JobInProgress.getHistoryPath() {\n    String historyLoc = \"\";\n    if(this.isComplete()) {\n      historyLoc = this.getHistoryFile();\n    } else {\n      String historyFileName = null;\n      try {\n        historyFileName  = JobHistory.JobInfo.getJobHistoryFileName(conf, \n            jobId);\n      } catch(IOException e) {\n      }\n      if(historyFileName != null) {\n        historyLoc = JobHistory.JobInfo.getJobHistoryLogLocation(\n            historyFileName).toString();\n      }\n    }\n    return historyLoc;\n  }\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"7549287a0342ad2b1e35ab85e6394bfd610ad66b","subject":"shorten logging to minor log levels","message":"shorten logging to minor log levels\n","repos":"palava\/palava-jpa-aspectj","old_file":"src\/main\/java\/de\/cosmocode\/palava\/jpa\/aspectj\/EntityTransactionAspect.aj","new_file":"src\/main\/java\/de\/cosmocode\/palava\/jpa\/aspectj\/EntityTransactionAspect.aj","new_contents":"\/**\n * Copyright 2010 CosmoCode GmbH\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage de.cosmocode.palava.jpa.aspectj;\n\nimport javax.persistence.EntityManager;\nimport javax.persistence.EntityTransaction;\nimport javax.persistence.PersistenceException;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\nimport de.cosmocode.palava.jpa.Transactional;\n\npublic final aspect EntityTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(EntityTransactionAspect.class);\n\n    private Provider<EntityManager> currentManager;\n    \n    @Inject\n    public void setProvider(Provider<EntityManager> manager) {\n        this.currentManager = Preconditions.checkNotNull(manager, \"Manager\");\n    }\n    \n    pointcut transactional(): execution(@Transactional * *.*(..));\n\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        final EntityManager manager = currentManager.get();\n        LOG.trace(\"Retrieved entitymanager {}\", manager);\n        final EntityTransaction tx = manager.getTransaction();\n        LOG.trace(\"Using transaction {}\", tx);\n        final boolean localTx = !tx.isActive();\n        \n        if (localTx) {\n            LOG.trace(\"Beginning automatic transaction\");\n            tx.begin();\n        } else {\n            LOG.trace(\"Transaction already active\");\n        }\n        \n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (RuntimeException e) {\n            LOG.debug(\"Exception inside automatic transaction context; rolling back\", e);\n            tx.rollback();\n            throw e;\n        }\n        \n        if (localTx && tx.isActive()) {\n            if (tx.getRollbackOnly()) {\n                LOG.debug(\"Transaction was marked as rollback only. Rolling back...\");\n                tx.rollback();\n            } else {\n                try {\n                    tx.commit();\n                    LOG.trace(\"Committed automatic transaction\");\n                } catch (PersistenceException e) {\n                    LOG.error(\"Commit in automatic transaction context failed\", e);\n                    if (tx.isActive()) {\n                        LOG.debug(\"Rolling back {}\", tx);\n                        tx.rollback();\n                    } else {\n                        LOG.debug(\"Can't roll back inactive transaction {}\", tx);\n                    }\n                    throw e;\n                }\n            }\n        }\n        \n        return returnValue;\n    }\n    \n}\n","old_contents":"\/**\n * Copyright 2010 CosmoCode GmbH\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage de.cosmocode.palava.jpa.aspectj;\n\nimport javax.persistence.EntityManager;\nimport javax.persistence.EntityTransaction;\nimport javax.persistence.PersistenceException;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\nimport de.cosmocode.palava.jpa.Transactional;\n\npublic final aspect EntityTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(EntityTransactionAspect.class);\n\n    private Provider<EntityManager> currentManager;\n    \n    @Inject\n    public void setProvider(Provider<EntityManager> manager) {\n        this.currentManager = Preconditions.checkNotNull(manager, \"Manager\");\n    }\n    \n    pointcut transactional(): execution(@Transactional * *.*(..));\n\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        final EntityManager manager = currentManager.get();\n        LOG.trace(\"Retrieved entitymanager {}\", manager);\n        final EntityTransaction tx = manager.getTransaction();\n        LOG.trace(\"Using transaction {}\", tx);\n        final boolean localTx = !tx.isActive();\n        \n        if (localTx) {\n            LOG.trace(\"Beginning automatic transaction\");\n            tx.begin();\n        } else {\n            LOG.trace(\"Transaction already active\");\n        }\n        \n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (RuntimeException e) {\n            LOG.error(\"Exception inside automatic transaction context\", e);\n            tx.rollback();\n            throw e;\n        }\n        \n        if (localTx && tx.isActive()) {\n            if (tx.getRollbackOnly()) {\n                LOG.trace(\"Transaction was marked as rollback only. Rolling back...\");\n                tx.rollback();\n            } else {\n                try {\n                    tx.commit();\n                    LOG.trace(\"Committed automatic transaction\");\n                } catch (PersistenceException e) {\n                    LOG.error(\"Commit in automatic transaction context failed\", e);\n                    if (tx.isActive()) {\n                        LOG.info(\"Rolling back {}\", tx);\n                        tx.rollback();\n                    } else {\n                        LOG.info(\"Can't roll back inactive transaction {}\", tx);\n                    }\n                    throw e;\n                }\n            }\n        }\n        \n        return returnValue;\n    }\n    \n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"bb2c8c06956f0e49a8453c21c1f3c55c04679ccd","subject":"fixed bug in statistics graph drawing function","message":"fixed bug in statistics graph drawing function\n","repos":"stieglma\/Schafkopfauswerter","old_file":"src\/StatPlayerWiseGraph.aj","new_file":"src\/StatPlayerWiseGraph.aj","new_contents":"import java.awt.BasicStroke;\nimport java.awt.Color;\nimport java.awt.Font;\nimport java.awt.GridLayout;\nimport java.awt.LinearGradientPaint;\n\nimport javax.swing.JPanel;\nimport javax.swing.JTabbedPane;\n\nimport model.SystemValues.Games;\nimport model.SystemValues.Players;\nimport view.GUI;\nimport view.UIUpdater;\nimport de.erichseifert.gral.data.DataTable;\nimport de.erichseifert.gral.plots.BarPlot;\nimport de.erichseifert.gral.plots.BarPlot.BarRenderer;\nimport de.erichseifert.gral.plots.PiePlot;\nimport de.erichseifert.gral.plots.PiePlot.PieSliceRenderer;\nimport de.erichseifert.gral.plots.points.PointRenderer;\nimport de.erichseifert.gral.ui.InteractivePanel;\nimport de.erichseifert.gral.util.GraphicsUtils;\nimport de.erichseifert.gral.util.Insets2D;\nimport de.erichseifert.gral.util.Location;\n\npublic privileged aspect StatPlayerWiseGraph {\n    \/**\n     * Statistics has to be the last feature executed, such that the subfeatures\n     * have the correct gui object before statistics can create the tabbed pane\n     *\/\n    declare precedence : Statistics, StatPlayerWiseGraph, StatPlayerWiseTxt, StatOverallGraph, StatOverallTxt;\n\n    private static GUI gui;\n\n    private static final JTabbedPane playersTabs = new JTabbedPane();\n    private static final Color COLOR1 = Color.GREEN;\n\n    private static DataTable playedTypes[] = new DataTable[4];\n    private static DataTable wonGames[] = new DataTable[4];\n\n    after() returning(GUI gui): call(GUI.new(*)) {\n        StatPlayerWiseGraph.gui = gui;\n    }\n\n    @SuppressWarnings(\"unchecked\")\n    after(JTabbedPane tabbedPane): \n                        execution(public static void StatisticsHelper.StatisticsPaneCreated(JTabbedPane))\n                        && args(tabbedPane) {\n\n        for (int i = 0; i < Players.values().length; i++) {\n            playedTypes[i] = new DataTable(Integer.class, String.class);\n            wonGames[i] = new DataTable(Integer.class, Double.class,String.class);\n        }\n\n        for (Players player : Players.values()) {\n            playersTabs.addTab(player.toString(), createPlayersPanel(player));\n        }\n        tabbedPane.addTab(\"Einzelstatistiken\", playersTabs);\n    }\n\n    private JPanel createPlayersPanel(Players player) {\n        JPanel containerPanel = new JPanel();\n        containerPanel.setLayout(new GridLayout(2, 2));\n\n        containerPanel.add(new InteractivePanel(createWonGamesBarPlot(player)));\n        containerPanel.add(new InteractivePanel(createPlayedTypesPlot(player)));\n        return containerPanel;\n    }\n\n    after() : execution(* UIUpdater.run()) {\n        updateData();\n        for (Players player : Players.values()) {\n            playersTabs.setTitleAt(player.ordinal(), player.toString());\n        }\n    }\n\n    private static void updateData() {\n        for (Players player : Players.values()) {\n            PlayerWiseStatistics data = gui.model.getGameData().getPlayerWiseStatistics(player);\n\n            int curPlayer = player.ordinal();\n\n            while (playedTypes[curPlayer].getRowCount() > 0) {\n                playedTypes[curPlayer].removeLast();\n            }\n            playedTypes[curPlayer].add(data.getGamesPlayedPerType()[Games.RUFSPIEL.ordinal()], \"Rufspiele\");\n            playedTypes[curPlayer].add(data.getGamesPlayedPerType()[Games.SOLO.ordinal()], \"Soli\");\n            playedTypes[curPlayer].add(data.getGamesPlayedPerType()[Games.TOUT.ordinal()], \"Soli Tout\");\n            playedTypes[curPlayer].add(data.getGamesPlayedPerType()[Games.SIE.ordinal()],\"Soli Sie\");\n            playedTypes[curPlayer].add(data.getGamesPlayedPerType()[Games.WEITER.ordinal()], \"Weiter\");\n\n            \/\/ percentage of won games by gametype\n            int soliCompleteAmount = data.getGamesPlayedPerType()[Games.SOLO.ordinal()]\n                    + data.getGamesPlayedPerType()[Games.SIE.ordinal()]\n                    + data.getGamesPlayedPerType()[Games.TOUT.ordinal()];\n            int soliCompleteAmountWon = data.getGamesWonPerType()[Games.SOLO.ordinal()]\n                    + data.getGamesWonPerType()[Games.SIE.ordinal()]\n                    + data.getGamesWonPerType()[Games.TOUT.ordinal()];\n            double soliGesamtWonPerc = (soliCompleteAmount > 0\n                    ? (double) soliCompleteAmountWon \/ soliCompleteAmount\n                    : 0.0) * 100;\n\n            while (wonGames[curPlayer].getRowCount() > 0) {\n                wonGames[curPlayer].removeLast();\n            }\n            wonGames[curPlayer].add(1, data.getGamesWonPerc(), \"Gesamt\");\n            wonGames[curPlayer].add(2, data.getGamesWonPerTypePerc()[Games.RUFSPIEL.ordinal()], \"Rufspiele\");\n            wonGames[curPlayer].add(3, soliGesamtWonPerc, \"Soli gesamt\");\n            wonGames[curPlayer].add(4, data.getGamesWonPerTypePerc()[Games.SOLO.ordinal()], \"Soli normal\");\n            wonGames[curPlayer].add(5, data.getGamesWonPerTypePerc()[Games.TOUT.ordinal()], \"Soli Tout\");\n            wonGames[curPlayer].add(6, data.getGamesWonPerTypePerc()[Games.SIE.ordinal()], \"Soli Sie\");\n        }\n    }\n\n    private static PiePlot createPlayedTypesPlot(Players player) {\n        int playerIndex = player.ordinal();\n\n        PiePlot plot = new PiePlot(playedTypes[playerIndex]);\n\n        PointRenderer pointRenderer = plot\n                .getPointRenderer(playedTypes[playerIndex]);\n        pointRenderer.setValueVisible(true);\n        pointRenderer.setValueColumn(1);\n\n        \/\/ Format plot\n        plot.getTitle().setText(\"Anzahl gespielter Spieltypen\");\n        \/\/ Change plot size\n        plot.setRadius(0.9);\n        \/\/ Display a legend\n        plot.setLegendVisible(true);\n        \/\/ Add some margin to the plot area\n        plot.setInsets(new Insets2D.Double(20.0, 40.0, 40.0, 40.0));\n\n        PieSliceRenderer pieSliceRenderer = (PieSliceRenderer) plot\n                .getPointRenderer(playedTypes[playerIndex]);\n\n        \/\/ Change relative size of inner region\n        pieSliceRenderer.setInnerRadius(0.4);\n        \/\/ Change the width of gaps between segments\n        pieSliceRenderer.setGap(0.2);\n        \/\/ Show labels\n        pieSliceRenderer.setValueVisible(true);\n        pieSliceRenderer.setValueColor(Color.WHITE);\n        pieSliceRenderer.setValueFont(Font.decode(null).deriveFont(Font.BOLD));\n\n        return plot;\n    }\n\n    public BarPlot createWonGamesBarPlot(Players player) {\n        int playerIndex = player.ordinal();\n\n        \/\/ Create new bar plot\n        BarPlot plot = new BarPlot(wonGames[playerIndex]);\n\n        \/\/ Format plot\n        plot.getTitle().setText(\"Gewonnene Spiele pro Spieltyp (in %)\");\n        plot.setInsets(new Insets2D.Double(40.0, 40.0, 40.0, 40.0));\n        plot.setBarWidth(0.075);\n\n        \/\/ Format bars\n        PointRenderer pointRenderer = plot.getPointRenderer(wonGames[playerIndex]);\n        BarRenderer barRenderer = (BarRenderer) pointRenderer;\n\n        barRenderer.setColor(new LinearGradientPaint(0f, 0f, 0f, 1f,\n                new float[] { 0.0f, 1.0f }, new Color[] { COLOR1,\n                        GraphicsUtils.deriveBrighter(COLOR1) }));\n        barRenderer.setBorderStroke(new BasicStroke(3f));\n        barRenderer.setBorderColor(new LinearGradientPaint(0f, 0f, 0f, 1f,\n                new float[] { 0.0f, 1.0f }, new Color[] {\n                        GraphicsUtils.deriveBrighter(COLOR1), COLOR1 }));\n\n        pointRenderer.setValueVisible(true);\n        pointRenderer.setValueColumn(2);\n\n        pointRenderer.setValueLocation(Location.CENTER);\n        pointRenderer.setValueColor(GraphicsUtils.deriveDarker(COLOR1));\n        pointRenderer.setValueFont(Font.decode(null).deriveFont(Font.BOLD));\n\n        return plot;\n    }\n}","old_contents":"import java.awt.BasicStroke;\nimport java.awt.Color;\nimport java.awt.Font;\nimport java.awt.GridLayout;\nimport java.awt.LinearGradientPaint;\n\nimport javax.swing.JPanel;\nimport javax.swing.JTabbedPane;\n\nimport model.SystemValues.Games;\nimport model.SystemValues.Players;\nimport view.GUI;\nimport view.UIUpdater;\nimport de.erichseifert.gral.data.DataTable;\nimport de.erichseifert.gral.plots.BarPlot;\nimport de.erichseifert.gral.plots.BarPlot.BarRenderer;\nimport de.erichseifert.gral.plots.PiePlot;\nimport de.erichseifert.gral.plots.PiePlot.PieSliceRenderer;\nimport de.erichseifert.gral.plots.points.PointRenderer;\nimport de.erichseifert.gral.ui.InteractivePanel;\nimport de.erichseifert.gral.util.GraphicsUtils;\nimport de.erichseifert.gral.util.Insets2D;\nimport de.erichseifert.gral.util.Location;\n\npublic privileged aspect StatPlayerWiseGraph {\n    \/**\n     * Statistics has to be the last feature executed, such that the subfeatures\n     * have the correct gui object before statistics can create the tabbed pane\n     *\/\n    declare precedence : Statistics, StatPlayerWiseGraph, StatPlayerWiseTxt, StatOverallGraph, StatOverallTxt;\n\n    private static GUI gui;\n\n    private static final JTabbedPane playersTabs = new JTabbedPane();\n    private static final Color COLOR1 = Color.GREEN;\n\n    private static DataTable playedTypes[] = new DataTable[4];\n    private static DataTable wonGames[] = new DataTable[4];\n\n    after() returning(GUI gui): call(GUI.new(*)) {\n        StatPlayerWiseGraph.gui = gui;\n    }\n\n    @SuppressWarnings(\"unchecked\")\n    after(JTabbedPane tabbedPane): \n                        execution(public static void StatisticsHelper.StatisticsPaneCreated(JTabbedPane))\n                        && args(tabbedPane) {\n\n        for (int i = 0; i < Players.values().length; i++) {\n            playedTypes[i] = new DataTable(Integer.class, String.class);\n            wonGames[i] = new DataTable(Integer.class, Double.class,String.class);\n        }\n\n        for (Players player : Players.values()) {\n            playersTabs.addTab(player.toString(), createPlayersPanel(player));\n        }\n        tabbedPane.addTab(\"Einzelstatistiken\", playersTabs);\n    }\n\n    private JPanel createPlayersPanel(Players player) {\n        JPanel containerPanel = new JPanel();\n        containerPanel.setLayout(new GridLayout(2, 2));\n\n        containerPanel.add(new InteractivePanel(createWonGamesBarPlot(player)));\n        containerPanel.add(new InteractivePanel(createPlayedTypesPlot(player)));\n        return containerPanel;\n    }\n\n    after() : execution(* UIUpdater.run()) {\n        updateData();\n        for (Players player : Players.values()) {\n            playersTabs.setTitleAt(player.ordinal(), player.toString());\n        }\n    }\n\n    private static void updateData() {\n        for (Players player : Players.values()) {\n            PlayerWiseStatistics data = gui.model.getGameData().getPlayerWiseStatistics(player);\n\n            int curPlayer = player.ordinal();\n\n            while (playedTypes[curPlayer].getRowCount() > 0) {\n                playedTypes[curPlayer].removeLast();\n            }\n            playedTypes[curPlayer].add(data.getGamesPlayedPerType()[Games.RUFSPIEL.ordinal()], \"Rufspiele\");\n            playedTypes[curPlayer].add(data.getGamesPlayedPerType()[Games.SOLO.ordinal()], \"Soli\");\n            playedTypes[curPlayer].add(data.getGamesPlayedPerType()[Games.TOUT.ordinal()], \"Soli Tout\");\n            playedTypes[curPlayer].add(data.getGamesPlayedPerType()[Games.SIE.ordinal()],\"Soli Sie\");\n            playedTypes[curPlayer].add(data.getGamesPlayedPerType()[Games.WEITER.ordinal()], \"Weiter\");\n\n            \/\/ percentage of won games by gametype\n            int soliCompleteAmount = data.getGamesPlayedPerType()[Games.SOLO.ordinal()]\n                    + data.getGamesPlayedPerType()[Games.SIE.ordinal()]\n                    + data.getGamesPlayedPerType()[Games.TOUT.ordinal()];\n            int soliCompleteAmountWon = data.getGamesWonPerType()[Games.SOLO.ordinal()]\n                    + data.getGamesWonPerType()[Games.SIE.ordinal()]\n                    + data.getGamesWonPerType()[Games.TOUT.ordinal()];\n            double soliGesamtWonPerc = (soliCompleteAmount > 0\n                    ? (double) soliCompleteAmountWon \/ soliCompleteAmount\n                    : 0.0) * 100;\n\n            while (wonGames[curPlayer].getRowCount() > 0) {\n                wonGames[curPlayer].removeLast();\n            }\n            wonGames[curPlayer].add(1, data.getGamesWonPerc(), \"Gesamt\");\n            wonGames[curPlayer].add(2, data.getGamesWonPerTypePerc()[Games.RUFSPIEL.ordinal()], \"Rufspiele\");\n            wonGames[curPlayer].add(3, soliGesamtWonPerc, \"Soli gesamt\");\n            wonGames[curPlayer].add(4, data.getGamesWonPerTypePerc()[Games.SOLO.ordinal()], \"Soli normal\");\n            wonGames[curPlayer].add(5, data.getGamesWonPerTypePerc()[Games.TOUT.ordinal()], \"Soli Tout\");\n            wonGames[curPlayer].add(6, data.getGamesWonPerTypePerc()[Games.SIE.ordinal()], \"Soli Sie\");\n        }\n    }\n\n    private static PiePlot createPlayedTypesPlot(Players player) {\n        int playerIndex = player.ordinal();\n\n        PiePlot plot = new PiePlot(playedTypes[playerIndex]);\n\n        PointRenderer pointRenderer = plot\n                .getPointRenderer(playedTypes[playerIndex]);\n        pointRenderer.setValueVisible(true);\n        pointRenderer.setValueColumn(1);\n\n        \/\/ Format plot\n        plot.getTitle().setText(\"Anzahl gespielter Spieltypen\");\n        \/\/ Change plot size\n        plot.setRadius(0.9);\n        \/\/ Display a legend\n        plot.setLegendVisible(true);\n        \/\/ Add some margin to the plot area\n        plot.setInsets(new Insets2D.Double(20.0, 40.0, 40.0, 40.0));\n\n        PieSliceRenderer pieSliceRenderer = (PieSliceRenderer) plot\n                .getPointRenderer(playedTypes[playerIndex]);\n\n        \/\/ Change relative size of inner region\n        pieSliceRenderer.setInnerRadius(0.4);\n        \/\/ Change the width of gaps between segments\n        pieSliceRenderer.setGap(0.2);\n        \/\/ Show labels\n        pieSliceRenderer.setValueVisible(true);\n        pieSliceRenderer.setValueColor(Color.WHITE);\n        pieSliceRenderer.setValueFont(Font.decode(null).deriveFont(Font.BOLD));\n\n        return plot;\n    }\n\n    public BarPlot createWonGamesBarPlot(Players player) {\n        int playerIndex = player.ordinal();\n\n        \/\/ Create new bar plot\n        BarPlot plot = new BarPlot(wonGames);\n\n        \/\/ Format plot\n        plot.getTitle().setText(\"Gewonnene Spiele pro Spieltyp (in %)\");\n        plot.setInsets(new Insets2D.Double(40.0, 40.0, 40.0, 40.0));\n        plot.setBarWidth(0.075);\n\n        \/\/ Format bars\n        PointRenderer pointRenderer = plot.getPointRenderer(wonGames[playerIndex]);\n        BarRenderer barRenderer = (BarRenderer) pointRenderer;\n\n        barRenderer.setColor(new LinearGradientPaint(0f, 0f, 0f, 1f,\n                new float[] { 0.0f, 1.0f }, new Color[] { COLOR1,\n                        GraphicsUtils.deriveBrighter(COLOR1) }));\n        barRenderer.setBorderStroke(new BasicStroke(3f));\n        barRenderer.setBorderColor(new LinearGradientPaint(0f, 0f, 0f, 1f,\n                new float[] { 0.0f, 1.0f }, new Color[] {\n                        GraphicsUtils.deriveBrighter(COLOR1), COLOR1 }));\n\n        pointRenderer.setValueVisible(true);\n        pointRenderer.setValueColumn(2);\n\n        pointRenderer.setValueLocation(Location.CENTER);\n        pointRenderer.setValueColor(GraphicsUtils.deriveDarker(COLOR1));\n        pointRenderer.setValueFont(Font.decode(null).deriveFont(Font.BOLD));\n\n        return plot;\n    }\n}","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"9c9bcde5f40d587a2710614c60c6e0309f2f7b6e","subject":"[MNG-3193] Adding pointcut and advice to provide backward compat on invalid lifecycle phase names (these bindings will be ignored).","message":"[MNG-3193] Adding pointcut and advice to provide backward compat on invalid lifecycle phase names (these bindings will be ignored).\n\ngit-svn-id: 2c527eb49caa05e19d6b2be874bf74fa9d7ea670@593310 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"vedmishr\/demo1,cstamas\/maven,stephenc\/maven,aheritier\/maven,njuneau\/maven,Mounika-Chirukuri\/maven,barthel\/maven,olamy\/maven,trajano\/maven,lbndev\/maven,xasx\/maven,josephw\/maven,wangyuesong\/maven,cstamas\/maven,olamy\/maven,Distrotech\/maven,pkozelka\/maven,changbai1980\/maven,gorcz\/maven,mcculls\/maven,rogerchina\/maven,karthikjaps\/maven,dsyer\/maven,Tibor17\/maven,ChristianSchulte\/maven,skitt\/maven,ChristianSchulte\/maven,aheritier\/maven,xasx\/maven,gorcz\/maven,dsyer\/maven,mizdebsk\/maven,karthikjaps\/maven,keith-turner\/maven,njuneau\/maven,rogerchina\/maven,stephenc\/maven,kidaa\/maven-1,trajano\/maven,stephenc\/maven,atanasenko\/maven,gorcz\/maven,wangyuesong0\/maven,skitt\/maven,wangyuesong0\/maven,apache\/maven,wangyuesong0\/maven,njuneau\/maven,Tibor17\/maven,changbai1980\/maven,josephw\/maven,atanasenko\/maven,mizdebsk\/maven,likaiwalkman\/maven,Mounika-Chirukuri\/maven,keith-turner\/maven,lbndev\/maven,runepeter\/maven-deploy-plugin-2.8.1,apache\/maven,josephw\/maven,lbndev\/maven,aheritier\/maven,likaiwalkman\/maven,mizdebsk\/maven,apache\/maven,wangyuesong\/maven,dsyer\/maven,kidaa\/maven-1,cstamas\/maven,wangyuesong\/maven,barthel\/maven,mcculls\/maven,Mounika-Chirukuri\/maven,karthikjaps\/maven,trajano\/maven,changbai1980\/maven,barthel\/maven,keith-turner\/maven,xasx\/maven,Distrotech\/maven,olamy\/maven,vedmishr\/demo1,mcculls\/maven,kidaa\/maven-1,vedmishr\/demo1,runepeter\/maven-deploy-plugin-2.8.1,pkozelka\/maven,skitt\/maven,likaiwalkman\/maven,ChristianSchulte\/maven,pkozelka\/maven,atanasenko\/maven,rogerchina\/maven","old_file":"maven-core\/src\/main\/aspect\/org\/apache\/maven\/compat\/plugin\/Maven20xCompatAspect.aj","new_file":"maven-core\/src\/main\/aspect\/org\/apache\/maven\/compat\/plugin\/Maven20xCompatAspect.aj","new_contents":"package org.apache.maven.compat.plugin;\n\nimport org.apache.maven.lifecycle.MojoBindingUtils;\nimport org.apache.maven.lifecycle.LifecycleUtils;\nimport org.apache.maven.lifecycle.NoSuchPhaseException;\nimport org.apache.maven.execution.MavenExecutionRequest;\nimport org.apache.maven.execution.MavenExecutionResult;\nimport org.apache.maven.execution.MavenSession;\nimport org.apache.maven.extension.DefaultExtensionManager;\nimport org.apache.maven.execution.MavenRealmManager;\nimport org.apache.maven.artifact.Artifact;\nimport org.apache.maven.artifact.factory.ArtifactFactory;\nimport org.apache.maven.artifact.metadata.ResolutionGroup;\nimport org.apache.maven.artifact.repository.ArtifactRepository;\nimport org.apache.maven.artifact.resolver.ArtifactNotFoundException;\nimport org.apache.maven.artifact.resolver.ArtifactResolutionException;\nimport org.apache.maven.artifact.versioning.DefaultArtifactVersion;\nimport org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;\nimport org.apache.maven.artifact.versioning.VersionRange;\nimport org.apache.maven.lifecycle.model.MojoBinding;\nimport org.apache.maven.model.Plugin;\nimport org.apache.maven.plugin.DefaultPluginManager;\nimport org.apache.maven.plugin.InvalidPluginException;\nimport org.apache.maven.plugin.PluginManager;\nimport org.apache.maven.plugin.PluginManagerException;\nimport org.apache.maven.plugin.PluginNotFoundException;\nimport org.apache.maven.plugin.descriptor.PluginDescriptor;\nimport org.apache.maven.plugin.version.PluginVersionNotFoundException;\nimport org.apache.maven.plugin.version.PluginVersionResolutionException;\nimport org.apache.maven.project.MavenProject;\nimport org.apache.maven.settings.MavenSettingsBuilder;\nimport org.apache.maven.settings.DefaultMavenSettingsBuilder;\nimport org.apache.maven.settings.Settings;\nimport org.codehaus.plexus.classworlds.realm.ClassRealm;\nimport org.codehaus.plexus.classworlds.realm.NoSuchRealmException;\nimport org.codehaus.plexus.util.xml.pull.XmlPullParserException;\nimport org.codehaus.plexus.util.xml.Xpp3Dom;\nimport org.codehaus.plexus.logging.Logger;\nimport org.codehaus.plexus.logging.LogEnabled;\nimport org.codehaus.plexus.PlexusContainer;\nimport org.codehaus.plexus.PlexusConstants;\nimport org.codehaus.plexus.context.Context;\nimport org.codehaus.plexus.context.ContextException;\n\nimport java.io.IOException;\nimport java.util.Iterator;\nimport java.util.Collection;\nimport java.util.Set;\n\npublic privileged aspect Maven20xCompatAspect\n{\n\n    \/\/ pointcut to avoid recursive matching on behavior injected by this aspect.\n    private pointcut notHere(): !within( Maven20xCompatAspect );\n\n    \/\/ GRAB Session as soon as it's constructed.\n    private MavenSession session;\n\n    private pointcut sessionCreation( MavenSession session ):\n        execution( public MavenSession+.new(..) )\n        && this( session )\n        && notHere();\n\n    \/\/ capture the session instance.\n    after( MavenSession session ): sessionCreation( session )\n    {\n        this.session = session;\n    }\n\n    \/\/ USE Session to compensate for old verifyPlugin(..) API.\n    private pointcut verifyPlugin( Plugin plugin, MavenProject project, PluginManager manager ):\n        execution( public PluginDescriptor PluginManager+.verifyPlugin( Plugin, MavenProject, Settings, ArtifactRepository ) )\n        && args( plugin, project, .. )\n        && target( manager )\n        && notHere();\n\n    \/\/ redirect the old verifyPlugin(..) call to the new one, using the captured session instance above.\n    PluginDescriptor around( Plugin plugin,\n                             MavenProject project,\n                             PluginManager manager )\n        throws ArtifactResolutionException, ArtifactNotFoundException, PluginNotFoundException,\n        PluginVersionResolutionException, InvalidPluginException, PluginManagerException,\n        PluginVersionNotFoundException:\n            verifyPlugin( plugin, project, manager )\n    {\n        return manager.verifyPlugin( plugin, project, session );\n    }\n\n    \/\/ Re-Introduce old verifyPlugin(..) API.\n    public PluginDescriptor PluginManager.verifyPlugin( Plugin plugin,\n                                                        MavenProject project,\n                                                        Settings settings,\n                                                        ArtifactRepository localRepository )\n    {\n        \/\/ this will always be diverted, so no need to do anything.\n        return null;\n    }\n\n    public PluginDescriptor DefaultPluginManager.verifyPlugin( Plugin plugin,\n                                                        MavenProject project,\n                                                        Settings settings,\n                                                        ArtifactRepository localRepository )\n    {\n        \/\/ this will always be diverted, so no need to do anything.\n        return null;\n    }\n\n    private pointcut getPluginDescriptorForPrefix( String prefix, PluginManager manager ):\n        execution( public PluginDescriptor PluginManager+.getPluginDescriptorForPrefix( String ) )\n        && args( prefix )\n        && target( manager )\n        && notHere();\n\n    PluginDescriptor around( String prefix, PluginManager manager ): getPluginDescriptorForPrefix( prefix, manager )\n    {\n        \/\/ TODO: Implement Me!\n        return null;\n    }\n\n    public PluginDescriptor PluginManager.getPluginDescriptorForPrefix( String prefix )\n    {\n        return null;\n    }\n\n    public PluginDescriptor DefaultPluginManager.getPluginDescriptorForPrefix( String prefix )\n    {\n        return null;\n    }\n\n    \/\/ Intercept retrieval of artifact dependencies of an extension, inject plexus-utils if it's not there.\n    private pointcut extDepArtifactsResolved( DefaultExtensionManager mgr ):\n        call( public Set ResolutionGroup+.getArtifacts() )\n        && within( DefaultExtensionManager+ )\n        && this( mgr )\n        && notHere();\n\n    \/\/ We use the same hack here to make sure that plexus 1.1 is available for extensions that do\n    \/\/ not declare plexus-utils but need it. MNG-2900\n    Set around( DefaultExtensionManager mgr ): extDepArtifactsResolved( mgr )\n    {\n        Set result = proceed( mgr );\n\n        checkPlexusUtils( result, mgr.artifactFactory );\n\n        return result;\n    }\n\n    \/\/ Intercept retrieval of artifact dependencies of a plugin, inject plexus-utils if it's not there.\n    private pointcut pluginDepArtifactsResolved( DefaultPluginManager mgr ):\n        call( public Set ResolutionGroup+.getArtifacts() )\n        && cflow( execution( Set DefaultPluginManager+.getPluginArtifacts(..) ) )\n        && this( mgr )\n        && notHere();\n\n    Set around( DefaultPluginManager mgr ): pluginDepArtifactsResolved( mgr )\n    {\n        Set result = proceed( mgr );\n\n        checkPlexusUtils( result, mgr.artifactFactory );\n\n        return result;\n    }\n\n    \/\/ GRAB the request when it's passed into a method that returns a corresponding result.\n    \/\/ NOTE: We'll use this in multiple places below...\n    private MavenExecutionRequest request;\n\n    private pointcut methodsTakingRequest( MavenExecutionRequest request ):\n        execution( MavenExecutionResult *.*( MavenExecutionRequest ) )\n        && args( request )\n        && notHere();\n\n    \/\/ capture the request instance before it's passed into any method that returns a corresponding MavenExecutionResult.\n    before( MavenExecutionRequest request ): methodsTakingRequest( request )\n    {\n        this.request = request;\n    }\n\n    \/\/ USE Request to compensate for old buildSettings() API.\n    private pointcut buildSettings( MavenSettingsBuilder builder ):\n        execution( public Settings MavenSettingsBuilder+.buildSettings() )\n        && target( builder )\n        && notHere();\n\n    \/\/ redirect old buildSettings() call to the new one, using the request captured above.\n    Settings around( MavenSettingsBuilder builder )\n        throws IOException, XmlPullParserException:\n            buildSettings( builder )\n    {\n        return builder.buildSettings( request );\n    }\n\n    \/\/ Re-Introduce old buildSettings() API.\n    public Settings MavenSettingsBuilder.buildSettings()\n        throws IOException, XmlPullParserException\n    {\n        return null;\n    }\n\n    public Settings DefaultMavenSettingsBuilder.buildSettings()\n    throws IOException, XmlPullParserException\n    {\n        return null;\n    }\n\n    \/\/ container used in the plugin manager.\n    private PlexusContainer container;\n\n    private pointcut pluginManagerContextualized( Context context ):\n        execution( void DefaultPluginManager+.contextualize( Context ) )\n        && args( context );\n\n    \/\/ capture the container when the DefaultPluginManager is contextualized.\n    void around( Context context ) throws ContextException: pluginManagerContextualized( context )\n    {\n        proceed( context );\n        container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY );\n    }\n\n    private pointcut pluginRealmCreation( Plugin plugin ):\n        call( ClassRealm MavenRealmManager+.createPluginRealm( Plugin, Artifact, Collection ) )\n        && withincode( void DefaultPluginManager.addPlugin(..) )\n        && args( plugin, .. );\n\n    \/\/ Add various imports for Xpp3 stuff back into the core realm every time a plugin realm is created.\n    ClassRealm around( Plugin plugin ): pluginRealmCreation( plugin )\n    {\n        ClassRealm pluginRealm = proceed( plugin );\n\n        try\n        {\n            String parentRealmId = container.getContainerRealm().getId();\n\n            \/\/ adding for MNG-3012 to try to work around problems with Xpp3Dom (from plexus-utils)\n            \/\/ spawning a ClassCastException when a mojo calls plugin.getConfiguration() from maven-model...\n            pluginRealm.importFrom( parentRealmId, Xpp3Dom.class.getName() );\n            pluginRealm.importFrom( parentRealmId, \"org.codehaus.plexus.util.xml.pull\" );\n\n            \/\/ Adding for MNG-2878, since maven-reporting-impl was removed from the\n            \/\/ internal list of artifacts managed by maven, the classloader is different\n            \/\/ between maven-reporting-impl and maven-reporting-api...so this resource\n            \/\/ is not available from the AbstractMavenReport since it uses:\n            \/\/ getClass().getResourceAsStream( \"\/default-report.xml\" )\n            \/\/ (maven-reporting-impl version 2.0; line 134; affects: checkstyle plugin, and probably others)\n            pluginRealm.importFrom( parentRealmId, \"\/default-report.xml\" );\n        }\n        catch ( NoSuchRealmException e )\n        {\n            \/\/ can't happen here. All realms are concretely resolved by now.\n        }\n\n        return pluginRealm;\n    }\n\n    \/\/ Grab this so we have a voice!\n    private Logger logger;\n\n    private pointcut enableLoggingCall( Logger logger ):\n        execution( void LogEnabled+.enableLogging( Logger ) )\n        && args( logger );\n\n    after( Logger logger ): enableLoggingCall( logger )\n    {\n        if ( this.logger == null )\n        {\n            this.logger = logger;\n        }\n    }\n\n    private pointcut addMojoBindingCall( String phase, MojoBinding binding ):\n        call( void LifecycleUtils.addMojoBinding( String, MojoBinding, .. ) )\n        && args( phase, binding, .. );\n\n    void around( String phase, MojoBinding binding ): addMojoBindingCall( phase, binding )\n    {\n        try\n        {\n            proceed( phase, binding );\n        }\n        catch ( NoSuchPhaseException e )\n        {\n            logger.debug( \"Mojo execution: \" + MojoBindingUtils.toString( binding )\n                          + \" cannot be attached to lifecycle phase: \" + phase\n                          + \"; it does not exist. Ignoring this binding.\" );\n        }\n    }\n\n    \/\/ --------------------------\n    \/\/ UTILITIES\n    \/\/ --------------------------\n\n    private VersionRange vr = null;\n    private Artifact plexusUtilsArtifact = null;\n\n    private void checkPlexusUtils( Set dependencyArtifacts, ArtifactFactory artifactFactory )\n    {\n        \/\/ ----------------------------------------------------------------------------\n        \/\/ If the plugin already declares a dependency on plexus-utils then we're all\n        \/\/ set as the plugin author is aware of its use. If we don't have a dependency\n        \/\/ on plexus-utils then we must protect users from stupid plugin authors who\n        \/\/ did not declare a direct dependency on plexus-utils because the version\n        \/\/ Maven uses is hidden from downstream use. We will also bump up any\n        \/\/ anything below 1.1 to 1.1 as this mimics the behaviour in 2.0.5 where\n        \/\/ plexus-utils 1.1 was being forced into use.\n        \/\/ ----------------------------------------------------------------------------\n\n        if ( vr == null )\n        {\n            try\n            {\n                vr = VersionRange.createFromVersionSpec( \"[1.1,)\" );\n            }\n            catch ( InvalidVersionSpecificationException e )\n            {\n                \/\/ Won't happen\n            }\n        }\n\n        boolean plexusUtilsPresent = false;\n\n        for ( Iterator i = dependencyArtifacts.iterator(); i.hasNext(); )\n        {\n            Artifact a = (Artifact) i.next();\n\n            if ( a.getArtifactId().equals( \"plexus-utils\" )\n                 && vr.containsVersion( new DefaultArtifactVersion( a.getVersion() ) ) )\n            {\n                plexusUtilsPresent = true;\n\n                break;\n            }\n        }\n\n        if ( !plexusUtilsPresent )\n        {\n            \/\/ We will add plexus-utils as every plugin was getting this anyway from Maven itself. We will set the\n            \/\/ version to the latest version we know that works as of the 2.0.6 release. We set the scope to runtime\n            \/\/ as this is what's implicitly happening in 2.0.6.\n\n            if ( plexusUtilsArtifact == null )\n            {\n                plexusUtilsArtifact = artifactFactory.createArtifact( \"org.codehaus.plexus\",\n                                                                      \"plexus-utils\",\n                                                                      \"1.1\",\n                                                                      Artifact.SCOPE_RUNTIME,\n                                                                      \"jar\" );\n            }\n\n            dependencyArtifacts.add( plexusUtilsArtifact );\n        }\n    }\n\n}\n","old_contents":"package org.apache.maven.compat.plugin;\n\nimport org.apache.maven.execution.MavenExecutionRequest;\nimport org.apache.maven.execution.MavenExecutionResult;\nimport org.apache.maven.execution.MavenSession;\nimport org.apache.maven.extension.DefaultExtensionManager;\nimport org.apache.maven.execution.MavenRealmManager;\nimport org.apache.maven.artifact.Artifact;\nimport org.apache.maven.artifact.factory.ArtifactFactory;\nimport org.apache.maven.artifact.metadata.ResolutionGroup;\nimport org.apache.maven.artifact.repository.ArtifactRepository;\nimport org.apache.maven.artifact.resolver.ArtifactNotFoundException;\nimport org.apache.maven.artifact.resolver.ArtifactResolutionException;\nimport org.apache.maven.artifact.versioning.DefaultArtifactVersion;\nimport org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;\nimport org.apache.maven.artifact.versioning.VersionRange;\nimport org.apache.maven.model.Plugin;\nimport org.apache.maven.plugin.DefaultPluginManager;\nimport org.apache.maven.plugin.InvalidPluginException;\nimport org.apache.maven.plugin.PluginManager;\nimport org.apache.maven.plugin.PluginManagerException;\nimport org.apache.maven.plugin.PluginNotFoundException;\nimport org.apache.maven.plugin.descriptor.PluginDescriptor;\nimport org.apache.maven.plugin.version.PluginVersionNotFoundException;\nimport org.apache.maven.plugin.version.PluginVersionResolutionException;\nimport org.apache.maven.project.MavenProject;\nimport org.apache.maven.settings.MavenSettingsBuilder;\nimport org.apache.maven.settings.DefaultMavenSettingsBuilder;\nimport org.apache.maven.settings.Settings;\nimport org.codehaus.plexus.classworlds.realm.ClassRealm;\nimport org.codehaus.plexus.classworlds.realm.NoSuchRealmException;\nimport org.codehaus.plexus.util.xml.pull.XmlPullParserException;\nimport org.codehaus.plexus.util.xml.Xpp3Dom;\nimport org.codehaus.plexus.PlexusContainer;\nimport org.codehaus.plexus.PlexusConstants;\nimport org.codehaus.plexus.context.Context;\nimport org.codehaus.plexus.context.ContextException;\n\nimport java.io.IOException;\nimport java.util.Iterator;\nimport java.util.Collection;\nimport java.util.Set;\n\npublic privileged aspect Maven20xCompatAspect\n{\n\n    \/\/ pointcut to avoid recursive matching on behavior injected by this aspect.\n    private pointcut notHere(): !within( Maven20xCompatAspect );\n\n    \/\/ GRAB Session as soon as it's constructed.\n    private MavenSession session;\n\n    private pointcut sessionCreation( MavenSession session ):\n        execution( public MavenSession+.new(..) )\n        && this( session )\n        && notHere();\n\n    \/\/ capture the session instance.\n    after( MavenSession session ): sessionCreation( session )\n    {\n        this.session = session;\n    }\n\n    \/\/ USE Session to compensate for old verifyPlugin(..) API.\n    private pointcut verifyPlugin( Plugin plugin, MavenProject project, PluginManager manager ):\n        execution( public PluginDescriptor PluginManager+.verifyPlugin( Plugin, MavenProject, Settings, ArtifactRepository ) )\n        && args( plugin, project, .. )\n        && target( manager )\n        && notHere();\n\n    \/\/ redirect the old verifyPlugin(..) call to the new one, using the captured session instance above.\n    PluginDescriptor around( Plugin plugin,\n                             MavenProject project,\n                             PluginManager manager )\n        throws ArtifactResolutionException, ArtifactNotFoundException, PluginNotFoundException,\n        PluginVersionResolutionException, InvalidPluginException, PluginManagerException,\n        PluginVersionNotFoundException:\n            verifyPlugin( plugin, project, manager )\n    {\n        return manager.verifyPlugin( plugin, project, session );\n    }\n\n    \/\/ Re-Introduce old verifyPlugin(..) API.\n    public PluginDescriptor PluginManager.verifyPlugin( Plugin plugin,\n                                                        MavenProject project,\n                                                        Settings settings,\n                                                        ArtifactRepository localRepository )\n    {\n        \/\/ this will always be diverted, so no need to do anything.\n        return null;\n    }\n\n    public PluginDescriptor DefaultPluginManager.verifyPlugin( Plugin plugin,\n                                                        MavenProject project,\n                                                        Settings settings,\n                                                        ArtifactRepository localRepository )\n    {\n        \/\/ this will always be diverted, so no need to do anything.\n        return null;\n    }\n\n    private pointcut getPluginDescriptorForPrefix( String prefix, PluginManager manager ):\n        execution( public PluginDescriptor PluginManager+.getPluginDescriptorForPrefix( String ) )\n        && args( prefix )\n        && target( manager )\n        && notHere();\n\n    PluginDescriptor around( String prefix, PluginManager manager ): getPluginDescriptorForPrefix( prefix, manager )\n    {\n        \/\/ TODO: Implement Me!\n        return null;\n    }\n\n    public PluginDescriptor PluginManager.getPluginDescriptorForPrefix( String prefix )\n    {\n        return null;\n    }\n\n    public PluginDescriptor DefaultPluginManager.getPluginDescriptorForPrefix( String prefix )\n    {\n        return null;\n    }\n\n    \/\/ Intercept retrieval of artifact dependencies of an extension, inject plexus-utils if it's not there.\n    private pointcut extDepArtifactsResolved( DefaultExtensionManager mgr ):\n        call( public Set ResolutionGroup+.getArtifacts() )\n        && within( DefaultExtensionManager+ )\n        && this( mgr )\n        && notHere();\n\n    \/\/ We use the same hack here to make sure that plexus 1.1 is available for extensions that do\n    \/\/ not declare plexus-utils but need it. MNG-2900\n    Set around( DefaultExtensionManager mgr ): extDepArtifactsResolved( mgr )\n    {\n        Set result = proceed( mgr );\n\n        checkPlexusUtils( result, mgr.artifactFactory );\n\n        return result;\n    }\n\n    \/\/ Intercept retrieval of artifact dependencies of a plugin, inject plexus-utils if it's not there.\n    private pointcut pluginDepArtifactsResolved( DefaultPluginManager mgr ):\n        call( public Set ResolutionGroup+.getArtifacts() )\n        && cflow( execution( Set DefaultPluginManager+.getPluginArtifacts(..) ) )\n        && this( mgr )\n        && notHere();\n\n    Set around( DefaultPluginManager mgr ): pluginDepArtifactsResolved( mgr )\n    {\n        Set result = proceed( mgr );\n\n        checkPlexusUtils( result, mgr.artifactFactory );\n\n        return result;\n    }\n\n    \/\/ GRAB the request when it's passed into a method that returns a corresponding result.\n    private MavenExecutionRequest request;\n\n    private pointcut methodsTakingRequest( MavenExecutionRequest request ):\n        execution( MavenExecutionResult *.*( MavenExecutionRequest ) )\n        && args( request )\n        && notHere();\n\n    \/\/ capture the request instance before it's passed into any method that returns a corresponding MavenExecutionResult.\n    before( MavenExecutionRequest request ): methodsTakingRequest( request )\n    {\n        this.request = request;\n    }\n\n    \/\/ USE Request to compensate for old buildSettings() API.\n    private pointcut buildSettings( MavenSettingsBuilder builder ):\n        execution( public Settings MavenSettingsBuilder+.buildSettings() )\n        && target( builder )\n        && notHere();\n\n    \/\/ redirect old buildSettings() call to the new one, using the request captured above.\n    Settings around( MavenSettingsBuilder builder )\n        throws IOException, XmlPullParserException:\n            buildSettings( builder )\n    {\n        return builder.buildSettings( request );\n    }\n\n    \/\/ Re-Introduce old buildSettings() API.\n    public Settings MavenSettingsBuilder.buildSettings()\n        throws IOException, XmlPullParserException\n    {\n        return null;\n    }\n\n    public Settings DefaultMavenSettingsBuilder.buildSettings()\n    throws IOException, XmlPullParserException\n    {\n        return null;\n    }\n\n    \/\/ container used in the plugin manager.\n    private PlexusContainer container;\n\n    private pointcut pluginManagerContextualized( Context context ):\n        execution( void DefaultPluginManager+.contextualize( Context ) )\n        && args( context );\n\n    \/\/ capture the container when the DefaultPluginManager is contextualized.\n    void around( Context context ) throws ContextException: pluginManagerContextualized( context )\n    {\n        proceed( context );\n        container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY );\n    }\n\n    private pointcut pluginRealmCreation( Plugin plugin ):\n        call( ClassRealm MavenRealmManager+.createPluginRealm( Plugin, Artifact, Collection ) )\n        && withincode( void DefaultPluginManager.addPlugin(..) )\n        && args( plugin, .. );\n\n    \/\/ Add various imports for Xpp3 stuff back into the core realm every time a plugin realm is created.\n    ClassRealm around( Plugin plugin ): pluginRealmCreation( plugin )\n    {\n        ClassRealm pluginRealm = proceed( plugin );\n\n        try\n        {\n            String parentRealmId = container.getContainerRealm().getId();\n\n            \/\/ adding for MNG-3012 to try to work around problems with Xpp3Dom (from plexus-utils)\n            \/\/ spawning a ClassCastException when a mojo calls plugin.getConfiguration() from maven-model...\n            pluginRealm.importFrom( parentRealmId, Xpp3Dom.class.getName() );\n            pluginRealm.importFrom( parentRealmId, \"org.codehaus.plexus.util.xml.pull\" );\n\n            \/\/ Adding for MNG-2878, since maven-reporting-impl was removed from the\n            \/\/ internal list of artifacts managed by maven, the classloader is different\n            \/\/ between maven-reporting-impl and maven-reporting-api...so this resource\n            \/\/ is not available from the AbstractMavenReport since it uses:\n            \/\/ getClass().getResourceAsStream( \"\/default-report.xml\" )\n            \/\/ (maven-reporting-impl version 2.0; line 134; affects: checkstyle plugin, and probably others)\n            pluginRealm.importFrom( parentRealmId, \"\/default-report.xml\" );\n        }\n        catch ( NoSuchRealmException e )\n        {\n            \/\/ can't happen here. All realms are concretely resolved by now.\n        }\n\n        return pluginRealm;\n    }\n\n    \/\/ --------------------------\n    \/\/ UTILITIES\n    \/\/ --------------------------\n\n    private VersionRange vr = null;\n    private Artifact plexusUtilsArtifact = null;\n\n    private void checkPlexusUtils( Set dependencyArtifacts, ArtifactFactory artifactFactory )\n    {\n        \/\/ ----------------------------------------------------------------------------\n        \/\/ If the plugin already declares a dependency on plexus-utils then we're all\n        \/\/ set as the plugin author is aware of its use. If we don't have a dependency\n        \/\/ on plexus-utils then we must protect users from stupid plugin authors who\n        \/\/ did not declare a direct dependency on plexus-utils because the version\n        \/\/ Maven uses is hidden from downstream use. We will also bump up any\n        \/\/ anything below 1.1 to 1.1 as this mimics the behaviour in 2.0.5 where\n        \/\/ plexus-utils 1.1 was being forced into use.\n        \/\/ ----------------------------------------------------------------------------\n\n        if ( vr == null )\n        {\n            try\n            {\n                vr = VersionRange.createFromVersionSpec( \"[1.1,)\" );\n            }\n            catch ( InvalidVersionSpecificationException e )\n            {\n                \/\/ Won't happen\n            }\n        }\n\n        boolean plexusUtilsPresent = false;\n\n        for ( Iterator i = dependencyArtifacts.iterator(); i.hasNext(); )\n        {\n            Artifact a = (Artifact) i.next();\n\n            if ( a.getArtifactId().equals( \"plexus-utils\" )\n                 && vr.containsVersion( new DefaultArtifactVersion( a.getVersion() ) ) )\n            {\n                plexusUtilsPresent = true;\n\n                break;\n            }\n        }\n\n        if ( !plexusUtilsPresent )\n        {\n            \/\/ We will add plexus-utils as every plugin was getting this anyway from Maven itself. We will set the\n            \/\/ version to the latest version we know that works as of the 2.0.6 release. We set the scope to runtime\n            \/\/ as this is what's implicitly happening in 2.0.6.\n\n            if ( plexusUtilsArtifact == null )\n            {\n                plexusUtilsArtifact = artifactFactory.createArtifact( \"org.codehaus.plexus\",\n                                                                      \"plexus-utils\",\n                                                                      \"1.1\",\n                                                                      Artifact.SCOPE_RUNTIME,\n                                                                      \"jar\" );\n            }\n\n            dependencyArtifacts.add( plexusUtilsArtifact );\n        }\n    }\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"1ce073a6962a2228296fcb9b9759991bbba0dcb6","subject":"SPR-2718 - customise annotation source to allow annotations on non-public methods","message":"SPR-2718 - customise annotation source to allow annotations on non-public methods\n\n\ngit-svn-id: b619a0c99665f88f1afe72824344cefe9a1c8c90@12137 fd5a2b45-1f63-4059-99e9-3c7cb7fd75c8\n","repos":"cbeams-archive\/spring-framework-2.5.x,cbeams-archive\/spring-framework-2.5.x,cbeams-archive\/spring-framework-2.5.x,cbeams-archive\/spring-framework-2.5.x","old_file":"aspectj\/src\/org\/springframework\/transaction\/aspectj\/AnnotationTransactionAspect.aj","new_file":"aspectj\/src\/org\/springframework\/transaction\/aspectj\/AnnotationTransactionAspect.aj","new_contents":"\/*\n * Copyright 2002-2005 the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.springframework.transaction.aspectj;\n\nimport org.springframework.transaction.annotation.AnnotationTransactionAttributeSource;\nimport org.springframework.transaction.annotation.Transactional;\n\n\/**\n * Concrete AspectJ transaction aspect using Spring Transactional annotation\n * for JDK 1.5+.\n * \n * <p>\n * When using this aspect, you <i>must<\/i> annotate the implementation class \n * (and\/or methods within that class), <i>not<\/i> the interface (if any) that\n * the class implements. AspectJ follows Java's rule that annotations on \n * interfaces are <i>not<\/i> inherited.\n * <\/p>\n * <p>A @Transactional annotation on a class specifies the default transaction\n * semantics for the execution of any <b>public<\/b> operation in the class.<\/p>\n * <p>A @Transactional annotation on a method within the class overrides the\n * default transaction semantics given by the class annotation (if present). \n * Methods with public, protected, and default visibility may all be annotated.\n * Annotating protected and default visibility methods directly is the only way\n * to get transaction demarcation for the execution of such operations.<\/p> \n *\n * @author Rod Johnson\n * @author Ramnivas Laddad\n * @author Adrian Colyer\n * @since 2.0\n * @see org.springframework.transaction.annotation.Transactional\n *\/\npublic aspect AnnotationTransactionAspect extends AbstractTransactionAspect {\n\t\n\tpublic AnnotationTransactionAspect() {\n\t\tsuper(new AnnotationTransactionAttributeSource() {\n\t\t\tprotected boolean allowPublicMethodsOnly() {\n\t\t\t\treturn false;\n\t\t\t}\t\t\n\t\t});\n\t}\n\n\t\/**\n\t * Matches the execution of any public method in a type with the\n\t * Transactional annotation, or any subtype of a type with the\n\t * Transactional annotation.\n\t *\/\n\tprivate pointcut executionOfAnyPublicMethodInAtTransactionalType() :\n\t\texecution(public * ((@Transactional *)+).*(..)) && @this(Transactional);\n\t\n\t\/**\n\t * Matches the execution of any non-private method with the \n\t * Transactional annotation.\n\t *\/\n\tprivate pointcut executionOfTransactionalNonPrivateMethod() :\n\t\texecution(!private * *(..)) && @annotation(Transactional);\n\t\n\t\/**\n\t * Definition of pointcut from super aspect - matched join points\n\t * will have Spring transaction management applied.\n\t *\/\t\n\tprotected pointcut transactionalMethodExecution(Object txObject) :\n\t\t(executionOfAnyPublicMethodInAtTransactionalType()\n\t\t || executionOfTransactionalNonPrivateMethod() )\n\t\t && this(txObject);\n\n\t\/**\n\t * Annotating private methods with @Transactional has no effect...\n\t *\/\n\tdeclare warning \n\t    \/\/ note, we should be able to say the following in one execution pcd, but\n\t    \/\/ aj doesn't like it...\n\t\t: execution(@Transactional * *(..)) &&\n\t\t  execution(private * *(..))\n\t\t: \"@Transactional annotation on private method will be ignored\";\n}\n","old_contents":"\/*\n * Copyright 2002-2005 the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.springframework.transaction.aspectj;\n\nimport org.springframework.transaction.annotation.AnnotationTransactionAttributeSource;\nimport org.springframework.transaction.annotation.Transactional;\n\n\/**\n * Concrete AspectJ transaction aspect using Spring Transactional annotation\n * for JDK 1.5+.\n * \n * <p>\n * When using this aspect, you <i>must<\/i> annotate the implementation class \n * (and\/or methods within that class), <i>not<\/i> the interface (if any) that\n * the class implements. AspectJ follows Java's rule that annotations on \n * interfaces are <i>not<\/i> inherited.\n * <\/p>\n * <p>A @Transactional annotation on a class specifies the default transaction\n * semantics for the execution of any <b>public<\/b> operation in the class.<\/p>\n * <p>A @Transactional annotation on a method within the class overrides the\n * default transaction semantics given by the class annotation (if present). \n * Methods with public, protected, and default visibility may all be annotated.\n * Annotating protected and default visibility methods directly is the only way\n * to get transaction demarcation for the execution of such operations.<\/p> \n *\n * @author Rod Johnson\n * @author Ramnivas Laddad\n * @author Adrian Colyer\n * @since 2.0\n * @see org.springframework.transaction.annotation.Transactional\n *\/\npublic aspect AnnotationTransactionAspect extends AbstractTransactionAspect {\n\t\n\tpublic AnnotationTransactionAspect() {\n\t\tsuper(new AnnotationTransactionAttributeSource());\n\t}\n\n\t\/**\n\t * Matches the execution of any public method in a type with the\n\t * Transactional annotation, or any subtype of a type with the\n\t * Transactional annotation.\n\t *\/\n\tprivate pointcut executionOfAnyPublicMethodInAtTransactionalType() :\n\t\texecution(public * ((@Transactional *)+).*(..)) && @this(Transactional);\n\t\n\t\/**\n\t * Matches the execution of any non-private method with the \n\t * Transactional annotation.\n\t *\/\n\tprivate pointcut executionOfTransactionalNonPrivateMethod() :\n\t\texecution(!private * *(..)) && @annotation(Transactional);\n\t\n\t\/**\n\t * Definition of pointcut from super aspect - matched join points\n\t * will have Spring transaction management applied.\n\t *\/\t\n\tprotected pointcut transactionalMethodExecution(Object txObject) :\n\t\t(executionOfAnyPublicMethodInAtTransactionalType()\n\t\t || executionOfTransactionalNonPrivateMethod() )\n\t\t && this(txObject);\n\n\t\/**\n\t * Annotating private methods with @Transactional has no effect...\n\t *\/\n\tdeclare warning \n\t    \/\/ note, we should be able to say the following in one execution pcd, but\n\t    \/\/ aj doesn't like it...\n\t\t: execution(@Transactional * *(..)) &&\n\t\t  execution(private * *(..))\n\t\t: \"@Transactional annotation on private method will be ignored\";\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"b67de25d679771e666a0850dcf3dd33f782b2483","subject":"add @Override in class AnnotationBeanConfigurerAspect","message":"add @Override in class AnnotationBeanConfigurerAspect\n","repos":"spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework","old_file":"spring-aspects\/src\/main\/java\/org\/springframework\/beans\/factory\/aspectj\/AnnotationBeanConfigurerAspect.aj","new_file":"spring-aspects\/src\/main\/java\/org\/springframework\/beans\/factory\/aspectj\/AnnotationBeanConfigurerAspect.aj","new_contents":"\/*\n * Copyright 2002-2017 the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      https:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.springframework.beans.factory.aspectj;\n\nimport java.io.Serializable;\n\nimport org.aspectj.lang.annotation.control.CodeGenerationHint;\n\nimport org.springframework.beans.factory.BeanFactory;\nimport org.springframework.beans.factory.BeanFactoryAware;\nimport org.springframework.beans.factory.DisposableBean;\nimport org.springframework.beans.factory.InitializingBean;\nimport org.springframework.beans.factory.annotation.AnnotationBeanWiringInfoResolver;\nimport org.springframework.beans.factory.annotation.Configurable;\nimport org.springframework.beans.factory.wiring.BeanConfigurerSupport;\n\n\/**\n * Concrete aspect that uses the {@link Configurable} annotation to identify\n * which classes need autowiring.\n *\n * <p>The bean name to look up will be taken from the {@code @Configurable}\n * annotation if specified; otherwise, the default bean name to look up will be\n * the fully qualified name of the class being configured.\n *\n * @author Rod Johnson\n * @author Ramnivas Laddad\n * @author Juergen Hoeller\n * @author Adrian Colyer\n * @since 2.0\n * @see org.springframework.beans.factory.annotation.Configurable\n * @see org.springframework.beans.factory.annotation.AnnotationBeanWiringInfoResolver\n *\/\npublic aspect AnnotationBeanConfigurerAspect extends AbstractInterfaceDrivenDependencyInjectionAspect\n\t\timplements BeanFactoryAware, InitializingBean, DisposableBean {\n\n\tprivate BeanConfigurerSupport beanConfigurerSupport = new BeanConfigurerSupport();\n\n\t@Override\n\tpublic void setBeanFactory(BeanFactory beanFactory) {\n\t\tthis.beanConfigurerSupport.setBeanWiringInfoResolver(new AnnotationBeanWiringInfoResolver());\n\t\tthis.beanConfigurerSupport.setBeanFactory(beanFactory);\n\t}\n\n\t@Override\n\tpublic void afterPropertiesSet() {\n\t\tthis.beanConfigurerSupport.afterPropertiesSet();\n\t}\n\n\t@Override\n\tpublic void configureBean(Object bean) {\n\t\tthis.beanConfigurerSupport.configureBean(bean);\n\t}\n\n\t@Override\n\tpublic void destroy() {\n\t\tthis.beanConfigurerSupport.destroy();\n\t}\n\n\n\tpublic pointcut inConfigurableBean() : @this(Configurable);\n\n\tpublic pointcut preConstructionConfiguration() : preConstructionConfigurationSupport(*);\n\n\t\/*\n\t * An intermediary to match preConstructionConfiguration signature (that doesn't expose the annotation object)\n\t *\/\n\t@CodeGenerationHint(ifNameSuffix=\"bb0\")\n\tprivate pointcut preConstructionConfigurationSupport(Configurable c) : @this(c) && if (c.preConstruction());\n\n\n\tdeclare parents: @Configurable * implements ConfigurableObject;\n\n\t\/*\n\t * This declaration shouldn't be needed,\n\t * except for an AspectJ bug (https:\/\/bugs.eclipse.org\/bugs\/show_bug.cgi?id=214559)\n\t *\/\n\tdeclare parents: @Configurable Serializable+ implements ConfigurableDeserializationSupport;\n\n}\n","old_contents":"\/*\n * Copyright 2002-2017 the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      https:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.springframework.beans.factory.aspectj;\n\nimport java.io.Serializable;\n\nimport org.aspectj.lang.annotation.control.CodeGenerationHint;\n\nimport org.springframework.beans.factory.BeanFactory;\nimport org.springframework.beans.factory.BeanFactoryAware;\nimport org.springframework.beans.factory.DisposableBean;\nimport org.springframework.beans.factory.InitializingBean;\nimport org.springframework.beans.factory.annotation.AnnotationBeanWiringInfoResolver;\nimport org.springframework.beans.factory.annotation.Configurable;\nimport org.springframework.beans.factory.wiring.BeanConfigurerSupport;\n\n\/**\n * Concrete aspect that uses the {@link Configurable} annotation to identify\n * which classes need autowiring.\n *\n * <p>The bean name to look up will be taken from the {@code @Configurable}\n * annotation if specified; otherwise, the default bean name to look up will be\n * the fully qualified name of the class being configured.\n *\n * @author Rod Johnson\n * @author Ramnivas Laddad\n * @author Juergen Hoeller\n * @author Adrian Colyer\n * @since 2.0\n * @see org.springframework.beans.factory.annotation.Configurable\n * @see org.springframework.beans.factory.annotation.AnnotationBeanWiringInfoResolver\n *\/\npublic aspect AnnotationBeanConfigurerAspect extends AbstractInterfaceDrivenDependencyInjectionAspect\n\t\timplements BeanFactoryAware, InitializingBean, DisposableBean {\n\n\tprivate BeanConfigurerSupport beanConfigurerSupport = new BeanConfigurerSupport();\n\n\n\tpublic void setBeanFactory(BeanFactory beanFactory) {\n\t\tthis.beanConfigurerSupport.setBeanWiringInfoResolver(new AnnotationBeanWiringInfoResolver());\n\t\tthis.beanConfigurerSupport.setBeanFactory(beanFactory);\n\t}\n\n\tpublic void afterPropertiesSet() {\n\t\tthis.beanConfigurerSupport.afterPropertiesSet();\n\t}\n\n\tpublic void configureBean(Object bean) {\n\t\tthis.beanConfigurerSupport.configureBean(bean);\n\t}\n\n\tpublic void destroy() {\n\t\tthis.beanConfigurerSupport.destroy();\n\t}\n\n\n\tpublic pointcut inConfigurableBean() : @this(Configurable);\n\n\tpublic pointcut preConstructionConfiguration() : preConstructionConfigurationSupport(*);\n\n\t\/*\n\t * An intermediary to match preConstructionConfiguration signature (that doesn't expose the annotation object)\n\t *\/\n\t@CodeGenerationHint(ifNameSuffix=\"bb0\")\n\tprivate pointcut preConstructionConfigurationSupport(Configurable c) : @this(c) && if (c.preConstruction());\n\n\n\tdeclare parents: @Configurable * implements ConfigurableObject;\n\n\t\/*\n\t * This declaration shouldn't be needed,\n\t * except for an AspectJ bug (https:\/\/bugs.eclipse.org\/bugs\/show_bug.cgi?id=214559)\n\t *\/\n\tdeclare parents: @Configurable Serializable+ implements ConfigurableDeserializationSupport;\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"3cb9f1dea2040f359aeacb200108959b85b508e7","subject":"Aspects ordering doing my head in","message":"Aspects ordering doing my head in\n","repos":"brownsys\/tracing-framework,brownsys\/tracing-framework,brownsys\/tracing-framework,brownsys\/tracing-framework,brownsys\/tracing-framework,brownsys\/tracing-framework,brownsys\/tracing-framework","old_file":"tracingplane\/aspects\/src\/main\/aspect\/edu\/brown\/cs\/systems\/tracing\/aspects\/AspectsOrdering.aj","new_file":"tracingplane\/aspects\/src\/main\/aspect\/edu\/brown\/cs\/systems\/tracing\/aspects\/AspectsOrdering.aj","new_contents":"package edu.brown.cs.systems.tracing.aspects;\n\nimport edu.brown.cs.systems.retro.aspects.cpu.Sleeping;\nimport edu.brown.cs.systems.retro.aspects.cpu.XTraceAPICalls;\nimport edu.brown.cs.systems.xtrace.logging.BaggageWrappers;\n\n\/** Declares aspect ordering for aspects from Retro and XTrace that modify the same classes *\/\npublic aspect AspectsOrdering {\n    declare precedence : BaggageWrappers, \/* --- *\/ XTraceAPICalls, Sleeping, \/* --- *\/ Futures, Runnables;\n}","old_contents":"package edu.brown.cs.systems.tracing.aspects;\n\nimport edu.brown.cs.systems.retro.aspects.cpu.Sleeping;\nimport edu.brown.cs.systems.retro.aspects.cpu.XTraceAPICalls;\nimport edu.brown.cs.systems.xtrace.logging.BaggageWrappers;\n\n\/** Declares aspect ordering for aspects from Retro and XTrace that modify the same classes *\/\npublic aspect AspectsOrdering {\n    declare precedence : BaggageWrappers, Futures, Runnables, \/* --- *\/ XTraceAPICalls, Sleeping;\n}","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"8bd3cf3f2c988d851debebd422d10156563ab262","subject":"o Added svn:eol-style=native","message":"o Added svn:eol-style=native\n\ngit-svn-id: dcbd4fc8c11328f69dc395471f1d5a9d33f6e6b1@6564 52ab4f32-60fc-0310-b215-8acea882cd1b\n","repos":"mojohaus\/aspectj-maven-plugin,mohanaraosv\/aspectj-maven-plugin,davidkarlsen\/aspectj-maven-plugin,nigelzor\/aspectj-maven-plugin","old_file":"src\/test\/projects\/parent-child-test-project\/my-app\/src\/main\/aspect\/com\/mycompany\/app\/aspects\/AppAspect.aj","new_file":"src\/test\/projects\/parent-child-test-project\/my-app\/src\/main\/aspect\/com\/mycompany\/app\/aspects\/AppAspect.aj","new_contents":"\/**\n * The MIT License\n *\n * Copyright 2005-2006 The Codehaus.\n *\n * Permission is hereby granted, free of charge, to any person obtaining a copy of\n * this software and associated documentation files (the \"Software\"), to deal in\n * the Software without restriction, including without limitation the rights to\n * use, copy, modify, merge, publish, distribute, sublicense, and\/or sell copies\n * of the Software, and to permit persons to whom the Software is furnished to do\n * so, subject to the following conditions:\n *\n * The above copyright notice and this permission notice shall be included in all\n * copies or substantial portions of the Software.\n *\n * THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n * SOFTWARE.\n *\/\npublic aspect AppAspect\n{\n\n    pointcut appCut() : call(* *.printHelloWorld(..));\n\n    before() : appCut() {\n        System.out.println( \"I'm saying \" );\n    }\n}","old_contents":"\/**\r\n * The MIT License\r\n *\r\n * Copyright 2005-2006 The Codehaus.\r\n *\r\n * Permission is hereby granted, free of charge, to any person obtaining a copy of\r\n * this software and associated documentation files (the \"Software\"), to deal in\r\n * the Software without restriction, including without limitation the rights to\r\n * use, copy, modify, merge, publish, distribute, sublicense, and\/or sell copies\r\n * of the Software, and to permit persons to whom the Software is furnished to do\r\n * so, subject to the following conditions:\r\n *\r\n * The above copyright notice and this permission notice shall be included in all\r\n * copies or substantial portions of the Software.\r\n *\r\n * THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\r\n * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\r\n * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\r\n * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\r\n * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\r\n * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\r\n * SOFTWARE.\r\n *\/\r\npublic aspect AppAspect\r\n{\r\n\r\n    pointcut appCut() : call(* *.printHelloWorld(..));\r\n\r\n    before() : appCut() {\r\n        System.out.println( \"I'm saying \" );\r\n    }\r\n}","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"b038fc47e7dabb8831d22155ff0596817c0c7632","subject":"HIGHLY UNTESTED COMMIT: attempt to throw checked exceptions","message":"HIGHLY UNTESTED COMMIT:\nattempt to throw checked exceptions\n","repos":"palava\/palava-jta","old_file":"src\/main\/java\/de\/cosmocode\/palava\/jta\/AbstractUserTransactionAspect.aj","new_file":"src\/main\/java\/de\/cosmocode\/palava\/jta\/AbstractUserTransactionAspect.aj","new_contents":"\/**\n * Copyright 2010 CosmoCode GmbH\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage de.cosmocode.palava.jta;\n\nimport javax.transaction.NotSupportedException;\nimport javax.transaction.Status;\nimport javax.transaction.SystemException;\nimport javax.transaction.UserTransaction;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.Registry;\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\n\npublic abstract aspect AbstractUserTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(AbstractUserTransactionAspect.class);\n\n    private Provider<UserTransaction> provider;\n\n    private TransactionBeginEvent begin;\n    private TransactionBeganEvent began;\n    private TransactionCommitEvent commit;\n    private TransactionCommittedEvent committed;\n    private TransactionRollbackEvent rollback;\n    private TransactionRolledbackEvent rolledback;\n    \n    @Inject\n    void setProvider(Provider<UserTransaction> provider) {\n        this.provider = Preconditions.checkNotNull(provider, \"Provider\");\n    }\n    \n    @Inject\n    void setRegistry(Registry registry) {\n        Preconditions.checkNotNull(registry, \"Registry\");\n        this.begin = registry.proxy(TransactionBeginEvent.class);\n        this.began = registry.proxy(TransactionBeganEvent.class);\n        this.commit = registry.proxy(TransactionCommitEvent.class);\n        this.committed = registry.proxy(TransactionCommittedEvent.class);\n        this.rollback = registry.proxy(TransactionRollbackEvent.class);\n        this.rolledback = registry.proxy(TransactionRolledbackEvent.class);\n    }\n    \n    protected abstract pointcut transactional();\n    \n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        Preconditions.checkNotNull(provider, \"Provider not injected yet\");\n        final UserTransaction tx = provider.get();\n        LOG.trace(\"Using transaction {}\", tx);\n\n        try {\n            LOG.trace(\"Status of transaction: {}\", tx.getStatus());\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        int status;\n        final boolean local;\n        try {\n            status = tx.getStatus();\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        local = status == Status.STATUS_NO_TRANSACTION;\n\n        if (local) {\n            LOG.debug(\"Beginning automatic transaction {}\", tx);\n            try {\n                begin.eventTransactionBegin(tx);\n                tx.begin();\n                began.eventTransactionBegan(tx);\n            } catch (NotSupportedException e) {\n                throw new IllegalStateException(e);\n            } catch (SystemException e) {\n                throw new IllegalStateException(e);\n            }\n        } else {\n            LOG.trace(\"Transaction {} already active (Status: {})\", tx, status);\n        }\n\n        try {\n            status = tx.getStatus();\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        final Object returnValue;\n        \n        try {\n            LOG.trace(\"Status before execution: {}\", status);\n            returnValue = proceed();\n        } catch (Exception e) {\n            try {\n                if (local && \n                    (tx.getStatus() == Status.STATUS_ACTIVE || tx.getStatus() == Status.STATUS_MARKED_ROLLBACK)) {\n                    LOG.info(\"Rolling back local\/active transaction {}\", tx);\n                    rollback(tx);\n                } else if (tx.getStatus() != Status.STATUS_ROLLEDBACK || tx.getStatus() != Status.STATUS_ROLLING_BACK) {\n                    LOG.debug(\"Setting transaction {} as rollback only\", tx);\n                    tx.setRollbackOnly();\n                }\n            } catch (Exception inner) {\n                LOG.error(\"Rollback failed\", inner);\n            }\n            \/\/ FIXME this effectively shadows the real exceptions thus preventing correct exception handling\n            throw sneakyThrow(e);\n            \/\/throw new IllegalStateException(e);\n        }\n        \n        try {\n            status = tx.getStatus();\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        LOG.trace(\"Status after execution: {}\", status);\n        \n        if (local) {\n            if (status == Status.STATUS_MARKED_ROLLBACK) {\n                try {\n                    LOG.debug(\"Rolling back marked transaction {}\", tx);\n                    rollback(tx);\n                } catch (SystemException e) {\n                    throw new IllegalStateException(e);\n                }\n            } else {\n                try {\n                    commit.eventTransactionCommit(tx);\n                    tx.commit();\n                    committed.eventTransactionCommitted(tx);\n                    LOG.debug(\"Committed automatic transaction {}\", tx);\n                } catch (Exception e) {\n                    try {\n                        LOG.info(\"Rolling back transaction {}\", tx);\n                        rollback(tx);\n                    } catch (Exception inner) {\n                        LOG.error(\"Rollback failed\", inner);\n                    }\n                    throw new IllegalStateException(e);\n                }\n            }\n        }\n        \n        return returnValue;\n    }\n    \n    private void rollback(UserTransaction tx) throws SystemException {\n        rollback.eventTransactionRollback(tx);\n        tx.rollback();\n        rolledback.eventTransactionRolledback(tx);\n    }\n    \n    private RuntimeException sneakyThrow(Throwable t) {\n        return this.<RuntimeException>doSneakyThrow(t);\n    }\n\n    @SuppressWarnings(\"unchecked\")\n    private <T extends Throwable> T doSneakyThrow(Throwable t) throws T {\n        return (T)t;\n    }\n    \n}\n","old_contents":"\/**\n * Copyright 2010 CosmoCode GmbH\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage de.cosmocode.palava.jta;\n\nimport javax.transaction.NotSupportedException;\nimport javax.transaction.Status;\nimport javax.transaction.SystemException;\nimport javax.transaction.UserTransaction;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.Registry;\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\n\npublic abstract aspect AbstractUserTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(AbstractUserTransactionAspect.class);\n\n    private Provider<UserTransaction> provider;\n\n    private TransactionBeginEvent begin;\n    private TransactionBeganEvent began;\n    private TransactionCommitEvent commit;\n    private TransactionCommittedEvent committed;\n    private TransactionRollbackEvent rollback;\n    private TransactionRolledbackEvent rolledback;\n    \n    @Inject\n    void setProvider(Provider<UserTransaction> provider) {\n        this.provider = Preconditions.checkNotNull(provider, \"Provider\");\n    }\n    \n    @Inject\n    void setRegistry(Registry registry) {\n        Preconditions.checkNotNull(registry, \"Registry\");\n        this.begin = registry.proxy(TransactionBeginEvent.class);\n        this.began = registry.proxy(TransactionBeganEvent.class);\n        this.commit = registry.proxy(TransactionCommitEvent.class);\n        this.committed = registry.proxy(TransactionCommittedEvent.class);\n        this.rollback = registry.proxy(TransactionRollbackEvent.class);\n        this.rolledback = registry.proxy(TransactionRolledbackEvent.class);\n    }\n    \n    protected abstract pointcut transactional();\n    \n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        Preconditions.checkNotNull(provider, \"Provider not injected yet\");\n        final UserTransaction tx = provider.get();\n        LOG.trace(\"Using transaction {}\", tx);\n\n        try {\n            LOG.trace(\"Status of transaction: {}\", tx.getStatus());\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        int status;\n        final boolean local;\n        try {\n            status = tx.getStatus();\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        local = status == Status.STATUS_NO_TRANSACTION;\n\n        if (local) {\n            LOG.debug(\"Beginning automatic transaction {}\", tx);\n            try {\n                begin.eventTransactionBegin(tx);\n                tx.begin();\n                began.eventTransactionBegan(tx);\n            } catch (NotSupportedException e) {\n                throw new IllegalStateException(e);\n            } catch (SystemException e) {\n                throw new IllegalStateException(e);\n            }\n        } else {\n            LOG.trace(\"Transaction {} already active (Status: {})\", tx, status);\n        }\n\n        try {\n            status = tx.getStatus();\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        final Object returnValue;\n        \n        try {\n            LOG.trace(\"Status before execution: {}\", status);\n            returnValue = proceed();\n        } catch (Exception e) {\n            try {\n                if (local && \n                    (tx.getStatus() == Status.STATUS_ACTIVE || tx.getStatus() == Status.STATUS_MARKED_ROLLBACK)) {\n                    LOG.info(\"Rolling back local\/active transaction {}\", tx);\n                    rollback(tx);\n                } else if (tx.getStatus() != Status.STATUS_ROLLEDBACK || tx.getStatus() != Status.STATUS_ROLLING_BACK) {\n                    LOG.debug(\"Setting transaction {} as rollback only\", tx);\n                    tx.setRollbackOnly();\n                }\n            } catch (Exception inner) {\n                LOG.error(\"Rollback failed\", inner);\n            }\n            \/\/ FIXME this effectively shadows the real exceptions thus preventing correct exception handling \n            throw new IllegalStateException(e);\n        }\n        \n        try {\n            status = tx.getStatus();\n        } catch (SystemException e) {\n            throw new IllegalStateException(e);\n        }\n\n        LOG.trace(\"Status after execution: {}\", status);\n        \n        if (local) {\n            if (status == Status.STATUS_MARKED_ROLLBACK) {\n                try {\n                    LOG.debug(\"Rolling back marked transaction {}\", tx);\n                    rollback(tx);\n                } catch (SystemException e) {\n                    throw new IllegalStateException(e);\n                }\n            } else {\n                try {\n                    commit.eventTransactionCommit(tx);\n                    tx.commit();\n                    committed.eventTransactionCommitted(tx);\n                    LOG.debug(\"Committed automatic transaction {}\", tx);\n                } catch (Exception e) {\n                    try {\n                        LOG.info(\"Rolling back transaction {}\", tx);\n                        rollback(tx);\n                    } catch (Exception inner) {\n                        LOG.error(\"Rollback failed\", inner);\n                    }\n                    throw new IllegalStateException(e);\n                }\n            }\n        }\n        \n        return returnValue;\n    }\n    \n    private void rollback(UserTransaction tx) throws SystemException {\n        rollback.eventTransactionRollback(tx);\n        tx.rollback();\n        rolledback.eventTransactionRolledback(tx);\n    }\n    \n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"4bb561f5eb5298b7c17cc2b225d398df301d0895","subject":"CThread2 renamed to CThread","message":"CThread2 renamed to CThread","repos":"selig\/qea","old_file":"qeaBenchmark\/src\/JavaMOPThreeAspect.aj","new_file":"qeaBenchmark\/src\/JavaMOPThreeAspect.aj","new_contents":"import properties.Property;\nimport properties.competition.JavaMOP;\nimport structure.impl.other.Verdict;\nimport benchmark.competition.java.QEAMonitoringAspect;\n\npublic aspect JavaMOPThreeAspect extends QEAMonitoringAspect {\n\n\tprivate final int A = 1;\n\tprivate final int B = 2;\n\tprivate final int C = 3;\n\n\tpublic JavaMOPThreeAspect() {\n\t\tsuper(new JavaMOP().make(Property.JAVAMOP_THREE));\n\t\tvalidationMsg = \"Property JavaMOP 3 satisfied\";\n\t\tviolationMsg = \"Property JavaMOP 3 violated. The functions A(), B(), C() must be called equal times\";\n\t}\n\n\tpointcut A() : call(void CThread.A());\n\n\tpointcut B() : call(void CThread.B());\n\n\tpointcut C() : call(void CThread.C());\n\n\tbefore() : A() {\n\t\tVerdict verdict;\n\t\tsynchronized (monitor) {\n\t\t\tverdict = monitor.step(A);\n\t\t}\n\t\tif (verdict == Verdict.FAILURE) {\n\t\t\tSystem.err.println(violationMsg);\n\t\t\tprintTimeAndExit();\n\t\t}\n\t}\n\n\tbefore() : B() {\n\t\tVerdict verdict;\n\t\tsynchronized (monitor) {\n\t\t\tverdict = monitor.step(B);\n\t\t}\n\t\tif (verdict == Verdict.FAILURE) {\n\t\t\tSystem.err.println(violationMsg);\n\t\t\tprintTimeAndExit();\n\t\t}\n\t}\n\n\tbefore() : C() {\n\t\tVerdict verdict;\n\t\tsynchronized (monitor) {\n\t\t\tverdict = monitor.step(C);\n\t\t}\n\t\tif (verdict == Verdict.FAILURE) {\n\t\t\tSystem.err.println(violationMsg);\n\t\t\tprintTimeAndExit();\n\t\t}\n\t}\n}\n","old_contents":"\n\nimport properties.Property;\nimport properties.competition.JavaMOP;\nimport structure.impl.other.Verdict;\nimport benchmark.competition.java.QEAMonitoringAspect;\n\npublic aspect JavaMOPThreeAspect extends QEAMonitoringAspect {\n\n\tprivate final int A = 1;\n\tprivate final int B = 2;\n\tprivate final int C = 3;\n\n\tpublic JavaMOPThreeAspect() {\n\t\tsuper(new JavaMOP().make(Property.JAVAMOP_THREE));\n\t\tvalidationMsg = \"Property JavaMOP 3 satisfied\";\n\t\tviolationMsg = \"Property JavaMOP 3 violated. The functions A(), B(), C() must be called equal times\";\n\t}\n\n\tpointcut A() : call(void CThread2.A());\n\n\tpointcut B() : call(void CThread2.B());\n\n\tpointcut C() : call(void CThread2.C());\n\n\tbefore() : A() {\n\t\tVerdict verdict;\n\t\tsynchronized (monitor) {\n\t\t\tverdict = monitor.step(A);\n\t\t}\n\t\tif (verdict == Verdict.FAILURE) {\n\t\t\tSystem.err.println(violationMsg);\n\t\t\tprintTimeAndExit();\n\t\t}\n\t}\n\n\tbefore() : B() {\n\t\tVerdict verdict;\n\t\tsynchronized (monitor) {\n\t\t\tverdict = monitor.step(B);\n\t\t}\n\t\tif (verdict == Verdict.FAILURE) {\n\t\t\tSystem.err.println(violationMsg);\n\t\t\tprintTimeAndExit();\n\t\t}\n\t}\n\n\tbefore() : C() {\n\t\tVerdict verdict;\n\t\tsynchronized (monitor) {\n\t\t\tverdict = monitor.step(C);\n\t\t}\n\t\tif (verdict == Verdict.FAILURE) {\n\t\t\tSystem.err.println(violationMsg);\n\t\t\tprintTimeAndExit();\n\t\t}\n\t}\n}\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"ee7ffaf9e2f3bdd7266d94ecc4b6f1c144a67679","subject":"replace system.out in aspect with log.debug","message":"replace system.out in aspect with log.debug\n","repos":"folio-org\/raml-module-builder,folio-org\/raml-module-builder,folio-org\/raml-module-builder","old_file":"domain-models-api-aspects\/src\/main\/java\/org\/folio\/rest\/annotations\/RestValidator.aj","new_file":"domain-models-api-aspects\/src\/main\/java\/org\/folio\/rest\/annotations\/RestValidator.aj","new_contents":"package org.folio.rest.annotations;\n\nimport io.vertx.core.logging.Logger;\nimport io.vertx.core.logging.LoggerFactory;\n\nimport java.util.Arrays;\nimport java.util.Set;\n\nimport javax.validation.ConstraintViolation;\nimport javax.validation.Validation;\nimport javax.validation.ValidationException;\nimport javax.validation.ValidatorFactory;\nimport javax.validation.executable.ExecutableValidator;\n\nimport org.aspectj.lang.reflect.MethodSignature;\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\n\npublic aspect RestValidator {\n\n  static private ValidatorFactory factory;\n  static final Logger log = LoggerFactory.getLogger(RestValidator.class);\n  \n  static {\n    factory = Validation.buildDefaultValidatorFactory();\n  }\n\n  static private ExecutableValidator getMethodValidator() {\n    return factory.getValidator().forExecutables();\n  }\n\n  pointcut validatedMethodCall() : execution(@Validate * *(..));\n\n  \/**\n   * Validates the method parameters.\n   *\/\n  @SuppressAjWarnings({\"adviceDidNotMatch\"})\n  before() : validatedMethodCall() {\n\n    MethodSignature methodSignature = (MethodSignature) thisJoinPoint.getSignature();\n\n    String[] params = methodSignature.getParameterNames();\n\n    Set<? extends ConstraintViolation<?>> validationErrors = getMethodValidator().validateParameters(thisJoinPoint.getThis(),\n        methodSignature.getMethod(), thisJoinPoint.getArgs());\n\n    if (validationErrors.isEmpty()) {\n      log.debug(\"Valid call: with args \" + methodSignature.getMethod() + Arrays.toString(thisJoinPoint.getArgs()));\n    } else {\n      log.debug(\"Invalid call: with args \" + methodSignature.getMethod() + Arrays.toString(thisJoinPoint.getArgs()));\n      RuntimeException ex = buildValidationException(validationErrors, params);\n      throw ex;\n    }\n  }\n\n  \/**\n   * @param validationErrors\n   *          The errors detected in a method\/constructor call.\n   * @return A RuntimeException with information about the detected validation\n   *         errors.\n   *\/\n  private RuntimeException buildValidationException(Set<? extends ConstraintViolation<?>> validationErrors, String[] paramNames) {\n    StringBuilder sb = new StringBuilder();\n    for (ConstraintViolation<?> cv : validationErrors) {\n      \/\/ sb.append(\"\\n\" + cv.getPropertyPath() + \"{\" + cv.getInvalidValue() +\n      \/\/ \"} : \" + cv.getMessage());\n      String positionOfBadParam = cv.getPropertyPath().toString();\n      if (positionOfBadParam != null) {\n        try {\n          String paramName = paramNames[Integer.valueOf(positionOfBadParam.substring(positionOfBadParam.length() - 1,\n              positionOfBadParam.length()))];\n          sb.append(\"\\n '\" + paramName + \"' parameter is incorrect. parameter value {\" + cv.getInvalidValue() + \"} is not valid: \"\n              + cv.getMessage());\n\n        } catch (Exception e) {\n          sb.append(\"\\n not all parameters were passed properly. parameter value {\" + cv.getInvalidValue() + \"} is not valid: \"\n              + cv.getMessage());\n\n        }\n      }\n    }\n    return new ValidationException(sb.toString());\n  }\n}\n","old_contents":"package org.folio.rest.annotations;\n\nimport java.util.Arrays;\nimport java.util.Set;\n\nimport javax.validation.ConstraintViolation;\nimport javax.validation.Validation;\nimport javax.validation.ValidationException;\nimport javax.validation.ValidatorFactory;\nimport javax.validation.executable.ExecutableValidator;\nimport org.aspectj.lang.reflect.MethodSignature;\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\n\npublic aspect RestValidator {\n\n  static private ValidatorFactory factory;\n\n  static {\n    factory = Validation.buildDefaultValidatorFactory();\n  }\n\n  static private ExecutableValidator getMethodValidator() {\n    return factory.getValidator().forExecutables();\n  }\n\n  pointcut validatedMethodCall() : execution(@Validate * *(..));\n\n  \/**\n   * Validates the method parameters.\n   *\/\n  @SuppressAjWarnings({\"adviceDidNotMatch\"})\n  before() : validatedMethodCall() {\n\n    MethodSignature methodSignature = (MethodSignature) thisJoinPoint.getSignature();\n\n    System.out.println(\"Validating call: with args \" + methodSignature.getMethod() + Arrays.toString(thisJoinPoint.getArgs()));\n\n    String[] params = methodSignature.getParameterNames();\n\n    Set<? extends ConstraintViolation<?>> validationErrors = getMethodValidator().validateParameters(thisJoinPoint.getThis(),\n        methodSignature.getMethod(), thisJoinPoint.getArgs());\n\n    if (validationErrors.isEmpty()) {\n      System.out.println(\"Valid call......\");\n    } else {\n      System.out.println(\"Invalid call......\");\n      RuntimeException ex = buildValidationException(validationErrors, params);\n      throw ex;\n    }\n  }\n\n  \/**\n   * @param validationErrors\n   *          The errors detected in a method\/constructor call.\n   * @return A RuntimeException with information about the detected validation\n   *         errors.\n   *\/\n  private RuntimeException buildValidationException(Set<? extends ConstraintViolation<?>> validationErrors, String[] paramNames) {\n    StringBuilder sb = new StringBuilder();\n    for (ConstraintViolation<?> cv : validationErrors) {\n      \/\/ sb.append(\"\\n\" + cv.getPropertyPath() + \"{\" + cv.getInvalidValue() +\n      \/\/ \"} : \" + cv.getMessage());\n      String positionOfBadParam = cv.getPropertyPath().toString();\n      if (positionOfBadParam != null) {\n        try {\n          String paramName = paramNames[Integer.valueOf(positionOfBadParam.substring(positionOfBadParam.length() - 1,\n              positionOfBadParam.length()))];\n          sb.append(\"\\n '\" + paramName + \"' parameter is incorrect. parameter value {\" + cv.getInvalidValue() + \"} is not valid: \"\n              + cv.getMessage());\n\n        } catch (Exception e) {\n          sb.append(\"\\n not all parameters were passed properly. parameter value {\" + cv.getInvalidValue() + \"} is not valid: \"\n              + cv.getMessage());\n\n        }\n      }\n    }\n    return new ValidationException(sb.toString());\n  }\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"ffee28b2b42fdb7528430b69d2965302ca85469e","subject":"Fix syntax error due to missing semicolon","message":"Fix syntax error due to missing semicolon\n\ngit-svn-id: 7acc490bd371dbc82047a939b87dc892fdc31f59@28620 76a6fc44-f60b-0410-a9a8-e67b0e8fc65c\n","repos":"lemmy\/tlaplus,tlaplus\/tlaplus,lemmy\/tlaplus,tlaplus\/tlaplus,lemmy\/tlaplus,lemmy\/tlaplus,tlaplus\/tlaplus,tlaplus\/tlaplus","old_file":"tlatools\/src-aj\/tlc2\/tool\/distributed\/RMIMethodMonitorAspect.aj","new_file":"tlatools\/src-aj\/tlc2\/tool\/distributed\/RMIMethodMonitorAspect.aj","new_contents":"package tlc2.tool.distributed;\n\npublic aspect RMIMethodMonitorAspect {\n\t\n\t\/\/ catch all method calls to RMI methods\n\tpointcut callToRemoteMethod() : \n\t\t   execution(* tlc2.tool.distributed.InternRMI.*(..))\n\t\t|| execution(* tlc2.tool.distributed.TLCServerRMI.*(..))\n\t\t|| execution(* tlc2.tool.distributed.TLCWorkerRMI.*(..))\n\t\t|| execution(* tlc2.tool.distributed.fp.FPSetRMI.*(..));\n\t\n\tbefore(): (callToRemoteMethod()) {\n\t\tRMIMethodMonitor.entering(thisJoinPoint);\n\t}\n}\n","old_contents":"package tlc2.tool.distributed;\n\npublic aspect RMIMethodMonitorAspect {\n\t\n\t\/\/ catch all method calls to RMI methods\n\tpointcut callToRemoteMethod() : \n\t\t   execution(* tlc2.tool.distributed.InternRMI.*(..))\n\t\t|| execution(* tlc2.tool.distributed.TLCServerRMI.*(..))\n\t\t|| execution(* tlc2.tool.distributed.TLCWorkerRMI.*(..))\n\t\t|| execution(* tlc2.tool.distributed.fp.FPSetRMI.*(..))\n\t\n\tbefore(): (callToRemoteMethod()) {\n\t\tRMIMethodMonitor.entering(thisJoinPoint);\n\t}\n}\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"99b84a810a5254b4305699c6e4b5e0ae6f71f5c5","subject":"Tryint to Resolve Quota Problems","message":"Tryint to Resolve Quota Problems\n","repos":"cansin\/chitterim","old_file":"src\/com\/chitter\/aspect\/Persistence.aj","new_file":"src\/com\/chitter\/aspect\/Persistence.aj","new_contents":"package com.chitter.aspect;\r\n\r\nimport java.util.ArrayList;\r\nimport java.util.Collections;\r\nimport java.util.List;\r\n\r\nimport javax.jdo.Extent;\r\nimport javax.jdo.JDOHelper;\r\nimport javax.jdo.PersistenceManager;\r\nimport javax.jdo.PersistenceManagerFactory;\r\nimport javax.jdo.Query;\r\nimport javax.jdo.Transaction;\r\nimport javax.jdo.annotations.PersistenceCapable;\r\nimport javax.servlet.http.HttpServletRequest;\r\nimport javax.servlet.http.HttpServletResponse;\r\n\r\nimport net.sf.jsr107cache.Cache;\r\nimport net.sf.jsr107cache.CacheException;\r\nimport net.sf.jsr107cache.CacheFactory;\r\nimport net.sf.jsr107cache.CacheManager;\r\n\r\nimport com.chitter.persistence.Announcement;\r\nimport com.chitter.persistence.UserAccount;\r\nimport com.chitter.persistence.UserStatistic;\r\nimport com.chitter.persistence.UserTwitterTimeline;\r\nimport com.chitter.utility.ExceptionPrinter;\r\n\r\npublic aspect Persistence {\t\r\n\tprivate static Cache cache;\r\n\tstatic\r\n\t{\r\n\t\ttry\r\n\t\t{\r\n\t\t\tCacheManager cacheManager = CacheManager.getInstance();\r\n\t\t\tCacheFactory cacheFactory = cacheManager.getCacheFactory();\r\n\t\t\tcache = cacheFactory.createCache(Collections.EMPTY_MAP);\r\n\t\t} catch (CacheException e) {\r\n\t\t\tExceptionPrinter.print(System.err, e, \"Couldn't create cache at PersistenceAspect\");\r\n\t\t}\r\n\t}\r\n\r\n\t\/** \r\n\t * captures ctors with more than one arg and\r\n\t * all setters of @PersistenceCapable objects.\r\n\t *\/\r\n\tpointcut pushObject(Object o): target(o) && (call(* (@PersistenceCapable *).set*(..)) || execution((@PersistenceCapable *).new(*,*,..)));\r\n\tpointcut pullObject(Object pk): args(pk) && call((@PersistenceCapable *).new(*));\r\n\tpointcut pullList(): call(List (@PersistenceCapable *).get*List());\r\n\tpointcut pullExtent(): call(Extent (@PersistenceCapable *).get*Extent());\r\n\r\n\tpointcut pmShouldClose() : call(* com.chitter..*Servlet.processRequest(HttpServletRequest,HttpServletResponse));\r\n\r\n\tpointcut withinEscapePersistence(): withincode(@EscapePersistence * *(..));\r\n\r\n\t@SuppressWarnings(\"all\")\r\n\tpublic static Extent UserAccount.getUserAccountExtent(){\r\n\t\treturn null;\r\n\t}\r\n\r\n\t@SuppressWarnings(\"all\")\r\n\tpublic static List UserAccount.getUserAccountList(){\r\n\t\treturn new ArrayList<UserAccount>();\r\n\t}\r\n\r\n\t@SuppressWarnings(\"all\")\r\n\tpublic static List UserAccount.getTimelineActiveAndOnlineUsers(){\r\n\t\tPersistenceManager pm = getPM();\r\n\r\n\t\ttry {\r\n\t\t\tQuery q = pm.newQuery(UserAccount.class, \"this.isTimelineActive == true && this.isOnline == true\");\r\n\t\t\treturn (List) q.execute();\r\n\t\t} catch (Exception e) {\r\n\t\t\tExceptionPrinter.print(System.err,e,\"I couldn't fetch timeline active and online users\");\r\n\t\t\treturn (List)(new ArrayList<Object>());\r\n\t\t} \r\n\t}\r\n\r\n\t@SuppressWarnings(\"all\")\r\n\tpublic static List UserAccount.getTimelineActiveUsers(){\r\n\t\tPersistenceManager pm = getPM();\r\n\r\n\t\ttry {\r\n\t\t\tQuery q = pm.newQuery(UserAccount.class, \"this.isTimelineActive == true\");\r\n\t\t\treturn (List) q.execute();\r\n\t\t} catch (Exception e) {\r\n\t\t\tExceptionPrinter.print(System.err,e,\"I couldn't fetch timeline active users\");\r\n\t\t\treturn (List)(new ArrayList<Object>());\r\n\t\t} \r\n\t}\r\n\r\n\t@SuppressWarnings(\"all\")\r\n\tpublic static List UserAccount.getOnlineUsers(){\r\n\t\tPersistenceManager pm = getPM();\r\n\r\n\t\ttry {\r\n\t\t\tQuery q = pm.newQuery(UserAccount.class, \"this.isOnline == true\");\r\n\t\t\treturn (List) q.execute();\r\n\t\t} catch (Exception e) {\r\n\t\t\tExceptionPrinter.print(System.err,e,\"I couldn't fetch online users\");\r\n\t\t\treturn (List)(new ArrayList<Object>());\r\n\t\t} \r\n\t}\r\n\r\n\t@SuppressWarnings(\"all\")\r\n\tpublic static List UserStatistic.getUserStatisticList() {\r\n\t\treturn new ArrayList<UserStatistic> ();\r\n\t}\r\n\r\n\t@SuppressWarnings(\"all\")\r\n\tpublic static List UserTwitterTimeline.getUserTwitterTimelineList() {\r\n\t\treturn new ArrayList<UserTwitterTimeline> ();\r\n\t}\r\n\r\n\t@SuppressWarnings(\"all\")\r\n\tpublic static List Announcement.getAnnouncementList() {\r\n\t\treturn new ArrayList<Announcement> ();\r\n\t}\r\n\r\n\tprivate static final PersistenceManagerFactory PMF =\r\n\t\t\tJDOHelper.getPersistenceManagerFactory(\"transactions-optional\");\r\n\tprivate static final ThreadLocal<PersistenceManager> perThreadPM\r\n\t= new ThreadLocal<PersistenceManager>();\r\n\r\n\tprivate Persistence() {};\r\n\r\n\tprivate static PersistenceManager getPM() {\r\n\t\tPersistenceManager PM = perThreadPM.get();\r\n\t\tif (PM == null) {\r\n\t\t\tPM = PMF.getPersistenceManager();\r\n\t\t\tperThreadPM.set(PM);\r\n\t\t}\r\n\t\treturn PM;\r\n\t}\r\n\r\n\tafter(Object o) : pushObject(o) && !withinEscapePersistence(){\r\n\t\tPersistenceManager pm = getPM();\r\n\t\t\/**\r\n\t\t * First try to convert object to UserStatistic.\r\n\t\t * If you can, that means the persistent object was UserStatistic,\r\n\t\t * so you should flag statistics array as dirty.\r\n\t\t * (o.w. it will not persist changes to the array.)\r\n\t\t *\/\r\n\t\tif(o.getClass().equals(UserStatistic.class)) {\r\n\t\t\tUserStatistic statistic=(UserStatistic) o;\r\n\t\t\tJDOHelper.makeDirty(statistic, \"statistics\");\r\n\t\t}\r\n\t\tpm.makePersistent(o.getClass().cast(o));\r\n\t\tcache.put(o.getClass().getName() + \"_\" + pm.getObjectId(o), o);\r\n\t\tpm.flush();\r\n\t}    \r\n\r\n\t@SuppressWarnings(\"all\")\r\n\tObject around(Object pk) : pullObject(pk) && !withinEscapePersistence(){\r\n\t\tPersistenceManager pm = getPM();\r\n\t\ttry{\r\n\t\t\tObject r = cache.peek(thisJoinPointStaticPart.getSignature().getDeclaringTypeName() + \"_\" + pk);\r\n\t\t\tif (r == null) {\r\n\t\t\t\tr = pm.getObjectById(thisJoinPoint.getSignature().getDeclaringType(),pk);\r\n\t\t\t\tcache.put(thisJoinPointStaticPart.getSignature().getDeclaringTypeName() + \"_\" + pk, r);\r\n\t\t\t}\r\n\t\t\treturn r;\r\n\t\t} catch (Exception e) {\r\n\t\t\tcache.remove(thisJoinPointStaticPart.getSignature().getDeclaringTypeName() + \"_\" + pk);\r\n\t\t\tExceptionPrinter.print(System.err, e, \"I couldn't fetch persistent object for \" + \r\n\t\t\t\t\tthisJoinPointStaticPart.getSignature().getDeclaringTypeName() + \" \" + pk);\r\n\t\t\treturn null;\r\n\t\t} \r\n\t}\r\n\r\n\t@SuppressWarnings(\"all\")\r\n\tList around() : pullList() {\r\n\t\tPersistenceManager pm = getPM();\r\n\r\n\t\ttry {\r\n\t\t\tList list = (List) pm.newQuery(thisJoinPoint.getSignature().getDeclaringType()).execute();\r\n\t\t\treturn list;\r\n\t\t} catch (Exception e) {\r\n\t\t\tExceptionPrinter.print(System.err,e,\"I couldn't fetch persistent list for \"+getClass());\r\n\t\t\treturn (List)(new ArrayList<Object>());\r\n\t\t} \r\n\t}\r\n\r\n\t@SuppressWarnings(\"all\")\r\n\t\/*Extent around() : pullExtent() {\r\n\t\tPersistenceManager pm = getPM();\r\n\r\n\t\ttry {\r\n\t\t\tExtent extent = pm.getExtent(thisJoinPoint.getSignature().getDeclaringType(), false);\r\n\t\t\treturn extent;\r\n\t\t} catch (Exception e) {\r\n\t\t\tExceptionPrinter.print(System.err, e, \"I couldn't fetch persistent extent for \"+getClass());\r\n\t\t\treturn null;\r\n\t\t} \r\n    }*\/\r\n\r\n\tafter() : pmShouldClose() {\r\n\t\tPersistenceManager PM = perThreadPM.get();\r\n\t\tif (PM != null) {\r\n\t\t\tperThreadPM.remove();\r\n\t\t\tTransaction tx = PM.currentTransaction();\r\n\t\t\tif (tx.isActive()) {\r\n\t\t\t\ttx.rollback();\r\n\t\t\t}\r\n\t\t\tPM.close();\r\n\t\t}\r\n\t}\r\n\r\n}\r\n","old_contents":"package com.chitter.aspect;\r\n\r\nimport java.util.ArrayList;\r\nimport java.util.Collections;\r\nimport java.util.List;\r\n\r\nimport javax.jdo.Extent;\r\nimport javax.jdo.JDOHelper;\r\nimport javax.jdo.PersistenceManager;\r\nimport javax.jdo.PersistenceManagerFactory;\r\nimport javax.jdo.Query;\r\nimport javax.jdo.Transaction;\r\nimport javax.jdo.annotations.PersistenceCapable;\r\nimport javax.servlet.http.HttpServletRequest;\r\nimport javax.servlet.http.HttpServletResponse;\r\n\r\nimport net.sf.jsr107cache.Cache;\r\nimport net.sf.jsr107cache.CacheException;\r\nimport net.sf.jsr107cache.CacheFactory;\r\nimport net.sf.jsr107cache.CacheManager;\r\n\r\nimport com.chitter.persistence.Announcement;\r\nimport com.chitter.persistence.UserAccount;\r\nimport com.chitter.persistence.UserStatistic;\r\nimport com.chitter.persistence.UserTwitterTimeline;\r\nimport com.chitter.utility.ExceptionPrinter;\r\n\r\npublic aspect Persistence {\t\r\n\tprivate static Cache cache;\r\n\tstatic\r\n\t{\r\n\t\ttry\r\n\t\t{\r\n\t\t\tCacheManager cacheManager = CacheManager.getInstance();\r\n\t\t\tCacheFactory cacheFactory = cacheManager.getCacheFactory();\r\n\t\t\tcache = cacheFactory.createCache(Collections.EMPTY_MAP);\r\n\t\t} catch (CacheException e) {\r\n\t\t\tExceptionPrinter.print(System.err, e, \"Couldn't create cache at PersistenceAspect\");\r\n\t\t}\r\n\t}\r\n\r\n\t\/** \r\n\t * captures ctors with more than one arg and\r\n\t * all setters of @PersistenceCapable objects.\r\n\t *\/\r\n\tpointcut pushObject(Object o): target(o) && (call(* (@PersistenceCapable *).set*(..)) || execution((@PersistenceCapable *).new(*,*,..)));\r\n\tpointcut pullObject(Object pk): args(pk) && call((@PersistenceCapable *).new(*));\r\n\tpointcut pullList(): call(List (@PersistenceCapable *).get*List());\r\n\tpointcut pullExtent(): call(Extent (@PersistenceCapable *).get*Extent());\r\n\r\n\tpointcut pmShouldClose() : call(* com.chitter..*Servlet.processRequest(HttpServletRequest,HttpServletResponse));\r\n\r\n\tpointcut withinEscapePersistence(): withincode(@EscapePersistence * *(..));\r\n\r\n\t@SuppressWarnings(\"all\")\r\n\tpublic static Extent UserAccount.getUserAccountExtent(){\r\n\t\treturn null;\r\n\t}\r\n\r\n\t@SuppressWarnings(\"all\")\r\n\tpublic static List UserAccount.getUserAccountList(){\r\n\t\treturn new ArrayList<UserAccount>();\r\n\t}\r\n\r\n\t@SuppressWarnings(\"all\")\r\n\tpublic static List UserAccount.getTimelineActiveAndOnlineUsers(){\r\n\t\tPersistenceManager pm = getPM();\r\n\r\n\t\ttry {\r\n\t\t\tQuery q = pm.newQuery(UserAccount.class, \"this.isTimelineActive == true && this.isOnline == true\");\r\n\t\t\treturn (List) q.execute();\r\n\t\t} catch (Exception e) {\r\n\t\t\tExceptionPrinter.print(System.err,e,\"I couldn't fetch timeline active and online users\");\r\n\t\t\treturn (List)(new ArrayList<Object>());\r\n\t\t} \r\n\t}\r\n\r\n\t@SuppressWarnings(\"all\")\r\n\tpublic static List UserAccount.getTimelineActiveUsers(){\r\n\t\tPersistenceManager pm = getPM();\r\n\r\n\t\ttry {\r\n\t\t\tQuery q = pm.newQuery(UserAccount.class, \"this.isTimelineActive == true\");\r\n\t\t\treturn (List) q.execute();\r\n\t\t} catch (Exception e) {\r\n\t\t\tExceptionPrinter.print(System.err,e,\"I couldn't fetch timeline active users\");\r\n\t\t\treturn (List)(new ArrayList<Object>());\r\n\t\t} \r\n\t}\r\n\r\n\t@SuppressWarnings(\"all\")\r\n\tpublic static List UserAccount.getOnlineUsers(){\r\n\t\tPersistenceManager pm = getPM();\r\n\r\n\t\ttry {\r\n\t\t\tQuery q = pm.newQuery(UserAccount.class, \"this.isOnline == true\");\r\n\t\t\treturn (List) q.execute();\r\n\t\t} catch (Exception e) {\r\n\t\t\tExceptionPrinter.print(System.err,e,\"I couldn't fetch online users\");\r\n\t\t\treturn (List)(new ArrayList<Object>());\r\n\t\t} \r\n\t}\r\n\r\n\t@SuppressWarnings(\"all\")\r\n\tpublic static List UserStatistic.getUserStatisticList() {\r\n\t\treturn new ArrayList<UserStatistic> ();\r\n\t}\r\n\r\n\t@SuppressWarnings(\"all\")\r\n\tpublic static List UserTwitterTimeline.getUserTwitterTimelineList() {\r\n\t\treturn new ArrayList<UserTwitterTimeline> ();\r\n\t}\r\n\r\n\t@SuppressWarnings(\"all\")\r\n\tpublic static List Announcement.getAnnouncementList() {\r\n\t\treturn new ArrayList<Announcement> ();\r\n\t}\r\n\r\n\tprivate static final PersistenceManagerFactory PMF =\r\n\t\t\tJDOHelper.getPersistenceManagerFactory(\"transactions-optional\");\r\n\tprivate static final ThreadLocal<PersistenceManager> perThreadPM\r\n\t= new ThreadLocal<PersistenceManager>();\r\n\r\n\tprivate Persistence() {};\r\n\r\n\tprivate static PersistenceManager getPM() {\r\n\t\tPersistenceManager PM = perThreadPM.get();\r\n\t\tif (PM == null) {\r\n\t\t\tPM = PMF.getPersistenceManager();\r\n\t\t\tperThreadPM.set(PM);\r\n\t\t}\r\n\t\treturn PM;\r\n\t}\r\n\r\n\tafter(Object o) : pushObject(o) && !withinEscapePersistence(){\r\n\t\tPersistenceManager pm = getPM();\r\n\t\t\/**\r\n\t\t * First try to convert object to UserStatistic.\r\n\t\t * If you can, that means the persistent object was UserStatistic,\r\n\t\t * so you should flag statistics array as dirty.\r\n\t\t * (o.w. it will not persist changes to the array.)\r\n\t\t *\/\r\n\t\tif(o.getClass().equals(UserStatistic.class)) {\r\n\t\t\tUserStatistic statistic=(UserStatistic) o;\r\n\t\t\tJDOHelper.makeDirty(statistic, \"statistics\");\r\n\t\t}\r\n\t\tpm.makePersistent(o.getClass().cast(o));\r\n\t\tcache.put(o.getClass().getName() + \"_\" + pm.getObjectId(o), o);\r\n\t\tpm.flush();\r\n\t}    \r\n\r\n\t@SuppressWarnings(\"all\")\r\n\tObject around(Object pk) : pullObject(pk) && !withinEscapePersistence(){\r\n\t\tPersistenceManager pm = getPM();\r\n\t\ttry{\r\n\t\t\tObject r = cache.peek(thisJoinPointStaticPart.getSignature().getDeclaringTypeName() + \"_\" + pk);\r\n\t\t\tif (r == null) {\r\n\t\t\t\tr = pm.getObjectById(thisJoinPoint.getSignature().getDeclaringType(),pk);\r\n\t\t\t\tcache.put(thisJoinPointStaticPart.getSignature().getDeclaringTypeName() + \"_\" + pk, r);\r\n\t\t\t}\r\n\t\t\treturn r;\r\n\t\t} catch (Exception e) {\r\n\t\t\tExceptionPrinter.print(System.err, e, \"I couldn't fetch persistent object for \" + \r\n\t\t\t\t\tthisJoinPointStaticPart.getSignature().getDeclaringTypeName() + \" \" + pk);\r\n\t\t\treturn null;\r\n\t\t} \r\n\t}\r\n\r\n\t@SuppressWarnings(\"all\")\r\n\tList around() : pullList() {\r\n\t\tPersistenceManager pm = getPM();\r\n\r\n\t\ttry {\r\n\t\t\tList list = (List) pm.newQuery(thisJoinPoint.getSignature().getDeclaringType()).execute();\r\n\t\t\treturn list;\r\n\t\t} catch (Exception e) {\r\n\t\t\tExceptionPrinter.print(System.err,e,\"I couldn't fetch persistent list for \"+getClass());\r\n\t\t\treturn (List)(new ArrayList<Object>());\r\n\t\t} \r\n\t}\r\n\r\n\t@SuppressWarnings(\"all\")\r\n\t\/*Extent around() : pullExtent() {\r\n\t\tPersistenceManager pm = getPM();\r\n\r\n\t\ttry {\r\n\t\t\tExtent extent = pm.getExtent(thisJoinPoint.getSignature().getDeclaringType(), false);\r\n\t\t\treturn extent;\r\n\t\t} catch (Exception e) {\r\n\t\t\tExceptionPrinter.print(System.err, e, \"I couldn't fetch persistent extent for \"+getClass());\r\n\t\t\treturn null;\r\n\t\t} \r\n    }*\/\r\n\r\n\tafter() : pmShouldClose() {\r\n\t\tPersistenceManager PM = perThreadPM.get();\r\n\t\tif (PM != null) {\r\n\t\t\tperThreadPM.remove();\r\n\t\t\tTransaction tx = PM.currentTransaction();\r\n\t\t\tif (tx.isActive()) {\r\n\t\t\t\ttx.rollback();\r\n\t\t\t}\r\n\t\t\tPM.close();\r\n\t\t}\r\n\t}\r\n\r\n}\r\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"5d330839e569528859de52a4db75a466be08d5a8","subject":"* fix changes","message":"* fix changes","repos":"agentlab\/ru.agentlab.maia","old_file":"aspects\/ru.agentlab.maia.context.events\/aj-src\/ru\/agentlab\/maia\/context\/events2\/AContextEvents.aj","new_file":"aspects\/ru.agentlab.maia.context.events\/aj-src\/ru\/agentlab\/maia\/context\/events2\/AContextEvents.aj","new_contents":"package ru.agentlab.maia.context.events2;\n\nimport ru.agentlab.maia.context.IContext;\nimport ru.agentlab.maia.context.events.MaiaContextChangeObjectEvent;\nimport ru.agentlab.maia.context.events.MaiaContextRemoveObjectEvent;\nimport ru.agentlab.maia.context.events.MaiaContextSetObjectEvent;\nimport ru.agentlab.maia.event.IMaiaEventBroker;\nimport ru.agentlab.maia.context.aspect.AContext;\n\npublic aspect AContextEvents extends AContext {\n\n\tvoid around(IContext context, String id): onRemoveByString(context, id) {\n\t\tIMaiaEventBroker broker = null;\n\t\tObject old = null;\n\t\tbroker = context.get(IMaiaEventBroker.class);\n\t\told = context.getLocal(id);\n\n\t\tproceed(context, id);\n\n\t\tif (broker != null) {\n\t\t\tif (old != null) {\n\t\t\t\tbroker.post(new MaiaContextRemoveObjectEvent(old));\n\t\t\t}\n\t\t}\n\t}\n\n\tvoid around(IContext context, Class<?> id): onRemoveByClass(context, id) {\n\t\tIMaiaEventBroker broker = null;\n\t\tObject old = null;\n\t\tbroker = context.get(IMaiaEventBroker.class);\n\t\told = context.getLocal(id);\n\n\t\tproceed(context, id);\n\n\t\tif (broker != null) {\n\t\t\tif (old != null) {\n\t\t\t\tbroker.post(new MaiaContextRemoveObjectEvent(old));\n\t\t\t}\n\t\t}\n\t}\n\n\tvoid around(IContext context, String id, Object value): onSetByString(context, id, value) {\n\t\tIMaiaEventBroker broker = null;\n\t\tObject old = null;\n\t\tbroker = context.get(IMaiaEventBroker.class);\n\t\told = context.getLocal(id);\n\n\t\tproceed(context, id, value);\n\n\t\tif (broker != null) {\n\t\t\tif (old == null) {\n\t\t\t\tbroker.post(new MaiaContextSetObjectEvent(context, value));\n\t\t\t} else {\n\t\t\t\tbroker.post(new MaiaContextChangeObjectEvent(context, value));\n\t\t\t}\n\t\t}\n\t}\n\n\tvoid around(IContext context, Class<?> id, Object value): onSetByClass(context, id, value) {\n\t\tIMaiaEventBroker broker = null;\n\t\tObject old = null;\n\t\tbroker = context.get(IMaiaEventBroker.class);\n\t\told = context.getLocal(id);\n\n\t\tproceed(context, id, value);\n\n\t\tif (broker != null) {\n\t\t\tif (old == null) {\n\t\t\t\tbroker.post(new MaiaContextSetObjectEvent(context, value));\n\t\t\t} else {\n\t\t\t\tbroker.post(new MaiaContextChangeObjectEvent(context, value));\n\t\t\t}\n\t\t}\n\t}\n}","old_contents":"package ru.agentlab.maia.context.events2;\n\nimport ru.agentlab.maia.context.IContext;\nimport ru.agentlab.maia.context.events.MaiaContextChangeObjectEvent;\nimport ru.agentlab.maia.context.events.MaiaContextRemoveObjectEvent;\nimport ru.agentlab.maia.context.events.MaiaContextSetObjectEvent;\nimport ru.agentlab.maia.context.exception.MaiaContextKeyNotFound;\nimport ru.agentlab.maia.event.IMaiaEventBroker;\nimport ru.agentlab.maia.context.aspect.AContext;\n\npublic aspect AContextEvents extends AContext {\n\n\tvoid around(IContext context, String id): onRemoveByString(context, id) {\n\t\tIMaiaEventBroker broker = null;\n\t\tObject old = null;\n\t\ttry {\n\t\t\tbroker = context.getService(IMaiaEventBroker.class);\n\t\t\told = context.getServiceLocal(id);\n\t\t} catch (MaiaContextKeyNotFound e) {\n\t\t}\n\n\t\tproceed(context, id);\n\n\t\tif (broker != null) {\n\t\t\tif (old != null) {\n\t\t\t\tbroker.post(new MaiaContextRemoveObjectEvent(old));\n\t\t\t}\n\t\t}\n\t}\n\n\tvoid around(IContext context, Class<?> id): onRemoveByClass(context, id) {\n\t\tIMaiaEventBroker broker = null;\n\t\tObject old = null;\n\t\ttry {\n\t\t\tbroker = context.getService(IMaiaEventBroker.class);\n\t\t\told = context.getServiceLocal(id);\n\t\t} catch (MaiaContextKeyNotFound e) {\n\t\t}\n\n\t\tproceed(context, id);\n\n\t\tif (broker != null) {\n\t\t\tif (old != null) {\n\t\t\t\tbroker.post(new MaiaContextRemoveObjectEvent(old));\n\t\t\t}\n\t\t}\n\t}\n\n\tvoid around(IContext context, String id, Object value): onSetByString(context, id, value) {\n\t\tIMaiaEventBroker broker = null;\n\t\tObject old = null;\n\t\ttry {\n\t\t\tbroker = context.getService(IMaiaEventBroker.class);\n\t\t\told = context.getServiceLocal(id);\n\t\t} catch (MaiaContextKeyNotFound e) {\n\t\t}\n\n\t\tproceed(context, id, value);\n\n\t\tif (broker != null) {\n\t\t\tif (old == null) {\n\t\t\t\tbroker.post(new MaiaContextSetObjectEvent(context, value));\n\t\t\t} else {\n\t\t\t\tbroker.post(new MaiaContextChangeObjectEvent(context, value));\n\t\t\t}\n\t\t}\n\t}\n\n\tvoid around(IContext context, Class<?> id, Object value): onSetByClass(context, id, value) {\n\t\tIMaiaEventBroker broker = null;\n\t\tObject old = null;\n\t\ttry {\n\t\t\tbroker = context.getService(IMaiaEventBroker.class);\n\t\t\told = context.getServiceLocal(id);\n\t\t} catch (MaiaContextKeyNotFound e) {\n\t\t}\n\n\t\tproceed(context, id, value);\n\n\t\tif (broker != null) {\n\t\t\tif (old == null) {\n\t\t\t\tbroker.post(new MaiaContextSetObjectEvent(context, value));\n\t\t\t} else {\n\t\t\t\tbroker.post(new MaiaContextChangeObjectEvent(context, value));\n\t\t\t}\n\t\t}\n\t}\n}","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"cf9816bf1a102b72ca7cc5951f98eed319c58a11","subject":"Define an ExecutorService using the Capacity annotation value set on the Program. If no Capacity is set on the Program, a CachedThreadPool ExecutorService is used.","message":"Define an ExecutorService using the Capacity annotation value set on the Program.\nIf no Capacity is set on the Program, a CachedThreadPool ExecutorService is used.\n","repos":"christophe-w\/parallelj.runtime,awltech\/org.parallelj","old_file":"parallelj-launching\/src\/main\/java\/org\/parallelj\/launching\/quartz\/ProgramJobsAdapter.aj","new_file":"parallelj-launching\/src\/main\/java\/org\/parallelj\/launching\/quartz\/ProgramJobsAdapter.aj","new_contents":"\/*\n *     ParallelJ, framework for parallel computing\n *\n *     Copyright (C) 2010, 2011, 2012 Atos Worldline or third-party contributors as\n *     indicated by the @author tags or express copyright attribution\n *     statements applied by the authors.\n *\n *     This library is free software; you can redistribute it and\/or\n *     modify it under the terms of the GNU Lesser General Public\n *     License as published by the Free Software Foundation; either\n *     version 2.1 of the License.\n *\n *     This library is distributed in the hope that it will be useful,\n *     but WITHOUT ANY WARRANTY; without even the implied warranty of\n *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n *     Lesser General Public License for more details.\n *\n *     You should have received a copy of the GNU Lesser General Public\n *     License along with this library; if not, write to the Free Software\n *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n *\/\npackage org.parallelj.launching.quartz;\n\nimport java.lang.reflect.InvocationTargetException;\nimport java.lang.reflect.Method;\nimport java.util.List;\nimport java.util.concurrent.ExecutorService;\nimport java.util.concurrent.Executors;\n\nimport org.parallelj.Programs;\nimport org.parallelj.Programs.ProcessHelper;\nimport org.parallelj.internal.kernel.KCall;\nimport org.parallelj.internal.kernel.KProgram;\nimport org.parallelj.internal.kernel.KReflection;\nimport org.parallelj.internal.reflect.ProgramAdapter.Adapter;\nimport org.parallelj.launching.LaunchingMessageKind;\nimport org.parallelj.launching.ReturnCodes;\nimport org.parallelj.mirror.ProgramType;\nimport org.quartz.Job;\nimport org.quartz.JobDataMap;\nimport org.quartz.JobExecutionContext;\nimport org.quartz.JobExecutionException;\n\n\/**\n * Implements the Job.execute(..) method\n * \n * \n *\/\nprivileged public aspect ProgramJobsAdapter percflow (execution(public void Job+.execute(..) throws JobExecutionException)) {\n\n\t\/**\n\t * The JobExecutionContext where get Program's arguments ant where to put\n\t * the Result.\n\t *\/\n\tpublic JobExecutionContext context;\n\n\t\/*\n\t * The Aspect JobsAdapter must be passed before this.\n\t *\/\n\tdeclare precedence :\n\t\torg.parallelj.launching.quartz.JobsAdapter;\n\n\tprivate Adapter adpater;\n\n\t\/**\n\t * Launch a Program and initialize the Result as a JobDataMap.\n\t * \n\t * @param self\n\t * @param context\n\t * @throws JobExecutionException\n\t *\/\n\tvoid around(Job self, JobExecutionContext context)\n\t\t\tthrows JobExecutionException : \n\t\texecution( public void  Job+.execute(..) throws JobExecutionException) \n\t\t\t&& (within(@org.parallelj.Program *) || within(JobsAdapter)) \n\t\t\t\t&& args(context) && this(self) {\n\t\tthis.adpater = (Adapter) self;\n\t\tthis.context = context;\n\t\tJobDataMap jobDataMap = new JobDataMap();\n\t\tcontext.setResult(jobDataMap);\n\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.SUCCESS);\n\t\ttry {\n\t\t\tproceed(self, context);\n\n\t\t\ttry {\n\t\t\t\t\/\/ Initialize an ExecutorService with the Capacity of the Program\n\t\t\t\tProcessHelper<?> processHelper = Programs.as((Adapter) self);\n\t\t\t\tProgramType programType = processHelper.getProcess().getProgram();\n\t\t\t\tExecutorService service = null;\n\t\t\t\tif (programType instanceof KProgram) {\n\t\t\t\t\tshort programCapacity = ((KProgram) programType)\n\t\t\t\t\t\t\t.getCapacity();\n\t\t\t\t\tservice = (programCapacity == Short.MAX_VALUE) ? Executors\n\t\t\t\t\t\t\t.newCachedThreadPool() : Executors\n\t\t\t\t\t\t\t.newFixedThreadPool(programCapacity);\n\t\t\t\t} else {\n\t\t\t\t\tservice = Executors\n\t\t\t\t\t\t\t.newCachedThreadPool();\n\t\t\t\t}\n\t\t\t\t\/\/ Launch the program with the initialized ExecutorService\n\t\t\t\tprocessHelper.execute(service).join();\n\t\t\t\tservice.shutdown();\n\t\t\t\tProgramFieldsBinder.getProgramOutputFields(this, context);\n\t\t\t} catch (IllegalAccessException e) {\n\t\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.FAILURE);\n\t\t\t} catch (NoSuchFieldException e) {\n\t\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.FAILURE);\n\t\t\t}\n\t\t} catch (InvocationTargetException e) {\n\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.FAILURE);\n\t\t}\n\t}\n\n\t\/**\n\t * Intercept Exception thrown in RunnableProcedure\/CallableProcedure for\n\t * tracing. If an Exception is thrown, the return code of a Launch becomes\n\t * FAILURE.\n\t * \n\t * @param self\n\t *\/\n\tpointcut enter(KCall _kCall): call(* org.parallelj.internal.kernel.callback.Entry+.enter(KCall)) && args(_kCall);\n\n\tpointcut invoke(): call(public Object Method.invoke(Object, ..)) && !within(ProgramJobsAdapter);\n\n\tafter(Object oo, KCall _kCall) throwing (InvocationTargetException ite) : \n    \tinvoke() && args(oo, ..) && cflow(enter(_kCall)) {\n\n\t\tLaunchingMessageKind.ELAUNCH0002.format(this.adpater, ite);\n\t\tif (this.context != null && this.context.getResult() != null\n\t\t\t\t&& this.context.getResult() instanceof JobDataMap) {\n\t\t\t((JobDataMap) this.context.getResult()).put(\n\t\t\t\t\tQuartzUtils.RETURN_CODE, ReturnCodes.FAILURE);\n\t\t}\n\t}\n}\n","old_contents":"\/*\n *     ParallelJ, framework for parallel computing\n *\n *     Copyright (C) 2010, 2011, 2012 Atos Worldline or third-party contributors as\n *     indicated by the @author tags or express copyright attribution\n *     statements applied by the authors.\n *\n *     This library is free software; you can redistribute it and\/or\n *     modify it under the terms of the GNU Lesser General Public\n *     License as published by the Free Software Foundation; either\n *     version 2.1 of the License.\n *\n *     This library is distributed in the hope that it will be useful,\n *     but WITHOUT ANY WARRANTY; without even the implied warranty of\n *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n *     Lesser General Public License for more details.\n *\n *     You should have received a copy of the GNU Lesser General Public\n *     License along with this library; if not, write to the Free Software\n *     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n *\/\npackage org.parallelj.launching.quartz;\n\nimport java.lang.reflect.InvocationTargetException;\nimport java.lang.reflect.Method;\n\nimport org.parallelj.Programs;\nimport org.parallelj.internal.kernel.KCall;\nimport org.parallelj.internal.reflect.ProgramAdapter.Adapter;\nimport org.parallelj.launching.LaunchingMessageKind;\nimport org.parallelj.launching.ReturnCodes;\nimport org.quartz.Job;\nimport org.quartz.JobDataMap;\nimport org.quartz.JobExecutionContext;\nimport org.quartz.JobExecutionException;\n\n\/**\n * Implements the Job.execute(..) method\n * \n * \n *\/\nprivileged public aspect ProgramJobsAdapter percflow (execution(public void Job+.execute(..) throws JobExecutionException)) {\n\n\t\/**\n\t * The JobExecutionContext where get Program's arguments ant where to put\n\t * the Result.\n\t *\/\n\tpublic JobExecutionContext context;\n\n\t\/*\n\t * The Aspect JobsAdapter must be passed before this.\n\t *\/\n\tdeclare precedence :\n\t\torg.parallelj.launching.quartz.JobsAdapter;\n\n\tprivate Adapter adpater;\n\n\t\/**\n\t * Launch a Program and initialize the Result as a JobDataMap.\n\t * \n\t * @param self\n\t * @param context\n\t * @throws JobExecutionException\n\t *\/\n\tvoid around(Job self, JobExecutionContext context)\n\t\t\tthrows JobExecutionException : \n\t\texecution( public void  Job+.execute(..) throws JobExecutionException) \n\t\t\t&& (within(@org.parallelj.Program *) || within(JobsAdapter)) \n\t\t\t\t&& args(context) && this(self) {\n\t\tthis.adpater = (Adapter) self;\n\t\tthis.context = context;\n\t\tJobDataMap jobDataMap = new JobDataMap();\n\t\tcontext.setResult(jobDataMap);\n\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.SUCCESS);\n\t\ttry {\n\t\t\tproceed(self, context);\n\n\t\t\ttry {\n\t\t\t\tPrograms.as((Adapter) self).execute().join();\n\t\t\t\tProgramFieldsBinder.getProgramOutputFields(this, context);\n\t\t\t} catch (IllegalAccessException e) {\n\t\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.FAILURE);\n\t\t\t} catch (NoSuchFieldException e) {\n\t\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.FAILURE);\n\t\t\t}\n\t\t} catch (InvocationTargetException e) {\n\t\t\tjobDataMap.put(QuartzUtils.RETURN_CODE, ReturnCodes.FAILURE);\n\t\t}\n\t}\n\n\t\/**\n\t * Intercept Exception thrown in RunnableProcedure\/CallableProcedure for tracing. If an\n\t * Exception is thrown, the return code of a Launch becomes FAILURE.\n\t * \n\t * @param self\n\t *\/\n    pointcut enter(KCall _kCall): call(* org.parallelj.internal.kernel.callback.Entry+.enter(KCall)) && args(_kCall);\n    pointcut invoke(): call(public Object Method.invoke(Object, ..)) && !within(ProgramJobsAdapter);\n    after(Object oo, KCall _kCall) throwing (InvocationTargetException ite) : \n    \tinvoke() && args(oo, ..) && cflow(enter(_kCall)) {\n\t\t\n\t\tLaunchingMessageKind.ELAUNCH0002.format(this.adpater, ite);\n\t\tif (this.context != null \n\t\t\t\t&& this.context.getResult() != null \n\t\t\t\t&& this.context.getResult() instanceof JobDataMap) {\n\t\t\t((JobDataMap) this.context.getResult()).put(\n\t\t\t\t\tQuartzUtils.RETURN_CODE, ReturnCodes.FAILURE);\n\t\t}\n    }\n}\n","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"2d7ae2767ef62eacb729c092a625282576b05de5","subject":"'cflow' changed to 'within' to specify where the method is called","message":"'cflow' changed to 'within' to specify where the method is called\n","repos":"selig\/qea","old_file":"code\/qea\/src\/benchmark\/competition\/java\/jUnitRV_MMT\/monitoring\/JUnitRV_MMTThreeAspect.aj","new_file":"code\/qea\/src\/benchmark\/competition\/java\/jUnitRV_MMT\/monitoring\/JUnitRV_MMTThreeAspect.aj","new_contents":"package benchmark.competition.java.jUnitRV_MMT.monitoring;\r\n\r\nimport java.util.concurrent.locks.Lock;\r\n\r\nimport monitoring.impl.MonitorFactory;\r\nimport monitoring.intf.Monitor;\r\nimport properties.Property;\r\nimport properties.competition.JavaRV_mmt;\r\nimport structure.impl.other.Verdict;\r\nimport structure.intf.QEA;\r\nimport benchmark.competition.java.jUnitRV_MMT.ExampleLocking;\r\n\r\npublic aspect JUnitRV_MMTThreeAspect {\r\n\r\n\tprivate final Monitor monitor;\r\n\r\n\tprivate final int RUN = 1;\r\n\tprivate final int LOCK_TRUE = 2;\r\n\tprivate final int UNLOCK = 3;\r\n\tprivate final int ACTION = 4;\r\n\r\n\tpublic JUnitRV_MMTThreeAspect() {\r\n\t\tQEA qea = new JavaRV_mmt().make(Property.JAVARV_MMT_THREE);\r\n\t\tmonitor = MonitorFactory.create(qea);\r\n\t}\r\n\r\n\tpointcut run(ExampleLocking thread) : execution(void ExampleLocking.run())\r\n\t\t&& target(thread);\r\n\r\n\tpointcut action(ExampleLocking thread) : call(void ExampleLocking.action())\r\n\t\t&& target(thread);\r\n\r\n\tbefore(ExampleLocking thread) : run(thread) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(RUN, thread);\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [thread=\"\r\n\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t\tSystem.exit(0);\r\n\t\t}\r\n\t};\r\n\r\n\tboolean around(Lock lockObj, ExampleLocking thread) :\r\n\t\tcall(boolean Lock.tryLock()) && target(lockObj) && this(thread) \r\n\t\t&& within(ExampleLocking) {\r\n\r\n\t\tboolean result = false;\r\n\t\t\/\/ We perform the lock and the monitor step as an atomic action\r\n\t\t\/\/ i.e. whilst holding the lockObj, so that we cannot be interrupted\r\n\t\tsynchronized (lockObj) {\r\n\t\t\tresult = proceed(lockObj, thread);\r\n\t\t\tif (result) {\r\n\t\t\t\tVerdict verdict = null;\r\n\t\t\t\t\/\/ Ordering between lockObj and monitor important\r\n\t\t\t\tsynchronized (monitor) {\r\n\t\t\t\t\tverdict = monitor.step(LOCK_TRUE, thread);\r\n\t\t\t\t}\r\n\t\t\t\tif (verdict == Verdict.FAILURE) {\r\n\t\t\t\t\tSystem.err\r\n\t\t\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [thread=\"\r\n\t\t\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t\t\t\tSystem.exit(0);\r\n\t\t\t\t}\r\n\r\n\t\t\t}\r\n\t\t}\r\n\t\treturn result;\r\n\t};\r\n\r\n\tvoid around(Lock lockObj, ExampleLocking thread) :\r\n\t\tcall(void Lock.unlock()) && target(lockObj) && this(thread)\r\n\t\t&& within(ExampleLocking) {\r\n\r\n\t\t\/\/ We perform the unlock and the monitor step as an atomic action\r\n\t\t\/\/ i.e. whilst holding the lockObj, so that we cannot be interrupted\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (lockObj) {\r\n\t\t\tproceed(lockObj, thread);\r\n\t\t\t\/\/ Ordering between lockObj and monitor important\r\n\t\t\tsynchronized (monitor) {\r\n\t\t\t\tverdict = monitor.step(UNLOCK, thread);\r\n\t\t\t}\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [thread=\"\r\n\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t\tSystem.exit(0);\r\n\t\t}\r\n\t};\r\n\r\n\tbefore(ExampleLocking thread) : action(thread) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(ACTION, thread);\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [id=\"\r\n\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t\tSystem.exit(0);\r\n\t\t}\r\n\t};\r\n\r\n\tpointcut endOfProgram() : execution(void ExampleLocking.main(String...));\r\n\r\n\tafter() : endOfProgram() {\r\n\t\tVerdict verdict = monitor.end();\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t} else {\r\n\t\t\tSystem.err.println(\"Property JUnitRV (MMT) 3 satisfied\");\r\n\t\t}\r\n\t}\r\n\r\n}\r\n","old_contents":"package benchmark.competition.java.jUnitRV_MMT.monitoring;\r\n\r\nimport java.util.concurrent.locks.Lock;\r\n\r\nimport monitoring.impl.MonitorFactory;\r\nimport monitoring.intf.Monitor;\r\nimport properties.Property;\r\nimport properties.competition.JavaRV_mmt;\r\nimport structure.impl.other.Verdict;\r\nimport structure.intf.QEA;\r\nimport benchmark.competition.java.jUnitRV_MMT.ExampleLocking;\r\n\r\npublic aspect JUnitRV_MMTThreeAspect {\r\n\r\n\tprivate final Monitor monitor;\r\n\r\n\tprivate final int RUN = 1;\r\n\tprivate final int LOCK_TRUE = 2;\r\n\tprivate final int UNLOCK = 3;\r\n\tprivate final int ACTION = 4;\r\n\r\n\tpublic JUnitRV_MMTThreeAspect() {\r\n\t\tQEA qea = new JavaRV_mmt().make(Property.JAVARV_MMT_THREE);\r\n\t\tmonitor = MonitorFactory.create(qea);\r\n\t}\r\n\r\n\tpointcut run(ExampleLocking thread) : execution(void ExampleLocking.run())\r\n\t\t&& target(thread);\r\n\r\n\tpointcut action(ExampleLocking thread) : call(void ExampleLocking.action())\r\n\t\t&& target(thread);\r\n\r\n\tbefore(ExampleLocking thread) : run(thread) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(RUN, thread);\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [thread=\"\r\n\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t\tSystem.exit(0);\r\n\t\t}\r\n\t};\r\n\r\n\tboolean around(Lock lockObj, ExampleLocking thread) :\r\n\t\t\tcall(boolean Lock.tryLock())\r\n\t\t\t&& cflow(call(boolean ExampleLocking.lock())) && target(lockObj)\r\n\t\t\t&& this(thread) {\r\n\r\n\t\tboolean result = false;\r\n\t\t\/\/ We perform the lock and the monitor step as an atomic action\r\n\t\t\/\/ i.e. whilst holding the lockObj, so that we cannot be interrupted\r\n\t\tsynchronized (lockObj) {\r\n\t\t\tresult = proceed(lockObj, thread);\t\t\r\n\t\t\tif (result) {\r\n\t\t\t\tVerdict verdict = null;\r\n\t\t\t\t\/\/ Ordering between lockObj and monitor important\r\n\t\t\t\tsynchronized (monitor) {\r\n\t\t\t\t\tverdict = monitor.step(LOCK_TRUE, thread);\r\n\t\t\t\t}\r\n\t\t\t\tif (verdict == Verdict.FAILURE) {\r\n\t\t\t\t\tSystem.err\r\n\t\t\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [thread=\"\r\n\t\t\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t\t\t\tSystem.exit(0);\r\n\t\t\t\t}\r\n\t\r\n\t\t\t}\r\n\t\t}\r\n\t\treturn result;\r\n\t};\r\n\r\n\tvoid around(Lock lockObj, ExampleLocking thread) :\r\n\t\tcall(void Lock.unlock()) && cflow(call(void ExampleLocking.unlock()))\r\n\t\t&& target(lockObj) && this(thread) {\r\n\r\n\t\t\/\/ We perform the unlock and the monitor step as an atomic action\r\n\t\t\/\/ i.e. whilst holding the lockObj, so that we cannot be interrupted\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (lockObj) {\r\n\t\t\tproceed(lockObj, thread);\t\r\n\t\t\t\/\/ Ordering between lockObj and monitor important\r\n\t\t\tsynchronized (monitor) {\r\n\t\t\t\tverdict = monitor.step(UNLOCK, thread);\r\n\t\t\t}\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [thread=\"\r\n\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t\tSystem.exit(0);\r\n\t\t}\r\n\t};\r\n\r\n\tbefore(ExampleLocking thread) : action(thread) {\r\n\t\tVerdict verdict = null;\r\n\t\tsynchronized (monitor) {\r\n\t\t\tverdict = monitor.step(ACTION, thread);\r\n\t\t}\r\n\t\tif (verdict == Verdict.FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. [id=\"\r\n\t\t\t\t\t\t\t+ thread\r\n\t\t\t\t\t\t\t+ \"]. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t\tSystem.exit(0);\r\n\t\t}\r\n\t};\r\n\t\r\n\tpointcut endOfProgram() : execution(void ExampleLocking.main(String...));\r\n\r\n\tafter() : endOfProgram() {\r\n\t\tVerdict verdict = monitor.end();\r\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\r\n\t\t\tSystem.err\r\n\t\t\t\t\t.println(\"Violation in JUnitRV (MMT) 3. - A thread has to call lock (returning true) to acquire the lock before it may call action - A call to lock only returns true, if no thread is currently holding the lock.\");\r\n\t\t} else {\r\n\t\t\tSystem.err.println(\"Property JUnitRV (MMT) 3 satisfied\");\r\n\t\t}\r\n\t}\r\n\r\n}\r\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"1e754797f936dfc5c14a0f333b11d46612f74cd7","subject":"Added to eliminate XsdValidation.java build error.","message":"Added to eliminate XsdValidation.java build error.\n","repos":"inbloom\/secure-data-service,inbloom\/secure-data-service,inbloom\/secure-data-service,inbloom\/secure-data-service,inbloom\/secure-data-service","old_file":"sli\/ingestion\/ingestion-base\/src\/main\/java\/org\/slc\/sli\/ingestion\/logging\/IngestionLoggerAspect.aj","new_file":"sli\/ingestion\/ingestion-base\/src\/main\/java\/org\/slc\/sli\/ingestion\/logging\/IngestionLoggerAspect.aj","new_contents":"\npackage org.slc.sli.ingestion.logging;\n\nimport org.slf4j.LoggerFactory;\n\nimport org.slc.sli.ingestion.util.LogUtil;\n\n\/**\n *\n * @author mpatel\n *\n *\/\npublic aspect IngestionLoggerAspect {\n\n    declare parents : (org.slc.sli.ingestion..*\n            && !org.slc.sli.ingestion.handler.AbstractIng*\n            && !org.slc.sli.ingestion.handler.Handl*\n            && !org.slc.sli.ingestion.transformation.AbstractTrans*\n            && !org.slc.sli.ingestion.validation.ErrorRep*\n            && !org.slc.sli.ingestion.validation.Valid*\n            && !org.slc.sli.ingestion.validation.spring.SimpleV*\n            && !org.slc.sli.ingestion.landingzone.validation.IngestionFileVal*\n            && !java.lang.Enum+ ) implements IngestionLogger;\n\n    public void IngestionLogger.debug(String msg) {\n        LoggerFactory.getLogger(this.getClass()).debug(msg);\n    }\n\n    public void IngestionLogger.info(String msg) {\n        LoggerFactory.getLogger(this.getClass()).info(msg);\n    }\n\n    public void IngestionLogger.warn(String msg) {\n        LoggerFactory.getLogger(this.getClass()).warn(msg);\n    }\n\n    public void IngestionLogger.debug(String msg, Object... params) {\n        LoggerFactory.getLogger(this.getClass()).debug(msg, params);\n    }\n\n    public void IngestionLogger.info(String msg, Object... params) {\n        LoggerFactory.getLogger(this.getClass()).info(msg, params);\n    }\n\n    public void IngestionLogger.warn(String msg, Object... params) {\n        LoggerFactory.getLogger(this.getClass()).warn(msg, params);\n    }\n\n    public void IngestionLogger.error(String msg, Object... params) {\n        LoggerFactory.getLogger(this.getClass()).error(msg, params);\n    }\n\n    public void IngestionLogger.error(String msg, Throwable x) {\n        LoggerFactory.getLogger(this.getClass()).error(msg, x);\n    }\n\n    public void IngestionLogger.piiClearedError(String msg, Throwable x) {\n        LogUtil.error(LoggerFactory.getLogger(this.getClass()), msg, (Exception)x);\n    }\n\n}","old_contents":"\npackage org.slc.sli.ingestion.logging;\n\nimport org.slf4j.LoggerFactory;\n\nimport org.slc.sli.ingestion.util.LogUtil;\n\n\/**\n *\n * @author mpatel\n *\n *\/\npublic aspect IngestionLoggerAspect {\n\n    declare parents : (org.slc.sli.ingestion..*\n            && !org.slc.sli.ingestion.handler.AbstractIng*\n            && !org.slc.sli.ingestion.handler.Handl*\n            && !org.slc.sli.ingestion.transformation.AbstractTrans*\n            && !org.slc.sli.ingestion.validation.ErrorRep*\n            && !org.slc.sli.ingestion.validation.spring.SimpleV*\n            && !org.slc.sli.ingestion.landingzone.validation.IngestionFileVal*\n            && !java.lang.Enum+ ) implements IngestionLogger;\n\n    public void IngestionLogger.debug(String msg) {\n        LoggerFactory.getLogger(this.getClass()).debug(msg);\n    }\n\n    public void IngestionLogger.info(String msg) {\n        LoggerFactory.getLogger(this.getClass()).info(msg);\n    }\n\n    public void IngestionLogger.warn(String msg) {\n        LoggerFactory.getLogger(this.getClass()).warn(msg);\n    }\n\n    public void IngestionLogger.debug(String msg, Object... params) {\n        LoggerFactory.getLogger(this.getClass()).debug(msg, params);\n    }\n\n    public void IngestionLogger.info(String msg, Object... params) {\n        LoggerFactory.getLogger(this.getClass()).info(msg, params);\n    }\n\n    public void IngestionLogger.warn(String msg, Object... params) {\n        LoggerFactory.getLogger(this.getClass()).warn(msg, params);\n    }\n\n    public void IngestionLogger.error(String msg, Object... params) {\n        LoggerFactory.getLogger(this.getClass()).error(msg, params);\n    }\n\n    public void IngestionLogger.error(String msg, Throwable x) {\n        LoggerFactory.getLogger(this.getClass()).error(msg, x);\n    }\n\n    public void IngestionLogger.piiClearedError(String msg, Throwable x) {\n        LogUtil.error(LoggerFactory.getLogger(this.getClass()), msg, (Exception)x);\n    }\n\n}","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"2b6237b9fe56dff8af0c009bc00d6740237356fc","subject":"changes made by roo","message":"changes made by roo\n","repos":"ulbricht\/mds,datacite\/mds,datacite\/mds,ulbricht\/mds,datacite\/mds,ulbricht\/mds,datacite\/mds,ulbricht\/mds,datacite\/mds","old_file":"src\/main\/java\/org\/datacite\/mds\/web\/ui\/controller\/MediaController_Roo_Controller.aj","new_file":"src\/main\/java\/org\/datacite\/mds\/web\/ui\/controller\/MediaController_Roo_Controller.aj","new_contents":"\/\/ WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.\n\/\/ You may push code into the target .java compilation unit if you wish to edit any member(s).\n\npackage org.datacite.mds.web.ui.controller;\n\nimport java.io.UnsupportedEncodingException;\nimport java.lang.Long;\nimport java.lang.String;\nimport java.util.ArrayList;\nimport java.util.Collection;\nimport java.util.List;\nimport javax.servlet.http.HttpServletRequest;\nimport javax.validation.Valid;\nimport org.datacite.mds.domain.Dataset;\nimport org.datacite.mds.domain.Media;\nimport org.springframework.ui.Model;\nimport org.springframework.validation.BindingResult;\nimport org.springframework.web.bind.annotation.ModelAttribute;\nimport org.springframework.web.bind.annotation.PathVariable;\nimport org.springframework.web.bind.annotation.RequestMapping;\nimport org.springframework.web.bind.annotation.RequestMethod;\nimport org.springframework.web.util.UriUtils;\nimport org.springframework.web.util.WebUtils;\n\nprivileged aspect MediaController_Roo_Controller {\n    \n    @RequestMapping(method = RequestMethod.POST)\n    public String MediaController.create(@Valid Media media, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {\n        if (bindingResult.hasErrors()) {\n            uiModel.addAttribute(\"media\", media);\n            return \"medias\/create\";\n        }\n        uiModel.asMap().clear();\n        media.persist();\n        return \"redirect:\/medias\/\" + encodeUrlPathSegment(media.getId().toString(), httpServletRequest);\n    }\n    \n    @RequestMapping(params = \"form\", method = RequestMethod.GET)\n    public String MediaController.createForm(Model uiModel) {\n        uiModel.addAttribute(\"media\", new Media());\n        List dependencies = new ArrayList();\n        if (Dataset.countDatasets() == 0) {\n            dependencies.add(new String[]{\"dataset\", \"datasets\"});\n        }\n        uiModel.addAttribute(\"dependencies\", dependencies);\n        return \"medias\/create\";\n    }\n    \n    @RequestMapping(value = \"\/{id}\", method = RequestMethod.GET)\n    public String MediaController.show(@PathVariable(\"id\") Long id, Model uiModel) {\n        uiModel.addAttribute(\"media\", Media.findMedia(id));\n        uiModel.addAttribute(\"itemId\", id);\n        return \"medias\/show\";\n    }\n    \n    @RequestMapping(method = RequestMethod.PUT)\n    public String MediaController.update(@Valid Media media, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {\n        if (bindingResult.hasErrors()) {\n            uiModel.addAttribute(\"media\", media);\n            return \"medias\/update\";\n        }\n        uiModel.asMap().clear();\n        media.merge();\n        return \"redirect:\/medias\/\" + encodeUrlPathSegment(media.getId().toString(), httpServletRequest);\n    }\n    \n    @RequestMapping(value = \"\/{id}\", params = \"form\", method = RequestMethod.GET)\n    public String MediaController.updateForm(@PathVariable(\"id\") Long id, Model uiModel) {\n        uiModel.addAttribute(\"media\", Media.findMedia(id));\n        return \"medias\/update\";\n    }\n    \n    @ModelAttribute(\"datasets\")\n    public Collection<Dataset> MediaController.populateDatasets() {\n        return Dataset.findAllDatasets();\n    }\n    \n    @ModelAttribute(\"medias\")\n    public Collection<Media> MediaController.populateMedias() {\n        return Media.findAllMedias();\n    }\n    \n    String MediaController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {\n        String enc = httpServletRequest.getCharacterEncoding();\n        if (enc == null) {\n            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;\n        }\n        try {\n            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);\n        }\n        catch (UnsupportedEncodingException uee) {}\n        return pathSegment;\n    }\n    \n}\n","old_contents":"\/\/ WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.\n\/\/ You may push code into the target .java compilation unit if you wish to edit any member(s).\n\npackage org.datacite.mds.web.ui.controller;\n\nimport java.io.UnsupportedEncodingException;\nimport java.lang.Long;\nimport java.lang.String;\nimport java.util.Collection;\nimport javax.servlet.http.HttpServletRequest;\nimport javax.validation.Valid;\nimport org.datacite.mds.domain.Dataset;\nimport org.datacite.mds.domain.Media;\nimport org.springframework.ui.Model;\nimport org.springframework.validation.BindingResult;\nimport org.springframework.web.bind.annotation.ModelAttribute;\nimport org.springframework.web.bind.annotation.PathVariable;\nimport org.springframework.web.bind.annotation.RequestMapping;\nimport org.springframework.web.bind.annotation.RequestMethod;\nimport org.springframework.web.util.UriUtils;\nimport org.springframework.web.util.WebUtils;\n\nprivileged aspect MediaController_Roo_Controller {\n    \n    @RequestMapping(method = RequestMethod.POST)\n    public String MediaController.create(@Valid Media media, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {\n        if (bindingResult.hasErrors()) {\n            uiModel.addAttribute(\"media\", media);\n            return \"medias\/create\";\n        }\n        uiModel.asMap().clear();\n        media.persist();\n        return \"redirect:\/medias\/\" + encodeUrlPathSegment(media.getId().toString(), httpServletRequest);\n    }\n    \n    @RequestMapping(params = \"form\", method = RequestMethod.GET)\n    public String MediaController.createForm(Model uiModel) {\n        uiModel.addAttribute(\"media\", new Media());\n        return \"medias\/create\";\n    }\n    \n    @RequestMapping(value = \"\/{id}\", method = RequestMethod.GET)\n    public String MediaController.show(@PathVariable(\"id\") Long id, Model uiModel) {\n        uiModel.addAttribute(\"media\", Media.findMedia(id));\n        uiModel.addAttribute(\"itemId\", id);\n        return \"medias\/show\";\n    }\n    \n    @RequestMapping(method = RequestMethod.PUT)\n    public String MediaController.update(@Valid Media media, BindingResult bindingResult, Model uiModel, HttpServletRequest httpServletRequest) {\n        if (bindingResult.hasErrors()) {\n            uiModel.addAttribute(\"media\", media);\n            return \"medias\/update\";\n        }\n        uiModel.asMap().clear();\n        media.merge();\n        return \"redirect:\/medias\/\" + encodeUrlPathSegment(media.getId().toString(), httpServletRequest);\n    }\n    \n    @RequestMapping(value = \"\/{id}\", params = \"form\", method = RequestMethod.GET)\n    public String MediaController.updateForm(@PathVariable(\"id\") Long id, Model uiModel) {\n        uiModel.addAttribute(\"media\", Media.findMedia(id));\n        return \"medias\/update\";\n    }\n    \n    @ModelAttribute(\"datasets\")\n    public Collection<Dataset> MediaController.populateDatasets() {\n        return Dataset.findAllDatasets();\n    }\n    \n    @ModelAttribute(\"medias\")\n    public Collection<Media> MediaController.populateMedias() {\n        return Media.findAllMedias();\n    }\n    \n    String MediaController.encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {\n        String enc = httpServletRequest.getCharacterEncoding();\n        if (enc == null) {\n            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;\n        }\n        try {\n            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);\n        }\n        catch (UnsupportedEncodingException uee) {}\n        return pathSegment;\n    }\n    \n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"3756794509130e8f8dcbed2d107a499212556066","subject":"XWIKI-2103: Add encodeURI and decodeURI to Util, deprecate XWiki.getURLEncoded, Utils.encode, Utils.decode Add the compatibility method to the aspect","message":"XWIKI-2103: Add encodeURI and decodeURI to Util, deprecate XWiki.getURLEncoded, Utils.encode, Utils.decode\nAdd the compatibility method to the aspect\n\n\ngit-svn-id: cfa2b40e478804c47c05d0f328c574ec5aa2b82e@7751 f329d543-caf0-0310-9063-dda96c69346f\n","repos":"xwiki\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform","old_file":"xwiki-core\/src\/main\/aspect\/compatibility\/com\/xpn\/xwiki\/api\/XWikiCompatibilityAspect.aj","new_file":"xwiki-core\/src\/main\/aspect\/compatibility\/com\/xpn\/xwiki\/api\/XWikiCompatibilityAspect.aj","new_contents":"\/*\n * See the NOTICE file distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This is free software; you can redistribute it and\/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF site: http:\/\/www.fsf.org.\n *\n *\/\npackage com.xpn.xwiki.api;\n\nimport com.xpn.xwiki.api.XWiki;\nimport com.xpn.xwiki.api.Util;\nimport com.xpn.xwiki.XWikiException;\nimport com.xpn.xwiki.stats.api.XWikiStatsService;\n\nimport java.io.IOException;\nimport java.awt.image.BufferedImage;\nimport java.util.*;\n\n\/**\n * Add a backward compatibility layer to the {@link com.xpn.xwiki.api.XWiki} class.\n *\n * @version $Id: $\n *\/\npublic privileged aspect XWikiCompatibilityAspect\n{\n    \/**\n     * Utility methods have been moved in version 1.3 Milestone 2 to the {@link Util} class.\n     * However to preserve backward compatibility we have deprecated them in this class and\n     * not removed them yet. All calls are funnelled through this class variable.\n     *\/\n    private Util XWiki.util;\n\n    \/**\n     * Capture the api.XWiki constructor so that we can initialize this.util.\n     *\/\n    private pointcut xwikiCreation(XWiki x): this(x) && execution( public XWiki.new(..) );\n\n    after(XWiki x): xwikiCreation(x)\n    {\n        x.util = new Util(x.xwiki, x.context);\n    }\n\n    \/**\n     * API to protect Text from Wiki transformation\n     * @param text\n     * @return escaped text\n     * @deprecated replaced by Util#escapeText since 1.3M2\n     *\/\n    public String XWiki.escapeText(String text)\n    {\n        return this.util.escapeText(text);\n    }\n\n    \/**\n     * API to protect URLs from Wiki transformation\n     * @param url\n     * @return encoded URL\n     * @deprecated replaced by Util#escapeURL since 1.3M2\n     *\/\n    public String XWiki.escapeURL(String url)\n    {\n        return this.util.escapeURL(url);\n    }\n\n    \/**\n     * @deprecated use {@link #getLanguagePreference()} instead\n     *\/\n    public String XWiki.getDocLanguagePreference()\n    {\n        return xwiki.getDocLanguagePreference(getXWikiContext());\n    }\n\n    \/**\n     * Privileged API to send a message to an email address\n     *\n     * @param sender email of the sender of the message\n     * @param recipient email of the recipient of the message\n     * @param message Message to send\n     * @throws XWikiException if the mail was not send successfully\n     * @deprecated replaced by the\n     *   <a href=\"http:\/\/code.xwiki.org\/xwiki\/bin\/view\/Plugins\/MailSenderPlugin\">Mail Sender\n     *   Plugin<\/a> since 1.3M2\n     *\/\n    public void XWiki.sendMessage(String sender, String recipient, String message)\n        throws XWikiException\n    {\n        if (hasProgrammingRights())\n            xwiki.sendMessage(sender, recipient, message, getXWikiContext());\n    }\n\n    \/**\n     * Privileged API to send a message to an email address\n     *\n     * @param sender email of the sender of the message\n     * @param recipient emails of the recipients of the message\n     * @param message Message to send\n     * @throws XWikiException if the mail was not send successfully\n     * @deprecated replaced by the\n     *   <a href=\"http:\/\/code.xwiki.org\/xwiki\/bin\/view\/Plugins\/MailSenderPlugin\">Mail Sender\n     *   Plugin<\/a> since 1.3M2\n     *\/\n    public void XWiki.sendMessage(String sender, String[] recipient, String message)\n        throws XWikiException\n    {\n        if (hasProgrammingRights())\n            xwiki.sendMessage(sender, recipient, message, getXWikiContext());\n    }\n\n    \/**\n     * @return the current date\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#getDate()} since 1.3M2\n     *\/\n    public Date XWiki.getCurrentDate()\n    {\n        return this.util.getDate();\n    }\n\n    \/**\n     * @return the current date\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#getDate()} since 1.3M2\n     *\/\n    public Date XWiki.getDate()\n    {\n        return this.util.getDate();\n    }\n\n    \/**\n     * @param time the time in milliseconds\n     * @return the time delta in milliseconds between the current date and the time passed\n     *         as parameter\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#getTimeDelta(long)} since 1.3M2\n     *\/\n    public int XWiki.getTimeDelta(long time)\n    {\n        return this.util.getTimeDelta(time);\n    }\n\n    \/**\n     * @param time time in milliseconds since 1970, 00:00:00 GMT\n     * @return Date a date from a time in milliseconds since 01\/01\/1970 as a\n     *         Java {@link Date} Object\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#getDate(long)} since 1.3M2\n     *\/\n    public Date XWiki.getDate(long time)\n    {\n        return this.util.getDate(time);\n    }\n\n    \/**\n     * Split a text to an array of texts, according to a separator.\n     *\n     * @param text the original text\n     * @param sep the separator characters. The separator is one or more of the\n     *        separator characters\n     * @return An array containing the split text\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#split(String, String)} since 1.3M2\n     *\/\n    public String[] XWiki.split(String text, String sep)\n    {\n        return this.util.split(text, sep);\n    }\n\n    \/**\n     * Get a stack trace as a String\n     *\n     * @param e the exception to convert to a String\n     * @return the exception stack trace as a String\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#printStrackTrace(Throwable)}\n                   since 1.3M2\n     *\/\n    public String XWiki.printStrackTrace(Throwable e)\n    {\n        return this.util.printStrackTrace(e);\n    }\n\n    \/**\n     * Get a Null object. This is useful in Velocity where there is no real null object\n     * for comparaisons.\n     *\n     * @return a Null Object\n     * @deprecated replaced by {@link Util#getNull()} since 1.3M2\n     *\/\n    public Object XWiki.getNull()\n    {\n        return this.util.getNull();\n    }\n\n    \/**\n     * Get a New Line character. This is useful in Velocity where there is no real new\n     * line character for inclusion in texts.\n     *\n     * @return a new line character\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#getNewline()} since 1.3M2\n     *\/\n    public String XWiki.getNl()\n    {\n        return this.util.getNewline();\n    }\n\n    \/**\n     * @see #getExoService(String)\n     * @deprecated use {@link #getExoService(String)} instead\n     *\/\n    public java.lang.Object XWiki.getService(String className) throws XWikiException\n    {\n        return getExoService(className);\n    }\n\n    \/**\n     * @see #getExoPortalService(String)\n     * @deprecated use {@link #getExoPortalService(String)} instead\n     *\/\n    public java.lang.Object XWiki.getPortalService(String className) throws XWikiException\n    {\n        return getExoPortalService(className);\n    }\n\n    \/**\n     * Creates an Array List. This is useful from Velocity since you cannot\n     * create Object from Velocity with our secure uberspector.\n     *\n     * @return a {@link ArrayList} object\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#getArrayList()} since 1.3M2\n     *\/\n    public List XWiki.getArrayList()\n    {\n        return this.util.getArrayList();\n    }\n\n    \/**\n     * Creates a Hash Map. This is useful from Velocity since you cannot\n     * create Object from Velocity with our secure uberspector.\n     *\n     * @return a {@link HashMap} object\n     * @deprecated replaced by {@link Util#getHashMap()} since 1.3M2\n     *\/\n    public Map XWiki.getHashMap()\n    {\n        return this.util.getHashMap();\n    }\n\n    \/**\n     * Creates a Tree Map. This is useful from Velocity since you cannot\n     * create Object from Velocity with our secure uberspector.\n     *\n     * @return a {@link TreeMap} object\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#getTreeMap()} since 1.3M2\n     *\/\n    public Map XWiki.getTreeMap()\n    {\n        return this.util.getTreeMap();\n    }\n\n    \/**\n     * Sort a list using a standard comparator. Elements need to be mutally comparable and\n     * implement the Comparable interface.\n     *\n     * @param list the list to sort\n     * @return the sorted list (as the same oject reference)\n     * @see {@link java.util.Collections#sort(java.util.List)}\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#sort(java.util.List)} since 1.3M2\n     *\/\n    public List XWiki.sort(List list)\n    {\n        return this.util.sort(list);\n    }\n\n    \/**\n     * Convert an Object to a number and return null if the object is not a Number.\n     *\n     * @param object the object to convert\n     * @return the object as a {@link Number}\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#toNumber(Object)} since 1.3M2\n     *\/\n    public Number XWiki.toNumber(Object object)\n    {\n        return this.util.toNumber(object);\n    }\n\n    \/**\n     * Generate a random string.\n     *\n     * @param size the desired size of the string\n     * @return the randomly generated string\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#generateRandomString(int)}\n                   since 1.3M2\n     *\/\n    public String XWiki.generateRandomString(int size)\n    {\n        return this.util.generateRandomString(size);\n    }\n\n    \/**\n     * Output a BufferedImage object into the response outputstream.\n     * Once this method has been called, not further action is possible.\n     * Users should set $context.setFinished(true) to\n     * avoid template output The image is outpout as image\/jpeg.\n     *\n     * @param image the BufferedImage to output\n     * @throws java.io.IOException if the output fails\n     * @deprecated replaced by\n     *             {@link com.xpn.xwiki.api.Util#outputImage(java.awt.image.BufferedImage)}\n     *             since 1.3M2\n     *\/\n    public void XWiki.outputImage(BufferedImage image) throws IOException\n    {\n        this.util.outputImage(image);\n    }\n\n    \/**\n     * Returns the recently visited pages for a specific action\n     *\n     * @param action (\"view\" or \"edit\")\n     * @param size how many recent actions to retrieve\n     * @return a ArrayList of document names\n     * @deprecated use {@link #getStatsService()} instead\n     *\/\n    public java.util.Collection XWiki.getRecentActions(String action, int size)\n    {\n        XWikiStatsService stats = getXWikiContext().getWiki().getStatsService(getXWikiContext());\n        if (stats == null)\n            return Collections.EMPTY_LIST;\n        return stats.getRecentActions(action, size, getXWikiContext());\n    }\n\n    \/**\n     * @param str the String to convert to an integer\n     * @return the parsed integer or zero in case of exception\n     * @deprecated replaced by {@link Util#parseInt(String)} since 1.3M2\n     *\/\n    public int XWiki.parseInt(String str)\n    {\n        return this.util.parseInt(str);\n    }\n\n    \/**\n     * @param str the String to convert to an Integer Object\n     * @return the parsed integer or zero in case of exception\n     * @deprecated replaced by {@link Util#parseInteger(String)} since 1.3M2\n     *\/\n    public Integer XWiki.parseInteger(String str)\n    {\n        return this.util.parseInteger(str);\n    }\n\n    \/**\n     * @param str the String to convert to a long\n     * @return the parsed long or zero in case of exception\n     * @deprecated replaced by {@link Util#parseLong(String)} since 1.3M2\n     *\/\n    public long XWiki.parseLong(String str)\n    {\n        return this.util.parseLong(str);\n    }\n\n    \/**\n     * @param str the String to convert to a float\n     * @return the parsed float or zero in case of exception\n     * @deprecated replaced by {@link Util#parseFloat(String)} since 1.3M2\n     *\/\n    public float XWiki.parseFloat(String str)\n    {\n        return this.util.parseFloat(str);\n    }\n\n    \/**\n     * @param str the String to convert to a double\n     * @return the parsed double or zero in case of exception\n     * @deprecated replaced by {@link Util#parseDouble(String)} since 1.3M2\n     *\/\n    public double XWiki.parseDouble(String str)\n    {\n        return this.util.parseDouble(str);\n    }\n\n    \/**\n     * Escape text so that it can be used in a like clause or in a test for equality clause.\n     * For example it escapes single quote characters.\n     *\n     * @param text the text to escape\n     * @return filtered text\n     * @deprecated replaced by {@link Util#escapeSQL(String)} since 1.3M2\n     *\/\n    public String XWiki.sqlfilter(String text)\n    {\n        return this.util.escapeSQL(text);\n    }\n\n    \/**\n     * Cleans up the passed text by removing all accents and special characters to make it\n     * a valid page name.\n     *\n     * @param name the page name to normalize\n     * @return the valid page name\n     * @deprecated replaced by {@link Util#clearName(String)} since 1.3M2\n     *\/\n    public String XWiki.clearName(String name)\n    {\n        return this.util.clearName(name);\n    }\n\n    \/**\n     * Replace all accents by their alpha equivalent.\n     *\n     * @param text the text to parse\n     * @return a string with accents replaced with their alpha equivalent\n     * @deprecated replaced by {@link Util#clearAccents(String)} since 1.3M2\n     *\/\n    public String XWiki.clearAccents(String text)\n    {\n        return this.util.clearAccents(text);\n    }\n\n    \/**\n     * Add a and b because Velocity operations are not always working.\n     *\n     * @param a an integer to add\n     * @param b an integer to add\n     * @return the sum of a and b\n     * @deprecated replaced by {@link Util#add(int, int)} since 1.3M2\n     *\/\n    public int XWiki.add(int a, int b)\n    {\n        return this.util.add(a, b);\n    }\n\n    \/**\n     * Add a and b because Velocity operations are not working with longs.\n     *\n     * @param a a long to add\n     * @param b a long to add\n     * @return the sum of a and b\n     * @deprecated replaced by {@link Util#add(long, long)} since 1.3M2\n     *\/\n    public long XWiki.add(long a, long b)\n    {\n        return this.util.add(a, b);\n    }\n\n    \/**\n     * Add a and b where a and b are non decimal numbers specified as Strings.\n     *\n     * @param a a string representing a non decimal number\n     * @param b a string representing a non decimal number\n     * @return the sum of a and b as a String\n     * @deprecated replaced by {@link Util#add(String, String)} since 1.3M2\n     *\/\n    public String XWiki.add(String a, String b)\n    {\n        return this.util.add(a,  b);\n    }\n\n    \/**\n     * Transform a text in a URL compatible text\n     * \n     * @param content text to transform\n     * @return encoded result\n     * @deprecated replaced by {@link Util#encodeURI(String)} since 1.3M2\n     *\/\n    public String XWiki.getURLEncoded(String content)\n    {\n        return this.util.encodeURI(content);\n    }\n}","old_contents":"\/*\n * See the NOTICE file distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This is free software; you can redistribute it and\/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF site: http:\/\/www.fsf.org.\n *\n *\/\npackage com.xpn.xwiki.api;\n\nimport com.xpn.xwiki.api.XWiki;\nimport com.xpn.xwiki.api.Util;\nimport com.xpn.xwiki.XWikiException;\nimport com.xpn.xwiki.stats.api.XWikiStatsService;\n\nimport java.io.IOException;\nimport java.awt.image.BufferedImage;\nimport java.util.*;\n\n\/**\n * Add a backward compatibility layer to the {@link com.xpn.xwiki.api.XWiki} class.\n *\n * @version $Id: $\n *\/\npublic privileged aspect XWikiCompatibilityAspect\n{\n    \/**\n     * Utility methods have been moved in version 1.3 Milestone 2 to the {@link Util} class.\n     * However to preserve backward compatibility we have deprecated them in this class and\n     * not removed them yet. All calls are funnelled through this class variable.\n     *\/\n    private Util XWiki.util;\n\n    \/**\n     * Capture the api.XWiki constructor so that we can initialize this.util.\n     *\/\n    private pointcut xwikiCreation(XWiki x): this(x) && execution( public XWiki.new(..) );\n\n    after(XWiki x): xwikiCreation(x)\n    {\n        x.util = new Util(x.xwiki, x.context);\n    }\n\n    \/**\n     * API to protect Text from Wiki transformation\n     * @param text\n     * @return escaped text\n     * @deprecated replaced by Util#escapeText since 1.3M2\n     *\/\n    public String XWiki.escapeText(String text)\n    {\n        return this.util.escapeText(text);\n    }\n\n    \/**\n     * API to protect URLs from Wiki transformation\n     * @param url\n     * @return encoded URL\n     * @deprecated replaced by Util#escapeURL since 1.3M2\n     *\/\n    public String XWiki.escapeURL(String url)\n    {\n        return this.util.escapeURL(url);\n    }\n\n    \/**\n     * @deprecated use {@link #getLanguagePreference()} instead\n     *\/\n    public String XWiki.getDocLanguagePreference()\n    {\n        return xwiki.getDocLanguagePreference(getXWikiContext());\n    }\n\n    \/**\n     * Privileged API to send a message to an email address\n     *\n     * @param sender email of the sender of the message\n     * @param recipient email of the recipient of the message\n     * @param message Message to send\n     * @throws XWikiException if the mail was not send successfully\n     * @deprecated replaced by the\n     *   <a href=\"http:\/\/code.xwiki.org\/xwiki\/bin\/view\/Plugins\/MailSenderPlugin\">Mail Sender\n     *   Plugin<\/a> since 1.3M2\n     *\/\n    public void XWiki.sendMessage(String sender, String recipient, String message)\n        throws XWikiException\n    {\n        if (hasProgrammingRights())\n            xwiki.sendMessage(sender, recipient, message, getXWikiContext());\n    }\n\n    \/**\n     * Privileged API to send a message to an email address\n     *\n     * @param sender email of the sender of the message\n     * @param recipient emails of the recipients of the message\n     * @param message Message to send\n     * @throws XWikiException if the mail was not send successfully\n     * @deprecated replaced by the\n     *   <a href=\"http:\/\/code.xwiki.org\/xwiki\/bin\/view\/Plugins\/MailSenderPlugin\">Mail Sender\n     *   Plugin<\/a> since 1.3M2\n     *\/\n    public void XWiki.sendMessage(String sender, String[] recipient, String message)\n        throws XWikiException\n    {\n        if (hasProgrammingRights())\n            xwiki.sendMessage(sender, recipient, message, getXWikiContext());\n    }\n\n    \/**\n     * @return the current date\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#getDate()} since 1.3M2\n     *\/\n    public Date XWiki.getCurrentDate()\n    {\n        return this.util.getDate();\n    }\n\n    \/**\n     * @return the current date\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#getDate()} since 1.3M2\n     *\/\n    public Date XWiki.getDate()\n    {\n        return this.util.getDate();\n    }\n\n    \/**\n     * @param time the time in milliseconds\n     * @return the time delta in milliseconds between the current date and the time passed\n     *         as parameter\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#getTimeDelta(long)} since 1.3M2\n     *\/\n    public int XWiki.getTimeDelta(long time)\n    {\n        return this.util.getTimeDelta(time);\n    }\n\n    \/**\n     * @param time time in milliseconds since 1970, 00:00:00 GMT\n     * @return Date a date from a time in milliseconds since 01\/01\/1970 as a\n     *         Java {@link Date} Object\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#getDate(long)} since 1.3M2\n     *\/\n    public Date XWiki.getDate(long time)\n    {\n        return this.util.getDate(time);\n    }\n\n    \/**\n     * Split a text to an array of texts, according to a separator.\n     *\n     * @param text the original text\n     * @param sep the separator characters. The separator is one or more of the\n     *        separator characters\n     * @return An array containing the split text\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#split(String, String)} since 1.3M2\n     *\/\n    public String[] XWiki.split(String text, String sep)\n    {\n        return this.util.split(text, sep);\n    }\n\n    \/**\n     * Get a stack trace as a String\n     *\n     * @param e the exception to convert to a String\n     * @return the exception stack trace as a String\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#printStrackTrace(Throwable)}\n                   since 1.3M2\n     *\/\n    public String XWiki.printStrackTrace(Throwable e)\n    {\n        return this.util.printStrackTrace(e);\n    }\n\n    \/**\n     * Get a Null object. This is useful in Velocity where there is no real null object\n     * for comparaisons.\n     *\n     * @return a Null Object\n     * @deprecated replaced by {@link Util#getNull()} since 1.3M2\n     *\/\n    public Object XWiki.getNull()\n    {\n        return this.util.getNull();\n    }\n\n    \/**\n     * Get a New Line character. This is useful in Velocity where there is no real new\n     * line character for inclusion in texts.\n     *\n     * @return a new line character\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#getNewline()} since 1.3M2\n     *\/\n    public String XWiki.getNl()\n    {\n        return this.util.getNewline();\n    }\n\n    \/**\n     * @see #getExoService(String)\n     * @deprecated use {@link #getExoService(String)} instead\n     *\/\n    public java.lang.Object XWiki.getService(String className) throws XWikiException\n    {\n        return getExoService(className);\n    }\n\n    \/**\n     * @see #getExoPortalService(String)\n     * @deprecated use {@link #getExoPortalService(String)} instead\n     *\/\n    public java.lang.Object XWiki.getPortalService(String className) throws XWikiException\n    {\n        return getExoPortalService(className);\n    }\n\n    \/**\n     * Creates an Array List. This is useful from Velocity since you cannot\n     * create Object from Velocity with our secure uberspector.\n     *\n     * @return a {@link ArrayList} object\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#getArrayList()} since 1.3M2\n     *\/\n    public List XWiki.getArrayList()\n    {\n        return this.util.getArrayList();\n    }\n\n    \/**\n     * Creates a Hash Map. This is useful from Velocity since you cannot\n     * create Object from Velocity with our secure uberspector.\n     *\n     * @return a {@link HashMap} object\n     * @deprecated replaced by {@link Util#getHashMap()} since 1.3M2\n     *\/\n    public Map XWiki.getHashMap()\n    {\n        return this.util.getHashMap();\n    }\n\n    \/**\n     * Creates a Tree Map. This is useful from Velocity since you cannot\n     * create Object from Velocity with our secure uberspector.\n     *\n     * @return a {@link TreeMap} object\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#getTreeMap()} since 1.3M2\n     *\/\n    public Map XWiki.getTreeMap()\n    {\n        return this.util.getTreeMap();\n    }\n\n    \/**\n     * Sort a list using a standard comparator. Elements need to be mutally comparable and\n     * implement the Comparable interface.\n     *\n     * @param list the list to sort\n     * @return the sorted list (as the same oject reference)\n     * @see {@link java.util.Collections#sort(java.util.List)}\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#sort(java.util.List)} since 1.3M2\n     *\/\n    public List XWiki.sort(List list)\n    {\n        return this.util.sort(list);\n    }\n\n    \/**\n     * Convert an Object to a number and return null if the object is not a Number.\n     *\n     * @param object the object to convert\n     * @return the object as a {@link Number}\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#toNumber(Object)} since 1.3M2\n     *\/\n    public Number XWiki.toNumber(Object object)\n    {\n        return this.util.toNumber(object);\n    }\n\n    \/**\n     * Generate a random string.\n     *\n     * @param size the desired size of the string\n     * @return the randomly generated string\n     * @deprecated replaced by {@link com.xpn.xwiki.api.Util#generateRandomString(int)}\n                   since 1.3M2\n     *\/\n    public String XWiki.generateRandomString(int size)\n    {\n        return this.util.generateRandomString(size);\n    }\n\n    \/**\n     * Output a BufferedImage object into the response outputstream.\n     * Once this method has been called, not further action is possible.\n     * Users should set $context.setFinished(true) to\n     * avoid template output The image is outpout as image\/jpeg.\n     *\n     * @param image the BufferedImage to output\n     * @throws java.io.IOException if the output fails\n     * @deprecated replaced by\n     *             {@link com.xpn.xwiki.api.Util#outputImage(java.awt.image.BufferedImage)}\n     *             since 1.3M2\n     *\/\n    public void XWiki.outputImage(BufferedImage image) throws IOException\n    {\n        this.util.outputImage(image);\n    }\n\n    \/**\n     * Returns the recently visited pages for a specific action\n     *\n     * @param action (\"view\" or \"edit\")\n     * @param size how many recent actions to retrieve\n     * @return a ArrayList of document names\n     * @deprecated use {@link #getStatsService()} instead\n     *\/\n    public java.util.Collection XWiki.getRecentActions(String action, int size)\n    {\n        XWikiStatsService stats = getXWikiContext().getWiki().getStatsService(getXWikiContext());\n        if (stats == null)\n            return Collections.EMPTY_LIST;\n        return stats.getRecentActions(action, size, getXWikiContext());\n    }\n\n    \/**\n     * @param str the String to convert to an integer\n     * @return the parsed integer or zero in case of exception\n     * @deprecated replaced by {@link Util#parseInt(String)} since 1.3M2\n     *\/\n    public int XWiki.parseInt(String str)\n    {\n        return this.util.parseInt(str);\n    }\n\n    \/**\n     * @param str the String to convert to an Integer Object\n     * @return the parsed integer or zero in case of exception\n     * @deprecated replaced by {@link Util#parseInteger(String)} since 1.3M2\n     *\/\n    public Integer XWiki.parseInteger(String str)\n    {\n        return this.util.parseInteger(str);\n    }\n\n    \/**\n     * @param str the String to convert to a long\n     * @return the parsed long or zero in case of exception\n     * @deprecated replaced by {@link Util#parseLong(String)} since 1.3M2\n     *\/\n    public long XWiki.parseLong(String str)\n    {\n        return this.util.parseLong(str);\n    }\n\n    \/**\n     * @param str the String to convert to a float\n     * @return the parsed float or zero in case of exception\n     * @deprecated replaced by {@link Util#parseFloat(String)} since 1.3M2\n     *\/\n    public float XWiki.parseFloat(String str)\n    {\n        return this.util.parseFloat(str);\n    }\n\n    \/**\n     * @param str the String to convert to a double\n     * @return the parsed double or zero in case of exception\n     * @deprecated replaced by {@link Util#parseDouble(String)} since 1.3M2\n     *\/\n    public double XWiki.parseDouble(String str)\n    {\n        return this.util.parseDouble(str);\n    }\n\n    \/**\n     * Escape text so that it can be used in a like clause or in a test for equality clause.\n     * For example it escapes single quote characters.\n     *\n     * @param text the text to escape\n     * @return filtered text\n     * @deprecated replaced by {@link Util#escapeSQL(String)} since 1.3M2\n     *\/\n    public String XWiki.sqlfilter(String text)\n    {\n        return this.util.escapeSQL(text);\n    }\n\n    \/**\n     * Cleans up the passed text by removing all accents and special characters to make it\n     * a valid page name.\n     *\n     * @param name the page name to normalize\n     * @return the valid page name\n     * @deprecated replaced by {@link Util#clearName(String)} since 1.3M2\n     *\/\n    public String XWiki.clearName(String name)\n    {\n        return this.util.clearName(name);\n    }\n\n    \/**\n     * Replace all accents by their alpha equivalent.\n     *\n     * @param text the text to parse\n     * @return a string with accents replaced with their alpha equivalent\n     * @deprecated replaced by {@link Util#clearAccents(String)} since 1.3M2\n     *\/\n    public String XWiki.clearAccents(String text)\n    {\n        return this.util.clearAccents(text);\n    }\n\n    \/**\n     * Add a and b because Velocity operations are not always working.\n     *\n     * @param a an integer to add\n     * @param b an integer to add\n     * @return the sum of a and b\n     * @deprecated replaced by {@link Util#add(int, int)} since 1.3M2\n     *\/\n    public int XWiki.add(int a, int b)\n    {\n        return this.util.add(a, b);\n    }\n\n    \/**\n     * Add a and b because Velocity operations are not working with longs.\n     *\n     * @param a a long to add\n     * @param b a long to add\n     * @return the sum of a and b\n     * @deprecated replaced by {@link Util#add(long, long)} since 1.3M2\n     *\/\n    public long XWiki.add(long a, long b)\n    {\n        return this.util.add(a, b);\n    }\n\n    \/**\n     * Add a and b where a and b are non decimal numbers specified as Strings.\n     *\n     * @param a a string representing a non decimal number\n     * @param b a string representing a non decimal number\n     * @return the sum of a and b as a String\n     * @deprecated replaced by {@link Util#add(String, String)} since 1.3M2\n     *\/\n    public String XWiki.add(String a, String b)\n    {\n        return this.util.add(a,  b);\n    }\n}","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"93905d841ad8d990cb74e4365417a6486bcf6733","subject":"Fixing typos in StatOverallTxt.aj","message":"Fixing typos in StatOverallTxt.aj\n","repos":"stieglma\/Schafkopfauswerter","old_file":"src\/StatOverallTxt.aj","new_file":"src\/StatOverallTxt.aj","new_contents":"import java.awt.GridLayout;\n\nimport javax.swing.JPanel;\nimport javax.swing.JTabbedPane;\nimport javax.swing.JTextArea;\n\nimport view.GUI;\nimport view.UIUpdater;\n\npublic privileged aspect StatOverallTxt {\n\n    private static GUI gui;\n    private static JPanel panel = new JPanel();\n    private static JTextArea statText = new JTextArea();\n\n    after() returning(GUI gui): call(GUI.new(*)) {\n        StatOverallTxt.gui = gui;\n    }\n\n    after(JTabbedPane tabbedPane): \n\t\t\texecution(public static void StatisticsHelper.StatisticsPaneCreated(JTabbedPane))\n\t\t\t&& args(tabbedPane) {\n        statText.setEditable(false);\n        panel.setLayout(new GridLayout(0, 1));\n        panel.add(statText);\n        ((JTabbedPane) tabbedPane).addTab(\"OverallText\", panel);\n    }\n\n    after() : execution(* UIUpdater.run()) {\n        statText.setText(getOverallStatisticsString());\n    }\n\n    public String getOverallStatisticsString() {\n        OverallStatistics data = gui.model.getGameData().getOverallStatistics();\n\n        return \"#Spiele (ohne weiter): \" + data.getAnzahlSpieleGesamt()\n                + \" (gewonnen: \"\n                + String.format(\"%.2f\", data.getGesamtWinPerc()) + \"%)\\n\"\n                + \"#Rufspiele: \" + data.getAnzahlRufspiele() + \" (gewonnen: \"\n                + String.format(\"%.2f\", data.getRufspieleWinPerc()) + \"%)\\n\"\n                + \"          -> teuerstes Rufspiel: \"\n                + data.getTeuerstesRufspiel() + \"\\n\" + \"#Soli gesamt: \"\n                + data.getAnzahlSoliGesamt() + \" (gewonnen: \"\n                + String.format(\"%.2f\", data.getSoliGesamtWinPerc())\n                + \"%)\\n\" + \"#Soli normal: \" + data.getAnzahlSoli()\n                + \" (gewonnen: \"\n                + String.format(\"%.2f\", data.getSoliNormalWinPerc()) + \"%)\\n\"\n                + \"            -> teuerstes Solo: \" + data.getTeuerstesSolo()\n                + \"\\n\" + \"#Solo Tout: \" + data.getAnzahlSoliTout()\n                + \" (gewonnen: \"\n                + String.format(\"%.2f\", data.getSoliToutWinPerc()) + \"%)\\n\"\n                + \"          -> teuerstes Solo Tout: \"\n                + data.getTeuerstesSoloTout() + \"\\n\" + \"#Solo Sie: \"\n                + data.getAnzahlSoliSie() + \"\\n\"\n                + \"         -> teuerstes Solo Sie: \"\n                + data.getTeuerstesSoloSie() + \"\\n\" + \"#Weiter: \"\n                + data.getAnzahlWeiter();\n    }\n}","old_contents":"import java.awt.GridLayout;\n\nimport javax.swing.JPanel;\nimport javax.swing.JTabbedPane;\nimport javax.swing.JTextArea;\n\nimport view.GUI;\nimport view.UIUpdater;\n\npublic privileged aspect StatOverallTxt {\n\n    private static GUI gui;\n    private static JPanel panel = new JPanel();\n    private static JTextArea statText = new JTextArea();\n\n    after() returning(GUI gui): call(GUI.new(*)) {\n        StatOverallTxt.gui = gui;\n    }\n\n    after(JTabbedPane tabbedPane): \n\t\t\texecution(public static void StatisticsHelper.StatisticsPaneCreated(JTabbedPane))\n\t\t\t&& args(tabbedPane) {\n        statText.setEditable(false);\n        panel.setLayout(new GridLayout(0, 1));\n        panel.add(statText);\n        ((JTabbedPane) tabbedPane).addTab(\"OverallText\", panel);\n    }\n\n    after() : execution(* UIUpdater.run()) {\n        statText.setText(getOverallStatisticsString());\n    }\n\n    public String getOverallStatisticsString() {\n        OverallStatistics data = gui.model.getGameData().getOverallStatistics();\n\n        return \"#Spiele (ohne weiter): \" + data.getAnzahlSpieleGesamt()\n                + \" (gewonnen: \"\n                + String.format(\"%.2f\", data.getGesamtWinPerc()) + \"%)\\n\"\n                + \"#Rufspiele: \" + data.getAnzahlRufspiele() + \" (gewonnen: \"\n                + String.format(\"%.2f\", data.getRufspieleWinPerc()) + \"%)\\n\"\n                + \"          -> teurstes Rufspiel: \"\n                + data.getTeuerstesRufspiel() + \"\\n\" + \"#Soli gesamt: \"\n                + data.getAnzahlSoliGesamt() + \" (gewonnen: \"\n                + String.format(\"%.2f\", data.getSoliGesamtWinPerc())\n                + \"%)\\n\" + \"#Soli normal: \" + data.getAnzahlSoli()\n                + \" (gewonnen: \"\n                + String.format(\"%.2f\", data.getSoliNormalWinPerc()) + \"%)\\n\"\n                + \"            -> teurstes Solo: \" + data.getTeuerstesSolo()\n                + \"\\n\" + \"#Solo Tout: \" + data.getAnzahlSoliTout()\n                + \" (gewonnen: \"\n                + String.format(\"%.2f\", data.getSoliToutWinPerc()) + \"%)\\n\"\n                + \"          -> teurstes Solo Tout: \"\n                + data.getTeuerstesSoloTout() + \"\\n\" + \"#Solo Sie: \"\n                + data.getAnzahlSoliSie() + \"\\n\"\n                + \"         -> teurstes Solo Sie: \"\n                + data.getTeuerstesSoloSie() + \"\\n\" + \"#Weiter: \"\n                + data.getAnzahlWeiter();\n    }\n}","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"446ec97f65c555b2dcd0b5be595056d112d1e54f","subject":"Remove unused import","message":"Remove unused import\n","repos":"astefanutti\/metrics-aspectj","old_file":"lib\/src\/main\/aspect\/fr\/stefanutti\/metrics\/aspectj\/MetricAspect.aj","new_file":"lib\/src\/main\/aspect\/fr\/stefanutti\/metrics\/aspectj\/MetricAspect.aj","new_contents":"\/**\n * Copyright (C) 2013 Antonin Stefanutti (antonin.stefanutti@gmail.com)\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *         http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage fr.stefanutti.metrics.aspectj;\n\nimport com.codahale.metrics.Metric;\nimport com.codahale.metrics.MetricRegistry;\nimport com.codahale.metrics.annotation.Gauge;\nimport com.codahale.metrics.annotation.ExceptionMetered;\nimport com.codahale.metrics.annotation.Metered;\nimport com.codahale.metrics.annotation.Timed;\n\nimport java.lang.annotation.Annotation;\nimport java.lang.reflect.Method;\nimport java.lang.reflect.Modifier;\nimport java.util.Map;\nimport java.util.concurrent.ConcurrentHashMap;\n\nfinal aspect MetricAspect extends AbstractMetricAspect {\n\n    declare precedence: MetricStaticAspect, MetricAspect, *;\n\n    declare parents : (@Metrics *) implements Profiled;\n\n    \/* packaged-protected *\/\n    final Map<String, AnnotatedMetric> Profiled.metrics = new ConcurrentHashMap<String, AnnotatedMetric>();\n\n    pointcut profiled(Profiled object) : execution((@Metrics Profiled+).new(..)) && this(object);\n\n    after(final Profiled object) : profiled(object) {\n        final MetricStrategy strategy = MetricStrategyFactory.newInstance(object);\n        for (final Method method : object.getClass().getDeclaredMethods()) {\n            \/\/ Skip advising static methods\n            if (Modifier.isStatic(method.getModifiers()))\n                continue;\n\n            metricAnnotation(object, method, strategy, ExceptionMetered.class, new MetricFactory() {\n                @Override\n                public Metric metric(MetricRegistry registry, String name, boolean absolute) {\n                    String finalName = name.isEmpty() ? method.getName() + \".\" + ExceptionMetered.DEFAULT_NAME_SUFFIX : strategy.resolveMetricName(name);\n                    return registry.meter(absolute ? finalName : MetricRegistry.name(object.getClass(), finalName));\n                }\n            });\n            metricAnnotation(object, method, strategy, Gauge.class, new MetricFactory() {\n                @Override\n                public Metric metric(MetricRegistry registry, String name, boolean absolute) {\n                    String finalName = name.isEmpty() ? method.getName() : strategy.resolveMetricName(name);\n                    return registry.register(absolute ? finalName : MetricRegistry.name(object.getClass(), finalName), new ForwardingGauge(method, object));\n                }\n            });\n            metricAnnotation(object, method, strategy, Metered.class, new MetricFactory() {\n                @Override\n                public Metric metric(MetricRegistry registry, String name, boolean absolute) {\n                    String finalName = name.isEmpty() ? method.getName() : strategy.resolveMetricName(name);\n                    return registry.meter(absolute ? finalName : MetricRegistry.name(object.getClass(), finalName));\n                }\n            });\n            metricAnnotation(object, method, strategy, Timed.class, new MetricFactory() {\n                @Override\n                public Metric metric(MetricRegistry registry, String name, boolean absolute) {\n                    String finalName = name.isEmpty() ? method.getName() : strategy.resolveMetricName(name);\n                    return registry.timer(absolute ? finalName : MetricRegistry.name(object.getClass(), finalName));\n                }\n            });\n        }\n    }\n\n    private void metricAnnotation(Profiled object, Method method, MetricStrategy strategy, Class<? extends Annotation> clazz, MetricFactory factory) {\n        if (method.isAnnotationPresent(clazz)) {\n            MetricRegistry registry = strategy.resolveMetricRegistry(object.getClass().getAnnotation(Registry.class).value());\n            Annotation annotation = method.getAnnotation(clazz);\n            Metric metric = factory.metric(registry, metricAnnotationName(annotation), metricAnnotationAbsolute(annotation));\n            object.metrics.put(method.toString(), new AnnotatedMetric(metric, annotation));\n        }\n    }\n}","old_contents":"\/**\n * Copyright (C) 2013 Antonin Stefanutti (antonin.stefanutti@gmail.com)\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *         http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage fr.stefanutti.metrics.aspectj;\n\nimport com.codahale.metrics.Metric;\nimport com.codahale.metrics.MetricRegistry;\nimport com.codahale.metrics.annotation.Gauge;\nimport com.codahale.metrics.annotation.ExceptionMetered;\nimport com.codahale.metrics.annotation.Metered;\nimport com.codahale.metrics.annotation.Timed;\n\nimport java.lang.annotation.Annotation;\nimport java.lang.reflect.InvocationTargetException;\nimport java.lang.reflect.Method;\nimport java.lang.reflect.Modifier;\nimport java.util.Map;\nimport java.util.concurrent.ConcurrentHashMap;\n\nfinal aspect MetricAspect extends AbstractMetricAspect {\n\n    declare precedence: MetricStaticAspect, MetricAspect, *;\n\n    declare parents : (@Metrics *) implements Profiled;\n\n    \/* packaged-protected *\/\n    final Map<String, AnnotatedMetric> Profiled.metrics = new ConcurrentHashMap<String, AnnotatedMetric>();\n\n    pointcut profiled(Profiled object) : execution((@Metrics Profiled+).new(..)) && this(object);\n\n    after(final Profiled object) : profiled(object) {\n        final MetricStrategy strategy = MetricStrategyFactory.newInstance(object);\n        for (final Method method : object.getClass().getDeclaredMethods()) {\n            \/\/ Skip advising static methods\n            if (Modifier.isStatic(method.getModifiers()))\n                continue;\n\n            metricAnnotation(object, method, strategy, ExceptionMetered.class, new MetricFactory() {\n                @Override\n                public Metric metric(MetricRegistry registry, String name, boolean absolute) {\n                    String finalName = name.isEmpty() ? method.getName() + \".\" + ExceptionMetered.DEFAULT_NAME_SUFFIX : strategy.resolveMetricName(name);\n                    return registry.meter(absolute ? finalName : MetricRegistry.name(object.getClass(), finalName));\n                }\n            });\n            metricAnnotation(object, method, strategy, Gauge.class, new MetricFactory() {\n                @Override\n                public Metric metric(MetricRegistry registry, String name, boolean absolute) {\n                    String finalName = name.isEmpty() ? method.getName() : strategy.resolveMetricName(name);\n                    return registry.register(absolute ? finalName : MetricRegistry.name(object.getClass(), finalName), new ForwardingGauge(method, object));\n                }\n            });\n            metricAnnotation(object, method, strategy, Metered.class, new MetricFactory() {\n                @Override\n                public Metric metric(MetricRegistry registry, String name, boolean absolute) {\n                    String finalName = name.isEmpty() ? method.getName() : strategy.resolveMetricName(name);\n                    return registry.meter(absolute ? finalName : MetricRegistry.name(object.getClass(), finalName));\n                }\n            });\n            metricAnnotation(object, method, strategy, Timed.class, new MetricFactory() {\n                @Override\n                public Metric metric(MetricRegistry registry, String name, boolean absolute) {\n                    String finalName = name.isEmpty() ? method.getName() : strategy.resolveMetricName(name);\n                    return registry.timer(absolute ? finalName : MetricRegistry.name(object.getClass(), finalName));\n                }\n            });\n        }\n    }\n\n    private void metricAnnotation(Profiled object, Method method, MetricStrategy strategy, Class<? extends Annotation> clazz, MetricFactory factory) {\n        if (method.isAnnotationPresent(clazz)) {\n            MetricRegistry registry = strategy.resolveMetricRegistry(object.getClass().getAnnotation(Registry.class).value());\n            Annotation annotation = method.getAnnotation(clazz);\n            Metric metric = factory.metric(registry, metricAnnotationName(annotation), metricAnnotationAbsolute(annotation));\n            object.metrics.put(method.toString(), new AnnotatedMetric(metric, annotation));\n        }\n    }\n}","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"e3171ecbeb18394bbdbd56d93fbb6c4f334a9ae4","subject":"profiling calls exclude logging class.","message":"profiling calls exclude logging class.\n","repos":"OpenDanbi\/Sherlock,OpenDanbi\/Sherlock,OpenDanbi\/Sherlock","old_file":"cfg\/android-gradle\/buildenv\/AutoLog.aj","new_file":"cfg\/android-gradle\/buildenv\/AutoLog.aj","new_contents":"package com.sec.android.app.camera;\n\nimport org.aspectj.lang.Signature;\n\npublic aspect AutoLog {\n    pointcut publicMethods() : execution(public * *..*(..));\n    pointcut protectedMethods() : execution(protected * *..*(..));\n    pointcut privateMethods() : execution(private * *..*(..));\n    pointcut allMethods() : execution(* *..*(..));\n    pointcut logObjectCalls() : execution(* Prof.*(..));\n    pointcut loggableCalls() : allMethods() && ! logObjectCalls();\n\n    before() : loggableCalls() {\n        Signature sig = thisJoinPoint.getSignature();\n        String str = sig.toLongString();\n\n        Object[] paramValues = thisJoinPoint.getArgs();\n        if (paramValues.length != 0)\n            str += \" [args] \";\n\n        for (Object object:paramValues) {\n            if (null != object)\n                str += object.toString() + \",,\";\n        }\n\n        Prof.entry(str);\n    }\n\n    after() returning(Object objectRet) : loggableCalls() {\n        Signature sig = thisJoinPoint.getSignature();\n        String str = sig.toLongString();\n        if (null != objectRet){\n            str += \" [returns] \";\n            str += objectRet.toString();\n        }\n        Prof.exit(str);\n    }\n}\n","old_contents":"package com.sec.android.app.camera;\n\nimport org.aspectj.lang.Signature;\n\npublic aspect AutoLog {\n    pointcut publicMethods() : execution(public * *..*(..));\n    pointcut protectedMethods() : execution(protected * *..*(..));\n    pointcut privateMethods() : execution(private * *..*(..));\n    pointcut allMethods() : execution(* *..*(..));\n    pointcut logObjectCalls() : execution(* Prof.*(..));\n    pointcut loggableCalls() : allMethods() && logObjectCalls();\n\n    before() : loggableCalls() {\n        Signature sig = thisJoinPoint.getSignature();\n        String str = sig.toLongString();\n\n        Object[] paramValues = thisJoinPoint.getArgs();\n        if (paramValues.length != 0)\n            str += \" [args] \";\n\n        for (Object object:paramValues) {\n            if (null != object)\n                str += object.toString() + \",,\";\n        }\n\n        Prof.entry(str);\n    }\n\n    after() returning(Object objectRet) : loggableCalls() {\n        Signature sig = thisJoinPoint.getSignature();\n        String str = sig.toLongString();\n        if (null != objectRet){\n            str += \" [returns] \";\n            str += objectRet.toString();\n        }\n        Prof.exit(str);\n    }\n}\n","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"d8f55885312e4b7173286a1f8883ea30f8712c47","subject":"Fix for issue #72","message":"Fix for issue #72\n","repos":"Imaginea\/bot-bot,Imaginea\/bot-bot,menonvarun\/andro_auto_framework,menonvarun\/andro_auto_framework,menonvarun\/andro_auto_framework,Imaginea\/bot-bot","old_file":"recorder\/aspects\/org\/imaginea\/botbot\/OnCreate.aj","new_file":"recorder\/aspects\/org\/imaginea\/botbot\/OnCreate.aj","new_contents":"\npackage org.imaginea.botbot;\n\nimport java.util.*;\nimport android.util.Log;\n \nimport android.os.Bundle;\nimport android.app.Activity;\nimport android.app.AlertDialog;\nimport android.app.Dialog;\nimport android.view.*;\nimport android.widget.*;\nimport android.gesture.*;\n\nimport org.imaginea.botbot.*;\n \naspect OnCreate\n{\n\t\n\tstatic String firstActivity;\n\tstatic int count=0;\n    pointcut captureOnCreate() : (execution(* onCreate(Bundle)));\n    \n    before(): captureOnCreate()\n   \t{\n   \t\tObject target = thisJoinPoint.getTarget();\n   \t\tcount++;\n   \t\tif (firstActivity == null) firstActivity = target.getClass().getName();\n   \t}\n    \n\tafter(): captureOnCreate()\n\t{\n\t\tObject target = thisJoinPoint.getTarget();\n\n\t\tif (!(target instanceof Activity))\n\t\t\treturn;\n\t\tif (firstActivity == null)\n\t\t\treturn;\n\t\tif (firstActivity.contentEquals(target.getClass().getName()) && count==1) {\n\t\t\tActivity a = (Activity) target;\n\n\t\t\tListenerAdder la = new ListenerAdder();\n\t\t\tla.processView(a.getWindow().getDecorView().getRootView());\n\t\t\tfirstActivity = null;\n\t\t}\n\t\tcount--;\n\t}\n    \n    pointcut captureCreate() : (call(* create()));\n\n    after() returning (AlertDialog d): captureCreate()\n\t{\n\t}    \n    \n}\n\n","old_contents":"\npackage org.imaginea.botbot;\n\nimport java.util.*;\nimport android.util.Log;\n \nimport android.os.Bundle;\nimport android.app.Activity;\nimport android.app.AlertDialog;\nimport android.app.Dialog;\nimport android.view.*;\nimport android.widget.*;\nimport android.gesture.*;\n\nimport org.imaginea.botbot.*;\n \naspect OnCreate\n{\n\t\n\tString firstActivity;\n\n    pointcut captureOnCreate() : (execution(* onCreate(Bundle)));\n\n    before(): captureOnCreate()\n\t{\n\t\tObject target = thisJoinPoint.getTarget();\n\n\t\tif (firstActivity == null) firstActivity = target.getClass().getName();\n\t}\n\n    after(): captureOnCreate()\n\t{\n\t\tObject target = thisJoinPoint.getTarget();\n\n\t\tif (!(target instanceof Activity)) return;\n\n\t\tActivity a = (Activity) target;\n\n\t\tListenerAdder la = new ListenerAdder();\n\t\tla.processView(a.getWindow().getDecorView().getRootView());    }\n    \n    pointcut captureCreate() : (call(* create()));\n\n    after() returning (AlertDialog d): captureCreate()\n\t{\n\t}    \n    \n}\n\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"b0a8b8e9d8d700b203997ff0775a87f49f6985e5","subject":"AspectJ tryouts","message":"AspectJ tryouts\n","repos":"rashmishrm\/cmpe202-UMLParser,rashmishrm\/cmpe202-UMLParser","old_file":"UMLGenerator\/aspectj\/MethodInterceptor.aj","new_file":"UMLGenerator\/aspectj\/MethodInterceptor.aj","new_contents":"","old_contents":"","returncode":0,"stderr":"unknown","license":"agpl-3.0","lang":"AspectJ"}
{"commit":"71b1f4222c0e966956fb1910ea4e04f81a5ed853","subject":"+= Logger lors des achats","message":"+= Logger lors des achats","repos":"Kar0t\/GLO-4003-B5,Kar0t\/GLO-4003-B5","old_file":"GLO-4003-B5\/src\/main\/java\/logger\/LogBoughtTicketAspect.aj","new_file":"GLO-4003-B5\/src\/main\/java\/logger\/LogBoughtTicketAspect.aj","new_contents":"package logger;\n\nimport java.io.FileWriter;\nimport java.io.IOException;\nimport java.util.ArrayList;\nimport java.util.Arrays;\nimport java.util.List;\nimport java.util.UUID;\n\nimport ca.ulaval.ticketmaster.events.tickets.model.Ticket;\nimport ca.ulaval.ticketmaster.purchase.model.PurchaseViewModel;\nimport ca.ulaval.ticketmaster.users.model.User;\n\nimport javax.servlet.http.HttpServletRequest;\nimport javax.servlet.http.HttpSession;\n\nimport org.springframework.ui.Model;\nimport org.springframework.validation.BindingResult;\n\npublic aspect LogBoughtTicketAspect {\n\n\tprivate static final String LOG_FILE = \"src\/main\/resources\/log.log\";\n\tprivate static void log( String str )\n\t{\n\t\tFileWriter fwLog = null;\n\t\t\n\t\ttry {\n\t\t\tfwLog = new FileWriter(LOG_FILE, true);\n\t\t\tfwLog.append(str);\n\t\t\tfwLog.flush();\n\t\t\tfwLog.close();\n\t\t} catch (IOException e) {\n\t\t\tSystem.out.println(\"Ne peut pas logger :\");\n\t\t\te.printStackTrace();\n\t\t}\n\t\t\n\t}\n\t\n\t\/\/Purchase\n\tpointcut logPurchase() :\n\t\texecution( \n\t\t\t\tpublic String ca.ulaval.ticketmaster.purchase.PurchaseController.purchase(PurchaseViewModel, Model, HttpSession,\n\t\t\t\t\t    BindingResult, HttpServletRequest) );\n\t\n\tbefore() : logPurchase()\n\t{\n\t\tSystem.out.println(\"About to log\");\n\t\t\n\t\tSystem.out.println(thisJoinPoint.getSignature());\n\t\tSystem.out.println(thisJoinPoint.getArgs().length);\n\t\t\n\t\tSystem.out.println(thisJoinPoint.getArgs()[0] instanceof PurchaseViewModel);\n\t\t\n\t\tif ( thisJoinPoint.getArgs()[0] instanceof PurchaseViewModel )\n\t\t{\n\t\t\tPurchaseViewModel pModel = (PurchaseViewModel)thisJoinPoint.getArgs()[0];\n\t\t\t\n\t\t\tSystem.out.println(pModel.toString());\n\t\t}\n\t\t\/\/pModel.\n\t\t\/\/System.out.println(model.);\n\t\t\t\t\/\/thisJoinPoint().getArgs();\n\t}\n\t\n\tpointcut logConfirmation() :\n\t\texecution(\n\t\t\t\tprivate void ca.ulaval.ticketmaster.dao.util.DataManager.sendConfirmationMail(User, UUID, List<Ticket>) );\n\t\n\t@SuppressWarnings(\"unchecked\")\n\tObject around() : logConfirmation()\n\t{\n\t\tSystem.out.println(\"around\");\n\n\t\tUser user = (User)thisJoinPoint.getArgs()[0];\n\t\tUUID transactionId = (UUID)thisJoinPoint.getArgs()[1];\n\t\tArrayList<Ticket> ticketList = (ArrayList<Ticket>)thisJoinPoint.getArgs()[2];\n\n\t\tLogBoughtTicketAspect.log(\"Envoi du courriel de confirmation  l'utilisateur '\" + user.getUsername()\n\t\t\t\t+ \"' avec transactionId = '\" + transactionId \n\t\t\t\t+ \"', les billets :\\n\" + Arrays.toString(ticketList.toArray()));\n\t\t\n\t\tObject retval = proceed();\n\t\t\n\t\treturn retval;\n\t}\n\n}\n","old_contents":"package logger;\n\nimport javax.servlet.http.HttpServletRequest;\nimport javax.servlet.http.HttpSession;\n\nimport org.springframework.ui.Model;\nimport org.springframework.validation.BindingResult;\n\nimport ca.ulaval.ticketmaster.purchase.model.PurchaseViewModel;\n\npublic aspect LogBoughtTicketAspect {\n\n\t\/\/Purchase\n\tpointcut logPurchase() :\n\t\texecution( \n\t\t\t\t\/\/Ne peut pas utiliser .. pour l'argument en raison du GET\n\t\t\t\tpublic String ca.ulaval.ticketmaster.purchase.PurchaseController.purchase(PurchaseViewModel, Model, HttpSession,\n\t\t\t\t\t    BindingResult, HttpServletRequest) );\n\t\t\/\/execution( * *(..) );\n\t\n\tbefore() : logPurchase()\n\t{\n\t\tSystem.out.println(\"About to log\");\n\t\t\n\t\tSystem.out.println(thisJoinPoint.getSignature());\n\t\tSystem.out.println(thisJoinPoint.getArgs().length);\n\t\t\n\t\tSystem.out.println(thisJoinPoint.getArgs()[0] instanceof PurchaseViewModel);\n\t\t\n\t\tif ( thisJoinPoint.getArgs()[0] instanceof PurchaseViewModel )\n\t\t{\n\t\t\tPurchaseViewModel pModel = (PurchaseViewModel)thisJoinPoint.getArgs()[0];\n\t\t\t\n\t\t\tSystem.out.println(pModel.toString());\n\t\t}\n\t\t\/\/pModel.\n\t\t\/\/System.out.println(model.);\n\t\t\t\t\/\/thisJoinPoint().getArgs();\n\t}\n\n}\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"6233f83078f7ef362c3e155022683b145f72e98e","subject":"[misc] Remove unused imports","message":"[misc] Remove unused imports\n","repos":"xwiki\/xwiki-commons,xwiki\/xwiki-commons","old_file":"xwiki-commons-core\/xwiki-commons-legacy\/xwiki-commons-legacy-component\/xwiki-commons-legacy-component-default\/src\/main\/aspect\/org\/xwiki\/component\/embed\/EmbeddableComponentManagerCompatibilityAspect.aj","new_file":"xwiki-commons-core\/xwiki-commons-legacy\/xwiki-commons-legacy-component\/xwiki-commons-legacy-component-default\/src\/main\/aspect\/org\/xwiki\/component\/embed\/EmbeddableComponentManagerCompatibilityAspect.aj","new_contents":"\/*\n * See the NOTICE file distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This is free software; you can redistribute it and\/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF site: http:\/\/www.fsf.org.\n *\/\npackage org.xwiki.component.embed;\n\nimport java.util.List;\nimport java.util.Map;\nimport java.lang.reflect.Type;\n\nimport org.xwiki.component.descriptor.ComponentDescriptor;\nimport org.xwiki.component.manager.ComponentLookupException;\n\n\/**\n * Add a backward compatibility layer to the {@link EmbeddableComponentManager} class.\n *\n * @version $Id$\n * @since 4.1M1\n *\/\npublic privileged aspect EmbeddableComponentManagerCompatibilityAspect\n{\n    @Deprecated\n    public <T> T EmbeddableComponentManager.lookup(Class<T> role) throws ComponentLookupException\n    {\n        return getInstance(role);\n    }\n\n    @Deprecated\n    public <T> T EmbeddableComponentManager.lookup(Class<T> role, String hint) throws ComponentLookupException\n    {\n        return getInstance(role, hint);\n    }\n\n    @Deprecated\n    public <T> List<T> EmbeddableComponentManager.lookupList(Class<T> role) throws ComponentLookupException\n    {\n        return getInstanceList((Type) role);\n    }\n\n    @Deprecated\n    public <T> Map<String, T> EmbeddableComponentManager.lookupMap(Class<T> role) throws ComponentLookupException\n    {\n        return getInstanceMap((Type) role);\n    }\n\n    @Deprecated\n    public <T> boolean EmbeddableComponentManager.hasComponent(Class<T> role, String hint)\n    {\n        return hasComponent((Type) role, hint);\n    }\n\n    @Deprecated\n    public <T> boolean EmbeddableComponentManager.hasComponent(Class<T> role)\n    {\n        return hasComponent((Type) role);\n    }\n\n    @Deprecated\n    public <T> ComponentDescriptor<T> EmbeddableComponentManager.getComponentDescriptor(Class<T> role, String hint)\n    {\n        return getComponentDescriptor((Type) role, hint);\n    }\n\n    @Deprecated\n    public <T> void EmbeddableComponentManager.unregisterComponent(Class<T> role, String hint)\n    {\n        unregisterComponent((Type) role, hint);\n    }\n}\n","old_contents":"\/*\n * See the NOTICE file distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This is free software; you can redistribute it and\/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF site: http:\/\/www.fsf.org.\n *\/\npackage org.xwiki.component.embed;\n\nimport java.util.ArrayList;\nimport java.util.List;\nimport java.util.Map;\nimport java.lang.reflect.Type;\n\nimport org.xwiki.component.descriptor.ComponentDescriptor;\nimport org.xwiki.component.internal.RoleHint;\nimport org.xwiki.component.manager.ComponentLookupException;\n\n\/**\n * Add a backward compatibility layer to the {@link EmbeddableComponentManager} class.\n *\n * @version $Id$\n * @since 4.1M1\n *\/\npublic privileged aspect EmbeddableComponentManagerCompatibilityAspect\n{\n    @Deprecated\n    public <T> T EmbeddableComponentManager.lookup(Class<T> role) throws ComponentLookupException\n    {\n        return getInstance(role);\n    }\n\n    @Deprecated\n    public <T> T EmbeddableComponentManager.lookup(Class<T> role, String hint) throws ComponentLookupException\n    {\n        return getInstance(role, hint);\n    }\n\n    @Deprecated\n    public <T> List<T> EmbeddableComponentManager.lookupList(Class<T> role) throws ComponentLookupException\n    {\n        return getInstanceList((Type) role);\n    }\n\n    @Deprecated\n    public <T> Map<String, T> EmbeddableComponentManager.lookupMap(Class<T> role) throws ComponentLookupException\n    {\n        return getInstanceMap((Type) role);\n    }\n\n    @Deprecated\n    public <T> boolean EmbeddableComponentManager.hasComponent(Class<T> role, String hint)\n    {\n        return hasComponent((Type) role, hint);\n    }\n\n    @Deprecated\n    public <T> boolean EmbeddableComponentManager.hasComponent(Class<T> role)\n    {\n        return hasComponent((Type) role);\n    }\n\n    @Deprecated\n    public <T> ComponentDescriptor<T> EmbeddableComponentManager.getComponentDescriptor(Class<T> role, String hint)\n    {\n        return getComponentDescriptor((Type) role, hint);\n    }\n\n    @Deprecated\n    public <T> void EmbeddableComponentManager.unregisterComponent(Class<T> role, String hint)\n    {\n        unregisterComponent((Type) role, hint);\n    }\n}\n","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"0f38245cb1ba7cb247f80cee8351835ee75e63f4","subject":"new tab line, renaming players works now","message":"new tab line, renaming players works now\n","repos":"stieglma\/Schafkopfauswerter","old_file":"src\/StatPlayerWiseGraph.aj","new_file":"src\/StatPlayerWiseGraph.aj","new_contents":"import java.awt.BasicStroke;\nimport java.awt.Color;\nimport java.awt.Font;\nimport java.awt.GridLayout;\nimport java.awt.LinearGradientPaint;\n\nimport javax.swing.JPanel;\nimport javax.swing.JTabbedPane;\n\nimport model.SystemValues.Games;\nimport model.SystemValues.Players;\nimport view.GUI;\nimport view.UIUpdater;\nimport de.erichseifert.gral.data.DataTable;\nimport de.erichseifert.gral.plots.BarPlot;\nimport de.erichseifert.gral.plots.BarPlot.BarRenderer;\nimport de.erichseifert.gral.plots.PiePlot;\nimport de.erichseifert.gral.plots.PiePlot.PieSliceRenderer;\nimport de.erichseifert.gral.plots.points.PointRenderer;\nimport de.erichseifert.gral.ui.InteractivePanel;\nimport de.erichseifert.gral.util.GraphicsUtils;\nimport de.erichseifert.gral.util.Insets2D;\nimport de.erichseifert.gral.util.Location;\n\npublic privileged aspect StatPlayerWiseGraph {\n    \/**\n     * Statistics has to be the last feature executed, such that the subfeatures\n     * have the correct gui object before statistics can create the tabbed pane\n     *\/\n    declare precedence : Statistics, StatPlayerWiseGraph, StatPlayerWiseTxt, StatOverallGraph, StatOverallTxt;\n\n    private static GUI gui;\n\n    private static final JTabbedPane playersTabs = new JTabbedPane();\n    private static final Color COLOR1 = Color.GREEN;\n\n    private static DataTable playedTypes[] = new DataTable[4];\n    private static DataTable wonGames[] = new DataTable[4];\n\n    after() returning(GUI gui): call(GUI.new(*)) {\n        StatPlayerWiseGraph.gui = gui;\n    }\n\n    @SuppressWarnings(\"unchecked\")\n    after(JTabbedPane tabbedPane): \n                        execution(public static void StatisticsHelper.StatisticsPaneCreated(JTabbedPane))\n                        && args(tabbedPane) {\n\n        for (int i = 0; i < Players.values().length; i++) {\n            playedTypes[i] = new DataTable(Integer.class, String.class);\n            wonGames[i] = new DataTable(Integer.class, Double.class,String.class);\n        }\n\n        updateData();\n;\n        for (Players player : Players.values()) {\n            playersTabs.addTab(player.toString(), createPlayersPanel(player));\n        }\n        tabbedPane.addTab(\"Einzelstatistiken\", playersTabs);\n    }\n\n    private JPanel createPlayersPanel(Players player) {\n        JPanel containerPanel = new JPanel();\n        containerPanel.setLayout(new GridLayout(2, 2));\n\n        containerPanel.add(new InteractivePanel(createWonGamesBarPlot(player)));\n        containerPanel.add(new InteractivePanel(createPlayedTypesPlot(player)));\n        return containerPanel;\n    }\n\n    after() : execution(* UIUpdater.run()) {\n        updateData();\n        for (Players player : Players.values()) {\n            playersTabs.setTitleAt(player.ordinal(), player.toString());\n        }\n    }\n\n    private static void updateData() {\n        for (Players player : Players.values()) {\n            PlayerWiseStatistics data = gui.model.getGameData()\n                    .getPlayerWiseStatistics(player);\n\n            int i = player.ordinal();\n\n            while (playedTypes[i].getRowCount() > 0) {\n                playedTypes[i].removeLast();\n            }\n            playedTypes[i].add(\n                    data.getGamesPlayedPerType()[Games.RUFSPIEL.ordinal()],\n                    \"Rufspiele\");\n            playedTypes[i].add(\n                    data.getGamesPlayedPerType()[Games.SOLO.ordinal()], \"Soli\");\n            playedTypes[i].add(\n                    data.getGamesPlayedPerType()[Games.TOUT.ordinal()],\n                    \"Soli Tout\");\n            playedTypes[i].add(\n                    data.getGamesPlayedPerType()[Games.SIE.ordinal()],\n                    \"Soli Sie\");\n            playedTypes[i].add(\n                    data.getGamesPlayedPerType()[Games.WEITER.ordinal()],\n                    \"Weiter\");\n\n            \/\/ percentage of won games by gametype\n            int soli_complete_amount = data.getGamesPlayedPerType()[Games.SOLO\n                    .ordinal()]\n                    + data.getGamesPlayedPerType()[Games.SIE.ordinal()]\n                    + data.getGamesPlayedPerType()[Games.TOUT.ordinal()];\n            int soli_complete_amount_won = data.getGamesWonPerType()[Games.SOLO\n                    .ordinal()]\n                    + data.getGamesWonPerType()[Games.SIE.ordinal()]\n                    + data.getGamesWonPerType()[Games.TOUT.ordinal()];\n            double soli_gesamt_won_perc = soli_complete_amount > 0 ? (double) soli_complete_amount_won\n                    \/ soli_complete_amount\n                    : 0.0;\n\n            while (wonGames[i].getRowCount() > 0) {\n                wonGames[i].removeLast();\n            }\n            wonGames[i].add(1, data.getGamesWonPerc(), \"Gesamt\");\n            wonGames[i].add(2,\n                    data.getGamesWonPerTypePerc()[Games.RUFSPIEL.ordinal()],\n                    \"Rufspiele\");\n            wonGames[i].add(3, soli_gesamt_won_perc, \"Soli gesamt\");\n            wonGames[i].add(4,\n                    data.getGamesWonPerTypePerc()[Games.SOLO.ordinal()],\n                    \"Soli normal\");\n            wonGames[i].add(5,\n                    data.getGamesWonPerTypePerc()[Games.TOUT.ordinal()],\n                    \"Soli Tout\");\n            wonGames[i].add(6,\n                    data.getGamesWonPerTypePerc()[Games.SIE.ordinal()],\n                    \"Soli Sie\");\n        }\n    }\n\n    private static PiePlot createPlayedTypesPlot(Players player) {\n        int playerIndex = player.ordinal();\n\n        PiePlot plot = new PiePlot(playedTypes[playerIndex]);\n\n        PointRenderer pointRenderer = plot\n                .getPointRenderer(playedTypes[playerIndex]);\n        pointRenderer.setValueVisible(true);\n        pointRenderer.setValueColumn(1);\n\n        \/\/ Format plot\n        plot.getTitle().setText(\"Anzahl gespielter Spieltypen\");\n        \/\/ Change plot size\n        plot.setRadius(0.9);\n        \/\/ Display a legend\n        plot.setLegendVisible(true);\n        \/\/ Add some margin to the plot area\n        plot.setInsets(new Insets2D.Double(20.0, 40.0, 40.0, 40.0));\n\n        PieSliceRenderer pieSliceRenderer = (PieSliceRenderer) plot\n                .getPointRenderer(playedTypes[playerIndex]);\n\n        \/\/ Change relative size of inner region\n        pieSliceRenderer.setInnerRadius(0.4);\n        \/\/ Change the width of gaps between segments\n        pieSliceRenderer.setGap(0.2);\n        \/\/ Show labels\n        pieSliceRenderer.setValueVisible(true);\n        pieSliceRenderer.setValueColor(Color.WHITE);\n        pieSliceRenderer.setValueFont(Font.decode(null).deriveFont(Font.BOLD));\n\n        return plot;\n    }\n\n    public BarPlot createWonGamesBarPlot(Players player) {\n        int playerIndex = player.ordinal();\n\n        \/\/ Create new bar plot\n        BarPlot plot = new BarPlot(wonGames);\n\n        \/\/ Format plot\n        plot.getTitle().setText(\"Gewonnene Spiele pro Spieltyp (in %)\");\n        plot.setInsets(new Insets2D.Double(40.0, 40.0, 40.0, 40.0));\n        plot.setBarWidth(0.075);\n\n        \/\/ Format bars\n        PointRenderer pointRenderer = plot\n                .getPointRenderer(wonGames[playerIndex]);\n        BarRenderer barRenderer = (BarRenderer) pointRenderer;\n\n        barRenderer.setColor(new LinearGradientPaint(0f, 0f, 0f, 1f,\n                new float[] { 0.0f, 1.0f }, new Color[] { COLOR1,\n                        GraphicsUtils.deriveBrighter(COLOR1) }));\n        barRenderer.setBorderStroke(new BasicStroke(3f));\n        barRenderer.setBorderColor(new LinearGradientPaint(0f, 0f, 0f, 1f,\n                new float[] { 0.0f, 1.0f }, new Color[] {\n                        GraphicsUtils.deriveBrighter(COLOR1), COLOR1 }));\n\n        pointRenderer.setValueVisible(true);\n        pointRenderer.setValueColumn(2);\n\n        pointRenderer.setValueLocation(Location.CENTER);\n        pointRenderer.setValueColor(GraphicsUtils.deriveDarker(COLOR1));\n        pointRenderer.setValueFont(Font.decode(null).deriveFont(Font.BOLD));\n\n        return plot;\n    }\n}","old_contents":"import java.awt.BasicStroke;\nimport java.awt.BorderLayout;\nimport java.awt.Color;\nimport java.awt.FlowLayout;\nimport java.awt.Font;\nimport java.awt.GridLayout;\nimport java.awt.LinearGradientPaint;\nimport java.awt.event.ActionEvent;\nimport java.awt.event.ActionListener;\n\nimport javax.swing.ButtonGroup;\nimport javax.swing.JPanel;\nimport javax.swing.JRadioButton;\nimport javax.swing.JTabbedPane;\n\nimport model.SystemValues.Games;\nimport model.SystemValues.Players;\nimport de.erichseifert.gral.data.DataTable;\nimport de.erichseifert.gral.plots.BarPlot;\nimport de.erichseifert.gral.plots.PiePlot;\nimport de.erichseifert.gral.ui.InteractivePanel;\nimport de.erichseifert.gral.plots.BarPlot.BarRenderer;\nimport de.erichseifert.gral.plots.PiePlot.PieSliceRenderer;\nimport de.erichseifert.gral.plots.points.PointRenderer;\nimport de.erichseifert.gral.util.GraphicsUtils;\nimport de.erichseifert.gral.util.Insets2D;\nimport de.erichseifert.gral.util.Location;\nimport view.GUI;\nimport view.UIUpdater;\nimport model.db.GameData;\n\npublic privileged aspect StatPlayerWiseGraph {\n    \/**\n     * Statistics has to be the last feature executed, such that the subfeatures\n     * have the correct gui object before statistics can create the tabbed pane\n     *\/\n    declare precedence : Statistics, StatPlayerWiseGraph, StatPlayerWiseTxt, StatOverallGraph, StatOverallTxt;\n\n    private static GUI gui;\n    private static JPanel containerPanel = new JPanel();\n    private static JPanel buttonPanel = new JPanel();\n    private static JPanel[] graphPanels = new JPanel[4];\n\n    private static final Color COLOR1 = Color.GREEN;\n\n    private static DataTable playedTypes[] = new DataTable[4];\n    private static DataTable wonGames[] = new DataTable[4];\n\n    after() returning(GUI gui): call(GUI.new(*)) {\n        StatPlayerWiseGraph.gui = gui;\n    }\n\n    after(JTabbedPane tabbedPane): \n                        execution(public static void StatisticsHelper.StatisticsPaneCreated(JTabbedPane))\n                        && args(tabbedPane) {\n        for (int i = 0; i < graphPanels.length; i++) {\n            graphPanels[i] = new JPanel();\n            playedTypes[i] = new DataTable(Integer.class, String.class);\n            wonGames[i] = new DataTable(Integer.class, Double.class,\n                    String.class);\n\n        }\n\n        updateData();\n\n        JRadioButton player1CheckBox = new JRadioButton(\"Spieler 1\");\n        JRadioButton player2CheckBox = new JRadioButton(\"Spieler 2\");\n        JRadioButton player3CheckBox = new JRadioButton(\"Spieler 3\");\n        JRadioButton player4CheckBox = new JRadioButton(\"Spieler 4\");\n\n        player1CheckBox.setSelected(true);\n        ButtonGroup buttonGroup = new ButtonGroup();\n        buttonGroup.add(player1CheckBox);\n        buttonGroup.add(player2CheckBox);\n        buttonGroup.add(player3CheckBox);\n        buttonGroup.add(player4CheckBox);\n\n        player1CheckBox.addActionListener(new ActionListener() {\n\n            @Override\n            public void actionPerformed(ActionEvent e) {\n                containerPanel.remove(1);\n                containerPanel.add(graphPanels[0], BorderLayout.CENTER, 1);\n                containerPanel.repaint();\n            }\n        });\n        player2CheckBox.addActionListener(new ActionListener() {\n\n            @Override\n            public void actionPerformed(ActionEvent e) {\n                containerPanel.remove(1);\n                containerPanel.add(graphPanels[1], BorderLayout.CENTER, 1);\n                containerPanel.repaint();\n            }\n        });\n        player3CheckBox.addActionListener(new ActionListener() {\n\n            @Override\n            public void actionPerformed(ActionEvent e) {\n                containerPanel.remove(1);\n                containerPanel.add(graphPanels[2], BorderLayout.CENTER, 1);\n                containerPanel.repaint();\n            }\n        });\n        player4CheckBox.addActionListener(new ActionListener() {\n\n            @Override\n            public void actionPerformed(ActionEvent e) {\n                containerPanel.remove(1);\n                containerPanel.add(graphPanels[3], BorderLayout.CENTER, 1);\n                containerPanel.repaint();\n            }\n        });\n\n        buttonPanel.setLayout(new FlowLayout());\n        buttonPanel.add(player1CheckBox);\n        buttonPanel.add(player2CheckBox);\n        buttonPanel.add(player3CheckBox);\n        buttonPanel.add(player4CheckBox);\n\n        for (JPanel graphPanel : graphPanels) {\n            graphPanel.setLayout(new GridLayout(2, 2));\n        }\n\n        for (Players player : Players.values()) {\n            int i = player.ordinal();\n            graphPanels[i].add(new InteractivePanel(\n                    createWonGamesBarPlot(player)));\n            graphPanels[i].add(new InteractivePanel(\n                    createPlayedTypesPlot(player)));\n        }\n\n        containerPanel.setLayout(new BorderLayout());\n        containerPanel.add(buttonPanel, BorderLayout.NORTH, 0);\n        containerPanel.add(graphPanels[0], BorderLayout.CENTER, 1);\n\n        tabbedPane.addTab(\"PlayerWiseGrafik\", containerPanel);\n    }\n\n    after() : execution(* UIUpdater.run()) {\n        updateData();\n    }\n\n    private static void updateData() {\n        for (Players player : Players.values()) {\n            PlayerWiseStatistics data = gui.model.getGameData()\n                    .getPlayerWiseStatistics(player);\n\n            int i = player.ordinal();\n\n            while (playedTypes[i].getRowCount() > 0) {\n                playedTypes[i].removeLast();\n            }\n            playedTypes[i].add(\n                    data.getGamesPlayedPerType()[Games.RUFSPIEL.ordinal()],\n                    \"Rufspiele\");\n            playedTypes[i].add(\n                    data.getGamesPlayedPerType()[Games.SOLO.ordinal()], \"Soli\");\n            playedTypes[i].add(\n                    data.getGamesPlayedPerType()[Games.TOUT.ordinal()],\n                    \"Soli Tout\");\n            playedTypes[i].add(\n                    data.getGamesPlayedPerType()[Games.SIE.ordinal()],\n                    \"Soli Sie\");\n            playedTypes[i].add(\n                    data.getGamesPlayedPerType()[Games.WEITER.ordinal()],\n                    \"Weiter\");\n\n            \/\/ percentage of won games by gametype\n            int soli_complete_amount = data.getGamesPlayedPerType()[Games.SOLO\n                    .ordinal()]\n                    + data.getGamesPlayedPerType()[Games.SIE.ordinal()]\n                    + data.getGamesPlayedPerType()[Games.TOUT.ordinal()];\n            int soli_complete_amount_won = data.getGamesWonPerType()[Games.SOLO\n                    .ordinal()]\n                    + data.getGamesWonPerType()[Games.SIE.ordinal()]\n                    + data.getGamesWonPerType()[Games.TOUT.ordinal()];\n            double soli_gesamt_won_perc = soli_complete_amount > 0 ? (double) soli_complete_amount_won\n                    \/ soli_complete_amount\n                    : 0.0;\n\n            while (wonGames[i].getRowCount() > 0) {\n                wonGames[i].removeLast();\n            }\n            wonGames[i].add(1, data.getGamesWonPerc(), \"Gesamt\");\n            wonGames[i].add(2,\n                    data.getGamesWonPerTypePerc()[Games.RUFSPIEL.ordinal()],\n                    \"Rufspiele\");\n            wonGames[i].add(3, soli_gesamt_won_perc, \"Soli gesamt\");\n            wonGames[i].add(4,\n                    data.getGamesWonPerTypePerc()[Games.SOLO.ordinal()],\n                    \"Soli normal\");\n            wonGames[i].add(5,\n                    data.getGamesWonPerTypePerc()[Games.TOUT.ordinal()],\n                    \"Soli Tout\");\n            wonGames[i].add(6,\n                    data.getGamesWonPerTypePerc()[Games.SIE.ordinal()],\n                    \"Soli Sie\");\n        }\n    }\n\n    private static PiePlot createPlayedTypesPlot(Players player) {\n        int playerIndex = player.ordinal();\n\n        PiePlot plot = new PiePlot(playedTypes[playerIndex]);\n\n        PointRenderer pointRenderer = plot\n                .getPointRenderer(playedTypes[playerIndex]);\n        pointRenderer.setValueVisible(true);\n        pointRenderer.setValueColumn(1);\n\n        \/\/ Format plot\n        plot.getTitle().setText(\"Anzahl gespielter Spieltypen\");\n        \/\/ Change plot size\n        plot.setRadius(0.9);\n        \/\/ Display a legend\n        plot.setLegendVisible(true);\n        \/\/ Add some margin to the plot area\n        plot.setInsets(new Insets2D.Double(20.0, 40.0, 40.0, 40.0));\n\n        PieSliceRenderer pieSliceRenderer = (PieSliceRenderer) plot\n                .getPointRenderer(playedTypes[playerIndex]);\n\n        \/\/ Change relative size of inner region\n        pieSliceRenderer.setInnerRadius(0.4);\n        \/\/ Change the width of gaps between segments\n        pieSliceRenderer.setGap(0.2);\n        \/\/ Show labels\n        pieSliceRenderer.setValueVisible(true);\n        pieSliceRenderer.setValueColor(Color.WHITE);\n        pieSliceRenderer.setValueFont(Font.decode(null).deriveFont(Font.BOLD));\n\n        return plot;\n    }\n\n    public BarPlot createWonGamesBarPlot(Players player) {\n        int playerIndex = player.ordinal();\n\n        \/\/ Create new bar plot\n        BarPlot plot = new BarPlot(wonGames);\n\n        \/\/ Format plot\n        plot.getTitle().setText(\"Gewonnene Spiele pro Spieltyp (in %)\");\n        plot.setInsets(new Insets2D.Double(40.0, 40.0, 40.0, 40.0));\n        plot.setBarWidth(0.075);\n\n        \/\/ Format bars\n        PointRenderer pointRenderer = plot\n                .getPointRenderer(wonGames[playerIndex]);\n        BarRenderer barRenderer = (BarRenderer) pointRenderer;\n\n        barRenderer.setColor(new LinearGradientPaint(0f, 0f, 0f, 1f,\n                new float[] { 0.0f, 1.0f }, new Color[] { COLOR1,\n                        GraphicsUtils.deriveBrighter(COLOR1) }));\n        barRenderer.setBorderStroke(new BasicStroke(3f));\n        barRenderer.setBorderColor(new LinearGradientPaint(0f, 0f, 0f, 1f,\n                new float[] { 0.0f, 1.0f }, new Color[] {\n                        GraphicsUtils.deriveBrighter(COLOR1), COLOR1 }));\n\n        pointRenderer.setValueVisible(true);\n        pointRenderer.setValueColumn(2);\n\n        pointRenderer.setValueLocation(Location.CENTER);\n        pointRenderer.setValueColor(GraphicsUtils.deriveDarker(COLOR1));\n        pointRenderer.setValueFont(Font.decode(null).deriveFont(Font.BOLD));\n\n        return plot;\n    }\n}","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"1716c57ff5c1b1532791d270b9529618a837bcb2","subject":"Create sequence diagram in the maven target folder","message":"Create sequence diagram in the maven target folder\n","repos":"madhurkhandelwal234\/UML_parser,madhurkhandelwal234\/UML_parser,madhurkhandelwal234\/UML_parser","old_file":"SequenceDiagramGenerator\/src\/main\/java\/SequenceDiagramGenerator.aj","new_file":"SequenceDiagramGenerator\/src\/main\/java\/SequenceDiagramGenerator.aj","new_contents":"\/\/ TODO change the name of the file\/class\n\n\/\/ Creates sequence diagram in the target folder of maven\n\/\/ TODO change it not depend on mvn target folder\n\nimport java.io.FileOutputStream;\nimport java.io.IOException;\nimport java.io.OutputStream;\nimport java.io.FileWriter;\nimport java.io.File;\nimport java.util.Stack;\nimport java.nio.file.Path;\nimport java.nio.file.Paths;\n\nimport org.aspectj.lang.Signature;\nimport org.aspectj.lang.reflect.MethodSignature;\nimport net.sourceforge.plantuml.SourceStringReader;\n\n\nclass Counter{\n    \/\/ TODO check equivalent of __doc__ in Java\n    private String base;\n    private int count;\n\n    protected Counter(){\n        \/\/ TODO check syntax to call the other Counter constructor\n        this.base = \"1\";\n        this.count = 1;\n    }\n\n    protected Counter(String base){\n        this.base = base;\n        this.count = 1;\n    }\n\n    Counter getNextCounter(){\n        String newBase;\n        if (base == \"\"){\n            newBase = String.valueOf(count);\n        }\n        else{\n            newBase = base + \".\" + String.valueOf(count);\n        }\n        count += 1;\n        return new Counter(newBase);\n    }\n\n    \/\/ TODO just for fun want to make this protected,\n    \/\/ so can i avoid inheritenc from Object?\n    public String toString(){\n        return base;\n    }\n}\n\npublic aspect SequenceDiagramGenerator{\n    \/\/ TODO check if aspects can have instance variables\n    \/\/ need to make these attributes non-static\n    static private Stack<String> currentMethodStack= new Stack<String>();\n    static private Stack<Counter> counterStack= new Stack<Counter>();\n    static private String planUMLGrammar=\"\";\n    static private boolean start=true;\n\n    pointcut traceMethods():  call(* *.*(..))   \/\/ All methods\n                              && !call(* java..*(..)) \/\/ Don't want java language inbuilt objects\n                              && !within(SequenceDiagramGenerator) \/\/ Not within our aspect itself, to avoid infinite reursion\n                              && !within(Counter);\n\n    pointcut traceConstructors():  execution(*.new(..)) \/\/ All constructors\n                                   && !within(SequenceDiagramGenerator)\n                                   && !within(Counter);\n\n    pointcut createSeqImage():  execution(* Main.main(..));\n\n    \/\/ TODO exploer java.io.PrintStream\n    void around(String str) : call(void java.io.PrintStream.println(String))\n                                && !within(SequenceDiagramGenerator)\n                                && !within(Counter)\n                                && args(str){\n        planUMLGrammar = planUMLGrammar + \"note right : \" + str + \"\\n\";\n        proceed(str);\n    }\n\n    after(): createSeqImage(){\n        \/\/ start = false;\n        String note = \"note left of aMain #FFAAAA\\n<color #118888>Madhur Khandelwal\\nmadhurkhandelwal.234@gmail.com \\nend note\\n\";\n        planUMLGrammar = planUMLGrammar + note;\n        \/\/ System.out.println(\"_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+\");\n        \/\/ System.out.println(\"@startuml\\n\" + \n        \/\/           planUMLGrammar +\n        \/\/           \"\\n@enduml\");\n        \/\/ System.out.println(\"_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+\");\n\n        String jarFileLoc = Counter.class.getProtectionDomain().getCodeSource().getLocation().getPath();\n        File file = new File(jarFileLoc);\n        String parentPath = file.getAbsoluteFile().getParent();\n        Path path = Paths.get(parentPath, \"sequenceDiagram.png\");\n        String outputPath = path.toString();\n\n        createImage(\"@startuml\\n\" + planUMLGrammar + \"\\n@enduml\", outputPath);\n    }\n\n    before(): createSeqImage(){\n      start = true;\n    }\n\n\n    before() : traceConstructors() {\n        if(start){\n            Signature s =\n            thisJoinPointStaticPart.getSignature();\n            String methodName = s.getName();\n\n            \/\/ use \"new\" for constructors.\n            if (methodName.equals(\"\") || methodName.equals(\"<init>\")){\n                methodName = \"new\";\n            }\n\n            \/\/ TODO show constructors in the sequence diagram\n            \/\/ System.out.println(s.getDeclaringType().getSimpleName() + \".\"  + methodName + \" {\");\n        }\n    }\n\n    after() : traceConstructors() {\n        \/\/ if(start){\n        \/\/    System.out.println(\"}\");\n        \/\/ }\n    }\n  \n\n    Object around() : traceMethods() {\n    if(start){\n        \/\/ System.out.println(\"##################START##################\");\n\n        MethodSignature signature = (MethodSignature)thisJoinPoint.getSignature();\n\n        String[] parameterNames = signature.getParameterNames();\n        Object[] parameterValues = thisJoinPoint.getArgs();\n\n        \/\/String calleClassName = signature.getDeclaringTypeName();\n        String calleClassName;\n        if (thisJoinPoint.getTarget() == null){\n            calleClassName = signature.getDeclaringTypeName();\n            \/\/ System.out.println(\"null aaya tha: \" + thisJoinPoint.getTarget());\n        }\n        else{\n            \/\/ TODO have diff line for objects of same type\n            \/\/ System.out.println(\"no null: \" + thisJoinPoint.getTarget());\n            calleClassName = thisJoinPoint.getTarget().toString().split(\"@\")[0];\n        }\n        if (\"aeiou\".indexOf(Character.toLowerCase((calleClassName.charAt(0)))) < 0){\n            calleClassName = \"a\" + calleClassName;\n        }\n        else{\n            calleClassName = \"an\" + calleClassName;\n        }\n        \/\/ System.out.println(\"-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\");\n        \/\/ System.out.println(calleClassName);\n        \/\/ System.out.println(\"-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\");\n        String calleMethodName = signature.getName();\n        String returnTypeName = signature.getReturnType().getName();\n\n\n        \/\/ TODO check any functionality to explore all methods like 'dir' in python\n        \/\/ maybe use reflection(why such name) API to iterate over the methods and call them\n        \/\/ System.out.println(\"thisJoinPoint getArgs  \" + thisJoinPoint.getArgs());\n        \/\/ System.out.println(\"thisJoinPoint getKind  \" + thisJoinPoint.getKind());\n        \/\/ System.out.println(\"thisJoinPoint getSignature  \" + thisJoinPoint.getSignature());\n        \/\/ System.out.println(\"thisJoinPoint getSourceLocation  \" + thisJoinPoint.getSourceLocation());\n        \/\/ System.out.println(\"thisJoinPoint getStaticPart  \" + thisJoinPoint.getStaticPart());\n        \/\/ System.out.println(\"thisJoinPoint getTarget  \" + thisJoinPoint.getTarget());\n        \/\/ System.out.println(\"thisJoinPoint getThis  \" + thisJoinPoint.getThis());\n        \/\/ System.out.println(\"thisJoinPoint toLongString  \" + thisJoinPoint.toLongString());\n        \/\/ System.out.println(\"thisJoinPoint toShortString  \" + thisJoinPoint.toShortString());\n        \/\/ System.out.println(\"thisJoinPoint toString  \" + thisJoinPoint.toString());\n\n\n        \/\/ System.out.println(\"thisJoinPointStaticPart getKind\" + thisJoinPointStaticPart.getKind());\n        \/\/ System.out.println(\"thisJoinPointStaticPart getSignature\" + thisJoinPointStaticPart.getSignature());\n        \/\/ System.out.println(\"thisJoinPointStaticPart getSourceLocation\" + thisJoinPointStaticPart.getSourceLocation());\n        \/\/ System.out.println(\"thisJoinPointStaticPart toLongString\" + thisJoinPointStaticPart.toLongString());\n        \/\/ System.out.println(\"thisJoinPointStaticPart toShortString\" + thisJoinPointStaticPart.toShortString());\n        \/\/ System.out.println(\"thisJoinPointStaticPart toString\" + thisJoinPointStaticPart.toString()  );\n\n\n        \/\/ System.out.println(\"thisEnclosingJoinPointStaticPart getKind\" + thisEnclosingJoinPointStaticPart.getKind());\n        \/\/ System.out.println(\"thisEnclosingJoinPointStaticPart getSignature\" + thisEnclosingJoinPointStaticPart.getSignature());\n        \/\/ System.out.println(\"thisEnclosingJoinPointStaticPart getSourceLocation\" + thisEnclosingJoinPointStaticPart.getSourceLocation());\n        \/\/ System.out.println(\"thisEnclosingJoinPointStaticPart toLongString\" + thisEnclosingJoinPointStaticPart.toLongString());\n        \/\/ System.out.println(\"thisEnclosingJoinPointStaticPart toShortString\" + thisEnclosingJoinPointStaticPart.toShortString());\n        \/\/ System.out.println(\"thisEnclosingJoinPointStaticPart toString\" + thisEnclosingJoinPointStaticPart.toString()  );\n\n        \/\/ TODO \n        String callerClass=\"\";\n        if (!currentMethodStack.empty()){\n            callerClass = currentMethodStack.peek();\n        }\n\n        int i = 0;\n        String argString=\"\";\n        for (String x: parameterNames){\n            if (argString != \"\"){\n                argString = argString + \",\";\n            }\n            argString = argString + x + \":\" + parameterValues[i].getClass().getSimpleName();\n            i++;\n        }\n\n        \/\/ System.out.println(\"\");\n\n        \/\/ System.out.println(\"-> \" + signature.toString());\n        String currentLine1;\n        String countString = updateCounter();\n        if (countString != \"\" ){\n            currentLine1 = String.format(\"%s -> %s: %s : %s(%s): %s\\n\", callerClass, calleClassName, countString,calleMethodName, argString, returnTypeName);\n        }else{\n            currentLine1 = String.format(\"%s -> %s: %s(%s): %s\\n\", callerClass, calleClassName, calleMethodName, argString, returnTypeName);\n        }\n        String currentLine2 = String.format(\"activate %s\\n\", calleClassName);\n        \/\/ System.out.println(\"currentLine1: \" + currentLine1);\n\n        planUMLGrammar = planUMLGrammar + currentLine1 + currentLine2;\n        currentMethodStack.push(calleClassName);\n        for (String x: parameterNames){\n            \/\/ System.out.print(\"----------\" + x + \" \");\n        }\n        \/\/ System.out.println(\"\");\n\n        Object result = proceed();\n\n        popCounter();\n        String currentLine3 = String.format(\"%s --> %s\\n\", calleClassName, callerClass);\n\n        String currentLine4 = String.format(\"deactivate %s\\n\", calleClassName);\n\n        planUMLGrammar = planUMLGrammar + currentLine3 + currentLine4;\n        currentMethodStack.pop();\n\n        \/\/ System.out.println(\"<- \" + signature.toString());\n        \/\/ System.out.println(\"##################END###################\");\n\n        return result;\n    }\n    else{\n        Object result = proceed();\n        return result;\n    }\n  }\n\n    private static void appendLineToFile(String line, String filePath){\n        try{\n            FileWriter fw = new FileWriter(filePath, true); \/\/the true will append the new data\n            fw.write(line);\/\/appends the string to the file\n            fw.close();\n        }\n        catch(IOException e){\n            e.printStackTrace();\n        }\n    }\n\n    private static void createImage(String plantUmlString, String filePath){\n        SourceStringReader ssr = new SourceStringReader(plantUmlString);\n        try (FileOutputStream imageFile = new FileOutputStream(filePath)) {\n            ssr.generateImage(imageFile);\n        } catch (IOException e) {\n            e.printStackTrace();\n        }\n    }\n\n    private static String updateCounter(){\n        Counter aCounter;\n        if (counterStack.empty()){\n            aCounter = new Counter();\n        }\n        else{\n            aCounter = counterStack.peek().getNextCounter();\n        }\n        counterStack.push(aCounter);\n        return aCounter.toString();\n    }\n\n    private static void popCounter(){\n        counterStack.pop();\n    }\n}\n","old_contents":"\/\/ TODO change the name of the file\/class\nimport java.io.FileOutputStream;\nimport java.io.IOException;\nimport java.io.OutputStream;\nimport java.io.FileWriter;\nimport java.util.Stack;\n\nimport org.aspectj.lang.Signature;\nimport org.aspectj.lang.reflect.MethodSignature;\nimport net.sourceforge.plantuml.SourceStringReader;\n\n\nclass Counter{\n    \/\/ TODO check equivalent of __doc__ in Java\n    private String base;\n    private int count;\n\n    protected Counter(){\n        \/\/ TODO check syntax to call the other Counter constructor\n        this.base = \"1\";\n        this.count = 1;\n    }\n\n    protected Counter(String base){\n        this.base = base;\n        this.count = 1;\n    }\n\n    Counter getNextCounter(){\n        String newBase;\n        if (base == \"\"){\n            newBase = String.valueOf(count);\n        }\n        else{\n            newBase = base + \".\" + String.valueOf(count);\n        }\n        count += 1;\n        return new Counter(newBase);\n    }\n\n    \/\/ TODO just for fun want to make this protected,\n    \/\/ so can i avoid inheritenc from Object?\n    public String toString(){\n        return base;\n    }\n}\n\npublic aspect SequenceDiagramGenerator{\n    \/\/ TODO check if aspects can have instance variables\n    \/\/ need to make these attributes non-static\n    static private Stack<String> currentMethodStack= new Stack<String>();\n    static private Stack<Counter> counterStack= new Stack<Counter>();\n    static private String planUMLGrammar=\"\";\n    static private boolean start=true;\n\n    pointcut traceMethods():  call(* *.*(..))   \/\/ All methods\n                              && !call(* java..*(..)) \/\/ Don't want java language inbuilt objects\n                              && !within(SequenceDiagramGenerator) \/\/ Not within our aspect itself, to avoid infinite reursion\n                              && !within(Counter);\n\n    pointcut traceConstructors():  execution(*.new(..)) \/\/ All constructors\n                                   && !within(SequenceDiagramGenerator)\n                                   && !within(Counter);\n\n    pointcut createSeqImage():  execution(* Main.main(..));\n\n    \/\/ TODO exploer java.io.PrintStream\n    void around(String str) : call(void java.io.PrintStream.println(String))\n                                && !within(SequenceDiagramGenerator)\n                                && !within(Counter)\n                                && args(str){\n        planUMLGrammar = planUMLGrammar + \"note right : \" + str + \"\\n\";\n        proceed(str);\n    }\n\n    after(): createSeqImage(){\n        \/\/ start = false;\n        String note = \"note left of aMain #FFAAAA\\n<color #118888>Madhur Khandelwal\\nmadhurkhandelwal.234@gmail.com \\nend note\\n\";\n        planUMLGrammar = planUMLGrammar + note;\n        \/\/ System.out.println(\"_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+\");\n        \/\/ System.out.println(\"@startuml\\n\" + \n        \/\/           planUMLGrammar +\n        \/\/           \"\\n@enduml\");\n        \/\/ System.out.println(\"_+_+_+_+_+_+_+_+_+_+_+_+_+_+_+\");\n        createImage(\"@startuml\\n\" + \n                  planUMLGrammar +\n                  \"\\n@enduml\",\n                  \"\/Users\/mak\/Downloads\/temp\/mak.png\");\n    }\n\n    before(): createSeqImage(){\n      start = true;\n    }\n\n\n    before() : traceConstructors() {\n        if(start){\n            Signature s =\n            thisJoinPointStaticPart.getSignature();\n            String methodName = s.getName();\n\n            \/\/ use \"new\" for constructors.\n            if (methodName.equals(\"\") || methodName.equals(\"<init>\")){\n                methodName = \"new\";\n            }\n\n            \/\/ TODO show constructors in the sequence diagram\n            \/\/ System.out.println(s.getDeclaringType().getSimpleName() + \".\"  + methodName + \" {\");\n        }\n    }\n\n    after() : traceConstructors() {\n        \/\/ if(start){\n        \/\/    System.out.println(\"}\");\n        \/\/ }\n    }\n  \n\n    Object around() : traceMethods() {\n    if(start){\n        \/\/ System.out.println(\"##################START##################\");\n\n        MethodSignature signature = (MethodSignature)thisJoinPoint.getSignature();\n\n        String[] parameterNames = signature.getParameterNames();\n        Object[] parameterValues = thisJoinPoint.getArgs();\n\n        \/\/String calleClassName = signature.getDeclaringTypeName();\n        String calleClassName;\n        if (thisJoinPoint.getTarget() == null){\n            calleClassName = signature.getDeclaringTypeName();\n            \/\/ System.out.println(\"null aaya tha: \" + thisJoinPoint.getTarget());\n        }\n        else{\n            \/\/ TODO have diff line for objects of same type\n            \/\/ System.out.println(\"no null: \" + thisJoinPoint.getTarget());\n            calleClassName = thisJoinPoint.getTarget().toString().split(\"@\")[0];\n        }\n        if (\"aeiou\".indexOf(Character.toLowerCase((calleClassName.charAt(0)))) < 0){\n            calleClassName = \"a\" + calleClassName;\n        }\n        else{\n            calleClassName = \"an\" + calleClassName;\n        }\n        \/\/ System.out.println(\"-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\");\n        \/\/ System.out.println(calleClassName);\n        \/\/ System.out.println(\"-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\");\n        String calleMethodName = signature.getName();\n        String returnTypeName = signature.getReturnType().getName();\n\n\n        \/\/ TODO check any functionality to explore all methods like 'dir' in python\n        \/\/ maybe use reflection(why such name) API to iterate over the methods and call them\n        \/\/ System.out.println(\"thisJoinPoint getArgs  \" + thisJoinPoint.getArgs());\n        \/\/ System.out.println(\"thisJoinPoint getKind  \" + thisJoinPoint.getKind());\n        \/\/ System.out.println(\"thisJoinPoint getSignature  \" + thisJoinPoint.getSignature());\n        \/\/ System.out.println(\"thisJoinPoint getSourceLocation  \" + thisJoinPoint.getSourceLocation());\n        \/\/ System.out.println(\"thisJoinPoint getStaticPart  \" + thisJoinPoint.getStaticPart());\n        \/\/ System.out.println(\"thisJoinPoint getTarget  \" + thisJoinPoint.getTarget());\n        \/\/ System.out.println(\"thisJoinPoint getThis  \" + thisJoinPoint.getThis());\n        \/\/ System.out.println(\"thisJoinPoint toLongString  \" + thisJoinPoint.toLongString());\n        \/\/ System.out.println(\"thisJoinPoint toShortString  \" + thisJoinPoint.toShortString());\n        \/\/ System.out.println(\"thisJoinPoint toString  \" + thisJoinPoint.toString());\n\n\n        \/\/ System.out.println(\"thisJoinPointStaticPart getKind\" + thisJoinPointStaticPart.getKind());\n        \/\/ System.out.println(\"thisJoinPointStaticPart getSignature\" + thisJoinPointStaticPart.getSignature());\n        \/\/ System.out.println(\"thisJoinPointStaticPart getSourceLocation\" + thisJoinPointStaticPart.getSourceLocation());\n        \/\/ System.out.println(\"thisJoinPointStaticPart toLongString\" + thisJoinPointStaticPart.toLongString());\n        \/\/ System.out.println(\"thisJoinPointStaticPart toShortString\" + thisJoinPointStaticPart.toShortString());\n        \/\/ System.out.println(\"thisJoinPointStaticPart toString\" + thisJoinPointStaticPart.toString()  );\n\n\n        \/\/ System.out.println(\"thisEnclosingJoinPointStaticPart getKind\" + thisEnclosingJoinPointStaticPart.getKind());\n        \/\/ System.out.println(\"thisEnclosingJoinPointStaticPart getSignature\" + thisEnclosingJoinPointStaticPart.getSignature());\n        \/\/ System.out.println(\"thisEnclosingJoinPointStaticPart getSourceLocation\" + thisEnclosingJoinPointStaticPart.getSourceLocation());\n        \/\/ System.out.println(\"thisEnclosingJoinPointStaticPart toLongString\" + thisEnclosingJoinPointStaticPart.toLongString());\n        \/\/ System.out.println(\"thisEnclosingJoinPointStaticPart toShortString\" + thisEnclosingJoinPointStaticPart.toShortString());\n        \/\/ System.out.println(\"thisEnclosingJoinPointStaticPart toString\" + thisEnclosingJoinPointStaticPart.toString()  );\n\n        \/\/ TODO \n        String callerClass=\"\";\n        if (!currentMethodStack.empty()){\n            callerClass = currentMethodStack.peek();\n        }\n\n        int i = 0;\n        String argString=\"\";\n        for (String x: parameterNames){\n            if (argString != \"\"){\n                argString = argString + \",\";\n            }\n            argString = argString + x + \":\" + parameterValues[i].getClass().getSimpleName();\n            i++;\n        }\n\n        \/\/ System.out.println(\"\");\n\n        \/\/ System.out.println(\"-> \" + signature.toString());\n        String currentLine1;\n        String countString = updateCounter();\n        if (countString != \"\" ){\n            currentLine1 = String.format(\"%s -> %s: %s : %s(%s): %s\\n\", callerClass, calleClassName, countString,calleMethodName, argString, returnTypeName);\n        }else{\n            currentLine1 = String.format(\"%s -> %s: %s(%s): %s\\n\", callerClass, calleClassName, calleMethodName, argString, returnTypeName);\n        }\n        String currentLine2 = String.format(\"activate %s\\n\", calleClassName);\n        \/\/ System.out.println(\"currentLine1: \" + currentLine1);\n\n        planUMLGrammar = planUMLGrammar + currentLine1 + currentLine2;\n        currentMethodStack.push(calleClassName);\n        for (String x: parameterNames){\n            \/\/ System.out.print(\"----------\" + x + \" \");\n        }\n        \/\/ System.out.println(\"\");\n\n        Object result = proceed();\n\n        popCounter();\n        String currentLine3 = String.format(\"%s --> %s\\n\", calleClassName, callerClass);\n\n        String currentLine4 = String.format(\"deactivate %s\\n\", calleClassName);\n\n        planUMLGrammar = planUMLGrammar + currentLine3 + currentLine4;\n        currentMethodStack.pop();\n\n        \/\/ System.out.println(\"<- \" + signature.toString());\n        \/\/ System.out.println(\"##################END###################\");\n\n        return result;\n    }\n    else{\n        Object result = proceed();\n        return result;\n    }\n  }\n\n    private static void appendLineToFile(String line, String filePath){\n        try{\n            FileWriter fw = new FileWriter(filePath, true); \/\/the true will append the new data\n            fw.write(line);\/\/appends the string to the file\n            fw.close();\n        }\n        catch(IOException e){\n            e.printStackTrace();\n        }\n    }\n\n    private static void createImage(String plantUmlString, String filePath){\n        SourceStringReader ssr = new SourceStringReader(plantUmlString);\n        try (FileOutputStream imageFile = new FileOutputStream(filePath)) {\n            ssr.generateImage(imageFile);\n        } catch (IOException e) {\n            e.printStackTrace();\n        }\n    }\n\n    private static String updateCounter(){\n        Counter aCounter;\n        if (counterStack.empty()){\n            aCounter = new Counter();\n        }\n        else{\n            aCounter = counterStack.peek().getNextCounter();\n        }\n        counterStack.push(aCounter);\n        return aCounter.toString();\n    }\n\n    private static void popCounter(){\n        counterStack.pop();\n    }\n}\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"f0ba8f225c072ecfd9eb51368455054df38c8fd1","subject":"XWIKI-5725: Deprecate XWiki#parseMessage Fix aspect","message":"XWIKI-5725: Deprecate XWiki#parseMessage\nFix aspect\n\ngit-svn-id: d23d7a6431d93e1bdd218a46658458610974b053@33155 f329d543-caf0-0310-9063-dda96c69346f\n","repos":"pbondoer\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,xwiki\/xwiki-platform,xwiki\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform,pbondoer\/xwiki-platform","old_file":"xwiki-core\/src\/main\/aspect\/compatibility\/com\/xpn\/xwiki\/XWikiCompatibilityAspect.aj","new_file":"xwiki-core\/src\/main\/aspect\/compatibility\/com\/xpn\/xwiki\/XWikiCompatibilityAspect.aj","new_contents":"\/*\n * See the NOTICE file distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This is free software; you can redistribute it and\/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF site: http:\/\/www.fsf.org.\n *\n *\/\npackage com.xpn.xwiki;\n\nimport com.xpn.xwiki.XWiki;\nimport com.xpn.xwiki.XWikiContext;\nimport com.xpn.xwiki.cache.api.XWikiCache;\nimport com.xpn.xwiki.cache.api.XWikiCacheService;\nimport com.xpn.xwiki.cache.api.internal.XWikiCacheServiceStub;\nimport com.xpn.xwiki.cache.api.internal.XWikiCacheStub;\nimport com.xpn.xwiki.web.XWikiMessageTool;\n\nimport java.io.UnsupportedEncodingException;\nimport java.net.URLEncoder;\nimport java.util.HashMap;\nimport java.util.Map;\n\n\/**\n * Add a backward compatibility layer to the {@link com.xpn.xwiki.XWiki} class.\n * \n * @version $Id$\n *\/\npublic privileged aspect XWikiCompatibilityAspect\n{\n    private static Map XWiki.threadMap = new HashMap();\n\n    \/**\n     * Transform a text in a URL compatible text\n     *\n     * @param content text to transform\n     * @return encoded result\n     * @deprecated replaced by Util#encodeURI since 1.3M2\n     *\/\n    @Deprecated\n    public String XWiki.getURLEncoded(String content)\n    {\n        try {\n            return URLEncoder.encode(content, this.getEncoding());            \n        } catch (UnsupportedEncodingException e) {\n            return content;\n        }\n    }\n    \n    \/**\n     * @return true for multi-wiki\/false for mono-wiki\n     * @deprecated replaced by {@link XWiki#isVirtualMode()} since 1.4M1.\n     *\/\n    @Deprecated\n    public boolean XWiki.isVirtual()\n    {\n        return this.isVirtualMode();\n    }\n\n    \/**\n     * @deprecated Removed since it isn't used; since 1.5M1.\n     *\/\n    @Deprecated\n    public static Map XWiki.getThreadMap()\n    {\n        return XWiki.threadMap;\n    }\n\n    \/**\n     * @deprecated Removed since it isn't used; since 1.5M1.\n     *\/\n    @Deprecated\n    public static void XWiki.setThreadMap(Map threadMap)\n    {\n        XWiki.threadMap = threadMap;\n    }\n\n    \/**\n     * @return the cache service.\n     * @deprecated replaced by {@link XWiki#getCacheFactory(XWikiContext)} or\n     *             {@link XWiki#getLocalCacheFactory(XWikiContext)} since 1.5M2.\n     *\/\n    @Deprecated\n    public XWikiCacheService XWiki.getCacheService()\n    {\n        return new XWikiCacheServiceStub(getCacheFactory(), getLocalCacheFactory());\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getVirtualWikiCache(XWikiContext)} since 1.5M2.\n     *\/\n    @Deprecated\n    public XWikiCache XWiki.getVirtualWikiMap()\n    {\n        return new XWikiCacheStub(this.virtualWikiMap);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpaceCopyright(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebCopyright(XWikiContext context)\n    {\n        return this.getSpaceCopyright(context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, String defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, String, String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, String space, String defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, space, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsLong(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public long XWiki.getWebPreferenceAsLong(String preference, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsLong(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsLong(String, long, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public long XWiki.getWebPreferenceAsLong(String preference, long defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsLong(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsInt(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.getWebPreferenceAsInt(String preference, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsInt(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsInt(String, int, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.getWebPreferenceAsInt(String preference, int defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsInt(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#copySpaceBetweenWikis(String, String, String, String, XWikiContext)} since\n     *             2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.copyWikiWeb(String space, String sourceWiki, String targetWiki, String language, XWikiContext context)\n        throws XWikiException\n    {\n        return this.copySpaceBetweenWikis(space, sourceWiki, targetWiki, language, context);\n    }\n\n    \/**\n     * @deprecated replaced by\n     *             {@link XWiki#copySpaceBetweenWikis(String, String, String, String, boolean, XWikiContext)} since\n     *             2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.copyWikiWeb(String space, String sourceWiki, String targetWiki, String language, boolean clean,\n        XWikiContext context) throws XWikiException\n    {\n        return this.copySpaceBetweenWikis(space, sourceWiki, targetWiki, language, clean, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getDefaultSpace(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getDefaultWeb(XWikiContext context)\n    {\n        return this.getDefaultSpace(context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#skipDefaultSpaceInURLs(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public boolean XWiki.useDefaultWeb(XWikiContext context)\n    {\n        return this.skipDefaultSpaceInURLs(context);\n    }\n\n    \/**\n     * @deprecated use {@link XWikiMessageTool#get(String, List)} instead. You can access message tool using\n     *             {@link XWikiContext#getMessageTool()}.\n     *\/\n    @Deprecated\n    public String XWiki.getMessage(String item, XWikiContext context)\n    {\n        XWikiMessageTool msg = context.getMessageTool();\n        if (msg == null) {\n            return item;\n        } else {\n            return msg.get(item);\n        }\n    }\n\n    \/**\n     * @deprecated use {@link XWikiMessageTool#get(String, List)} instead. You can access message tool using\n     *             {@link XWikiContext#getMessageTool()}.\n     *\/\n    @Deprecated\n    public String XWiki.parseMessage(String id, XWikiContext context)\n    {\n        XWikiMessageTool msg = context.getMessageTool();\n\n        return parseContent(msg.get(id), context);\n    }\n\n    \/**\n     * @deprecated use {@link XWikiMessageTool#get(String, List)} instead. You can access message tool using\n     *             {@link XWikiContext#getMessageTool()}.\n     *\/\n    @Deprecated\n    public String XWiki.parseMessage(XWikiContext context)\n    {\n        String message = (String) context.get(\"message\");\n        if (message == null) {\n            return null;\n        }\n\n        return parseMessage(message, context);\n    }\n}\n","old_contents":"\/*\n * See the NOTICE file distributed with this work for additional\n * information regarding copyright ownership.\n *\n * This is free software; you can redistribute it and\/or modify it\n * under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation; either version 2.1 of\n * the License, or (at your option) any later version.\n *\n * This software is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n * Lesser General Public License for more details.\n *\n * You should have received a copy of the GNU Lesser General Public\n * License along with this software; if not, write to the Free\n * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA\n * 02110-1301 USA, or see the FSF site: http:\/\/www.fsf.org.\n *\n *\/\npackage com.xpn.xwiki;\n\nimport com.xpn.xwiki.XWiki;\nimport com.xpn.xwiki.XWikiContext;\nimport com.xpn.xwiki.cache.api.XWikiCache;\nimport com.xpn.xwiki.cache.api.XWikiCacheService;\nimport com.xpn.xwiki.cache.api.internal.XWikiCacheServiceStub;\nimport com.xpn.xwiki.cache.api.internal.XWikiCacheStub;\n\nimport java.io.UnsupportedEncodingException;\nimport java.net.URLEncoder;\nimport java.util.HashMap;\nimport java.util.Map;\n\n\/**\n * Add a backward compatibility layer to the {@link com.xpn.xwiki.XWiki} class.\n * \n * @version $Id$\n *\/\npublic privileged aspect XWikiCompatibilityAspect\n{\n    private static Map XWiki.threadMap = new HashMap();\n\n    \/**\n     * Transform a text in a URL compatible text\n     *\n     * @param content text to transform\n     * @return encoded result\n     * @deprecated replaced by Util#encodeURI since 1.3M2\n     *\/\n    @Deprecated\n    public String XWiki.getURLEncoded(String content)\n    {\n        try {\n            return URLEncoder.encode(content, this.getEncoding());            \n        } catch (UnsupportedEncodingException e) {\n            return content;\n        }\n    }\n    \n    \/**\n     * @return true for multi-wiki\/false for mono-wiki\n     * @deprecated replaced by {@link XWiki#isVirtualMode()} since 1.4M1.\n     *\/\n    @Deprecated\n    public boolean XWiki.isVirtual()\n    {\n        return this.isVirtualMode();\n    }\n\n    \/**\n     * @deprecated Removed since it isn't used; since 1.5M1.\n     *\/\n    @Deprecated\n    public static Map XWiki.getThreadMap()\n    {\n        return XWiki.threadMap;\n    }\n\n    \/**\n     * @deprecated Removed since it isn't used; since 1.5M1.\n     *\/\n    @Deprecated\n    public static void XWiki.setThreadMap(Map threadMap)\n    {\n        XWiki.threadMap = threadMap;\n    }\n\n    \/**\n     * @return the cache service.\n     * @deprecated replaced by {@link XWiki#getCacheFactory(XWikiContext)} or\n     *             {@link XWiki#getLocalCacheFactory(XWikiContext)} since 1.5M2.\n     *\/\n    @Deprecated\n    public XWikiCacheService XWiki.getCacheService()\n    {\n        return new XWikiCacheServiceStub(getCacheFactory(), getLocalCacheFactory());\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getVirtualWikiCache(XWikiContext)} since 1.5M2.\n     *\/\n    @Deprecated\n    public XWikiCache XWiki.getVirtualWikiMap()\n    {\n        return new XWikiCacheStub(this.virtualWikiMap);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpaceCopyright(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebCopyright(XWikiContext context)\n    {\n        return this.getSpaceCopyright(context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, String defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreference(String, String, String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getWebPreference(String preference, String space, String defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreference(preference, space, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsLong(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public long XWiki.getWebPreferenceAsLong(String preference, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsLong(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsLong(String, long, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public long XWiki.getWebPreferenceAsLong(String preference, long defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsLong(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsInt(String, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.getWebPreferenceAsInt(String preference, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsInt(preference, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getSpacePreferenceAsInt(String, int, XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.getWebPreferenceAsInt(String preference, int defaultValue, XWikiContext context)\n    {\n        return this.getSpacePreferenceAsInt(preference, defaultValue, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#copySpaceBetweenWikis(String, String, String, String, XWikiContext)} since\n     *             2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.copyWikiWeb(String space, String sourceWiki, String targetWiki, String language, XWikiContext context)\n        throws XWikiException\n    {\n        return this.copySpaceBetweenWikis(space, sourceWiki, targetWiki, language, context);\n    }\n\n    \/**\n     * @deprecated replaced by\n     *             {@link XWiki#copySpaceBetweenWikis(String, String, String, String, boolean, XWikiContext)} since\n     *             2.3M1\n     *\/\n    @Deprecated\n    public int XWiki.copyWikiWeb(String space, String sourceWiki, String targetWiki, String language, boolean clean,\n        XWikiContext context) throws XWikiException\n    {\n        return this.copySpaceBetweenWikis(space, sourceWiki, targetWiki, language, clean, context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#getDefaultSpace(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public String XWiki.getDefaultWeb(XWikiContext context)\n    {\n        return this.getDefaultSpace(context);\n    }\n\n    \/**\n     * @deprecated replaced by {@link XWiki#skipDefaultSpaceInURLs(XWikiContext)} since 2.3M1\n     *\/\n    @Deprecated\n    public boolean XWiki.useDefaultWeb(XWikiContext context)\n    {\n        return this.skipDefaultSpaceInURLs(context);\n    }\n\n    \/**\n     * @deprecated use {@link XWikiMessageTool#get(String, List)} instead. You can access message tool using\n     *             {@link XWikiContext#getMessageTool()}.\n     *\/\n    @Deprecated\n    public String XWiki.getMessage(String item, XWikiContext context)\n    {\n        XWikiMessageTool msg = context.getMessageTool();\n        if (msg == null) {\n            return item;\n        } else {\n            return msg.get(item);\n        }\n    }\n\n    \/**\n     * @deprecated use {@link XWikiMessageTool#get(String, List)} instead. You can access message tool using\n     *             {@link XWikiContext#getMessageTool()}.\n     *\/\n    @Deprecated\n    public String XWiki.parseMessage(String id, XWikiContext context)\n    {\n        XWikiMessageTool msg = context.getMessageTool();\n\n        return parseContent(msg.get(id), context);\n    }\n\n    \/**\n     * @deprecated use {@link XWikiMessageTool#get(String, List)} instead. You can access message tool using\n     *             {@link XWikiContext#getMessageTool()}.\n     *\/\n    @Deprecated\n    public String XWiki.parseMessage(XWikiContext context)\n    {\n        String message = (String) context.get(\"message\");\n        if (message == null) {\n            return null;\n        }\n\n        return parseMessage(message, context);\n    }\n}\n","returncode":0,"stderr":"","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"a7d58adc43d1652ab15178507ea8332b12073da5","subject":"write statistics to file","message":"write statistics to file\n","repos":"mebigfatguy\/hashshmash","old_file":"aj\/com\/mebigfatguy\/hashshmash\/HashCollector.aj","new_file":"aj\/com\/mebigfatguy\/hashshmash\/HashCollector.aj","new_contents":"package com.mebigfatguy.hashshmash;\n\nimport java.io.BufferedWriter;\nimport java.io.File;\nimport java.io.FileOutputStream;\nimport java.io.OutputStreamWriter;\nimport java.io.PrintWriter;\nimport java.lang.reflect.Field;\nimport java.util.Date;\nimport java.util.HashMap;\nimport java.util.Map;\nimport java.util.Map.Entry;\nimport java.util.concurrent.ConcurrentHashMap;\n\nimport org.aspectj.lang.Signature;\n\npublic aspect HashCollector {\n    \n    private static final Journaller journaller = new Journaller();\n\n    after() returning (Map m): call(HashMap.new(..)) {\n        Signature sig = thisJoinPointStaticPart.getSignature();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashMapDetails details = new HashMapDetails(m, System.currentTimeMillis(), sig + \":\" + line);\n        journaller.add(details);\n    }\n}\n\nfinal class Journaller implements Runnable {\n    \n    private static final int SLEEP_TIME = 10 * 1000;\n    \n    private Field tableField;\n    private ConcurrentHashMap<HashMapDetails, HashMapDetails> hmDetails = new ConcurrentHashMap<HashMapDetails, HashMapDetails>();\n    private PrintWriter writer;\n\n    public Journaller() {\n        try {\n            tableField = HashMap.class.getDeclaredField(\"table\");\n            tableField.setAccessible(true);\n                        \n            File dir = new File(System.getProperty(\"user.home\"), \".hashshmash\");\n            dir.mkdirs();\n            \n            writer = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(new File(dir, new Date().toString() + \".txt\")))));\n            \n            Thread t = new Thread(this);\n            t.setDaemon(true);\n            t.start();\n        } catch (Exception e) {\n        }\n    }\n    \n    public void add(HashMapDetails details) {\n        hmDetails.put(details,  details);\n    }\n    \n    public void run() {\n        try {\n            while (!Thread.interrupted()) {\n                Thread.sleep(SLEEP_TIME);\n                \n                for (HashMapDetails details : hmDetails.keySet()) {\n                    try {\n                        if (details.map != null) {\n                            int newSize = details.map.size();\n                            if (newSize == details.size) {\n                                Entry<?, ?>[] table = (Entry<?, ?>[])tableField.get(details.map);\n                                details.totalSlots = table.length;\n                                for (Entry<?, ?> e : table) {\n                                    if (e != null) {\n                                        details.usedSlots++;\n                                    }\n                                }\n                                writer.println(details.allocTime + \"\\t\" + details.caller + \"\\t\" + details.map.size() + \"\\t\" + details.totalSlots + \"\\t\" + details.usedSlots);\n                                hmDetails.remove(details);\n                            }\n                        }\n                    } catch (Exception e) {\n                        \/\/might get ConcurrentModificationException or such, just ignore\n                    }\n                }\n                writer.flush();\n            }\n        } catch (InterruptedException ie) {    \n        }\n    }\n}\n\nclass HashMapDetails {\n    public Map<?, ?> map;\n    public long allocTime;\n    public String caller;\n    public int size;\n    public int usedSlots;\n    public int totalSlots;\n\n    public HashMapDetails(Map<?, ?> m, long t, String c) {\n        map = m;\n        allocTime = t;\n        caller = c;\n        size = map.size();\n    }\n}\n","old_contents":"package com.mebigfatguy.hashshmash;\n\nimport java.lang.reflect.Field;\nimport java.util.HashMap;\nimport java.util.Map;\nimport java.util.Map.Entry;\nimport java.util.concurrent.ConcurrentHashMap;\n\nimport org.aspectj.lang.Signature;\n\npublic aspect HashCollector {\n\n    private static final int SLEEP_TIME = 10 * 1000;\n    private static Field TABLE_FIELD;\n    private static ConcurrentHashMap<HashMapDetails, HashMapDetails> HM_DETAILS = new ConcurrentHashMap<HashMapDetails, HashMapDetails>();\n    \n    static {\n        try {\n            TABLE_FIELD = HashMap.class.getDeclaredField(\"table\");\n            TABLE_FIELD.setAccessible(true);\n            \n            Thread t = new Thread(new Runnable() {\n                public void run() {\n                    try {\n                        while (!Thread.interrupted()) {\n                            Thread.sleep(SLEEP_TIME);\n                            \n                            for (HashMapDetails details : HM_DETAILS.keySet()) {\n                                try {\n                                    if (details.map != null) {\n                                        int newSize = details.map.size();\n                                        if (newSize == details.size) {\n                                            Entry<?, ?>[] table = (Entry<?, ?>[])TABLE_FIELD.get(details.map);\n                                            details.totalSlots = table.length;\n                                            for (Entry<?, ?> e : table) {\n                                                if (e != null) {\n                                                    details.usedSlots++;\n                                                }\n                                            }\n                                            details.map = null;\n                                        }\n                                    }\n                                } catch (Exception e) {\n                                    \/\/might get ConcurrentModificationException or such, just ignore\n                                }\n                            }\n                        }\n                    } catch (InterruptedException ie) {    \n                    }\n                }\n            });\n            t.setDaemon(true);\n            t.start();\n        } catch (Exception e) {\n            \n        }\n    }\n    \n    after() returning (Map m): call(HashMap.new(..)) {\n        Signature sig = thisJoinPointStaticPart.getSignature();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashMapDetails details = new HashMapDetails(m, System.currentTimeMillis(), sig + \":\" + line);\n        HM_DETAILS.put(details,  details);\n    }\n    \n    class HashMapDetails {\n        public HashMapDetails(Map<?, ?> m, long t, String c) {\n            map = m;\n            allocTime = t;\n            caller = c;\n            size = map.size();\n        }\n        \n        public Map<?, ?> map;\n        public long allocTime;\n        public String caller;\n        public int size;\n        public int usedSlots;\n        public int totalSlots;\n    }\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"157543173c93eed19d31337f9a89c485d818d8bd","subject":"removed failed experiments","message":"removed failed experiments\n","repos":"eigengo\/monitor,DataDog\/monitor,DataDog\/monitor,eigengo\/monitor","old_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/ActorCellMonitoringAspect.aj","new_file":"agent-akka\/src\/main\/aspectj\/org\/eigengo\/monitor\/agent\/akka\/ActorCellMonitoringAspect.aj","new_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.actor.*;\nimport org.eigengo.monitor.agent.AgentConfiguration;\nimport org.eigengo.monitor.output.CounterInterface;\nimport scala.Option;\n\nimport java.util.ArrayList;\nimport java.util.List;\nimport java.util.concurrent.atomic.AtomicInteger;\nimport java.util.concurrent.atomic.AtomicLong;\nimport java.util.concurrent.ConcurrentHashMap;\n\n\/**\n * Contains advices for monitoring behaviour of an actor; typically imprisoned in an {@code ActorCell}.\n *\/\npublic aspect ActorCellMonitoringAspect extends AbstractMonitoringAspect issingleton() {\n    private AkkaAgentConfiguration agentConfiguration;\n    private final CounterInterface counterInterface;\n    private final Option<String> anonymousActorClassName = Option.empty();\n    private final ConcurrentHashMap<PathAndClass, AtomicLong> samplingCounters  = new ConcurrentHashMap<PathAndClass, AtomicLong>();\n    private final ConcurrentHashMap<PathAndClass, AtomicInteger> numberOfActors = new ConcurrentHashMap<PathAndClass, AtomicInteger>();\n\n    \/**\n     * Constructs this aspect\n     *\/\n    public ActorCellMonitoringAspect() {\n        AgentConfiguration<AkkaAgentConfiguration> configuration = getAgentConfiguration(\"akka\", AkkaAgentConfigurationJapi.apply());\n        this.agentConfiguration = configuration.agent();\n        this.counterInterface = createCounterInterface(configuration.common());\n    }\n\n    \/**\n     * Advises the {@code ActorCell.receiveMessage(message: Object): Unit}\n     * We proceed with the pointcut if the actor is to be included in the monitoring *and* this is\n     * the 'multiple-of-n'th time we've seen a message for an actor with a sample rate of n.\n     *\n     * Currently, we sample queue size, the fact that the message is delivered, the simple name of the class of the\n     * message, and the time taken to complete the actor's reactive action.\n     *\n     * @param actorCell the ActorCell where the actor that receives the message \"lives\"\n     * @param msg the incoming message\n     *\/\n    Object around(ActorCell actorCell, Object msg) : Pointcuts.actorCellReceiveMessage(actorCell, msg) {\n        final ActorPath actorPath = actorCell.self().path();\n        final PathAndClass pathAndClass = new PathAndClass(actorPath, getActorClassName(actorCell));\n        if (!includeActorPath(pathAndClass) || !sampleMessage(pathAndClass)) return proceed(actorCell, msg);\n\n        int samplingRate = getSampleRate(pathAndClass);\n\n        \/\/ we tag by actor name\n        final String[] tags = getTags(actorPath, getActorClassName(actorCell));\n\n        \/\/ record the queue size\n        this.counterInterface.recordGaugeValue(Aspects.queueSize(), actorCell.numberOfMessages(), tags);\n        \/\/ record the message, general and specific\n        this.counterInterface.incrementCounter(Aspects.delivered(), samplingRate, tags);\n        this.counterInterface.incrementCounter(Aspects.delivered(msg), samplingRate, tags);\n\n        \/\/ measure the time. we're using the ``nanoTime`` call to access the high-precision timer.\n        \/\/ since we're not really interested in wall time, but just some increasing measure of\n        \/\/ elapsed time\n        Object result = null;\n        final long start = System.nanoTime();\n        \/\/ result will always be ``null``, because target returns ``Unit``\n        result = proceed(actorCell, msg);\n        \/\/ ns or \u00b5s is too fine. ms will do for now.\n        final long duration = (System.nanoTime() - start) \/ 1000000;\n\n        \/\/ record the actor duration\n        this.counterInterface.recordExecutionTime(Aspects.actorDuration(), (int)duration, tags);\n\n        \/\/ return null would do the trick, but we want to be _proper_.\n        return result;\n    }\n\n    \/**\n     * Advises the {@code ActorCell.handleInvokeFailure(_, failure: Throwable): Unit}\n     *\n     * @param actorCell the ActorCell where the error spreads from\n     * @param failure the exception that escaped from the {@code receive} method\n     *\/\n    before(ActorCell actorCell, Throwable failure) : Pointcuts.actorCellHandleInvokeFailure(actorCell, failure) {\n        \/\/ record the error, general and specific\n        String[] tags = getTags(actorCell.self().path(), getActorClassName(actorCell));\n        this.counterInterface.incrementCounter(Aspects.actorError(), tags);\n        this.counterInterface.incrementCounter(Aspects.actorError(failure), tags);\n    }\n\n    \/**\n     * Advises the {@code EventStream.publish(event: Any): Unit}\n     *\n     * @param event the received event\n     *\/\n    before(Object event) : Pointcuts.eventStreamPublish(event) {\n        if (event instanceof UnhandledMessage) {\n            UnhandledMessage unhandledMessage = (UnhandledMessage)event;\n            String[] tags = getTags(unhandledMessage.recipient().path(), this.anonymousActorClassName);\n            this.counterInterface.incrementCounter(Aspects.undelivered(), tags);\n            this.counterInterface.incrementCounter(Aspects.undelivered(unhandledMessage.getMessage()), tags);\n        }\n    }\n\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorRefFactory} implementations\n     *\n     * @param props the {@code Props} instance used in the call\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after(Props props) returning (ActorRef actor) : Pointcuts.anyActorOf(props) {\n        recordActorCount(actor.path(), props, CountType.Increment);\n    }\n\n    \/**\n     * Advises the {@code LocalActorRef.stop} method\n     *\n     * @param actorCell the {@code ActorCell} of the actor being stopped\n     *\/\n    after(ActorCell actorCell) : Pointcuts.actorCellInternalStop(actorCell) {\n        recordActorCount(actorCell.self().path(), actorCell.props(), CountType.Decrement);\n    }\n\n    \/**\n     * Records the actor count increment or decrement\n     *\n     * @param path the ActorPath being created or destroyed\n     * @param props the Props of the actor at the {@code path}\n     * @param countType the increment or decrement\n     *\/\n     private void recordActorCount(ActorPath path, Props props, CountType countType) {\n         final PathAndClass pac = new PathAndClass(path, getActorClassName(props));\n         if (!includeActorPath(pac)) return;\n\n         final String[] tags = getTags(path, pac.actorClassName());\n         this.numberOfActors.putIfAbsent(pac, new AtomicInteger(0));\n         \/\/ increment and get the current number of actors of this type (if the value was 0, then this returns 1 -- which is correct)\n         final int currentNumberOfActors;\n         switch (countType) {\n             case Increment:\n                 currentNumberOfActors = this.numberOfActors.get(pac).incrementAndGet();\n                 break;\n             case Decrement:\n                 currentNumberOfActors = this.numberOfActors.get(pac).decrementAndGet();\n                 break;\n             default:\n                 currentNumberOfActors = 0;\n                 break;\n         }\n\n         this.counterInterface.recordGaugeValue(Aspects.actorCount(), currentNumberOfActors, tags);\n     }\n\n    \/**\n     * Injects the new {@code AkkaAgentConfiguration} instance.\n     *\n     * @param agentConfiguration the new configuration\n     *\/\n    synchronized final void setAgentConfiguration(AkkaAgentConfiguration agentConfiguration) {\n        this.agentConfiguration = agentConfiguration;\n    }\n\n    \/**\n     * The count type for exhaustive matching\n     *\/\n    private static enum CountType {\n        Increment, Decrement\n    }\n\n    \/**\n     * Decide whether to include this ActorCell in our measurements\n     *\n     * @param pathAndClass the PAC container\n     * @return whether to include the given actor in the metrics\n     *\/\n    private boolean includeActorPath(final PathAndClass pathAndClass) {\n        \/\/ do not monitor our own output code\n        if (pathAndClass.actorClassName().isDefined()) {\n            if (pathAndClass.actorClassName().get().startsWith(\"org.eigengo.monitor.output\")) return false;\n        }\n\n        \/\/ include actor if it's in 'included' list\n        if (this.agentConfiguration.included().accept(pathAndClass)) return true;\n        \/\/ exclude actor if excluded (i.e. is in 'excluded' list, or excludeAllNotIncluded = true, and actor is not included)\n        if (this.agentConfiguration.excluded().accept(pathAndClass)) return false;\n\n        \/\/ skip system actor checks if we wish to monitor them\n        if (this.agentConfiguration.includeSystemAgents()) return true;\n\n        String userOrSystem = pathAndClass.actorPath().getElements().iterator().next();\n        return \"user\".equals(userOrSystem);\n    }\n\n    \/**\n     * Lookup the sample rate for an actor from the configuration\n     *\n     * @param pathAndClass the PAC container\n     * @return the sampling rate as non-negative integer\n     *\/\n    private int getSampleRate(final PathAndClass pathAndClass) {\n        return this.agentConfiguration.sampling().getRate(pathAndClass);\n    }\n\n    \/**\n     * Decide whether to sample an actor on a particular occasion\n     *\n     * @param pathAndClass the PAC container\n     * @return {@code true} if we should sample this actor\n     *\/\n    private boolean sampleMessage(final PathAndClass pathAndClass) {\n        int sampleRate = getSampleRate(pathAndClass);\n        if (sampleRate == 1) return true;\n\n        this.samplingCounters.putIfAbsent(pathAndClass, new AtomicLong(0));\n        long timesSeenSoFar = this.samplingCounters.get(pathAndClass).incrementAndGet();\n\n        return (timesSeenSoFar % sampleRate == 1); \/\/ == 1 to log first value (incrementAndGet returns updated value)\n    }\n\n    \/**\n     * Formats the given {@code path} in a way that can be used for tagging. For example, for\n     * path <code>akka:\/\/default\/user\/a\/b\/c<\/code>, it returns <code>akka.path:\/default\/user\/a\/b\/c<\/code>\n     *\n     * @param path the path\n     * @return the tag-ready path\n     *\/\n    private String actorPathToString(ActorPath path) {\n        StringBuilder sb = new StringBuilder();\n        sb.append(\"akka.path:\/\");\n        sb.append(path.address().system());\n        for (String element : path.getElements()) {\n            sb.append(\"\/\");\n            sb.append(element);\n        }\n        return sb.toString();\n    }\n\n    \/**\n     * Decides whether {@code path} represents the \"root\" of the user actors\n     *\n     * @param path the actor path\n     * @return {@code true} if root of user actors\n     *\/\n    private boolean isUserRoot(ActorPath path) {\n        return \"user\".equals(path.elements().mkString(\"\/\"));\n    }\n\n    \/**\n     * Computes the tags for the given {@code actorPath} and {@code actor} instances.\n     *\n     * @param actorPath the actor path; never {@code null}\n     * @param actorClassName the actor instance; may be {@code null}\n     * @return non-{@code null} array of tags\n     *\/\n    private String[] getTags(final ActorPath actorPath, final Option<String> actorClassName) {\n        List<String> tags = new ArrayList<String>();\n\n        \/\/ TODO: Improve detection of routed actors. This only detects \"root\" unnamed actors\n        String lastPathElement = actorPath.elements().last();\n        if (lastPathElement.startsWith(\"$\")) {\n            \/\/ this is routed actor.\n            final ActorPath parent = actorPath.parent();\n            if (isUserRoot(parent)) {\n                \/\/ the parent is akka:\/\/xxx\/user\n                tags.add(actorPathToString(actorPath));\n            } else {\n                \/\/ the parent is some other actor, akka:\/\/xxx\/user\/foo\n                tags.add(actorPathToString(parent));\n                if (this.agentConfiguration.includeRoutees()) tags.add(actorPathToString(actorPath));\n            }\n        } else {\n            \/\/ there is no supervisor\n            tags.add(actorPathToString(actorPath));\n        }\n        if (actorClassName.isDefined()) {\n            tags.add(String.format(\"akka.type:%s.%s\", actorPath.address().system(), actorClassName.get()));\n        }\n\n        return tags.toArray(new String[tags.size()]);\n    }\n\n    \/**\n     * returns the canonical name of the actor type associated with an ActorCell\n     *\n     * @param actorCell the actor cell to get the name for\n     * @return the Option of actor class, never {@code null}.\n     *\/\n    private Option<String> getActorClassName(final ActorCell actorCell) {\n        return getActorClassName(actorCell.props());\n    }\n\n    \/**\n     * Returns the canonical name of the actor type associated with a Props instance\n     *\n     * Returns null if props.actorClass does not have a canonical name (i.e., if\n     * it is a local or anonymous class)\n     *\n     * Notably, when the actor class is anonymous, the {@code getCanonicalName} returns {@code null},\n     * which we deal with here.\n     *\n     * @param props the ActorRef {@code Props} instance\n     * @return the Option of actor class, never {@code null}.\n     *\/\n    private Option<String> getActorClassName(final Props props) {\n        final String canonicalName = props.actorClass().getCanonicalName();\n        if (canonicalName == null) return this.anonymousActorClassName;\n\n        return Option.apply(canonicalName);\n    }\n\n}\n","old_contents":"\/*\n * Copyright (c) 2013 original authors\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\npackage org.eigengo.monitor.agent.akka;\n\nimport akka.actor.*;\nimport org.eigengo.monitor.agent.AgentConfiguration;\nimport org.eigengo.monitor.output.CounterInterface;\nimport scala.Option;\n\nimport java.util.ArrayList;\nimport java.util.List;\nimport java.util.concurrent.atomic.AtomicInteger;\nimport java.util.concurrent.atomic.AtomicLong;\nimport java.util.concurrent.ConcurrentHashMap;\n\n\/**\n * Contains advices for monitoring behaviour of an actor; typically imprisoned in an {@code ActorCell}.\n *\/\npublic aspect ActorCellMonitoringAspect extends AbstractMonitoringAspect issingleton() {\n    private AkkaAgentConfiguration agentConfiguration;\n    private final CounterInterface counterInterface;\n    private final Option<String> anonymousActorClassName = Option.empty();\n    private final ConcurrentHashMap<PathAndClass, AtomicLong> samplingCounters  = new ConcurrentHashMap<PathAndClass, AtomicLong>();\n    private final ConcurrentHashMap<PathAndClass, AtomicInteger> numberOfActors = new ConcurrentHashMap<PathAndClass, AtomicInteger>();\n    private final ConcurrentHashMap<ActorPath, String> pathToClass              = new ConcurrentHashMap<ActorPath, String>();\n\n    \/**\n     * Constructs this aspect\n     *\/\n    public ActorCellMonitoringAspect() {\n        AgentConfiguration<AkkaAgentConfiguration> configuration = getAgentConfiguration(\"akka\", AkkaAgentConfigurationJapi.apply());\n        this.agentConfiguration = configuration.agent();\n        this.counterInterface = createCounterInterface(configuration.common());\n    }\n\n    \/**\n     * Advises the {@code ActorCell.receiveMessage(message: Object): Unit}\n     * We proceed with the pointcut if the actor is to be included in the monitoring *and* this is\n     * the 'multiple-of-n'th time we've seen a message for an actor with a sample rate of n.\n     *\n     * Currently, we sample queue size, the fact that the message is delivered, the simple name of the class of the\n     * message, and the time taken to complete the actor's reactive action.\n     *\n     * @param actorCell the ActorCell where the actor that receives the message \"lives\"\n     * @param msg the incoming message\n     *\/\n    Object around(ActorCell actorCell, Object msg) : Pointcuts.actorCellReceiveMessage(actorCell, msg) {\n        final ActorPath actorPath = actorCell.self().path();\n        final PathAndClass pathAndClass = new PathAndClass(actorPath, getActorClassName(actorCell));\n        if (!includeActorPath(pathAndClass) || !sampleMessage(pathAndClass)) return proceed(actorCell, msg);\n\n        int samplingRate = getSampleRate(pathAndClass);\n\n        \/\/ we tag by actor name\n        final String[] tags = getTags(actorPath, getActorClassName(actorCell));\n\n        \/\/ record the queue size\n        this.counterInterface.recordGaugeValue(Aspects.queueSize(), actorCell.numberOfMessages(), tags);\n        \/\/ record the message, general and specific\n        this.counterInterface.incrementCounter(Aspects.delivered(), samplingRate, tags);\n        this.counterInterface.incrementCounter(Aspects.delivered(msg), samplingRate, tags);\n\n        \/\/ measure the time. we're using the ``nanoTime`` call to access the high-precision timer.\n        \/\/ since we're not really interested in wall time, but just some increasing measure of\n        \/\/ elapsed time\n        Object result = null;\n        final long start = System.nanoTime();\n        \/\/ result will always be ``null``, because target returns ``Unit``\n        result = proceed(actorCell, msg);\n        \/\/ ns or \u00b5s is too fine. ms will do for now.\n        final long duration = (System.nanoTime() - start) \/ 1000000;\n\n        \/\/ record the actor duration\n        this.counterInterface.recordExecutionTime(Aspects.actorDuration(), (int)duration, tags);\n\n        \/\/ return null would do the trick, but we want to be _proper_.\n        return result;\n    }\n\n    \/**\n     * Advises the {@code ActorCell.handleInvokeFailure(_, failure: Throwable): Unit}\n     *\n     * @param actorCell the ActorCell where the error spreads from\n     * @param failure the exception that escaped from the {@code receive} method\n     *\/\n    before(ActorCell actorCell, Throwable failure) : Pointcuts.actorCellHandleInvokeFailure(actorCell, failure) {\n        \/\/ record the error, general and specific\n        String[] tags = getTags(actorCell.self().path(), getActorClassName(actorCell));\n        this.counterInterface.incrementCounter(Aspects.actorError(), tags);\n        this.counterInterface.incrementCounter(Aspects.actorError(failure), tags);\n    }\n\n    \/**\n     * Advises the {@code EventStream.publish(event: Any): Unit}\n     *\n     * @param event the received event\n     *\/\n    before(Object event) : Pointcuts.eventStreamPublish(event) {\n        if (event instanceof UnhandledMessage) {\n            UnhandledMessage unhandledMessage = (UnhandledMessage)event;\n            String[] tags = getTags(unhandledMessage.recipient().path(), this.anonymousActorClassName);\n            this.counterInterface.incrementCounter(Aspects.undelivered(), tags);\n            this.counterInterface.incrementCounter(Aspects.undelivered(unhandledMessage.getMessage()), tags);\n        }\n    }\n\n    \/**\n     * Advises the {@code actorOf} method of {@code ActorRefFactory} implementations\n     *\n     * @param props the {@code Props} instance used in the call\n     * @param actor the {@code ActorRef} returned from the call\n     *\/\n    after(Props props) returning (ActorRef actor) : Pointcuts.anyActorOf(props) {\n        recordActorCount(actor.path(), props, CountType.Increment);\n    }\n\n    \/**\n     * Advises the {@code LocalActorRef.stop} method\n     *\n     * @param actorCell the {@code ActorCell} of the actor being stopped\n     *\/\n    after(ActorCell actorCell) : Pointcuts.actorCellInternalStop(actorCell) {\n        recordActorCount(actorCell.self().path(), actorCell.props(), CountType.Decrement);\n    }\n\n    \/**\n     * Records the actor count increment or decrement\n     *\n     * @param path the ActorPath being created or destroyed\n     * @param props the Props of the actor at the {@code path}\n     * @param countType the increment or decrement\n     *\/\n     private void recordActorCount(ActorPath path, Props props, CountType countType) {\n         final PathAndClass pac = new PathAndClass(path, getActorClassName(props));\n         if (!includeActorPath(pac)) return;\n\n         final String[] tags = getTags(path, pac.actorClassName());\n         this.numberOfActors.putIfAbsent(pac, new AtomicInteger(0));\n         \/\/ increment and get the current number of actors of this type (if the value was 0, then this returns 1 -- which is correct)\n         final int currentNumberOfActors;\n         switch (countType) {\n             case Increment:\n                 currentNumberOfActors = this.numberOfActors.get(pac).incrementAndGet();\n                 break;\n             case Decrement:\n                 currentNumberOfActors = this.numberOfActors.get(pac).decrementAndGet();\n                 break;\n             default:\n                 currentNumberOfActors = 0;\n                 break;\n         }\n\n         this.counterInterface.recordGaugeValue(Aspects.actorCount(), currentNumberOfActors, tags);\n     }\n\n    \/**\n     * Injects the new {@code AkkaAgentConfiguration} instance.\n     *\n     * @param agentConfiguration the new configuration\n     *\/\n    synchronized final void setAgentConfiguration(AkkaAgentConfiguration agentConfiguration) {\n        this.agentConfiguration = agentConfiguration;\n    }\n\n    \/**\n     * The count type for exhaustive matching\n     *\/\n    private static enum CountType {\n        Increment, Decrement\n    }\n\n    \/**\n     * Decide whether to include this ActorCell in our measurements\n     *\n     * @param pathAndClass the PAC container\n     * @return whether to include the given actor in the metrics\n     *\/\n    private boolean includeActorPath(final PathAndClass pathAndClass) {\n        \/\/ do not monitor our own output code\n        if (pathAndClass.actorClassName().isDefined()) {\n            if (pathAndClass.actorClassName().get().startsWith(\"org.eigengo.monitor.output\")) return false;\n        }\n\n        \/\/ include actor if it's in 'included' list\n        if (this.agentConfiguration.included().accept(pathAndClass)) return true;\n        \/\/ exclude actor if excluded (i.e. is in 'excluded' list, or excludeAllNotIncluded = true, and actor is not included)\n        if (this.agentConfiguration.excluded().accept(pathAndClass)) return false;\n\n        \/\/ skip system actor checks if we wish to monitor them\n        if (this.agentConfiguration.includeSystemAgents()) return true;\n\n        String userOrSystem = pathAndClass.actorPath().getElements().iterator().next();\n        return \"user\".equals(userOrSystem);\n    }\n\n    \/**\n     * Lookup the sample rate for an actor from the configuration\n     *\n     * @param pathAndClass the PAC container\n     * @return the sampling rate as non-negative integer\n     *\/\n    private int getSampleRate(final PathAndClass pathAndClass) {\n        return this.agentConfiguration.sampling().getRate(pathAndClass);\n    }\n\n    \/**\n     * Decide whether to sample an actor on a particular occasion\n     *\n     * @param pathAndClass the PAC container\n     * @return {@code true} if we should sample this actor\n     *\/\n    private boolean sampleMessage(final PathAndClass pathAndClass) {\n        int sampleRate = getSampleRate(pathAndClass);\n        if (sampleRate == 1) return true;\n\n        this.samplingCounters.putIfAbsent(pathAndClass, new AtomicLong(0));\n        long timesSeenSoFar = this.samplingCounters.get(pathAndClass).incrementAndGet();\n        \/\/ yeah yeah. Put it somewhere else. Why?\n        if (timesSeenSoFar == 1 && pathAndClass.actorClassName() != this.anonymousActorClassName) {\n            pathToClass.putIfAbsent(pathAndClass.actorPath(), pathAndClass.actorClassName().get());\n        }\n        if (sampleRate == 1) return true;\n        return (timesSeenSoFar % sampleRate == 1); \/\/ == 1 to log first value (incrementAndGet returns updated value)\n    }\n\n    \/**\n     * Formats the given {@code path} in a way that can be used for tagging. For example, for\n     * path <code>akka:\/\/default\/user\/a\/b\/c<\/code>, it returns <code>akka.path:\/default\/user\/a\/b\/c<\/code>\n     *\n     * @param path the path\n     * @return the tag-ready path\n     *\/\n    private String actorPathToString(ActorPath path) {\n        StringBuilder sb = new StringBuilder();\n        sb.append(\"akka.path:\/\");\n        sb.append(path.address().system());\n        for (String element : path.getElements()) {\n            sb.append(\"\/\");\n            sb.append(element);\n        }\n        return sb.toString();\n    }\n\n    \/**\n     * Decides whether {@code path} represents the \"root\" of the user actors\n     *\n     * @param path the actor path\n     * @return {@code true} if root of user actors\n     *\/\n    private boolean isUserRoot(ActorPath path) {\n        return \"user\".equals(path.elements().mkString(\"\/\"));\n    }\n\n    \/**\n     * Computes the tags for the given {@code actorPath} and {@code actor} instances.\n     *\n     * @param actorPath the actor path; never {@code null}\n     * @param actorClassName the actor instance; may be {@code null}\n     * @return non-{@code null} array of tags\n     *\/\n    private String[] getTags(final ActorPath actorPath, final Option<String> actorClassName) {\n        List<String> tags = new ArrayList<String>();\n\n        \/\/ TODO: Improve detection of routed actors. This only detects \"root\" unnamed actors\n        String lastPathElement = actorPath.elements().last();\n        if (lastPathElement.startsWith(\"$\")) {\n            \/\/ this is routed actor.\n            final ActorPath parent = actorPath.parent();\n            if (isUserRoot(parent)) {\n                \/\/ the parent is akka:\/\/xxx\/user\n                tags.add(actorPathToString(actorPath));\n            } else {\n                \/\/ the parent is some other actor, akka:\/\/xxx\/user\/foo\n                tags.add(actorPathToString(parent));\n                if (this.agentConfiguration.includeRoutees()) tags.add(actorPathToString(actorPath));\n            }\n        } else {\n            \/\/ there is no supervisor\n            tags.add(actorPathToString(actorPath));\n        }\n        if (actorClassName.isDefined()) {\n            tags.add(String.format(\"akka.type:%s.%s\", actorPath.address().system(), actorClassName.get()));\n        } else if (pathToClass.contains(actorPath)) {\n            tags.add(String.format(\"akka.type:%s.%s\", actorPath.address().system(), pathToClass.get(actorPath)));\n        }\n\n        return tags.toArray(new String[tags.size()]);\n    }\n\n    \/**\n     * returns the canonical name of the actor type associated with an ActorCell\n     *\n     * @param actorCell the actor cell to get the name for\n     * @return the Option of actor class, never {@code null}.\n     *\/\n    private Option<String> getActorClassName(final ActorCell actorCell) {\n        return getActorClassName(actorCell.props());\n    }\n\n    \/**\n     * Returns the canonical name of the actor type associated with a Props instance\n     *\n     * Returns null if props.actorClass does not have a canonical name (i.e., if\n     * it is a local or anonymous class)\n     *\n     * Notably, when the actor class is anonymous, the {@code getCanonicalName} returns {@code null},\n     * which we deal with here.\n     *\n     * @param props the ActorRef {@code Props} instance\n     * @return the Option of actor class, never {@code null}.\n     *\/\n    private Option<String> getActorClassName(final Props props) {\n        final String canonicalName = props.actorClass().getCanonicalName();\n        if (canonicalName == null) return this.anonymousActorClassName;\n\n\/\/        final Class<?> something = props.clazz();\n\/\/        Class<?> interim = props.actorClass();\n\/\/        System.out.println(\"##@ 0 : \"+something.toString());\n\/\/        System.out.println(\"##@ 1 : \"+interim.getDeclaredClasses().length);\n\/\/        System.out.println(\"##@ 1 : \"+interim);\n\/\/        for (int i = 0; i < interim.getDeclaredClasses().length; i++) {\n\/\/            System.out.println(\"##@ \"+(i+2)+\" : \"+interim.getDeclaredClasses()[i].toString());\n\/\/        }\n\n\n\/\/        for (int i=0; i <something.getTypeParameters().length; i++) {\n\/\/            System.out.println(\"##@ 1 : \"+something.getTypeParameters()[i]);\n\/\/        }\n\/\/        System.out.println(\"# 2 : \"+something.getClasses());\n\/\/        for (Class<?> i : something.getClasses()) {\n\/\/            System.out.println(\"##@ 2 : \"+i);\n\/\/        }\n\/\/        System.out.println(\"##@ 3 : \"+something.getComponentType());\n\/\/        System.out.println(\"# 4 : \"+something.getInterfaces());\n\/\/        for (Class<?> i : something.getInterfaces()) {\n\/\/            System.out.println(\"##@ 4 : \"+i);\n\/\/        }\n\n        return Option.apply(canonicalName);\n    }\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"4e8b44b98f74ed9d331a1a9f07810ec5ce6b1ada","subject":"Remove annotation to remove java5 dependency","message":"Remove annotation to remove java5 dependency\n\ngit-svn-id: 7acc490bd371dbc82047a939b87dc892fdc31f59@22179 76a6fc44-f60b-0410-a9a8-e67b0e8fc65c\n","repos":"tlaplus\/tlaplus,tlaplus\/tlaplus,lemmy\/tlaplus,lemmy\/tlaplus,lemmy\/tlaplus,lemmy\/tlaplus,tlaplus\/tlaplus,tlaplus\/tlaplus","old_file":"org.lamport.tla.toolbox.uitest\/src\/org\/lamport\/tla\/toolbox\/test\/threading\/MonitorAspect.aj","new_file":"org.lamport.tla.toolbox.uitest\/src\/org\/lamport\/tla\/toolbox\/test\/threading\/MonitorAspect.aj","new_contents":"package org.lamport.tla.toolbox.test.threading;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\n\n\/**\n * The purpose of this advice is to intercept method execution in the backend\n * code - namely all code in the packages tlc2, tla2sany, tla2tex, pcal and util.\n * \n * It notifies the {@link MonitorAdaptor} about the method execution.\n *\/\npublic aspect MonitorAspect {\n\n\tpublic MonitorAspect() {\n\t\tMonitorAdaptor.setAspect(this);\n\t}\n\t\n\t\/\/ known places where backend call within UI thread are acceptable\n\tpointcut inFilter() : \n\t\twithincode(public boolean org.lamport.tla.toolbox.util.ResourceHelper.isValidSpecName(String));\n\n\t\/\/ catch all method calls (static and object ones)\n\tpointcut callToBackend() : \n\t\t   execution(* tlc2..*.*(..))\n\t\t|| execution(* tla2sany..*.*(..))\n\t\t|| execution(* tla2tex..*.*(..))\n\t\t|| execution(* pcal..*.*(..))\n\t\t|| execution(* util..*.*(..));\n\t\n\t\/\/ capture calls to backend, but not within ourself or in filter\n\tbefore(): (callToBackend()\n\t\t\t&& !cflowbelow(callToBackend()) && !cflowbelow(inFilter())) { \n\t\tMonitorAdaptor.enter(thisJoinPoint);\n\t}\n}\n","old_contents":"package org.lamport.tla.toolbox.test.threading;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\n\n\/**\n * The purpose of this advice is to intercept method execution in the backend\n * code - namely all code in the packages tlc2, tla2sany, tla2tex, pcal and util.\n * \n * It notifies the {@link MonitorAdaptor} about the method execution.\n *\/\npublic aspect MonitorAspect {\n\n\tpublic MonitorAspect() {\n\t\tMonitorAdaptor.setAspect(this);\n\t}\n\t\n\t\/\/ known places where backend call within UI thread are acceptable\n\tpointcut inFilter() : \n\t\twithincode(public boolean org.lamport.tla.toolbox.util.ResourceHelper.isValidSpecName(String));\n\n\t\/\/ catch all method calls (static and object ones)\n\tpointcut callToBackend() : \n\t\t   execution(* tlc2..*.*(..))\n\t\t|| execution(* tla2sany..*.*(..))\n\t\t|| execution(* tla2tex..*.*(..))\n\t\t|| execution(* pcal..*.*(..))\n\t\t|| execution(* util..*.*(..));\n\t\n\t\/\/ capture calls to backend, but not within ourself or in filter\n\t@SuppressAjWarnings\n\tbefore(): (callToBackend()\n\t\t\t&& !cflowbelow(callToBackend()) && !cflowbelow(inFilter())) { \n\t\tMonitorAdaptor.enter(thisJoinPoint);\n\t}\n}\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"b38e6e2fad5d81cb4fa01bcc0a31e75935e03b4a","subject":"Fixing compat aspect in cases where the Set being passed in is unmodifiable.","message":"Fixing compat aspect in cases where the Set being passed in is unmodifiable.\n\ngit-svn-id: 2c527eb49caa05e19d6b2be874bf74fa9d7ea670@601161 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"skitt\/maven,karthikjaps\/maven,barthel\/maven,wangyuesong0\/maven,dsyer\/maven,rogerchina\/maven,karthikjaps\/maven,wangyuesong\/maven,likaiwalkman\/maven,stephenc\/maven,xasx\/maven,keith-turner\/maven,atanasenko\/maven,wangyuesong\/maven,changbai1980\/maven,rogerchina\/maven,barthel\/maven,wangyuesong\/maven,Distrotech\/maven,cstamas\/maven,njuneau\/maven,runepeter\/maven-deploy-plugin-2.8.1,keith-turner\/maven,kidaa\/maven-1,skitt\/maven,cstamas\/maven,kidaa\/maven-1,aheritier\/maven,njuneau\/maven,gorcz\/maven,pkozelka\/maven,runepeter\/maven-deploy-plugin-2.8.1,xasx\/maven,ChristianSchulte\/maven,mcculls\/maven,likaiwalkman\/maven,kidaa\/maven-1,Tibor17\/maven,mcculls\/maven,atanasenko\/maven,Distrotech\/maven,aheritier\/maven,stephenc\/maven,likaiwalkman\/maven,cstamas\/maven,pkozelka\/maven,josephw\/maven,lbndev\/maven,wangyuesong0\/maven,skitt\/maven,aheritier\/maven,stephenc\/maven,Mounika-Chirukuri\/maven,apache\/maven,mizdebsk\/maven,gorcz\/maven,lbndev\/maven,trajano\/maven,olamy\/maven,apache\/maven,Mounika-Chirukuri\/maven,olamy\/maven,ChristianSchulte\/maven,atanasenko\/maven,changbai1980\/maven,pkozelka\/maven,Mounika-Chirukuri\/maven,rogerchina\/maven,vedmishr\/demo1,lbndev\/maven,dsyer\/maven,dsyer\/maven,njuneau\/maven,josephw\/maven,vedmishr\/demo1,mcculls\/maven,apache\/maven,vedmishr\/demo1,mizdebsk\/maven,xasx\/maven,olamy\/maven,wangyuesong0\/maven,changbai1980\/maven,Tibor17\/maven,karthikjaps\/maven,ChristianSchulte\/maven,mizdebsk\/maven,keith-turner\/maven,trajano\/maven,josephw\/maven,gorcz\/maven,barthel\/maven,trajano\/maven","old_file":"maven-core\/src\/main\/aspect\/org\/apache\/maven\/compat\/plugin\/Maven20xCompatAspect.aj","new_file":"maven-core\/src\/main\/aspect\/org\/apache\/maven\/compat\/plugin\/Maven20xCompatAspect.aj","new_contents":"package org.apache.maven.compat.plugin;\n\nimport org.apache.maven.lifecycle.MojoBindingUtils;\nimport org.apache.maven.lifecycle.LifecycleUtils;\nimport org.apache.maven.lifecycle.NoSuchPhaseException;\nimport org.apache.maven.execution.MavenExecutionRequest;\nimport org.apache.maven.execution.MavenExecutionResult;\nimport org.apache.maven.execution.MavenSession;\nimport org.apache.maven.extension.DefaultExtensionManager;\nimport org.apache.maven.execution.MavenRealmManager;\nimport org.apache.maven.artifact.Artifact;\nimport org.apache.maven.artifact.factory.ArtifactFactory;\nimport org.apache.maven.artifact.metadata.ResolutionGroup;\nimport org.apache.maven.artifact.repository.ArtifactRepository;\nimport org.apache.maven.artifact.resolver.ArtifactNotFoundException;\nimport org.apache.maven.artifact.resolver.ArtifactResolutionException;\nimport org.apache.maven.artifact.versioning.DefaultArtifactVersion;\nimport org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;\nimport org.apache.maven.artifact.versioning.VersionRange;\nimport org.apache.maven.lifecycle.model.MojoBinding;\nimport org.apache.maven.model.Plugin;\nimport org.apache.maven.plugin.DefaultPluginManager;\nimport org.apache.maven.plugin.InvalidPluginException;\nimport org.apache.maven.plugin.PluginManager;\nimport org.apache.maven.plugin.PluginManagerException;\nimport org.apache.maven.plugin.PluginNotFoundException;\nimport org.apache.maven.plugin.descriptor.PluginDescriptor;\nimport org.apache.maven.plugin.version.PluginVersionNotFoundException;\nimport org.apache.maven.plugin.version.PluginVersionResolutionException;\nimport org.apache.maven.project.MavenProject;\nimport org.apache.maven.settings.MavenSettingsBuilder;\nimport org.apache.maven.settings.DefaultMavenSettingsBuilder;\nimport org.apache.maven.settings.Settings;\nimport org.codehaus.plexus.classworlds.realm.ClassRealm;\nimport org.codehaus.plexus.classworlds.realm.NoSuchRealmException;\nimport org.codehaus.plexus.util.xml.pull.XmlPullParserException;\nimport org.codehaus.plexus.util.xml.Xpp3Dom;\nimport org.codehaus.plexus.logging.Logger;\nimport org.codehaus.plexus.logging.LogEnabled;\n\nimport java.io.IOException;\nimport java.util.Iterator;\nimport java.util.Collection;\nimport java.util.Set;\nimport java.util.LinkedHashSet;\n\npublic privileged aspect Maven20xCompatAspect\n{\n\n    \/\/ GRAB Session as soon as it's constructed.\n    private MavenSession session;\n\n    \/\/ GRAB the request when it's passed into a method that returns a corresponding result.\n    \/\/ NOTE: We'll use this in multiple places below...\n    private MavenExecutionRequest request;\n\n    \/\/ Grab this so we have a voice!\n    private Logger logger;\n\n    \/\/ used for injecting plexus-utils into extension and plugin artifact sets.\n    private VersionRange vr = null;\n    private Artifact plexusUtilsArtifact = null;\n\n\n    private pointcut mavenEmbedderStop():\n        execution( * org.apache.maven.embedder.MavenEmbedder.stop( .. ) );\n\n    \/\/ TODO: There must be a more elegant way to release these resources than depending on MavenEmbedder.stop().\n    after(): mavenEmbedderStop()\n    {\n        session = null;\n        request = null;\n        logger = null;\n        vr = null;\n        plexusUtilsArtifact = null;\n    }\n\n\n    \/\/ pointcut to avoid recursive matching on behavior injected by this aspect.\n    private pointcut notHere(): !within( Maven20xCompatAspect );\n\n    private pointcut sessionCreation( MavenSession session ):\n        execution( public MavenSession+.new(..) )\n        && this( session )\n        && notHere();\n\n    \/\/ capture the session instance.\n    after( MavenSession session ): sessionCreation( session )\n    {\n        this.session = session;\n    }\n\n    \/\/ USE Session to compensate for old verifyPlugin(..) API.\n    private pointcut verifyPlugin( Plugin plugin, MavenProject project, PluginManager manager ):\n        execution( public PluginDescriptor PluginManager+.verifyPlugin( Plugin, MavenProject, Settings, ArtifactRepository ) )\n        && args( plugin, project, .. )\n        && target( manager )\n        && notHere();\n\n    \/\/ redirect the old verifyPlugin(..) call to the new one, using the captured session instance above.\n    PluginDescriptor around( Plugin plugin,\n                             MavenProject project,\n                             PluginManager manager )\n        throws ArtifactResolutionException, ArtifactNotFoundException, PluginNotFoundException,\n        PluginVersionResolutionException, InvalidPluginException, PluginManagerException,\n        PluginVersionNotFoundException:\n            verifyPlugin( plugin, project, manager )\n    {\n        return manager.verifyPlugin( plugin, project, session );\n    }\n\n    \/\/ Re-Introduce old verifyPlugin(..) API.\n    public PluginDescriptor PluginManager.verifyPlugin( Plugin plugin,\n                                                        MavenProject project,\n                                                        Settings settings,\n                                                        ArtifactRepository localRepository )\n    {\n        \/\/ this will always be diverted, so no need to do anything.\n        return null;\n    }\n\n    public PluginDescriptor DefaultPluginManager.verifyPlugin( Plugin plugin,\n                                                        MavenProject project,\n                                                        Settings settings,\n                                                        ArtifactRepository localRepository )\n    {\n        \/\/ this will always be diverted, so no need to do anything.\n        return null;\n    }\n\n    private pointcut getPluginDescriptorForPrefix( String prefix, PluginManager manager ):\n        execution( public PluginDescriptor PluginManager+.getPluginDescriptorForPrefix( String ) )\n        && args( prefix )\n        && target( manager )\n        && notHere();\n\n    PluginDescriptor around( String prefix, PluginManager manager ): getPluginDescriptorForPrefix( prefix, manager )\n    {\n        \/\/ TODO: Implement Me!\n        throw new UnsupportedOperationException( \"This method has not yet been implemented in Maven's backward-compatibility library.\" );\n    }\n\n    public PluginDescriptor PluginManager.getPluginDescriptorForPrefix( String prefix )\n    {\n        return null;\n    }\n\n    \/\/ Intercept retrieval of artifact dependencies of an extension, inject plexus-utils if it's not there.\n    private pointcut extDepArtifactsResolved( DefaultExtensionManager mgr ):\n        call( public Set ResolutionGroup+.getArtifacts() )\n        && within( DefaultExtensionManager+ )\n        && this( mgr )\n        && notHere();\n\n    \/\/ We use the same hack here to make sure that plexus 1.1 is available for extensions that do\n    \/\/ not declare plexus-utils but need it. MNG-2900\n    Set around( DefaultExtensionManager mgr ): extDepArtifactsResolved( mgr )\n    {\n        Set result = proceed( mgr );\n\n        result = checkPlexusUtils( result, mgr.artifactFactory );\n\n        return result;\n    }\n\n    \/\/ Intercept retrieval of artifact dependencies of a plugin, inject plexus-utils if it's not there.\n    private pointcut pluginDepArtifactsResolved( DefaultPluginManager mgr ):\n        call( public Set ResolutionGroup+.getArtifacts() )\n        && cflow( execution( Set DefaultPluginManager+.getPluginArtifacts(..) ) )\n        && this( mgr )\n        && notHere();\n\n    Set around( DefaultPluginManager mgr ): pluginDepArtifactsResolved( mgr )\n    {\n        Set result = proceed( mgr );\n\n        result = checkPlexusUtils( result, mgr.artifactFactory );\n\n        return result;\n    }\n\n    private pointcut methodsTakingRequest( MavenExecutionRequest request ):\n        execution( MavenExecutionResult *.*( MavenExecutionRequest ) )\n        && !withincode( * *.*( MavenExecutionRequest ) )\n        && args( request )\n        && notHere();\n\n    \/\/ capture the request instance before it's passed into any method that returns a corresponding MavenExecutionResult.\n    Object around( MavenExecutionRequest request ): methodsTakingRequest( request )\n    {\n        this.request = request;\n\n        try\n        {\n            return proceed( request );\n        }\n        finally\n        {\n            this.request = null;\n        }\n    }\n\n    \/\/ USE Request to compensate for old buildSettings() API.\n    private pointcut buildSettings( MavenSettingsBuilder builder ):\n        execution( public Settings MavenSettingsBuilder+.buildSettings() )\n        && target( builder )\n        && notHere();\n\n    \/\/ redirect old buildSettings() call to the new one, using the request captured above.\n    Settings around( MavenSettingsBuilder builder )\n        throws IOException, XmlPullParserException:\n            buildSettings( builder )\n    {\n        return builder.buildSettings( request );\n    }\n\n    \/\/ Re-Introduce old buildSettings() API.\n    public Settings MavenSettingsBuilder.buildSettings()\n        throws IOException, XmlPullParserException\n    {\n        return null;\n    }\n\n    public Settings DefaultMavenSettingsBuilder.buildSettings()\n    throws IOException, XmlPullParserException\n    {\n        return null;\n    }\n\n    private pointcut pluginManager( DefaultPluginManager manager ):\n        execution( * DefaultPluginManager.*( .. ) )\n        && this( manager );\n\n    private pointcut pluginRealmCreation( Plugin plugin, DefaultPluginManager manager ):\n        call( ClassRealm MavenRealmManager+.createPluginRealm( Plugin, Artifact, Collection ) )\n        && cflow( pluginManager( manager ) )\n        && args( plugin, .. );\n\n    \/\/ Add various imports for Xpp3 stuff back into the core realm every time a plugin realm is created.\n    ClassRealm around( Plugin plugin, DefaultPluginManager manager ): pluginRealmCreation( plugin, manager )\n    {\n        ClassRealm pluginRealm = proceed( plugin, manager );\n\n        try\n        {\n            String parentRealmId = manager.container.getContainerRealm().getId();\n\n            \/\/ adding for MNG-3012 to try to work around problems with Xpp3Dom (from plexus-utils)\n            \/\/ spawning a ClassCastException when a mojo calls plugin.getConfiguration() from maven-model...\n            pluginRealm.importFrom( parentRealmId, Xpp3Dom.class.getName() );\n            pluginRealm.importFrom( parentRealmId, \"org.codehaus.plexus.util.xml.pull\" );\n\n            \/\/ Adding for MNG-2878, since maven-reporting-impl was removed from the\n            \/\/ internal list of artifacts managed by maven, the classloader is different\n            \/\/ between maven-reporting-impl and maven-reporting-api...so this resource\n            \/\/ is not available from the AbstractMavenReport since it uses:\n            \/\/ getClass().getResourceAsStream( \"\/default-report.xml\" )\n            \/\/ (maven-reporting-impl version 2.0; line 134; affects: checkstyle plugin, and probably others)\n            pluginRealm.importFrom( parentRealmId, \"\/default-report.xml\" );\n        }\n        catch ( NoSuchRealmException e )\n        {\n            \/\/ can't happen here. All realms are concretely resolved by now.\n        }\n\n        return pluginRealm;\n    }\n\n    private pointcut enableLoggingCall( Logger logger ):\n        execution( void LogEnabled+.enableLogging( Logger ) )\n        && args( logger );\n\n    after( Logger logger ): enableLoggingCall( logger )\n    {\n        if ( this.logger == null )\n        {\n            this.logger = logger;\n        }\n    }\n\n    private pointcut addMojoBindingCall( String phase, MojoBinding binding ):\n        call( void LifecycleUtils.addMojoBinding( String, MojoBinding, .. ) )\n        && args( phase, binding, .. );\n\n    void around( String phase, MojoBinding binding ): addMojoBindingCall( phase, binding )\n    {\n        try\n        {\n            proceed( phase, binding );\n        }\n        catch ( NoSuchPhaseException e )\n        {\n            logger.debug( \"Mojo execution: \" + MojoBindingUtils.toString( binding )\n                          + \" cannot be attached to lifecycle phase: \" + phase\n                          + \"; it does not exist. Ignoring this binding.\" );\n        }\n    }\n\n    \/\/ --------------------------\n    \/\/ UTILITIES\n    \/\/ --------------------------\n\n    private Set checkPlexusUtils( Set dependencyArtifacts, ArtifactFactory artifactFactory )\n    {\n        \/\/ ----------------------------------------------------------------------------\n        \/\/ If the plugin already declares a dependency on plexus-utils then we're all\n        \/\/ set as the plugin author is aware of its use. If we don't have a dependency\n        \/\/ on plexus-utils then we must protect users from stupid plugin authors who\n        \/\/ did not declare a direct dependency on plexus-utils because the version\n        \/\/ Maven uses is hidden from downstream use. We will also bump up any\n        \/\/ anything below 1.1 to 1.1 as this mimics the behaviour in 2.0.5 where\n        \/\/ plexus-utils 1.1 was being forced into use.\n        \/\/ ----------------------------------------------------------------------------\n\n        if ( vr == null )\n        {\n            try\n            {\n                vr = VersionRange.createFromVersionSpec( \"[1.1,)\" );\n            }\n            catch ( InvalidVersionSpecificationException e )\n            {\n                \/\/ Won't happen\n            }\n        }\n\n        for ( Iterator i = dependencyArtifacts.iterator(); i.hasNext(); )\n        {\n            Artifact a = (Artifact) i.next();\n\n            if ( a.getArtifactId().equals( \"plexus-utils\" )\n                 && vr.containsVersion( new DefaultArtifactVersion( a.getVersion() ) ) )\n            {\n                return dependencyArtifacts;\n            }\n        }\n\n        \/\/ We will add plexus-utils as every plugin was getting this anyway from Maven itself. We will set the\n        \/\/ version to the latest version we know that works as of the 2.0.6 release. We set the scope to runtime\n        \/\/ as this is what's implicitly happening in 2.0.6.\n\n        if ( plexusUtilsArtifact == null )\n        {\n            plexusUtilsArtifact = artifactFactory.createArtifact( \"org.codehaus.plexus\",\n                                                                  \"plexus-utils\",\n                                                                  \"1.1\",\n                                                                  Artifact.SCOPE_RUNTIME,\n                                                                  \"jar\" );\n        }\n\n        Set result = new LinkedHashSet( dependencyArtifacts );\n        result.add( plexusUtilsArtifact );\n\n        return result;\n    }\n\n}\n","old_contents":"package org.apache.maven.compat.plugin;\n\nimport org.apache.maven.lifecycle.MojoBindingUtils;\nimport org.apache.maven.lifecycle.LifecycleUtils;\nimport org.apache.maven.lifecycle.NoSuchPhaseException;\nimport org.apache.maven.execution.MavenExecutionRequest;\nimport org.apache.maven.execution.MavenExecutionResult;\nimport org.apache.maven.execution.MavenSession;\nimport org.apache.maven.extension.DefaultExtensionManager;\nimport org.apache.maven.execution.MavenRealmManager;\nimport org.apache.maven.artifact.Artifact;\nimport org.apache.maven.artifact.factory.ArtifactFactory;\nimport org.apache.maven.artifact.metadata.ResolutionGroup;\nimport org.apache.maven.artifact.repository.ArtifactRepository;\nimport org.apache.maven.artifact.resolver.ArtifactNotFoundException;\nimport org.apache.maven.artifact.resolver.ArtifactResolutionException;\nimport org.apache.maven.artifact.versioning.DefaultArtifactVersion;\nimport org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;\nimport org.apache.maven.artifact.versioning.VersionRange;\nimport org.apache.maven.lifecycle.model.MojoBinding;\nimport org.apache.maven.model.Plugin;\nimport org.apache.maven.plugin.DefaultPluginManager;\nimport org.apache.maven.plugin.InvalidPluginException;\nimport org.apache.maven.plugin.PluginManager;\nimport org.apache.maven.plugin.PluginManagerException;\nimport org.apache.maven.plugin.PluginNotFoundException;\nimport org.apache.maven.plugin.descriptor.PluginDescriptor;\nimport org.apache.maven.plugin.version.PluginVersionNotFoundException;\nimport org.apache.maven.plugin.version.PluginVersionResolutionException;\nimport org.apache.maven.project.MavenProject;\nimport org.apache.maven.settings.MavenSettingsBuilder;\nimport org.apache.maven.settings.DefaultMavenSettingsBuilder;\nimport org.apache.maven.settings.Settings;\nimport org.codehaus.plexus.classworlds.realm.ClassRealm;\nimport org.codehaus.plexus.classworlds.realm.NoSuchRealmException;\nimport org.codehaus.plexus.util.xml.pull.XmlPullParserException;\nimport org.codehaus.plexus.util.xml.Xpp3Dom;\nimport org.codehaus.plexus.logging.Logger;\nimport org.codehaus.plexus.logging.LogEnabled;\n\nimport java.io.IOException;\nimport java.util.Iterator;\nimport java.util.Collection;\nimport java.util.Set;\n\npublic privileged aspect Maven20xCompatAspect\n{\n\n    \/\/ GRAB Session as soon as it's constructed.\n    private MavenSession session;\n\n    \/\/ GRAB the request when it's passed into a method that returns a corresponding result.\n    \/\/ NOTE: We'll use this in multiple places below...\n    private MavenExecutionRequest request;\n\n    \/\/ Grab this so we have a voice!\n    private Logger logger;\n\n    \/\/ used for injecting plexus-utils into extension and plugin artifact sets.\n    private VersionRange vr = null;\n    private Artifact plexusUtilsArtifact = null;\n\n\n    private pointcut mavenEmbedderStop():\n        execution( * org.apache.maven.embedder.MavenEmbedder.stop( .. ) );\n\n    \/\/ TODO: There must be a more elegant way to release these resources than depending on MavenEmbedder.stop().\n    after(): mavenEmbedderStop()\n    {\n        session = null;\n        request = null;\n        logger = null;\n        vr = null;\n        plexusUtilsArtifact = null;\n    }\n\n\n    \/\/ pointcut to avoid recursive matching on behavior injected by this aspect.\n    private pointcut notHere(): !within( Maven20xCompatAspect );\n\n    private pointcut sessionCreation( MavenSession session ):\n        execution( public MavenSession+.new(..) )\n        && this( session )\n        && notHere();\n\n    \/\/ capture the session instance.\n    after( MavenSession session ): sessionCreation( session )\n    {\n        this.session = session;\n    }\n\n    \/\/ USE Session to compensate for old verifyPlugin(..) API.\n    private pointcut verifyPlugin( Plugin plugin, MavenProject project, PluginManager manager ):\n        execution( public PluginDescriptor PluginManager+.verifyPlugin( Plugin, MavenProject, Settings, ArtifactRepository ) )\n        && args( plugin, project, .. )\n        && target( manager )\n        && notHere();\n\n    \/\/ redirect the old verifyPlugin(..) call to the new one, using the captured session instance above.\n    PluginDescriptor around( Plugin plugin,\n                             MavenProject project,\n                             PluginManager manager )\n        throws ArtifactResolutionException, ArtifactNotFoundException, PluginNotFoundException,\n        PluginVersionResolutionException, InvalidPluginException, PluginManagerException,\n        PluginVersionNotFoundException:\n            verifyPlugin( plugin, project, manager )\n    {\n        return manager.verifyPlugin( plugin, project, session );\n    }\n\n    \/\/ Re-Introduce old verifyPlugin(..) API.\n    public PluginDescriptor PluginManager.verifyPlugin( Plugin plugin,\n                                                        MavenProject project,\n                                                        Settings settings,\n                                                        ArtifactRepository localRepository )\n    {\n        \/\/ this will always be diverted, so no need to do anything.\n        return null;\n    }\n\n    public PluginDescriptor DefaultPluginManager.verifyPlugin( Plugin plugin,\n                                                        MavenProject project,\n                                                        Settings settings,\n                                                        ArtifactRepository localRepository )\n    {\n        \/\/ this will always be diverted, so no need to do anything.\n        return null;\n    }\n\n    private pointcut getPluginDescriptorForPrefix( String prefix, PluginManager manager ):\n        execution( public PluginDescriptor PluginManager+.getPluginDescriptorForPrefix( String ) )\n        && args( prefix )\n        && target( manager )\n        && notHere();\n\n    PluginDescriptor around( String prefix, PluginManager manager ): getPluginDescriptorForPrefix( prefix, manager )\n    {\n        \/\/ TODO: Implement Me!\n        throw new UnsupportedOperationException( \"This method has not yet been implemented in Maven's backward-compatibility library.\" );\n    }\n\n    public PluginDescriptor PluginManager.getPluginDescriptorForPrefix( String prefix )\n    {\n        return null;\n    }\n\n    \/\/ Intercept retrieval of artifact dependencies of an extension, inject plexus-utils if it's not there.\n    private pointcut extDepArtifactsResolved( DefaultExtensionManager mgr ):\n        call( public Set ResolutionGroup+.getArtifacts() )\n        && within( DefaultExtensionManager+ )\n        && this( mgr )\n        && notHere();\n\n    \/\/ We use the same hack here to make sure that plexus 1.1 is available for extensions that do\n    \/\/ not declare plexus-utils but need it. MNG-2900\n    Set around( DefaultExtensionManager mgr ): extDepArtifactsResolved( mgr )\n    {\n        Set result = proceed( mgr );\n\n        checkPlexusUtils( result, mgr.artifactFactory );\n\n        return result;\n    }\n\n    \/\/ Intercept retrieval of artifact dependencies of a plugin, inject plexus-utils if it's not there.\n    private pointcut pluginDepArtifactsResolved( DefaultPluginManager mgr ):\n        call( public Set ResolutionGroup+.getArtifacts() )\n        && cflow( execution( Set DefaultPluginManager+.getPluginArtifacts(..) ) )\n        && this( mgr )\n        && notHere();\n\n    Set around( DefaultPluginManager mgr ): pluginDepArtifactsResolved( mgr )\n    {\n        Set result = proceed( mgr );\n\n        checkPlexusUtils( result, mgr.artifactFactory );\n\n        return result;\n    }\n\n    private pointcut methodsTakingRequest( MavenExecutionRequest request ):\n        execution( MavenExecutionResult *.*( MavenExecutionRequest ) )\n        && !withincode( * *.*( MavenExecutionRequest ) )\n        && args( request )\n        && notHere();\n\n    \/\/ capture the request instance before it's passed into any method that returns a corresponding MavenExecutionResult.\n    Object around( MavenExecutionRequest request ): methodsTakingRequest( request )\n    {\n        this.request = request;\n\n        try\n        {\n            return proceed( request );\n        }\n        finally\n        {\n            this.request = null;\n        }\n    }\n\n    \/\/ USE Request to compensate for old buildSettings() API.\n    private pointcut buildSettings( MavenSettingsBuilder builder ):\n        execution( public Settings MavenSettingsBuilder+.buildSettings() )\n        && target( builder )\n        && notHere();\n\n    \/\/ redirect old buildSettings() call to the new one, using the request captured above.\n    Settings around( MavenSettingsBuilder builder )\n        throws IOException, XmlPullParserException:\n            buildSettings( builder )\n    {\n        return builder.buildSettings( request );\n    }\n\n    \/\/ Re-Introduce old buildSettings() API.\n    public Settings MavenSettingsBuilder.buildSettings()\n        throws IOException, XmlPullParserException\n    {\n        return null;\n    }\n\n    public Settings DefaultMavenSettingsBuilder.buildSettings()\n    throws IOException, XmlPullParserException\n    {\n        return null;\n    }\n\n    private pointcut pluginManager( DefaultPluginManager manager ):\n        execution( * DefaultPluginManager.*( .. ) )\n        && this( manager );\n\n    private pointcut pluginRealmCreation( Plugin plugin, DefaultPluginManager manager ):\n        call( ClassRealm MavenRealmManager+.createPluginRealm( Plugin, Artifact, Collection ) )\n        && cflow( pluginManager( manager ) )\n        && args( plugin, .. );\n\n    \/\/ Add various imports for Xpp3 stuff back into the core realm every time a plugin realm is created.\n    ClassRealm around( Plugin plugin, DefaultPluginManager manager ): pluginRealmCreation( plugin, manager )\n    {\n        ClassRealm pluginRealm = proceed( plugin, manager );\n\n        try\n        {\n            String parentRealmId = manager.container.getContainerRealm().getId();\n\n            \/\/ adding for MNG-3012 to try to work around problems with Xpp3Dom (from plexus-utils)\n            \/\/ spawning a ClassCastException when a mojo calls plugin.getConfiguration() from maven-model...\n            pluginRealm.importFrom( parentRealmId, Xpp3Dom.class.getName() );\n            pluginRealm.importFrom( parentRealmId, \"org.codehaus.plexus.util.xml.pull\" );\n\n            \/\/ Adding for MNG-2878, since maven-reporting-impl was removed from the\n            \/\/ internal list of artifacts managed by maven, the classloader is different\n            \/\/ between maven-reporting-impl and maven-reporting-api...so this resource\n            \/\/ is not available from the AbstractMavenReport since it uses:\n            \/\/ getClass().getResourceAsStream( \"\/default-report.xml\" )\n            \/\/ (maven-reporting-impl version 2.0; line 134; affects: checkstyle plugin, and probably others)\n            pluginRealm.importFrom( parentRealmId, \"\/default-report.xml\" );\n        }\n        catch ( NoSuchRealmException e )\n        {\n            \/\/ can't happen here. All realms are concretely resolved by now.\n        }\n\n        return pluginRealm;\n    }\n\n    private pointcut enableLoggingCall( Logger logger ):\n        execution( void LogEnabled+.enableLogging( Logger ) )\n        && args( logger );\n\n    after( Logger logger ): enableLoggingCall( logger )\n    {\n        if ( this.logger == null )\n        {\n            this.logger = logger;\n        }\n    }\n\n    private pointcut addMojoBindingCall( String phase, MojoBinding binding ):\n        call( void LifecycleUtils.addMojoBinding( String, MojoBinding, .. ) )\n        && args( phase, binding, .. );\n\n    void around( String phase, MojoBinding binding ): addMojoBindingCall( phase, binding )\n    {\n        try\n        {\n            proceed( phase, binding );\n        }\n        catch ( NoSuchPhaseException e )\n        {\n            logger.debug( \"Mojo execution: \" + MojoBindingUtils.toString( binding )\n                          + \" cannot be attached to lifecycle phase: \" + phase\n                          + \"; it does not exist. Ignoring this binding.\" );\n        }\n    }\n\n    \/\/ --------------------------\n    \/\/ UTILITIES\n    \/\/ --------------------------\n\n    private void checkPlexusUtils( Set dependencyArtifacts, ArtifactFactory artifactFactory )\n    {\n        \/\/ ----------------------------------------------------------------------------\n        \/\/ If the plugin already declares a dependency on plexus-utils then we're all\n        \/\/ set as the plugin author is aware of its use. If we don't have a dependency\n        \/\/ on plexus-utils then we must protect users from stupid plugin authors who\n        \/\/ did not declare a direct dependency on plexus-utils because the version\n        \/\/ Maven uses is hidden from downstream use. We will also bump up any\n        \/\/ anything below 1.1 to 1.1 as this mimics the behaviour in 2.0.5 where\n        \/\/ plexus-utils 1.1 was being forced into use.\n        \/\/ ----------------------------------------------------------------------------\n\n        if ( vr == null )\n        {\n            try\n            {\n                vr = VersionRange.createFromVersionSpec( \"[1.1,)\" );\n            }\n            catch ( InvalidVersionSpecificationException e )\n            {\n                \/\/ Won't happen\n            }\n        }\n\n        boolean plexusUtilsPresent = false;\n\n        for ( Iterator i = dependencyArtifacts.iterator(); i.hasNext(); )\n        {\n            Artifact a = (Artifact) i.next();\n\n            if ( a.getArtifactId().equals( \"plexus-utils\" )\n                 && vr.containsVersion( new DefaultArtifactVersion( a.getVersion() ) ) )\n            {\n                plexusUtilsPresent = true;\n\n                break;\n            }\n        }\n\n        if ( !plexusUtilsPresent )\n        {\n            \/\/ We will add plexus-utils as every plugin was getting this anyway from Maven itself. We will set the\n            \/\/ version to the latest version we know that works as of the 2.0.6 release. We set the scope to runtime\n            \/\/ as this is what's implicitly happening in 2.0.6.\n\n            if ( plexusUtilsArtifact == null )\n            {\n                plexusUtilsArtifact = artifactFactory.createArtifact( \"org.codehaus.plexus\",\n                                                                      \"plexus-utils\",\n                                                                      \"1.1\",\n                                                                      Artifact.SCOPE_RUNTIME,\n                                                                      \"jar\" );\n            }\n\n            dependencyArtifacts.add( plexusUtilsArtifact );\n        }\n    }\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"dcb6ff30c1a2dab95872d32f52137e64c7f31519","subject":"roo changes","message":"roo changes\n","repos":"ulbricht\/mds,ulbricht\/mds,datacite\/mds,datacite\/mds,datacite\/mds,datacite\/mds,ulbricht\/mds,ulbricht\/mds,datacite\/mds","old_file":"src\/main\/java\/org\/datacite\/mds\/web\/MetadataController_Roo_Controller.aj","new_file":"src\/main\/java\/org\/datacite\/mds\/web\/MetadataController_Roo_Controller.aj","new_contents":"\/\/ WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.\n\/\/ You may push code into the target .java compilation unit if you wish to edit any member(s).\n\npackage org.datacite.mds.web;\n\nimport java.io.UnsupportedEncodingException;\nimport java.lang.String;\nimport java.util.ArrayList;\nimport java.util.List;\nimport javax.servlet.http.HttpServletRequest;\nimport javax.validation.Valid;\nimport org.datacite.mds.domain.Dataset;\nimport org.datacite.mds.domain.Metadata;\nimport org.springframework.beans.factory.annotation.Autowired;\nimport org.springframework.core.convert.support.GenericConversionService;\nimport org.springframework.ui.Model;\nimport org.springframework.validation.BindingResult;\nimport org.springframework.web.bind.annotation.RequestMapping;\nimport org.springframework.web.bind.annotation.RequestMethod;\nimport org.springframework.web.bind.annotation.RequestParam;\nimport org.springframework.web.util.UriUtils;\nimport org.springframework.web.util.WebUtils;\n\nprivileged aspect MetadataController_Roo_Controller {\n    \n    @Autowired\n    private GenericConversionService MetadataController.conversionService;\n    \n    @RequestMapping(method = RequestMethod.POST)\n    public String MetadataController.create(@Valid Metadata metadata, BindingResult result, Model model, HttpServletRequest request) {\n        if (result.hasErrors()) {\n            model.addAttribute(\"metadata\", metadata);\n            return \"metadatas\/create\";\n        }\n        metadata.persist();\n        return \"redirect:\/metadatas\/\" + encodeUrlPathSegment(metadata.getId().toString(), request);\n    }\n    \n    @RequestMapping(params = \"form\", method = RequestMethod.GET)\n    public String MetadataController.createForm(Model model) {\n        model.addAttribute(\"metadata\", new Metadata());\n        List dependencies = new ArrayList();\n        if (Dataset.countDatasets() == 0) {\n            dependencies.add(new String[]{\"dataset\", \"datasets\"});\n        }\n        model.addAttribute(\"dependencies\", dependencies);\n        return \"metadatas\/create\";\n    }\n    \n    @RequestMapping(method = RequestMethod.GET)\n    public String MetadataController.list(@RequestParam(value = \"page\", required = false) Integer page, @RequestParam(value = \"size\", required = false) Integer size, Model model) {\n        if (page != null || size != null) {\n            int sizeNo = size == null ? 10 : size.intValue();\n            model.addAttribute(\"metadatas\", Metadata.findMetadataEntries(page == null ? 0 : (page.intValue() - 1) * sizeNo, sizeNo));\n            float nrOfPages = (float) Metadata.countMetadatas() \/ sizeNo;\n            model.addAttribute(\"maxPages\", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));\n        } else {\n            model.addAttribute(\"metadatas\", Metadata.findAllMetadatas());\n        }\n        return \"metadatas\/list\";\n    }\n    \n    @RequestMapping(params = { \"find=ByDataset\", \"form\" }, method = RequestMethod.GET)\n    public String MetadataController.findMetadatasByDatasetForm(Model model) {\n        model.addAttribute(\"datasets\", Dataset.findAllDatasets());\n        return \"metadatas\/findMetadatasByDataset\";\n    }\n    \n    @RequestMapping(params = \"find=ByDataset\", method = RequestMethod.GET)\n    public String MetadataController.findMetadatasByDataset(@RequestParam(\"dataset\") Dataset dataset, Model model) {\n        model.addAttribute(\"metadatas\", Metadata.findMetadatasByDataset(dataset).getResultList());\n        return \"metadatas\/list\";\n    }\n    \n    private String MetadataController.encodeUrlPathSegment(String pathSegment, HttpServletRequest request) {\n        String enc = request.getCharacterEncoding();\n        if (enc == null) {\n            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;\n        }\n        try {\n            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);\n        }\n        catch (UnsupportedEncodingException uee) {}\n        return pathSegment;\n    }\n    \n}\n","old_contents":"\/\/ WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.\n\/\/ You may push code into the target .java compilation unit if you wish to edit any member(s).\n\npackage org.datacite.mds.web;\n\nimport java.io.UnsupportedEncodingException;\nimport java.lang.Long;\nimport java.lang.String;\nimport java.util.ArrayList;\nimport java.util.List;\nimport javax.servlet.http.HttpServletRequest;\nimport javax.validation.Valid;\nimport org.datacite.mds.domain.Dataset;\nimport org.datacite.mds.domain.Metadata;\nimport org.springframework.beans.factory.annotation.Autowired;\nimport org.springframework.core.convert.support.GenericConversionService;\nimport org.springframework.ui.Model;\nimport org.springframework.validation.BindingResult;\nimport org.springframework.web.bind.annotation.PathVariable;\nimport org.springframework.web.bind.annotation.RequestMapping;\nimport org.springframework.web.bind.annotation.RequestMethod;\nimport org.springframework.web.bind.annotation.RequestParam;\nimport org.springframework.web.util.UriUtils;\nimport org.springframework.web.util.WebUtils;\n\nprivileged aspect MetadataController_Roo_Controller {\n    \n    @Autowired\n    private GenericConversionService MetadataController.conversionService;\n    \n    @RequestMapping(method = RequestMethod.POST)\n    public String MetadataController.create(@Valid Metadata metadata, BindingResult result, Model model, HttpServletRequest request) {\n        if (result.hasErrors()) {\n            model.addAttribute(\"metadata\", metadata);\n            return \"metadatas\/create\";\n        }\n        metadata.persist();\n        return \"redirect:\/metadatas\/\" + encodeUrlPathSegment(metadata.getId().toString(), request);\n    }\n    \n    @RequestMapping(params = \"form\", method = RequestMethod.GET)\n    public String MetadataController.createForm(Model model) {\n        model.addAttribute(\"metadata\", new Metadata());\n        List dependencies = new ArrayList();\n        if (Dataset.countDatasets() == 0) {\n            dependencies.add(new String[]{\"dataset\", \"datasets\"});\n        }\n        model.addAttribute(\"dependencies\", dependencies);\n        return \"metadatas\/create\";\n    }\n    \n        \n    @RequestMapping(method = RequestMethod.GET)\n    public String MetadataController.list(@RequestParam(value = \"page\", required = false) Integer page, @RequestParam(value = \"size\", required = false) Integer size, Model model) {\n        if (page != null || size != null) {\n            int sizeNo = size == null ? 10 : size.intValue();\n            model.addAttribute(\"metadatas\", Metadata.findMetadataEntries(page == null ? 0 : (page.intValue() - 1) * sizeNo, sizeNo));\n            float nrOfPages = (float) Metadata.countMetadatas() \/ sizeNo;\n            model.addAttribute(\"maxPages\", (int) ((nrOfPages > (int) nrOfPages || nrOfPages == 0.0) ? nrOfPages + 1 : nrOfPages));\n        } else {\n            model.addAttribute(\"metadatas\", Metadata.findAllMetadatas());\n        }\n        return \"metadatas\/list\";\n    }\n    \n    @RequestMapping(params = { \"find=ByDataset\", \"form\" }, method = RequestMethod.GET)\n    public String MetadataController.findMetadatasByDatasetForm(Model model) {\n        model.addAttribute(\"datasets\", Dataset.findAllDatasets());\n        return \"metadatas\/findMetadatasByDataset\";\n    }\n    \n    @RequestMapping(params = \"find=ByDataset\", method = RequestMethod.GET)\n    public String MetadataController.findMetadatasByDataset(@RequestParam(\"dataset\") Dataset dataset, Model model) {\n        model.addAttribute(\"metadatas\", Metadata.findMetadatasByDataset(dataset).getResultList());\n        return \"metadatas\/list\";\n    }\n    \n    private String MetadataController.encodeUrlPathSegment(String pathSegment, HttpServletRequest request) {\n        String enc = request.getCharacterEncoding();\n        if (enc == null) {\n            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;\n        }\n        try {\n            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);\n        }\n        catch (UnsupportedEncodingException uee) {}\n        return pathSegment;\n    }\n    \n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"8285e6be31e20a572d8547c0a061515b3def3882","subject":"Suppressed ProviderNexusAspect to throw NullPointerException in case user wants to create Invocations outside of the server context (e.g. Unit testing)","message":"Suppressed ProviderNexusAspect to throw NullPointerException in case user wants to create Invocations outside of the server context (e.g. Unit testing)\n\n\n\ngit-svn-id: 90776817adfbd895fc5cfa90f675377e0a62e745@160541 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"lucastheisen\/apache-directory-server,darranl\/directory-server,darranl\/directory-server,apache\/directory-server,drankye\/directory-server,apache\/directory-server,lucastheisen\/apache-directory-server,drankye\/directory-server","old_file":"core\/src\/main\/aspects\/org\/apache\/ldap\/server\/jndi\/ProviderNexusAspect.aj","new_file":"core\/src\/main\/aspects\/org\/apache\/ldap\/server\/jndi\/ProviderNexusAspect.aj","new_contents":"package org.apache.ldap.server.jndi;\n\n\nimport java.util.Map;\nimport java.util.Stack;\nimport java.util.Iterator;\nimport java.util.EmptyStackException;\n        \nimport javax.naming.Name;\nimport javax.naming.Context;\nimport javax.naming.ldap.LdapContext;\nimport javax.naming.NamingEnumeration;\nimport javax.naming.directory.Attributes;\nimport javax.naming.directory.SearchControls;\nimport javax.naming.directory.ModificationItem;\n\nimport org.apache.ldap.common.filter.ExprNode;\nimport org.apache.ldap.server.PartitionNexus;\nimport org.apache.ldap.server.db.Database;\nimport org.apache.ldap.server.ContextPartition;\nimport org.apache.ldap.server.invocation.Invocation;\n\n\n\/**\n * Aspect coupling the JNDI provider with the nexus thereby facilitating the \n * injection of interceptors between calls to the nexus from the JNDI.\n * \n * @author <a href=\"mailto:aok123@bellsouth.net\">Alex Karasulu<\/a>\n * @author $Author: akarasulu $\n * @version $Revision$\n *\/\npublic aspect ProviderNexusAspect\n{\n    \/\/ ------------------------------------------------------------------------\n    \/\/ M E M B E R   I N T R O D U C T I O N S\n    \/\/ ------------------------------------------------------------------------\n    \n    \n    \/** \n     * Adds a static ThreadLocal for a Stack of LdapContexts representing nested\n     * backend nexus calls made by the JndiProvider's contexts within the same \n     * thread of execution.\n     *\/\n    private static ThreadLocal JndiProvider.s_contextStacks = new ThreadLocal();\n    \n    \n    \/\/ ------------------------------------------------------------------------\n    \/\/ M E T H O D   I N T R O D U C T I O N S\n    \/\/ ------------------------------------------------------------------------\n\n\n    \/**\n     * Pushes a calling LdapContext onto the Thread's ThreadLocal Stack before\n     * calls are made on the nexus within the LdapContext code.\n     * \n     * @param context the caller or the current context for the nexus call\n     *\/\n    private static void JndiProvider.push( LdapContext context )\n    {\n        Stack stack = ( Stack ) s_contextStacks.get();\n        \n        if ( null == stack )\n        {\n            stack = new Stack();\n            s_contextStacks.set( stack );\n        }\n        \n        stack.push( context );\n    } \n\n\n    \/**\n     * Pops the head of the Thread's ThreadLocal Stack after calls complete on\n     * the nexus within the LdapContext code.\n     * \n     * @return the last LdapContext or caller\n     *\/\n    private static LdapContext JndiProvider.pop()\n    {\n        Stack stack = ( Stack ) s_contextStacks.get();\n        \n        if ( null == stack )\n        {\n            throw new EmptyStackException();\n        }\n        \n        return ( LdapContext ) stack.pop();\n    }\n    \n    \n    \/**\n     * Peeks at the head of the Thread's ThreadLocal Stack.\n     * \n     * @return the current LdapContext or caller\n     *\/\n    static LdapContext JndiProvider.peek()\n    {\n        Stack stack = ( Stack ) s_contextStacks.get();\n        \n        if ( null == stack )\n        {\n            throw new EmptyStackException();\n        }\n        \n        return ( LdapContext ) stack.peek();\n    }\n    \n    \n    \/\/ ------------------------------------------------------------------------\n    \/\/ A S P E C T   M E T H O D S \n    \/\/ ------------------------------------------------------------------------\n    \n\n    \/**\n     * Gets a shallow copy of the context stack.\n     * \n     * @return the context Stack.\n     *\/    \n    private static Stack getContextStack()\n    {\n        Stack stack = ( Stack ) JndiProvider.s_contextStacks.get();\n        \n        if ( stack == null )\n        {\n            return null;\n        }\n        \n        return ( Stack ) stack.clone();\n    }\n    \n    \n    \/\/ ------------------------------------------------------------------------\n    \/\/ P O I N T   C U T S\n    \/\/ ------------------------------------------------------------------------\n    \n    \n    \/**\n     * Selects join points on any public method calls made on the BackendNexus\n     * interface implementing proxy from code executing within an LdapContext \n     * caller.  Makes sure that Proxy methods (static) and the \n     * getInvokationHandler() do not get selected.\n     * \n     * @param caller the calling LdapContext.\n     *\/\n    pointcut jndiNexusCalls( Context caller ):\n        this( caller ) &&\n        ! this( ContextPartition ) &&\n        target( PartitionNexus ) &&\n        ! target( Database ) &&\n        (\n        \/\/ these are for the ContextPartition interface methods \n\n        \/\/ not used anymore since it was moved to RootNexus class\n        \/\/ call( public Attributes getRootDSE() ) ||\n        \t\t\n        call( public Name getMatchedDn( Name, boolean ) ) ||\n        call( public Name getSuffix( Name, boolean ) ) ||\n\t\tcall( public Iterator listSuffixes( boolean ) ) ||\n\t\tcall( public Attributes lookup( Name, String [] ) ) ||\n\n\t\t\/\/ these are for BackingStore interface methods\n        call( public void add( String, Name, Attributes ) ) ||\n        call( public void delete( Name ) ) ||\n\t\tcall( public boolean hasEntry( Name ) ) ||\n        call( public boolean isSuffix( Name ) ) ||\n        call( public NamingEnumeration list( Name ) ) ||\n\t\tcall( public Attributes lookup( Name ) ) ||\n        call( public void modify( Name, int, Attributes ) ) ||\n        call( public void modify( Name, ModificationItem [] ) ) ||\n        call( public void modifyRn( Name, String, boolean ) ) ||\n        call( public void move( Name, Name ) ) ||\n        call( public void move( Name, Name, String, boolean ) ) ||\n        call( public NamingEnumeration \n           search( Name, Map, ExprNode, SearchControls ) ) );\n        \n\n    \/**\n     * Selects join points where the Invokation default constructor executes.\n     * \n     * @param invocation the Invocation instantiated\n     *\/\n    pointcut newInvocation( Invocation invocation ):\n        target( invocation ) &&\n        execution( Invocation.new(..) );\n      \n        \n    \/\/ ------------------------------------------------------------------------\n    \/\/ A D V I C E\n    \/\/ ------------------------------------------------------------------------\n\n\n    before( Context caller ):\n        jndiNexusCalls( caller )\n        {\n    \t\tJndiProvider.push( ( LdapContext ) caller );\n            \/\/System.out.println( \"\\npushed \" + caller + \" for join point \"\n            \/\/    + thisJoinPoint );\n        }\n        \n\n    after( Context caller ):\n        jndiNexusCalls( caller ) \n        {\n            LdapContext head = JndiProvider.pop();\n            \/\/System.out.println( \"\\npopped \" + caller + \" for join point \"\n            \/\/    + thisJoinPoint );\n        }\n      \n        \n    after( Invocation invocation ):\n        newInvocation( invocation )\n        {\n            invocation.setContextStack( getContextStack() );\n            \/\/System.out.println( \n            \/\/    \"\\nJust set the context stack on a new Invocation: \" \n            \/\/    + thisJoinPoint );\n        }\n}\n","old_contents":"package org.apache.ldap.server.jndi;\n\n\nimport java.util.Map;\nimport java.util.Stack;\nimport java.util.Iterator;\nimport java.util.EmptyStackException;\n        \nimport javax.naming.Name;\nimport javax.naming.Context;\nimport javax.naming.ldap.LdapContext;\nimport javax.naming.NamingEnumeration;\nimport javax.naming.directory.Attributes;\nimport javax.naming.directory.SearchControls;\nimport javax.naming.directory.ModificationItem;\n\nimport org.apache.ldap.common.filter.ExprNode;\nimport org.apache.ldap.server.PartitionNexus;\nimport org.apache.ldap.server.db.Database;\nimport org.apache.ldap.server.ContextPartition;\nimport org.apache.ldap.server.invocation.Invocation;\n\n\n\/**\n * Aspect coupling the JNDI provider with the nexus thereby facilitating the \n * injection of interceptors between calls to the nexus from the JNDI.\n * \n * @author <a href=\"mailto:aok123@bellsouth.net\">Alex Karasulu<\/a>\n * @author $Author: akarasulu $\n * @version $Revision$\n *\/\npublic aspect ProviderNexusAspect\n{\n    \/\/ ------------------------------------------------------------------------\n    \/\/ M E M B E R   I N T R O D U C T I O N S\n    \/\/ ------------------------------------------------------------------------\n    \n    \n    \/** \n     * Adds a static ThreadLocal for a Stack of LdapContexts representing nested\n     * backend nexus calls made by the JndiProvider's contexts within the same \n     * thread of execution.\n     *\/\n    private static ThreadLocal JndiProvider.s_contextStacks = new ThreadLocal();\n    \n    \n    \/\/ ------------------------------------------------------------------------\n    \/\/ M E T H O D   I N T R O D U C T I O N S\n    \/\/ ------------------------------------------------------------------------\n\n\n    \/**\n     * Pushes a calling LdapContext onto the Thread's ThreadLocal Stack before\n     * calls are made on the nexus within the LdapContext code.\n     * \n     * @param context the caller or the current context for the nexus call\n     *\/\n    private static void JndiProvider.push( LdapContext context )\n    {\n        Stack stack = ( Stack ) s_contextStacks.get();\n        \n        if ( null == stack )\n        {\n            stack = new Stack();\n            s_contextStacks.set( stack );\n        }\n        \n        stack.push( context );\n    } \n\n\n    \/**\n     * Pops the head of the Thread's ThreadLocal Stack after calls complete on\n     * the nexus within the LdapContext code.\n     * \n     * @return the last LdapContext or caller\n     *\/\n    private static LdapContext JndiProvider.pop()\n    {\n        Stack stack = ( Stack ) s_contextStacks.get();\n        \n        if ( null == stack )\n        {\n            throw new EmptyStackException();\n        }\n        \n        return ( LdapContext ) stack.pop();\n    }\n    \n    \n    \/**\n     * Peeks at the head of the Thread's ThreadLocal Stack.\n     * \n     * @return the current LdapContext or caller\n     *\/\n    static LdapContext JndiProvider.peek()\n    {\n        Stack stack = ( Stack ) s_contextStacks.get();\n        \n        if ( null == stack )\n        {\n            throw new EmptyStackException();\n        }\n        \n        return ( LdapContext ) stack.peek();\n    }\n    \n    \n    \/\/ ------------------------------------------------------------------------\n    \/\/ A S P E C T   M E T H O D S \n    \/\/ ------------------------------------------------------------------------\n    \n\n    \/**\n     * Gets a shallow copy of the context stack.\n     * \n     * @return the context Stack.\n     *\/    \n    private static Stack getContextStack()\n    {\n        Stack stack = ( Stack ) JndiProvider.s_contextStacks.get();\n        \n        if ( null == stack )\n        {\n            throw new NullPointerException( \"Thread had null stack\" );\n        }\n        \n        return ( Stack ) stack.clone();\n    }\n    \n    \n    \/\/ ------------------------------------------------------------------------\n    \/\/ P O I N T   C U T S\n    \/\/ ------------------------------------------------------------------------\n    \n    \n    \/**\n     * Selects join points on any public method calls made on the BackendNexus\n     * interface implementing proxy from code executing within an LdapContext \n     * caller.  Makes sure that Proxy methods (static) and the \n     * getInvokationHandler() do not get selected.\n     * \n     * @param caller the calling LdapContext.\n     *\/\n    pointcut jndiNexusCalls( Context caller ):\n        this( caller ) &&\n        ! this( ContextPartition ) &&\n        target( PartitionNexus ) &&\n        ! target( Database ) &&\n        (\n        \/\/ these are for the ContextPartition interface methods \n\n        \/\/ not used anymore since it was moved to RootNexus class\n        \/\/ call( public Attributes getRootDSE() ) ||\n        \t\t\n        call( public Name getMatchedDn( Name, boolean ) ) ||\n        call( public Name getSuffix( Name, boolean ) ) ||\n\t\tcall( public Iterator listSuffixes( boolean ) ) ||\n\t\tcall( public Attributes lookup( Name, String [] ) ) ||\n\n\t\t\/\/ these are for BackingStore interface methods\n        call( public void add( String, Name, Attributes ) ) ||\n        call( public void delete( Name ) ) ||\n\t\tcall( public boolean hasEntry( Name ) ) ||\n        call( public boolean isSuffix( Name ) ) ||\n        call( public NamingEnumeration list( Name ) ) ||\n\t\tcall( public Attributes lookup( Name ) ) ||\n        call( public void modify( Name, int, Attributes ) ) ||\n        call( public void modify( Name, ModificationItem [] ) ) ||\n        call( public void modifyRn( Name, String, boolean ) ) ||\n        call( public void move( Name, Name ) ) ||\n        call( public void move( Name, Name, String, boolean ) ) ||\n        call( public NamingEnumeration \n           search( Name, Map, ExprNode, SearchControls ) ) );\n        \n\n    \/**\n     * Selects join points where the Invokation default constructor executes.\n     * \n     * @param invocation the Invocation instantiated\n     *\/\n    pointcut newInvocation( Invocation invocation ):\n        target( invocation ) &&\n        execution( Invocation.new(..) );\n      \n        \n    \/\/ ------------------------------------------------------------------------\n    \/\/ A D V I C E\n    \/\/ ------------------------------------------------------------------------\n\n\n    before( Context caller ):\n        jndiNexusCalls( caller )\n        {\n    \t\tJndiProvider.push( ( LdapContext ) caller );\n            \/\/System.out.println( \"\\npushed \" + caller + \" for join point \"\n            \/\/    + thisJoinPoint );\n        }\n        \n\n    after( Context caller ):\n        jndiNexusCalls( caller ) \n        {\n            LdapContext head = JndiProvider.pop();\n            \/\/System.out.println( \"\\npopped \" + caller + \" for join point \"\n            \/\/    + thisJoinPoint );\n        }\n      \n        \n    after( Invocation invocation ):\n        newInvocation( invocation )\n        {\n            invocation.setContextStack( getContextStack() );\n            \/\/System.out.println( \n            \/\/    \"\\nJust set the context stack on a new Invocation: \" \n            \/\/    + thisJoinPoint );\n        }\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"8e276efd156004b5f7e2f122b44164e0efb875ac","subject":"Fixed #1741.","message":"Fixed #1741.\n\ngit-svn-id: f4ecfe233223879a4a16cd7937f11b5152963d8e@17176 5e8d7ff9-d8ef-0310-90f0-a4852d11357a\n","repos":"Kwestor\/scala-ide,Duhemm\/scala-ide,aleksi-lukkarinen\/scala-ide,stephenh\/scala-ide,andrey-ilinykh\/scala-ide,sschaef\/scala-ide,pilipolio\/scala-ide,scala-ide\/scala-ide,stephenh\/scala-ide,wpopielarski\/scala-ide,Kwestor\/scala-ide,sschaef\/scala-ide,aleksi-lukkarinen\/scala-ide,andrey-ilinykh\/scala-ide,aleksi-lukkarinen\/scala-ide,wpopielarski\/scala-ide,stephenh\/scala-ide,Duhemm\/scala-ide,sschaef\/scala-ide,Duhemm\/scala-ide,sschaef\/scala-ide,stephenh\/scala-ide,Duhemm\/scala-ide,romanowski\/scala-ide,andrey-ilinykh\/scala-ide,wpopielarski\/scala-ide,dragos\/scala-ide,mlangc\/scala-ide,mlangc\/scala-ide,aleksi-lukkarinen\/scala-ide,mlangc\/scala-ide,dragos\/scala-ide,scala-ide\/scala-ide,scala-ide\/scala-ide,Kwestor\/scala-ide,pilipolio\/scala-ide,romanowski\/scala-ide,Kwestor\/scala-ide,dragos\/scala-ide,pilipolio\/scala-ide,romanowski\/scala-ide,dragos\/scala-ide,wpopielarski\/scala-ide,romanowski\/scala-ide,andrey-ilinykh\/scala-ide,pilipolio\/scala-ide,scala-ide\/scala-ide,mlangc\/scala-ide","old_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/builderoptions\/ScalaJavaBuilderAspect.aj","new_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/builderoptions\/ScalaJavaBuilderAspect.aj","new_contents":"\/*\n * Copyright 2005-2009 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.builderoptions;\n\nimport java.util.Map;\n\nimport org.eclipse.core.resources.IProject;\nimport org.eclipse.core.runtime.CoreException;\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.internal.core.builder.BatchImageBuilder;\n\/\/import org.eclipse.jdt.internal.core.builder.ClasspathMultiDirectory;\nimport org.eclipse.jdt.internal.core.util.Util;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect ScalaJavaBuilderAspect {\n  pointcut build() : execution(IProject[] ScalaJavaBuilder.build(int, Map, IProgressMonitor) throws CoreException);\n  pointcut cleanOutputFolders(boolean copyBack) : args(copyBack) && execution(void BatchImageBuilder.cleanOutputFolders(boolean) throws CoreException);\n  pointcut isJavaLikeFileName(String fileName) : args(fileName) && execution(boolean Util.isJavaLikeFileName(String));  \n  \n  void around(BatchImageBuilder builder, boolean copyBack) throws CoreException : target(builder) && cleanOutputFolders(copyBack) && cflow(build()) {\n    \/\/ Suppress the cleaning behaviour but do the extra resource copying if requested\n    if (copyBack)\n      for (int i = 0, l = builder.sourceLocations.length; i < l; i++) {\n        org.eclipse.jdt.internal.core.builder.ClasspathMultiDirectory sourceLocation = builder.sourceLocations[i];\n        if (sourceLocation.hasIndependentOutputFolder)\n          builder.copyExtraResourcesBack(sourceLocation, false);\n      }\n  }\n  \n  boolean around(String fileName) : isJavaLikeFileName(fileName) && cflow(build()) && !cflow(cleanOutputFolders(*)) {\n    if (fileName != null && fileName.endsWith(\"scala\"))\n      return false;\n    else\n      return proceed(fileName);\n  }\n}\n","old_contents":"\/*\n * Copyright 2005-2009 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.builderoptions;\n\nimport java.util.Map;\n\nimport org.eclipse.core.resources.IProject;\nimport org.eclipse.core.runtime.CoreException;\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.internal.core.builder.BatchImageBuilder;\nimport org.eclipse.jdt.internal.core.util.Util;\n\n@SuppressWarnings(\"restriction\")\npublic aspect ScalaJavaBuilderAspect {\n  pointcut build() : execution(IProject[] ScalaJavaBuilder.build(int, Map, IProgressMonitor) throws CoreException);\n  pointcut clean() : execution(void ScalaJavaBuilder.clean(IProgressMonitor) throws CoreException);\n  pointcut cleanOutputFolders() : execution(void BatchImageBuilder.cleanOutputFolders(boolean) throws CoreException);\n  pointcut isJavaLikeFileName(String fileName) : args(fileName) && execution(boolean Util.isJavaLikeFileName(String));  \n  \n  void around() : cleanOutputFolders() && cflow(build()) {\n    \/\/ Just suppress the behaviour\n  }\n  \n  boolean around(String fileName) : isJavaLikeFileName(fileName) && (cflow(build()) || cflow(clean())) {\n    if (fileName != null && fileName.endsWith(\"scala\"))\n      return false;\n    else\n      return proceed(fileName);\n  }\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"4380735fdd89dbf207a5d9d02b122aac12df57ee","subject":"[Internal: fix lock timeout metrics]","message":"[Internal: fix lock timeout metrics]\n","repos":"zstackio\/zstack,AlanJager\/zstack,zstackorg\/zstack,zstackio\/zstack,MatheMatrix\/zstack,MatheMatrix\/zstack,AlanJager\/zstack,zstackorg\/zstack,zstackio\/zstack,MatheMatrix\/zstack,AlanJager\/zstack","old_file":"core\/src\/main\/java\/org\/zstack\/core\/aspect\/DbDeadlockAspect.aj","new_file":"core\/src\/main\/java\/org\/zstack\/core\/aspect\/DbDeadlockAspect.aj","new_contents":"package org.zstack.core.aspect;\r\n\r\nimport com.mysql.jdbc.exceptions.jdbc4.MySQLTransactionRollbackException;\r\nimport org.springframework.transaction.annotation.Transactional;\r\nimport org.zstack.core.db.DatabaseGlobalProperty;\r\nimport org.zstack.utils.DebugUtils;\r\nimport org.zstack.core.db.DatabaseFacadeImpl;\r\nimport org.zstack.utils.Utils;\r\nimport org.zstack.utils.logging.CLogger;\r\nimport java.util.concurrent.ThreadLocalRandom;\r\nimport java.util.concurrent.TimeUnit;\r\nimport java.util.concurrent.Callable;\r\nimport java.util.concurrent.atomic.AtomicInteger;\r\n\r\npublic aspect DbDeadlockAspect {\r\n    private static final CLogger logger = Utils.getLogger(DbDeadlockAspect.class);\r\n    private static ThreadLocal<AtomicInteger> local = new ThreadLocal<>();\r\n\r\n    declare error: withincode(@org.springframework.transaction.annotation.Transactional * *.*(..)) && withincode(@org.zstack.core.db.DeadlockAutoRestart * *.*(..)) : \"@Transactional and @DeadlockAutoRestart can not be present on the same method. @DeadlockAutoRestart must be on parent method which calls method that has @Transactional\";\r\n\r\n    Object around() : execution(@org.zstack.core.db.DeadlockAutoRestart * *.*(..)) {\r\n        RuntimeException bad = null;\r\n        int times = DatabaseGlobalProperty.retryTimes;\r\n        AtomicInteger refCount = local.get();\r\n        if (refCount == null) {\r\n            refCount = new AtomicInteger(0);\r\n            local.set(refCount);\r\n        }\r\n\r\n        refCount.incrementAndGet();\r\n        try {\r\n            do {\r\n                try {\r\n                    return new Callable<Object>() {\r\n                        @Override\r\n                        @Transactional\r\n                        public Object call() {\r\n                           return proceed();\r\n                        }\r\n                    }.call();\r\n                } catch (RuntimeException re) {\r\n                    int c = refCount.get();\r\n                    DatabaseFacadeImpl.increaseDberror();\r\n                    if (c > 1) {\r\n                        logger.warn(String.format(\"ref = %s, ask outer deadlock handler to handle it\", c));\r\n                        throw re;\r\n                    }\r\n\r\n                    times --;\r\n                    bad = re;\r\n                    Throwable root = DebugUtils.getRootCause(re);\r\n                    if (root instanceof MySQLTransactionRollbackException && root.getMessage().contains(\"Deadlock\")) {\r\n                        logger.warn(\"deadlock happened, retry\");\r\n                        DatabaseFacadeImpl.increaseDeadlock();\r\n                        try {\r\n                            TimeUnit.MILLISECONDS.sleep(ThreadLocalRandom.current().nextInt(400, 600));\r\n                        } catch (InterruptedException e) {\r\n                            logger.warn(e.getMessage(), e);\r\n                        }\r\n                    } else {\r\n                        if (root.getMessage().contains(\"Lock wait timeout\")) {\r\n                            DatabaseFacadeImpl.increaseLocktimeout();\r\n                        }\r\n                        throw re;\r\n                    }\r\n                }\r\n            } while (times > 0);\r\n\r\n            logger.warn(String.format(\"DB deadlock still happens after retrying %s times, give up\", DatabaseGlobalProperty.retryTimes));\r\n            throw bad;\r\n        } finally {\r\n            refCount.decrementAndGet();\r\n        }\r\n    }\r\n}\r\n","old_contents":"package org.zstack.core.aspect;\r\n\r\nimport com.mysql.jdbc.exceptions.jdbc4.MySQLTransactionRollbackException;\r\nimport org.springframework.transaction.annotation.Transactional;\r\nimport org.zstack.core.db.DatabaseGlobalProperty;\r\nimport org.zstack.utils.DebugUtils;\r\nimport org.zstack.core.db.DatabaseFacadeImpl;\r\nimport org.zstack.utils.Utils;\r\nimport org.zstack.utils.logging.CLogger;\r\nimport java.util.concurrent.ThreadLocalRandom;\r\nimport java.util.concurrent.TimeUnit;\r\nimport java.util.concurrent.Callable;\r\nimport java.util.concurrent.atomic.AtomicInteger;\r\n\r\npublic aspect DbDeadlockAspect {\r\n    private static final CLogger logger = Utils.getLogger(DbDeadlockAspect.class);\r\n    private static ThreadLocal<AtomicInteger> local = new ThreadLocal<>();\r\n\r\n    declare error: withincode(@org.springframework.transaction.annotation.Transactional * *.*(..)) && withincode(@org.zstack.core.db.DeadlockAutoRestart * *.*(..)) : \"@Transactional and @DeadlockAutoRestart can not be present on the same method. @DeadlockAutoRestart must be on parent method which calls method that has @Transactional\";\r\n\r\n    Object around() : execution(@org.zstack.core.db.DeadlockAutoRestart * *.*(..)) {\r\n        RuntimeException bad = null;\r\n        int times = DatabaseGlobalProperty.retryTimes;\r\n        AtomicInteger refCount = local.get();\r\n        if (refCount == null) {\r\n            refCount = new AtomicInteger(0);\r\n            local.set(refCount);\r\n        }\r\n\r\n        refCount.incrementAndGet();\r\n        try {\r\n            do {\r\n                try {\r\n                    return new Callable<Object>() {\r\n                        @Override\r\n                        @Transactional\r\n                        public Object call() {\r\n                           return proceed();\r\n                        }\r\n                    }.call();\r\n                } catch (RuntimeException re) {\r\n                    int c = refCount.get();\r\n                    DatabaseFacadeImpl.increaseDberror();\r\n                    if (c > 1) {\r\n                        logger.warn(String.format(\"ref = %s, ask outer deadlock handler to handle it\", c));\r\n                        throw re;\r\n                    }\r\n\r\n                    times --;\r\n                    bad = re;\r\n                    Throwable root = DebugUtils.getRootCause(re);\r\n                    if (root instanceof MySQLTransactionRollbackException && root.getMessage().contains(\"Deadlock\")) {\r\n                        logger.warn(\"deadlock happened, retry\");\r\n                        DatabaseFacadeImpl.increaseDeadlock();\r\n                        try {\r\n                            TimeUnit.MILLISECONDS.sleep(ThreadLocalRandom.current().nextInt(400, 600));\r\n                        } catch (InterruptedException e) {\r\n                            logger.warn(e.getMessage(), e);\r\n                        }\r\n                    } else {\r\n                        if (root.getMessage().contains(\"Deadlock\")) {\r\n                            DatabaseFacadeImpl.increaseLocktimeout();\r\n                        }\r\n                        throw re;\r\n                    }\r\n                }\r\n            } while (times > 0);\r\n\r\n            logger.warn(String.format(\"DB deadlock still happens after retrying %s times, give up\", DatabaseGlobalProperty.retryTimes));\r\n            throw bad;\r\n        } finally {\r\n            refCount.decrementAndGet();\r\n        }\r\n    }\r\n}\r\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"9ccbf234a5a8cb77b6763fd95bf1b54e7668b8a9","subject":"Fixed #2621.","message":"Fixed #2621.\n\ngit-svn-id: f4ecfe233223879a4a16cd7937f11b5152963d8e@19648 5e8d7ff9-d8ef-0310-90f0-a4852d11357a\n","repos":"romanowski\/scala-ide,dragos\/scala-ide,Kwestor\/scala-ide,scala-ide\/scala-ide,stephenh\/scala-ide,mlangc\/scala-ide,mlangc\/scala-ide,sschaef\/scala-ide,wpopielarski\/scala-ide,Duhemm\/scala-ide,romanowski\/scala-ide,Kwestor\/scala-ide,stephenh\/scala-ide,Duhemm\/scala-ide,aleksi-lukkarinen\/scala-ide,Duhemm\/scala-ide,sschaef\/scala-ide,romanowski\/scala-ide,stephenh\/scala-ide,wpopielarski\/scala-ide,sschaef\/scala-ide,dragos\/scala-ide,aleksi-lukkarinen\/scala-ide,aleksi-lukkarinen\/scala-ide,dragos\/scala-ide,scala-ide\/scala-ide,romanowski\/scala-ide,aleksi-lukkarinen\/scala-ide,andrey-ilinykh\/scala-ide,mlangc\/scala-ide,pilipolio\/scala-ide,dragos\/scala-ide,scala-ide\/scala-ide,wpopielarski\/scala-ide,andrey-ilinykh\/scala-ide,scala-ide\/scala-ide,pilipolio\/scala-ide,mlangc\/scala-ide,pilipolio\/scala-ide,stephenh\/scala-ide,andrey-ilinykh\/scala-ide,Duhemm\/scala-ide,andrey-ilinykh\/scala-ide,sschaef\/scala-ide,wpopielarski\/scala-ide,Kwestor\/scala-ide,pilipolio\/scala-ide,Kwestor\/scala-ide","old_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/core\/DOMAspect.aj","new_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/core\/DOMAspect.aj","new_contents":"\/*\n * Copyright 2005-2009 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.core;\n\nimport java.util.Locale;\nimport java.util.Map;\n\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.core.ICompilationUnit;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.core.compiler.CharOperation;\nimport org.eclipse.jdt.core.dom.AST;\nimport org.eclipse.jdt.core.dom.ASTNode;\nimport org.eclipse.jdt.core.dom.ASTParser;\nimport org.eclipse.jdt.internal.compiler.CompilationResult;\nimport org.eclipse.jdt.internal.compiler.DefaultErrorHandlingPolicies;\nimport org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.AbstractVariableDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.AnnotationMethodDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.Argument;\nimport org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.ConstructorDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.Expression;\nimport org.eclipse.jdt.internal.compiler.ast.MethodDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.QualifiedAllocationExpression;\nimport org.eclipse.jdt.internal.compiler.ast.Statement;\nimport org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.TypeParameter;\nimport org.eclipse.jdt.internal.compiler.ast.TypeReference;\nimport org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;\nimport org.eclipse.jdt.internal.compiler.env.AccessRestriction;\nimport org.eclipse.jdt.internal.compiler.env.IBinaryType;\nimport org.eclipse.jdt.internal.compiler.env.INameEnvironment;\nimport org.eclipse.jdt.internal.compiler.env.ISourceType;\nimport org.eclipse.jdt.internal.compiler.impl.CompilerOptions;\nimport org.eclipse.jdt.internal.compiler.impl.ITypeRequestor;\nimport org.eclipse.jdt.internal.compiler.lookup.LookupEnvironment;\nimport org.eclipse.jdt.internal.compiler.lookup.PackageBinding;\nimport org.eclipse.jdt.internal.compiler.parser.SourceTypeConverter;\nimport org.eclipse.jdt.internal.compiler.problem.DefaultProblemFactory;\nimport org.eclipse.jdt.internal.compiler.problem.ProblemReporter;\nimport org.eclipse.jdt.internal.core.DefaultWorkingCopyOwner;\nimport org.eclipse.jdt.internal.core.JavaProject;\nimport org.eclipse.jdt.internal.core.SourceAnnotationMethodInfo;\nimport org.eclipse.jdt.internal.core.SourceMethod;\nimport org.eclipse.jdt.internal.core.SourceMethodElementInfo;\nimport org.eclipse.jdt.internal.core.SourceType;\nimport org.eclipse.jdt.internal.core.SourceTypeElementInfo;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaCompilationUnit;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect DOMAspect {\n  pointcut internalCreateAST(ASTParser parser, IProgressMonitor monitor) :\n    execution(ASTNode ASTParser.internalCreateAST(IProgressMonitor)) &&\n    args(monitor) &&\n    target(parser);\n  \n  pointcut convert(SourceTypeConverter stc, SourceMethod methodHandle, SourceMethodElementInfo methodInfo, CompilationResult compilationResult) :\n    execution(AbstractMethodDeclaration SourceTypeConverter.convert(SourceMethod, SourceMethodElementInfo, CompilationResult)) &&\n    args(methodHandle, methodInfo, compilationResult) &&\n    target(stc);\n  \n  ASTNode around(ASTParser parser, IProgressMonitor monitor) :\n    internalCreateAST(parser, monitor) {\n    try {\n      if (!(parser.typeRoot instanceof IScalaCompilationUnit))\n        return proceed(parser, monitor);\n      \n      ICompilationUnit cu = (ICompilationUnit)parser.typeRoot;\n      org.eclipse.jdt.internal.compiler.env.ICompilationUnit sourceUnit = (org.eclipse.jdt.internal.compiler.env.ICompilationUnit)cu;\n      \n      IType[] topLevelTypes = cu.getTypes();\n      int length = topLevelTypes.length;\n      if (length == 0)\n        throw new IllegalStateException();\n      \n      SourceTypeElementInfo[] topLevelInfos = new SourceTypeElementInfo[length];\n      for (int i = 0; i < length; i++) {\n        topLevelInfos[i] = (SourceTypeElementInfo) ((SourceType)topLevelTypes[i]).getElementInfo();\n      }\n      char[] fileName = ((ISourceType)topLevelInfos[0]).getFileName();\n      \n      CompilationResult result = new CompilationResult(fileName, 1, 1, 100);\n\n      JavaProject javaProject = (JavaProject)cu.getJavaProject(); \n      Map compilerOptions0 = javaProject.getOptions(true);\n      CompilerOptions compilerOptions = new CompilerOptions(compilerOptions0);\n      compilerOptions.storeAnnotations = true;\n      \n      ProblemReporter problemReporter =\n        new ProblemReporter(\n          DefaultErrorHandlingPolicies.proceedWithAllProblems(),\n          compilerOptions,\n          new DefaultProblemFactory(Locale.getDefault()));\n      \n      int flags = SourceTypeConverter.FIELD_AND_METHOD | SourceTypeConverter.MEMBER_TYPE;\n      \n      CompilationUnitDeclaration unit =\n        SourceTypeConverter.buildCompilationUnit(topLevelInfos, flags, problemReporter, result);\n      \n      INameEnvironment ne = javaProject.newSearchableNameEnvironment(DefaultWorkingCopyOwner.PRIMARY);\n      final LookupEnvironment le = new LookupEnvironment(null, compilerOptions, problemReporter, ne);\n      ITypeRequestor typeRequestor = new ITypeRequestor() {\n        public void accept(IBinaryType binaryType, PackageBinding packageBinding, AccessRestriction accessRestriction) {\n          le.createBinaryTypeFrom(binaryType, packageBinding, accessRestriction);\n        }\n        public void accept(org.eclipse.jdt.internal.compiler.env.ICompilationUnit unit, AccessRestriction accessRestriction) {}\n        public void accept(ISourceType[] sourceType, PackageBinding packageBinding, AccessRestriction accessRestriction) {}\n      };\n      le.typeRequestor = typeRequestor;\n      \n      le.buildTypeBindings(unit, null);\n      le.completeTypeBindings();\n      fixTypes(unit.types);\n      \n      AST ast = AST.newAST(AST.JLS3);\n      ast.setFlag(AST.RESOLVED_BINDINGS);\n      ast.setDefaultNodeFlag(ASTNode.ORIGINAL);\n\n      org.eclipse.jdt.core.dom.ASTConverter converter =\n        new org.eclipse.jdt.core.dom.ASTConverter(compilerOptions0, true, monitor);\n      \n      org.eclipse.jdt.core.dom.BindingResolver resolver =\n        new org.eclipse.jdt.core.dom.DefaultBindingResolver(\n          unit.scope,\n          DefaultWorkingCopyOwner.PRIMARY,\n          new org.eclipse.jdt.core.dom.DefaultBindingResolver.BindingTables(),\n          true);\n      ast.setBindingResolver(resolver);\n      converter.setAST(ast);\n      \n      ASTNode node = converter.convert(unit, sourceUnit.getContents());\n      return node;\n    } catch (JavaModelException ex) {\n      throw new IllegalArgumentException(ex);\n    }\n  }\n  \n  private void fixTypes(TypeDeclaration[] types) {\n    for(int i = 0, iLimit = types.length; i < iLimit ; ++i) {\n      TypeDeclaration tpe = types[i];\n      tpe.binding.getAnnotationTagBits();\n      tpe.scope.buildFields();\n      tpe.scope.buildMethods();\n      fixFields(tpe.fields);\n      fixMethods(tpe.methods);\n      fixTypes(tpe.memberTypes);\n    }\n  }\n  \n  private void fixMethods(AbstractMethodDeclaration[] methods) {\n    if (methods == null)\n      return;\n    \n    for(int i = 0, iLimit = methods.length; i < iLimit; ++i) {\n      AbstractMethodDeclaration m = methods[i];\n      m.bodyStart = m.declarationSourceStart;\n      m.bodyEnd = m.declarationSourceEnd;\n      m.binding.getAnnotationTagBits();\n    }\n  }\n  \n  private void fixFields(AbstractVariableDeclaration[] fields) {\n    if (fields == null)\n      return;\n    \n    for(int i = 0, iLimit = fields.length; i < iLimit; ++i) {\n      AbstractVariableDeclaration f = fields[i];\n      f.declarationEnd = f.declarationSourceEnd;\n    }\n  }\n\n  AbstractMethodDeclaration around(SourceTypeConverter stc, SourceMethod methodHandle, SourceMethodElementInfo methodInfo, CompilationResult compilationResult) throws JavaModelException :\n    convert(stc, methodHandle, methodInfo, compilationResult) {\n    AbstractMethodDeclaration method;\n\n    \/* only source positions available *\/\n    int start = methodInfo.getNameSourceStart();\n    int end = methodInfo.getNameSourceEnd();\n\n    \/\/ convert 1.5 specific constructs only if compliance is 1.5 or above\n    TypeParameter[] typeParams = null;\n    if (stc.has1_5Compliance) {\n      \/* convert type parameters *\/\n      char[][] typeParameterNames = methodInfo.getTypeParameterNames();\n      if (typeParameterNames != null) {\n        int parameterCount = typeParameterNames.length;\n        if (parameterCount > 0) { \/\/ method's type parameters must be null if no type parameter\n          char[][][] typeParameterBounds = methodInfo.getTypeParameterBounds();\n          typeParams = new TypeParameter[parameterCount];\n          for (int i = 0; i < parameterCount; i++) {\n            typeParams[i] = stc.createTypeParameter(typeParameterNames[i], typeParameterBounds[i], start, end);\n          }\n        }\n      }\n    }\n\n    int modifiers = methodInfo.getModifiers();\n    if (methodInfo.isConstructor()) {\n      ConstructorDeclaration decl = new ConstructorDeclaration(compilationResult);\n      decl.bits &= ~org.eclipse.jdt.internal.compiler.ast.ASTNode.IsDefaultConstructor;\n      method = decl;\n      decl.typeParameters = typeParams;\n    } else {\n      MethodDeclaration decl;\n      if (methodInfo.isAnnotationMethod()) {\n        AnnotationMethodDeclaration annotationMethodDeclaration = new AnnotationMethodDeclaration(compilationResult);\n\n        \/* conversion of default value *\/\n        SourceAnnotationMethodInfo annotationMethodInfo = (SourceAnnotationMethodInfo) methodInfo;\n        boolean hasDefaultValue = annotationMethodInfo.defaultValueStart != -1 || annotationMethodInfo.defaultValueEnd != -1;\n        if ((stc.flags & SourceTypeConverter.FIELD_INITIALIZATION) != 0) {\n          if (hasDefaultValue) {\n            char[] defaultValueSource = CharOperation.subarray(stc.getSource(), annotationMethodInfo.defaultValueStart, annotationMethodInfo.defaultValueEnd+1);\n            if (defaultValueSource != null) {\n                Expression expression =  stc.parseMemberValue(defaultValueSource);\n                if (expression != null) {\n                  annotationMethodDeclaration.defaultValue = expression;\n                }\n            } else {\n              \/\/ could not retrieve the default value\n              hasDefaultValue = false;\n            }\n          }\n        }\n        if (hasDefaultValue)\n          modifiers |= ClassFileConstants.AccAnnotationDefault;\n        decl = annotationMethodDeclaration;\n      } else {\n        decl = new MethodDeclaration(compilationResult);\n      }\n\n      \/\/ convert return type\n      decl.returnType = stc.createTypeReference(methodInfo.getReturnTypeName(), start, end);\n\n      \/\/ type parameters\n      decl.typeParameters = typeParams;\n\n      method = decl;\n    }\n    method.selector = methodHandle.getElementName().toCharArray();\n    boolean isVarargs = (modifiers & ClassFileConstants.AccVarargs) != 0;\n    method.modifiers = modifiers & ~ClassFileConstants.AccVarargs;\n    method.sourceStart = start;\n    method.sourceEnd = end;\n    method.declarationSourceStart = methodInfo.getDeclarationSourceStart();\n    method.declarationSourceEnd = methodInfo.getDeclarationSourceEnd();\n\n    \/\/ convert 1.5 specific constructs only if compliance is 1.5 or above\n    if (stc.has1_5Compliance) {\n      \/* convert annotations *\/\n      method.annotations = stc.convertAnnotations(methodHandle);\n    }\n\n    \/* convert arguments *\/\n    String[] argumentTypeSignatures = methodHandle.getParameterTypes();\n    char[][] argumentNames = methodInfo.getArgumentNames();\n    int argumentCount = argumentTypeSignatures == null ? 0 : argumentTypeSignatures.length;\n    if (argumentCount > 0) {\n      long position = ((long) start << 32) + end;\n      method.arguments = new Argument[argumentCount];\n      for (int i = 0; i < argumentCount; i++) {\n        TypeReference typeReference = stc.createTypeReference(argumentTypeSignatures[i], start, end);\n        if (isVarargs && i == argumentCount-1) {\n          typeReference.bits |= org.eclipse.jdt.internal.compiler.ast.ASTNode.IsVarArgs;\n        }\n        method.arguments[i] =\n          new Argument(\n            argumentNames[i],\n            position,\n            typeReference,\n            ClassFileConstants.AccDefault);\n        \/\/ do not care whether was final or not\n      }\n    }\n\n    \/* convert thrown exceptions *\/\n    char[][] exceptionTypeNames = methodInfo.getExceptionTypeNames();\n    int exceptionCount = exceptionTypeNames == null ? 0 : exceptionTypeNames.length;\n    if (exceptionCount > 0) {\n      method.thrownExceptions = new TypeReference[exceptionCount];\n      for (int i = 0; i < exceptionCount; i++) {\n        method.thrownExceptions[i] =\n          stc.createTypeReference(exceptionTypeNames[i], start, end);\n      }\n    }\n\n    \/* convert local and anonymous types *\/\n    if ((stc.flags & SourceTypeConverter.LOCAL_TYPE) != 0) {\n      IJavaElement[] children = methodInfo.getChildren();\n      int typesLength = 0;\n      int childrenLength = children.length;\n      for (int i = 0; i < childrenLength; ++i)\n        if (children[i] instanceof SourceType)\n          ++typesLength;\n      \n      if (typesLength != 0) {\n        Statement[] statements = new Statement[typesLength];\n        int typeIndex = 0;\n        for (int i = 0; i < childrenLength; i++) {\n          if (children[i] instanceof SourceType) {\n            SourceType type = (SourceType) children[i];\n            TypeDeclaration localType = stc.convert(type, compilationResult);\n            if ((localType.bits & org.eclipse.jdt.internal.compiler.ast.ASTNode.IsAnonymousType) != 0) {\n              QualifiedAllocationExpression expression = new QualifiedAllocationExpression(localType);\n              expression.type = localType.superclass;\n              localType.superclass = null;\n              localType.superInterfaces = null;\n              localType.allocation = expression;\n              statements[typeIndex] = expression;\n            } else {\n              statements[typeIndex] = localType;\n            }\n            ++typeIndex;\n          }\n        }\n        method.statements = statements;\n      }\n    }\n\n    return method;\n  }\n}\n","old_contents":"\/*\n * Copyright 2005-2009 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.core;\n\nimport java.util.Locale;\nimport java.util.Map;\n\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.core.ICompilationUnit;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.core.dom.AST;\nimport org.eclipse.jdt.core.dom.ASTNode;\nimport org.eclipse.jdt.core.dom.ASTParser;\nimport org.eclipse.jdt.internal.compiler.CompilationResult;\nimport org.eclipse.jdt.internal.compiler.DefaultErrorHandlingPolicies;\nimport org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.AbstractVariableDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;\nimport org.eclipse.jdt.internal.compiler.env.AccessRestriction;\nimport org.eclipse.jdt.internal.compiler.env.IBinaryType;\nimport org.eclipse.jdt.internal.compiler.env.INameEnvironment;\nimport org.eclipse.jdt.internal.compiler.env.ISourceType;\nimport org.eclipse.jdt.internal.compiler.impl.CompilerOptions;\nimport org.eclipse.jdt.internal.compiler.impl.ITypeRequestor;\nimport org.eclipse.jdt.internal.compiler.lookup.LookupEnvironment;\nimport org.eclipse.jdt.internal.compiler.lookup.PackageBinding;\nimport org.eclipse.jdt.internal.compiler.parser.SourceTypeConverter;\nimport org.eclipse.jdt.internal.compiler.problem.DefaultProblemFactory;\nimport org.eclipse.jdt.internal.compiler.problem.ProblemReporter;\nimport org.eclipse.jdt.internal.core.DefaultWorkingCopyOwner;\nimport org.eclipse.jdt.internal.core.JavaProject;\nimport org.eclipse.jdt.internal.core.SourceType;\nimport org.eclipse.jdt.internal.core.SourceTypeElementInfo;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaCompilationUnit;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect DOMAspect {\n  pointcut internalCreateAST(ASTParser parser, IProgressMonitor monitor) :\n    execution(ASTNode ASTParser.internalCreateAST(IProgressMonitor)) &&\n    args(monitor) &&\n    target(parser);\n  \n  ASTNode around(ASTParser parser, IProgressMonitor monitor) :\n    internalCreateAST(parser, monitor) {\n    try {\n      if (!(parser.typeRoot instanceof IScalaCompilationUnit))\n        return proceed(parser, monitor);\n      \n      ICompilationUnit cu = (ICompilationUnit)parser.typeRoot;\n      org.eclipse.jdt.internal.compiler.env.ICompilationUnit sourceUnit = (org.eclipse.jdt.internal.compiler.env.ICompilationUnit)cu;\n      \n      IType[] topLevelTypes = cu.getTypes();\n      int length = topLevelTypes.length;\n      if (length == 0)\n        throw new IllegalStateException();\n      \n      SourceTypeElementInfo[] topLevelInfos = new SourceTypeElementInfo[length];\n      for (int i = 0; i < length; i++) {\n        topLevelInfos[i] = (SourceTypeElementInfo) ((SourceType)topLevelTypes[i]).getElementInfo();\n      }\n      char[] fileName = ((ISourceType)topLevelInfos[0]).getFileName();\n      \n      CompilationResult result = new CompilationResult(fileName, 1, 1, 100);\n\n      JavaProject javaProject = (JavaProject)cu.getJavaProject(); \n      Map compilerOptions0 = javaProject.getOptions(true);\n      CompilerOptions compilerOptions = new CompilerOptions(compilerOptions0);\n      compilerOptions.storeAnnotations = true;\n      \n      ProblemReporter problemReporter =\n        new ProblemReporter(\n          DefaultErrorHandlingPolicies.proceedWithAllProblems(),\n          compilerOptions,\n          new DefaultProblemFactory(Locale.getDefault()));\n      \n      int flags = SourceTypeConverter.FIELD_AND_METHOD | SourceTypeConverter.MEMBER_TYPE;\n      \n      CompilationUnitDeclaration unit =\n        SourceTypeConverter.buildCompilationUnit(topLevelInfos, flags, problemReporter, result);\n      \n      INameEnvironment ne = javaProject.newSearchableNameEnvironment(DefaultWorkingCopyOwner.PRIMARY);\n      final LookupEnvironment le = new LookupEnvironment(null, compilerOptions, problemReporter, ne);\n      ITypeRequestor typeRequestor = new ITypeRequestor() {\n        public void accept(IBinaryType binaryType, PackageBinding packageBinding, AccessRestriction accessRestriction) {\n          le.createBinaryTypeFrom(binaryType, packageBinding, accessRestriction);\n        }\n        public void accept(org.eclipse.jdt.internal.compiler.env.ICompilationUnit unit, AccessRestriction accessRestriction) {}\n        public void accept(ISourceType[] sourceType, PackageBinding packageBinding, AccessRestriction accessRestriction) {}\n      };\n      le.typeRequestor = typeRequestor;\n      \n      le.buildTypeBindings(unit, null);\n      le.completeTypeBindings();\n      fixTypes(unit.types);\n      \n      AST ast = AST.newAST(AST.JLS3);\n      ast.setFlag(AST.RESOLVED_BINDINGS);\n      ast.setDefaultNodeFlag(ASTNode.ORIGINAL);\n\n      org.eclipse.jdt.core.dom.ASTConverter converter =\n        new org.eclipse.jdt.core.dom.ASTConverter(compilerOptions0, true, monitor);\n      \n      org.eclipse.jdt.core.dom.BindingResolver resolver =\n        new org.eclipse.jdt.core.dom.DefaultBindingResolver(\n          unit.scope,\n          DefaultWorkingCopyOwner.PRIMARY,\n          new org.eclipse.jdt.core.dom.DefaultBindingResolver.BindingTables(),\n          true);\n      ast.setBindingResolver(resolver);\n      converter.setAST(ast);\n      \n      ASTNode node = converter.convert(unit, sourceUnit.getContents());\n      return node;\n    } catch (JavaModelException ex) {\n      throw new IllegalArgumentException(ex);\n    }\n  }\n  \n  private void fixTypes(TypeDeclaration[] types) {\n    for(int i = 0, iLimit = types.length; i < iLimit ; ++i) {\n      TypeDeclaration tpe = types[i];\n      tpe.binding.getAnnotationTagBits();\n      tpe.scope.buildFields();\n      tpe.scope.buildMethods();\n      fixFields(tpe.fields);\n      fixMethods(tpe.methods);\n      fixTypes(tpe.memberTypes);\n    }\n  }\n  \n  private void fixMethods(AbstractMethodDeclaration[] methods) {\n    if (methods == null)\n      return;\n    \n    for(int i = 0, iLimit = methods.length; i < iLimit; ++i) {\n      AbstractMethodDeclaration m = methods[i];\n      m.bodyStart = m.declarationSourceStart;\n      m.bodyEnd = m.declarationSourceEnd;\n      m.binding.getAnnotationTagBits();\n    }\n  }\n  \n  private void fixFields(AbstractVariableDeclaration[] fields) {\n    if (fields == null)\n      return;\n    \n    for(int i = 0, iLimit = fields.length; i < iLimit; ++i) {\n      AbstractVariableDeclaration f = fields[i];\n      f.declarationEnd = f.declarationSourceEnd;\n    }\n  }\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"de41715ae9b5f64deb29bbe11708506173051971","subject":"removed connection scope access","message":"removed connection scope access\n","repos":"palava\/palava-jpa","old_file":"src\/main\/java\/de\/cosmocode\/palava\/jpa\/TransactionAspect.aj","new_file":"src\/main\/java\/de\/cosmocode\/palava\/jpa\/TransactionAspect.aj","new_contents":"package de.cosmocode.palava.jpa;\n\nimport javax.persistence.EntityManager;\nimport javax.persistence.EntityTransaction;\nimport javax.persistence.PersistenceException;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Guice;\nimport com.google.inject.Inject;\nimport com.google.inject.Injector;\nimport com.google.inject.Provider;\n\npublic final aspect TransactionAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(TransactionAspect.class);\n\n    private Provider<EntityManager> currentManager;\n    \n    @Inject\n    public void setProvider(Provider<EntityManager> manager) {\n        this.currentManager = Preconditions.checkNotNull(manager, \"Manager\");\n    }\n    \n    pointcut createInjector(): call(Injector Guice.createInjector(..));\n    \n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    after() returning (Injector injector): createInjector() {\n        LOG.trace(\"Injecting members on {}\", this);\n        if (currentManager == null) {\n            injector.injectMembers(this);\n        } else {\n            throw new IllegalStateException(\"An injector has already been created\");\n        }\n    }\n\n    pointcut transactional(): execution(@Transactional * *.*(..));\n\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        final EntityManager manager = currentManager.get();\n        final EntityTransaction tx = manager.getTransaction();\n        final boolean localTx = !tx.isActive();\n        if (localTx) {\n            LOG.trace(\"Beginning automatic transaction\");\n            tx.begin();\n        } else {\n            LOG.trace(\"Transaction already active\");\n        }\n        \n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (RuntimeException e) {\n            LOG.error(\"Exception inside automatic transaction context\", e);\n            tx.rollback();\n            throw e;\n        }\n        \n        try {\n            if (localTx) {\n                tx.commit();\n                LOG.trace(\"Committed automatic transaction\");\n            }\n            return returnValue;\n        } catch (PersistenceException e) {\n            LOG.error(\"Commit in automatic transaction context failed\", e);\n            tx.rollback();\n            throw e;\n        }\n    }\n    \n}\n","old_contents":"package de.cosmocode.palava.jpa;\n\nimport javax.persistence.EntityManager;\nimport javax.persistence.EntityTransaction;\nimport javax.persistence.PersistenceException;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Guice;\nimport com.google.inject.Inject;\nimport com.google.inject.Injector;\nimport com.google.inject.Key;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.ipc.IpcConnection;\n\npublic final aspect TransactionAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(TransactionAspect.class);\n\n    private Provider<EntityManager> currentManager;\n    private Provider<IpcConnection> currentConnection;\n    \n    @Inject\n    public void setProvider(Provider<EntityManager> manager, Provider<IpcConnection> connection) {\n        this.currentManager = Preconditions.checkNotNull(manager, \"Manager\");\n        this.currentConnection = Preconditions.checkNotNull(connection, \"Connection\");\n    }\n    \n    pointcut createInjector(): call(Injector Guice.createInjector(..));\n    \n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    after() returning (Injector injector): createInjector() {\n        LOG.trace(\"Injecting members on {}\", this);\n        if (currentManager == null) {\n            injector.injectMembers(this);\n        } else {\n            throw new IllegalStateException(\"An injector has already been created\");\n        }\n    }\n\n    pointcut transactional(): execution(@Transactional * *.*(..));\n\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        final IpcConnection connection = currentConnection.get();\n        final Key<EntityManager> key = Key.get(EntityManager.class);\n        EntityManager manager = connection == null ? null : EntityManager.class.cast(connection.get(key));\n        if (manager == null) {\n            manager = currentManager.get();\n        }\n        final EntityTransaction tx = manager.getTransaction();\n        final boolean localTx = !tx.isActive();\n        if (localTx) {\n            LOG.trace(\"Beginning automatic transaction\");\n            tx.begin();\n        } else {\n            LOG.trace(\"Transaction already active\");\n        }\n        \n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (RuntimeException e) {\n            LOG.error(\"Exception inside automatic transaction context\", e);\n            tx.rollback();\n            throw e;\n        }\n        \n        try {\n            if (localTx) {\n                tx.commit();\n                LOG.trace(\"Committed automatic transaction\");\n            }\n            return returnValue;\n        } catch (PersistenceException e) {\n            LOG.error(\"Commit in automatic transaction context failed\", e);\n            tx.rollback();\n            throw e;\n        }\n    }\n    \n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"04bcd7752022a41f0b391bb7b9442ddaa3234cca","subject":"+ temporarily revert change ","message":"+ temporarily revert change \n","repos":"spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework","old_file":"org.springframework.aspects\/src\/main\/java\/org\/springframework\/cache\/aspectj\/AbstractCacheAspect.aj","new_file":"org.springframework.aspects\/src\/main\/java\/org\/springframework\/cache\/aspectj\/AbstractCacheAspect.aj","new_contents":"\/*\r\n * Copyright 2002-2011 the original author or authors.\r\n *\r\n * Licensed under the Apache License, Version 2.0 (the \"License\");\r\n * you may not use this file except in compliance with the License.\r\n * You may obtain a copy of the License at\r\n *\r\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\r\n *\r\n * Unless required by applicable law or agreed to in writing, software\r\n * distributed under the License is distributed on an \"AS IS\" BASIS,\r\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n * See the License for the specific language governing permissions and\r\n * limitations under the License.\r\n *\/\r\n\r\npackage org.springframework.cache.aspectj;\r\n\r\nimport java.lang.reflect.InvocationTargetException;\r\nimport java.lang.reflect.Method;\r\nimport java.util.concurrent.Callable;\r\n\r\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\r\nimport org.aspectj.lang.reflect.MethodSignature;\r\nimport org.springframework.cache.interceptor.CacheAspectSupport;\r\nimport org.springframework.cache.interceptor.CacheOperationSource;\r\n\r\n\/**\r\n * Abstract superaspect for AspectJ cache aspects. Concrete\r\n * subaspects will implement the <code>cacheMethodExecution()<\/code>\r\n * pointcut using a strategy such as Java 5 annotations.\r\n *\r\n * <p>Suitable for use inside or outside the Spring IoC container.\r\n * Set the \"cacheManager\" property appropriately, allowing\r\n * use of any cache implementation supported by Spring.\r\n *\r\n * <p><b>NB:<\/b> If a method implements an interface that is itself\r\n * cache annotated, the relevant Spring cache definition\r\n * will <i>not<\/i> be resolved.\r\n *\r\n * @author Costin Leau\r\n * @since 3.1\r\n *\/\r\npublic abstract aspect AbstractCacheAspect extends CacheAspectSupport {\r\n\r\n\tprotected AbstractCacheAspect() {\r\n\t}\r\n\r\n\t\/**\r\n\t * Construct object using the given caching metadata retrieval strategy.\r\n\t * @param cos {@link CacheOperationSource} implementation, retrieving Spring\r\n\t * cache metadata for each joinpoint.\r\n\t *\/\r\n\tprotected AbstractCacheAspect(CacheOperationSource... cos) {\r\n\t\tsetCacheOperationSources(cos);\r\n\t}\r\n\r\n\t@SuppressAjWarnings(\"adviceDidNotMatch\")\r\n\tObject around(final Object cachedObject) : cacheMethodExecution(cachedObject) {\r\n\t\tMethodSignature methodSignature = (MethodSignature) thisJoinPoint.getSignature();\r\n\t\tMethod method = methodSignature.getMethod();\r\n\r\n\t\tCallable<Object> ajInvocation = new Callable<Object>() {\r\n\t\t\tpublic Object call() {\r\n\t\t\t\treturn proceed(cachedObject);\r\n\t\t\t}\r\n\t\t};\r\n\r\n\t\ttry{\r\n\t\t\treturn execute(ajInvocation, thisJoinPoint.getTarget(), method, thisJoinPoint.getArgs());\t\r\n\t\t} catch (Exception ex){\r\n\t\t\tthrow new RuntimeException(\"Cannot cache target \", ex);\r\n\t\t}\r\n\t}\r\n\r\n\t\/**\r\n\t * Concrete subaspects must implement this pointcut, to identify\r\n\t * cached methods. For each selected joinpoint, {@link CacheOperationDefinition}\r\n\t * will be retrieved using Spring's {@link CacheOperationSource} interface.\r\n\t *\/\r\n\tprotected abstract pointcut cacheMethodExecution(Object cachedObject);\r\n\r\n}\r\n","old_contents":"\/*\r\n * Copyright 2002-2011 the original author or authors.\r\n *\r\n * Licensed under the Apache License, Version 2.0 (the \"License\");\r\n * you may not use this file except in compliance with the License.\r\n * You may obtain a copy of the License at\r\n *\r\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\r\n *\r\n * Unless required by applicable law or agreed to in writing, software\r\n * distributed under the License is distributed on an \"AS IS\" BASIS,\r\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n * See the License for the specific language governing permissions and\r\n * limitations under the License.\r\n *\/\r\n\r\npackage org.springframework.cache.aspectj;\r\n\r\nimport java.lang.reflect.Method;\r\nimport java.util.concurrent.Callable;\r\n\r\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\r\nimport org.aspectj.lang.reflect.MethodSignature;\r\nimport org.springframework.cache.interceptor.CacheAspectSupport;\r\nimport org.springframework.cache.interceptor.CacheOperationSource;\r\n\r\n\/**\r\n * Abstract superaspect for AspectJ cache aspects. Concrete\r\n * subaspects will implement the <code>cacheMethodExecution()<\/code>\r\n * pointcut using a strategy such as Java 5 annotations.\r\n *\r\n * <p>Suitable for use inside or outside the Spring IoC container.\r\n * Set the \"cacheManager\" property appropriately, allowing\r\n * use of any cache implementation supported by Spring.\r\n *\r\n * <p><b>NB:<\/b> If a method implements an interface that is itself\r\n * cache annotated, the relevant Spring cache definition\r\n * will <i>not<\/i> be resolved.\r\n *\r\n * @author Costin Leau\r\n * @since 3.1\r\n *\/\r\npublic abstract aspect AbstractCacheAspect extends CacheAspectSupport {\r\n\r\n\tprotected AbstractCacheAspect() {\r\n\t}\r\n\r\n\t\/**\r\n\t * Construct object using the given caching metadata retrieval strategy.\r\n\t * @param cos {@link CacheOperationSource} implementation, retrieving Spring\r\n\t * cache metadata for each joinpoint.\r\n\t *\/\r\n\tprotected AbstractCacheAspect(CacheOperationSource... cos) {\r\n\t\tsetCacheOperationSources(cos);\r\n\t}\r\n\r\n\t@SuppressAjWarnings(\"adviceDidNotMatch\")\r\n\tObject around(final Object cachedObject) : cacheMethodExecution(cachedObject){\r\n\t\tMethodSignature methodSignature = (MethodSignature) thisJoinPoint.getSignature();\r\n\t\tMethod method = methodSignature.getMethod();\r\n\r\n\t\tCallable<Object> ajInvocation = new Callable<Object>() {\r\n\t\t\tpublic Object call() {\r\n\t\t\t\treturn proceed(cachedObject);\r\n\t\t\t}\r\n\t\t};\r\n\r\n\t\treturn execute(ajInvocation, thisJoinPoint.getTarget(), method, thisJoinPoint.getArgs());\r\n\t}\r\n\r\n\t\/**\r\n\t * Concrete subaspects must implement this pointcut, to identify\r\n\t * cached methods. For each selected joinpoint, {@link CacheOperationDefinition}\r\n\t * will be retrieved using Spring's {@link CacheOperationSource} interface.\r\n\t *\/\r\n\tprotected abstract pointcut cacheMethodExecution(Object cachedObject);\r\n\r\n}\r\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"363f927828fad89b668a30c4a6a2570c085ca966","subject":"Fixed #3114.","message":"Fixed #3114.\n\ngit-svn-id: f4ecfe233223879a4a16cd7937f11b5152963d8e@21046 5e8d7ff9-d8ef-0310-90f0-a4852d11357a\n","repos":"aleksi-lukkarinen\/scala-ide,andrey-ilinykh\/scala-ide,aleksi-lukkarinen\/scala-ide,Duhemm\/scala-ide,Duhemm\/scala-ide,pilipolio\/scala-ide,stephenh\/scala-ide,Kwestor\/scala-ide,andrey-ilinykh\/scala-ide,Kwestor\/scala-ide,sschaef\/scala-ide,dragos\/scala-ide,wpopielarski\/scala-ide,wpopielarski\/scala-ide,scala-ide\/scala-ide,mlangc\/scala-ide,stephenh\/scala-ide,dragos\/scala-ide,scala-ide\/scala-ide,aleksi-lukkarinen\/scala-ide,Kwestor\/scala-ide,sschaef\/scala-ide,Duhemm\/scala-ide,sschaef\/scala-ide,mlangc\/scala-ide,pilipolio\/scala-ide,sschaef\/scala-ide,dragos\/scala-ide,romanowski\/scala-ide,mlangc\/scala-ide,Duhemm\/scala-ide,pilipolio\/scala-ide,wpopielarski\/scala-ide,aleksi-lukkarinen\/scala-ide,scala-ide\/scala-ide,andrey-ilinykh\/scala-ide,romanowski\/scala-ide,stephenh\/scala-ide,scala-ide\/scala-ide,romanowski\/scala-ide,wpopielarski\/scala-ide,romanowski\/scala-ide,andrey-ilinykh\/scala-ide,stephenh\/scala-ide,dragos\/scala-ide,pilipolio\/scala-ide,Kwestor\/scala-ide,mlangc\/scala-ide","old_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/cfprovider\/ClassFileProviderAspect.aj","new_file":"org.scala-ide.sdt.aspects\/src\/scala\/tools\/eclipse\/contribution\/weaving\/jdt\/cfprovider\/ClassFileProviderAspect.aj","new_contents":"\/*\n * Copyright 2005-2010 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.cfprovider;\n\nimport java.util.HashSet;\n\nimport org.eclipse.core.filebuffers.FileBuffers;\nimport org.eclipse.core.filebuffers.ITextFileBuffer;\nimport org.eclipse.core.filebuffers.ITextFileBufferManager;\nimport org.eclipse.core.filebuffers.LocationKind;\nimport org.eclipse.core.resources.IResource;\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.core.IBuffer;\nimport org.eclipse.jdt.core.IClassFile;\nimport org.eclipse.jdt.core.IImportDeclaration;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IOpenable;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.ITypeRoot;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.core.dom.CompilationUnit;\nimport org.eclipse.jdt.core.search.TypeNameMatch;\nimport org.eclipse.jdt.internal.compiler.CompilationResult;\nimport org.eclipse.jdt.internal.compiler.ast.ASTNode;\nimport org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.ImportReference;\nimport org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.TypeReference;\nimport org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;\nimport org.eclipse.jdt.internal.compiler.env.IBinaryType;\nimport org.eclipse.jdt.internal.compiler.env.ICompilationUnit;\nimport org.eclipse.jdt.internal.compiler.env.IGenericType;\nimport org.eclipse.jdt.internal.compiler.env.ISourceImport;\nimport org.eclipse.jdt.internal.compiler.env.ISourceType;\nimport org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer;\nimport org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding;\nimport org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding;\nimport org.eclipse.jdt.internal.compiler.parser.Parser;\nimport org.eclipse.jdt.internal.compiler.parser.SourceTypeConverter;\nimport org.eclipse.jdt.internal.core.BinaryType;\nimport org.eclipse.jdt.internal.core.ClassFile;\nimport org.eclipse.jdt.internal.core.CompilationUnitElementInfo;\nimport org.eclipse.jdt.internal.core.ImportDeclaration;\nimport org.eclipse.jdt.internal.core.JavaElement;\nimport org.eclipse.jdt.internal.core.NameLookup;\nimport org.eclipse.jdt.internal.core.Openable;\nimport org.eclipse.jdt.internal.core.PackageFragment;\nimport org.eclipse.jdt.internal.core.SearchableEnvironment;\nimport org.eclipse.jdt.internal.core.SourceMapper;\nimport org.eclipse.jdt.internal.core.SourceType;\nimport org.eclipse.jdt.internal.core.SourceTypeElementInfo;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyResolver;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyType;\nimport org.eclipse.jdt.internal.core.util.Util;\nimport org.eclipse.jdt.internal.corext.util.OpenTypeHistory;\nimport org.eclipse.jdt.internal.ui.filters.InnerClassFilesFilter;\nimport org.eclipse.jdt.ui.SharedASTProvider;\nimport org.eclipse.jface.viewers.Viewer;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaClassFile;\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaElement;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect ClassFileProviderAspect {\n\n  pointcut classFileCreations(PackageFragment parent, String name) : \n    call(protected ClassFile.new(PackageFragment, String)) &&\n    within(org.eclipse.jdt..*) &&\n    args(parent, name);\n  \n  pointcut getTypeName(ClassFile cf) :\n    execution(public String ClassFile.getTypeName()) &&\n    target(cf);\n\n  pointcut getType(ClassFile cf) :\n    call(public IType ClassFile.getType()) &&\n    target(cf);\n  \n  pointcut mapSource() :\n    execution(IBuffer ClassFile.mapSource(SourceMapper, IBinaryType)) &&\n    target(IScalaClassFile);\n  \n  pointcut mapSource2() :\n    execution(void SourceMapper.mapSource(IType, char[], IBinaryType));\n  \n  pointcut getSourceFileName(BinaryType bt) :\n    execution(String BinaryType.getSourceFileName(IBinaryType)) &&\n    target(bt);\n  \n  pointcut select(Viewer viewer, Object parentElement, Object element) :\n    execution(boolean InnerClassFilesFilter.select(Viewer, Object, Object)) &&\n    args(viewer, parentElement, element);\n  \n  pointcut getChildren(BinaryType bt) :\n    execution(IJavaElement[] BinaryType.getChildren()) &&\n    target(bt);\n  \n  pointcut getAST(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) : \n    execution(CompilationUnit SharedASTProvider.getAST(ITypeRoot, SharedASTProvider.WAIT_FLAG, IProgressMonitor)) &&\n    args(element, waitFlag, progressMonitor);\n  \n  pointcut resolve(HierarchyResolver hr, IGenericType suppliedType) :\n    execution(void HierarchyResolver.resolve(IGenericType)) &&\n    target(hr) &&\n    args(suppliedType);\n  \n  pointcut remember(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    execution(void HierarchyResolver.remember(IType, ReferenceBinding)) &&\n    target(hr) &&\n    args(type, typeBinding);\n  \n  pointcut acceptType(IType type, int acceptFlags, boolean isSourceType) :\n    execution(boolean NameLookup.acceptType(IType, int, boolean)) &&\n    args(type, acceptFlags, isSourceType);\n  \n  pointcut find(SearchableEnvironment se, String typeName, String packageName) :\n    execution(NameEnvironmentAnswer find(String, String)) &&\n    target(se) &&\n    args(typeName, packageName);\n  \n  pointcut convert(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) :\n    execution(CompilationUnitDeclaration SourceTypeConverter.convert(ISourceType[], CompilationResult)) &&\n    target(stc) &&\n    args(sourceTypes, compilationResult);\n  \n  pointcut getAncestor(JavaElement je, int ancestorType) :\n    execution(IJavaElement JavaElement.getAncestor(int)) &&\n    target(je) &&\n    args(ancestorType);\n  \n  pointcut isContainerDirty(TypeNameMatch match) :\n    execution(boolean OpenTypeHistory.isContainerDirty(TypeNameMatch)) &&\n    args(match);\n  \n  ClassFile around(PackageFragment parent, String name) : \n    classFileCreations(parent, name) {\n\n    ClassFile javaClassFile = proceed(parent, name);\n    byte[] bytes;\n    \n    try {\n      bytes = javaClassFile.getBytes();\n    } catch(Throwable t) {\n      return javaClassFile; \n    }\n    \n    for (IClassFileProvider provider : ClassFileProviderRegistry.getInstance().getProviders()) {\n      ClassFile cf = provider.create(bytes, parent, name);\n      if (cf != null)\n        return cf;\n    }\n    \n    return javaClassFile;\n  }\n  \n  void around() :\n    mapSource2() &&\n    cflow(mapSource()) {\n    return;\n  }\n  \n  IType around(ClassFile cf) :\n    getType(cf) &&\n    cflow(mapSource()) {\n    if (cf.binaryType == null)\n      cf.binaryType = new BinaryType(cf, cf.getTypeName());\n    return cf.binaryType;\n  }\n  \n  String around(ClassFile cf) :\n    getTypeName(cf) {\n    if(cf instanceof IScalaClassFile) {\n      int lastDollar = cf.name.lastIndexOf('$');\n      return (lastDollar == -1 || lastDollar == cf.name.length()-1) ? cf.name : Util.localTypeName(cf.name, lastDollar, cf.name.length());\n    } else\n      return proceed(cf);\n  }\n  \n  boolean around(Viewer viewer, Object parentElement, Object element) :\n    select(viewer, parentElement, element) {\n    if (element instanceof IScalaClassFile) {\n      IClassFile classFile = (IClassFile) element;\n      String name = classFile.getElementName(); \n      int dollarIndex = name.indexOf('$');\n      return dollarIndex == -1 || dollarIndex == name.length()-7; \/\/ Trailing '$' implies object rather than inner class \n    }\n    return proceed(viewer, parentElement, element);\n  }\n  \n  IJavaElement[] around(BinaryType bt) throws JavaModelException :\n    getChildren(bt) && \n    target(BinaryType) {\n    ClassFile cf = (ClassFile)bt.parent;\n    if (cf instanceof IScalaClassFile)\n      return cf.getChildren();\n    else\n      return proceed(bt);\n  }\n  \n  CompilationUnit around(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) :\n    getAST(element, waitFlag, progressMonitor) {\n      if (element instanceof IScalaElement)\n        return null;\n      else\n        return proceed(element, waitFlag, progressMonitor);\n  }\n  \n  void around(HierarchyResolver hr, IGenericType suppliedType) :\n    resolve(hr, suppliedType) {\n    if (!suppliedType.isBinaryType()) {\n      IType tpe = ((SourceTypeElementInfo)suppliedType).getHandle();\n      IClassFile cf = tpe.getClassFile();\n      if (cf instanceof IScalaClassFile) {\n        hr.resolve(new Openable[]{(Openable)cf}, new HashSet(), null);\n        return;\n      }\n    }\n      \n    proceed(hr, suppliedType);\n  }\n  \n  void around(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    remember(hr, type, typeBinding) {\n    if (((IOpenable)type.getCompilationUnit()).isOpen()) {\n      try {\n        IGenericType genericType = (IGenericType)((JavaElement)type).getElementInfo();\n        hr.remember(genericType, typeBinding);\n      } catch (JavaModelException e) {\n        \/\/ cannot happen since element is open\n        return;\n      }\n    } else {\n      if (typeBinding == null) return;\n\n      TypeDeclaration typeDeclaration = ((SourceTypeBinding)typeBinding).scope.referenceType();\n\n      \/\/ simple super class name\n      char[] superclassName = null;\n      TypeReference superclass;\n      if ((typeDeclaration.bits & ASTNode.IsAnonymousType) != 0) {\n        superclass = typeDeclaration.allocation.type;\n      } else {\n        superclass = typeDeclaration.superclass;\n      }\n      if (superclass != null) {\n        char[][] typeName = superclass.getTypeName();\n        superclassName = typeName == null ? null : typeName[typeName.length-1];\n      }\n\n      \/\/ simple super interface names\n      char[][] superInterfaceNames = null;\n      TypeReference[] superInterfaces = typeDeclaration.superInterfaces;\n      if (superInterfaces != null) {\n        int length = superInterfaces.length;\n        superInterfaceNames = new char[length][];\n        for (int i = 0; i < length; i++) {\n          TypeReference superInterface = superInterfaces[i];\n          char[][] typeName = superInterface.getTypeName();\n          superInterfaceNames[i] = typeName[typeName.length-1];\n        }\n      }\n\n      HierarchyType hierarchyType = new HierarchyType(\n        type,\n        typeDeclaration.name,\n        typeDeclaration.binding.modifiers,\n        superclassName,\n        superInterfaceNames);\n      hr.remember(hierarchyType, typeDeclaration.binding);\n    }\n  }\n  \n  String around(BinaryType bt) :\n    getSourceFileName(bt) {\n    IJavaElement parent = bt.getParent(); \n    if (parent instanceof IScalaClassFile)\n      return ((IScalaClassFile)parent).getSourceFileName();\n    else\n      return proceed(bt);\n  }\n  \n  boolean around(IType type, int acceptFlags, boolean isSourceType) :\n    acceptType(type, acceptFlags, isSourceType) {\n    if (!isSourceType && (type instanceof SourceType)) {\n      IJavaElement parent = type.getParent(); \n      if (parent instanceof IScalaClassFile)\n        return proceed(type, acceptFlags, true);\n    }\n    \n    return proceed(type, acceptFlags, isSourceType);\n  }\n  \n  CompilationUnitDeclaration around(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) throws JavaModelException :\n    convert(stc, sourceTypes, compilationResult) {\n    stc.unit = new CompilationUnitDeclaration(stc.problemReporter, compilationResult, 0);\n    \/\/ not filled at this point\n\n    if (sourceTypes.length == 0) return stc.unit;\n    SourceTypeElementInfo topLevelTypeInfo = (SourceTypeElementInfo) sourceTypes[0];\n    org.eclipse.jdt.core.ICompilationUnit cuHandle = topLevelTypeInfo.getHandle().getCompilationUnit();\n    stc.cu = (ICompilationUnit) cuHandle;\n\n    CompilationUnitElementInfo cuei = null;\n    Object info = ((JavaElement)stc.cu).getElementInfo();\n    if (info instanceof CompilationUnitElementInfo)\n      cuei = (CompilationUnitElementInfo)info;\n    \n    \n    if (stc.has1_5Compliance && cuei != null && cuei.annotationNumber > 10) { \/\/ experimental value\n      \/\/ if more than 10 annotations, diet parse as this is faster\n      return new Parser(stc.problemReporter, true).dietParse(stc.cu, compilationResult);\n    }\n\n    \/* only positions available *\/\n    int start = topLevelTypeInfo.getNameSourceStart();\n    int end = topLevelTypeInfo.getNameSourceEnd();\n\n    \/* convert package and imports *\/\n    String[] packageName = ((PackageFragment) cuHandle.getParent()).names;\n    if (packageName.length > 0)\n      \/\/ if its null then it is defined in the default package\n      stc.unit.currentPackage =\n        stc.createImportReference(packageName, start, end, false, ClassFileConstants.AccDefault);\n    IImportDeclaration[] importDeclarations = topLevelTypeInfo.getHandle().getCompilationUnit().getImports();\n    int importCount = importDeclarations.length;\n    stc.unit.imports = new ImportReference[importCount];\n    for (int i = 0; i < importCount; i++) {\n      ImportDeclaration importDeclaration = (ImportDeclaration) importDeclarations[i];\n      ISourceImport sourceImport = (ISourceImport) importDeclaration.getElementInfo();\n      String nameWithoutStar = importDeclaration.getNameWithoutStar();\n      stc.unit.imports[i] = stc.createImportReference(\n        Util.splitOn('.', nameWithoutStar, 0, nameWithoutStar.length()),\n        sourceImport.getDeclarationSourceStart(),\n        sourceImport.getDeclarationSourceEnd(),\n        importDeclaration.isOnDemand(),\n        sourceImport.getModifiers());\n    }\n    \/* convert type(s) *\/\n    try {\n      int typeCount = sourceTypes.length;\n      final TypeDeclaration[] types = new TypeDeclaration[typeCount];\n      \/*\n       * We used a temporary types collection to prevent this.unit.types from being null during a call to\n       * convert(...) when the source is syntactically incorrect and the parser is flushing the unit's types.\n       * See https:\/\/bugs.eclipse.org\/bugs\/show_bug.cgi?id=97466\n       *\/\n      for (int i = 0; i < typeCount; i++) {\n        SourceTypeElementInfo typeInfo = (SourceTypeElementInfo) sourceTypes[i];\n        types[i] = stc.convert((SourceType) typeInfo.getHandle(), compilationResult);\n      }\n      stc.unit.types = types;\n      return stc.unit;\n    } catch (SourceTypeConverter.AnonymousMemberFound e) {\n      return new Parser(stc.problemReporter, true).parse(stc.cu, compilationResult);\n    }\n  }\n  \n  IJavaElement around(JavaElement je, int ancestorType) :\n    getAncestor(je, ancestorType) {\n    IJavaElement element = je;\n    while (element != null) {\n      if (element.getElementType() == ancestorType)\n        return element;\n      else if (element instanceof IScalaClassFile && ancestorType == IJavaElement.COMPILATION_UNIT)\n        return ((JavaElement)element).getCompilationUnit();\n      element= element.getParent();\n    }\n    return null;\n  }\n\n  boolean around(TypeNameMatch match) :\n    isContainerDirty(match) {\n    org.eclipse.jdt.core.ICompilationUnit cu = match.getType().getCompilationUnit();\n    if (cu == null) {\n      return false;\n    }\n    IResource resource= cu.getResource();\n    if (resource == null)\n      return false;\n    \n    ITextFileBufferManager manager= FileBuffers.getTextFileBufferManager();\n    ITextFileBuffer textFileBuffer= manager.getTextFileBuffer(resource.getFullPath(), LocationKind.IFILE);\n    if (textFileBuffer != null) {\n      return textFileBuffer.isDirty();\n    }\n    return false;\n  }\n}\n","old_contents":"\/*\n * Copyright 2005-2010 LAMP\/EPFL\n *\/\n\/\/ $Id$\n\npackage scala.tools.eclipse.contribution.weaving.jdt.cfprovider;\n\nimport java.util.HashSet;\n\nimport org.eclipse.core.filebuffers.FileBuffers;\nimport org.eclipse.core.filebuffers.ITextFileBuffer;\nimport org.eclipse.core.filebuffers.ITextFileBufferManager;\nimport org.eclipse.core.filebuffers.LocationKind;\nimport org.eclipse.core.resources.IResource;\nimport org.eclipse.core.runtime.IProgressMonitor;\nimport org.eclipse.jdt.core.IBuffer;\nimport org.eclipse.jdt.core.IClassFile;\nimport org.eclipse.jdt.core.IImportDeclaration;\nimport org.eclipse.jdt.core.IJavaElement;\nimport org.eclipse.jdt.core.IOpenable;\nimport org.eclipse.jdt.core.IType;\nimport org.eclipse.jdt.core.ITypeRoot;\nimport org.eclipse.jdt.core.JavaModelException;\nimport org.eclipse.jdt.core.dom.CompilationUnit;\nimport org.eclipse.jdt.core.search.TypeNameMatch;\nimport org.eclipse.jdt.internal.compiler.CompilationResult;\nimport org.eclipse.jdt.internal.compiler.ast.ASTNode;\nimport org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.ImportReference;\nimport org.eclipse.jdt.internal.compiler.ast.TypeDeclaration;\nimport org.eclipse.jdt.internal.compiler.ast.TypeReference;\nimport org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants;\nimport org.eclipse.jdt.internal.compiler.env.IBinaryType;\nimport org.eclipse.jdt.internal.compiler.env.ICompilationUnit;\nimport org.eclipse.jdt.internal.compiler.env.IGenericType;\nimport org.eclipse.jdt.internal.compiler.env.ISourceImport;\nimport org.eclipse.jdt.internal.compiler.env.ISourceType;\nimport org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer;\nimport org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding;\nimport org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding;\nimport org.eclipse.jdt.internal.compiler.parser.Parser;\nimport org.eclipse.jdt.internal.compiler.parser.SourceTypeConverter;\nimport org.eclipse.jdt.internal.core.BinaryType;\nimport org.eclipse.jdt.internal.core.ClassFile;\nimport org.eclipse.jdt.internal.core.CompilationUnitElementInfo;\nimport org.eclipse.jdt.internal.core.ImportDeclaration;\nimport org.eclipse.jdt.internal.core.JavaElement;\nimport org.eclipse.jdt.internal.core.NameLookup;\nimport org.eclipse.jdt.internal.core.Openable;\nimport org.eclipse.jdt.internal.core.PackageFragment;\nimport org.eclipse.jdt.internal.core.SearchableEnvironment;\nimport org.eclipse.jdt.internal.core.SourceMapper;\nimport org.eclipse.jdt.internal.core.SourceType;\nimport org.eclipse.jdt.internal.core.SourceTypeElementInfo;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyResolver;\nimport org.eclipse.jdt.internal.core.hierarchy.HierarchyType;\nimport org.eclipse.jdt.internal.core.util.Util;\nimport org.eclipse.jdt.internal.corext.util.OpenTypeHistory;\nimport org.eclipse.jdt.internal.ui.filters.InnerClassFilesFilter;\nimport org.eclipse.jdt.ui.SharedASTProvider;\nimport org.eclipse.jface.viewers.Viewer;\n\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaClassFile;\nimport scala.tools.eclipse.contribution.weaving.jdt.IScalaElement;\n\n@SuppressWarnings(\"restriction\")\npublic privileged aspect ClassFileProviderAspect {\n\n  pointcut classFileCreations(PackageFragment parent, String name) : \n    call(protected ClassFile.new(PackageFragment, String)) &&\n    within(org.eclipse.jdt..*) &&\n    args(parent, name);\n  \n  pointcut getTypeName(ClassFile cf) :\n    execution(public String ClassFile.getTypeName()) &&\n    target(cf);\n  \n  pointcut mapSource() :\n    execution(IBuffer ClassFile.mapSource(SourceMapper, IBinaryType)) &&\n    target(IScalaClassFile);\n  \n  pointcut mapSource2() :\n    execution(void SourceMapper.mapSource(IType, char[], IBinaryType));\n  \n  pointcut getSourceFileName(BinaryType bt) :\n    execution(String BinaryType.getSourceFileName(IBinaryType)) &&\n    target(bt);\n  \n  pointcut select(Viewer viewer, Object parentElement, Object element) :\n    execution(boolean InnerClassFilesFilter.select(Viewer, Object, Object)) &&\n    args(viewer, parentElement, element);\n  \n  pointcut getChildren(BinaryType bt) :\n    execution(IJavaElement[] BinaryType.getChildren()) &&\n    target(bt);\n  \n  pointcut getAST(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) : \n    execution(CompilationUnit SharedASTProvider.getAST(ITypeRoot, SharedASTProvider.WAIT_FLAG, IProgressMonitor)) &&\n    args(element, waitFlag, progressMonitor);\n  \n  pointcut resolve(HierarchyResolver hr, IGenericType suppliedType) :\n    execution(void HierarchyResolver.resolve(IGenericType)) &&\n    target(hr) &&\n    args(suppliedType);\n  \n  pointcut remember(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    execution(void HierarchyResolver.remember(IType, ReferenceBinding)) &&\n    target(hr) &&\n    args(type, typeBinding);\n  \n  pointcut acceptType(IType type, int acceptFlags, boolean isSourceType) :\n    execution(boolean NameLookup.acceptType(IType, int, boolean)) &&\n    args(type, acceptFlags, isSourceType);\n  \n  pointcut find(SearchableEnvironment se, String typeName, String packageName) :\n    execution(NameEnvironmentAnswer find(String, String)) &&\n    target(se) &&\n    args(typeName, packageName);\n  \n  pointcut convert(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) :\n    execution(CompilationUnitDeclaration SourceTypeConverter.convert(ISourceType[], CompilationResult)) &&\n    target(stc) &&\n    args(sourceTypes, compilationResult);\n  \n  pointcut getAncestor(JavaElement je, int ancestorType) :\n    execution(IJavaElement JavaElement.getAncestor(int)) &&\n    target(je) &&\n    args(ancestorType);\n  \n  pointcut isContainerDirty(TypeNameMatch match) :\n    execution(boolean OpenTypeHistory.isContainerDirty(TypeNameMatch)) &&\n    args(match);\n  \n  ClassFile around(PackageFragment parent, String name) : \n    classFileCreations(parent, name) {\n\n    ClassFile javaClassFile = proceed(parent, name);\n    byte[] bytes;\n    \n    try {\n      bytes = javaClassFile.getBytes();\n    } catch(Throwable t) {\n      return javaClassFile; \n    }\n    \n    for (IClassFileProvider provider : ClassFileProviderRegistry.getInstance().getProviders()) {\n      ClassFile cf = provider.create(bytes, parent, name);\n      if (cf != null)\n        return cf;\n    }\n    \n    return javaClassFile;\n  }\n  \n  void around() :\n    mapSource2() &&\n    cflow(mapSource()) {\n    return;\n  }\n  \n  String around(ClassFile cf) :\n    getTypeName(cf) {\n    if(cf instanceof IScalaClassFile) {\n      int lastDollar = cf.name.lastIndexOf('$');\n      return (lastDollar == -1 || lastDollar == cf.name.length()-1) ? cf.name : Util.localTypeName(cf.name, lastDollar, cf.name.length());\n    } else\n      return proceed(cf);\n  }\n  \n  boolean around(Viewer viewer, Object parentElement, Object element) :\n    select(viewer, parentElement, element) {\n    if (element instanceof IScalaClassFile) {\n      IClassFile classFile = (IClassFile) element;\n      String name = classFile.getElementName(); \n      int dollarIndex = name.indexOf('$');\n      return dollarIndex == -1 || dollarIndex == name.length()-7; \/\/ Trailing '$' implies object rather than inner class \n    }\n    return proceed(viewer, parentElement, element);\n  }\n  \n  IJavaElement[] around(BinaryType bt) throws JavaModelException :\n    getChildren(bt) && \n    target(BinaryType) {\n    ClassFile cf = (ClassFile)bt.parent;\n    if (cf instanceof IScalaClassFile)\n      return cf.getChildren();\n    else\n      return proceed(bt);\n  }\n  \n  CompilationUnit around(ITypeRoot element, SharedASTProvider.WAIT_FLAG waitFlag, IProgressMonitor progressMonitor) :\n    getAST(element, waitFlag, progressMonitor) {\n      if (element instanceof IScalaElement)\n        return null;\n      else\n        return proceed(element, waitFlag, progressMonitor);\n  }\n  \n  void around(HierarchyResolver hr, IGenericType suppliedType) :\n    resolve(hr, suppliedType) {\n    if (!suppliedType.isBinaryType()) {\n      IType tpe = ((SourceTypeElementInfo)suppliedType).getHandle();\n      IClassFile cf = tpe.getClassFile();\n      if (cf instanceof IScalaClassFile) {\n        hr.resolve(new Openable[]{(Openable)cf}, new HashSet(), null);\n        return;\n      }\n    }\n      \n    proceed(hr, suppliedType);\n  }\n  \n  void around(HierarchyResolver hr, IType type, ReferenceBinding typeBinding) :\n    remember(hr, type, typeBinding) {\n    if (((IOpenable)type.getCompilationUnit()).isOpen()) {\n      try {\n        IGenericType genericType = (IGenericType)((JavaElement)type).getElementInfo();\n        hr.remember(genericType, typeBinding);\n      } catch (JavaModelException e) {\n        \/\/ cannot happen since element is open\n        return;\n      }\n    } else {\n      if (typeBinding == null) return;\n\n      TypeDeclaration typeDeclaration = ((SourceTypeBinding)typeBinding).scope.referenceType();\n\n      \/\/ simple super class name\n      char[] superclassName = null;\n      TypeReference superclass;\n      if ((typeDeclaration.bits & ASTNode.IsAnonymousType) != 0) {\n        superclass = typeDeclaration.allocation.type;\n      } else {\n        superclass = typeDeclaration.superclass;\n      }\n      if (superclass != null) {\n        char[][] typeName = superclass.getTypeName();\n        superclassName = typeName == null ? null : typeName[typeName.length-1];\n      }\n\n      \/\/ simple super interface names\n      char[][] superInterfaceNames = null;\n      TypeReference[] superInterfaces = typeDeclaration.superInterfaces;\n      if (superInterfaces != null) {\n        int length = superInterfaces.length;\n        superInterfaceNames = new char[length][];\n        for (int i = 0; i < length; i++) {\n          TypeReference superInterface = superInterfaces[i];\n          char[][] typeName = superInterface.getTypeName();\n          superInterfaceNames[i] = typeName[typeName.length-1];\n        }\n      }\n\n      HierarchyType hierarchyType = new HierarchyType(\n        type,\n        typeDeclaration.name,\n        typeDeclaration.binding.modifiers,\n        superclassName,\n        superInterfaceNames);\n      hr.remember(hierarchyType, typeDeclaration.binding);\n    }\n  }\n  \n  String around(BinaryType bt) :\n    getSourceFileName(bt) {\n    IJavaElement parent = bt.getParent(); \n    if (parent instanceof IScalaClassFile)\n      return ((IScalaClassFile)parent).getSourceFileName();\n    else\n      return proceed(bt);\n  }\n  \n  boolean around(IType type, int acceptFlags, boolean isSourceType) :\n    acceptType(type, acceptFlags, isSourceType) {\n    if (!isSourceType && (type instanceof SourceType)) {\n      IJavaElement parent = type.getParent(); \n      if (parent instanceof IScalaClassFile)\n        return proceed(type, acceptFlags, true);\n    }\n    \n    return proceed(type, acceptFlags, isSourceType);\n  }\n  \n  CompilationUnitDeclaration around(SourceTypeConverter stc, ISourceType[] sourceTypes, CompilationResult compilationResult) throws JavaModelException :\n    convert(stc, sourceTypes, compilationResult) {\n    stc.unit = new CompilationUnitDeclaration(stc.problemReporter, compilationResult, 0);\n    \/\/ not filled at this point\n\n    if (sourceTypes.length == 0) return stc.unit;\n    SourceTypeElementInfo topLevelTypeInfo = (SourceTypeElementInfo) sourceTypes[0];\n    org.eclipse.jdt.core.ICompilationUnit cuHandle = topLevelTypeInfo.getHandle().getCompilationUnit();\n    stc.cu = (ICompilationUnit) cuHandle;\n\n    CompilationUnitElementInfo cuei = null;\n    Object info = ((JavaElement)stc.cu).getElementInfo();\n    if (info instanceof CompilationUnitElementInfo)\n      cuei = (CompilationUnitElementInfo)info;\n    \n    \n    if (stc.has1_5Compliance && cuei != null && cuei.annotationNumber > 10) { \/\/ experimental value\n      \/\/ if more than 10 annotations, diet parse as this is faster\n      return new Parser(stc.problemReporter, true).dietParse(stc.cu, compilationResult);\n    }\n\n    \/* only positions available *\/\n    int start = topLevelTypeInfo.getNameSourceStart();\n    int end = topLevelTypeInfo.getNameSourceEnd();\n\n    \/* convert package and imports *\/\n    String[] packageName = ((PackageFragment) cuHandle.getParent()).names;\n    if (packageName.length > 0)\n      \/\/ if its null then it is defined in the default package\n      stc.unit.currentPackage =\n        stc.createImportReference(packageName, start, end, false, ClassFileConstants.AccDefault);\n    IImportDeclaration[] importDeclarations = topLevelTypeInfo.getHandle().getCompilationUnit().getImports();\n    int importCount = importDeclarations.length;\n    stc.unit.imports = new ImportReference[importCount];\n    for (int i = 0; i < importCount; i++) {\n      ImportDeclaration importDeclaration = (ImportDeclaration) importDeclarations[i];\n      ISourceImport sourceImport = (ISourceImport) importDeclaration.getElementInfo();\n      String nameWithoutStar = importDeclaration.getNameWithoutStar();\n      stc.unit.imports[i] = stc.createImportReference(\n        Util.splitOn('.', nameWithoutStar, 0, nameWithoutStar.length()),\n        sourceImport.getDeclarationSourceStart(),\n        sourceImport.getDeclarationSourceEnd(),\n        importDeclaration.isOnDemand(),\n        sourceImport.getModifiers());\n    }\n    \/* convert type(s) *\/\n    try {\n      int typeCount = sourceTypes.length;\n      final TypeDeclaration[] types = new TypeDeclaration[typeCount];\n      \/*\n       * We used a temporary types collection to prevent this.unit.types from being null during a call to\n       * convert(...) when the source is syntactically incorrect and the parser is flushing the unit's types.\n       * See https:\/\/bugs.eclipse.org\/bugs\/show_bug.cgi?id=97466\n       *\/\n      for (int i = 0; i < typeCount; i++) {\n        SourceTypeElementInfo typeInfo = (SourceTypeElementInfo) sourceTypes[i];\n        types[i] = stc.convert((SourceType) typeInfo.getHandle(), compilationResult);\n      }\n      stc.unit.types = types;\n      return stc.unit;\n    } catch (SourceTypeConverter.AnonymousMemberFound e) {\n      return new Parser(stc.problemReporter, true).parse(stc.cu, compilationResult);\n    }\n  }\n  \n  IJavaElement around(JavaElement je, int ancestorType) :\n    getAncestor(je, ancestorType) {\n    IJavaElement element = je;\n    while (element != null) {\n      if (element.getElementType() == ancestorType)\n        return element;\n      else if (element instanceof IScalaClassFile && ancestorType == IJavaElement.COMPILATION_UNIT)\n        return ((JavaElement)element).getCompilationUnit();\n      element= element.getParent();\n    }\n    return null;\n  }\n\n  boolean around(TypeNameMatch match) :\n    isContainerDirty(match) {\n    org.eclipse.jdt.core.ICompilationUnit cu = match.getType().getCompilationUnit();\n    if (cu == null) {\n      return false;\n    }\n    IResource resource= cu.getResource();\n    if (resource == null)\n      return false;\n    \n    ITextFileBufferManager manager= FileBuffers.getTextFileBufferManager();\n    ITextFileBuffer textFileBuffer= manager.getTextFileBuffer(resource.getFullPath(), LocationKind.IFILE);\n    if (textFileBuffer != null) {\n      return textFileBuffer.isDirty();\n    }\n    return false;\n  }\n}\n","returncode":0,"stderr":"","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"9e78ffd0d1d4da48ec3c2d574e62629be141f7a0","subject":"UnitOfWorkScopeAspect now logs different states","message":"UnitOfWorkScopeAspect now logs different states\n","repos":"palava\/palava-scope","old_file":"src\/main\/java\/de\/cosmocode\/palava\/scope\/UnitOfWorkScopeAspect.aj","new_file":"src\/main\/java\/de\/cosmocode\/palava\/scope\/UnitOfWorkScopeAspect.aj","new_contents":"\/**\n * palava - a java-php-bridge\n * Copyright (C) 2007-2010  CosmoCode GmbH\n *\n * This program is free software; you can redistribute it and\/or\n * modify it under the terms of the GNU General Public License\n * as published by the Free Software Foundation; either version 2\n * of the License, or (at your option) any later version.\n *\n * This program is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n * along with this program; if not, write to the Free Software\n * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n * MA  02110-1301, USA.\n *\/\n\npackage de.cosmocode.palava.scope;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\n\nfinal aspect UnitOfWorkScopeAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(UnitOfWorkScope.class);\n    \n    private UnitOfWorkScope scope;\n    \n    @Inject\n    void setUnitOfWorkScope(UnitOfWorkScope scope) {\n        this.scope = Preconditions.checkNotNull(scope, \"Scope\");\n    }\n    \n    pointcut unitOfWork(): execution(@UnitOfWork * *.*(..));\n    \n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): unitOfWork() {\n        checkState();\n        LOG.trace(\"Handling UnitOfWorkScope at {}\", thisJoinPointStaticPart);\n        if (scope.inProgress()) {\n            LOG.trace(\"UnitOfWorkScope already in progress\");\n            return proceed();\n        } else {\n            LOG.trace(\"UnitOfWorkScope not in progress\");\n            scope.begin();\n            try {\n                return proceed();\n            } finally {\n                scope.end();\n            }\n        }\n    }\n    \n}\n","old_contents":"\/**\n * palava - a java-php-bridge\n * Copyright (C) 2007-2010  CosmoCode GmbH\n *\n * This program is free software; you can redistribute it and\/or\n * modify it under the terms of the GNU General Public License\n * as published by the Free Software Foundation; either version 2\n * of the License, or (at your option) any later version.\n *\n * This program is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n * along with this program; if not, write to the Free Software\n * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n * MA  02110-1301, USA.\n *\/\n\npackage de.cosmocode.palava.scope;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\n\nfinal aspect UnitOfWorkScopeAspect extends AbstractPalavaAspect issingleton() {\n\n    private UnitOfWorkScope scope;\n    \n    @Inject\n    void setUnitOfWorkScope(UnitOfWorkScope scope) {\n        this.scope = Preconditions.checkNotNull(scope, \"Scope\");\n    }\n    \n    pointcut unitOfWork(): execution(@UnitOfWork * *.*(..));\n    \n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): unitOfWork() {\n        if (scope.inProgress()) return proceed();\n        scope.begin();\n        try {\n            return proceed();\n        } finally {\n            scope.end();\n        }\n    }\n    \n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"169b7a7cd3ad088442e7df5f500b2f5e77dce314","subject":"comments for RemoveLastGame","message":"comments for RemoveLastGame\n","repos":"stieglma\/Schafkopfauswerter","old_file":"src\/RemoveLastGame.aj","new_file":"src\/RemoveLastGame.aj","new_contents":"import java.awt.event.ActionEvent;\nimport java.awt.event.ActionListener;\n\nimport javax.swing.JButton;\nimport javax.swing.JPanel;\n\nimport model.Schafkopfmodel;\nimport model.db.GameData;\nimport view.GUI;\n\n\npublic privileged aspect RemoveLastGame {\n\n    private GUI gui;\n\n    \/**\n     * catch constructor call, so that we have the correct gui, to refer to everywhere\n     *\/\n    after() returning(GUI gui): call(GUI.new(Schafkopfmodel)) {\n        this.gui = gui;\n    }\n\n    private boolean Schafkopfmodel.removeLastGame() {\n        return gameDB.removeLast();\n    }\n\n    private boolean GameData.removeLast() {\n        if(data.size() > 1) {\n            data.remove(data.size()-1);\n            p1.removeLast();\n            p2.removeLast();\n            p3.removeLast();\n            p4.removeLast();\n            return true;\n        }\n        return false;\n    }\n\n    \/** add remove last game button *\/\n    after() returning(JPanel panel): call(JPanel GUI.createButtonPane()) {\n        JButton buttonRemoveLastGame = new JButton(\"letztes Spiel l\u00f6schen\");\n        buttonRemoveLastGame.addActionListener(new RemoveLastGameListener());\n        panel.add(buttonRemoveLastGame);\n    }\n\n    \/** catch execution of removelastgamelistener and remove the game + update ui *\/\n    after() : execution(* RemoveLastGameListener.actionPerformed(*)) {\n        gui.tabbedPane.setSelectedIndex(1);\n        if (gui.model.removeLastGame()) {\n            gui.table.updateUI();\n            gui.updateValues();\n        }\n        if(gui.model.getGameData().size() <= 1) {\n            gui.tabbedPane.setEnabledAt(1, false);\n        }\n    }\n\n}\n\nclass RemoveLastGameListener implements ActionListener {\n\n    \/** filled with pointcut from RemoveLastGame.aj*\/\n    @Override\n    public void actionPerformed(ActionEvent e) {}\n}","old_contents":"import java.awt.event.ActionEvent;\nimport java.awt.event.ActionListener;\n\nimport javax.swing.JButton;\nimport javax.swing.JPanel;\n\nimport model.Schafkopfmodel;\nimport model.db.GameData;\nimport view.GUI;\n\n\npublic privileged aspect RemoveLastGame {\n\n    private GUI gui;\n\n    \/**\n     * catch constructor call, so that we have the correct gui, to refer to everywhere\n     *\/\n    after() returning(GUI gui): call(GUI.new(Schafkopfmodel)) {\n        this.gui = gui;\n    }\n\n    private boolean Schafkopfmodel.removeLastGame() {\n        return gameDB.removeLast();\n    }\n\n    private boolean GameData.removeLast() {\n        if(data.size() > 1) {\n            data.remove(data.size()-1);\n            p1.removeLast();\n            p2.removeLast();\n            p3.removeLast();\n            p4.removeLast();\n            return true;\n        }\n        return false;\n    }\n\n    after() returning(JPanel panel): call(JPanel GUI.createButtonPane()) {\n        JButton buttonRemoveLastGame = new JButton(\"letztes Spiel l\u00f6schen\");\n        buttonRemoveLastGame.addActionListener(new RemoveLastGameListener());\n        panel.add(buttonRemoveLastGame);\n    }\n\n    after() : execution(* RemoveLastGameListener.actionPerformed(*)) {\n        gui.tabbedPane.setSelectedIndex(1);\n        if (gui.model.removeLastGame()) {\n            gui.table.updateUI();\n            gui.updateValues();\n        }\n        if(gui.model.getGameData().size() <= 1) {\n            gui.tabbedPane.setEnabledAt(1, false);\n        }\n    }\n\n}\n\nclass RemoveLastGameListener implements ActionListener {\n\n    \/** filled with pointcut from RemoveLastGame.aj*\/\n    @Override\n    public void actionPerformed(ActionEvent e) {}\n}","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"2a78b975984c7aee84cb31bb4a29978ae155d9bd","subject":"Polish whitespace in JpaExceptionTranslatorAspect.aj","message":"Polish whitespace in JpaExceptionTranslatorAspect.aj\n\nIssue: SPR-10208\n","repos":"spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework,spring-projects\/spring-framework","old_file":"spring-aspects\/src\/main\/java\/org\/springframework\/orm\/jpa\/aspectj\/JpaExceptionTranslatorAspect.aj","new_file":"spring-aspects\/src\/main\/java\/org\/springframework\/orm\/jpa\/aspectj\/JpaExceptionTranslatorAspect.aj","new_contents":"\/*\n * Copyright 2002-2013 the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n\npackage org.springframework.orm.jpa.aspectj;\n\nimport javax.persistence.EntityManager;\nimport javax.persistence.EntityManagerFactory;\nimport javax.persistence.EntityTransaction;\nimport javax.persistence.Query;\n\nimport org.springframework.dao.DataAccessException;\nimport org.springframework.orm.jpa.EntityManagerFactoryUtils;\n\npublic aspect JpaExceptionTranslatorAspect {\n\tpointcut entityManagerCall():\n\t\tcall(* EntityManager.*(..)) || call(* EntityManagerFactory.*(..)) ||\n\t\tcall(* EntityTransaction.*(..)) || call(* Query.*(..));\n\n\tafter() throwing(RuntimeException re): entityManagerCall() {\n\t\tDataAccessException dex = EntityManagerFactoryUtils.convertJpaAccessExceptionIfPossible(re);\n\t\tif (dex != null) {\n\t\t\tthrow dex;\n\t\t}\n\t\telse {\n\t\t\tthrow re;\n\t\t}\n\t}\n}","old_contents":"\/*\n * Copyright 2002-2013 the original author or authors.\n * \n * Licensed under the Apache License, Version 2.0 (the \"License\"); you may not use this\n * file except in compliance with the License. You may obtain a copy of the License at\n * \n * http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n * KIND, either express or implied. See the License for the specific language governing\n * permissions and limitations under the License.\n *\/\npackage org.springframework.orm.jpa.aspectj;\n\nimport javax.persistence.EntityManager;\nimport javax.persistence.EntityManagerFactory;\nimport javax.persistence.EntityTransaction;\nimport javax.persistence.Query;\n\nimport org.springframework.dao.DataAccessException;\nimport org.springframework.orm.jpa.EntityManagerFactoryUtils;\n\npublic aspect JpaExceptionTranslatorAspect {\n    pointcut entityManagerCall(): call(* EntityManager.*(..)) || call(* EntityManagerFactory.*(..)) || call(* EntityTransaction.*(..)) || call(* Query.*(..));\n\n    after() throwing(RuntimeException re): entityManagerCall() {\n    \tDataAccessException dex = EntityManagerFactoryUtils.convertJpaAccessExceptionIfPossible(re);\n    \tif (dex != null) {\n    \t\tthrow dex;\n    \t} else {\n    \t\tthrow re;\n    \t}\n    }\n}","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"c9947353354e45c157a4fdb37a7e3b40010a1db6","subject":"Created flags to keep track of registered broadcast receivers. This should prevent IllegalArgumentExceptions that sometimes pop up.","message":"Created flags to keep track of registered broadcast receivers. This should prevent IllegalArgumentExceptions that sometimes pop up.\n","repos":"treejames\/ignition,mttkay\/ignition,hongnguyenpro\/ignition,Applied-Duality\/ignition","old_file":"ignition-location\/ignition-location-lib\/src\/com\/github\/ignition\/location\/IgnitedLocationManager.aj","new_file":"ignition-location\/ignition-location-lib\/src\/com\/github\/ignition\/location\/IgnitedLocationManager.aj","new_contents":"\/*\n * Copyright 2011 Google Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * This code has been modified by Stefano Dacchille.\n *\/\n\npackage com.github.ignition.location;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\n\nimport android.app.Activity;\nimport android.app.PendingIntent;\nimport android.content.BroadcastReceiver;\nimport android.content.Context;\nimport android.content.Intent;\nimport android.content.IntentFilter;\nimport android.content.SharedPreferences;\nimport android.content.SharedPreferences.Editor;\nimport android.location.Criteria;\nimport android.location.Location;\nimport android.location.LocationListener;\nimport android.location.LocationManager;\nimport android.os.AsyncTask;\nimport android.os.BatteryManager;\nimport android.os.Bundle;\nimport android.os.Handler;\nimport android.util.Log;\n\nimport com.github.ignition.location.annotations.IgnitedLocation;\nimport com.github.ignition.location.annotations.IgnitedLocationActivity;\nimport com.github.ignition.location.receivers.IgnitedLocationChangedReceiver;\nimport com.github.ignition.location.receivers.IgnitedPassiveLocationChangedReceiver;\nimport com.github.ignition.location.tasks.IgnitedLastKnownLocationAsyncTask;\nimport com.github.ignition.location.templates.ILastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLocationUpdateRequester;\nimport com.github.ignition.location.templates.OnIgnitedLocationChangedListener;\nimport com.github.ignition.location.utils.IgnitedLocationSupport;\nimport com.github.ignition.location.utils.PlatformSpecificImplementationFactory;\nimport com.github.ignition.support.IgnitedDiagnostics;\n\n@SuppressAjWarnings\npublic aspect IgnitedLocationManager {\n    public static final String LOG_TAG = IgnitedLocationManager.class.getSimpleName();\n\n    declare parents : (@IgnitedLocationActivity *) implements OnIgnitedLocationChangedListener;\n\n    private Criteria defaultCriteria, lowPowerCriteria;\n    protected IgnitedAbstractLocationUpdateRequester locationUpdateRequester;\n    protected PendingIntent locationListenerPendingIntent, locationListenerPassivePendingIntent;\n    protected LocationManager locationManager;\n    protected IgnitedLocationListener bestInactiveLocationProviderListener;\n\n    private Context context;\n    private volatile Location currentLocation;\n\n    private IgnitedLastKnownLocationAsyncTask ignitedLastKnownLocationTask;\n    private SharedPreferences prefs;\n    private Handler handler;\n\n    private long locationUpdatesInterval, passiveLocationUpdatesInterval;\n    private int locationUpdatesDistanceDiff;\n    private int passiveLocationUpdatesDistanceDiff;\n    private boolean requestLocationUpdates;\n    private boolean locationUpdatesDisabled = true;\n    private boolean waitForFixDialogShown = false;\n    private boolean noProvidersEnabledDialogShown = false;\n    private boolean locationProviderDisabledReceiverRegistered = false;\n    private boolean refreshLocationUpdatesReceiverRegistered = false;\n\n    \/\/ Switch to another provider if gps doesn't return a location quickly enough.\n    private Runnable removeGpsUpdates = new Runnable() {\n        @Override\n        public void run() {\n            Log.d(LOG_TAG,\n                    \"It looks like GPS isn't available at this time (i.e.: maybe you're indoors). Removing GPS location updates and requesting network updates.\");\n\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, lowPowerCriteria());\n        }\n    };\n\n    \/**\n     * If the Location Provider we're using to receive location updates is disabled while the app is\n     * running, this Receiver will be notified, allowing us to re-register our Location Receivers\n     * using the best available Location Provider is still available.\n     *\/\n    protected BroadcastReceiver locationProviderDisabledReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            boolean providerDisabled = !intent.getBooleanExtra(\n                    LocationManager.KEY_PROVIDER_ENABLED, false);\n            \/\/ Re-register the location listeners using the best available\n            \/\/ Location Provider.\n            if (providerDisabled) {\n                disableLocationUpdates(false);\n                requestLocationUpdates(context, null);\n            }\n        }\n    };\n\n    \/**\n     * If the battery state is low disable the passive location update receiver.\n     *\/\n    protected BroadcastReceiver refreshLocationUpdatesReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, null);\n        }\n    };\n\n    after(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onCreate(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n\n        \/\/ Get a reference to the Context\n        this.context = context;\n        \/\/ Set pref file\n        prefs = context.getSharedPreferences(IgnitedLocationConstants.SHARED_PREFERENCE_FILE,\n                Context.MODE_PRIVATE);\n        \/\/ Get references to the managers\n        locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);\n        handler = new Handler();\n\n        \/\/ Specify the Criteria to use when requesting location updates while\n        \/\/ the application is Active\n        if (defaultCriteria == null) {\n            defaultCriteria = new Criteria();\n        }\n        \/\/ Use gps if it's enabled and if battery level is at least 15%\n        boolean useGps = prefs.getBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS,\n                IgnitedLocationConstants.USE_GPS_DEFAULT);\n        if (useGps) {\n            defaultCriteria.setAccuracy(Criteria.ACCURACY_FINE);\n        } else {\n            defaultCriteria.setPowerRequirement(Criteria.POWER_LOW);\n        }\n\n        \/\/ Setup the location update Pending Intent\n        Intent activeIntent = new Intent(IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_ACTION);\n        locationListenerPendingIntent = PendingIntent.getBroadcast(context, 0, activeIntent,\n                PendingIntent.FLAG_UPDATE_CURRENT);\n        \/\/ Setup the passive location update Pending Intent\n        Intent passiveIntent = new Intent(context, IgnitedPassiveLocationChangedReceiver.class);\n        locationListenerPassivePendingIntent = PendingIntent.getBroadcast(context, 0,\n                passiveIntent, PendingIntent.FLAG_UPDATE_CURRENT);\n\n        \/\/ Instantiate a Location Update Requester class based on the available\n        \/\/ platform version. This will be used to request location updates.\n        locationUpdateRequester = PlatformSpecificImplementationFactory\n                .getLocationUpdateRequester(context);\n    }\n\n    private boolean isBatteryOk() {\n        IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);\n        Intent intent = context.registerReceiver(null, filter);\n        double currentLevel = 100.0;\n        if (intent != null) {\n            currentLevel = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1);\n        }\n\n        return currentLevel >= prefs.getInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                IgnitedLocationConstants.MIN_BATTERY_LEVEL_FOR_GPS_DEFAULT);\n    }\n\n    before(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onResume(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n        \/\/ Get a reference to the Context if this context is null\n        if (this.context == null) {\n            this.context = context;\n        }\n\n        saveToPreferences(context, ignitedAnnotation);\n\n        Log.d(LOG_TAG, \"Retrieving last known location...\");\n        \/\/ Get the last known location. This isn't directly affecting the UI, so put it on a\n        \/\/ worker thread.\n        ignitedLastKnownLocationTask = new IgnitedLastKnownLocationAsyncTask(context,\n                locationUpdatesDistanceDiff, locationUpdatesInterval);\n        ignitedLastKnownLocationTask.execute();\n    }\n\n    \/**\n     * Save last settings to preferences.\n     * \n     * @param context\n     * @param locationAnnotation\n     *\/\n    private void saveToPreferences(Context context, IgnitedLocationActivity locationAnnotation) {\n        requestLocationUpdates = locationAnnotation.requestLocationUpdates();\n        locationUpdatesDistanceDiff = locationAnnotation.locationUpdatesDistanceDiff();\n        locationUpdatesInterval = locationAnnotation.locationUpdatesInterval();\n        passiveLocationUpdatesDistanceDiff = locationAnnotation\n                .passiveLocationUpdatesDistanceDiff();\n        passiveLocationUpdatesInterval = locationAnnotation.passiveLocationUpdatesInterval();\n        boolean enablePassiveLocationUpdates = locationAnnotation.enablePassiveUpdates();\n        boolean useGps = locationAnnotation.useGps();\n\n        Editor editor = prefs.edit();\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_LOCATION_UPDATES,\n                requestLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                enablePassiveLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS, useGps);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_DISTANCE_DIFF,\n                locationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_INTERVAL,\n                locationUpdatesInterval);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_DISTANCE_DIFF,\n                passiveLocationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_INTERVAL,\n                passiveLocationUpdatesInterval);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_RUN_ONCE, true);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                locationAnnotation.minBatteryLevelForGps());\n        editor.putLong(IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                locationAnnotation.waitForGpsFixInterval());\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                locationAnnotation.showWaitForLocationDialog());\n        editor.commit();\n\n    }\n\n    before(Activity activity, IgnitedLocationActivity ignitedAnnotation) : execution(* Activity.onPause(..)) \n        && @this(ignitedAnnotation) && this(activity) && within(@IgnitedLocationActivity *) {\n\n        if (ignitedAnnotation.requestLocationUpdates()) {\n            disableLocationUpdates(true);\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n\n        if (ignitedLastKnownLocationTask != null) {\n            if (ignitedLastKnownLocationTask.getStatus() != AsyncTask.Status.FINISHED) {\n                Log.d(LOG_TAG, \"Cancel last location task\");\n                ignitedLastKnownLocationTask.cancel(true);\n            }\n            ignitedLastKnownLocationTask.getLastLocationFinder().cancel();\n        }\n\n        boolean finishing = activity.isFinishing();\n        if (finishing) {\n            context = null;\n        }\n    }\n\n    Location around() : get(@IgnitedLocation Location *) {\n        return currentLocation;\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && within(IgnitedPassiveLocationChangedReceiver) && !adviceexecution() {\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, lng\/acc): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude() + \"\/\"\n                + currentLocation.getAccuracy());\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && (within(IgnitedLocationChangedReceiver) || within(IgnitedAbstractLastLocationFinder)\n                || within(IgnitedLastKnownLocationAsyncTask)) && !adviceexecution() {\n\n        if (context == null) {\n            return;\n        }\n\n        final Activity activity = (Activity) context;\n        if (IgnitedLocationSupport.getEnabledProviders(context).isEmpty()) {\n            \/\/ On some older versions of Android if a dialog is not shown by the activity after\n            \/\/ calling showDialog an IllegalArgunmentException is raised. Catch this exception since\n            \/\/ the docs returning a null dialog should be allowed.\n            try {\n                activity.showDialog(R.id.ign_loc_dialog_no_providers_enabled);\n                noProvidersEnabledDialogShown = true;\n            } catch (IllegalArgumentException e) {\n                e.printStackTrace();\n            }\n            return;\n        }\n\n        if (freshLocation == null) {\n            \/\/ TODO Migrate this to DialogFragment at some point\n            boolean showWaitForLocationDialog = prefs.getBoolean(\n                    IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                    IgnitedLocationConstants.SHOW_WAIT_FOR_LOCATION_DIALOG_DEFAULT);\n            if (showWaitForLocationDialog && !activity.isFinishing()) {\n                \/\/ On some older versions of Android if a dialog is not shown by the activity after\n                \/\/ calling showDialog an IllegalArgunmentException is raised. Catch this exception since\n                \/\/ the docs returning a null dialog should be allowed.\n                try {\n                    activity.showDialog(R.id.ign_loc_dialog_wait_for_fix);\n                    waitForFixDialogShown = true;\n                } catch (IllegalArgumentException e) {\n                    e.printStackTrace();\n                }\n            }\n            return;\n        }\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, lng\/acc): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude() + \"\/\" + currentLocation.getAccuracy());\n        \/\/ TODO Migrate this to DialogFragment at some point\n        if (noProvidersEnabledDialogShown) {\n            activity.removeDialog(R.id.ign_loc_dialog_no_providers_enabled);\n            noProvidersEnabledDialogShown = false;\n        } else if (waitForFixDialogShown) {\n            activity.removeDialog(R.id.ign_loc_dialog_wait_for_fix);\n            waitForFixDialogShown = false;\n        }\n        boolean keepRequestingLocationUpdates = ((OnIgnitedLocationChangedListener) context)\n                .onIgnitedLocationChanged(currentLocation);\n        Bundle extras = freshLocation.getExtras();\n        \/\/ a) If location updates shouldn't be requested anymore turn them off.\n        \/\/ b) Don't turn location updates on if last location is too old, since the single location\n        \/\/ update is running.\n        if (!keepRequestingLocationUpdates) {\n            disableLocationUpdates(true);\n            \/\/ PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            return;\n        } else if (requestLocationUpdates\n                && (extras == null || !extras.containsKey(ILastLocationFinder.LAST_LOCATION_TOO_OLD_OR_INACCURATE_EXTRA))) {\n            \/\/ If we requested location updates, turn them on here.\n            requestLocationUpdates(context, null);\n        }\n\n        \/\/ If gps is enabled location comes from gps, remove runnable that removes gps updates\n        boolean lastLocation = extras != null && extras.containsKey(IgnitedLocationConstants.IGNITED_LAST_LOCATION_EXTRA);\n        if (!lastLocation && defaultCriteria.getAccuracy() == Criteria.ACCURACY_FINE\n                && currentLocation.getProvider().equals(LocationManager.GPS_PROVIDER)) {\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n    }\n\n    \/**\n     * Start listening for location updates.\n     *\/\n    protected void requestLocationUpdates(Context context, Criteria criteria) {\n        if (!locationUpdatesDisabled) {\n            return;\n        }\n        Criteria locationUpdateCriteria = criteria;\n        if (criteria == null) {\n            if (isBatteryOk()) {\n                locationUpdateCriteria = defaultCriteria;\n            } else {\n                locationUpdateCriteria = lowPowerCriteria();\n            }\n        }\n        Log.d(LOG_TAG, \"Disabling passive location updates\");\n        locationManager.removeUpdates(locationListenerPassivePendingIntent);\n\n        Log.d(LOG_TAG, \"Requesting location updates\");\n        \/\/ Normal updates while activity is visible.\n        locationUpdateRequester.requestLocationUpdates(locationUpdatesInterval,\n                locationUpdatesDistanceDiff, locationUpdateCriteria, locationListenerPendingIntent);\n\n        \/\/ Register a receiver that listens for when the provider I'm using has\n        \/\/ been disabled.\n        IntentFilter locationProviderDisabledIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_PROVIDER_DISABLED_ACTION);\n        context.registerReceiver(locationProviderDisabledReceiver,\n                locationProviderDisabledIntentFilter);\n        locationProviderDisabledReceiverRegistered = true;\n\n        IntentFilter refreshLocationUpdatesIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.UPDATE_LOCATION_UPDATES_CRITERIA_ACTION);\n        context.registerReceiver(refreshLocationUpdatesReceiver, refreshLocationUpdatesIntentFilter);\n        refreshLocationUpdatesReceiverRegistered = true;\n\n        \/\/ Register a receiver that listens for when a better provider than I'm\n        \/\/ using becomes available.\n        String bestProvider = locationManager.getBestProvider(locationUpdateCriteria, false);\n        String bestAvailableProvider = locationManager.getBestProvider(locationUpdateCriteria, true);\n        if (bestProvider != null && !bestProvider.equals(bestAvailableProvider)) {\n            bestInactiveLocationProviderListener = new IgnitedLocationListener(context);\n            locationManager.requestLocationUpdates(bestProvider, 0, 0,\n                    bestInactiveLocationProviderListener, context.getMainLooper());\n        }\n\n        if (bestAvailableProvider.equals(LocationManager.GPS_PROVIDER)) {\n            Log.d(LOG_TAG, \"Posting delayed remove GPS updates message\");\n            \/\/ Post a runnable that will remove gps updates if no gps location is returned after 1\n            \/\/ minute in order to avoid draining the battery.\n            handler.postDelayed(removeGpsUpdates, prefs.getLong(\n                    IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                    IgnitedLocationConstants.WAIT_FOR_GPS_FIX_INTERVAL_DEFAULT));\n        }\n\n        locationUpdatesDisabled = false;\n    }\n\n    \/**\n     * Stop listening for location updates\n     * \n     * @param enablePassiveLocationUpdates\n     *\/\n    protected void disableLocationUpdates(boolean requestPassiveLocationUpdates) {\n        if (locationUpdatesDisabled) {\n            return;\n        }\n\n        Log.d(LOG_TAG, \"Disabling location updates\");\n        if (locationProviderDisabledReceiverRegistered) {\n            context.unregisterReceiver(locationProviderDisabledReceiver);\n            locationProviderDisabledReceiverRegistered = false;\n        }\n        if (refreshLocationUpdatesReceiverRegistered) {\n            context.unregisterReceiver(refreshLocationUpdatesReceiver);\n            refreshLocationUpdatesReceiverRegistered = false;\n        }\n        locationUpdateRequester.removeLocationUpdates();\n        if (bestInactiveLocationProviderListener != null) {\n            locationManager.removeUpdates(bestInactiveLocationProviderListener);\n        }\n\n        boolean finishing = ((Activity) context).isFinishing();\n\n        if (requestPassiveLocationUpdates && !finishing) {\n            requestPassiveLocationUpdates();\n        }\n\n        locationUpdatesDisabled = true;\n    }\n\n    private void requestPassiveLocationUpdates() {\n        if (IgnitedDiagnostics.SUPPORTS_FROYO\n                && prefs.getBoolean(\n                        IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                        IgnitedLocationConstants.ENABLE_PASSIVE_LOCATION_UPDATES_DEFAULT)) {\n            Log.d(LOG_TAG, \"Requesting passive location updates\");\n            \/\/ Passive location updates from 3rd party apps when the Activity isn't\n            \/\/ visible. Only for Android 2.2+.\n            locationUpdateRequester.requestPassiveLocationUpdates(passiveLocationUpdatesInterval,\n                    passiveLocationUpdatesDistanceDiff, locationListenerPassivePendingIntent);\n        }\n    }\n\n    public boolean isLocationUpdatesDisabled() {\n        return locationUpdatesDisabled;\n    }\n\n    public Criteria lowPowerCriteria() {\n        if (lowPowerCriteria == null) {\n            lowPowerCriteria = new Criteria();\n            lowPowerCriteria.setPowerRequirement(Criteria.POWER_LOW);\n            lowPowerCriteria.setAccuracy(Criteria.NO_REQUIREMENT);\n        }\n        return lowPowerCriteria;\n    }\n\n    \/**\n     * If the best Location Provider (usually GPS) is not available when we request location\n     * updates, this listener will be notified if \/ when it becomes available. It calls\n     * requestLocationUpdates to re-register the location listeners using the better Location\n     * Provider.\n     *\/\n    private class IgnitedLocationListener implements LocationListener {\n        private Context context;\n\n        public IgnitedLocationListener(Context appContext) {\n            this.context = appContext;\n        }\n\n        @Override\n        public void onLocationChanged(Location l) {\n        }\n\n        @Override\n        public void onProviderDisabled(String provider) {\n        }\n\n        @Override\n        public void onStatusChanged(String provider, int status, Bundle extras) {\n        }\n\n        @Override\n        public void onProviderEnabled(String provider) {\n            \/\/ Re-register the location listeners using the better Location\n            \/\/ Provider.\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, null);\n        }\n    }\n\n}\n","old_contents":"\/*\n * Copyright 2011 Google Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * This code has been modified by Stefano Dacchille.\n *\/\n\npackage com.github.ignition.location;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\n\nimport android.app.Activity;\nimport android.app.PendingIntent;\nimport android.content.BroadcastReceiver;\nimport android.content.Context;\nimport android.content.Intent;\nimport android.content.IntentFilter;\nimport android.content.SharedPreferences;\nimport android.content.SharedPreferences.Editor;\nimport android.location.Criteria;\nimport android.location.Location;\nimport android.location.LocationListener;\nimport android.location.LocationManager;\nimport android.os.AsyncTask;\nimport android.os.BatteryManager;\nimport android.os.Bundle;\nimport android.os.Handler;\nimport android.util.Log;\n\nimport com.github.ignition.location.annotations.IgnitedLocation;\nimport com.github.ignition.location.annotations.IgnitedLocationActivity;\nimport com.github.ignition.location.receivers.IgnitedLocationChangedReceiver;\nimport com.github.ignition.location.receivers.IgnitedPassiveLocationChangedReceiver;\nimport com.github.ignition.location.tasks.IgnitedLastKnownLocationAsyncTask;\nimport com.github.ignition.location.templates.ILastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLocationUpdateRequester;\nimport com.github.ignition.location.templates.OnIgnitedLocationChangedListener;\nimport com.github.ignition.location.utils.IgnitedLocationSupport;\nimport com.github.ignition.location.utils.PlatformSpecificImplementationFactory;\nimport com.github.ignition.support.IgnitedDiagnostics;\n\n@SuppressAjWarnings\npublic aspect IgnitedLocationManager {\n    public static final String LOG_TAG = IgnitedLocationManager.class.getSimpleName();\n\n    declare parents : (@IgnitedLocationActivity *) implements OnIgnitedLocationChangedListener;\n\n    private Criteria defaultCriteria, lowPowerCriteria;\n    protected IgnitedAbstractLocationUpdateRequester locationUpdateRequester;\n    protected PendingIntent locationListenerPendingIntent, locationListenerPassivePendingIntent;\n    protected LocationManager locationManager;\n    protected IgnitedLocationListener bestInactiveLocationProviderListener;\n\n    private Context context;\n    private volatile Location currentLocation;\n\n    private IgnitedLastKnownLocationAsyncTask ignitedLastKnownLocationTask;\n    private SharedPreferences prefs;\n    private Handler handler;\n\n    private long locationUpdatesInterval, passiveLocationUpdatesInterval;\n    private int locationUpdatesDistanceDiff;\n    private int passiveLocationUpdatesDistanceDiff;\n    private boolean requestLocationUpdates;\n    private boolean locationUpdatesDisabled = true;\n    private boolean waitForFixDialogShown = false;\n    private boolean noProvidersEnabledDialogShown = false;\n\n    \/\/ Switch to another provider if gps doesn't return a location quickly enough.\n    private Runnable removeGpsUpdates = new Runnable() {\n        @Override\n        public void run() {\n            Log.d(LOG_TAG,\n                    \"It looks like GPS isn't available at this time (i.e.: maybe you're indoors). Removing GPS location updates and requesting network updates.\");\n\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, lowPowerCriteria());\n        }\n    };\n\n    \/**\n     * If the Location Provider we're using to receive location updates is disabled while the app is\n     * running, this Receiver will be notified, allowing us to re-register our Location Receivers\n     * using the best available Location Provider is still available.\n     *\/\n    protected BroadcastReceiver locationProviderDisabledReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            boolean providerDisabled = !intent.getBooleanExtra(\n                    LocationManager.KEY_PROVIDER_ENABLED, false);\n            \/\/ Re-register the location listeners using the best available\n            \/\/ Location Provider.\n            if (providerDisabled) {\n                disableLocationUpdates(false);\n                requestLocationUpdates(context, null);\n            }\n        }\n    };\n\n    \/**\n     * If the battery state is low disable the passive location update receiver.\n     *\/\n    protected BroadcastReceiver refreshLocationUpdatesReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, null);\n        }\n    };\n\n    after(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onCreate(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n\n        \/\/ Get a reference to the Context\n        this.context = context;\n        \/\/ Set pref file\n        prefs = context.getSharedPreferences(IgnitedLocationConstants.SHARED_PREFERENCE_FILE,\n                Context.MODE_PRIVATE);\n        \/\/ Get references to the managers\n        locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);\n        handler = new Handler();\n\n        \/\/ Specify the Criteria to use when requesting location updates while\n        \/\/ the application is Active\n        if (defaultCriteria == null) {\n            defaultCriteria = new Criteria();\n        }\n        \/\/ Use gps if it's enabled and if battery level is at least 15%\n        boolean useGps = prefs.getBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS,\n                IgnitedLocationConstants.USE_GPS_DEFAULT);\n        if (useGps) {\n            defaultCriteria.setAccuracy(Criteria.ACCURACY_FINE);\n        } else {\n            defaultCriteria.setPowerRequirement(Criteria.POWER_LOW);\n        }\n\n        \/\/ Setup the location update Pending Intent\n        Intent activeIntent = new Intent(IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_ACTION);\n        locationListenerPendingIntent = PendingIntent.getBroadcast(context, 0, activeIntent,\n                PendingIntent.FLAG_UPDATE_CURRENT);\n        \/\/ Setup the passive location update Pending Intent\n        Intent passiveIntent = new Intent(context, IgnitedPassiveLocationChangedReceiver.class);\n        locationListenerPassivePendingIntent = PendingIntent.getBroadcast(context, 0,\n                passiveIntent, PendingIntent.FLAG_UPDATE_CURRENT);\n\n        \/\/ Instantiate a Location Update Requester class based on the available\n        \/\/ platform version. This will be used to request location updates.\n        locationUpdateRequester = PlatformSpecificImplementationFactory\n                .getLocationUpdateRequester(context);\n    }\n\n    private boolean isBatteryOk() {\n        IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);\n        Intent intent = context.registerReceiver(null, filter);\n        double currentLevel = 100.0;\n        if (intent != null) {\n            currentLevel = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1);\n        }\n\n        return currentLevel >= prefs.getInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                IgnitedLocationConstants.MIN_BATTERY_LEVEL_FOR_GPS_DEFAULT);\n    }\n\n    before(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onResume(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n        \/\/ Get a reference to the Context if this context is null\n        if (this.context == null) {\n            this.context = context;\n        }\n\n        saveToPreferences(context, ignitedAnnotation);\n\n        Log.d(LOG_TAG, \"Retrieving last known location...\");\n        \/\/ Get the last known location. This isn't directly affecting the UI, so put it on a\n        \/\/ worker thread.\n        ignitedLastKnownLocationTask = new IgnitedLastKnownLocationAsyncTask(context,\n                locationUpdatesDistanceDiff, locationUpdatesInterval);\n        ignitedLastKnownLocationTask.execute();\n    }\n\n    \/**\n     * Save last settings to preferences.\n     * \n     * @param context\n     * @param locationAnnotation\n     *\/\n    private void saveToPreferences(Context context, IgnitedLocationActivity locationAnnotation) {\n        requestLocationUpdates = locationAnnotation.requestLocationUpdates();\n        locationUpdatesDistanceDiff = locationAnnotation.locationUpdatesDistanceDiff();\n        locationUpdatesInterval = locationAnnotation.locationUpdatesInterval();\n        passiveLocationUpdatesDistanceDiff = locationAnnotation\n                .passiveLocationUpdatesDistanceDiff();\n        passiveLocationUpdatesInterval = locationAnnotation.passiveLocationUpdatesInterval();\n        boolean enablePassiveLocationUpdates = locationAnnotation.enablePassiveUpdates();\n        boolean useGps = locationAnnotation.useGps();\n\n        Editor editor = prefs.edit();\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_LOCATION_UPDATES,\n                requestLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                enablePassiveLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS, useGps);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_DISTANCE_DIFF,\n                locationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_INTERVAL,\n                locationUpdatesInterval);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_DISTANCE_DIFF,\n                passiveLocationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_INTERVAL,\n                passiveLocationUpdatesInterval);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_RUN_ONCE, true);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                locationAnnotation.minBatteryLevelForGps());\n        editor.putLong(IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                locationAnnotation.waitForGpsFixInterval());\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                locationAnnotation.showWaitForLocationDialog());\n        editor.commit();\n\n    }\n\n    before(Activity activity, IgnitedLocationActivity ignitedAnnotation) : execution(* Activity.onPause(..)) \n        && @this(ignitedAnnotation) && this(activity) && within(@IgnitedLocationActivity *) {\n\n        if (ignitedAnnotation.requestLocationUpdates()) {\n            disableLocationUpdates(true);\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n\n        if (ignitedLastKnownLocationTask != null) {\n            if (ignitedLastKnownLocationTask.getStatus() != AsyncTask.Status.FINISHED) {\n                Log.d(LOG_TAG, \"Cancel last location task\");\n                ignitedLastKnownLocationTask.cancel(true);\n            }\n            ignitedLastKnownLocationTask.getLastLocationFinder().cancel();\n        }\n\n        boolean finishing = activity.isFinishing();\n        if (finishing) {\n            context = null;\n        }\n    }\n\n    Location around() : get(@IgnitedLocation Location *) {\n        return currentLocation;\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && within(IgnitedPassiveLocationChangedReceiver) && !adviceexecution() {\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, lng\/acc): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude() + \"\/\"\n                + currentLocation.getAccuracy());\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && (within(IgnitedLocationChangedReceiver) || within(IgnitedAbstractLastLocationFinder)\n                || within(IgnitedLastKnownLocationAsyncTask)) && !adviceexecution() {\n\n        if (context == null) {\n            return;\n        }\n\n        final Activity activity = (Activity) context;\n        if (IgnitedLocationSupport.getEnabledProviders(context).isEmpty()) {\n            \/\/ On some older versions of Android if a dialog is not shown by the activity after\n            \/\/ calling showDialog an IllegalArgunmentException is raised. Catch this exception since\n            \/\/ the docs returning a null dialog should be allowed.\n            try {\n                activity.showDialog(R.id.ign_loc_dialog_no_providers_enabled);\n                noProvidersEnabledDialogShown = true;\n            } catch (IllegalArgumentException e) {\n                e.printStackTrace();\n            }\n            return;\n        }\n\n        if (freshLocation == null) {\n            \/\/ TODO Migrate this to DialogFragment at some point\n            boolean showWaitForLocationDialog = prefs.getBoolean(\n                    IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                    IgnitedLocationConstants.SHOW_WAIT_FOR_LOCATION_DIALOG_DEFAULT);\n            if (showWaitForLocationDialog && !activity.isFinishing()) {\n                \/\/ On some older versions of Android if a dialog is not shown by the activity after\n                \/\/ calling showDialog an IllegalArgunmentException is raised. Catch this exception since\n                \/\/ the docs returning a null dialog should be allowed.\n                try {\n                    activity.showDialog(R.id.ign_loc_dialog_wait_for_fix);\n                    waitForFixDialogShown = true;\n                } catch (IllegalArgumentException e) {\n                    e.printStackTrace();\n                }\n            }\n            return;\n        }\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, lng\/acc): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude() + \"\/\" + currentLocation.getAccuracy());\n        \/\/ TODO Migrate this to DialogFragment at some point\n        if (noProvidersEnabledDialogShown) {\n            activity.removeDialog(R.id.ign_loc_dialog_no_providers_enabled);\n            noProvidersEnabledDialogShown = false;\n        } else if (waitForFixDialogShown) {\n            activity.removeDialog(R.id.ign_loc_dialog_wait_for_fix);\n            waitForFixDialogShown = false;\n        }\n        boolean keepRequestingLocationUpdates = ((OnIgnitedLocationChangedListener) context)\n                .onIgnitedLocationChanged(currentLocation);\n        Bundle extras = freshLocation.getExtras();\n        \/\/ a) If location updates shouldn't be requested anymore turn them off.\n        \/\/ b) Don't turn location updates on if last location is too old, since the single location\n        \/\/ update is running.\n        if (!keepRequestingLocationUpdates) {\n            disableLocationUpdates(true);\n            \/\/ PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            return;\n        } else if (requestLocationUpdates\n                && (extras == null || !extras.containsKey(ILastLocationFinder.LAST_LOCATION_TOO_OLD_OR_INACCURATE_EXTRA))) {\n            \/\/ If we requested location updates, turn them on here.\n            requestLocationUpdates(context, null);\n        }\n\n        \/\/ If gps is enabled location comes from gps, remove runnable that removes gps updates\n        boolean lastLocation = extras != null && extras.containsKey(IgnitedLocationConstants.IGNITED_LAST_LOCATION_EXTRA);\n        if (!lastLocation && defaultCriteria.getAccuracy() == Criteria.ACCURACY_FINE\n                && currentLocation.getProvider().equals(LocationManager.GPS_PROVIDER)) {\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n    }\n\n    \/**\n     * Start listening for location updates.\n     *\/\n    protected void requestLocationUpdates(Context context, Criteria criteria) {\n        if (!locationUpdatesDisabled) {\n            return;\n        }\n        Criteria locationUpdateCriteria = criteria;\n        if (criteria == null) {\n            if (isBatteryOk()) {\n                locationUpdateCriteria = defaultCriteria;\n            } else {\n                locationUpdateCriteria = lowPowerCriteria();\n            }\n        }\n        Log.d(LOG_TAG, \"Disabling passive location updates\");\n        locationManager.removeUpdates(locationListenerPassivePendingIntent);\n\n        Log.d(LOG_TAG, \"Requesting location updates\");\n        \/\/ Normal updates while activity is visible.\n        locationUpdateRequester.requestLocationUpdates(locationUpdatesInterval,\n                locationUpdatesDistanceDiff, locationUpdateCriteria, locationListenerPendingIntent);\n\n        \/\/ Register a receiver that listens for when the provider I'm using has\n        \/\/ been disabled.\n        IntentFilter locationProviderDisabledIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_PROVIDER_DISABLED_ACTION);\n        context.registerReceiver(locationProviderDisabledReceiver,\n                locationProviderDisabledIntentFilter);\n\n        IntentFilter refreshLocationUpdatesIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.UPDATE_LOCATION_UPDATES_CRITERIA_ACTION);\n        context.registerReceiver(refreshLocationUpdatesReceiver, refreshLocationUpdatesIntentFilter);\n\n        \/\/ Register a receiver that listens for when a better provider than I'm\n        \/\/ using becomes available.\n        String bestProvider = locationManager.getBestProvider(locationUpdateCriteria, false);\n        String bestAvailableProvider = locationManager.getBestProvider(locationUpdateCriteria, true);\n        if (bestProvider != null && !bestProvider.equals(bestAvailableProvider)) {\n            bestInactiveLocationProviderListener = new IgnitedLocationListener(context);\n            locationManager.requestLocationUpdates(bestProvider, 0, 0,\n                    bestInactiveLocationProviderListener, context.getMainLooper());\n        }\n\n        if (bestAvailableProvider.equals(LocationManager.GPS_PROVIDER)) {\n            Log.d(LOG_TAG, \"Posting delayed remove GPS updates message\");\n            \/\/ Post a runnable that will remove gps updates if no gps location is returned after 1\n            \/\/ minute in order to avoid draining the battery.\n            handler.postDelayed(removeGpsUpdates, prefs.getLong(\n                    IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                    IgnitedLocationConstants.WAIT_FOR_GPS_FIX_INTERVAL_DEFAULT));\n        }\n\n        locationUpdatesDisabled = false;\n    }\n\n    \/**\n     * Stop listening for location updates\n     * \n     * @param enablePassiveLocationUpdates\n     *\/\n    protected void disableLocationUpdates(boolean requestPassiveLocationUpdates) {\n        if (locationUpdatesDisabled) {\n            return;\n        }\n\n        Log.d(LOG_TAG, \"Disabling location updates\");\n        context.unregisterReceiver(locationProviderDisabledReceiver);\n        context.unregisterReceiver(refreshLocationUpdatesReceiver);\n\n        locationUpdateRequester.removeLocationUpdates();\n        if (bestInactiveLocationProviderListener != null) {\n            locationManager.removeUpdates(bestInactiveLocationProviderListener);\n        }\n\n        boolean finishing = ((Activity) context).isFinishing();\n\n        if (requestPassiveLocationUpdates && !finishing) {\n            requestPassiveLocationUpdates();\n        }\n\n        locationUpdatesDisabled = true;\n    }\n\n    private void requestPassiveLocationUpdates() {\n        if (IgnitedDiagnostics.SUPPORTS_FROYO\n                && prefs.getBoolean(\n                        IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                        IgnitedLocationConstants.ENABLE_PASSIVE_LOCATION_UPDATES_DEFAULT)) {\n            Log.d(LOG_TAG, \"Requesting passive location updates\");\n            \/\/ Passive location updates from 3rd party apps when the Activity isn't\n            \/\/ visible. Only for Android 2.2+.\n            locationUpdateRequester.requestPassiveLocationUpdates(passiveLocationUpdatesInterval,\n                    passiveLocationUpdatesDistanceDiff, locationListenerPassivePendingIntent);\n        }\n    }\n\n    public boolean isLocationUpdatesDisabled() {\n        return locationUpdatesDisabled;\n    }\n\n    public Criteria lowPowerCriteria() {\n        if (lowPowerCriteria == null) {\n            lowPowerCriteria = new Criteria();\n            lowPowerCriteria.setPowerRequirement(Criteria.POWER_LOW);\n            lowPowerCriteria.setAccuracy(Criteria.NO_REQUIREMENT);\n        }\n        return lowPowerCriteria;\n    }\n\n    \/**\n     * If the best Location Provider (usually GPS) is not available when we request location\n     * updates, this listener will be notified if \/ when it becomes available. It calls\n     * requestLocationUpdates to re-register the location listeners using the better Location\n     * Provider.\n     *\/\n    private class IgnitedLocationListener implements LocationListener {\n        private Context context;\n\n        public IgnitedLocationListener(Context appContext) {\n            this.context = appContext;\n        }\n\n        @Override\n        public void onLocationChanged(Location l) {\n        }\n\n        @Override\n        public void onProviderDisabled(String provider) {\n        }\n\n        @Override\n        public void onStatusChanged(String provider, int status, Bundle extras) {\n        }\n\n        @Override\n        public void onProviderEnabled(String provider) {\n            \/\/ Re-register the location listeners using the better Location\n            \/\/ Provider.\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, null);\n        }\n    }\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"d6fae223690a29793b081cfedbe2759bc1668111","subject":"inspections","message":"inspections\n\nSigned-off-by: Ketoth Xupack <2ff7bd69a79a23dbf64ebd5846a612566f93fbf7@gmail.com>\n","repos":"KetothXupack\/jsr305-aspectj-validation","old_file":"src\/main\/java\/org\/nohope\/validation\/NotNullAspect.aj","new_file":"src\/main\/java\/org\/nohope\/validation\/NotNullAspect.aj","new_contents":"package org.nohope.validation;\n\nimport org.aspectj.lang.Signature;\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.aspectj.lang.reflect.ConstructorSignature;\nimport org.aspectj.lang.reflect.MethodSignature;\n\nimport javax.annotation.Nonnull;\nimport javax.annotation.meta.When;\nimport java.lang.annotation.Annotation;\nimport java.lang.reflect.Constructor;\nimport java.lang.reflect.Method;\nimport java.util.Map;\nimport java.util.concurrent.ConcurrentHashMap;\n\npublic final privileged aspect NotNullAspect {\n    private static final Map<Constructor, MethodCache> constructorCache = new ConcurrentHashMap<>();\n    private static final Map<Method, MethodCache> methodCache = new ConcurrentHashMap<>();\n\n    \/** Utility constructor. *\/\n    private NotNullAspect() {\n    }\n\n    pointcut thisAdvice(): adviceexecution() && within(NotNullAspect);\n\n    \/**\n     * matches all constructors with at last one parameter\n     * marked with @Nonnull annotation\n     *\/\n    pointcut nonNullConstructorParameters():\n            execution(new(.., @javax.annotation.Nonnull (*), ..))\n            && !cflow(thisAdvice())\n            ;\n\n    \/**\n     * searches for all methods have at last one parameter\n     * annotated with @Nonnull\n     *\/\n    pointcut nonNullMethodParameters():\n            execution(* *.*(.., @javax.annotation.Nonnull (*), ..))\n            && !cflow(thisAdvice())\n            ;\n\n    \/**\n     * searches for all methods which returns any reference type and\n     * annotated with @Nonnull\n     *\/\n    static pointcut validatedReturnValue():\n            execution(@javax.annotation.Nonnull (Object+) *.*(..))\n            && !cflow(thisAdvice())\n            ;\n\n    @SuppressAjWarnings\n    after() returning(final Object ret): validatedReturnValue() {\n        final MethodSignature sig = (MethodSignature) thisJoinPoint.getStaticPart().getSignature();\n        if (ret == null) {\n            throw new IllegalStateException(\"@Nonnull method \"\n                    + toString(sig.getMethod())\n                    + \" must not return null\");\n        }\n    }\n\n    @SuppressAjWarnings\n    before(): nonNullMethodParameters() || nonNullConstructorParameters() {\n        final Signature signature = thisJoinPoint.getStaticPart().getSignature();\n        final MethodCache cache;\n\n        if (signature instanceof MethodSignature) {\n            final MethodSignature sig = (MethodSignature) thisJoinPoint.getStaticPart().getSignature();\n            final Method method = sig.getMethod();\n            cache = getCached(method);\n        } else if (signature instanceof ConstructorSignature) {\n            final ConstructorSignature sig = (ConstructorSignature) signature;\n            final Constructor method = sig.getConstructor();\n            cache = getCached(method);\n        } else {\n            throw new IllegalStateException(\"Illegal advice for \" + signature.getClass());\n        }\n\n        final Object[] args = thisJoinPoint.getArgs();\n        final int constructorDiff = args.length - cache.params.length;\n        for (int j = constructorDiff; j < args.length; j++) {\n            final Object obj = args[j];\n            Nonnull a = null;\n            for (Annotation annotation : cache.params[j - constructorDiff]) {\n                if (annotation instanceof Nonnull) {\n                    a = (Nonnull) annotation;\n                    break;\n                }\n            }\n\n            if (obj == null && a != null && a.when() == When.ALWAYS) {\n                throw new IllegalArgumentException(\"Argument \"\n                        + (j - constructorDiff + 1)\n                        + \" for @Nonnull parameter of \"\n                        + cache.message\n                        + \" must not be null\"\n                );\n            }\n        }\n    }\n\n    private static MethodCache getCached(final Method method) {\n        MethodCache result = methodCache.get(method);\n        if (result == null) {\n            result = new MethodCache(NotNullAspect.toString(method),\n                    method.getParameterAnnotations());\n            methodCache.put(method, result);\n        }\n        return result;\n    }\n\n    private static MethodCache getCached(final Constructor constructor) {\n        MethodCache result = constructorCache.get(constructor);\n        if (result == null) {\n            result = new MethodCache(NotNullAspect.toString(constructor),\n                    constructor.getParameterAnnotations());\n            constructorCache.put(constructor, result);\n        }\n        return result;\n    }\n\n    private static String toString(final Constructor method) {\n        final Class[] args = method.getParameterTypes();\n        String builder = '\\''\n                + method.getName()\n                + '('\n                ;\n        boolean started = true;\n        for (final Class arg : args) {\n            if (!started) {\n                builder += \", \";\n            } else {\n                started = false;\n            }\n            builder = arg.getCanonicalName();\n        }\n        builder = \")'\";\n        return builder;\n    }\n\n    private static String toString(final Method method) {\n        final Class[] args = method.getParameterTypes();\n        String builder = '\\''\n                + method.getReturnType().getSimpleName()\n                +  \" \"\n                + method.getDeclaringClass().getCanonicalName()\n                + '.'\n                + method.getName()\n                + '('\n                ;\n        boolean started = true;\n        for (final Class arg : args) {\n            if (!started) {\n                builder += \", \";\n            } else {\n                started = false;\n            }\n            builder += arg.getCanonicalName();\n        }\n        builder += \")'\";\n        return builder;\n    }\n\n    private static final class MethodCache {\n        private final String message;\n        private final Annotation[][] params;\n\n        private MethodCache(final String message, final Annotation[][] params) {\n            this.message = message;\n            this.params = params;\n        }\n    }\n}\n","old_contents":"package org.nohope.validation;\n\nimport org.aspectj.lang.Signature;\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.aspectj.lang.reflect.ConstructorSignature;\nimport org.aspectj.lang.reflect.MethodSignature;\n\nimport javax.annotation.Nonnull;\nimport javax.annotation.meta.When;\nimport java.lang.annotation.Annotation;\nimport java.lang.reflect.Constructor;\nimport java.lang.reflect.Method;\nimport java.util.Map;\nimport java.util.concurrent.ConcurrentHashMap;\n\npublic final privileged aspect NotNullAspect {\n    private static final Map<Constructor, MethodCache> constructorCache = new ConcurrentHashMap<>();\n    private static final Map<Method, MethodCache> methodCache = new ConcurrentHashMap<>();\n\n    \/** Utility constructor. *\/\n    private NotNullAspect() {\n    }\n\n    pointcut thisAdvice(): adviceexecution() && within(NotNullAspect);\n\n    \/**\n     * matches all constructors with at last one parameter\n     * marked with @Nonnull annotation\n     *\/\n    pointcut nonNullConstructorParameters():\n            execution(new(.., @javax.annotation.Nonnull (*), ..))\n            && !cflow(thisAdvice())\n            ;\n\n    \/**\n     * searches for all methods have at last one parameter\n     * annotated with @Nonnull\n     *\/\n    pointcut nonNullMethodParameters():\n            execution(* *.*(.., @javax.annotation.Nonnull (*), ..))\n            && !cflow(thisAdvice())\n            ;\n\n    \/**\n     * searches for all methods which returns any reference type and\n     * annotated with @Nonnull\n     *\/\n    static pointcut validatedReturnValue():\n            execution(@javax.annotation.Nonnull (Object+) *.*(..))\n            && !cflow(thisAdvice())\n            ;\n\n    @SuppressAjWarnings\n    after() returning(final Object ret): validatedReturnValue() {\n        final MethodSignature sig = (MethodSignature) thisJoinPoint.getStaticPart().getSignature();\n        if (ret == null) {\n            throw new IllegalStateException(\"@Nonnull method \"\n                    + toString(sig.getMethod())\n                    + \" must not return null\");\n        }\n    }\n\n    @SuppressAjWarnings\n    before(): nonNullMethodParameters() || nonNullConstructorParameters() {\n        final Signature signature = thisJoinPoint.getStaticPart().getSignature();\n        final MethodCache cache;\n\n        if (signature instanceof MethodSignature) {\n            final MethodSignature sig = (MethodSignature) thisJoinPoint.getStaticPart().getSignature();\n            final Method method = sig.getMethod();\n            cache = getCached(method);\n        } else if (signature instanceof ConstructorSignature) {\n            final ConstructorSignature sig = (ConstructorSignature) signature;\n            final Constructor method = sig.getConstructor();\n            cache = getCached(method);\n        } else {\n            throw new IllegalStateException(\"Illegal advice for \" + signature.getClass());\n        }\n\n        final Object[] args = thisJoinPoint.getArgs();\n        final int constructorDiff = args.length - cache.params.length;\n        for (int j = constructorDiff; j < args.length; j++) {\n            final Object obj = args[j];\n            Nonnull a = null;\n            for (Annotation annotation : cache.params[j - constructorDiff]) {\n                if (annotation instanceof Nonnull) {\n                    a = (Nonnull) annotation;\n                    break;\n                }\n            }\n\n            if (obj == null && a != null && a.when() == When.ALWAYS) {\n                throw new IllegalArgumentException(\"Argument \"\n                        + (j - constructorDiff + 1)\n                        + \" for @Nonnull parameter of \"\n                        + cache.message\n                        + \" must not be null\"\n                );\n            }\n        }\n    }\n\n    private static MethodCache getCached(final Method method) {\n        MethodCache result = methodCache.get(method);\n        if (result == null) {\n            result = new MethodCache(NotNullAspect.toString(method),\n                    method.getParameterAnnotations());\n            methodCache.put(method, result);\n        }\n        return result;\n    }\n\n    private static MethodCache getCached(final Constructor constructor) {\n        MethodCache result = constructorCache.get(constructor);\n        if (result == null) {\n            result = new MethodCache(NotNullAspect.toString(constructor),\n                    constructor.getParameterAnnotations());\n            constructorCache.put(constructor, result);\n        }\n        return result;\n    }\n\n    private static String toString(final Constructor method) {\n        final Class[] args = method.getParameterTypes();\n        String builder = '\\''\n                + method.getName()\n                + '('\n                ;\n        boolean started = true;\n        for (final Class arg : args) {\n            if (!started) {\n                builder += \", \";\n            } else {\n                started = false;\n            }\n            builder = arg.getCanonicalName();\n        }\n        builder = \")'\";\n        return builder;\n    }\n\n    private static String toString(final Method method) {\n        final Class[] args = method.getParameterTypes();\n        String builder = '\\''\n                + method.getReturnType().getSimpleName()\n                +  \" \"\n                + method.getDeclaringClass().getCanonicalName()\n                + '.'\n                + method.getName()\n                + '('\n                ;\n        boolean started = true;\n        for (final Class arg : args) {\n            if (!started) {\n                builder += \", \";\n            } else {\n                started = false;\n            }\n            builder += arg.getCanonicalName();\n        }\n        builder += \")'\";\n        return builder;\n    }\n\n    private static class MethodCache {\n        private final String message;\n        private final Annotation[][] params;\n\n        private MethodCache(final String message, final Annotation[][] params) {\n            this.message = message;\n            this.params = params;\n        }\n    }\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"9d0eb40deef5e07d2cbc8e2c83f94a9e30d8ef44","subject":"load static block on main entry","message":"load static block on main entry\n","repos":"mebigfatguy\/hashshmash","old_file":"aj\/com\/mebigfatguy\/hashshmash\/HashCollector.aj","new_file":"aj\/com\/mebigfatguy\/hashshmash\/HashCollector.aj","new_contents":"package com.mebigfatguy.hashshmash;\n\nimport java.io.BufferedWriter;\nimport java.io.File;\nimport java.io.FileOutputStream;\nimport java.io.OutputStreamWriter;\nimport java.io.PrintWriter;\nimport java.lang.reflect.Field;\nimport java.text.SimpleDateFormat;\nimport java.util.Date;\nimport java.util.HashMap;\nimport java.util.Map;\nimport java.util.Map.Entry;\nimport java.util.concurrent.ConcurrentHashMap;\n\npublic aspect HashCollector {\n    \n    private static final Journaller journaller = new Journaller();\n\n    after() returning (Map m): call(HashMap.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashMapDetails details = new HashMapDetails(m, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n    \n    before(): execution(public static void *.main(String[])) {\n        Class<?> c = HashCollector.class;\n    }\n}\n\nfinal class Journaller implements Runnable {\n    \n    private static final int SLEEP_TIME = 10 * 1000;\n    \n    private Field tableField;\n    private ConcurrentHashMap<HashMapDetails, HashMapDetails> hmDetails = new ConcurrentHashMap<HashMapDetails, HashMapDetails>();\n    private PrintWriter writer;\n    private SimpleDateFormat formatter;\n\n    public Journaller() {\n        try {\n            \n            tableField = HashMap.class.getDeclaredField(\"table\");\n            tableField.setAccessible(true);\n              \n            formatter = new SimpleDateFormat(\"MM\/dd\/yyyy HH:mm:ss\");\n            File dir = new File(System.getProperty(\"user.home\"), \".hashshmash\");\n            dir.mkdirs();  \n            \n            writer = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(new File(dir, new Date().toString() + \".txt\")))));\n            \n            Thread t = new Thread(this);\n            t.setDaemon(true);\n            t.start();\n        } catch (Exception e) {\n        }\n    }\n    \n    public void add(HashMapDetails details) {\n        hmDetails.put(details,  details);\n    }\n    \n    public void run() {\n        try {\n            while (!Thread.interrupted()) {\n                Thread.sleep(SLEEP_TIME);\n                \n                for (HashMapDetails details : hmDetails.keySet()) {\n                    try {\n                        int newSize = details.map.size();\n                        if (newSize == details.size) {\n                            Entry<?, ?>[] table = (Entry<?, ?>[])tableField.get(details.map);\n                            details.totalSlots = table.length;\n                            for (Entry<?, ?> e : table) {\n                                if (e != null) {\n                                    details.usedSlots++;\n                                }\n                            }\n                            writer.println(formatter.format(details.allocTime) + \"\\t\" + details.caller + \"\\t\" + details.map.size() + \"\\t\" + details.totalSlots + \"\\t\" + details.usedSlots);\n                            hmDetails.remove(details);\n                        } else {\n                            details.size = newSize;\n                        }\n                    } catch (Exception e) {\n                        \/\/might get ConcurrentModificationException or such, just ignore\n                    }\n                }\n                writer.flush();\n            }\n        } catch (InterruptedException ie) {    \n        }\n    }\n}\n\nclass HashMapDetails {\n    public Map<?, ?> map;\n    public Date allocTime;\n    public String caller;\n    public int size;\n    public int usedSlots;\n    public int totalSlots;\n\n    public HashMapDetails(Map<?, ?> m, Date d, String c) {\n        map = m;\n        allocTime = d;\n        caller = c;\n        size = map.size();\n    }\n}\n","old_contents":"package com.mebigfatguy.hashshmash;\n\nimport java.io.BufferedWriter;\nimport java.io.File;\nimport java.io.FileOutputStream;\nimport java.io.OutputStreamWriter;\nimport java.io.PrintWriter;\nimport java.lang.reflect.Field;\nimport java.text.SimpleDateFormat;\nimport java.util.Date;\nimport java.util.HashMap;\nimport java.util.Map;\nimport java.util.Map.Entry;\nimport java.util.concurrent.ConcurrentHashMap;\n\npublic aspect HashCollector {\n    \n    private static final Journaller journaller = new Journaller();\n\n    after() returning (Map m): call(HashMap.new(..)) {\n        String fileName = thisJoinPointStaticPart.getSourceLocation().getFileName();\n        int line = thisJoinPointStaticPart.getSourceLocation().getLine();\n        \n        HashMapDetails details = new HashMapDetails(m, new Date(), fileName + \":\" + line);\n        journaller.add(details);\n    }\n}\n\nfinal class Journaller implements Runnable {\n    \n    private static final int SLEEP_TIME = 10 * 1000;\n    \n    private Field tableField;\n    private ConcurrentHashMap<HashMapDetails, HashMapDetails> hmDetails = new ConcurrentHashMap<HashMapDetails, HashMapDetails>();\n    private PrintWriter writer;\n    private SimpleDateFormat formatter;\n\n    public Journaller() {\n        try {\n            tableField = HashMap.class.getDeclaredField(\"table\");\n            tableField.setAccessible(true);\n              \n            formatter = new SimpleDateFormat(\"MM\/dd\/yyyy HH:mm:ss\");\n            File dir = new File(System.getProperty(\"user.home\"), \".hashshmash\");\n            dir.mkdirs();  \n            \n            writer = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(new File(dir, new Date().toString() + \".txt\")))));\n            \n            Thread t = new Thread(this);\n            t.setDaemon(true);\n            t.start();\n        } catch (Exception e) {\n        }\n    }\n    \n    public void add(HashMapDetails details) {\n        hmDetails.put(details,  details);\n    }\n    \n    public void run() {\n        try {\n            while (!Thread.interrupted()) {\n                Thread.sleep(SLEEP_TIME);\n                \n                for (HashMapDetails details : hmDetails.keySet()) {\n                    try {\n                        int newSize = details.map.size();\n                        if (newSize == details.size) {\n                            Entry<?, ?>[] table = (Entry<?, ?>[])tableField.get(details.map);\n                            details.totalSlots = table.length;\n                            for (Entry<?, ?> e : table) {\n                                if (e != null) {\n                                    details.usedSlots++;\n                                }\n                            }\n                            writer.println(formatter.format(details.allocTime) + \"\\t\" + details.caller + \"\\t\" + details.map.size() + \"\\t\" + details.totalSlots + \"\\t\" + details.usedSlots);\n                            hmDetails.remove(details);\n                        } else {\n                            details.size = newSize;\n                        }\n                    } catch (Exception e) {\n                        \/\/might get ConcurrentModificationException or such, just ignore\n                    }\n                }\n                writer.flush();\n            }\n        } catch (InterruptedException ie) {    \n        }\n    }\n}\n\nclass HashMapDetails {\n    public Map<?, ?> map;\n    public Date allocTime;\n    public String caller;\n    public int size;\n    public int usedSlots;\n    public int totalSlots;\n\n    public HashMapDetails(Map<?, ?> m, Date d, String c) {\n        map = m;\n        allocTime = d;\n        caller = c;\n        size = map.size();\n    }\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"25eee20c97f3259d931c30df069a857982ff2ba0","subject":"QEA monitoring aspect added containing: *Initialisation of the monitor *Calculation of the time taken by the program","message":"QEA monitoring aspect added containing:\n*Initialisation of the monitor\n*Calculation of the time taken by the program\n","repos":"selig\/qea","old_file":"code\/qea\/src\/monitoring\/intf\/QEAMonitoringAspect.aj","new_file":"code\/qea\/src\/monitoring\/intf\/QEAMonitoringAspect.aj","new_contents":"package monitoring.intf;\n\nimport monitoring.impl.MonitorFactory;\nimport structure.impl.other.Verdict;\nimport structure.intf.QEA;\n\npublic abstract aspect QEAMonitoringAspect {\n\n\tprotected final Monitor monitor;\n\tprotected long startTime;\n\tprotected String validationMsg;\n\tprotected String violationMsg;\n\n\tpublic QEAMonitoringAspect(QEA qea) {\n\t\tmonitor = MonitorFactory.create(qea);\n\t}\n\n\tpointcut main() : execution(void *.main(String[])) ||\n\t\texecution(void *.main(String...));\n\n\tbefore() : main() {\n\t\tstartTime = System.currentTimeMillis();\n\t}\n\n\tafter() : main() {\n\t\tVerdict verdict = monitor.end();\n\t\tif (verdict == Verdict.WEAK_SUCCESS || verdict == Verdict.SUCCESS) {\n\t\t\tSystem.err.println(validationMsg);\n\t\t} else {\n\t\t\tSystem.err.println(violationMsg);\n\t\t}\n\t\tlong totalTime = System.currentTimeMillis() - startTime;\n\t\tSystem.err.println(\">>Execution time: \" + totalTime);\n\t}\n\n\tprotected void printTimeAndExit() {\n\t\tlong totalTime = System.currentTimeMillis() - startTime;\n\t\tSystem.err.println(\">>Execution time: \" + totalTime);\n\t\tSystem.exit(0);\n\t}\n\n}\n","old_contents":"","returncode":1,"stderr":"error: pathspec 'code\/qea\/src\/monitoring\/intf\/QEAMonitoringAspect.aj' did not match any file(s) known to git\n","license":"mit","lang":"AspectJ"}
{"commit":"f3ba5d0d9abd533d1f0ba51bb46ed9ea73f53aff","subject":"Check if the activity is finishing before showing the wait for fix dialog. Hope this will fix a reported crash that we couldn't reproduce.","message":"Check if the activity is finishing before showing the wait for fix dialog. Hope this will fix a reported crash that we couldn't reproduce.","repos":"mttkay\/ignition,Applied-Duality\/ignition,hongnguyenpro\/ignition,treejames\/ignition","old_file":"ignition-location\/ignition-location-lib\/src\/com\/github\/ignition\/location\/IgnitedLocationManager.aj","new_file":"ignition-location\/ignition-location-lib\/src\/com\/github\/ignition\/location\/IgnitedLocationManager.aj","new_contents":"\/*\n * Copyright 2011 Google Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * This code has been modified by Stefano Dacchille.\n *\/\n\npackage com.github.ignition.location;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\n\nimport android.app.Activity;\nimport android.app.PendingIntent;\nimport android.content.BroadcastReceiver;\nimport android.content.Context;\nimport android.content.Intent;\nimport android.content.IntentFilter;\nimport android.content.SharedPreferences;\nimport android.content.SharedPreferences.Editor;\nimport android.location.Criteria;\nimport android.location.Location;\nimport android.location.LocationListener;\nimport android.location.LocationManager;\nimport android.os.AsyncTask;\nimport android.os.BatteryManager;\nimport android.os.Bundle;\nimport android.os.Handler;\nimport android.util.Log;\n\nimport com.github.ignition.location.annotations.IgnitedLocation;\nimport com.github.ignition.location.annotations.IgnitedLocationActivity;\nimport com.github.ignition.location.receivers.IgnitedLocationChangedReceiver;\nimport com.github.ignition.location.receivers.IgnitedPassiveLocationChangedReceiver;\nimport com.github.ignition.location.tasks.IgnitedLastKnownLocationAsyncTask;\nimport com.github.ignition.location.templates.ILastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLocationUpdateRequester;\nimport com.github.ignition.location.templates.OnIgnitedLocationChangedListener;\nimport com.github.ignition.location.utils.PlatformSpecificImplementationFactory;\nimport com.github.ignition.support.IgnitedDiagnostics;\n\n@SuppressAjWarnings\npublic aspect IgnitedLocationManager {\n    public static final String LOG_TAG = IgnitedLocationManager.class.getSimpleName();\n\n    declare parents : (@IgnitedLocationActivity *) implements OnIgnitedLocationChangedListener;\n\n    private Criteria defaultCriteria, lowPowerCriteria;\n    protected IgnitedAbstractLocationUpdateRequester locationUpdateRequester;\n    protected PendingIntent locationListenerPendingIntent, locationListenerPassivePendingIntent;\n    protected LocationManager locationManager;\n    protected IgnitedLocationListener bestInactiveLocationProviderListener;\n\n    private Context context;\n    private volatile Location currentLocation;\n\n    private IgnitedLastKnownLocationAsyncTask ignitedLastKnownLocationTask;\n    private SharedPreferences prefs;\n    private Handler handler;\n\n    private long locationUpdatesInterval, passiveLocationUpdatesInterval;\n    private int locationUpdatesDistanceDiff;\n    private int passiveLocationUpdatesDistanceDiff;\n    private boolean requestLocationUpdates;\n    private boolean locationUpdatesDisabled = true;\n    private boolean waitForFixDialogShown = false;\n\n    \/\/ Switch to another provider if gps doesn't return a location quickly enough.\n    private Runnable removeGpsUpdates = new Runnable() {\n        @Override\n        public void run() {\n            Log.d(LOG_TAG,\n                    \"It looks like GPS isn't available at this time (i.e.: maybe you're indoors). Removing GPS location updates and requesting network updates.\");\n\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, lowPowerCriteria());\n        }\n    };\n\n    \/**\n     * If the Location Provider we're using to receive location updates is disabled while the app is\n     * running, this Receiver will be notified, allowing us to re-register our Location Receivers\n     * using the best available Location Provider is still available.\n     *\/\n    protected BroadcastReceiver locationProviderDisabledReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            boolean providerDisabled = !intent.getBooleanExtra(\n                    LocationManager.KEY_PROVIDER_ENABLED, false);\n            \/\/ Re-register the location listeners using the best available\n            \/\/ Location Provider.\n            if (providerDisabled) {\n                disableLocationUpdates(false);\n                requestLocationUpdates(context, null);\n            }\n        }\n    };\n\n    \/**\n     * If the battery state is low disable the passive location update receiver.\n     *\/\n    protected BroadcastReceiver refreshLocationUpdatesReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, null);\n        }\n    };\n\n    after(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onCreate(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n\n        \/\/ Get a reference to the Context\n        this.context = context;\n        \/\/ Set pref file\n        prefs = context.getSharedPreferences(IgnitedLocationConstants.SHARED_PREFERENCE_FILE,\n                Context.MODE_PRIVATE);\n        \/\/ Get references to the managers\n        locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);\n        handler = new Handler();\n\n        \/\/ Specify the Criteria to use when requesting location updates while\n        \/\/ the application is Active\n        if (defaultCriteria == null) {\n            defaultCriteria = new Criteria();\n        }\n        \/\/ Use gps if it's enabled and if battery level is at least 15%\n        boolean useGps = prefs.getBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS,\n                IgnitedLocationConstants.USE_GPS_DEFAULT);\n        if (useGps) {\n            defaultCriteria.setAccuracy(Criteria.ACCURACY_FINE);\n        } else {\n            defaultCriteria.setPowerRequirement(Criteria.POWER_LOW);\n        }\n\n        \/\/ Setup the location update Pending Intent\n        Intent activeIntent = new Intent(IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_ACTION);\n        locationListenerPendingIntent = PendingIntent.getBroadcast(context, 0, activeIntent,\n                PendingIntent.FLAG_UPDATE_CURRENT);\n        \/\/ Setup the passive location update Pending Intent\n        Intent passiveIntent = new Intent(context, IgnitedPassiveLocationChangedReceiver.class);\n        locationListenerPassivePendingIntent = PendingIntent.getBroadcast(context, 0,\n                passiveIntent, PendingIntent.FLAG_UPDATE_CURRENT);\n\n        \/\/ Instantiate a Location Update Requester class based on the available\n        \/\/ platform version. This will be used to request location updates.\n        locationUpdateRequester = PlatformSpecificImplementationFactory\n                .getLocationUpdateRequester(context);\n    }\n\n    private boolean isBatteryOk() {\n        IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);\n        Intent intent = context.registerReceiver(null, filter);\n        double currentLevel = 100.0;\n        if (intent != null) {\n            currentLevel = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1);\n        }\n\n        return currentLevel >= prefs.getInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                IgnitedLocationConstants.MIN_BATTERY_LEVEL_FOR_GPS_DEFAULT);\n    }\n\n    before(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onResume(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n        \/\/ Get a reference to the Context if this context is null\n        if (this.context == null) {\n            this.context = context;\n        }\n\n        saveToPreferences(context, ignitedAnnotation);\n\n        Log.d(LOG_TAG, \"Retrieving last known location...\");\n        \/\/ Get the last known location. This isn't directly affecting the UI, so put it on a\n        \/\/ worker thread.\n        ignitedLastKnownLocationTask = new IgnitedLastKnownLocationAsyncTask(context,\n                locationUpdatesDistanceDiff, locationUpdatesInterval);\n        ignitedLastKnownLocationTask.execute();\n    }\n\n    \/**\n     * Save last settings to preferences.\n     * \n     * @param context\n     * @param locationAnnotation\n     *\/\n    private void saveToPreferences(Context context, IgnitedLocationActivity locationAnnotation) {\n        requestLocationUpdates = locationAnnotation.requestLocationUpdates();\n        locationUpdatesDistanceDiff = locationAnnotation.locationUpdatesDistanceDiff();\n        locationUpdatesInterval = locationAnnotation.locationUpdatesInterval();\n        passiveLocationUpdatesDistanceDiff = locationAnnotation\n                .passiveLocationUpdatesDistanceDiff();\n        passiveLocationUpdatesInterval = locationAnnotation.passiveLocationUpdatesInterval();\n        boolean enablePassiveLocationUpdates = locationAnnotation.enablePassiveUpdates();\n        boolean useGps = locationAnnotation.useGps();\n\n        Editor editor = prefs.edit();\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_LOCATION_UPDATES,\n                requestLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                enablePassiveLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS, useGps);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_DISTANCE_DIFF,\n                locationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_INTERVAL,\n                locationUpdatesInterval);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_DISTANCE_DIFF,\n                passiveLocationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_INTERVAL,\n                passiveLocationUpdatesInterval);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_RUN_ONCE, true);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                locationAnnotation.minBatteryLevelForGps());\n        editor.putLong(IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                locationAnnotation.waitForGpsFixInterval());\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                locationAnnotation.showWaitForLocationDialog());\n        editor.commit();\n\n    }\n\n    before(Activity activity, IgnitedLocationActivity ignitedAnnotation) : execution(* Activity.onPause(..)) \n        && @this(ignitedAnnotation) && this(activity) && within(@IgnitedLocationActivity *) {\n\n        if (ignitedAnnotation.requestLocationUpdates()) {\n            disableLocationUpdates(true);\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n\n        if (ignitedLastKnownLocationTask != null) {\n            if (ignitedLastKnownLocationTask.getStatus() != AsyncTask.Status.FINISHED) {\n                Log.d(LOG_TAG, \"Cancel last location task\");\n                ignitedLastKnownLocationTask.cancel(true);\n            }\n            ignitedLastKnownLocationTask.getLastLocationFinder().cancel();\n        }\n\n        boolean finishing = activity.isFinishing();\n        if (finishing) {\n            context = null;\n        }\n    }\n\n    Location around() : get(@IgnitedLocation Location *) {\n        return currentLocation;\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && within(IgnitedPassiveLocationChangedReceiver) && !adviceexecution() {\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, lng\/acc): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude() + \"\/\"\n                + currentLocation.getAccuracy());\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && (within(IgnitedLocationChangedReceiver) || within(IgnitedAbstractLastLocationFinder)\n                || within(IgnitedLastKnownLocationAsyncTask)) && !adviceexecution() {\n\n        if (context == null) {\n            return;\n        }\n        final Activity activity = (Activity) context;\n        boolean showWaitForLocationDialog = prefs.getBoolean(\n                IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                IgnitedLocationConstants.SHOW_WAIT_FOR_LOCATION_DIALOG_DEFAULT);\n        if (freshLocation == null) {\n            \/\/ TODO Migrate this to DialogFragment at some point\n            if (showWaitForLocationDialog && !activity.isFinishing()) {\n                activity.showDialog(R.id.ign_loc_dialog_wait_for_fix);\n                waitForFixDialogShown = true;\n            }\n            return;\n        }\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, lng\/acc): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude() + \"\/\" + currentLocation.getAccuracy());\n        \/\/ TODO Migrate this to DialogFragment at some point\n        if (waitForFixDialogShown) {\n            activity.removeDialog(R.id.ign_loc_dialog_wait_for_fix);\n            waitForFixDialogShown = false;\n        }\n        boolean keepRequestingLocationUpdates = ((OnIgnitedLocationChangedListener) context)\n                .onIgnitedLocationChanged(currentLocation);\n        Bundle extras = freshLocation.getExtras();\n        \/\/ a) If location updates shouldn't be requested anymore turn them off.\n        \/\/ b) Don't turn location updates on if last location is too old, since the single location\n        \/\/ update is running.\n        if (!keepRequestingLocationUpdates) {\n            disableLocationUpdates(true);\n            \/\/ PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            return;\n        } else if (requestLocationUpdates\n                && (extras == null || !extras.containsKey(ILastLocationFinder.LAST_LOCATION_TOO_OLD_OR_INACCURATE_EXTRA))) {\n            \/\/ If we requested location updates, turn them on here.\n            requestLocationUpdates(context, null);\n        }\n\n        \/\/ If gps is enabled location comes from gps, remove runnable that removes gps updates\n        boolean lastLocation = extras != null && extras.containsKey(IgnitedLocationConstants.IGNITED_LAST_LOCATION_EXTRA);\n        if (!lastLocation && defaultCriteria.getAccuracy() == Criteria.ACCURACY_FINE\n                && currentLocation.getProvider().equals(LocationManager.GPS_PROVIDER)) {\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n    }\n\n    \/**\n     * Start listening for location updates.\n     *\/\n    protected void requestLocationUpdates(Context context, Criteria criteria) {\n        if (!locationUpdatesDisabled) {\n            return;\n        }\n        Criteria locationUpdateCriteria = criteria;\n        if (criteria == null) {\n            if (isBatteryOk()) {\n                locationUpdateCriteria = defaultCriteria;\n            } else {\n                locationUpdateCriteria = lowPowerCriteria();\n            }\n        }\n        Log.d(LOG_TAG, \"Disabling passive location updates\");\n        locationManager.removeUpdates(locationListenerPassivePendingIntent);\n\n        Log.d(LOG_TAG, \"Requesting location updates\");\n        \/\/ Normal updates while activity is visible.\n        locationUpdateRequester.requestLocationUpdates(locationUpdatesInterval,\n                locationUpdatesDistanceDiff, locationUpdateCriteria, locationListenerPendingIntent);\n\n        \/\/ Register a receiver that listens for when the provider I'm using has\n        \/\/ been disabled.\n        IntentFilter locationProviderDisabledIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_PROVIDER_DISABLED_ACTION);\n        context.registerReceiver(locationProviderDisabledReceiver,\n                locationProviderDisabledIntentFilter);\n\n        IntentFilter refreshLocationUpdatesIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.UPDATE_LOCATION_UPDATES_CRITERIA_ACTION);\n        context.registerReceiver(refreshLocationUpdatesReceiver, refreshLocationUpdatesIntentFilter);\n\n        \/\/ Register a receiver that listens for when a better provider than I'm\n        \/\/ using becomes available.\n        String bestProvider = locationManager.getBestProvider(locationUpdateCriteria, false);\n        String bestAvailableProvider = locationManager.getBestProvider(locationUpdateCriteria, true);\n        if (bestProvider != null && !bestProvider.equals(bestAvailableProvider)) {\n            bestInactiveLocationProviderListener = new IgnitedLocationListener(context);\n            locationManager.requestLocationUpdates(bestProvider, 0, 0,\n                    bestInactiveLocationProviderListener, context.getMainLooper());\n        }\n\n        if (bestAvailableProvider.equals(LocationManager.GPS_PROVIDER)) {\n            Log.d(LOG_TAG, \"Posting delayed remove GPS updates message\");\n            \/\/ Post a runnable that will remove gps updates if no gps location is returned after 1\n            \/\/ minute in order to avoid draining the battery.\n            handler.postDelayed(removeGpsUpdates, prefs.getLong(\n                    IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                    IgnitedLocationConstants.WAIT_FOR_GPS_FIX_INTERVAL_DEFAULT));\n        }\n\n        locationUpdatesDisabled = false;\n    }\n\n    \/**\n     * Stop listening for location updates\n     * \n     * @param enablePassiveLocationUpdates\n     *\/\n    protected void disableLocationUpdates(boolean requestPassiveLocationUpdates) {\n        if (locationUpdatesDisabled) {\n            return;\n        }\n\n        Log.d(LOG_TAG, \"Disabling location updates\");\n        context.unregisterReceiver(locationProviderDisabledReceiver);\n        context.unregisterReceiver(refreshLocationUpdatesReceiver);\n\n        locationUpdateRequester.removeLocationUpdates();\n        if (bestInactiveLocationProviderListener != null) {\n            locationManager.removeUpdates(bestInactiveLocationProviderListener);\n        }\n\n        boolean finishing = ((Activity) context).isFinishing();\n\n        if (requestPassiveLocationUpdates && !finishing) {\n            requestPassiveLocationUpdates();\n        }\n\n        locationUpdatesDisabled = true;\n    }\n\n    private void requestPassiveLocationUpdates() {\n        if (IgnitedDiagnostics.SUPPORTS_FROYO\n                && prefs.getBoolean(\n                        IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                        IgnitedLocationConstants.ENABLE_PASSIVE_LOCATION_UPDATES_DEFAULT)) {\n            Log.d(LOG_TAG, \"Requesting passive location updates\");\n            \/\/ Passive location updates from 3rd party apps when the Activity isn't\n            \/\/ visible. Only for Android 2.2+.\n            locationUpdateRequester.requestPassiveLocationUpdates(passiveLocationUpdatesInterval,\n                    passiveLocationUpdatesDistanceDiff, locationListenerPassivePendingIntent);\n        }\n    }\n\n    public boolean isLocationUpdatesDisabled() {\n        return locationUpdatesDisabled;\n    }\n\n    public Criteria lowPowerCriteria() {\n        if (lowPowerCriteria == null) {\n            lowPowerCriteria = new Criteria();\n            lowPowerCriteria.setPowerRequirement(Criteria.POWER_LOW);\n            lowPowerCriteria.setAccuracy(Criteria.NO_REQUIREMENT);\n        }\n        return lowPowerCriteria;\n    }\n\n    \/**\n     * If the best Location Provider (usually GPS) is not available when we request location\n     * updates, this listener will be notified if \/ when it becomes available. It calls\n     * requestLocationUpdates to re-register the location listeners using the better Location\n     * Provider.\n     *\/\n    private class IgnitedLocationListener implements LocationListener {\n        private Context context;\n\n        public IgnitedLocationListener(Context appContext) {\n            this.context = appContext;\n        }\n\n        @Override\n        public void onLocationChanged(Location l) {\n        }\n\n        @Override\n        public void onProviderDisabled(String provider) {\n        }\n\n        @Override\n        public void onStatusChanged(String provider, int status, Bundle extras) {\n        }\n\n        @Override\n        public void onProviderEnabled(String provider) {\n            \/\/ Re-register the location listeners using the better Location\n            \/\/ Provider.\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, null);\n        }\n    }\n\n}\n","old_contents":"\/*\n * Copyright 2011 Google Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * This code has been modified by Stefano Dacchille.\n *\/\n\npackage com.github.ignition.location;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\n\nimport android.app.Activity;\nimport android.app.PendingIntent;\nimport android.content.BroadcastReceiver;\nimport android.content.Context;\nimport android.content.Intent;\nimport android.content.IntentFilter;\nimport android.content.SharedPreferences;\nimport android.content.SharedPreferences.Editor;\nimport android.location.Criteria;\nimport android.location.Location;\nimport android.location.LocationListener;\nimport android.location.LocationManager;\nimport android.os.AsyncTask;\nimport android.os.BatteryManager;\nimport android.os.Bundle;\nimport android.os.Handler;\nimport android.util.Log;\n\nimport com.github.ignition.location.annotations.IgnitedLocation;\nimport com.github.ignition.location.annotations.IgnitedLocationActivity;\nimport com.github.ignition.location.receivers.IgnitedLocationChangedReceiver;\nimport com.github.ignition.location.receivers.IgnitedPassiveLocationChangedReceiver;\nimport com.github.ignition.location.tasks.IgnitedLastKnownLocationAsyncTask;\nimport com.github.ignition.location.templates.ILastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLocationUpdateRequester;\nimport com.github.ignition.location.templates.OnIgnitedLocationChangedListener;\nimport com.github.ignition.location.utils.PlatformSpecificImplementationFactory;\nimport com.github.ignition.support.IgnitedDiagnostics;\n\n@SuppressAjWarnings\npublic aspect IgnitedLocationManager {\n    public static final String LOG_TAG = IgnitedLocationManager.class.getSimpleName();\n\n    declare parents : (@IgnitedLocationActivity *) implements OnIgnitedLocationChangedListener;\n\n    private Criteria defaultCriteria, lowPowerCriteria;\n    protected IgnitedAbstractLocationUpdateRequester locationUpdateRequester;\n    protected PendingIntent locationListenerPendingIntent, locationListenerPassivePendingIntent;\n    protected LocationManager locationManager;\n    protected IgnitedLocationListener bestInactiveLocationProviderListener;\n\n    private Context context;\n    private volatile Location currentLocation;\n\n    private IgnitedLastKnownLocationAsyncTask ignitedLastKnownLocationTask;\n    private SharedPreferences prefs;\n    private Handler handler;\n\n    private long locationUpdatesInterval, passiveLocationUpdatesInterval;\n    private int locationUpdatesDistanceDiff;\n    private int passiveLocationUpdatesDistanceDiff;\n    private boolean requestLocationUpdates;\n    private boolean locationUpdatesDisabled = true;\n    private boolean waitForFixDialogShown = false;\n\n    \/\/ Switch to another provider if gps doesn't return a location quickly enough.\n    private Runnable removeGpsUpdates = new Runnable() {\n        @Override\n        public void run() {\n            Log.d(LOG_TAG,\n                    \"It looks like GPS isn't available at this time (i.e.: maybe you're indoors). Removing GPS location updates and requesting network updates.\");\n\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, lowPowerCriteria());\n        }\n    };\n\n    \/**\n     * If the Location Provider we're using to receive location updates is disabled while the app is\n     * running, this Receiver will be notified, allowing us to re-register our Location Receivers\n     * using the best available Location Provider is still available.\n     *\/\n    protected BroadcastReceiver locationProviderDisabledReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            boolean providerDisabled = !intent.getBooleanExtra(\n                    LocationManager.KEY_PROVIDER_ENABLED, false);\n            \/\/ Re-register the location listeners using the best available\n            \/\/ Location Provider.\n            if (providerDisabled) {\n                disableLocationUpdates(false);\n                requestLocationUpdates(context, null);\n            }\n        }\n    };\n\n    \/**\n     * If the battery state is low disable the passive location update receiver.\n     *\/\n    protected BroadcastReceiver refreshLocationUpdatesReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, null);\n        }\n    };\n\n    after(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onCreate(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n\n        \/\/ Get a reference to the Context\n        this.context = context;\n        \/\/ Set pref file\n        prefs = context.getSharedPreferences(IgnitedLocationConstants.SHARED_PREFERENCE_FILE,\n                Context.MODE_PRIVATE);\n        \/\/ Get references to the managers\n        locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);\n        handler = new Handler();\n\n        \/\/ Specify the Criteria to use when requesting location updates while\n        \/\/ the application is Active\n        if (defaultCriteria == null) {\n            defaultCriteria = new Criteria();\n        }\n        \/\/ Use gps if it's enabled and if battery level is at least 15%\n        boolean useGps = prefs.getBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS,\n                IgnitedLocationConstants.USE_GPS_DEFAULT);\n        if (useGps) {\n            defaultCriteria.setAccuracy(Criteria.ACCURACY_FINE);\n        } else {\n            defaultCriteria.setPowerRequirement(Criteria.POWER_LOW);\n        }\n\n        \/\/ Setup the location update Pending Intent\n        Intent activeIntent = new Intent(IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_ACTION);\n        locationListenerPendingIntent = PendingIntent.getBroadcast(context, 0, activeIntent,\n                PendingIntent.FLAG_UPDATE_CURRENT);\n        \/\/ Setup the passive location update Pending Intent\n        Intent passiveIntent = new Intent(context, IgnitedPassiveLocationChangedReceiver.class);\n        locationListenerPassivePendingIntent = PendingIntent.getBroadcast(context, 0,\n                passiveIntent, PendingIntent.FLAG_UPDATE_CURRENT);\n\n        \/\/ Instantiate a Location Update Requester class based on the available\n        \/\/ platform version. This will be used to request location updates.\n        locationUpdateRequester = PlatformSpecificImplementationFactory\n                .getLocationUpdateRequester(context);\n    }\n\n    private boolean isBatteryOk() {\n        IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);\n        Intent intent = context.registerReceiver(null, filter);\n        double currentLevel = 100.0;\n        if (intent != null) {\n            currentLevel = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1);\n        }\n\n        return currentLevel >= prefs.getInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                IgnitedLocationConstants.MIN_BATTERY_LEVEL_FOR_GPS_DEFAULT);\n    }\n\n    before(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onResume(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n        \/\/ Get a reference to the Context if this context is null\n        if (this.context == null) {\n            this.context = context;\n        }\n\n        saveToPreferences(context, ignitedAnnotation);\n\n        Log.d(LOG_TAG, \"Retrieving last known location...\");\n        \/\/ Get the last known location. This isn't directly affecting the UI, so put it on a\n        \/\/ worker thread.\n        ignitedLastKnownLocationTask = new IgnitedLastKnownLocationAsyncTask(context,\n                locationUpdatesDistanceDiff, locationUpdatesInterval);\n        ignitedLastKnownLocationTask.execute();\n    }\n\n    \/**\n     * Save last settings to preferences.\n     * \n     * @param context\n     * @param locationAnnotation\n     *\/\n    private void saveToPreferences(Context context, IgnitedLocationActivity locationAnnotation) {\n        requestLocationUpdates = locationAnnotation.requestLocationUpdates();\n        locationUpdatesDistanceDiff = locationAnnotation.locationUpdatesDistanceDiff();\n        locationUpdatesInterval = locationAnnotation.locationUpdatesInterval();\n        passiveLocationUpdatesDistanceDiff = locationAnnotation\n                .passiveLocationUpdatesDistanceDiff();\n        passiveLocationUpdatesInterval = locationAnnotation.passiveLocationUpdatesInterval();\n        boolean enablePassiveLocationUpdates = locationAnnotation.enablePassiveUpdates();\n        boolean useGps = locationAnnotation.useGps();\n\n        Editor editor = prefs.edit();\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_LOCATION_UPDATES,\n                requestLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                enablePassiveLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS, useGps);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_DISTANCE_DIFF,\n                locationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_INTERVAL,\n                locationUpdatesInterval);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_DISTANCE_DIFF,\n                passiveLocationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_INTERVAL,\n                passiveLocationUpdatesInterval);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_RUN_ONCE, true);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                locationAnnotation.minBatteryLevelForGps());\n        editor.putLong(IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                locationAnnotation.waitForGpsFixInterval());\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                locationAnnotation.showWaitForLocationDialog());\n        editor.commit();\n\n    }\n\n    before(Activity activity, IgnitedLocationActivity ignitedAnnotation) : execution(* Activity.onPause(..)) \n        && @this(ignitedAnnotation) && this(activity) && within(@IgnitedLocationActivity *) {\n\n        if (ignitedAnnotation.requestLocationUpdates()) {\n            disableLocationUpdates(true);\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n\n        if (ignitedLastKnownLocationTask != null) {\n            if (ignitedLastKnownLocationTask.getStatus() != AsyncTask.Status.FINISHED) {\n                Log.d(LOG_TAG, \"Cancel last location task\");\n                ignitedLastKnownLocationTask.cancel(true);\n            }\n            ignitedLastKnownLocationTask.getLastLocationFinder().cancel();\n        }\n\n        boolean finishing = activity.isFinishing();\n        if (finishing) {\n            context = null;\n        }\n    }\n\n    Location around() : get(@IgnitedLocation Location *) {\n        return currentLocation;\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && within(IgnitedPassiveLocationChangedReceiver) && !adviceexecution() {\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, lng\/acc): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude() + \"\/\"\n                + currentLocation.getAccuracy());\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && (within(IgnitedLocationChangedReceiver) || within(IgnitedAbstractLastLocationFinder)\n                || within(IgnitedLastKnownLocationAsyncTask)) && !adviceexecution() {\n\n        if (context == null) {\n            return;\n        }\n        final Activity activity = (Activity) context;\n        boolean showWaitForLocationDialog = prefs.getBoolean(\n                IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                IgnitedLocationConstants.SHOW_WAIT_FOR_LOCATION_DIALOG_DEFAULT);\n        if (freshLocation == null) {\n            \/\/ TODO Migrate this to DialogFragment at some point\n            if (showWaitForLocationDialog) {\n                activity.showDialog(R.id.ign_loc_dialog_wait_for_fix);\n                waitForFixDialogShown = true;\n            }\n            return;\n        }\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, lng\/acc): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude() + \"\/\" + currentLocation.getAccuracy());\n        \/\/ TODO Migrate this to DialogFragment at some point\n        if (waitForFixDialogShown) {\n            activity.removeDialog(R.id.ign_loc_dialog_wait_for_fix);\n            waitForFixDialogShown = false;\n        }\n        boolean keepRequestingLocationUpdates = ((OnIgnitedLocationChangedListener) context)\n                .onIgnitedLocationChanged(currentLocation);\n        Bundle extras = freshLocation.getExtras();\n        \/\/ a) If location updates shouldn't be requested anymore turn them off.\n        \/\/ b) Don't turn location updates on if last location is too old, since the single location\n        \/\/ update is running.\n        if (!keepRequestingLocationUpdates) {\n            disableLocationUpdates(true);\n            \/\/ PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            return;\n        } else if (requestLocationUpdates\n                && (extras == null || !extras.containsKey(ILastLocationFinder.LAST_LOCATION_TOO_OLD_OR_INACCURATE_EXTRA))) {\n            \/\/ If we requested location updates, turn them on here.\n            requestLocationUpdates(context, null);\n        }\n\n        \/\/ If gps is enabled location comes from gps, remove runnable that removes gps updates\n        boolean lastLocation = extras != null && extras.containsKey(IgnitedLocationConstants.IGNITED_LAST_LOCATION_EXTRA);\n        if (!lastLocation && defaultCriteria.getAccuracy() == Criteria.ACCURACY_FINE\n                && currentLocation.getProvider().equals(LocationManager.GPS_PROVIDER)) {\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n    }\n\n    \/**\n     * Start listening for location updates.\n     *\/\n    protected void requestLocationUpdates(Context context, Criteria criteria) {\n        if (!locationUpdatesDisabled) {\n            return;\n        }\n        Criteria locationUpdateCriteria = criteria;\n        if (criteria == null) {\n            if (isBatteryOk()) {\n                locationUpdateCriteria = defaultCriteria;\n            } else {\n                locationUpdateCriteria = lowPowerCriteria();\n            }\n        }\n        Log.d(LOG_TAG, \"Disabling passive location updates\");\n        locationManager.removeUpdates(locationListenerPassivePendingIntent);\n\n        Log.d(LOG_TAG, \"Requesting location updates\");\n        \/\/ Normal updates while activity is visible.\n        locationUpdateRequester.requestLocationUpdates(locationUpdatesInterval,\n                locationUpdatesDistanceDiff, locationUpdateCriteria, locationListenerPendingIntent);\n\n        \/\/ Register a receiver that listens for when the provider I'm using has\n        \/\/ been disabled.\n        IntentFilter locationProviderDisabledIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_PROVIDER_DISABLED_ACTION);\n        context.registerReceiver(locationProviderDisabledReceiver,\n                locationProviderDisabledIntentFilter);\n\n        IntentFilter refreshLocationUpdatesIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.UPDATE_LOCATION_UPDATES_CRITERIA_ACTION);\n        context.registerReceiver(refreshLocationUpdatesReceiver, refreshLocationUpdatesIntentFilter);\n\n        \/\/ Register a receiver that listens for when a better provider than I'm\n        \/\/ using becomes available.\n        String bestProvider = locationManager.getBestProvider(locationUpdateCriteria, false);\n        String bestAvailableProvider = locationManager.getBestProvider(locationUpdateCriteria, true);\n        if (bestProvider != null && !bestProvider.equals(bestAvailableProvider)) {\n            bestInactiveLocationProviderListener = new IgnitedLocationListener(context);\n            locationManager.requestLocationUpdates(bestProvider, 0, 0,\n                    bestInactiveLocationProviderListener, context.getMainLooper());\n        }\n\n        if (bestAvailableProvider.equals(LocationManager.GPS_PROVIDER)) {\n            Log.d(LOG_TAG, \"Posting delayed remove GPS updates message\");\n            \/\/ Post a runnable that will remove gps updates if no gps location is returned after 1\n            \/\/ minute in order to avoid draining the battery.\n            handler.postDelayed(removeGpsUpdates, prefs.getLong(\n                    IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                    IgnitedLocationConstants.WAIT_FOR_GPS_FIX_INTERVAL_DEFAULT));\n        }\n\n        locationUpdatesDisabled = false;\n    }\n\n    \/**\n     * Stop listening for location updates\n     * \n     * @param enablePassiveLocationUpdates\n     *\/\n    protected void disableLocationUpdates(boolean requestPassiveLocationUpdates) {\n        if (locationUpdatesDisabled) {\n            return;\n        }\n\n        Log.d(LOG_TAG, \"Disabling location updates\");\n        context.unregisterReceiver(locationProviderDisabledReceiver);\n        context.unregisterReceiver(refreshLocationUpdatesReceiver);\n\n        locationUpdateRequester.removeLocationUpdates();\n        if (bestInactiveLocationProviderListener != null) {\n            locationManager.removeUpdates(bestInactiveLocationProviderListener);\n        }\n\n        boolean finishing = ((Activity) context).isFinishing();\n\n        if (requestPassiveLocationUpdates && !finishing) {\n            requestPassiveLocationUpdates();\n        }\n\n        locationUpdatesDisabled = true;\n    }\n\n    private void requestPassiveLocationUpdates() {\n        if (IgnitedDiagnostics.SUPPORTS_FROYO\n                && prefs.getBoolean(\n                        IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                        IgnitedLocationConstants.ENABLE_PASSIVE_LOCATION_UPDATES_DEFAULT)) {\n            Log.d(LOG_TAG, \"Requesting passive location updates\");\n            \/\/ Passive location updates from 3rd party apps when the Activity isn't\n            \/\/ visible. Only for Android 2.2+.\n            locationUpdateRequester.requestPassiveLocationUpdates(passiveLocationUpdatesInterval,\n                    passiveLocationUpdatesDistanceDiff, locationListenerPassivePendingIntent);\n        }\n    }\n\n    public boolean isLocationUpdatesDisabled() {\n        return locationUpdatesDisabled;\n    }\n\n    public Criteria lowPowerCriteria() {\n        if (lowPowerCriteria == null) {\n            lowPowerCriteria = new Criteria();\n            lowPowerCriteria.setPowerRequirement(Criteria.POWER_LOW);\n            lowPowerCriteria.setAccuracy(Criteria.NO_REQUIREMENT);\n        }\n        return lowPowerCriteria;\n    }\n\n    \/**\n     * If the best Location Provider (usually GPS) is not available when we request location\n     * updates, this listener will be notified if \/ when it becomes available. It calls\n     * requestLocationUpdates to re-register the location listeners using the better Location\n     * Provider.\n     *\/\n    private class IgnitedLocationListener implements LocationListener {\n        private Context context;\n\n        public IgnitedLocationListener(Context appContext) {\n            this.context = appContext;\n        }\n\n        @Override\n        public void onLocationChanged(Location l) {\n        }\n\n        @Override\n        public void onProviderDisabled(String provider) {\n        }\n\n        @Override\n        public void onStatusChanged(String provider, int status, Bundle extras) {\n        }\n\n        @Override\n        public void onProviderEnabled(String provider) {\n            \/\/ Re-register the location listeners using the better Location\n            \/\/ Provider.\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, null);\n        }\n    }\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"99a26a6ddd630099da0fc248b91c1abce129cd9d","subject":"Instrumentation added for property Java 4-3 (JavaMOP)","message":"Instrumentation added for property Java 4-3 (JavaMOP)\n","repos":"selig\/qea","old_file":"code\/qea\/src\/benchmark\/competition\/java\/javaMOP\/JavaMOPThreeAspect.aj","new_file":"code\/qea\/src\/benchmark\/competition\/java\/javaMOP\/JavaMOPThreeAspect.aj","new_contents":"package benchmark.competition.java.javaMOP;\n\nimport monitoring.impl.MonitorFactory;\nimport monitoring.intf.Monitor;\nimport properties.Property;\nimport properties.competition.JavaMOP;\nimport structure.impl.other.Verdict;\nimport structure.intf.QEA;\n\npublic aspect JavaMOPThreeAspect {\n\n\tprivate final Monitor monitor;\n\n\tprivate final int A = 1;\n\tprivate final int B = 2;\n\tprivate final int C = 3;\n\n\tpublic JavaMOPThreeAspect() {\n\t\tQEA qea = new JavaMOP().make(Property.JAVAMOP_THREE);\n\t\tmonitor = MonitorFactory.create(qea);\n\t}\n\t\n\tpointcut A() : call(void CThread2.A());\n\t\n\tpointcut B() : call(void CThread2.B());\n\t\n\tpointcut C() : call(void CThread2.C());\n\t\n\tbefore() : A() {\n\t\tVerdict verdict;\n\t\tsynchronized (monitor) {\n\t\t\tverdict = monitor.step(A);\n\t\t}\n\t\tif (verdict == Verdict.FAILURE) {\n\t\t\tSystem.err\n\t\t\t.println(\"Violation in JavaMOP 3. The functions A(), B(), C() must be called equal times.\");\n\t\t}\n\t}\n\t\n\tbefore() : B() {\n\t\tVerdict verdict;\n\t\tsynchronized (monitor) {\n\t\t\tverdict = monitor.step(B);\n\t\t}\n\t\tif (verdict == Verdict.FAILURE) {\n\t\t\tSystem.err\n\t\t\t.println(\"Violation in JavaMOP 3. The functions A(), B(), C() must be called equal times.\");\n\t\t}\n\t}\n\t\n\tbefore() : C() {\n\t\tVerdict verdict;\n\t\tsynchronized (monitor) {\n\t\t\tverdict = monitor.step(C);\n\t\t}\n\t\tif (verdict == Verdict.FAILURE) {\n\t\t\tSystem.err\n\t\t\t.println(\"Violation in JavaMOP 3. The functions A(), B(), C() must be called equal times.\");\n\t\t}\n\t}\n\t\n\n\tpointcut endOfProgram() : execution(void SRSTest.main(String[]));\n\n\tafter() : endOfProgram() {\n\t\tVerdict verdict = monitor.end();\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\n\t\t\tSystem.err\n\t\t\t\t\t.println(\"Violation in JavaMOP 3. The functions A(), B(), C() must be called equal times.\");\n\t\t} else {\n\t\t\tSystem.err.println(\"Property JavaMOP 3 satisfied\");\n\t\t}\n\t}\n}\n","old_contents":"","returncode":1,"stderr":"error: pathspec 'code\/qea\/src\/benchmark\/competition\/java\/javaMOP\/JavaMOPThreeAspect.aj' did not match any file(s) known to git\n","license":"mit","lang":"AspectJ"}
{"commit":"b250693d7cb152d3e06c953791002d91d6fd51e3","subject":"Instrumentation added for property Online 4-4 (JavaMOP)","message":"Instrumentation added for property Online 4-4 (JavaMOP)\n","repos":"selig\/qea","old_file":"code\/qea\/src\/benchmark\/competition\/java\/javaMOP\/monitoring\/JavaMOPFourAspect.aj","new_file":"code\/qea\/src\/benchmark\/competition\/java\/javaMOP\/monitoring\/JavaMOPFourAspect.aj","new_contents":"package benchmark.competition.java.javaMOP.monitoring;\n\nimport java.util.Collection;\nimport java.util.Iterator;\nimport java.util.Map;\nimport java.util.Set;\n\nimport monitoring.impl.MonitorFactory;\nimport monitoring.intf.Monitor;\nimport properties.Property;\nimport properties.competition.JavaMOP;\nimport structure.impl.other.Verdict;\nimport structure.intf.QEA;\nimport benchmark.competition.java.javaMOP.MapIteratorTest;\n\n@SuppressWarnings(\"rawtypes\")\npublic aspect JavaMOPFourAspect {\n\n\tprivate final Monitor monitor;\n\n\tprivate final int CREATE = 1;\n\tprivate final int ITERATOR = 2;\n\tprivate final int USE = 3;\n\tprivate final int UPDATE = 4;\n\n\tpublic JavaMOPFourAspect() {\n\t\tQEA qea = new JavaMOP().make(Property.JAVAMOP_FOUR);\n\t\tmonitor = MonitorFactory.create(qea);\n\t}\n\n\t\/\/ create(m,c)\n\tpointcut create(Map map) : call(Set Map.keySet()) && target(map)\n\t\t&& within(MapIteratorTest);\n\n\t\/\/ iterator(c,i)\n\tpointcut iterator(Collection col) : call(Iterator Collection.iterator())\n\t\t&& target(col) && within(MapIteratorTest);\n\n\t\/\/ update(m)\n\tpointcut update(Map map) : call(* Map.put(*, *)) && target(map)\n\t\t&& within(MapIteratorTest);\n\n\t\/\/ use(i)\n\tpointcut use(Iterator iter) : call(* Iterator.*(..)) && target(iter)\n\t\t&& within(MapIteratorTest);\n\n\tafter(Map map) returning (Collection col) : create(map) {\n\t\tVerdict verdict = monitor.step(CREATE, map, col);\n\t\tif (verdict == Verdict.FAILURE) {\n\t\t\tSystem.err.println(\"Violation in JavaMOP 4. [map=\" + map + \", col=\"\n\t\t\t\t\t+ col + \"]. UnsafeMapIterator\");\n\t\t\tSystem.exit(0);\n\t\t}\n\t}\n\n\tafter(Collection col) returning (Iterator iter) : iterator(col) {\n\t\tVerdict verdict = monitor.step(ITERATOR, col, iter);\n\t\tif (verdict == Verdict.FAILURE) {\n\t\t\tSystem.err.println(\"Violation in JavaMOP 4. [col=\" + col\n\t\t\t\t\t+ \", iter=\" + iter + \"]. UnsafeMapIterator\");\n\t\t\tSystem.exit(0);\n\t\t}\n\t}\n\n\tbefore(Map map) : update(map) {\n\t\tVerdict verdict = monitor.step(UPDATE, map);\n\t\tif (verdict == Verdict.FAILURE) {\n\t\t\tSystem.err.println(\"Violation in JavaMOP 4. [map=\" + map\n\t\t\t\t\t+ \"]. UnsafeMapIterator\");\n\t\t\tSystem.exit(0);\n\t\t}\n\t}\n\n\tbefore(Iterator iter) : use(iter) {\n\t\tVerdict verdict = monitor.step(USE, iter);\n\t\tif (verdict == Verdict.FAILURE) {\n\t\t\tSystem.err.println(\"Violation in JavaMOP 4. [iter=\" + iter\n\t\t\t\t\t+ \"]. UnsafeMapIterator\");\n\t\t\tSystem.exit(0);\n\t\t}\n\t}\n\n\tpointcut endOfProgram() : execution(void MapIteratorTest.main(String[]));\n\n\tafter() : endOfProgram() {\n\t\tVerdict verdict = monitor.end();\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\n\t\t\tSystem.err.println(\"Violation in JavaMOP 4. UnsafeMapIterator.\");\n\t\t} else {\n\t\t\tSystem.err.println(\"Property JavaMOP 4 satisfied\");\n\t\t}\n\t}\n}\n","old_contents":"","returncode":1,"stderr":"error: pathspec 'code\/qea\/src\/benchmark\/competition\/java\/javaMOP\/monitoring\/JavaMOPFourAspect.aj' did not match any file(s) known to git\n","license":"mit","lang":"AspectJ"}
{"commit":"21a6e86bd1a53e8075309431f53934fb23d41a64","subject":"[misc] Move deprecated api.Api#checkProgrammingRights to the compatibility aspect","message":"[misc] Move deprecated api.Api#checkProgrammingRights to the compatibility aspect\n\n\ngit-svn-id: cfa2b40e478804c47c05d0f328c574ec5aa2b82e@8599 f329d543-caf0-0310-9063-dda96c69346f\n","repos":"xwiki\/xwiki-platform,pbondoer\/xwiki-platform,pbondoer\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,xwiki\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform,xwiki\/xwiki-platform,pbondoer\/xwiki-platform","old_file":"xwiki-core\/src\/main\/aspect\/compatibility\/com\/xpn\/xwiki\/api\/ApiCompatibilityAspect.aj","new_file":"xwiki-core\/src\/main\/aspect\/compatibility\/com\/xpn\/xwiki\/api\/ApiCompatibilityAspect.aj","new_contents":"package compatibility.com.xpn.xwiki.api;\n\nimport com.xpn.xwiki.api.Api;\n\n\/**\n * Add a backward compatibility layer to the {@link Api} class.\n * \n * @version $Id: $\n *\/\npublic privileged aspect ApiCompatibilityAspect\n{\n    \/**\n     * @return true if the current user has the Programming right or false otherwise\n     * @deprecated use {@link Api#hasProgrammingRights()} instead\n     *\/\n    public boolean Api.checkProgrammingRights()\n    {\n        return this.hasProgrammingRights();\n    }\n}\n","old_contents":"","returncode":1,"stderr":"error: pathspec 'xwiki-core\/src\/main\/aspect\/compatibility\/com\/xpn\/xwiki\/api\/ApiCompatibilityAspect.aj' did not match any file(s) known to git\n","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"15e19de1039ff72fd24740ce6ed522c431cff3bc","subject":"-solving bug ","message":"-solving bug ","repos":"jmseigneur\/opprim-sim","old_file":"Muses Sim\/src\/main\/java\/eu\/musesproject\/server\/rt2ae\/Accessrequest_Roo_Jpa_ActiveRecord.aj","new_file":"Muses Sim\/src\/main\/java\/eu\/musesproject\/server\/rt2ae\/Accessrequest_Roo_Jpa_ActiveRecord.aj","new_contents":"","old_contents":"","returncode":1,"stderr":"error: pathspec 'Muses' did not match any file(s) known to git\nerror: pathspec 'Sim\/src\/main\/java\/eu\/musesproject\/server\/rt2ae\/Accessrequest_Roo_Jpa_ActiveRecord.aj' did not match any file(s) known to git\n","license":"agpl-3.0","lang":"AspectJ"}
{"commit":"369c079fa690e15d2aba88a6e9c0da08914e1037","subject":"Changed debug log to include location accuracy","message":"Changed debug log to include location accuracy\n","repos":"mttkay\/ignition,treejames\/ignition,hongnguyenpro\/ignition,beni55\/ignition,Applied-Duality\/ignition","old_file":"ignition-location\/ignition-location-lib\/src\/com\/github\/ignition\/location\/IgnitedLocationManager.aj","new_file":"ignition-location\/ignition-location-lib\/src\/com\/github\/ignition\/location\/IgnitedLocationManager.aj","new_contents":"\/*\n * Copyright 2011 Google Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * This code has been modified by Stefano Dacchille.\n *\/\n\npackage com.github.ignition.location;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\n\nimport android.app.Activity;\nimport android.app.PendingIntent;\nimport android.content.BroadcastReceiver;\nimport android.content.Context;\nimport android.content.Intent;\nimport android.content.IntentFilter;\nimport android.content.SharedPreferences;\nimport android.content.SharedPreferences.Editor;\nimport android.location.Criteria;\nimport android.location.Location;\nimport android.location.LocationListener;\nimport android.location.LocationManager;\nimport android.os.AsyncTask;\nimport android.os.BatteryManager;\nimport android.os.Bundle;\nimport android.os.Handler;\nimport android.util.Log;\n\nimport com.github.ignition.location.annotations.IgnitedLocation;\nimport com.github.ignition.location.annotations.IgnitedLocationActivity;\nimport com.github.ignition.location.receivers.IgnitedLocationChangedReceiver;\nimport com.github.ignition.location.receivers.IgnitedPassiveLocationChangedReceiver;\nimport com.github.ignition.location.tasks.IgnitedLastKnownLocationAsyncTask;\nimport com.github.ignition.location.templates.ILastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLocationUpdateRequester;\nimport com.github.ignition.location.templates.OnIgnitedLocationChangedListener;\nimport com.github.ignition.location.utils.PlatformSpecificImplementationFactory;\nimport com.github.ignition.support.IgnitedDiagnostics;\n\n@SuppressAjWarnings\npublic aspect IgnitedLocationManager {\n    public static final String LOG_TAG = IgnitedLocationManager.class.getSimpleName();\n\n    declare parents : (@IgnitedLocationActivity *) implements OnIgnitedLocationChangedListener;\n\n    private Criteria defaultCriteria, lowPowerCriteria;\n    protected IgnitedAbstractLocationUpdateRequester locationUpdateRequester;\n    protected PendingIntent locationListenerPendingIntent, locationListenerPassivePendingIntent;\n    protected LocationManager locationManager;\n    protected IgnitedLocationListener bestInactiveLocationProviderListener;\n\n    private Context context;\n    private volatile Location currentLocation;\n\n    private AsyncTask<Void, Void, Location> ignitedLastKnownLocationTask;\n    private SharedPreferences prefs;\n    private Handler handler;\n\n    private long locationUpdatesInterval, passiveLocationUpdatesInterval;\n    private int locationUpdatesDistanceDiff;\n    private int passiveLocationUpdatesDistanceDiff;\n    private boolean requestLocationUpdates;\n    private boolean locationUpdatesDisabled = true;\n    \n    \/\/ Switch to another provider if gps doesn't return a location quickly enough.\n    private Runnable removeGpsUpdates = new Runnable() {\n        @Override\n        public void run() {\n            Log.d(LOG_TAG,\n                    \"It looks like GPS isn't available at this time (i.e.: maybe you're indoors). Removing GPS location updates and requesting network updates.\");\n\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, lowPowerCriteria());\n        }\n    };\n\n    \/**\n     * If the Location Provider we're using to receive location updates is disabled while the app is\n     * running, this Receiver will be notified, allowing us to re-register our Location Receivers\n     * using the best available Location Provider is still available.\n     *\/\n    protected BroadcastReceiver locationProviderDisabledReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            boolean providerDisabled = !intent.getBooleanExtra(\n                    LocationManager.KEY_PROVIDER_ENABLED, false);\n            \/\/ Re-register the location listeners using the best available\n            \/\/ Location Provider.\n            if (providerDisabled) {\n                disableLocationUpdates(false);\n                requestLocationUpdates(context, null);\n            }\n        }\n    };\n\n    \/**\n     * If the battery state is low disable the passive location update receiver.\n     *\/\n    protected BroadcastReceiver refreshLocationUpdatesReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, lowPowerCriteria());\n        }\n    };\n\n    after(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onCreate(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n\n        \/\/ Get a reference to the Context\n        this.context = context;\n        \/\/ Set pref file\n        prefs = context.getSharedPreferences(IgnitedLocationConstants.SHARED_PREFERENCE_FILE,\n                Context.MODE_PRIVATE);\n        \/\/ Get references to the managers\n        locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);\n        handler = new Handler();\n\n        \/\/ Specify the Criteria to use when requesting location updates while\n        \/\/ the application is Active\n        if (defaultCriteria == null) {\n            defaultCriteria = new Criteria();\n        }\n        \/\/ Use gps if it's enabled and if battery level is at least 15%\n        boolean useGps = prefs.getBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS,\n                IgnitedLocationConstants.USE_GPS_DEFAULT);\n        if (useGps) {\n            defaultCriteria.setAccuracy(Criteria.ACCURACY_FINE);\n        } else {\n            defaultCriteria.setPowerRequirement(Criteria.POWER_LOW);\n        }\n\n        \/\/ Setup the location update Pending Intent\n        Intent activeIntent = new Intent(IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_ACTION);\n        locationListenerPendingIntent = PendingIntent.getBroadcast(context, 0, activeIntent,\n                PendingIntent.FLAG_UPDATE_CURRENT);\n        \/\/ Setup the passive location update Pending Intent\n        Intent passiveIntent = new Intent(context, IgnitedPassiveLocationChangedReceiver.class);\n        locationListenerPassivePendingIntent = PendingIntent.getBroadcast(context, 0,\n                passiveIntent, PendingIntent.FLAG_UPDATE_CURRENT);\n\n        \/\/ Instantiate a Location Update Requester class based on the available\n        \/\/ platform version. This will be used to request location updates.\n        locationUpdateRequester = PlatformSpecificImplementationFactory\n                .getLocationUpdateRequester(context);\n    }\n\n    private boolean isBatteryOk() {\n        IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);\n        Intent intent = context.registerReceiver(null, filter);\n        double currentLevel = 100.0;\n        if (intent != null) {\n            currentLevel = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1);\n        }\n\n        return currentLevel >= prefs.getInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                IgnitedLocationConstants.MIN_BATTERY_LEVEL_DEFAULT);\n    }\n\n    before(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onResume(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n        \/\/ Get a reference to the Context if this context is null\n        if (this.context == null) {\n            this.context = context;\n        }\n\n        saveToPreferences(context, ignitedAnnotation);\n\n        Log.d(LOG_TAG, \"Retrieving last known location...\");\n        \/\/ Get the last known location. This isn't directly affecting the UI, so put it on a\n        \/\/ worker thread.\n        ignitedLastKnownLocationTask = new IgnitedLastKnownLocationAsyncTask(\n                context, locationUpdatesDistanceDiff, locationUpdatesInterval);\n        ignitedLastKnownLocationTask.execute();\n    }\n\n    \/**\n     * Save last settings to preferences.\n     * \n     * @param context\n     * @param locationAnnotation\n     *\/\n    private void saveToPreferences(Context context, IgnitedLocationActivity locationAnnotation) {\n        requestLocationUpdates = locationAnnotation.requestLocationUpdates();\n        locationUpdatesDistanceDiff = locationAnnotation.locationUpdatesDistanceDiff();\n        locationUpdatesInterval = locationAnnotation.locationUpdatesInterval();\n        passiveLocationUpdatesDistanceDiff = locationAnnotation\n                .passiveLocationUpdatesDistanceDiff();\n        passiveLocationUpdatesInterval = locationAnnotation.passiveLocationUpdatesInterval();\n        boolean enablePassiveLocationUpdates = locationAnnotation.enablePassiveUpdates();\n        boolean useGps = locationAnnotation.useGps();\n\n        Editor editor = prefs.edit();\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_LOCATION_UPDATES,\n                requestLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                enablePassiveLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS, useGps);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_DISTANCE_DIFF,\n                locationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_INTERVAL,\n                locationUpdatesInterval);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_DISTANCE_DIFF,\n                passiveLocationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_INTERVAL,\n                passiveLocationUpdatesInterval);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_RUN_ONCE, true);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                locationAnnotation.minBatteryLevel());\n        editor.putLong(IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                locationAnnotation.waitForGpsFix());\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                locationAnnotation.showWaitForLocationDialog());\n        editor.commit();\n\n    }\n\n    before(Activity activity, IgnitedLocationActivity ignitedAnnotation) : execution(* Activity.onPause(..)) \n        && @this(ignitedAnnotation) && this(activity)\n        && within(@IgnitedLocationActivity *) && if (ignitedAnnotation.requestLocationUpdates()) {\n\n        disableLocationUpdates(true);\n\n        handler.removeCallbacks(removeGpsUpdates);\n\n        boolean finishing = activity.isFinishing();\n        if (finishing) {\n            if (ignitedLastKnownLocationTask != null && ignitedLastKnownLocationTask.getStatus() != AsyncTask.Status.FINISHED) {\n                ignitedLastKnownLocationTask.cancel(true);\n            } else {\n                PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            }\n\n            context = null;\n        }\n    }\n\n    \/\/ after() : execution(* Activity.onDestroy(..)) && @this(IgnitedLocationActivity)\n    \/\/ && within(@IgnitedLocationActivity *) {\n    \/\/ }\n\n    Location around() : get(@IgnitedLocation Location *) {\n        return currentLocation;\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && within(IgnitedPassiveLocationChangedReceiver) && !adviceexecution() {\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, lng\/acc): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude() + \"\/\" + currentLocation.getAccuracy());\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && (within(IgnitedLocationChangedReceiver) || within(IgnitedAbstractLastLocationFinder)\n                || within(IgnitedLastKnownLocationAsyncTask)) && !adviceexecution() {\n\n        if (context == null) {\n            return;\n        }\n        final Activity activity = (Activity) context;\n        boolean showWaitForLocationDialog = prefs.getBoolean(\n                IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                IgnitedLocationConstants.SHOW_WAIT_FOR_LOCATION_DIALOG_DEFAULT);\n        if (freshLocation == null && showWaitForLocationDialog) {\n            activity.showDialog(R.id.ign_loc_dialog_wait_for_fix);\n            return;\n        }\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, lng\/acc): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude() + \"\/\" + currentLocation.getAccuracy());\n        boolean keepRequestingLocationUpdates = ((OnIgnitedLocationChangedListener) context)\n                .onIgnitedLocationChanged(currentLocation);\n        Bundle extras = freshLocation.getExtras();\n        if (!keepRequestingLocationUpdates) {\n            disableLocationUpdates(true);\n            PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            return;\n        } else if (requestLocationUpdates\n                && !extras.containsKey(ILastLocationFinder.LAST_LOCATION_TOO_OLD_EXTRA)) {\n            \/\/ If we requested location updates, turn them on here.\n            requestLocationUpdates(context, null);\n        }\n\n        \/\/ If gps is enabled location comes from gps, remove runnable that removes gps updates\n        boolean lastLocation = extras.containsKey(IgnitedLocationConstants.IGNITED_LAST_LOCATION_EXTRA);\n        if (!lastLocation && defaultCriteria.getAccuracy() == Criteria.ACCURACY_FINE\n                && currentLocation.getProvider().equals(LocationManager.GPS_PROVIDER)) {\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n    }\n\n    \/**\n     * Start listening for location updates.\n     *\/\n    protected void requestLocationUpdates(Context context, Criteria criteria) {\n        if (!locationUpdatesDisabled) {\n            return;\n        }\n        Criteria locationUpdateCriteria = criteria;\n        if (criteria == null) {\n            if (isBatteryOk()) {\n                locationUpdateCriteria = defaultCriteria;\n            } else {\n                locationUpdateCriteria = lowPowerCriteria();\n            }\n        }\n        Log.d(LOG_TAG, \"Disabling passive location updates\");\n        locationManager.removeUpdates(locationListenerPassivePendingIntent);\n\n        Log.d(LOG_TAG, \"Requesting location updates\");\n        \/\/ Normal updates while activity is visible.\n        locationUpdateRequester.requestLocationUpdates(locationUpdatesInterval,\n                locationUpdatesDistanceDiff, locationUpdateCriteria, locationListenerPendingIntent);\n\n        \/\/ Register a receiver that listens for when the provider I'm using has\n        \/\/ been disabled.\n        IntentFilter locationProviderDisabledIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_PROVIDER_DISABLED_ACTION);\n        context.registerReceiver(locationProviderDisabledReceiver,\n                locationProviderDisabledIntentFilter);\n\n        IntentFilter refreshLocationUpdatesIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.UPDATE_LOCATION_UPDATES_CRITERIA_ACTION);\n        context.registerReceiver(refreshLocationUpdatesReceiver, refreshLocationUpdatesIntentFilter);\n\n        \/\/ Register a receiver that listens for when a better provider than I'm\n        \/\/ using becomes available.\n        String bestProvider = locationManager.getBestProvider(locationUpdateCriteria, false);\n        String bestAvailableProvider = locationManager.getBestProvider(locationUpdateCriteria, true);\n        if (bestProvider != null && !bestProvider.equals(bestAvailableProvider)) {\n            bestInactiveLocationProviderListener = new IgnitedLocationListener(context);\n            locationManager.requestLocationUpdates(bestProvider, 0, 0,\n                    bestInactiveLocationProviderListener, context.getMainLooper());\n        }\n\n        if (bestAvailableProvider.equals(LocationManager.GPS_PROVIDER)) {\n            Log.d(LOG_TAG, \"Posting delayed remove GPS updates message\");\n            \/\/ Post a runnable that will remove gps updates if no gps location is returned after 1\n            \/\/ minute in order to avoid draining the battery.\n            handler.postDelayed(removeGpsUpdates, prefs.getLong(\n                    IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                    IgnitedLocationConstants.WAIT_FOR_GPS_FIX_INTERVAL_DEFAULT));\n        }\n\n        locationUpdatesDisabled = false;\n    }\n\n    \/**\n     * Stop listening for location updates\n     * \n     * @param enablePassiveLocationUpdates\n     *\/\n    protected void disableLocationUpdates(boolean requestPassiveLocationUpdates) {\n        if (locationUpdatesDisabled) {\n            return;\n        }\n\n        Log.d(LOG_TAG, \"Disabling location updates\");\n        context.unregisterReceiver(locationProviderDisabledReceiver);\n        context.unregisterReceiver(refreshLocationUpdatesReceiver);\n\n        locationUpdateRequester.removeLocationUpdates();\n        if (bestInactiveLocationProviderListener != null) {\n            locationManager.removeUpdates(bestInactiveLocationProviderListener);\n        }\n\n        boolean finishing = ((Activity) context).isFinishing();\n\n        if (requestPassiveLocationUpdates && !finishing) {\n            requestPassiveLocationUpdates();\n        }\n\n        locationUpdatesDisabled = true;\n    }\n\n    private void requestPassiveLocationUpdates() {\n        if (IgnitedDiagnostics.SUPPORTS_FROYO\n                && prefs.getBoolean(\n                        IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                        IgnitedLocationConstants.ENABLE_PASSIVE_LOCATION_UPDATES_DEFAULT)) {\n            Log.d(LOG_TAG, \"Requesting passive location updates\");\n            \/\/ Passive location updates from 3rd party apps when the Activity isn't\n            \/\/ visible. Only for Android 2.2+.\n            locationUpdateRequester.requestPassiveLocationUpdates(passiveLocationUpdatesInterval,\n                    passiveLocationUpdatesDistanceDiff, locationListenerPassivePendingIntent);\n        }\n    }\n\n    public boolean isLocationUpdatesDisabled() {\n        return locationUpdatesDisabled;\n    }\n\n    public Criteria lowPowerCriteria() {\n        if (lowPowerCriteria == null) {\n            lowPowerCriteria = new Criteria();\n            lowPowerCriteria.setPowerRequirement(Criteria.POWER_LOW);\n            lowPowerCriteria.setAccuracy(Criteria.NO_REQUIREMENT);\n        }\n        return lowPowerCriteria;\n    }\n\n    \/**\n     * If the best Location Provider (usually GPS) is not available when we request location\n     * updates, this listener will be notified if \/ when it becomes available. It calls\n     * requestLocationUpdates to re-register the location listeners using the better Location\n     * Provider.\n     *\/\n    private class IgnitedLocationListener implements LocationListener {\n        private Context context;\n\n        public IgnitedLocationListener(Context appContext) {\n            this.context = appContext;\n        }\n\n        @Override\n        public void onLocationChanged(Location l) {\n        }\n\n        @Override\n        public void onProviderDisabled(String provider) {\n        }\n\n        @Override\n        public void onStatusChanged(String provider, int status, Bundle extras) {\n        }\n\n        @Override\n        public void onProviderEnabled(String provider) {\n            \/\/ Re-register the location listeners using the better Location\n            \/\/ Provider.\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, null);\n        }\n    }\n\n}\n","old_contents":"\/*\n * Copyright 2011 Google Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * This code has been modified by Stefano Dacchille.\n *\/\n\npackage com.github.ignition.location;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\n\nimport android.app.Activity;\nimport android.app.PendingIntent;\nimport android.content.BroadcastReceiver;\nimport android.content.Context;\nimport android.content.Intent;\nimport android.content.IntentFilter;\nimport android.content.SharedPreferences;\nimport android.content.SharedPreferences.Editor;\nimport android.location.Criteria;\nimport android.location.Location;\nimport android.location.LocationListener;\nimport android.location.LocationManager;\nimport android.os.AsyncTask;\nimport android.os.BatteryManager;\nimport android.os.Bundle;\nimport android.os.Handler;\nimport android.util.Log;\n\nimport com.github.ignition.location.annotations.IgnitedLocation;\nimport com.github.ignition.location.annotations.IgnitedLocationActivity;\nimport com.github.ignition.location.receivers.IgnitedLocationChangedReceiver;\nimport com.github.ignition.location.receivers.IgnitedPassiveLocationChangedReceiver;\nimport com.github.ignition.location.tasks.IgnitedLastKnownLocationAsyncTask;\nimport com.github.ignition.location.templates.ILastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLocationUpdateRequester;\nimport com.github.ignition.location.templates.OnIgnitedLocationChangedListener;\nimport com.github.ignition.location.utils.PlatformSpecificImplementationFactory;\nimport com.github.ignition.support.IgnitedDiagnostics;\n\n@SuppressAjWarnings\npublic aspect IgnitedLocationManager {\n    public static final String LOG_TAG = IgnitedLocationManager.class.getSimpleName();\n\n    declare parents : (@IgnitedLocationActivity *) implements OnIgnitedLocationChangedListener;\n\n    private Criteria defaultCriteria, lowPowerCriteria;\n    protected IgnitedAbstractLocationUpdateRequester locationUpdateRequester;\n    protected PendingIntent locationListenerPendingIntent, locationListenerPassivePendingIntent;\n    protected LocationManager locationManager;\n    protected IgnitedLocationListener bestInactiveLocationProviderListener;\n\n    private Context context;\n    private volatile Location currentLocation;\n\n    private AsyncTask<Void, Void, Location> ignitedLastKnownLocationTask;\n    private SharedPreferences prefs;\n    private Handler handler;\n\n    private long locationUpdatesInterval, passiveLocationUpdatesInterval;\n    private int locationUpdatesDistanceDiff;\n    private int passiveLocationUpdatesDistanceDiff;\n    private boolean requestLocationUpdates;\n    private boolean locationUpdatesDisabled = true;\n    \n    \/\/ Switch to another provider if gps doesn't return a location quickly enough.\n    private Runnable removeGpsUpdates = new Runnable() {\n        @Override\n        public void run() {\n            Log.d(LOG_TAG,\n                    \"It looks like GPS isn't available at this time (i.e.: maybe you're indoors). Removing GPS location updates and requesting network updates.\");\n\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, lowPowerCriteria());\n        }\n    };\n\n    \/**\n     * If the Location Provider we're using to receive location updates is disabled while the app is\n     * running, this Receiver will be notified, allowing us to re-register our Location Receivers\n     * using the best available Location Provider is still available.\n     *\/\n    protected BroadcastReceiver locationProviderDisabledReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            boolean providerDisabled = !intent.getBooleanExtra(\n                    LocationManager.KEY_PROVIDER_ENABLED, false);\n            \/\/ Re-register the location listeners using the best available\n            \/\/ Location Provider.\n            if (providerDisabled) {\n                disableLocationUpdates(false);\n                requestLocationUpdates(context, null);\n            }\n        }\n    };\n\n    \/**\n     * If the battery state is low disable the passive location update receiver.\n     *\/\n    protected BroadcastReceiver refreshLocationUpdatesReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, lowPowerCriteria());\n        }\n    };\n\n    after(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onCreate(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n\n        \/\/ Get a reference to the Context\n        this.context = context;\n        \/\/ Set pref file\n        prefs = context.getSharedPreferences(IgnitedLocationConstants.SHARED_PREFERENCE_FILE,\n                Context.MODE_PRIVATE);\n        \/\/ Get references to the managers\n        locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);\n        handler = new Handler();\n\n        \/\/ Specify the Criteria to use when requesting location updates while\n        \/\/ the application is Active\n        if (defaultCriteria == null) {\n            defaultCriteria = new Criteria();\n        }\n        \/\/ Use gps if it's enabled and if battery level is at least 15%\n        boolean useGps = prefs.getBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS,\n                IgnitedLocationConstants.USE_GPS_DEFAULT);\n        if (useGps) {\n            defaultCriteria.setAccuracy(Criteria.ACCURACY_FINE);\n        } else {\n            defaultCriteria.setPowerRequirement(Criteria.POWER_LOW);\n        }\n\n        \/\/ Setup the location update Pending Intent\n        Intent activeIntent = new Intent(IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_ACTION);\n        locationListenerPendingIntent = PendingIntent.getBroadcast(context, 0, activeIntent,\n                PendingIntent.FLAG_UPDATE_CURRENT);\n        \/\/ Setup the passive location update Pending Intent\n        Intent passiveIntent = new Intent(context, IgnitedPassiveLocationChangedReceiver.class);\n        locationListenerPassivePendingIntent = PendingIntent.getBroadcast(context, 0,\n                passiveIntent, PendingIntent.FLAG_UPDATE_CURRENT);\n\n        \/\/ Instantiate a Location Update Requester class based on the available\n        \/\/ platform version. This will be used to request location updates.\n        locationUpdateRequester = PlatformSpecificImplementationFactory\n                .getLocationUpdateRequester(context);\n    }\n\n    private boolean isBatteryOk() {\n        IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);\n        Intent intent = context.registerReceiver(null, filter);\n        double currentLevel = 100.0;\n        if (intent != null) {\n            currentLevel = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1);\n        }\n\n        return currentLevel >= prefs.getInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                IgnitedLocationConstants.MIN_BATTERY_LEVEL_DEFAULT);\n    }\n\n    before(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onResume(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n        \/\/ Get a reference to the Context if this context is null\n        if (this.context == null) {\n            this.context = context;\n        }\n\n        saveToPreferences(context, ignitedAnnotation);\n\n        Log.d(LOG_TAG, \"Retrieving last known location...\");\n        \/\/ Get the last known location. This isn't directly affecting the UI, so put it on a\n        \/\/ worker thread.\n        ignitedLastKnownLocationTask = new IgnitedLastKnownLocationAsyncTask(\n                context, locationUpdatesDistanceDiff, locationUpdatesInterval);\n        ignitedLastKnownLocationTask.execute();\n    }\n\n    \/**\n     * Save last settings to preferences.\n     * \n     * @param context\n     * @param locationAnnotation\n     *\/\n    private void saveToPreferences(Context context, IgnitedLocationActivity locationAnnotation) {\n        requestLocationUpdates = locationAnnotation.requestLocationUpdates();\n        locationUpdatesDistanceDiff = locationAnnotation.locationUpdatesDistanceDiff();\n        locationUpdatesInterval = locationAnnotation.locationUpdatesInterval();\n        passiveLocationUpdatesDistanceDiff = locationAnnotation\n                .passiveLocationUpdatesDistanceDiff();\n        passiveLocationUpdatesInterval = locationAnnotation.passiveLocationUpdatesInterval();\n        boolean enablePassiveLocationUpdates = locationAnnotation.enablePassiveUpdates();\n        boolean useGps = locationAnnotation.useGps();\n\n        Editor editor = prefs.edit();\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_LOCATION_UPDATES,\n                requestLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                enablePassiveLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS, useGps);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_DISTANCE_DIFF,\n                locationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_INTERVAL,\n                locationUpdatesInterval);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_DISTANCE_DIFF,\n                passiveLocationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_INTERVAL,\n                passiveLocationUpdatesInterval);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_RUN_ONCE, true);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                locationAnnotation.minBatteryLevel());\n        editor.putLong(IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                locationAnnotation.waitForGpsFix());\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                locationAnnotation.showWaitForLocationDialog());\n        editor.commit();\n\n    }\n\n    before(Activity activity, IgnitedLocationActivity ignitedAnnotation) : execution(* Activity.onPause(..)) \n        && @this(ignitedAnnotation) && this(activity)\n        && within(@IgnitedLocationActivity *) && if (ignitedAnnotation.requestLocationUpdates()) {\n\n        disableLocationUpdates(true);\n\n        handler.removeCallbacks(removeGpsUpdates);\n\n        boolean finishing = activity.isFinishing();\n        if (finishing) {\n            if (ignitedLastKnownLocationTask != null && ignitedLastKnownLocationTask.getStatus() != AsyncTask.Status.FINISHED) {\n                ignitedLastKnownLocationTask.cancel(true);\n            } else {\n                PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            }\n\n            context = null;\n        }\n    }\n\n    \/\/ after() : execution(* Activity.onDestroy(..)) && @this(IgnitedLocationActivity)\n    \/\/ && within(@IgnitedLocationActivity *) {\n    \/\/ }\n\n    Location around() : get(@IgnitedLocation Location *) {\n        return currentLocation;\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && within(IgnitedPassiveLocationChangedReceiver) && !adviceexecution() {\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, long): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude());\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && (within(IgnitedLocationChangedReceiver) || within(IgnitedAbstractLastLocationFinder)\n                || within(IgnitedLastKnownLocationAsyncTask)) && !adviceexecution() {\n\n        if (context == null) {\n            return;\n        }\n        final Activity activity = (Activity) context;\n        boolean showWaitForLocationDialog = prefs.getBoolean(\n                IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                IgnitedLocationConstants.SHOW_WAIT_FOR_LOCATION_DIALOG_DEFAULT);\n        if (freshLocation == null && showWaitForLocationDialog) {\n            activity.showDialog(R.id.ign_loc_dialog_wait_for_fix);\n            return;\n        }\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, long): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude());\n        boolean keepRequestingLocationUpdates = ((OnIgnitedLocationChangedListener) context)\n                .onIgnitedLocationChanged(currentLocation);\n        Bundle extras = freshLocation.getExtras();\n        if (!keepRequestingLocationUpdates) {\n            disableLocationUpdates(true);\n            PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            return;\n        } else if (requestLocationUpdates\n                && !extras.containsKey(ILastLocationFinder.LAST_LOCATION_TOO_OLD_EXTRA)) {\n            \/\/ If we requested location updates, turn them on here.\n            requestLocationUpdates(context, null);\n        }\n\n        \/\/ If gps is enabled location comes from gps, remove runnable that removes gps updates\n        boolean lastLocation = extras.containsKey(IgnitedLocationConstants.IGNITED_LAST_LOCATION_EXTRA);\n        if (!lastLocation && defaultCriteria.getAccuracy() == Criteria.ACCURACY_FINE\n                && currentLocation.getProvider().equals(LocationManager.GPS_PROVIDER)) {\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n    }\n\n    \/**\n     * Start listening for location updates.\n     *\/\n    protected void requestLocationUpdates(Context context, Criteria criteria) {\n        if (!locationUpdatesDisabled) {\n            return;\n        }\n        Criteria locationUpdateCriteria = criteria;\n        if (criteria == null) {\n            if (isBatteryOk()) {\n                locationUpdateCriteria = defaultCriteria;\n            } else {\n                locationUpdateCriteria = lowPowerCriteria();\n            }\n        }\n        Log.d(LOG_TAG, \"Disabling passive location updates\");\n        locationManager.removeUpdates(locationListenerPassivePendingIntent);\n\n        Log.d(LOG_TAG, \"Requesting location updates\");\n        \/\/ Normal updates while activity is visible.\n        locationUpdateRequester.requestLocationUpdates(locationUpdatesInterval,\n                locationUpdatesDistanceDiff, locationUpdateCriteria, locationListenerPendingIntent);\n\n        \/\/ Register a receiver that listens for when the provider I'm using has\n        \/\/ been disabled.\n        IntentFilter locationProviderDisabledIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_PROVIDER_DISABLED_ACTION);\n        context.registerReceiver(locationProviderDisabledReceiver,\n                locationProviderDisabledIntentFilter);\n\n        IntentFilter refreshLocationUpdatesIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.UPDATE_LOCATION_UPDATES_CRITERIA_ACTION);\n        context.registerReceiver(refreshLocationUpdatesReceiver, refreshLocationUpdatesIntentFilter);\n\n        \/\/ Register a receiver that listens for when a better provider than I'm\n        \/\/ using becomes available.\n        String bestProvider = locationManager.getBestProvider(locationUpdateCriteria, false);\n        String bestAvailableProvider = locationManager.getBestProvider(locationUpdateCriteria, true);\n        if (bestProvider != null && !bestProvider.equals(bestAvailableProvider)) {\n            bestInactiveLocationProviderListener = new IgnitedLocationListener(context);\n            locationManager.requestLocationUpdates(bestProvider, 0, 0,\n                    bestInactiveLocationProviderListener, context.getMainLooper());\n        }\n\n        if (bestAvailableProvider.equals(LocationManager.GPS_PROVIDER)) {\n            Log.d(LOG_TAG, \"Posting delayed remove GPS updates message\");\n            \/\/ Post a runnable that will remove gps updates if no gps location is returned after 1\n            \/\/ minute in order to avoid draining the battery.\n            handler.postDelayed(removeGpsUpdates, prefs.getLong(\n                    IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                    IgnitedLocationConstants.WAIT_FOR_GPS_FIX_INTERVAL_DEFAULT));\n        }\n\n        locationUpdatesDisabled = false;\n    }\n\n    \/**\n     * Stop listening for location updates\n     * \n     * @param enablePassiveLocationUpdates\n     *\/\n    protected void disableLocationUpdates(boolean requestPassiveLocationUpdates) {\n        if (locationUpdatesDisabled) {\n            return;\n        }\n\n        Log.d(LOG_TAG, \"Disabling location updates\");\n        context.unregisterReceiver(locationProviderDisabledReceiver);\n        context.unregisterReceiver(refreshLocationUpdatesReceiver);\n\n        locationUpdateRequester.removeLocationUpdates();\n        if (bestInactiveLocationProviderListener != null) {\n            locationManager.removeUpdates(bestInactiveLocationProviderListener);\n        }\n\n        boolean finishing = ((Activity) context).isFinishing();\n\n        if (requestPassiveLocationUpdates && !finishing) {\n            requestPassiveLocationUpdates();\n        }\n\n        locationUpdatesDisabled = true;\n    }\n\n    private void requestPassiveLocationUpdates() {\n        if (IgnitedDiagnostics.SUPPORTS_FROYO\n                && prefs.getBoolean(\n                        IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                        IgnitedLocationConstants.ENABLE_PASSIVE_LOCATION_UPDATES_DEFAULT)) {\n            Log.d(LOG_TAG, \"Requesting passive location updates\");\n            \/\/ Passive location updates from 3rd party apps when the Activity isn't\n            \/\/ visible. Only for Android 2.2+.\n            locationUpdateRequester.requestPassiveLocationUpdates(passiveLocationUpdatesInterval,\n                    passiveLocationUpdatesDistanceDiff, locationListenerPassivePendingIntent);\n        }\n    }\n\n    public boolean isLocationUpdatesDisabled() {\n        return locationUpdatesDisabled;\n    }\n\n    public Criteria lowPowerCriteria() {\n        if (lowPowerCriteria == null) {\n            lowPowerCriteria = new Criteria();\n            lowPowerCriteria.setPowerRequirement(Criteria.POWER_LOW);\n            lowPowerCriteria.setAccuracy(Criteria.NO_REQUIREMENT);\n        }\n        return lowPowerCriteria;\n    }\n\n    \/**\n     * If the best Location Provider (usually GPS) is not available when we request location\n     * updates, this listener will be notified if \/ when it becomes available. It calls\n     * requestLocationUpdates to re-register the location listeners using the better Location\n     * Provider.\n     *\/\n    private class IgnitedLocationListener implements LocationListener {\n        private Context context;\n\n        public IgnitedLocationListener(Context appContext) {\n            this.context = appContext;\n        }\n\n        @Override\n        public void onLocationChanged(Location l) {\n        }\n\n        @Override\n        public void onProviderDisabled(String provider) {\n        }\n\n        @Override\n        public void onStatusChanged(String provider, int status, Bundle extras) {\n        }\n\n        @Override\n        public void onProviderEnabled(String provider) {\n            \/\/ Re-register the location listeners using the better Location\n            \/\/ Provider.\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, null);\n        }\n    }\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"8bce6d063f446ebe7eb39a44b5310ec5c9c27a3a","subject":"Better method naming.","message":"Better method naming.\n","repos":"hongnguyenpro\/ignition,mttkay\/ignition,Applied-Duality\/ignition,treejames\/ignition","old_file":"ignition-location\/ignition-location-lib\/src\/com\/github\/ignition\/location\/IgnitedLocationManager.aj","new_file":"ignition-location\/ignition-location-lib\/src\/com\/github\/ignition\/location\/IgnitedLocationManager.aj","new_contents":"\/*\n * Copyright 2011 Google Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * This code has been modified by Stefano Dacchille.\n *\/\n\npackage com.github.ignition.location;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\n\nimport android.app.Activity;\nimport android.app.PendingIntent;\nimport android.content.BroadcastReceiver;\nimport android.content.Context;\nimport android.content.Intent;\nimport android.content.IntentFilter;\nimport android.content.SharedPreferences;\nimport android.content.SharedPreferences.Editor;\nimport android.location.Criteria;\nimport android.location.Location;\nimport android.location.LocationListener;\nimport android.location.LocationManager;\nimport android.os.AsyncTask;\nimport android.os.BatteryManager;\nimport android.os.Bundle;\nimport android.os.Handler;\nimport android.util.Log;\n\nimport com.github.ignition.location.annotations.IgnitedLocation;\nimport com.github.ignition.location.annotations.IgnitedLocationActivity;\nimport com.github.ignition.location.receivers.IgnitedLocationChangedReceiver;\nimport com.github.ignition.location.receivers.IgnitedPassiveLocationChangedReceiver;\nimport com.github.ignition.location.tasks.IgnitedLastKnownLocationAsyncTask;\nimport com.github.ignition.location.templates.ILastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLocationUpdateRequester;\nimport com.github.ignition.location.templates.OnIgnitedLocationChangedListener;\nimport com.github.ignition.location.utils.IgnitedLocationSupport;\nimport com.github.ignition.location.utils.PlatformSpecificImplementationFactory;\nimport com.github.ignition.support.IgnitedDiagnostics;\n\n@SuppressAjWarnings\npublic aspect IgnitedLocationManager {\n    public static final String LOG_TAG = IgnitedLocationManager.class.getSimpleName();\n\n    declare parents : (@IgnitedLocationActivity *) implements OnIgnitedLocationChangedListener;\n\n    private Criteria defaultCriteria, lowPowerCriteria;\n    protected IgnitedAbstractLocationUpdateRequester locationUpdateRequester;\n    protected PendingIntent locationListenerPendingIntent, locationListenerPassivePendingIntent;\n    protected LocationManager locationManager;\n    protected IgnitedLocationListener bestInactiveLocationProviderListener;\n\n    private Context context;\n    private volatile Location currentLocation;\n\n    private IgnitedLastKnownLocationAsyncTask ignitedLastKnownLocationTask;\n    private SharedPreferences prefs;\n    private Handler handler;\n\n    private long locationUpdatesInterval, passiveLocationUpdatesInterval;\n    private int locationUpdatesDistanceDiff;\n    private int passiveLocationUpdatesDistanceDiff;\n    private boolean requestLocationUpdates = false;\n    private boolean locationUpdatesDisabled = true;\n    private boolean waitForFixDialogShown = false;\n    private boolean noProvidersEnabledDialogShown = false;\n    private boolean locationProviderDisabledReceiverRegistered = false;\n    private boolean refreshLocationUpdatesReceiverRegistered = false;\n\n    \/\/ Switch to another provider if gps doesn't return a location quickly enough.\n    private Runnable removeGpsUpdates = new Runnable() {\n        @Override\n        public void run() {\n            Log.d(LOG_TAG,\n                    \"It looks like GPS isn't available at this time (i.e.: maybe you're indoors). Removing GPS location updates and requesting network updates.\");\n\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, lowPowerCriteria());\n        }\n    };\n\n    \/**\n     * If the Location Provider we're using to receive location updates is disabled while the app is\n     * running, this Receiver will be notified, allowing us to re-register our Location Receivers\n     * using the best available Location Provider is still available.\n     *\/\n    protected BroadcastReceiver locationProviderDisabledReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            boolean providerDisabled = !intent.getBooleanExtra(\n                    LocationManager.KEY_PROVIDER_ENABLED, false);\n            \/\/ Re-register the location listeners using the best available\n            \/\/ Location Provider.\n            if (providerDisabled) {\n                disableLocationUpdates(false);\n                requestLocationUpdates(context, null);\n            }\n        }\n    };\n\n    \/**\n     * If the battery state is low disable the passive location update receiver.\n     *\/\n    protected BroadcastReceiver refreshLocationUpdatesReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, null);\n        }\n    };\n\n    after(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onCreate(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n\n        \/\/ Get a reference to the Context\n        this.context = context;\n        \/\/ Set pref file\n        prefs = context.getSharedPreferences(IgnitedLocationConstants.SHARED_PREFERENCE_FILE,\n                Context.MODE_PRIVATE);\n        \/\/ Get references to the managers\n        locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);\n        handler = new Handler();\n\n        \/\/ Specify the Criteria to use when requesting location updates while\n        \/\/ the application is Active\n        if (defaultCriteria == null) {\n            defaultCriteria = new Criteria();\n        }\n        \/\/ Use gps if it's enabled and if battery level is at least 15%\n        boolean useGps = prefs.getBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS,\n                IgnitedLocationConstants.USE_GPS_DEFAULT);\n        if (useGps) {\n            defaultCriteria.setAccuracy(Criteria.ACCURACY_FINE);\n        } else {\n            defaultCriteria.setPowerRequirement(Criteria.POWER_LOW);\n        }\n\n        \/\/ Setup the location update Pending Intent\n        Intent activeIntent = new Intent(IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_ACTION);\n        locationListenerPendingIntent = PendingIntent.getBroadcast(context, 0, activeIntent,\n                PendingIntent.FLAG_UPDATE_CURRENT);\n        \/\/ Setup the passive location update Pending Intent\n        Intent passiveIntent = new Intent(context, IgnitedPassiveLocationChangedReceiver.class);\n        locationListenerPassivePendingIntent = PendingIntent.getBroadcast(context, 0,\n                passiveIntent, PendingIntent.FLAG_UPDATE_CURRENT);\n\n        \/\/ Instantiate a Location Update Requester class based on the available\n        \/\/ platform version. This will be used to request location updates.\n        locationUpdateRequester = PlatformSpecificImplementationFactory\n                .getLocationUpdateRequester(context);\n    }\n\n    private boolean isBatteryLevelOk() {\n        IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);\n        Intent intent = context.registerReceiver(null, filter);\n        double currentLevel = 100.0;\n        if (intent != null) {\n            currentLevel = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1);\n        }\n\n        return currentLevel >= prefs.getInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                IgnitedLocationConstants.MIN_BATTERY_LEVEL_FOR_GPS_DEFAULT);\n    }\n\n    before(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onResume(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n        \/\/ Get a reference to the Context if this context is null\n        if (this.context == null) {\n            this.context = context;\n        }\n\n        saveToPreferences(context, ignitedAnnotation);\n\n        Log.d(LOG_TAG, \"Retrieving last known location...\");\n        \/\/ Get the last known location. This isn't directly affecting the UI, so put it on a\n        \/\/ worker thread.\n        ignitedLastKnownLocationTask = new IgnitedLastKnownLocationAsyncTask(context,\n                locationUpdatesDistanceDiff, locationUpdatesInterval);\n        if(IgnitedDiagnostics.SUPPORTS_HONEYCOMB) {\n            ignitedLastKnownLocationTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Boolean[0]);\n        } else {\n            ignitedLastKnownLocationTask.execute();\n        }\n    }\n\n    \/**\n     * Save last settings to preferences.\n     * \n     * @param context\n     * @param locationAnnotation\n     *\/\n    private void saveToPreferences(Context context, IgnitedLocationActivity locationAnnotation) {\n        requestLocationUpdates = locationAnnotation.requestLocationUpdates();\n        locationUpdatesDistanceDiff = locationAnnotation.locationUpdatesDistanceDiff();\n        locationUpdatesInterval = locationAnnotation.locationUpdatesInterval();\n        passiveLocationUpdatesDistanceDiff = locationAnnotation\n                .passiveLocationUpdatesDistanceDiff();\n        passiveLocationUpdatesInterval = locationAnnotation.passiveLocationUpdatesInterval();\n        boolean enablePassiveLocationUpdates = locationAnnotation.enablePassiveUpdates();\n        boolean useGps = locationAnnotation.useGps();\n\n        Editor editor = prefs.edit();\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_LOCATION_UPDATES,\n                requestLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                enablePassiveLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS, useGps);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_DISTANCE_DIFF,\n                locationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_INTERVAL,\n                locationUpdatesInterval);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_DISTANCE_DIFF,\n                passiveLocationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_INTERVAL,\n                passiveLocationUpdatesInterval);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_RUN_ONCE, true);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                locationAnnotation.minBatteryLevelForGps());\n        editor.putLong(IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                locationAnnotation.waitForGpsFixInterval());\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                locationAnnotation.showWaitForLocationDialog());\n        editor.commit();\n\n    }\n\n    before(Activity activity, IgnitedLocationActivity ignitedAnnotation) : execution(* Activity.onPause(..)) \n        && @this(ignitedAnnotation) && this(activity) && within(@IgnitedLocationActivity *) {\n\n        if (ignitedAnnotation.requestLocationUpdates()) {\n            disableLocationUpdates(true);\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n\n        if (ignitedLastKnownLocationTask != null) {\n            if (ignitedLastKnownLocationTask.getStatus() != AsyncTask.Status.FINISHED) {\n                Log.d(LOG_TAG, \"Cancel last location task\");\n                ignitedLastKnownLocationTask.cancel(true);\n            }\n            ignitedLastKnownLocationTask.getLastLocationFinder().cancel();\n        }\n\n        boolean finishing = activity.isFinishing();\n        if (finishing) {\n            context = null;\n            \/\/ Be sure to reset every flag previously set (since an aspect is a\n            \/\/ singleton by default, so its state will be shared across all Activities that\n            \/\/ reference it).\n            requestLocationUpdates = false;\n            locationUpdatesDisabled = true;\n            waitForFixDialogShown = false;\n            noProvidersEnabledDialogShown = false;\n            locationProviderDisabledReceiverRegistered = false;\n            refreshLocationUpdatesReceiverRegistered = false;\n        }\n    }\n\n    Location around() : get(@IgnitedLocation Location *) {\n        return currentLocation;\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && within(IgnitedPassiveLocationChangedReceiver) && !adviceexecution() {\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, lng\/acc): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude() + \"\/\"\n                + currentLocation.getAccuracy());\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && (within(IgnitedLocationChangedReceiver) || within(IgnitedAbstractLastLocationFinder)\n                || within(IgnitedLastKnownLocationAsyncTask)) && !adviceexecution() {\n\n        if (context == null) {\n            return;\n        }\n\n        final Activity activity = (Activity) context;\n        if (IgnitedLocationSupport.getEnabledProviders(context).isEmpty()) {\n            \/\/ On some older versions of Android if a dialog is not shown by the activity after\n            \/\/ calling showDialog an IllegalArgunmentException is raised. Catch this exception since\n            \/\/ the docs returning a null dialog should be allowed.\n            try {\n                activity.showDialog(R.id.ign_loc_dialog_no_providers_enabled);\n                noProvidersEnabledDialogShown = true;\n            } catch (IllegalArgumentException e) {\n                e.printStackTrace();\n            }\n            return;\n        }\n\n        if (freshLocation == null) {\n            \/\/ TODO Migrate this to DialogFragment at some point\n            boolean showWaitForLocationDialog = prefs.getBoolean(\n                    IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                    IgnitedLocationConstants.SHOW_WAIT_FOR_LOCATION_DIALOG_DEFAULT);\n            if (showWaitForLocationDialog && !activity.isFinishing()) {\n                \/\/ On some older versions of Android if a dialog is not shown by the activity after\n                \/\/ calling showDialog an IllegalArgunmentException is raised. Catch this exception since\n                \/\/ the docs returning a null dialog should be allowed.\n                try {\n                    activity.showDialog(R.id.ign_loc_dialog_wait_for_fix);\n                    waitForFixDialogShown = true;\n                } catch (IllegalArgumentException e) {\n                    e.printStackTrace();\n                }\n            }\n            return;\n        }\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, lng\/acc): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude() + \"\/\" + currentLocation.getAccuracy());\n        \/\/ TODO Migrate this to DialogFragment at some point\n        if (noProvidersEnabledDialogShown) {\n            activity.removeDialog(R.id.ign_loc_dialog_no_providers_enabled);\n            noProvidersEnabledDialogShown = false;\n        } else if (waitForFixDialogShown) {\n            activity.removeDialog(R.id.ign_loc_dialog_wait_for_fix);\n            waitForFixDialogShown = false;\n        }\n        boolean keepRequestingLocationUpdates = ((OnIgnitedLocationChangedListener) context)\n                .onIgnitedLocationChanged(currentLocation);\n        Bundle extras = freshLocation.getExtras();\n        \/\/ a) If location updates shouldn't be requested anymore turn them off.\n        \/\/ b) Don't turn location updates on if last location is too old, since the single location\n        \/\/ update is running.\n        if (!keepRequestingLocationUpdates) {\n            disableLocationUpdates(true);\n            \/\/ PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            return;\n        } else if (requestLocationUpdates\n                && (extras == null || !extras.containsKey(ILastLocationFinder.LAST_LOCATION_TOO_OLD_OR_INACCURATE_EXTRA))) {\n            \/\/ If we requested location updates, turn them on here.\n            requestLocationUpdates(context, null);\n        }\n\n        \/\/ If gps is enabled location comes from gps, remove runnable that removes gps updates\n        boolean lastLocation = extras != null && extras.containsKey(IgnitedLocationConstants.IGNITED_LAST_LOCATION_EXTRA);\n        if (!lastLocation && defaultCriteria.getAccuracy() == Criteria.ACCURACY_FINE\n                && currentLocation.getProvider().equals(LocationManager.GPS_PROVIDER)) {\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n    }\n\n    \/**\n     * Start listening for location updates.\n     *\/\n    protected void requestLocationUpdates(Context context, Criteria criteria) {\n        if (!locationUpdatesDisabled) {\n            return;\n        }\n        Criteria locationUpdateCriteria = criteria;\n        if (criteria == null) {\n            if (isBatteryLevelOk()) {\n                locationUpdateCriteria = defaultCriteria;\n            } else {\n                locationUpdateCriteria = lowPowerCriteria();\n            }\n        }\n        Log.d(LOG_TAG, \"Disabling passive location updates\");\n        locationManager.removeUpdates(locationListenerPassivePendingIntent);\n\n        Log.d(LOG_TAG, \"Requesting location updates\");\n        \/\/ Normal updates while activity is visible.\n        locationUpdateRequester.requestLocationUpdates(locationUpdatesInterval,\n                locationUpdatesDistanceDiff, locationUpdateCriteria, locationListenerPendingIntent);\n\n        \/\/ Register a receiver that listens for when the provider I'm using has\n        \/\/ been disabled.\n        IntentFilter locationProviderDisabledIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_PROVIDER_DISABLED_ACTION);\n        context.registerReceiver(locationProviderDisabledReceiver,\n                locationProviderDisabledIntentFilter);\n        locationProviderDisabledReceiverRegistered = true;\n\n        IntentFilter refreshLocationUpdatesIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.UPDATE_LOCATION_UPDATES_CRITERIA_ACTION);\n        context.registerReceiver(refreshLocationUpdatesReceiver, refreshLocationUpdatesIntentFilter);\n        refreshLocationUpdatesReceiverRegistered = true;\n\n        \/\/ Register a receiver that listens for when a better provider than I'm\n        \/\/ using becomes available.\n        String bestProvider = locationManager.getBestProvider(locationUpdateCriteria, false);\n        String bestAvailableProvider = locationManager.getBestProvider(locationUpdateCriteria, true);\n        if (bestProvider != null && !bestProvider.equals(bestAvailableProvider)) {\n            bestInactiveLocationProviderListener = new IgnitedLocationListener(context);\n            locationManager.requestLocationUpdates(bestProvider, 0, 0,\n                    bestInactiveLocationProviderListener, context.getMainLooper());\n        }\n\n        if (bestAvailableProvider.equals(LocationManager.GPS_PROVIDER)) {\n            Log.d(LOG_TAG, \"Posting delayed remove GPS updates message\");\n            \/\/ Post a runnable that will remove gps updates if no gps location is returned after 1\n            \/\/ minute in order to avoid draining the battery.\n            handler.postDelayed(removeGpsUpdates, prefs.getLong(\n                    IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                    IgnitedLocationConstants.WAIT_FOR_GPS_FIX_INTERVAL_DEFAULT));\n        }\n\n        locationUpdatesDisabled = false;\n    }\n\n    \/**\n     * Stop listening for location updates\n     * \n     * @param enablePassiveLocationUpdates\n     *\/\n    protected void disableLocationUpdates(boolean requestPassiveLocationUpdates) {\n        if (locationUpdatesDisabled) {\n            return;\n        }\n\n        Log.d(LOG_TAG, \"Disabling location updates\");\n        if (locationProviderDisabledReceiverRegistered) {\n            context.unregisterReceiver(locationProviderDisabledReceiver);\n            locationProviderDisabledReceiverRegistered = false;\n        }\n        if (refreshLocationUpdatesReceiverRegistered) {\n            context.unregisterReceiver(refreshLocationUpdatesReceiver);\n            refreshLocationUpdatesReceiverRegistered = false;\n        }\n        locationUpdateRequester.removeLocationUpdates();\n        if (bestInactiveLocationProviderListener != null) {\n            locationManager.removeUpdates(bestInactiveLocationProviderListener);\n        }\n\n        boolean finishing = ((Activity) context).isFinishing();\n\n        if (requestPassiveLocationUpdates && !finishing) {\n            requestPassiveLocationUpdates();\n        }\n\n        locationUpdatesDisabled = true;\n    }\n\n    private void requestPassiveLocationUpdates() {\n        if (IgnitedDiagnostics.SUPPORTS_FROYO\n                && prefs.getBoolean(\n                        IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                        IgnitedLocationConstants.ENABLE_PASSIVE_LOCATION_UPDATES_DEFAULT)) {\n            Log.d(LOG_TAG, \"Requesting passive location updates\");\n            \/\/ Passive location updates from 3rd party apps when the Activity isn't\n            \/\/ visible. Only for Android 2.2+.\n            locationUpdateRequester.requestPassiveLocationUpdates(passiveLocationUpdatesInterval,\n                    passiveLocationUpdatesDistanceDiff, locationListenerPassivePendingIntent);\n        }\n    }\n\n    public boolean isLocationUpdatesDisabled() {\n        return locationUpdatesDisabled;\n    }\n\n    public Criteria lowPowerCriteria() {\n        if (lowPowerCriteria == null) {\n            lowPowerCriteria = new Criteria();\n            lowPowerCriteria.setPowerRequirement(Criteria.POWER_LOW);\n            lowPowerCriteria.setAccuracy(Criteria.NO_REQUIREMENT);\n        }\n        return lowPowerCriteria;\n    }\n\n    \/**\n     * If the best Location Provider (usually GPS) is not available when we request location\n     * updates, this listener will be notified if \/ when it becomes available. It calls\n     * requestLocationUpdates to re-register the location listeners using the better Location\n     * Provider.\n     *\/\n    private class IgnitedLocationListener implements LocationListener {\n        private Context context;\n\n        public IgnitedLocationListener(Context appContext) {\n            this.context = appContext;\n        }\n\n        @Override\n        public void onLocationChanged(Location l) {\n        }\n\n        @Override\n        public void onProviderDisabled(String provider) {\n        }\n\n        @Override\n        public void onStatusChanged(String provider, int status, Bundle extras) {\n        }\n\n        @Override\n        public void onProviderEnabled(String provider) {\n            \/\/ Re-register the location listeners using the better Location\n            \/\/ Provider.\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, null);\n        }\n    }\n\n}\n","old_contents":"\/*\n * Copyright 2011 Google Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * This code has been modified by Stefano Dacchille.\n *\/\n\npackage com.github.ignition.location;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\n\nimport android.app.Activity;\nimport android.app.PendingIntent;\nimport android.content.BroadcastReceiver;\nimport android.content.Context;\nimport android.content.Intent;\nimport android.content.IntentFilter;\nimport android.content.SharedPreferences;\nimport android.content.SharedPreferences.Editor;\nimport android.location.Criteria;\nimport android.location.Location;\nimport android.location.LocationListener;\nimport android.location.LocationManager;\nimport android.os.AsyncTask;\nimport android.os.BatteryManager;\nimport android.os.Bundle;\nimport android.os.Handler;\nimport android.util.Log;\n\nimport com.github.ignition.location.annotations.IgnitedLocation;\nimport com.github.ignition.location.annotations.IgnitedLocationActivity;\nimport com.github.ignition.location.receivers.IgnitedLocationChangedReceiver;\nimport com.github.ignition.location.receivers.IgnitedPassiveLocationChangedReceiver;\nimport com.github.ignition.location.tasks.IgnitedLastKnownLocationAsyncTask;\nimport com.github.ignition.location.templates.ILastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLocationUpdateRequester;\nimport com.github.ignition.location.templates.OnIgnitedLocationChangedListener;\nimport com.github.ignition.location.utils.IgnitedLocationSupport;\nimport com.github.ignition.location.utils.PlatformSpecificImplementationFactory;\nimport com.github.ignition.support.IgnitedDiagnostics;\n\n@SuppressAjWarnings\npublic aspect IgnitedLocationManager {\n    public static final String LOG_TAG = IgnitedLocationManager.class.getSimpleName();\n\n    declare parents : (@IgnitedLocationActivity *) implements OnIgnitedLocationChangedListener;\n\n    private Criteria defaultCriteria, lowPowerCriteria;\n    protected IgnitedAbstractLocationUpdateRequester locationUpdateRequester;\n    protected PendingIntent locationListenerPendingIntent, locationListenerPassivePendingIntent;\n    protected LocationManager locationManager;\n    protected IgnitedLocationListener bestInactiveLocationProviderListener;\n\n    private Context context;\n    private volatile Location currentLocation;\n\n    private IgnitedLastKnownLocationAsyncTask ignitedLastKnownLocationTask;\n    private SharedPreferences prefs;\n    private Handler handler;\n\n    private long locationUpdatesInterval, passiveLocationUpdatesInterval;\n    private int locationUpdatesDistanceDiff;\n    private int passiveLocationUpdatesDistanceDiff;\n    private boolean requestLocationUpdates = false;\n    private boolean locationUpdatesDisabled = true;\n    private boolean waitForFixDialogShown = false;\n    private boolean noProvidersEnabledDialogShown = false;\n    private boolean locationProviderDisabledReceiverRegistered = false;\n    private boolean refreshLocationUpdatesReceiverRegistered = false;\n\n    \/\/ Switch to another provider if gps doesn't return a location quickly enough.\n    private Runnable removeGpsUpdates = new Runnable() {\n        @Override\n        public void run() {\n            Log.d(LOG_TAG,\n                    \"It looks like GPS isn't available at this time (i.e.: maybe you're indoors). Removing GPS location updates and requesting network updates.\");\n\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, lowPowerCriteria());\n        }\n    };\n\n    \/**\n     * If the Location Provider we're using to receive location updates is disabled while the app is\n     * running, this Receiver will be notified, allowing us to re-register our Location Receivers\n     * using the best available Location Provider is still available.\n     *\/\n    protected BroadcastReceiver locationProviderDisabledReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            boolean providerDisabled = !intent.getBooleanExtra(\n                    LocationManager.KEY_PROVIDER_ENABLED, false);\n            \/\/ Re-register the location listeners using the best available\n            \/\/ Location Provider.\n            if (providerDisabled) {\n                disableLocationUpdates(false);\n                requestLocationUpdates(context, null);\n            }\n        }\n    };\n\n    \/**\n     * If the battery state is low disable the passive location update receiver.\n     *\/\n    protected BroadcastReceiver refreshLocationUpdatesReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, null);\n        }\n    };\n\n    after(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onCreate(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n\n        \/\/ Get a reference to the Context\n        this.context = context;\n        \/\/ Set pref file\n        prefs = context.getSharedPreferences(IgnitedLocationConstants.SHARED_PREFERENCE_FILE,\n                Context.MODE_PRIVATE);\n        \/\/ Get references to the managers\n        locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);\n        handler = new Handler();\n\n        \/\/ Specify the Criteria to use when requesting location updates while\n        \/\/ the application is Active\n        if (defaultCriteria == null) {\n            defaultCriteria = new Criteria();\n        }\n        \/\/ Use gps if it's enabled and if battery level is at least 15%\n        boolean useGps = prefs.getBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS,\n                IgnitedLocationConstants.USE_GPS_DEFAULT);\n        if (useGps) {\n            defaultCriteria.setAccuracy(Criteria.ACCURACY_FINE);\n        } else {\n            defaultCriteria.setPowerRequirement(Criteria.POWER_LOW);\n        }\n\n        \/\/ Setup the location update Pending Intent\n        Intent activeIntent = new Intent(IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_ACTION);\n        locationListenerPendingIntent = PendingIntent.getBroadcast(context, 0, activeIntent,\n                PendingIntent.FLAG_UPDATE_CURRENT);\n        \/\/ Setup the passive location update Pending Intent\n        Intent passiveIntent = new Intent(context, IgnitedPassiveLocationChangedReceiver.class);\n        locationListenerPassivePendingIntent = PendingIntent.getBroadcast(context, 0,\n                passiveIntent, PendingIntent.FLAG_UPDATE_CURRENT);\n\n        \/\/ Instantiate a Location Update Requester class based on the available\n        \/\/ platform version. This will be used to request location updates.\n        locationUpdateRequester = PlatformSpecificImplementationFactory\n                .getLocationUpdateRequester(context);\n    }\n\n    private boolean isBatteryOk() {\n        IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);\n        Intent intent = context.registerReceiver(null, filter);\n        double currentLevel = 100.0;\n        if (intent != null) {\n            currentLevel = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1);\n        }\n\n        return currentLevel >= prefs.getInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                IgnitedLocationConstants.MIN_BATTERY_LEVEL_FOR_GPS_DEFAULT);\n    }\n\n    before(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onResume(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n        \/\/ Get a reference to the Context if this context is null\n        if (this.context == null) {\n            this.context = context;\n        }\n\n        saveToPreferences(context, ignitedAnnotation);\n\n        Log.d(LOG_TAG, \"Retrieving last known location...\");\n        \/\/ Get the last known location. This isn't directly affecting the UI, so put it on a\n        \/\/ worker thread.\n        ignitedLastKnownLocationTask = new IgnitedLastKnownLocationAsyncTask(context,\n                locationUpdatesDistanceDiff, locationUpdatesInterval);\n        if(IgnitedDiagnostics.SUPPORTS_HONEYCOMB) {\n            ignitedLastKnownLocationTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Boolean[0]);\n        } else {\n            ignitedLastKnownLocationTask.execute();\n        }\n    }\n\n    \/**\n     * Save last settings to preferences.\n     * \n     * @param context\n     * @param locationAnnotation\n     *\/\n    private void saveToPreferences(Context context, IgnitedLocationActivity locationAnnotation) {\n        requestLocationUpdates = locationAnnotation.requestLocationUpdates();\n        locationUpdatesDistanceDiff = locationAnnotation.locationUpdatesDistanceDiff();\n        locationUpdatesInterval = locationAnnotation.locationUpdatesInterval();\n        passiveLocationUpdatesDistanceDiff = locationAnnotation\n                .passiveLocationUpdatesDistanceDiff();\n        passiveLocationUpdatesInterval = locationAnnotation.passiveLocationUpdatesInterval();\n        boolean enablePassiveLocationUpdates = locationAnnotation.enablePassiveUpdates();\n        boolean useGps = locationAnnotation.useGps();\n\n        Editor editor = prefs.edit();\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_LOCATION_UPDATES,\n                requestLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                enablePassiveLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS, useGps);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_DISTANCE_DIFF,\n                locationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_INTERVAL,\n                locationUpdatesInterval);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_DISTANCE_DIFF,\n                passiveLocationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_INTERVAL,\n                passiveLocationUpdatesInterval);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_RUN_ONCE, true);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                locationAnnotation.minBatteryLevelForGps());\n        editor.putLong(IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                locationAnnotation.waitForGpsFixInterval());\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                locationAnnotation.showWaitForLocationDialog());\n        editor.commit();\n\n    }\n\n    before(Activity activity, IgnitedLocationActivity ignitedAnnotation) : execution(* Activity.onPause(..)) \n        && @this(ignitedAnnotation) && this(activity) && within(@IgnitedLocationActivity *) {\n\n        if (ignitedAnnotation.requestLocationUpdates()) {\n            disableLocationUpdates(true);\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n\n        if (ignitedLastKnownLocationTask != null) {\n            if (ignitedLastKnownLocationTask.getStatus() != AsyncTask.Status.FINISHED) {\n                Log.d(LOG_TAG, \"Cancel last location task\");\n                ignitedLastKnownLocationTask.cancel(true);\n            }\n            ignitedLastKnownLocationTask.getLastLocationFinder().cancel();\n        }\n\n        boolean finishing = activity.isFinishing();\n        if (finishing) {\n            context = null;\n            \/\/ Be sure to reset every flag previously set (since an aspect is a\n            \/\/ singleton by default, so its state will be shared across all Activities that\n            \/\/ reference it).\n            requestLocationUpdates = false;\n            locationUpdatesDisabled = true;\n            waitForFixDialogShown = false;\n            noProvidersEnabledDialogShown = false;\n            locationProviderDisabledReceiverRegistered = false;\n            refreshLocationUpdatesReceiverRegistered = false;\n        }\n    }\n\n    Location around() : get(@IgnitedLocation Location *) {\n        return currentLocation;\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && within(IgnitedPassiveLocationChangedReceiver) && !adviceexecution() {\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, lng\/acc): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude() + \"\/\"\n                + currentLocation.getAccuracy());\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && (within(IgnitedLocationChangedReceiver) || within(IgnitedAbstractLastLocationFinder)\n                || within(IgnitedLastKnownLocationAsyncTask)) && !adviceexecution() {\n\n        if (context == null) {\n            return;\n        }\n\n        final Activity activity = (Activity) context;\n        if (IgnitedLocationSupport.getEnabledProviders(context).isEmpty()) {\n            \/\/ On some older versions of Android if a dialog is not shown by the activity after\n            \/\/ calling showDialog an IllegalArgunmentException is raised. Catch this exception since\n            \/\/ the docs returning a null dialog should be allowed.\n            try {\n                activity.showDialog(R.id.ign_loc_dialog_no_providers_enabled);\n                noProvidersEnabledDialogShown = true;\n            } catch (IllegalArgumentException e) {\n                e.printStackTrace();\n            }\n            return;\n        }\n\n        if (freshLocation == null) {\n            \/\/ TODO Migrate this to DialogFragment at some point\n            boolean showWaitForLocationDialog = prefs.getBoolean(\n                    IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                    IgnitedLocationConstants.SHOW_WAIT_FOR_LOCATION_DIALOG_DEFAULT);\n            if (showWaitForLocationDialog && !activity.isFinishing()) {\n                \/\/ On some older versions of Android if a dialog is not shown by the activity after\n                \/\/ calling showDialog an IllegalArgunmentException is raised. Catch this exception since\n                \/\/ the docs returning a null dialog should be allowed.\n                try {\n                    activity.showDialog(R.id.ign_loc_dialog_wait_for_fix);\n                    waitForFixDialogShown = true;\n                } catch (IllegalArgumentException e) {\n                    e.printStackTrace();\n                }\n            }\n            return;\n        }\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, lng\/acc): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude() + \"\/\" + currentLocation.getAccuracy());\n        \/\/ TODO Migrate this to DialogFragment at some point\n        if (noProvidersEnabledDialogShown) {\n            activity.removeDialog(R.id.ign_loc_dialog_no_providers_enabled);\n            noProvidersEnabledDialogShown = false;\n        } else if (waitForFixDialogShown) {\n            activity.removeDialog(R.id.ign_loc_dialog_wait_for_fix);\n            waitForFixDialogShown = false;\n        }\n        boolean keepRequestingLocationUpdates = ((OnIgnitedLocationChangedListener) context)\n                .onIgnitedLocationChanged(currentLocation);\n        Bundle extras = freshLocation.getExtras();\n        \/\/ a) If location updates shouldn't be requested anymore turn them off.\n        \/\/ b) Don't turn location updates on if last location is too old, since the single location\n        \/\/ update is running.\n        if (!keepRequestingLocationUpdates) {\n            disableLocationUpdates(true);\n            \/\/ PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            return;\n        } else if (requestLocationUpdates\n                && (extras == null || !extras.containsKey(ILastLocationFinder.LAST_LOCATION_TOO_OLD_OR_INACCURATE_EXTRA))) {\n            \/\/ If we requested location updates, turn them on here.\n            requestLocationUpdates(context, null);\n        }\n\n        \/\/ If gps is enabled location comes from gps, remove runnable that removes gps updates\n        boolean lastLocation = extras != null && extras.containsKey(IgnitedLocationConstants.IGNITED_LAST_LOCATION_EXTRA);\n        if (!lastLocation && defaultCriteria.getAccuracy() == Criteria.ACCURACY_FINE\n                && currentLocation.getProvider().equals(LocationManager.GPS_PROVIDER)) {\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n    }\n\n    \/**\n     * Start listening for location updates.\n     *\/\n    protected void requestLocationUpdates(Context context, Criteria criteria) {\n        if (!locationUpdatesDisabled) {\n            return;\n        }\n        Criteria locationUpdateCriteria = criteria;\n        if (criteria == null) {\n            if (isBatteryOk()) {\n                locationUpdateCriteria = defaultCriteria;\n            } else {\n                locationUpdateCriteria = lowPowerCriteria();\n            }\n        }\n        Log.d(LOG_TAG, \"Disabling passive location updates\");\n        locationManager.removeUpdates(locationListenerPassivePendingIntent);\n\n        Log.d(LOG_TAG, \"Requesting location updates\");\n        \/\/ Normal updates while activity is visible.\n        locationUpdateRequester.requestLocationUpdates(locationUpdatesInterval,\n                locationUpdatesDistanceDiff, locationUpdateCriteria, locationListenerPendingIntent);\n\n        \/\/ Register a receiver that listens for when the provider I'm using has\n        \/\/ been disabled.\n        IntentFilter locationProviderDisabledIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_PROVIDER_DISABLED_ACTION);\n        context.registerReceiver(locationProviderDisabledReceiver,\n                locationProviderDisabledIntentFilter);\n        locationProviderDisabledReceiverRegistered = true;\n\n        IntentFilter refreshLocationUpdatesIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.UPDATE_LOCATION_UPDATES_CRITERIA_ACTION);\n        context.registerReceiver(refreshLocationUpdatesReceiver, refreshLocationUpdatesIntentFilter);\n        refreshLocationUpdatesReceiverRegistered = true;\n\n        \/\/ Register a receiver that listens for when a better provider than I'm\n        \/\/ using becomes available.\n        String bestProvider = locationManager.getBestProvider(locationUpdateCriteria, false);\n        String bestAvailableProvider = locationManager.getBestProvider(locationUpdateCriteria, true);\n        if (bestProvider != null && !bestProvider.equals(bestAvailableProvider)) {\n            bestInactiveLocationProviderListener = new IgnitedLocationListener(context);\n            locationManager.requestLocationUpdates(bestProvider, 0, 0,\n                    bestInactiveLocationProviderListener, context.getMainLooper());\n        }\n\n        if (bestAvailableProvider.equals(LocationManager.GPS_PROVIDER)) {\n            Log.d(LOG_TAG, \"Posting delayed remove GPS updates message\");\n            \/\/ Post a runnable that will remove gps updates if no gps location is returned after 1\n            \/\/ minute in order to avoid draining the battery.\n            handler.postDelayed(removeGpsUpdates, prefs.getLong(\n                    IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                    IgnitedLocationConstants.WAIT_FOR_GPS_FIX_INTERVAL_DEFAULT));\n        }\n\n        locationUpdatesDisabled = false;\n    }\n\n    \/**\n     * Stop listening for location updates\n     * \n     * @param enablePassiveLocationUpdates\n     *\/\n    protected void disableLocationUpdates(boolean requestPassiveLocationUpdates) {\n        if (locationUpdatesDisabled) {\n            return;\n        }\n\n        Log.d(LOG_TAG, \"Disabling location updates\");\n        if (locationProviderDisabledReceiverRegistered) {\n            context.unregisterReceiver(locationProviderDisabledReceiver);\n            locationProviderDisabledReceiverRegistered = false;\n        }\n        if (refreshLocationUpdatesReceiverRegistered) {\n            context.unregisterReceiver(refreshLocationUpdatesReceiver);\n            refreshLocationUpdatesReceiverRegistered = false;\n        }\n        locationUpdateRequester.removeLocationUpdates();\n        if (bestInactiveLocationProviderListener != null) {\n            locationManager.removeUpdates(bestInactiveLocationProviderListener);\n        }\n\n        boolean finishing = ((Activity) context).isFinishing();\n\n        if (requestPassiveLocationUpdates && !finishing) {\n            requestPassiveLocationUpdates();\n        }\n\n        locationUpdatesDisabled = true;\n    }\n\n    private void requestPassiveLocationUpdates() {\n        if (IgnitedDiagnostics.SUPPORTS_FROYO\n                && prefs.getBoolean(\n                        IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                        IgnitedLocationConstants.ENABLE_PASSIVE_LOCATION_UPDATES_DEFAULT)) {\n            Log.d(LOG_TAG, \"Requesting passive location updates\");\n            \/\/ Passive location updates from 3rd party apps when the Activity isn't\n            \/\/ visible. Only for Android 2.2+.\n            locationUpdateRequester.requestPassiveLocationUpdates(passiveLocationUpdatesInterval,\n                    passiveLocationUpdatesDistanceDiff, locationListenerPassivePendingIntent);\n        }\n    }\n\n    public boolean isLocationUpdatesDisabled() {\n        return locationUpdatesDisabled;\n    }\n\n    public Criteria lowPowerCriteria() {\n        if (lowPowerCriteria == null) {\n            lowPowerCriteria = new Criteria();\n            lowPowerCriteria.setPowerRequirement(Criteria.POWER_LOW);\n            lowPowerCriteria.setAccuracy(Criteria.NO_REQUIREMENT);\n        }\n        return lowPowerCriteria;\n    }\n\n    \/**\n     * If the best Location Provider (usually GPS) is not available when we request location\n     * updates, this listener will be notified if \/ when it becomes available. It calls\n     * requestLocationUpdates to re-register the location listeners using the better Location\n     * Provider.\n     *\/\n    private class IgnitedLocationListener implements LocationListener {\n        private Context context;\n\n        public IgnitedLocationListener(Context appContext) {\n            this.context = appContext;\n        }\n\n        @Override\n        public void onLocationChanged(Location l) {\n        }\n\n        @Override\n        public void onProviderDisabled(String provider) {\n        }\n\n        @Override\n        public void onStatusChanged(String provider, int status, Bundle extras) {\n        }\n\n        @Override\n        public void onProviderEnabled(String provider) {\n            \/\/ Re-register the location listeners using the better Location\n            \/\/ Provider.\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, null);\n        }\n    }\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"f603eae521caebdafcb2959f0f0fa8b3e8f602fc","subject":"re-adding AspectJ support; softening IOException, ClassNotFoundException, InstantiationException, IllegalAccessException, InvocationTargetException","message":"re-adding AspectJ support; softening IOException, ClassNotFoundException, InstantiationException, IllegalAccessException, InvocationTargetException\n","repos":"jfs\/mechjack","old_file":"src\/java\/com\/mechjack\/dispatch\/aspects\/SoftenExceptionsAspect.aj","new_file":"src\/java\/com\/mechjack\/dispatch\/aspects\/SoftenExceptionsAspect.aj","new_contents":"","old_contents":"","returncode":128,"stderr":"remote: Support for password authentication was removed on August 13, 2021.\nremote: Please see https:\/\/docs.github.com\/en\/get-started\/getting-started-with-git\/about-remote-repositories#cloning-with-https-urls for information on currently recommended modes of authentication.\nfatal: Authentication failed for 'https:\/\/github.com\/jfs\/mechjack.git\/'\n","license":"mit","lang":"AspectJ"}
{"commit":"b60ac538b9ab606fa00ef6bcc512d36d4bd4db09","subject":"Dispatcher monitor","message":"Dispatcher monitor\n","repos":"DataDog\/monitor,eigengo\/monitor,eigengo\/monitor,DataDog\/monitor","old_file":"agent-akka\/src\/main\/aj\/org\/eigengo\/monitor\/agent\/akka\/DispatcherMonitoringAspect.aj","new_file":"agent-akka\/src\/main\/aj\/org\/eigengo\/monitor\/agent\/akka\/DispatcherMonitoringAspect.aj","new_contents":"package org.eigengo.monitor.agent.akka;\n\npublic aspect DispatcherMonitoringAspect extends AbstractMonitoringAspect {\n\n\n\n}\n","old_contents":"","returncode":1,"stderr":"error: pathspec 'agent-akka\/src\/main\/aj\/org\/eigengo\/monitor\/agent\/akka\/DispatcherMonitoringAspect.aj' did not match any file(s) known to git\n","license":"apache-2.0","lang":"AspectJ"}
{"commit":"85ea0673ceb3e3f8668d6ff4a4795d5a34dede7f","subject":"-solving bug ","message":"-solving bug ","repos":"jmseigneur\/opprim-sim","old_file":"Muses Sim\/src\/main\/java\/eu\/musesproject\/server\/rt2ae\/Accessrequest_Roo_Jpa_ActiveRecord.aj","new_file":"Muses Sim\/src\/main\/java\/eu\/musesproject\/server\/rt2ae\/Accessrequest_Roo_Jpa_ActiveRecord.aj","new_contents":"","old_contents":"","returncode":1,"stderr":"error: pathspec 'Muses' did not match any file(s) known to git\nerror: pathspec 'Sim\/src\/main\/java\/eu\/musesproject\/server\/rt2ae\/Accessrequest_Roo_Jpa_ActiveRecord.aj' did not match any file(s) known to git\n","license":"agpl-3.0","lang":"AspectJ"}
{"commit":"082a0d5a47179ca4cd461078308cd23c36714425","subject":"Extra fixture for more complex execution path testing.","message":"Extra fixture for more complex execution path testing.\n","repos":"cderoove\/damp.ekeko.aspectj","old_file":"damp.ekeko.aspectj.plugin.test\/resources\/TestCases\/AJ-LMP-Annotations\/src\/damp\/ekeko\/aspectj\/annasstests\/PrevFix2.aj","new_file":"damp.ekeko.aspectj.plugin.test\/resources\/TestCases\/AJ-LMP-Annotations\/src\/damp\/ekeko\/aspectj\/annasstests\/PrevFix2.aj","new_contents":"package damp.ekeko.aspectj.annasstests;\n\nimport damp.ekeko.aspectj.annotations.RequiresPrevious;\n\n\n\/\/testing advice execution order and execution paths through advice and methods\npublic aspect PrevFix2 {\n\tdeclare precedence: PrevFix, PrevFix2;\n\t\n\t\/\/succeeds\n\t@RequiresPrevious(\"beforecompute\")\n\tbefore() : call(int *.compute(String))\n\t{\t}\n\t\n\t\/\/succeeds\n\t@RequiresPrevious(\"beforecompute\")\n\tafter() : call(int *.compute(String))\n\t{\t}\n\t\n\t\/\/succeeds\n\t@RequiresPrevious(\"preparing\")\n\tafter() : call(int *.compute(String))\n\t{\t}\n\t\n\t\/\/succeeds\n\t@RequiresPrevious(\"beforecompute\")\n\tafter() : call(void *.simulate())\n\t{\n\t\tthis.unthink();\n\t}\n\t\n\t@RequiresPrevious(\"thinking\")\n\tvoid unthink()\n\t{ }\n}\n","old_contents":"","returncode":1,"stderr":"error: pathspec 'damp.ekeko.aspectj.plugin.test\/resources\/TestCases\/AJ-LMP-Annotations\/src\/damp\/ekeko\/aspectj\/annasstests\/PrevFix2.aj' did not match any file(s) known to git\n","license":"epl-1.0","lang":"AspectJ"}
{"commit":"3aac5efdf8821c1b12826d4a4d6e994c999e190a","subject":"Instrumentation added for property Online 4-4 (JavaMOP)","message":"Instrumentation added for property Online 4-4 (JavaMOP)","repos":"selig\/qea","old_file":"code\/qea\/src\/benchmark\/competition\/java\/javaMOP\/monitoring\/JavaMOPFourAspect.aj","new_file":"code\/qea\/src\/benchmark\/competition\/java\/javaMOP\/monitoring\/JavaMOPFourAspect.aj","new_contents":"package benchmark.competition.java.javaMOP.monitoring;\n\nimport java.util.Collection;\nimport java.util.Iterator;\nimport java.util.Map;\nimport java.util.Set;\n\nimport monitoring.impl.MonitorFactory;\nimport monitoring.intf.Monitor;\nimport properties.Property;\nimport properties.competition.JavaMOP;\nimport structure.impl.other.Verdict;\nimport structure.intf.QEA;\nimport benchmark.competition.java.javaMOP.MapIteratorTest;\n\n@SuppressWarnings(\"rawtypes\")\npublic aspect JavaMOPFourAspect {\n\n\tprivate final Monitor monitor;\n\n\tprivate final int CREATE = 1;\n\tprivate final int ITERATOR = 2;\n\tprivate final int USE = 3;\n\tprivate final int UPDATE = 4;\n\n\tpublic JavaMOPFourAspect() {\n\t\tQEA qea = new JavaMOP().make(Property.JAVAMOP_FOUR);\n\t\tmonitor = MonitorFactory.create(qea);\n\t}\n\n\t\/\/ create(m,c)\n\tpointcut create(Map map) : call(Set Map.keySet()) && target(map)\n\t\t&& within(MapIteratorTest);\n\n\t\/\/ iterator(c,i)\n\tpointcut iterator(Collection col) : call(Iterator Collection.iterator())\n\t\t&& target(col) && within(MapIteratorTest);\n\n\t\/\/ update(m)\n\tpointcut update(Map map) : call(* Map.put(*, *)) && target(map)\n\t\t&& within(MapIteratorTest);\n\n\t\/\/ use(i)\n\tpointcut use(Iterator iter) : call(* Iterator.*(..)) && target(iter)\n\t\t&& within(MapIteratorTest);\n\n\tafter(Map map) returning (Collection col) : create(map) {\n\t\tVerdict verdict = monitor.step(CREATE, map, col);\n\t\tif (verdict == Verdict.FAILURE) {\n\t\t\tSystem.err.println(\"Violation in JavaMOP 4. [map=\" + map + \", col=\"\n\t\t\t\t\t+ col + \"]. UnsafeMapIterator\");\n\t\t\tSystem.exit(0);\n\t\t}\n\t}\n\n\tafter(Collection col) returning (Iterator iter) : iterator(col) {\n\t\tVerdict verdict = monitor.step(ITERATOR, col, iter);\n\t\tif (verdict == Verdict.FAILURE) {\n\t\t\tSystem.err.println(\"Violation in JavaMOP 4. [col=\" + col\n\t\t\t\t\t+ \", iter=\" + iter + \"]. UnsafeMapIterator\");\n\t\t\tSystem.exit(0);\n\t\t}\n\t}\n\n\tbefore(Map map) : update(map) {\n\t\tVerdict verdict = monitor.step(UPDATE, map);\n\t\tif (verdict == Verdict.FAILURE) {\n\t\t\tSystem.err.println(\"Violation in JavaMOP 4. [map=\" + map\n\t\t\t\t\t+ \"]. UnsafeMapIterator\");\n\t\t\tSystem.exit(0);\n\t\t}\n\t}\n\n\tbefore(Iterator iter) : use(iter) {\n\t\tVerdict verdict = monitor.step(USE, iter);\n\t\tif (verdict == Verdict.FAILURE) {\n\t\t\tSystem.err.println(\"Violation in JavaMOP 4. [iter=\" + iter\n\t\t\t\t\t+ \"]. UnsafeMapIterator\");\n\t\t\tSystem.exit(0);\n\t\t}\n\t}\n\n\tpointcut endOfProgram() : execution(void MapIteratorTest.main(String[]));\n\n\tafter() : endOfProgram() {\n\t\tVerdict verdict = monitor.end();\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\n\t\t\tSystem.err.println(\"Violation in JavaMOP 4. UnsafeMapIterator.\");\n\t\t} else {\n\t\t\tSystem.err.println(\"Property JavaMOP 4 satisfied\");\n\t\t}\n\t}\n}\n","old_contents":"","returncode":1,"stderr":"error: pathspec 'code\/qea\/src\/benchmark\/competition\/java\/javaMOP\/monitoring\/JavaMOPFourAspect.aj' did not match any file(s) known to git\n","license":"mit","lang":"AspectJ"}
{"commit":"f405a6e97b7c3063a2fcaeab1e782eac33765689","subject":"Add aspect to check environment variables for Baggage from main method","message":"Add aspect to check environment variables for Baggage from main method\n","repos":"brownsys\/tracing-framework,brownsys\/tracing-framework,brownsys\/tracing-framework,brownsys\/tracing-framework,brownsys\/tracing-framework,brownsys\/tracing-framework,brownsys\/tracing-framework","old_file":"tracingplane\/aspects\/src\/main\/aspect\/edu\/brown\/cs\/systems\/tracing\/aspects\/TracingPlaneInit.aj","new_file":"tracingplane\/aspects\/src\/main\/aspect\/edu\/brown\/cs\/systems\/tracing\/aspects\/TracingPlaneInit.aj","new_contents":"package edu.brown.cs.systems.tracing.aspects;\n\nimport edu.brown.cs.systems.baggage.BaggageUtils;\n\n\/**\n * Instruments all main methods\n *\/\npublic aspect TracingPlaneInit {\n    \n    declare precedence: TracingPlaneInit, *;\n\n    before(): execution(public static void main(String[])) {\n        BaggageUtils.checkEnvironment(System.getenv());\n    }\n\n}\n","old_contents":"","returncode":1,"stderr":"error: pathspec 'tracingplane\/aspects\/src\/main\/aspect\/edu\/brown\/cs\/systems\/tracing\/aspects\/TracingPlaneInit.aj' did not match any file(s) known to git\n","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"407d15509740bd2461d6380f3ca378ee37118aa1","subject":"-solving bug ","message":"-solving bug ","repos":"jmseigneur\/opprim-sim","old_file":"Muses Sim\/src\/main\/java\/eu\/musesproject\/server\/rt2ae\/Opportunity_Roo_DbManaged.aj","new_file":"Muses Sim\/src\/main\/java\/eu\/musesproject\/server\/rt2ae\/Opportunity_Roo_DbManaged.aj","new_contents":"","old_contents":"","returncode":1,"stderr":"error: pathspec 'Muses' did not match any file(s) known to git\nerror: pathspec 'Sim\/src\/main\/java\/eu\/musesproject\/server\/rt2ae\/Opportunity_Roo_DbManaged.aj' did not match any file(s) known to git\n","license":"agpl-3.0","lang":"AspectJ"}
{"commit":"d701e5ecc067f6937f08269ae196e330acf8e56b","subject":"Add a test cases for arrays in arrooj","message":"Add a test cases for arrays in arrooj\n","repos":"amanjpro\/languages-a-la-carte,amanjpro\/languages-a-la-carte","old_file":"tests\/arrooj\/arrays.aj","new_file":"tests\/arrooj\/arrays.aj","new_contents":"\/\/ fails\n\/\/ TYPE_MISMATCH\n\n\nclass Arrays {\n  int array[][] = new int[3][];\n  int array2[]  = {1, 2, 3, 4};\n  int array3[]  = {1, \"klj\", 3, 4}; \/\/ fails\n\n\n  void m() {\n    int k = array[2][3];\n    k     = array2[3];\n  }\n}\n\n","old_contents":"","returncode":1,"stderr":"error: pathspec 'tests\/arrooj\/arrays.aj' did not match any file(s) known to git\n","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"0789739e1df8b13fd3cc1ff88aaf5c6fa2667a91","subject":"txtUML, trunk: fix - previous commit did not add InstructionImporerAspect.aj to version control","message":"txtUML, trunk: fix - previous commit did not add InstructionImporerAspect.aj to version control\n","repos":"ELTE-Soft\/txtUML,ELTE-Soft\/txtUML,ELTE-Soft\/txtUML,ELTE-Soft\/txtUML","old_file":"src\/txtuml\/importer\/InstructionImporterAspect.aj","new_file":"src\/txtuml\/importer\/InstructionImporterAspect.aj","new_contents":"package txtuml.importer;\r\n\r\nimport org.aspectj.lang.Signature;\r\n\r\nimport txtuml.api.ExternalClass;\r\nimport txtuml.api.ModelBool;\r\nimport txtuml.api.ModelClass;\r\nimport txtuml.api.ModelInt;\r\nimport txtuml.api.ModelString;\r\nimport txtuml.api.ExternalClass;\r\nimport txtuml.api.Association.AssociationEnd;\r\n\r\npublic privileged aspect InstructionImporterAspect extends AbstractImporterAspect {\r\n\r\n\r\n\tafter() returning(ModelInt target) : call((ModelInt).new(int)) && isActive()\r\n\t{\r\n\t\tInstructionImporter.createModelTypeLiteral(target);\r\n\t}\r\n\tafter() returning(ModelBool target) : call((ModelBool).new(boolean)) && isActive()\r\n\t{\r\n\t\tInstructionImporter.createModelTypeLiteral(target);\r\n\t}\r\n\tafter() returning(ModelString target) : call((ModelString).new(String)) && isActive()\r\n\t{\r\n\t\tInstructionImporter.createModelTypeLiteral(target);\r\n\t}\r\n\t\r\n\t@SuppressWarnings({ \"rawtypes\", \"unchecked\" })\r\n\tObject around(AssociationEnd target):target(target) && call(ModelClass selectOne()) && isActive()\r\n\t{\r\n\t\treturn InstructionImporter.importAssociationEnd_SelectOne(target);\r\n\t}\r\n\r\n\r\n\tafter(ModelClass target): execution((ModelClass+).new(..)) && isActive() && target(target)\r\n\t{\r\n\t\tInstructionImporter.importInstanceCreation(target);\r\n\t}\r\n\t\r\n\t\r\n\tObject around(ModelClass target): target(target) && call(* *(..))  && isActive() {\r\n\t\ttry\r\n\t\t{\r\n\t\t\treturn InstructionImporter.importMethodCall(target, thisJoinPoint.getSignature().getName(),thisJoinPoint.getArgs());\r\n\t\t}\r\n\t\tcatch(ImportException exc)\r\n\t\t{\r\n\t\t\t\/\/exc.printStackTrace();\r\n\t\t\treturn null;\r\n\t\t}\r\n\t}\r\n\t\r\n\r\n\tObject around(ExternalClass target) : target(target) && call(* (ExternalClass+).*(..)) && isActive() {\r\n\t\treturn InstructionImporter.callExternal(target, thisJoinPoint.getSignature().getName(), thisJoinPoint.getArgs());\r\n\t}\r\n\t\r\n\tObject around() : call(static * (ExternalClass+).*(..)) && isActive() {\r\n\t\treturn InstructionImporter.callStaticExternal(thisJoinPoint.getSignature().getDeclaringType(), thisJoinPoint.getSignature().getName(), thisJoinPoint.getArgs());\r\n\t}\r\n\r\n\t\r\n\t\r\n\tObject around(ModelClass target, Object newValue) : target(target) && set(* *) && args(newValue) && isActive() && !withincode((ModelClass+).new(..))\r\n\t{\r\n\t\treturn InstructionImporter.fieldSet(target,thisJoinPoint.getSignature().getName(),newValue);\r\n\t}\r\n\r\n\tObject around(ModelClass target) : target(target) && get(* *) && isActive() {\r\n\t\tSignature signature=thisJoinPoint.getSignature();\r\n\t\ttry {\r\n\t\t\treturn InstructionImporter.fieldGet(target,signature.getName(),signature.getDeclaringType().getDeclaredField(signature.getName()).getType());\r\n\t\t} catch (NoSuchFieldException e) {\r\n\t\t\t\/\/ TODO Auto-generated catch block\r\n\t\t\t\/\/e.printStackTrace();\r\n\t\t}\r\n\t\treturn null;\r\n\t}\r\n}\r\n","old_contents":"","returncode":1,"stderr":"error: pathspec 'src\/txtuml\/importer\/InstructionImporterAspect.aj' did not match any file(s) known to git\n","license":"epl-1.0","lang":"AspectJ"}
{"commit":"7d32e9b4e60096385a6d6703f1b1c21b707e154b","subject":"Instrumentation added for property Java 4-2 (JavaMOP)","message":"Instrumentation added for property Java 4-2 (JavaMOP)","repos":"selig\/qea","old_file":"code\/qea\/src\/benchmark\/competition\/java\/javaMOP\/monitoring\/JavaMOPTwoAspect.aj","new_file":"code\/qea\/src\/benchmark\/competition\/java\/javaMOP\/monitoring\/JavaMOPTwoAspect.aj","new_contents":"package benchmark.competition.java.javaMOP.monitoring;\n\nimport java.util.concurrent.locks.Lock;\n\nimport monitoring.impl.MonitorFactory;\nimport monitoring.intf.Monitor;\nimport properties.Property;\nimport properties.competition.JavaMOP;\nimport structure.impl.other.Verdict;\nimport structure.intf.QEA;\nimport benchmark.competition.java.javaMOP.LockTest;\n\npublic aspect JavaMOPTwoAspect {\n\n\tprivate final Monitor monitor;\n\n\tprivate final int LOCK = 1;\n\tprivate final int UNLOCK = 2;\n\n\tpublic JavaMOPTwoAspect() {\n\t\tQEA qea = new JavaMOP().make(Property.JAVAMOP_TWO);\n\t\tmonitor = MonitorFactory.create(qea);\n\t}\n\n\tpointcut lockPC(Thread thread, Lock lockObj) : call(void Lock.lock())\n\t\t&& target(lockObj) && this(thread);\n\n\tpointcut unlockPC(Thread thread, Lock lockObj) : call(void Lock.unlock())\n\t\t&& target(lockObj) && this(thread);\n\n\tbefore(Thread thread, Lock lockObj) : lockPC(thread, lockObj) {\n\t\tVerdict verdict = null;\n\t\tsynchronized (monitor) {\n\t\t\tverdict = monitor.step(LOCK, thread, lockObj);\n\t\t}\n\t\tif (verdict == Verdict.FAILURE) {\n\t\t\tSystem.err\n\t\t\t\t\t.println(\"Violation in JavaMOP 2. [thread=\"\n\t\t\t\t\t\t\t+ thread\n\t\t\t\t\t\t\t+ \", lock=\"\n\t\t\t\t\t\t\t+ lockObj\n\t\t\t\t\t\t\t+ \"]. A thread should release a lock as many times as it acquires the lock.\");\n\t\t}\n\t}\n\n\tbefore(Thread thread, Lock lockObj) : unlockPC(thread, lockObj) {\n\t\tVerdict verdict = null;\n\t\tsynchronized (monitor) {\n\t\t\tverdict = monitor.step(UNLOCK, thread, lockObj);\n\t\t}\n\t\tif (verdict == Verdict.FAILURE) {\n\t\t\tSystem.err\n\t\t\t\t\t.println(\"Violation in JavaMOP 2. [thread=\"\n\t\t\t\t\t\t\t+ thread\n\t\t\t\t\t\t\t+ \", lock=\"\n\t\t\t\t\t\t\t+ lockObj\n\t\t\t\t\t\t\t+ \"]. A thread should release a lock as many times as it acquires the lock.\");\n\t\t}\n\t}\n\n\tpointcut endOfProgram() : execution(void LockTest.main(String[]));\n\n\tafter() : endOfProgram() {\n\t\tVerdict verdict = monitor.end();\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\n\t\t\tSystem.err\n\t\t\t\t\t.println(\"Violation in JavaMOP 2. A thread should release a lock as many times as it acquires the lock.\");\n\t\t} else {\n\t\t\tSystem.err.println(\"Property JavaMOP 2 satisfied\");\n\t\t}\n\t}\n}\n","old_contents":"","returncode":1,"stderr":"error: pathspec 'code\/qea\/src\/benchmark\/competition\/java\/javaMOP\/monitoring\/JavaMOPTwoAspect.aj' did not match any file(s) known to git\n","license":"mit","lang":"AspectJ"}
{"commit":"b6288276031fd1b31faf200f99613cab9ddef0ae","subject":"add aspect for audit migrate-vm and add-disk","message":"add aspect for audit migrate-vm and add-disk\n","repos":"OpenUniversity\/ovirt-engine,OpenUniversity\/ovirt-engine,OpenUniversity\/ovirt-engine,OpenUniversity\/ovirt-engine,OpenUniversity\/ovirt-engine","old_file":"backend\/manager\/modules\/bll\/src\/main\/java\/org\/ovirt\/engine\/core\/bll\/Logs.aj","new_file":"backend\/manager\/modules\/bll\/src\/main\/java\/org\/ovirt\/engine\/core\/bll\/Logs.aj","new_contents":"package org.ovirt.engine.core.bll;\n\nimport java.util.*;\nimport org.ovirt.engine.core.common.AuditLogType;\nimport org.ovirt.engine.core.bll.CommandActionState;\n\npublic privileged aspect Logs {\n\tAuditLogType around(org.ovirt.engine.core.bll.MigrateVmCommand command): execution(* getAuditLogTypeValue()) && this(command) {\n\t\tif (command.getSucceeded()\n\t\t && command.isReturnValueUp())\n\t\t\treturn AuditLogType.VM_MIGRATION_DONE;\n\t\tif (command.getSucceeded() && command.isInternalExecution()\n\t\t)\n\t\t\treturn AuditLogType.VM_MIGRATION_START_SYSTEM_INITIATED;\n\t\tif (command.getSucceeded()\n\t\t)\n\t\t\treturn AuditLogType.VM_MIGRATION_START;\n\t\tif (!command.getSucceeded()\n\t\t && command.isHostInPrepareForMaintenance())\n\t\t\treturn AuditLogType.VM_MIGRATION_FAILED_DURING_MOVE_TO_MAINTENANCE;\n\t\tif (!command.getSucceeded()\n\t\t)\n\t\t\treturn AuditLogType.VM_MIGRATION_FAILED;\n\t\treturn AuditLogType.UNASSIGNED;\n\t}\n\t\n\tAuditLogType around(org.ovirt.engine.core.bll.storage.disk.AddDiskCommand command): execution(* getAuditLogTypeValue()) && this(command) {\n\t\tif (command.getSucceeded() && command.getActionState() == CommandActionState.EXECUTE && command.isInternalExecution()\n\t\t && command.isDiskStorageTypeRequiresExecuteState())\n\t\t\treturn AuditLogType.ADD_DISK_INTERNAL;\n\t\tif (command.getSucceeded() && command.getActionState() == CommandActionState.EXECUTE\n\t\t && command.isDiskStorageTypeRequiresExecuteState() && command.isVmNameExists())\n\t\t\treturn AuditLogType.USER_ADD_DISK_TO_VM;\n\t\tif (command.getSucceeded() && command.getActionState() == CommandActionState.EXECUTE\n\t\t && command.isDiskStorageTypeRequiresExecuteState())\n\t\t\treturn AuditLogType.USER_ADD_DISK;\n\t\tif (!command.getSucceeded() && command.getActionState() == CommandActionState.EXECUTE && command.isInternalExecution()\n\t\t && command.isDiskStorageTypeRequiresExecuteState())\n\t\t\treturn AuditLogType.ADD_DISK_INTERNAL_FAILURE;\n\t\tif (!command.getSucceeded() && command.getActionState() == CommandActionState.EXECUTE\n\t\t && command.isDiskStorageTypeRequiresExecuteState() && command.isVmNameExists())\n\t\t\treturn AuditLogType.USER_FAILED_ADD_DISK_TO_VM;\n\t\tif (!command.getSucceeded() && command.getActionState() == CommandActionState.EXECUTE\n\t\t && command.isDiskStorageTypeRequiresExecuteState())\n\t\t\treturn AuditLogType.USER_FAILED_ADD_DISK;\n\t\tif (command.getSucceeded() && command.getActionState() == CommandActionState.EXECUTE\n\t\t && command.isVmNameExists())\n\t\t\treturn AuditLogType.USER_ADD_DISK_TO_VM_FINISHED_SUCCESS;\n\t\tif (command.getSucceeded() && command.getActionState() == CommandActionState.EXECUTE\n\t\t)\n\t\t\treturn AuditLogType.USER_ADD_DISK_FINISHED_SUCCESS;\n\t\tif (!command.getSucceeded() && command.getActionState() == CommandActionState.EXECUTE\n\t\t && command.isVmNameExists())\n\t\t\treturn AuditLogType.USER_ADD_DISK_TO_VM_FINISHED_FAILURE;\n\t\tif (!command.getSucceeded() && command.getActionState() == CommandActionState.EXECUTE\n\t\t)\n\t\t\treturn AuditLogType.USER_ADD_DISK_FINISHED_FAILURE;\n\t\tif (command.getSucceeded() && command.getActionState() == CommandActionState.END_SUCCESS\n\t\t && command.isVmNameExists())\n\t\t\treturn AuditLogType.USER_ADD_DISK_TO_VM_FINISHED_SUCCESS;\n\t\tif (command.getSucceeded() && command.getActionState() == CommandActionState.END_SUCCESS\n\t\t)\n\t\t\treturn AuditLogType.USER_ADD_DISK_FINISHED_SUCCESS;\n\t\tif (!command.getSucceeded() && command.getActionState() == CommandActionState.END_SUCCESS\n\t\t && command.isVmNameExists())\n\t\t\treturn AuditLogType.USER_ADD_DISK_TO_VM_FINISHED_FAILURE;\n\t\tif (!command.getSucceeded() && command.getActionState() == CommandActionState.END_SUCCESS\n\t\t)\n\t\t\treturn AuditLogType.USER_ADD_DISK_FINISHED_FAILURE;\n\t\treturn AuditLogType.USER_ADD_DISK_FINISHED_FAILURE;\n\t}\n\t\n}\n\n","old_contents":"","returncode":1,"stderr":"error: pathspec 'backend\/manager\/modules\/bll\/src\/main\/java\/org\/ovirt\/engine\/core\/bll\/Logs.aj' did not match any file(s) known to git\n","license":"apache-2.0","lang":"AspectJ"}
{"commit":"1de5f144184dfb8c5da9ddc1f65fbcb7ecd00821","subject":"Instrumentation added for property Java 4-2 (JavaMOP)","message":"Instrumentation added for property Java 4-2 (JavaMOP)\n","repos":"selig\/qea","old_file":"code\/qea\/src\/benchmark\/competition\/java\/javaMOP\/monitoring\/JavaMOPTwoAspect.aj","new_file":"code\/qea\/src\/benchmark\/competition\/java\/javaMOP\/monitoring\/JavaMOPTwoAspect.aj","new_contents":"package benchmark.competition.java.javaMOP.monitoring;\n\nimport java.util.concurrent.locks.Lock;\n\nimport monitoring.impl.MonitorFactory;\nimport monitoring.intf.Monitor;\nimport properties.Property;\nimport properties.competition.JavaMOP;\nimport structure.impl.other.Verdict;\nimport structure.intf.QEA;\nimport benchmark.competition.java.javaMOP.LockTest;\n\npublic aspect JavaMOPTwoAspect {\n\n\tprivate final Monitor monitor;\n\n\tprivate final int LOCK = 1;\n\tprivate final int UNLOCK = 2;\n\n\tpublic JavaMOPTwoAspect() {\n\t\tQEA qea = new JavaMOP().make(Property.JAVAMOP_TWO);\n\t\tmonitor = MonitorFactory.create(qea);\n\t}\n\n\tpointcut lockPC(Thread thread, Lock lockObj) : call(void Lock.lock())\n\t\t&& target(lockObj) && this(thread);\n\n\tpointcut unlockPC(Thread thread, Lock lockObj) : call(void Lock.unlock())\n\t\t&& target(lockObj) && this(thread);\n\n\tbefore(Thread thread, Lock lockObj) : lockPC(thread, lockObj) {\n\t\tVerdict verdict = null;\n\t\tsynchronized (monitor) {\n\t\t\tverdict = monitor.step(LOCK, thread, lockObj);\n\t\t}\n\t\tif (verdict == Verdict.FAILURE) {\n\t\t\tSystem.err\n\t\t\t\t\t.println(\"Violation in JavaMOP 2. [thread=\"\n\t\t\t\t\t\t\t+ thread\n\t\t\t\t\t\t\t+ \", lock=\"\n\t\t\t\t\t\t\t+ lockObj\n\t\t\t\t\t\t\t+ \"]. A thread should release a lock as many times as it acquires the lock.\");\n\t\t}\n\t}\n\n\tbefore(Thread thread, Lock lockObj) : unlockPC(thread, lockObj) {\n\t\tVerdict verdict = null;\n\t\tsynchronized (monitor) {\n\t\t\tverdict = monitor.step(UNLOCK, thread, lockObj);\n\t\t}\n\t\tif (verdict == Verdict.FAILURE) {\n\t\t\tSystem.err\n\t\t\t\t\t.println(\"Violation in JavaMOP 2. [thread=\"\n\t\t\t\t\t\t\t+ thread\n\t\t\t\t\t\t\t+ \", lock=\"\n\t\t\t\t\t\t\t+ lockObj\n\t\t\t\t\t\t\t+ \"]. A thread should release a lock as many times as it acquires the lock.\");\n\t\t}\n\t}\n\n\tpointcut endOfProgram() : execution(void LockTest.main(String[]));\n\n\tafter() : endOfProgram() {\n\t\tVerdict verdict = monitor.end();\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\n\t\t\tSystem.err\n\t\t\t\t\t.println(\"Violation in JavaMOP 2. A thread should release a lock as many times as it acquires the lock.\");\n\t\t} else {\n\t\t\tSystem.err.println(\"Property JavaMOP 2 satisfied\");\n\t\t}\n\t}\n}\n","old_contents":"","returncode":1,"stderr":"error: pathspec 'code\/qea\/src\/benchmark\/competition\/java\/javaMOP\/monitoring\/JavaMOPTwoAspect.aj' did not match any file(s) known to git\n","license":"mit","lang":"AspectJ"}
{"commit":"13ecf5eb9ab2361adfc7aefb714364bf8426f520","subject":"Refactoring of criteria selection from location updates requests","message":"Refactoring of criteria selection from location updates requests\n","repos":"treejames\/ignition,Applied-Duality\/ignition,mttkay\/ignition,beni55\/ignition,hongnguyenpro\/ignition","old_file":"ignition-location\/ignition-location\/src\/com\/github\/ignition\/location\/IgnitedLocationManager.aj","new_file":"ignition-location\/ignition-location\/src\/com\/github\/ignition\/location\/IgnitedLocationManager.aj","new_contents":"\/*\n * Copyright 2011 Google Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * This code has been modified by Stefano Dacchille.\n *\/\n\npackage com.github.ignition.location;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\n\nimport android.app.Activity;\nimport android.app.PendingIntent;\nimport android.content.BroadcastReceiver;\nimport android.content.Context;\nimport android.content.Intent;\nimport android.content.IntentFilter;\nimport android.content.SharedPreferences;\nimport android.content.SharedPreferences.Editor;\nimport android.location.Criteria;\nimport android.location.Location;\nimport android.location.LocationListener;\nimport android.location.LocationManager;\nimport android.os.AsyncTask;\nimport android.os.BatteryManager;\nimport android.os.Bundle;\nimport android.os.Handler;\nimport android.util.Log;\n\nimport com.github.ignition.location.annotations.IgnitedLocation;\nimport com.github.ignition.location.annotations.IgnitedLocationActivity;\nimport com.github.ignition.location.receivers.IgnitedLocationChangedReceiver;\nimport com.github.ignition.location.receivers.IgnitedPassiveLocationChangedReceiver;\nimport com.github.ignition.location.tasks.IgnitedLastKnownLocationAsyncTask;\nimport com.github.ignition.location.templates.ILastLocationFinder;\nimport com.github.ignition.location.templates.LocationUpdateRequester;\nimport com.github.ignition.location.templates.OnIgnitedLocationChangedListener;\nimport com.github.ignition.location.utils.PlatformSpecificImplementationFactory;\nimport com.github.ignition.support.IgnitedDiagnostics;\n\n@SuppressAjWarnings\npublic aspect IgnitedLocationManager {\n    public static final String LOG_TAG = IgnitedLocationManager.class.getSimpleName();\n\n    declare parents : (@IgnitedLocationActivity *) implements OnIgnitedLocationChangedListener;\n\n    private Criteria defaultCriteria;\n    protected LocationUpdateRequester locationUpdateRequester;\n    protected PendingIntent locationListenerPendingIntent, locationListenerPassivePendingIntent;\n    protected LocationManager locationManager;\n    protected IgnitedLocationListener bestInactiveLocationProviderListener;\n\n    private Context context;\n    private volatile Location currentLocation;\n    private long locationUpdatesInterval, passiveLocationUpdatesInterval;\n    private int locationUpdatesDistanceDiff, passiveLocationUpdatesDistanceDiff;\n    private boolean enableLocationUpdates;\n    private boolean locationUpdatesDisabled = true;\n\n    private AsyncTask<Void, Void, Location> ignitedLastKnownLocationTask;\n    private SharedPreferences prefs;\n    private Handler handler;\n\n    \/\/ Switch to another provider if gps doesn't return a location quickly enough.\n    private Runnable removeGpsUpdates = new Runnable() {\n        @Override\n        public void run() {\n            Log.d(LOG_TAG,\n                    \"It looks like GPS isn't available at this time (i.e.: maybe you're indoors). Removing GPS location updates and requesting network updates.\");\n\n            Criteria criteria = lowBatteryConsumptionCriteria();\n\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, criteria);\n        }\n    };\n\n    \/**\n     * If the Location Provider we're using to receive location updates is disabled while the app is\n     * running, this Receiver will be notified, allowing us to re-register our Location Receivers\n     * using the best available Location Provider is still available.\n     *\/\n    protected BroadcastReceiver locationProviderDisabledReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            boolean providerDisabled = !intent.getBooleanExtra(\n                    LocationManager.KEY_PROVIDER_ENABLED, false);\n            \/\/ Re-register the location listeners using the best available\n            \/\/ Location Provider.\n            if (providerDisabled) {\n                disableLocationUpdates(false);\n                requestLocationUpdates(context, null);\n            }\n        }\n    };\n\n    \/**\n     * If the battery state is low disable the passive location update receiver.\n     *\/\n    protected BroadcastReceiver refreshLocationUpdatesReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            if (isBatteryOk()) {\n                disableLocationUpdates(false);\n                requestLocationUpdates(context, null);\n            } else {\n                disableLocationUpdates(false);\n                requestLocationUpdates(context, lowBatteryConsumptionCriteria());\n            }\n        }\n    };\n\n    after(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onCreate(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n\n        \/\/ Get a reference to the Context\n        this.context = context;\n        \/\/ Set pref file\n        prefs = context.getSharedPreferences(IgnitedLocationConstants.SHARED_PREFERENCE_FILE,\n                Context.MODE_PRIVATE);\n        \/\/ Get references to the managers\n        locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);\n        handler = new Handler();\n\n        \/\/ Specify the Criteria to use when requesting location updates while\n        \/\/ the application is Active\n        defaultCriteria = new Criteria();\n        \/\/ Use gps if it's enabled and if battery level is at least 15%\n        boolean useGps = prefs.getBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS,\n                IgnitedLocationConstants.USE_GPS_DEFAULT);\n        if (useGps) {\n            defaultCriteria.setAccuracy(Criteria.ACCURACY_FINE);\n        } else {\n            defaultCriteria.setPowerRequirement(Criteria.POWER_LOW);\n        }\n\n        \/\/ Setup the location update Pending Intent\n        Intent activeIntent = new Intent(IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_ACTION);\n        locationListenerPendingIntent = PendingIntent.getBroadcast(context, 0, activeIntent,\n                PendingIntent.FLAG_UPDATE_CURRENT);\n        \/\/ Setup the passive location update Pending Intent\n        Intent passiveIntent = new Intent(context, IgnitedPassiveLocationChangedReceiver.class);\n        locationListenerPassivePendingIntent = PendingIntent.getBroadcast(context, 0,\n                passiveIntent, PendingIntent.FLAG_UPDATE_CURRENT);\n\n        \/\/ Instantiate a Location Update Requester class based on the available\n        \/\/ platform version. This will be used to request location updates.\n        locationUpdateRequester = PlatformSpecificImplementationFactory\n                .getLocationUpdateRequester(context);\n    }\n\n    private boolean isBatteryOk() {\n        IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);\n        Intent intent = context.registerReceiver(null, filter);\n        double currentLevel = 100.0;\n        if (intent != null) {\n            currentLevel = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1);\n        }\n\n        return currentLevel >= prefs.getInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                IgnitedLocationConstants.MIN_BATTERY_LEVEL_DEFAULT);\n    }\n\n    before(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onResume(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n        \/\/ Get a reference to the Context if this context is null\n        if (this.context == null) {\n            this.context = context;\n        }\n\n        saveToPreferences(context, ignitedAnnotation);\n\n        Log.d(LOG_TAG, \"Retrieving last known location...\");\n        \/\/ Get the last known location. This isn't directly affecting the UI, so put it on a\n        \/\/ worker thread.\n        ignitedLastKnownLocationTask = new IgnitedLastKnownLocationAsyncTask(\n                context.getApplicationContext(), locationUpdatesDistanceDiff,\n                locationUpdatesInterval);\n        ignitedLastKnownLocationTask.execute();\n    }\n\n    \/**\n     * Save last settings to preferences.\n     * \n     * @param context\n     * @param locationAnnotation\n     *\/\n    private void saveToPreferences(Context context, IgnitedLocationActivity locationAnnotation) {\n        enableLocationUpdates = locationAnnotation.requestLocationUpdates();\n        locationUpdatesDistanceDiff = locationAnnotation.locationUpdatesDistanceDiff();\n        locationUpdatesInterval = locationAnnotation.locationUpdatesInterval();\n        passiveLocationUpdatesDistanceDiff = locationAnnotation\n                .passiveLocationUpdatesDistanceDiff();\n        passiveLocationUpdatesInterval = locationAnnotation.passiveLocationUpdatesInterval();\n        boolean enablePassiveLocationUpdates = locationAnnotation.enablePassiveUpdates();\n        boolean useGps = locationAnnotation.useGps();\n\n        Editor editor = prefs.edit();\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_LOCATION_UPDATES,\n                enableLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                enablePassiveLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS, useGps);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_DISTANCE_DIFF,\n                locationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_INTERVAL,\n                locationUpdatesInterval);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_DISTANCE_DIFF,\n                passiveLocationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_INTERVAL,\n                passiveLocationUpdatesInterval);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_RUN_ONCE, true);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                locationAnnotation.minBatteryLevel());\n        editor.putLong(IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                locationAnnotation.waitForGpsFix());\n        editor.commit();\n\n    }\n\n    before(Activity activity, IgnitedLocationActivity ignitedAnnotation) : execution(* Activity.onPause(..)) \n        && @this(ignitedAnnotation) && this(activity)\n        && within(@IgnitedLocationActivity *) && if (ignitedAnnotation.requestLocationUpdates()) {\n\n        disableLocationUpdates(true);\n\n        handler.removeCallbacks(removeGpsUpdates);\n\n        boolean finishing = activity.isFinishing();\n        if (finishing) {\n            context = null;\n        }\n    }\n\n    \/\/ after() : execution(* Activity.onDestroy(..)) && @this(IgnitedLocationActivity)\n    \/\/ && within(@IgnitedLocationActivity *) {\n    \/\/ }\n\n    Location around() : get(@IgnitedLocation Location *) {\n        return currentLocation;\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && within(IgnitedPassiveLocationChangedReceiver) && !adviceexecution() {\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, long): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude());\n\/\/        if (context != null) {\n\/\/            ((OnIgnitedLocationChangedListener) context).onIgnitedLocationChanged(currentLocation);\n\/\/        }\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && (within(IgnitedLocationChangedReceiver) || within(com.github.ignition.location.utils.*)\n                || within(IgnitedLastKnownLocationAsyncTask)) && !adviceexecution() {\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, long): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude());\n        if (context != null) {\n            boolean keepRequestingLocationUpdates = ((OnIgnitedLocationChangedListener) context)\n                    .onIgnitedLocationChanged(currentLocation);\n            if (!keepRequestingLocationUpdates && !locationUpdatesDisabled) {\n                disableLocationUpdates(true);\n            } else if (enableLocationUpdates\n                    && locationUpdatesDisabled\n                    && !freshLocation.getExtras().getBoolean(\n                            ILastLocationFinder.LAST_LOCATION_TOO_OLD_EXTRA)) {\n                \/\/ If we have requested location updates, turn them on here.\n                requestLocationUpdates(context, isBatteryOk()? defaultCriteria : lowBatteryConsumptionCriteria());\n            }\n        }\n\n        \/\/ If gps is enabled location comes from gps, remove runnable that removes gps updates\n        boolean lastLocation = freshLocation.getExtras().getBoolean(\n                IgnitedLocationConstants.IGNITED_LAST_LOCATION_EXTRA);\n        if (!lastLocation && defaultCriteria.getAccuracy() == Criteria.ACCURACY_FINE\n                && currentLocation.getProvider().equals(LocationManager.GPS_PROVIDER)) {\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n    }\n\n    \/**\n     * Start listening for location updates.\n     *\/\n    protected void requestLocationUpdates(Context context, Criteria locationUpdatesCriteria) {\n        Criteria criteria = locationUpdatesCriteria == null? defaultCriteria : locationUpdatesCriteria;\n\n        Log.d(LOG_TAG, \"Disabling passive location updates\");\n        locationManager.removeUpdates(locationListenerPassivePendingIntent);\n\n        Log.d(LOG_TAG, \"Requesting location updates\");\n        \/\/ Normal updates while activity is visible.\n        locationUpdateRequester.requestLocationUpdates(locationUpdatesInterval,\n                locationUpdatesDistanceDiff, criteria, locationListenerPendingIntent);\n\n        \/\/ Register a receiver that listens for when the provider I'm using has\n        \/\/ been disabled.\n        IntentFilter locationProviderDisabledIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_PROVIDER_DISABLED_ACTION);\n        context.registerReceiver(locationProviderDisabledReceiver,\n                locationProviderDisabledIntentFilter);\n\n        IntentFilter refreshLocationUpdatesIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.UPDATE_LOCATION_UPDATES_CRITERIA_ACTION);\n        context.registerReceiver(refreshLocationUpdatesReceiver, refreshLocationUpdatesIntentFilter);\n\n        \/\/ Register a receiver that listens for when a better provider than I'm\n        \/\/ using becomes available.\n        String bestProvider = locationManager.getBestProvider(criteria, false);\n        String bestAvailableProvider = locationManager.getBestProvider(criteria, true);\n        if (bestProvider != null && !bestProvider.equals(bestAvailableProvider)) {\n            bestInactiveLocationProviderListener = new IgnitedLocationListener(context);\n            locationManager.requestLocationUpdates(bestProvider, 0, 0,\n                    bestInactiveLocationProviderListener, context.getMainLooper());\n        }\n\n        if (bestAvailableProvider.equals(LocationManager.GPS_PROVIDER)) {\n            Log.d(LOG_TAG, \"Posting delayed remove GPS updates message\");\n            \/\/ Post a runnable that will remove gps updates if no gps location is returned after 1\n            \/\/ minute in order to avoid draining the battery.\n            handler.postDelayed(removeGpsUpdates, prefs.getLong(\n                    IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                    IgnitedLocationConstants.WAIT_FOR_GPS_FIX_INTERVAL_DEFAULT));\n        }\n\n        locationUpdatesDisabled = false;\n    }\n\n    \/**\n     * Stop listening for location updates\n     * \n     * @param enablePassiveLocationUpdates\n     *\/\n    protected void disableLocationUpdates(boolean requestPassiveLocationUpdates) {\n        if (locationUpdatesDisabled) {\n            return;\n        }\n\n        Log.d(LOG_TAG, \"Disabling location updates\");\n        context.unregisterReceiver(locationProviderDisabledReceiver);\n        context.unregisterReceiver(refreshLocationUpdatesReceiver);\n\n        locationUpdateRequester.removeLocationUpdates();\n        if (bestInactiveLocationProviderListener != null) {\n            locationManager.removeUpdates(bestInactiveLocationProviderListener);\n        }\n\n        boolean finishing = ((Activity) context).isFinishing();\n        if (finishing && ignitedLastKnownLocationTask != null) {\n            ignitedLastKnownLocationTask.cancel(true);\n        }\n\n        if (requestPassiveLocationUpdates && !finishing) {\n            requestPassiveLocationUpdates();\n        }\n\n        locationUpdatesDisabled = true;\n    }\n\n    private void requestPassiveLocationUpdates() {\n        if (IgnitedDiagnostics.SUPPORTS_FROYO\n                && prefs.getBoolean(\n                        IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                        IgnitedLocationConstants.ENABLE_PASSIVE_LOCATION_UPDATES_DEFAULT)) {\n            Log.d(LOG_TAG, \"Requesting passive location updates\");\n            \/\/ Passive location updates from 3rd party apps when the Activity isn't\n            \/\/ visible. Only for Android 2.2+.\n            locationUpdateRequester.requestPassiveLocationUpdates(passiveLocationUpdatesInterval,\n                    passiveLocationUpdatesDistanceDiff, locationListenerPassivePendingIntent);\n        }\n    }\n\n    public boolean isLocationUpdatesDisabled() {\n        return locationUpdatesDisabled;\n    }\n\n    public Criteria lowBatteryConsumptionCriteria() {\n        Criteria criteria = new Criteria();\n        criteria.setPowerRequirement(Criteria.POWER_LOW);\n        criteria.setAccuracy(Criteria.NO_REQUIREMENT);\n        return criteria;\n    }\n\n    \/**\n     * If the best Location Provider (usually GPS) is not available when we request location\n     * updates, this listener will be notified if \/ when it becomes available. It calls\n     * requestLocationUpdates to re-register the location listeners using the better Location\n     * Provider.\n     *\/\n    private class IgnitedLocationListener implements LocationListener {\n        private Context context;\n\n        public IgnitedLocationListener(Context appContext) {\n            this.context = appContext;\n        }\n\n        @Override\n        public void onLocationChanged(Location l) {\n        }\n\n        @Override\n        public void onProviderDisabled(String provider) {\n        }\n\n        @Override\n        public void onStatusChanged(String provider, int status, Bundle extras) {\n        }\n\n        @Override\n        public void onProviderEnabled(String provider) {\n            \/\/ Re-register the location listeners using the better Location\n            \/\/ Provider.\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, null);\n        }\n    }\n\n}\n","old_contents":"\/*\n * Copyright 2011 Google Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * This code has been modified by Stefano Dacchille.\n *\/\n\npackage com.github.ignition.location;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\n\nimport android.app.Activity;\nimport android.app.PendingIntent;\nimport android.content.BroadcastReceiver;\nimport android.content.Context;\nimport android.content.Intent;\nimport android.content.IntentFilter;\nimport android.content.SharedPreferences;\nimport android.content.SharedPreferences.Editor;\nimport android.location.Criteria;\nimport android.location.Location;\nimport android.location.LocationListener;\nimport android.location.LocationManager;\nimport android.os.AsyncTask;\nimport android.os.BatteryManager;\nimport android.os.Bundle;\nimport android.os.Handler;\nimport android.util.Log;\n\nimport com.github.ignition.location.annotations.IgnitedLocation;\nimport com.github.ignition.location.annotations.IgnitedLocationActivity;\nimport com.github.ignition.location.receivers.IgnitedLocationChangedReceiver;\nimport com.github.ignition.location.receivers.IgnitedPassiveLocationChangedReceiver;\nimport com.github.ignition.location.tasks.IgnitedLastKnownLocationAsyncTask;\nimport com.github.ignition.location.templates.ILastLocationFinder;\nimport com.github.ignition.location.templates.LocationUpdateRequester;\nimport com.github.ignition.location.templates.OnIgnitedLocationChangedListener;\nimport com.github.ignition.location.utils.PlatformSpecificImplementationFactory;\nimport com.github.ignition.support.IgnitedDiagnostics;\n\n@SuppressAjWarnings\npublic aspect IgnitedLocationManager {\n    public static final String LOG_TAG = IgnitedLocationManager.class.getSimpleName();\n\n    declare parents : (@IgnitedLocationActivity *) implements OnIgnitedLocationChangedListener;\n\n    protected Criteria criteria;\n    protected LocationUpdateRequester locationUpdateRequester;\n    protected PendingIntent locationListenerPendingIntent, locationListenerPassivePendingIntent;\n    protected LocationManager locationManager;\n    protected IgnitedLocationListener bestInactiveLocationProviderListener;\n\n    private Context context;\n    private volatile Location currentLocation;\n    private long locationUpdatesInterval, passiveLocationUpdatesInterval;\n    private int locationUpdatesDistanceDiff, passiveLocationUpdatesDistanceDiff;\n    private boolean enableLocationUpdates;\n    private boolean locationUpdatesDisabled = true;\n\n    private AsyncTask<Void, Void, Location> ignitedLastKnownLocationTask;\n    private SharedPreferences prefs;\n    private Handler handler;\n\n    \/\/ Switch to another provider if gps doesn't return a location quickly enough.\n    private Runnable removeGpsUpdates = new Runnable() {\n        @Override\n        public void run() {\n            Log.d(LOG_TAG,\n                    \"It looks like GPS isn't available at this time (i.e.: maybe you're indoors). Removing GPS location updates and requesting network updates.\");\n\n            Criteria criteria = new Criteria();\n            criteria.setPowerRequirement(Criteria.POWER_LOW);\n            criteria.setAccuracy(Criteria.NO_REQUIREMENT);\n\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, criteria);\n        }\n    };\n\n    \/**\n     * If the Location Provider we're using to receive location updates is disabled while the app is\n     * running, this Receiver will be notified, allowing us to re-register our Location Receivers\n     * using the best available Location Provider is still available.\n     *\/\n    protected BroadcastReceiver locationProviderDisabledReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            boolean providerDisabled = !intent.getBooleanExtra(\n                    LocationManager.KEY_PROVIDER_ENABLED, false);\n            \/\/ Re-register the location listeners using the best available\n            \/\/ Location Provider.\n            if (providerDisabled) {\n                disableLocationUpdates(false);\n                requestLocationUpdates(context, null);\n            }\n        }\n    };\n\n    \/**\n     * If the battery state is low disable the passive location update receiver.\n     *\/\n    protected BroadcastReceiver refreshLocationUpdatesReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            if (isBatteryOk()) {\n                disableLocationUpdates(false);\n                requestLocationUpdates(context, null);\n            } else {\n                Criteria criteria = new Criteria();\n                criteria.setPowerRequirement(Criteria.POWER_LOW);\n\n                disableLocationUpdates(false);\n                requestLocationUpdates(context, criteria);\n            }\n        }\n    };\n\n    after(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onCreate(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n\n        \/\/ Get a reference to the Context\n        this.context = context;\n        \/\/ Set pref file\n        prefs = context.getSharedPreferences(IgnitedLocationConstants.SHARED_PREFERENCE_FILE,\n                Context.MODE_PRIVATE);\n        \/\/ Get references to the managers\n        locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);\n        handler = new Handler();\n\n        \/\/ Specify the Criteria to use when requesting location updates while\n        \/\/ the application is Active\n        criteria = new Criteria();\n        \/\/ Use gps if it's enabled and if battery level is at least 15%\n        boolean useGps = prefs.getBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS,\n                IgnitedLocationConstants.USE_GPS_DEFAULT) && isBatteryOk();\n        if (useGps) {\n            criteria.setAccuracy(Criteria.ACCURACY_FINE);\n            criteria.setPowerRequirement(Criteria.NO_REQUIREMENT);\n        } else {\n            criteria.setPowerRequirement(Criteria.POWER_LOW);\n            criteria.setAccuracy(Criteria.NO_REQUIREMENT);\n        }\n\n        \/\/ Setup the location update Pending Intent\n        Intent activeIntent = new Intent(IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_ACTION);\n        locationListenerPendingIntent = PendingIntent.getBroadcast(context, 0, activeIntent,\n                PendingIntent.FLAG_UPDATE_CURRENT);\n        \/\/ Setup the passive location update Pending Intent\n        Intent passiveIntent = new Intent(context, IgnitedPassiveLocationChangedReceiver.class);\n        locationListenerPassivePendingIntent = PendingIntent.getBroadcast(context, 0,\n                passiveIntent, PendingIntent.FLAG_UPDATE_CURRENT);\n\n        \/\/ Instantiate a Location Update Requester class based on the available\n        \/\/ platform version. This will be used to request location updates.\n        locationUpdateRequester = PlatformSpecificImplementationFactory\n                .getLocationUpdateRequester(context);\n    }\n\n    private boolean isBatteryOk() {\n        IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);\n        Intent intent = context.registerReceiver(null, filter);\n        double currentLevel = 100.0;\n        if (intent != null) {\n            currentLevel = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1);\n        }\n\n        return currentLevel >= prefs.getInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                IgnitedLocationConstants.MIN_BATTERY_LEVEL_DEFAULT);\n    }\n\n    before(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onResume(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n        \/\/ Get a reference to the Context if this context is null\n        if (this.context == null) {\n            this.context = context;\n        }\n\n        saveToPreferences(context, ignitedAnnotation);\n\n        Log.d(LOG_TAG, \"Retrieving last known location...\");\n        \/\/ Get the last known location. This isn't directly affecting the UI, so put it on a\n        \/\/ worker thread.\n        ignitedLastKnownLocationTask = new IgnitedLastKnownLocationAsyncTask(\n                context.getApplicationContext(), locationUpdatesDistanceDiff,\n                locationUpdatesInterval);\n        ignitedLastKnownLocationTask.execute();\n    }\n\n    \/**\n     * Save last settings to preferences.\n     * \n     * @param context\n     * @param locationAnnotation\n     *\/\n    private void saveToPreferences(Context context, IgnitedLocationActivity locationAnnotation) {\n        enableLocationUpdates = locationAnnotation.requestLocationUpdates();\n        locationUpdatesDistanceDiff = locationAnnotation.locationUpdatesDistanceDiff();\n        locationUpdatesInterval = locationAnnotation.locationUpdatesInterval();\n        passiveLocationUpdatesDistanceDiff = locationAnnotation\n                .passiveLocationUpdatesDistanceDiff();\n        passiveLocationUpdatesInterval = locationAnnotation.passiveLocationUpdatesInterval();\n        boolean enablePassiveLocationUpdates = locationAnnotation.enablePassiveUpdates();\n        boolean useGps = locationAnnotation.useGps();\n\n        Editor editor = prefs.edit();\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_LOCATION_UPDATES,\n                enableLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                enablePassiveLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS, useGps);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_DISTANCE_DIFF,\n                locationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_INTERVAL,\n                locationUpdatesInterval);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_DISTANCE_DIFF,\n                passiveLocationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_INTERVAL,\n                passiveLocationUpdatesInterval);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_RUN_ONCE, true);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                locationAnnotation.minBatteryLevel());\n        editor.putLong(IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                locationAnnotation.waitForGpsFix());\n        editor.commit();\n\n    }\n\n    before(Activity activity, IgnitedLocationActivity ignitedAnnotation) : execution(* Activity.onPause(..)) \n        && @this(ignitedAnnotation) && this(activity)\n        && within(@IgnitedLocationActivity *) && if (ignitedAnnotation.requestLocationUpdates()) {\n\n        disableLocationUpdates(true);\n\n        handler.removeCallbacks(removeGpsUpdates);\n\n        boolean finishing = activity.isFinishing();\n        if (finishing) {\n            context = null;\n        }\n    }\n\n    \/\/ after() : execution(* Activity.onDestroy(..)) && @this(IgnitedLocationActivity)\n    \/\/ && within(@IgnitedLocationActivity *) {\n    \/\/ }\n\n    Location around() : get(@IgnitedLocation Location *) {\n        return currentLocation;\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && within(IgnitedPassiveLocationChangedReceiver) && !adviceexecution() {\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, long): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude());\n\/\/        if (context != null) {\n\/\/            ((OnIgnitedLocationChangedListener) context).onIgnitedLocationChanged(currentLocation);\n\/\/        }\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && (within(IgnitedLocationChangedReceiver) || within(com.github.ignition.location.utils.*)\n                || within(IgnitedLastKnownLocationAsyncTask)) && !adviceexecution() {\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, long): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude());\n        if (context != null) {\n            boolean keepRequestingLocationUpdates = ((OnIgnitedLocationChangedListener) context)\n                    .onIgnitedLocationChanged(currentLocation);\n            if (!keepRequestingLocationUpdates && !locationUpdatesDisabled) {\n                disableLocationUpdates(true);\n            } else if (enableLocationUpdates\n                    && locationUpdatesDisabled\n                    && !freshLocation.getExtras().containsKey(\n                            ILastLocationFinder.LAST_LOCATION_TOO_OLD_EXTRA)) {\n                \/\/ If we have requested location updates, turn them on here.\n                requestLocationUpdates(context);\n            }\n        }\n\n        \/\/ If gps is enabled location comes from gps, remove runnable that removes gps updates\n        boolean lastLocation = freshLocation.getExtras().getBoolean(\n                IgnitedLocationConstants.IGNITED_LAST_LOCATION_EXTRA);\n        if (!lastLocation && criteria.getAccuracy() == Criteria.ACCURACY_FINE\n                && currentLocation.getProvider().equals(LocationManager.GPS_PROVIDER)) {\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n    }\n\n    protected void requestLocationUpdates(Context context) {\n        requestLocationUpdates(context, criteria);\n    }\n\n    \/**\n     * Start listening for location updates.\n     *\/\n    protected void requestLocationUpdates(Context context, Criteria criteria) {\n        Log.d(LOG_TAG, \"Disabling passive location updates\");\n        locationManager.removeUpdates(locationListenerPassivePendingIntent);\n\n        Log.d(LOG_TAG, \"Requesting location updates\");\n        \/\/ Normal updates while activity is visible.\n        locationUpdateRequester.requestLocationUpdates(locationUpdatesInterval,\n                locationUpdatesDistanceDiff, criteria, locationListenerPendingIntent);\n\n        \/\/ Register a receiver that listens for when the provider I'm using has\n        \/\/ been disabled.\n        IntentFilter locationProviderDisabledIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_PROVIDER_DISABLED_ACTION);\n        context.registerReceiver(locationProviderDisabledReceiver,\n                locationProviderDisabledIntentFilter);\n\n        IntentFilter refreshLocationUpdatesIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.UPDATE_LOCATION_UPDATES_CRITERIA_ACTION);\n        context.registerReceiver(refreshLocationUpdatesReceiver, refreshLocationUpdatesIntentFilter);\n\n        \/\/ Register a receiver that listens for when a better provider than I'm\n        \/\/ using becomes available.\n        String bestProvider = locationManager.getBestProvider(criteria, false);\n        String bestAvailableProvider = locationManager.getBestProvider(criteria, true);\n        if (bestProvider != null && !bestProvider.equals(bestAvailableProvider)) {\n            bestInactiveLocationProviderListener = new IgnitedLocationListener(context);\n            locationManager.requestLocationUpdates(bestProvider, 0, 0,\n                    bestInactiveLocationProviderListener, context.getMainLooper());\n        }\n\n        if (bestAvailableProvider.equals(LocationManager.GPS_PROVIDER)) {\n            Log.d(LOG_TAG, \"Posting delayed remove GPS updates message\");\n            \/\/ Post a runnable that will remove gps updates if no gps location is returned after 1\n            \/\/ minute in order to avoid draining the battery.\n            handler.postDelayed(removeGpsUpdates, prefs.getLong(\n                    IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                    IgnitedLocationConstants.WAIT_FOR_GPS_FIX_INTERVAL_DEFAULT));\n        }\n\n        locationUpdatesDisabled = false;\n    }\n\n    \/**\n     * Stop listening for location updates\n     * \n     * @param enablePassiveLocationUpdates\n     *\/\n    protected void disableLocationUpdates(boolean requestPassiveLocationUpdates) {\n        if (locationUpdatesDisabled) {\n            return;\n        }\n\n        Log.d(LOG_TAG, \"Disabling location updates\");\n        context.unregisterReceiver(locationProviderDisabledReceiver);\n        context.unregisterReceiver(refreshLocationUpdatesReceiver);\n\n        locationUpdateRequester.removeLocationUpdates();\n        if (bestInactiveLocationProviderListener != null) {\n            locationManager.removeUpdates(bestInactiveLocationProviderListener);\n        }\n\n        boolean finishing = ((Activity) context).isFinishing();\n        if (finishing && ignitedLastKnownLocationTask != null) {\n            ignitedLastKnownLocationTask.cancel(true);\n        }\n\n        if (requestPassiveLocationUpdates && !finishing) {\n            requestPassiveLocationUpdates();\n        }\n\n        locationUpdatesDisabled = true;\n    }\n\n    private void requestPassiveLocationUpdates() {\n        if (IgnitedDiagnostics.SUPPORTS_FROYO\n                && prefs.getBoolean(\n                        IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                        IgnitedLocationConstants.ENABLE_PASSIVE_LOCATION_UPDATES_DEFAULT)) {\n            Log.d(LOG_TAG, \"Requesting passive location updates\");\n            \/\/ Passive location updates from 3rd party apps when the Activity isn't\n            \/\/ visible. Only for Android 2.2+.\n            locationUpdateRequester.requestPassiveLocationUpdates(passiveLocationUpdatesInterval,\n                    passiveLocationUpdatesDistanceDiff, locationListenerPassivePendingIntent);\n        }\n    }\n\n    public boolean isLocationUpdatesDisabled() {\n        return locationUpdatesDisabled;\n    }\n\n    \/**\n     * If the best Location Provider (usually GPS) is not available when we request location\n     * updates, this listener will be notified if \/ when it becomes available. It calls\n     * requestLocationUpdates to re-register the location listeners using the better Location\n     * Provider.\n     *\/\n    private class IgnitedLocationListener implements LocationListener {\n        private Context context;\n\n        public IgnitedLocationListener(Context appContext) {\n            this.context = appContext;\n        }\n\n        @Override\n        public void onLocationChanged(Location l) {\n        }\n\n        @Override\n        public void onProviderDisabled(String provider) {\n        }\n\n        @Override\n        public void onStatusChanged(String provider, int status, Bundle extras) {\n        }\n\n        @Override\n        public void onProviderEnabled(String provider) {\n            \/\/ Re-register the location listeners using the better Location\n            \/\/ Provider.\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, null);\n        }\n    }\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"4a3c0bf14d7a9dcb7a1a6d64e610b3b6c9c9b1d7","subject":"spaces in place of tabs removed empty lines","message":"spaces in place of tabs\nremoved empty lines\n\ngit-svn-id: 4c9d3fe6b7b6c0d9eeb10ce04f5d3c1083d3aa64@1183048 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"kidaa\/directmemory,kidaa\/directmemory,apache\/directmemory,apache\/directmemory,apache\/directmemory,kidaa\/directmemory,apache\/directmemory,kidaa\/directmemory","old_file":"directmemory-cache\/src\/main\/aspect\/org\/directmemory\/monitoring\/Performance.aj","new_file":"directmemory-cache\/src\/main\/aspect\/org\/directmemory\/monitoring\/Performance.aj","new_contents":"","old_contents":"","returncode":128,"stderr":"remote: Support for password authentication was removed on August 13, 2021.\nremote: Please see https:\/\/docs.github.com\/en\/get-started\/getting-started-with-git\/about-remote-repositories#cloning-with-https-urls for information on currently recommended modes of authentication.\nfatal: Authentication failed for 'https:\/\/github.com\/kidaa\/directmemory.git\/'\n","license":"apache-2.0","lang":"AspectJ"}
{"commit":"192585538a84765ab7d51ba474aaf9409cc11630","subject":"First version","message":"First version\n\n\ngit-svn-id: b619a0c99665f88f1afe72824344cefe9a1c8c90@8670 fd5a2b45-1f63-4059-99e9-3c7cb7fd75c8\n","repos":"cbeams-archive\/spring-framework-2.5.x,cbeams-archive\/spring-framework-2.5.x,cbeams-archive\/spring-framework-2.5.x,cbeams-archive\/spring-framework-2.5.x","old_file":"aspectj\/src\/org\/springframework\/beans\/factory\/aspectj\/EntityBeanConfigurer.aj","new_file":"aspectj\/src\/org\/springframework\/beans\/factory\/aspectj\/EntityBeanConfigurer.aj","new_contents":"\/*\n * Copyright 2002-2006 the original author or authors.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\/\n \npackage org.springframework.beans.factory.aspectj;\n\nimport javax.persistence.Entity;\n\n\n\/**\n * Concrete aspect that uses the Java Persistence API Entity annotation to identify\n * which classes need autowiring. The bean name to look up will be\n * taken from the Configurable annotation's \"name\" attribute if specified, otherwise\n * the default will be the FQN of the class being configured.\n * @see javax.persistence.Entity\n * @author Rod Johnson\n * @since 2.0\n *\/\npublic aspect EntityBeanConfigurer extends AbstractBeanConfigurer {\n\t\n\tpublic EntityBeanConfigurer() {\n\t\t\/\/ Set a custom BeanWiringInfoResolver that is aware of \n\t\t\/\/ the Entity annotation\n\t\tsetBeanWiringInfoResolver(new BeanWiringInfoResolver() {\n\t\t\tpublic BeanWiringInfo resolve(Object instance) {\n\t\t\t\tClass<?> clazz = instance.getClass();\n\t\t\t\tEntity entityAnnotation = clazz.getAnnotation(Entity.class);\n\t\t\t\tif (entityAnnotation != null) {\n\t\t\t\t\tString beanName = entityAnnotation.name();\n\t\t\t\t\tif (\"\".equals(beanName)) {\n\t\t\t\t\t\tbeanName = clazz.getName();\n\t\t\t\t\t}\n\t\t\t\t\treturn new BeanWiringInfo(beanName);\n\t\t\t\t}\n\t\t\t\treturn null;\n\t\t\t}\n\t\t});\n\t}\n\n\t\/**\n     * The creation of a new bean (an object with the @Entity annotation)\n     *\/\n    protected pointcut beanCreation(Object beanInstance) :\n        initialization((@Entity *).new(..)) &&\n        \tthis(beanInstance);\n}\n","old_contents":"","returncode":1,"stderr":"error: pathspec 'aspectj\/src\/org\/springframework\/beans\/factory\/aspectj\/EntityBeanConfigurer.aj' did not match any file(s) known to git\n","license":"apache-2.0","lang":"AspectJ"}
{"commit":"72317f60c4c051ed0342c2e2e467b9c9b7732531","subject":"-solving bug","message":"-solving bug","repos":"jmseigneur\/opprim-sim","old_file":"Muses Sim\/src\/main\/java\/eu\/musesproject\/server\/rt2ae\/Accessrequest_Roo_Jpa_ActiveRecord.aj","new_file":"Muses Sim\/src\/main\/java\/eu\/musesproject\/server\/rt2ae\/Accessrequest_Roo_Jpa_ActiveRecord.aj","new_contents":"","old_contents":"","returncode":1,"stderr":"error: pathspec 'Muses' did not match any file(s) known to git\nerror: pathspec 'Sim\/src\/main\/java\/eu\/musesproject\/server\/rt2ae\/Accessrequest_Roo_Jpa_ActiveRecord.aj' did not match any file(s) known to git\n","license":"agpl-3.0","lang":"AspectJ"}
{"commit":"1fd4ee21387845607031bf9e58992ef9d0d3bc79","subject":"Reset state of the location manger when the Activity is destroyed.","message":"Reset state of the location manger when the Activity is destroyed.\n","repos":"hongnguyenpro\/ignition,Applied-Duality\/ignition,mttkay\/ignition,treejames\/ignition","old_file":"ignition-location\/ignition-location-lib\/src\/com\/github\/ignition\/location\/IgnitedLocationManager.aj","new_file":"ignition-location\/ignition-location-lib\/src\/com\/github\/ignition\/location\/IgnitedLocationManager.aj","new_contents":"\/*\n * Copyright 2011 Google Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * This code has been modified by Stefano Dacchille.\n *\/\n\npackage com.github.ignition.location;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\n\nimport android.app.Activity;\nimport android.app.PendingIntent;\nimport android.content.BroadcastReceiver;\nimport android.content.Context;\nimport android.content.Intent;\nimport android.content.IntentFilter;\nimport android.content.SharedPreferences;\nimport android.content.SharedPreferences.Editor;\nimport android.location.Criteria;\nimport android.location.Location;\nimport android.location.LocationListener;\nimport android.location.LocationManager;\nimport android.os.AsyncTask;\nimport android.os.BatteryManager;\nimport android.os.Bundle;\nimport android.os.Handler;\nimport android.util.Log;\n\nimport com.github.ignition.location.annotations.IgnitedLocation;\nimport com.github.ignition.location.annotations.IgnitedLocationActivity;\nimport com.github.ignition.location.receivers.IgnitedLocationChangedReceiver;\nimport com.github.ignition.location.receivers.IgnitedPassiveLocationChangedReceiver;\nimport com.github.ignition.location.tasks.IgnitedLastKnownLocationAsyncTask;\nimport com.github.ignition.location.templates.ILastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLocationUpdateRequester;\nimport com.github.ignition.location.templates.OnIgnitedLocationChangedListener;\nimport com.github.ignition.location.utils.IgnitedLocationSupport;\nimport com.github.ignition.location.utils.PlatformSpecificImplementationFactory;\nimport com.github.ignition.support.IgnitedDiagnostics;\n\n@SuppressAjWarnings\npublic aspect IgnitedLocationManager {\n    public static final String LOG_TAG = IgnitedLocationManager.class.getSimpleName();\n\n    declare parents : (@IgnitedLocationActivity *) implements OnIgnitedLocationChangedListener;\n\n    private Criteria defaultCriteria, lowPowerCriteria;\n    protected IgnitedAbstractLocationUpdateRequester locationUpdateRequester;\n    protected PendingIntent locationListenerPendingIntent, locationListenerPassivePendingIntent;\n    protected LocationManager locationManager;\n    protected IgnitedLocationListener bestInactiveLocationProviderListener;\n\n    private Context context;\n    private volatile Location currentLocation;\n\n    private IgnitedLastKnownLocationAsyncTask ignitedLastKnownLocationTask;\n    private SharedPreferences prefs;\n    private Handler handler;\n\n    private long locationUpdatesInterval, passiveLocationUpdatesInterval;\n    private int locationUpdatesDistanceDiff;\n    private int passiveLocationUpdatesDistanceDiff;\n    private boolean requestLocationUpdates = false;\n    private boolean locationUpdatesDisabled = true;\n    private boolean waitForFixDialogShown = false;\n    private boolean noProvidersEnabledDialogShown = false;\n    private boolean locationProviderDisabledReceiverRegistered = false;\n    private boolean refreshLocationUpdatesReceiverRegistered = false;\n\n    \/\/ Switch to another provider if gps doesn't return a location quickly enough.\n    private Runnable removeGpsUpdates = new Runnable() {\n        @Override\n        public void run() {\n            Log.d(LOG_TAG,\n                    \"It looks like GPS isn't available at this time (i.e.: maybe you're indoors). Removing GPS location updates and requesting network updates.\");\n\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, lowPowerCriteria());\n        }\n    };\n\n    \/**\n     * If the Location Provider we're using to receive location updates is disabled while the app is\n     * running, this Receiver will be notified, allowing us to re-register our Location Receivers\n     * using the best available Location Provider is still available.\n     *\/\n    protected BroadcastReceiver locationProviderDisabledReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            boolean providerDisabled = !intent.getBooleanExtra(\n                    LocationManager.KEY_PROVIDER_ENABLED, false);\n            \/\/ Re-register the location listeners using the best available\n            \/\/ Location Provider.\n            if (providerDisabled) {\n                disableLocationUpdates(false);\n                requestLocationUpdates(context, null);\n            }\n        }\n    };\n\n    \/**\n     * If the battery state is low disable the passive location update receiver.\n     *\/\n    protected BroadcastReceiver refreshLocationUpdatesReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, null);\n        }\n    };\n\n    after(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onCreate(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n\n        \/\/ Get a reference to the Context\n        this.context = context;\n        \/\/ Set pref file\n        prefs = context.getSharedPreferences(IgnitedLocationConstants.SHARED_PREFERENCE_FILE,\n                Context.MODE_PRIVATE);\n        \/\/ Get references to the managers\n        locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);\n        handler = new Handler();\n\n        \/\/ Specify the Criteria to use when requesting location updates while\n        \/\/ the application is Active\n        if (defaultCriteria == null) {\n            defaultCriteria = new Criteria();\n        }\n        \/\/ Use gps if it's enabled and if battery level is at least 15%\n        boolean useGps = prefs.getBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS,\n                IgnitedLocationConstants.USE_GPS_DEFAULT);\n        if (useGps) {\n            defaultCriteria.setAccuracy(Criteria.ACCURACY_FINE);\n        } else {\n            defaultCriteria.setPowerRequirement(Criteria.POWER_LOW);\n        }\n\n        \/\/ Setup the location update Pending Intent\n        Intent activeIntent = new Intent(IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_ACTION);\n        locationListenerPendingIntent = PendingIntent.getBroadcast(context, 0, activeIntent,\n                PendingIntent.FLAG_UPDATE_CURRENT);\n        \/\/ Setup the passive location update Pending Intent\n        Intent passiveIntent = new Intent(context, IgnitedPassiveLocationChangedReceiver.class);\n        locationListenerPassivePendingIntent = PendingIntent.getBroadcast(context, 0,\n                passiveIntent, PendingIntent.FLAG_UPDATE_CURRENT);\n\n        \/\/ Instantiate a Location Update Requester class based on the available\n        \/\/ platform version. This will be used to request location updates.\n        locationUpdateRequester = PlatformSpecificImplementationFactory\n                .getLocationUpdateRequester(context);\n    }\n\n    private boolean isBatteryOk() {\n        IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);\n        Intent intent = context.registerReceiver(null, filter);\n        double currentLevel = 100.0;\n        if (intent != null) {\n            currentLevel = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1);\n        }\n\n        return currentLevel >= prefs.getInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                IgnitedLocationConstants.MIN_BATTERY_LEVEL_FOR_GPS_DEFAULT);\n    }\n\n    before(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onResume(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n        \/\/ Get a reference to the Context if this context is null\n        if (this.context == null) {\n            this.context = context;\n        }\n\n        saveToPreferences(context, ignitedAnnotation);\n\n        Log.d(LOG_TAG, \"Retrieving last known location...\");\n        \/\/ Get the last known location. This isn't directly affecting the UI, so put it on a\n        \/\/ worker thread.\n        ignitedLastKnownLocationTask = new IgnitedLastKnownLocationAsyncTask(context,\n                locationUpdatesDistanceDiff, locationUpdatesInterval);\n        ignitedLastKnownLocationTask.execute();\n    }\n\n    \/**\n     * Save last settings to preferences.\n     * \n     * @param context\n     * @param locationAnnotation\n     *\/\n    private void saveToPreferences(Context context, IgnitedLocationActivity locationAnnotation) {\n        requestLocationUpdates = locationAnnotation.requestLocationUpdates();\n        locationUpdatesDistanceDiff = locationAnnotation.locationUpdatesDistanceDiff();\n        locationUpdatesInterval = locationAnnotation.locationUpdatesInterval();\n        passiveLocationUpdatesDistanceDiff = locationAnnotation\n                .passiveLocationUpdatesDistanceDiff();\n        passiveLocationUpdatesInterval = locationAnnotation.passiveLocationUpdatesInterval();\n        boolean enablePassiveLocationUpdates = locationAnnotation.enablePassiveUpdates();\n        boolean useGps = locationAnnotation.useGps();\n\n        Editor editor = prefs.edit();\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_LOCATION_UPDATES,\n                requestLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                enablePassiveLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS, useGps);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_DISTANCE_DIFF,\n                locationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_INTERVAL,\n                locationUpdatesInterval);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_DISTANCE_DIFF,\n                passiveLocationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_INTERVAL,\n                passiveLocationUpdatesInterval);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_RUN_ONCE, true);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                locationAnnotation.minBatteryLevelForGps());\n        editor.putLong(IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                locationAnnotation.waitForGpsFixInterval());\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                locationAnnotation.showWaitForLocationDialog());\n        editor.commit();\n\n    }\n\n    before(Activity activity, IgnitedLocationActivity ignitedAnnotation) : execution(* Activity.onPause(..)) \n        && @this(ignitedAnnotation) && this(activity) && within(@IgnitedLocationActivity *) {\n\n        if (ignitedAnnotation.requestLocationUpdates()) {\n            disableLocationUpdates(true);\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n\n        if (ignitedLastKnownLocationTask != null) {\n            if (ignitedLastKnownLocationTask.getStatus() != AsyncTask.Status.FINISHED) {\n                Log.d(LOG_TAG, \"Cancel last location task\");\n                ignitedLastKnownLocationTask.cancel(true);\n            }\n            ignitedLastKnownLocationTask.getLastLocationFinder().cancel();\n        }\n\n        boolean finishing = activity.isFinishing();\n        if (finishing) {\n            context = null;\n            \/\/ Be sure to reset every flag previously set (since an aspect is a\n            \/\/ singleton by default, so its state will be shared across all Activities that\n            \/\/ reference it).\n            requestLocationUpdates = false;\n            locationUpdatesDisabled = true;\n            waitForFixDialogShown = false;\n            noProvidersEnabledDialogShown = false;\n            locationProviderDisabledReceiverRegistered = false;\n            refreshLocationUpdatesReceiverRegistered = false;\n        }\n    }\n\n    Location around() : get(@IgnitedLocation Location *) {\n        return currentLocation;\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && within(IgnitedPassiveLocationChangedReceiver) && !adviceexecution() {\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, lng\/acc): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude() + \"\/\"\n                + currentLocation.getAccuracy());\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && (within(IgnitedLocationChangedReceiver) || within(IgnitedAbstractLastLocationFinder)\n                || within(IgnitedLastKnownLocationAsyncTask)) && !adviceexecution() {\n\n        if (context == null) {\n            return;\n        }\n\n        final Activity activity = (Activity) context;\n        if (IgnitedLocationSupport.getEnabledProviders(context).isEmpty()) {\n            \/\/ On some older versions of Android if a dialog is not shown by the activity after\n            \/\/ calling showDialog an IllegalArgunmentException is raised. Catch this exception since\n            \/\/ the docs returning a null dialog should be allowed.\n            try {\n                activity.showDialog(R.id.ign_loc_dialog_no_providers_enabled);\n                noProvidersEnabledDialogShown = true;\n            } catch (IllegalArgumentException e) {\n                e.printStackTrace();\n            }\n            return;\n        }\n\n        if (freshLocation == null) {\n            \/\/ TODO Migrate this to DialogFragment at some point\n            boolean showWaitForLocationDialog = prefs.getBoolean(\n                    IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                    IgnitedLocationConstants.SHOW_WAIT_FOR_LOCATION_DIALOG_DEFAULT);\n            if (showWaitForLocationDialog && !activity.isFinishing()) {\n                \/\/ On some older versions of Android if a dialog is not shown by the activity after\n                \/\/ calling showDialog an IllegalArgunmentException is raised. Catch this exception since\n                \/\/ the docs returning a null dialog should be allowed.\n                try {\n                    activity.showDialog(R.id.ign_loc_dialog_wait_for_fix);\n                    waitForFixDialogShown = true;\n                } catch (IllegalArgumentException e) {\n                    e.printStackTrace();\n                }\n            }\n            return;\n        }\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, lng\/acc): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude() + \"\/\" + currentLocation.getAccuracy());\n        \/\/ TODO Migrate this to DialogFragment at some point\n        if (noProvidersEnabledDialogShown) {\n            activity.removeDialog(R.id.ign_loc_dialog_no_providers_enabled);\n            noProvidersEnabledDialogShown = false;\n        } else if (waitForFixDialogShown) {\n            activity.removeDialog(R.id.ign_loc_dialog_wait_for_fix);\n            waitForFixDialogShown = false;\n        }\n        boolean keepRequestingLocationUpdates = ((OnIgnitedLocationChangedListener) context)\n                .onIgnitedLocationChanged(currentLocation);\n        Bundle extras = freshLocation.getExtras();\n        \/\/ a) If location updates shouldn't be requested anymore turn them off.\n        \/\/ b) Don't turn location updates on if last location is too old, since the single location\n        \/\/ update is running.\n        if (!keepRequestingLocationUpdates) {\n            disableLocationUpdates(true);\n            \/\/ PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            return;\n        } else if (requestLocationUpdates\n                && (extras == null || !extras.containsKey(ILastLocationFinder.LAST_LOCATION_TOO_OLD_OR_INACCURATE_EXTRA))) {\n            \/\/ If we requested location updates, turn them on here.\n            requestLocationUpdates(context, null);\n        }\n\n        \/\/ If gps is enabled location comes from gps, remove runnable that removes gps updates\n        boolean lastLocation = extras != null && extras.containsKey(IgnitedLocationConstants.IGNITED_LAST_LOCATION_EXTRA);\n        if (!lastLocation && defaultCriteria.getAccuracy() == Criteria.ACCURACY_FINE\n                && currentLocation.getProvider().equals(LocationManager.GPS_PROVIDER)) {\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n    }\n\n    \/**\n     * Start listening for location updates.\n     *\/\n    protected void requestLocationUpdates(Context context, Criteria criteria) {\n        if (!locationUpdatesDisabled) {\n            return;\n        }\n        Criteria locationUpdateCriteria = criteria;\n        if (criteria == null) {\n            if (isBatteryOk()) {\n                locationUpdateCriteria = defaultCriteria;\n            } else {\n                locationUpdateCriteria = lowPowerCriteria();\n            }\n        }\n        Log.d(LOG_TAG, \"Disabling passive location updates\");\n        locationManager.removeUpdates(locationListenerPassivePendingIntent);\n\n        Log.d(LOG_TAG, \"Requesting location updates\");\n        \/\/ Normal updates while activity is visible.\n        locationUpdateRequester.requestLocationUpdates(locationUpdatesInterval,\n                locationUpdatesDistanceDiff, locationUpdateCriteria, locationListenerPendingIntent);\n\n        \/\/ Register a receiver that listens for when the provider I'm using has\n        \/\/ been disabled.\n        IntentFilter locationProviderDisabledIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_PROVIDER_DISABLED_ACTION);\n        context.registerReceiver(locationProviderDisabledReceiver,\n                locationProviderDisabledIntentFilter);\n        locationProviderDisabledReceiverRegistered = true;\n\n        IntentFilter refreshLocationUpdatesIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.UPDATE_LOCATION_UPDATES_CRITERIA_ACTION);\n        context.registerReceiver(refreshLocationUpdatesReceiver, refreshLocationUpdatesIntentFilter);\n        refreshLocationUpdatesReceiverRegistered = true;\n\n        \/\/ Register a receiver that listens for when a better provider than I'm\n        \/\/ using becomes available.\n        String bestProvider = locationManager.getBestProvider(locationUpdateCriteria, false);\n        String bestAvailableProvider = locationManager.getBestProvider(locationUpdateCriteria, true);\n        if (bestProvider != null && !bestProvider.equals(bestAvailableProvider)) {\n            bestInactiveLocationProviderListener = new IgnitedLocationListener(context);\n            locationManager.requestLocationUpdates(bestProvider, 0, 0,\n                    bestInactiveLocationProviderListener, context.getMainLooper());\n        }\n\n        if (bestAvailableProvider.equals(LocationManager.GPS_PROVIDER)) {\n            Log.d(LOG_TAG, \"Posting delayed remove GPS updates message\");\n            \/\/ Post a runnable that will remove gps updates if no gps location is returned after 1\n            \/\/ minute in order to avoid draining the battery.\n            handler.postDelayed(removeGpsUpdates, prefs.getLong(\n                    IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                    IgnitedLocationConstants.WAIT_FOR_GPS_FIX_INTERVAL_DEFAULT));\n        }\n\n        locationUpdatesDisabled = false;\n    }\n\n    \/**\n     * Stop listening for location updates\n     * \n     * @param enablePassiveLocationUpdates\n     *\/\n    protected void disableLocationUpdates(boolean requestPassiveLocationUpdates) {\n        if (locationUpdatesDisabled) {\n            return;\n        }\n\n        Log.d(LOG_TAG, \"Disabling location updates\");\n        if (locationProviderDisabledReceiverRegistered) {\n            context.unregisterReceiver(locationProviderDisabledReceiver);\n            locationProviderDisabledReceiverRegistered = false;\n        }\n        if (refreshLocationUpdatesReceiverRegistered) {\n            context.unregisterReceiver(refreshLocationUpdatesReceiver);\n            refreshLocationUpdatesReceiverRegistered = false;\n        }\n        locationUpdateRequester.removeLocationUpdates();\n        if (bestInactiveLocationProviderListener != null) {\n            locationManager.removeUpdates(bestInactiveLocationProviderListener);\n        }\n\n        boolean finishing = ((Activity) context).isFinishing();\n\n        if (requestPassiveLocationUpdates && !finishing) {\n            requestPassiveLocationUpdates();\n        }\n\n        locationUpdatesDisabled = true;\n    }\n\n    private void requestPassiveLocationUpdates() {\n        if (IgnitedDiagnostics.SUPPORTS_FROYO\n                && prefs.getBoolean(\n                        IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                        IgnitedLocationConstants.ENABLE_PASSIVE_LOCATION_UPDATES_DEFAULT)) {\n            Log.d(LOG_TAG, \"Requesting passive location updates\");\n            \/\/ Passive location updates from 3rd party apps when the Activity isn't\n            \/\/ visible. Only for Android 2.2+.\n            locationUpdateRequester.requestPassiveLocationUpdates(passiveLocationUpdatesInterval,\n                    passiveLocationUpdatesDistanceDiff, locationListenerPassivePendingIntent);\n        }\n    }\n\n    public boolean isLocationUpdatesDisabled() {\n        return locationUpdatesDisabled;\n    }\n\n    public Criteria lowPowerCriteria() {\n        if (lowPowerCriteria == null) {\n            lowPowerCriteria = new Criteria();\n            lowPowerCriteria.setPowerRequirement(Criteria.POWER_LOW);\n            lowPowerCriteria.setAccuracy(Criteria.NO_REQUIREMENT);\n        }\n        return lowPowerCriteria;\n    }\n\n    \/**\n     * If the best Location Provider (usually GPS) is not available when we request location\n     * updates, this listener will be notified if \/ when it becomes available. It calls\n     * requestLocationUpdates to re-register the location listeners using the better Location\n     * Provider.\n     *\/\n    private class IgnitedLocationListener implements LocationListener {\n        private Context context;\n\n        public IgnitedLocationListener(Context appContext) {\n            this.context = appContext;\n        }\n\n        @Override\n        public void onLocationChanged(Location l) {\n        }\n\n        @Override\n        public void onProviderDisabled(String provider) {\n        }\n\n        @Override\n        public void onStatusChanged(String provider, int status, Bundle extras) {\n        }\n\n        @Override\n        public void onProviderEnabled(String provider) {\n            \/\/ Re-register the location listeners using the better Location\n            \/\/ Provider.\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, null);\n        }\n    }\n\n}\n","old_contents":"\/*\n * Copyright 2011 Google Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * This code has been modified by Stefano Dacchille.\n *\/\n\npackage com.github.ignition.location;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\n\nimport android.app.Activity;\nimport android.app.PendingIntent;\nimport android.content.BroadcastReceiver;\nimport android.content.Context;\nimport android.content.Intent;\nimport android.content.IntentFilter;\nimport android.content.SharedPreferences;\nimport android.content.SharedPreferences.Editor;\nimport android.location.Criteria;\nimport android.location.Location;\nimport android.location.LocationListener;\nimport android.location.LocationManager;\nimport android.os.AsyncTask;\nimport android.os.BatteryManager;\nimport android.os.Bundle;\nimport android.os.Handler;\nimport android.util.Log;\n\nimport com.github.ignition.location.annotations.IgnitedLocation;\nimport com.github.ignition.location.annotations.IgnitedLocationActivity;\nimport com.github.ignition.location.receivers.IgnitedLocationChangedReceiver;\nimport com.github.ignition.location.receivers.IgnitedPassiveLocationChangedReceiver;\nimport com.github.ignition.location.tasks.IgnitedLastKnownLocationAsyncTask;\nimport com.github.ignition.location.templates.ILastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLocationUpdateRequester;\nimport com.github.ignition.location.templates.OnIgnitedLocationChangedListener;\nimport com.github.ignition.location.utils.IgnitedLocationSupport;\nimport com.github.ignition.location.utils.PlatformSpecificImplementationFactory;\nimport com.github.ignition.support.IgnitedDiagnostics;\n\n@SuppressAjWarnings\npublic aspect IgnitedLocationManager {\n    public static final String LOG_TAG = IgnitedLocationManager.class.getSimpleName();\n\n    declare parents : (@IgnitedLocationActivity *) implements OnIgnitedLocationChangedListener;\n\n    private Criteria defaultCriteria, lowPowerCriteria;\n    protected IgnitedAbstractLocationUpdateRequester locationUpdateRequester;\n    protected PendingIntent locationListenerPendingIntent, locationListenerPassivePendingIntent;\n    protected LocationManager locationManager;\n    protected IgnitedLocationListener bestInactiveLocationProviderListener;\n\n    private Context context;\n    private volatile Location currentLocation;\n\n    private IgnitedLastKnownLocationAsyncTask ignitedLastKnownLocationTask;\n    private SharedPreferences prefs;\n    private Handler handler;\n\n    private long locationUpdatesInterval, passiveLocationUpdatesInterval;\n    private int locationUpdatesDistanceDiff;\n    private int passiveLocationUpdatesDistanceDiff;\n    private boolean requestLocationUpdates;\n    private boolean locationUpdatesDisabled = true;\n    private boolean waitForFixDialogShown = false;\n    private boolean noProvidersEnabledDialogShown = false;\n    private boolean locationProviderDisabledReceiverRegistered = false;\n    private boolean refreshLocationUpdatesReceiverRegistered = false;\n\n    \/\/ Switch to another provider if gps doesn't return a location quickly enough.\n    private Runnable removeGpsUpdates = new Runnable() {\n        @Override\n        public void run() {\n            Log.d(LOG_TAG,\n                    \"It looks like GPS isn't available at this time (i.e.: maybe you're indoors). Removing GPS location updates and requesting network updates.\");\n\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, lowPowerCriteria());\n        }\n    };\n\n    \/**\n     * If the Location Provider we're using to receive location updates is disabled while the app is\n     * running, this Receiver will be notified, allowing us to re-register our Location Receivers\n     * using the best available Location Provider is still available.\n     *\/\n    protected BroadcastReceiver locationProviderDisabledReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            boolean providerDisabled = !intent.getBooleanExtra(\n                    LocationManager.KEY_PROVIDER_ENABLED, false);\n            \/\/ Re-register the location listeners using the best available\n            \/\/ Location Provider.\n            if (providerDisabled) {\n                disableLocationUpdates(false);\n                requestLocationUpdates(context, null);\n            }\n        }\n    };\n\n    \/**\n     * If the battery state is low disable the passive location update receiver.\n     *\/\n    protected BroadcastReceiver refreshLocationUpdatesReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, null);\n        }\n    };\n\n    after(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onCreate(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n\n        \/\/ Get a reference to the Context\n        this.context = context;\n        \/\/ Set pref file\n        prefs = context.getSharedPreferences(IgnitedLocationConstants.SHARED_PREFERENCE_FILE,\n                Context.MODE_PRIVATE);\n        \/\/ Get references to the managers\n        locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);\n        handler = new Handler();\n\n        \/\/ Specify the Criteria to use when requesting location updates while\n        \/\/ the application is Active\n        if (defaultCriteria == null) {\n            defaultCriteria = new Criteria();\n        }\n        \/\/ Use gps if it's enabled and if battery level is at least 15%\n        boolean useGps = prefs.getBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS,\n                IgnitedLocationConstants.USE_GPS_DEFAULT);\n        if (useGps) {\n            defaultCriteria.setAccuracy(Criteria.ACCURACY_FINE);\n        } else {\n            defaultCriteria.setPowerRequirement(Criteria.POWER_LOW);\n        }\n\n        \/\/ Setup the location update Pending Intent\n        Intent activeIntent = new Intent(IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_ACTION);\n        locationListenerPendingIntent = PendingIntent.getBroadcast(context, 0, activeIntent,\n                PendingIntent.FLAG_UPDATE_CURRENT);\n        \/\/ Setup the passive location update Pending Intent\n        Intent passiveIntent = new Intent(context, IgnitedPassiveLocationChangedReceiver.class);\n        locationListenerPassivePendingIntent = PendingIntent.getBroadcast(context, 0,\n                passiveIntent, PendingIntent.FLAG_UPDATE_CURRENT);\n\n        \/\/ Instantiate a Location Update Requester class based on the available\n        \/\/ platform version. This will be used to request location updates.\n        locationUpdateRequester = PlatformSpecificImplementationFactory\n                .getLocationUpdateRequester(context);\n    }\n\n    private boolean isBatteryOk() {\n        IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);\n        Intent intent = context.registerReceiver(null, filter);\n        double currentLevel = 100.0;\n        if (intent != null) {\n            currentLevel = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1);\n        }\n\n        return currentLevel >= prefs.getInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                IgnitedLocationConstants.MIN_BATTERY_LEVEL_FOR_GPS_DEFAULT);\n    }\n\n    before(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onResume(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n        \/\/ Get a reference to the Context if this context is null\n        if (this.context == null) {\n            this.context = context;\n        }\n\n        saveToPreferences(context, ignitedAnnotation);\n\n        Log.d(LOG_TAG, \"Retrieving last known location...\");\n        \/\/ Get the last known location. This isn't directly affecting the UI, so put it on a\n        \/\/ worker thread.\n        ignitedLastKnownLocationTask = new IgnitedLastKnownLocationAsyncTask(context,\n                locationUpdatesDistanceDiff, locationUpdatesInterval);\n        ignitedLastKnownLocationTask.execute();\n    }\n\n    \/**\n     * Save last settings to preferences.\n     * \n     * @param context\n     * @param locationAnnotation\n     *\/\n    private void saveToPreferences(Context context, IgnitedLocationActivity locationAnnotation) {\n        requestLocationUpdates = locationAnnotation.requestLocationUpdates();\n        locationUpdatesDistanceDiff = locationAnnotation.locationUpdatesDistanceDiff();\n        locationUpdatesInterval = locationAnnotation.locationUpdatesInterval();\n        passiveLocationUpdatesDistanceDiff = locationAnnotation\n                .passiveLocationUpdatesDistanceDiff();\n        passiveLocationUpdatesInterval = locationAnnotation.passiveLocationUpdatesInterval();\n        boolean enablePassiveLocationUpdates = locationAnnotation.enablePassiveUpdates();\n        boolean useGps = locationAnnotation.useGps();\n\n        Editor editor = prefs.edit();\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_LOCATION_UPDATES,\n                requestLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                enablePassiveLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS, useGps);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_DISTANCE_DIFF,\n                locationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_INTERVAL,\n                locationUpdatesInterval);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_DISTANCE_DIFF,\n                passiveLocationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_INTERVAL,\n                passiveLocationUpdatesInterval);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_RUN_ONCE, true);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                locationAnnotation.minBatteryLevelForGps());\n        editor.putLong(IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                locationAnnotation.waitForGpsFixInterval());\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                locationAnnotation.showWaitForLocationDialog());\n        editor.commit();\n\n    }\n\n    before(Activity activity, IgnitedLocationActivity ignitedAnnotation) : execution(* Activity.onPause(..)) \n        && @this(ignitedAnnotation) && this(activity) && within(@IgnitedLocationActivity *) {\n\n        if (ignitedAnnotation.requestLocationUpdates()) {\n            disableLocationUpdates(true);\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n\n        if (ignitedLastKnownLocationTask != null) {\n            if (ignitedLastKnownLocationTask.getStatus() != AsyncTask.Status.FINISHED) {\n                Log.d(LOG_TAG, \"Cancel last location task\");\n                ignitedLastKnownLocationTask.cancel(true);\n            }\n            ignitedLastKnownLocationTask.getLastLocationFinder().cancel();\n        }\n\n        boolean finishing = activity.isFinishing();\n        if (finishing) {\n            context = null;\n        }\n    }\n\n    Location around() : get(@IgnitedLocation Location *) {\n        return currentLocation;\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && within(IgnitedPassiveLocationChangedReceiver) && !adviceexecution() {\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, lng\/acc): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude() + \"\/\"\n                + currentLocation.getAccuracy());\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && (within(IgnitedLocationChangedReceiver) || within(IgnitedAbstractLastLocationFinder)\n                || within(IgnitedLastKnownLocationAsyncTask)) && !adviceexecution() {\n\n        if (context == null) {\n            return;\n        }\n\n        final Activity activity = (Activity) context;\n        if (IgnitedLocationSupport.getEnabledProviders(context).isEmpty()) {\n            \/\/ On some older versions of Android if a dialog is not shown by the activity after\n            \/\/ calling showDialog an IllegalArgunmentException is raised. Catch this exception since\n            \/\/ the docs returning a null dialog should be allowed.\n            try {\n                activity.showDialog(R.id.ign_loc_dialog_no_providers_enabled);\n                noProvidersEnabledDialogShown = true;\n            } catch (IllegalArgumentException e) {\n                e.printStackTrace();\n            }\n            return;\n        }\n\n        if (freshLocation == null) {\n            \/\/ TODO Migrate this to DialogFragment at some point\n            boolean showWaitForLocationDialog = prefs.getBoolean(\n                    IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                    IgnitedLocationConstants.SHOW_WAIT_FOR_LOCATION_DIALOG_DEFAULT);\n            if (showWaitForLocationDialog && !activity.isFinishing()) {\n                \/\/ On some older versions of Android if a dialog is not shown by the activity after\n                \/\/ calling showDialog an IllegalArgunmentException is raised. Catch this exception since\n                \/\/ the docs returning a null dialog should be allowed.\n                try {\n                    activity.showDialog(R.id.ign_loc_dialog_wait_for_fix);\n                    waitForFixDialogShown = true;\n                } catch (IllegalArgumentException e) {\n                    e.printStackTrace();\n                }\n            }\n            return;\n        }\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, lng\/acc): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude() + \"\/\" + currentLocation.getAccuracy());\n        \/\/ TODO Migrate this to DialogFragment at some point\n        if (noProvidersEnabledDialogShown) {\n            activity.removeDialog(R.id.ign_loc_dialog_no_providers_enabled);\n            noProvidersEnabledDialogShown = false;\n        } else if (waitForFixDialogShown) {\n            activity.removeDialog(R.id.ign_loc_dialog_wait_for_fix);\n            waitForFixDialogShown = false;\n        }\n        boolean keepRequestingLocationUpdates = ((OnIgnitedLocationChangedListener) context)\n                .onIgnitedLocationChanged(currentLocation);\n        Bundle extras = freshLocation.getExtras();\n        \/\/ a) If location updates shouldn't be requested anymore turn them off.\n        \/\/ b) Don't turn location updates on if last location is too old, since the single location\n        \/\/ update is running.\n        if (!keepRequestingLocationUpdates) {\n            disableLocationUpdates(true);\n            \/\/ PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            return;\n        } else if (requestLocationUpdates\n                && (extras == null || !extras.containsKey(ILastLocationFinder.LAST_LOCATION_TOO_OLD_OR_INACCURATE_EXTRA))) {\n            \/\/ If we requested location updates, turn them on here.\n            requestLocationUpdates(context, null);\n        }\n\n        \/\/ If gps is enabled location comes from gps, remove runnable that removes gps updates\n        boolean lastLocation = extras != null && extras.containsKey(IgnitedLocationConstants.IGNITED_LAST_LOCATION_EXTRA);\n        if (!lastLocation && defaultCriteria.getAccuracy() == Criteria.ACCURACY_FINE\n                && currentLocation.getProvider().equals(LocationManager.GPS_PROVIDER)) {\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n    }\n\n    \/**\n     * Start listening for location updates.\n     *\/\n    protected void requestLocationUpdates(Context context, Criteria criteria) {\n        if (!locationUpdatesDisabled) {\n            return;\n        }\n        Criteria locationUpdateCriteria = criteria;\n        if (criteria == null) {\n            if (isBatteryOk()) {\n                locationUpdateCriteria = defaultCriteria;\n            } else {\n                locationUpdateCriteria = lowPowerCriteria();\n            }\n        }\n        Log.d(LOG_TAG, \"Disabling passive location updates\");\n        locationManager.removeUpdates(locationListenerPassivePendingIntent);\n\n        Log.d(LOG_TAG, \"Requesting location updates\");\n        \/\/ Normal updates while activity is visible.\n        locationUpdateRequester.requestLocationUpdates(locationUpdatesInterval,\n                locationUpdatesDistanceDiff, locationUpdateCriteria, locationListenerPendingIntent);\n\n        \/\/ Register a receiver that listens for when the provider I'm using has\n        \/\/ been disabled.\n        IntentFilter locationProviderDisabledIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_PROVIDER_DISABLED_ACTION);\n        context.registerReceiver(locationProviderDisabledReceiver,\n                locationProviderDisabledIntentFilter);\n        locationProviderDisabledReceiverRegistered = true;\n\n        IntentFilter refreshLocationUpdatesIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.UPDATE_LOCATION_UPDATES_CRITERIA_ACTION);\n        context.registerReceiver(refreshLocationUpdatesReceiver, refreshLocationUpdatesIntentFilter);\n        refreshLocationUpdatesReceiverRegistered = true;\n\n        \/\/ Register a receiver that listens for when a better provider than I'm\n        \/\/ using becomes available.\n        String bestProvider = locationManager.getBestProvider(locationUpdateCriteria, false);\n        String bestAvailableProvider = locationManager.getBestProvider(locationUpdateCriteria, true);\n        if (bestProvider != null && !bestProvider.equals(bestAvailableProvider)) {\n            bestInactiveLocationProviderListener = new IgnitedLocationListener(context);\n            locationManager.requestLocationUpdates(bestProvider, 0, 0,\n                    bestInactiveLocationProviderListener, context.getMainLooper());\n        }\n\n        if (bestAvailableProvider.equals(LocationManager.GPS_PROVIDER)) {\n            Log.d(LOG_TAG, \"Posting delayed remove GPS updates message\");\n            \/\/ Post a runnable that will remove gps updates if no gps location is returned after 1\n            \/\/ minute in order to avoid draining the battery.\n            handler.postDelayed(removeGpsUpdates, prefs.getLong(\n                    IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                    IgnitedLocationConstants.WAIT_FOR_GPS_FIX_INTERVAL_DEFAULT));\n        }\n\n        locationUpdatesDisabled = false;\n    }\n\n    \/**\n     * Stop listening for location updates\n     * \n     * @param enablePassiveLocationUpdates\n     *\/\n    protected void disableLocationUpdates(boolean requestPassiveLocationUpdates) {\n        if (locationUpdatesDisabled) {\n            return;\n        }\n\n        Log.d(LOG_TAG, \"Disabling location updates\");\n        if (locationProviderDisabledReceiverRegistered) {\n            context.unregisterReceiver(locationProviderDisabledReceiver);\n            locationProviderDisabledReceiverRegistered = false;\n        }\n        if (refreshLocationUpdatesReceiverRegistered) {\n            context.unregisterReceiver(refreshLocationUpdatesReceiver);\n            refreshLocationUpdatesReceiverRegistered = false;\n        }\n        locationUpdateRequester.removeLocationUpdates();\n        if (bestInactiveLocationProviderListener != null) {\n            locationManager.removeUpdates(bestInactiveLocationProviderListener);\n        }\n\n        boolean finishing = ((Activity) context).isFinishing();\n\n        if (requestPassiveLocationUpdates && !finishing) {\n            requestPassiveLocationUpdates();\n        }\n\n        locationUpdatesDisabled = true;\n    }\n\n    private void requestPassiveLocationUpdates() {\n        if (IgnitedDiagnostics.SUPPORTS_FROYO\n                && prefs.getBoolean(\n                        IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                        IgnitedLocationConstants.ENABLE_PASSIVE_LOCATION_UPDATES_DEFAULT)) {\n            Log.d(LOG_TAG, \"Requesting passive location updates\");\n            \/\/ Passive location updates from 3rd party apps when the Activity isn't\n            \/\/ visible. Only for Android 2.2+.\n            locationUpdateRequester.requestPassiveLocationUpdates(passiveLocationUpdatesInterval,\n                    passiveLocationUpdatesDistanceDiff, locationListenerPassivePendingIntent);\n        }\n    }\n\n    public boolean isLocationUpdatesDisabled() {\n        return locationUpdatesDisabled;\n    }\n\n    public Criteria lowPowerCriteria() {\n        if (lowPowerCriteria == null) {\n            lowPowerCriteria = new Criteria();\n            lowPowerCriteria.setPowerRequirement(Criteria.POWER_LOW);\n            lowPowerCriteria.setAccuracy(Criteria.NO_REQUIREMENT);\n        }\n        return lowPowerCriteria;\n    }\n\n    \/**\n     * If the best Location Provider (usually GPS) is not available when we request location\n     * updates, this listener will be notified if \/ when it becomes available. It calls\n     * requestLocationUpdates to re-register the location listeners using the better Location\n     * Provider.\n     *\/\n    private class IgnitedLocationListener implements LocationListener {\n        private Context context;\n\n        public IgnitedLocationListener(Context appContext) {\n            this.context = appContext;\n        }\n\n        @Override\n        public void onLocationChanged(Location l) {\n        }\n\n        @Override\n        public void onProviderDisabled(String provider) {\n        }\n\n        @Override\n        public void onStatusChanged(String provider, int status, Bundle extras) {\n        }\n\n        @Override\n        public void onProviderEnabled(String provider) {\n            \/\/ Re-register the location listeners using the better Location\n            \/\/ Provider.\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, null);\n        }\n    }\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"9024a29eb66d20f3fc4dc34de9249f50b85cc24d","subject":"+ aspects for events","message":"+ aspects for events","repos":"agentlab\/ru.agentlab.maia","old_file":"aspects\/ru.agentlab.maia.context.event\/aj-src\/ru\/agentlab\/maia\/context\/event\/AMaiaContextFactoryEvent.aj","new_file":"aspects\/ru.agentlab.maia.context.event\/aj-src\/ru\/agentlab\/maia\/context\/event\/AMaiaContextFactoryEvent.aj","new_contents":"package ru.agentlab.maia.context.event;\n\nimport ru.agentlab.maia.context.IMaiaContext;\nimport ru.agentlab.maia.context.aj.AMaiaContextFactory;\nimport ru.agentlab.maia.event.IMaiaEventBroker;\n\npublic aspect AMaiaContextFactoryEvent extends AMaiaContextFactory {\n\n\tafter(IMaiaContext parent) returning (IMaiaContext result): \n\t\tonCreateChildContext(*, parent, *) {\n\t\tIMaiaEventBroker broker = result.get(IMaiaEventBroker.class);\n\t\tbroker.post(new MaiaContextFactoryCreateChildEvent(parent, result));\n\t}\n\n\tafter() returning (IMaiaContext result): \n\t\tonCreateContext(*, *) {\n\t\tIMaiaEventBroker broker = result.get(IMaiaEventBroker.class);\n\t\tbroker.post(new MaiaContextFactoryCreateEvent(result));\n\t}\n}","old_contents":"","returncode":1,"stderr":"error: pathspec 'aspects\/ru.agentlab.maia.context.event\/aj-src\/ru\/agentlab\/maia\/context\/event\/AMaiaContextFactoryEvent.aj' did not match any file(s) known to git\n","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"55454d1c12d44188455ac7c190ace49cfd6bc5d9","subject":"roll-back","message":"roll-back\n","repos":"HaStr\/kieker,HaStr\/kieker,kieker-monitoring\/kieker,kieker-monitoring\/kieker,kieker-monitoring\/kieker,HaStr\/kieker,kieker-monitoring\/kieker,leadwire-apm\/leadwire-javaagent,kieker-monitoring\/kieker,HaStr\/kieker,leadwire-apm\/leadwire-javaagent,HaStr\/kieker","old_file":"src\/kieker\/tpmon\/aspects\/TpmonFullServletRemoteInstrumentation.aj","new_file":"src\/kieker\/tpmon\/aspects\/TpmonFullServletRemoteInstrumentation.aj","new_contents":"","old_contents":"","returncode":128,"stderr":"remote: Support for password authentication was removed on August 13, 2021.\nremote: Please see https:\/\/docs.github.com\/en\/get-started\/getting-started-with-git\/about-remote-repositories#cloning-with-https-urls for information on currently recommended modes of authentication.\nfatal: Authentication failed for 'https:\/\/github.com\/HaStr\/kieker.git\/'\n","license":"apache-2.0","lang":"AspectJ"}
{"commit":"ff1a313dfd7714f6a6eca00dd2cc1037c644f971","subject":"Added debugging aspects in AspectJ (didn't change the project type to AspectJ so that folks can still open it in Eclipse).","message":"Added debugging aspects in AspectJ (didn't change the project type to AspectJ so that folks can still open it in Eclipse).\n","repos":"morfologik\/morfologik-stemming,aldenquimby\/morfologik-stemming","old_file":"src-aspects\/morfologik\/fsa\/MeasureSpeed.aj","new_file":"src-aspects\/morfologik\/fsa\/MeasureSpeed.aj","new_contents":"package morfologik.fsa;\n\nimport java.util.HashMap;\n\nimport org.omg.CORBA.IntHolder;\n\n\/**\n * Aspects useful for debugging.\n *\/\npublic aspect MeasureSpeed issingleton() {\n    public int addSuffixTime; \n    public int replaceOrRegisterTime;\n\n    Object around(): \n        execution(* morfologik.fsa.FSABuilder.addSuffix(..))\n    {\n        final long start = System.currentTimeMillis();\n        try {\n            return proceed();\n        } finally {\n            addSuffixTime += (System.currentTimeMillis() - start);\n        }\n    }\n\n    Object around():\n        withincode(* morfologik.fsa.FSABuilder.add(..)) &&\n        call(* morfologik.fsa.FSABuilder.replaceOrRegister(..))\n    {\n        final long start = System.currentTimeMillis();\n        try {\n            return proceed();\n        } finally {\n            replaceOrRegisterTime += (System.currentTimeMillis() - start);\n        }\n    }\n\n    State around(): \n        execution(State morfologik.fsa.FSABuilder.build(..))\n    {\n        long start = System.currentTimeMillis();\n        State result = proceed();\n        long end = System.currentTimeMillis();\n\n        System.out.println(\n                \"Total: \" +\n                ((end - start) \/ 1000.0) + \n                \", ror: \" + \n                (replaceOrRegisterTime \/ 1000.0) + \n                \", adds: \" + \n                addSuffixTime \/ 1000.0);\n\n        \/\/ Check hash code collision rate.\n        final HashMap<Integer, IntHolder> collisions = new HashMap<Integer, IntHolder>();\n        result.preOrder(new Visitor<State>() {\n            public void accept(State s) {\n                int hash = s.hashCode();\n                if (!collisions.containsKey(hash)) {\n                    collisions.put(hash, new IntHolder(1));\n                } else {\n                    collisions.get(hash).value++;\n                }\n            };\n        });\n        \n        int collSlots = 0;\n        int collCumulative = 0;\n        for (IntHolder ih : collisions.values()) {\n            if (ih.value > 1) {\n                collSlots++;\n                collCumulative += ih.value;\n            }\n        }\n\n        System.out.println(\"States: \" + collisions.size()\n                + \", coll: \" + collSlots + \", cum: \" + collCumulative);\n\n        replaceOrRegisterTime = 0;\n        addSuffixTime = 0;\n\n        return result;\n    }\n}\n","old_contents":"","returncode":1,"stderr":"error: pathspec 'src-aspects\/morfologik\/fsa\/MeasureSpeed.aj' did not match any file(s) known to git\n","license":"bsd-3-clause","lang":"AspectJ"}
{"commit":"ab1f4f08640b63f2bcebac84e020453c8ed5a001","subject":"ouch, forgot to commit it and caused the Jenkins failure - have to pay a beer to the team","message":"ouch, forgot to commit it and caused the Jenkins failure - have to pay a beer to the team\n\ngit-svn-id: 4c9d3fe6b7b6c0d9eeb10ce04f5d3c1083d3aa64@1244498 13f79535-47bb-0310-9956-ffa450edef68\n","repos":"kidaa\/directmemory,kidaa\/directmemory,kidaa\/directmemory,kidaa\/directmemory,apache\/directmemory,apache\/directmemory,apache\/directmemory,apache\/directmemory","old_file":"directmemory-cache\/src\/main\/aspect\/org\/apache\/directmemory\/monitoring\/Performance.aj","new_file":"directmemory-cache\/src\/main\/aspect\/org\/apache\/directmemory\/monitoring\/Performance.aj","new_contents":"","old_contents":"","returncode":128,"stderr":"remote: Support for password authentication was removed on August 13, 2021.\nremote: Please see https:\/\/docs.github.com\/en\/get-started\/getting-started-with-git\/about-remote-repositories#cloning-with-https-urls for information on currently recommended modes of authentication.\nfatal: Authentication failed for 'https:\/\/github.com\/kidaa\/directmemory.git\/'\n","license":"apache-2.0","lang":"AspectJ"}
{"commit":"c85adbcebfc965ae85947f8fe40d2b53acfbb7fe","subject":"Fixed requesting location updates when a battery ok broadcast is received and GPS is used.","message":"Fixed requesting location updates when a battery ok broadcast is received and GPS is used.\n","repos":"hongnguyenpro\/ignition,Applied-Duality\/ignition,mttkay\/ignition,treejames\/ignition,beni55\/ignition","old_file":"ignition-location\/ignition-location-lib\/src\/com\/github\/ignition\/location\/IgnitedLocationManager.aj","new_file":"ignition-location\/ignition-location-lib\/src\/com\/github\/ignition\/location\/IgnitedLocationManager.aj","new_contents":"\/*\n * Copyright 2011 Google Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * This code has been modified by Stefano Dacchille.\n *\/\n\npackage com.github.ignition.location;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\n\nimport android.app.Activity;\nimport android.app.PendingIntent;\nimport android.content.BroadcastReceiver;\nimport android.content.Context;\nimport android.content.Intent;\nimport android.content.IntentFilter;\nimport android.content.SharedPreferences;\nimport android.content.SharedPreferences.Editor;\nimport android.location.Criteria;\nimport android.location.Location;\nimport android.location.LocationListener;\nimport android.location.LocationManager;\nimport android.os.AsyncTask;\nimport android.os.BatteryManager;\nimport android.os.Bundle;\nimport android.os.Handler;\nimport android.util.Log;\n\nimport com.github.ignition.location.annotations.IgnitedLocation;\nimport com.github.ignition.location.annotations.IgnitedLocationActivity;\nimport com.github.ignition.location.receivers.IgnitedLocationChangedReceiver;\nimport com.github.ignition.location.receivers.IgnitedPassiveLocationChangedReceiver;\nimport com.github.ignition.location.tasks.IgnitedLastKnownLocationAsyncTask;\nimport com.github.ignition.location.templates.ILastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLocationUpdateRequester;\nimport com.github.ignition.location.templates.OnIgnitedLocationChangedListener;\nimport com.github.ignition.location.utils.PlatformSpecificImplementationFactory;\nimport com.github.ignition.support.IgnitedDiagnostics;\n\n@SuppressAjWarnings\npublic aspect IgnitedLocationManager {\n    public static final String LOG_TAG = IgnitedLocationManager.class.getSimpleName();\n\n    declare parents : (@IgnitedLocationActivity *) implements OnIgnitedLocationChangedListener;\n\n    private Criteria defaultCriteria, lowPowerCriteria;\n    protected IgnitedAbstractLocationUpdateRequester locationUpdateRequester;\n    protected PendingIntent locationListenerPendingIntent, locationListenerPassivePendingIntent;\n    protected LocationManager locationManager;\n    protected IgnitedLocationListener bestInactiveLocationProviderListener;\n\n    private Context context;\n    private volatile Location currentLocation;\n\n    private AsyncTask<Void, Void, Location> ignitedLastKnownLocationTask;\n    private SharedPreferences prefs;\n    private Handler handler;\n\n    private long locationUpdatesInterval, passiveLocationUpdatesInterval;\n    private int locationUpdatesDistanceDiff;\n    private int passiveLocationUpdatesDistanceDiff;\n    private boolean requestLocationUpdates;\n    private boolean locationUpdatesDisabled = true;\n    \n    \/\/ Switch to another provider if gps doesn't return a location quickly enough.\n    private Runnable removeGpsUpdates = new Runnable() {\n        @Override\n        public void run() {\n            Log.d(LOG_TAG,\n                    \"It looks like GPS isn't available at this time (i.e.: maybe you're indoors). Removing GPS location updates and requesting network updates.\");\n\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, lowPowerCriteria());\n        }\n    };\n\n    \/**\n     * If the Location Provider we're using to receive location updates is disabled while the app is\n     * running, this Receiver will be notified, allowing us to re-register our Location Receivers\n     * using the best available Location Provider is still available.\n     *\/\n    protected BroadcastReceiver locationProviderDisabledReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            boolean providerDisabled = !intent.getBooleanExtra(\n                    LocationManager.KEY_PROVIDER_ENABLED, false);\n            \/\/ Re-register the location listeners using the best available\n            \/\/ Location Provider.\n            if (providerDisabled) {\n                disableLocationUpdates(false);\n                requestLocationUpdates(context, null);\n            }\n        }\n    };\n\n    \/**\n     * If the battery state is low disable the passive location update receiver.\n     *\/\n    protected BroadcastReceiver refreshLocationUpdatesReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, null);\n        }\n    };\n\n    after(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onCreate(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n\n        \/\/ Get a reference to the Context\n        this.context = context;\n        \/\/ Set pref file\n        prefs = context.getSharedPreferences(IgnitedLocationConstants.SHARED_PREFERENCE_FILE,\n                Context.MODE_PRIVATE);\n        \/\/ Get references to the managers\n        locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);\n        handler = new Handler();\n\n        \/\/ Specify the Criteria to use when requesting location updates while\n        \/\/ the application is Active\n        if (defaultCriteria == null) {\n            defaultCriteria = new Criteria();\n        }\n        \/\/ Use gps if it's enabled and if battery level is at least 15%\n        boolean useGps = prefs.getBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS,\n                IgnitedLocationConstants.USE_GPS_DEFAULT);\n        if (useGps) {\n            defaultCriteria.setAccuracy(Criteria.ACCURACY_FINE);\n        } else {\n            defaultCriteria.setPowerRequirement(Criteria.POWER_LOW);\n        }\n\n        \/\/ Setup the location update Pending Intent\n        Intent activeIntent = new Intent(IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_ACTION);\n        locationListenerPendingIntent = PendingIntent.getBroadcast(context, 0, activeIntent,\n                PendingIntent.FLAG_UPDATE_CURRENT);\n        \/\/ Setup the passive location update Pending Intent\n        Intent passiveIntent = new Intent(context, IgnitedPassiveLocationChangedReceiver.class);\n        locationListenerPassivePendingIntent = PendingIntent.getBroadcast(context, 0,\n                passiveIntent, PendingIntent.FLAG_UPDATE_CURRENT);\n\n        \/\/ Instantiate a Location Update Requester class based on the available\n        \/\/ platform version. This will be used to request location updates.\n        locationUpdateRequester = PlatformSpecificImplementationFactory\n                .getLocationUpdateRequester(context);\n    }\n\n    private boolean isBatteryOk() {\n        IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);\n        Intent intent = context.registerReceiver(null, filter);\n        double currentLevel = 100.0;\n        if (intent != null) {\n            currentLevel = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1);\n        }\n\n        return currentLevel >= prefs.getInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                IgnitedLocationConstants.MIN_BATTERY_LEVEL_DEFAULT);\n    }\n\n    before(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onResume(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n        \/\/ Get a reference to the Context if this context is null\n        if (this.context == null) {\n            this.context = context;\n        }\n\n        saveToPreferences(context, ignitedAnnotation);\n\n        Log.d(LOG_TAG, \"Retrieving last known location...\");\n        \/\/ Get the last known location. This isn't directly affecting the UI, so put it on a\n        \/\/ worker thread.\n        ignitedLastKnownLocationTask = new IgnitedLastKnownLocationAsyncTask(\n                context, locationUpdatesDistanceDiff, locationUpdatesInterval);\n        ignitedLastKnownLocationTask.execute();\n    }\n\n    \/**\n     * Save last settings to preferences.\n     * \n     * @param context\n     * @param locationAnnotation\n     *\/\n    private void saveToPreferences(Context context, IgnitedLocationActivity locationAnnotation) {\n        requestLocationUpdates = locationAnnotation.requestLocationUpdates();\n        locationUpdatesDistanceDiff = locationAnnotation.locationUpdatesDistanceDiff();\n        locationUpdatesInterval = locationAnnotation.locationUpdatesInterval();\n        passiveLocationUpdatesDistanceDiff = locationAnnotation\n                .passiveLocationUpdatesDistanceDiff();\n        passiveLocationUpdatesInterval = locationAnnotation.passiveLocationUpdatesInterval();\n        boolean enablePassiveLocationUpdates = locationAnnotation.enablePassiveUpdates();\n        boolean useGps = locationAnnotation.useGps();\n\n        Editor editor = prefs.edit();\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_LOCATION_UPDATES,\n                requestLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                enablePassiveLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS, useGps);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_DISTANCE_DIFF,\n                locationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_INTERVAL,\n                locationUpdatesInterval);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_DISTANCE_DIFF,\n                passiveLocationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_INTERVAL,\n                passiveLocationUpdatesInterval);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_RUN_ONCE, true);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                locationAnnotation.minBatteryLevel());\n        editor.putLong(IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                locationAnnotation.waitForGpsFix());\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                locationAnnotation.showWaitForLocationDialog());\n        editor.commit();\n\n    }\n\n    before(Activity activity, IgnitedLocationActivity ignitedAnnotation) : execution(* Activity.onPause(..)) \n        && @this(ignitedAnnotation) && this(activity)\n        && within(@IgnitedLocationActivity *) && if (ignitedAnnotation.requestLocationUpdates()) {\n\n        disableLocationUpdates(true);\n\n        handler.removeCallbacks(removeGpsUpdates);\n\n        boolean finishing = activity.isFinishing();\n        if (finishing) {\n            if (ignitedLastKnownLocationTask != null && ignitedLastKnownLocationTask.getStatus() != AsyncTask.Status.FINISHED) {\n                ignitedLastKnownLocationTask.cancel(true);\n            } else {\n                PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            }\n\n            context = null;\n        }\n    }\n\n    \/\/ after() : execution(* Activity.onDestroy(..)) && @this(IgnitedLocationActivity)\n    \/\/ && within(@IgnitedLocationActivity *) {\n    \/\/ }\n\n    Location around() : get(@IgnitedLocation Location *) {\n        return currentLocation;\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && within(IgnitedPassiveLocationChangedReceiver) && !adviceexecution() {\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, lng\/acc): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude() + \"\/\" + currentLocation.getAccuracy());\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && (within(IgnitedLocationChangedReceiver) || within(IgnitedAbstractLastLocationFinder)\n                || within(IgnitedLastKnownLocationAsyncTask)) && !adviceexecution() {\n\n        if (context == null) {\n            return;\n        }\n        final Activity activity = (Activity) context;\n        boolean showWaitForLocationDialog = prefs.getBoolean(\n                IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                IgnitedLocationConstants.SHOW_WAIT_FOR_LOCATION_DIALOG_DEFAULT);\n        if (freshLocation == null && showWaitForLocationDialog) {\n            activity.showDialog(R.id.ign_loc_dialog_wait_for_fix);\n            return;\n        }\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, lng\/acc): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude() + \"\/\" + currentLocation.getAccuracy());\n        boolean keepRequestingLocationUpdates = ((OnIgnitedLocationChangedListener) context)\n                .onIgnitedLocationChanged(currentLocation);\n        Bundle extras = freshLocation.getExtras();\n        if (!keepRequestingLocationUpdates) {\n            disableLocationUpdates(true);\n            PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            return;\n        } else if (requestLocationUpdates\n                && !extras.containsKey(ILastLocationFinder.LAST_LOCATION_TOO_OLD_EXTRA)) {\n            \/\/ If we requested location updates, turn them on here.\n            requestLocationUpdates(context, null);\n        }\n\n        \/\/ If gps is enabled location comes from gps, remove runnable that removes gps updates\n        boolean lastLocation = extras.containsKey(IgnitedLocationConstants.IGNITED_LAST_LOCATION_EXTRA);\n        if (!lastLocation && defaultCriteria.getAccuracy() == Criteria.ACCURACY_FINE\n                && currentLocation.getProvider().equals(LocationManager.GPS_PROVIDER)) {\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n    }\n\n    \/**\n     * Start listening for location updates.\n     *\/\n    protected void requestLocationUpdates(Context context, Criteria criteria) {\n        if (!locationUpdatesDisabled) {\n            return;\n        }\n        Criteria locationUpdateCriteria = criteria;\n        if (criteria == null) {\n            if (isBatteryOk()) {\n                locationUpdateCriteria = defaultCriteria;\n            } else {\n                locationUpdateCriteria = lowPowerCriteria();\n            }\n        }\n        Log.d(LOG_TAG, \"Disabling passive location updates\");\n        locationManager.removeUpdates(locationListenerPassivePendingIntent);\n\n        Log.d(LOG_TAG, \"Requesting location updates\");\n        \/\/ Normal updates while activity is visible.\n        locationUpdateRequester.requestLocationUpdates(locationUpdatesInterval,\n                locationUpdatesDistanceDiff, locationUpdateCriteria, locationListenerPendingIntent);\n\n        \/\/ Register a receiver that listens for when the provider I'm using has\n        \/\/ been disabled.\n        IntentFilter locationProviderDisabledIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_PROVIDER_DISABLED_ACTION);\n        context.registerReceiver(locationProviderDisabledReceiver,\n                locationProviderDisabledIntentFilter);\n\n        IntentFilter refreshLocationUpdatesIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.UPDATE_LOCATION_UPDATES_CRITERIA_ACTION);\n        context.registerReceiver(refreshLocationUpdatesReceiver, refreshLocationUpdatesIntentFilter);\n\n        \/\/ Register a receiver that listens for when a better provider than I'm\n        \/\/ using becomes available.\n        String bestProvider = locationManager.getBestProvider(locationUpdateCriteria, false);\n        String bestAvailableProvider = locationManager.getBestProvider(locationUpdateCriteria, true);\n        if (bestProvider != null && !bestProvider.equals(bestAvailableProvider)) {\n            bestInactiveLocationProviderListener = new IgnitedLocationListener(context);\n            locationManager.requestLocationUpdates(bestProvider, 0, 0,\n                    bestInactiveLocationProviderListener, context.getMainLooper());\n        }\n\n        if (bestAvailableProvider.equals(LocationManager.GPS_PROVIDER)) {\n            Log.d(LOG_TAG, \"Posting delayed remove GPS updates message\");\n            \/\/ Post a runnable that will remove gps updates if no gps location is returned after 1\n            \/\/ minute in order to avoid draining the battery.\n            handler.postDelayed(removeGpsUpdates, prefs.getLong(\n                    IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                    IgnitedLocationConstants.WAIT_FOR_GPS_FIX_INTERVAL_DEFAULT));\n        }\n\n        locationUpdatesDisabled = false;\n    }\n\n    \/**\n     * Stop listening for location updates\n     * \n     * @param enablePassiveLocationUpdates\n     *\/\n    protected void disableLocationUpdates(boolean requestPassiveLocationUpdates) {\n        if (locationUpdatesDisabled) {\n            return;\n        }\n\n        Log.d(LOG_TAG, \"Disabling location updates\");\n        context.unregisterReceiver(locationProviderDisabledReceiver);\n        context.unregisterReceiver(refreshLocationUpdatesReceiver);\n\n        locationUpdateRequester.removeLocationUpdates();\n        if (bestInactiveLocationProviderListener != null) {\n            locationManager.removeUpdates(bestInactiveLocationProviderListener);\n        }\n\n        boolean finishing = ((Activity) context).isFinishing();\n\n        if (requestPassiveLocationUpdates && !finishing) {\n            requestPassiveLocationUpdates();\n        }\n\n        locationUpdatesDisabled = true;\n    }\n\n    private void requestPassiveLocationUpdates() {\n        if (IgnitedDiagnostics.SUPPORTS_FROYO\n                && prefs.getBoolean(\n                        IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                        IgnitedLocationConstants.ENABLE_PASSIVE_LOCATION_UPDATES_DEFAULT)) {\n            Log.d(LOG_TAG, \"Requesting passive location updates\");\n            \/\/ Passive location updates from 3rd party apps when the Activity isn't\n            \/\/ visible. Only for Android 2.2+.\n            locationUpdateRequester.requestPassiveLocationUpdates(passiveLocationUpdatesInterval,\n                    passiveLocationUpdatesDistanceDiff, locationListenerPassivePendingIntent);\n        }\n    }\n\n    public boolean isLocationUpdatesDisabled() {\n        return locationUpdatesDisabled;\n    }\n\n    public Criteria lowPowerCriteria() {\n        if (lowPowerCriteria == null) {\n            lowPowerCriteria = new Criteria();\n            lowPowerCriteria.setPowerRequirement(Criteria.POWER_LOW);\n            lowPowerCriteria.setAccuracy(Criteria.NO_REQUIREMENT);\n        }\n        return lowPowerCriteria;\n    }\n\n    \/**\n     * If the best Location Provider (usually GPS) is not available when we request location\n     * updates, this listener will be notified if \/ when it becomes available. It calls\n     * requestLocationUpdates to re-register the location listeners using the better Location\n     * Provider.\n     *\/\n    private class IgnitedLocationListener implements LocationListener {\n        private Context context;\n\n        public IgnitedLocationListener(Context appContext) {\n            this.context = appContext;\n        }\n\n        @Override\n        public void onLocationChanged(Location l) {\n        }\n\n        @Override\n        public void onProviderDisabled(String provider) {\n        }\n\n        @Override\n        public void onStatusChanged(String provider, int status, Bundle extras) {\n        }\n\n        @Override\n        public void onProviderEnabled(String provider) {\n            \/\/ Re-register the location listeners using the better Location\n            \/\/ Provider.\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, null);\n        }\n    }\n\n}\n","old_contents":"\/*\n * Copyright 2011 Google Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *      http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n * \n * This code has been modified by Stefano Dacchille.\n *\/\n\npackage com.github.ignition.location;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\n\nimport android.app.Activity;\nimport android.app.PendingIntent;\nimport android.content.BroadcastReceiver;\nimport android.content.Context;\nimport android.content.Intent;\nimport android.content.IntentFilter;\nimport android.content.SharedPreferences;\nimport android.content.SharedPreferences.Editor;\nimport android.location.Criteria;\nimport android.location.Location;\nimport android.location.LocationListener;\nimport android.location.LocationManager;\nimport android.os.AsyncTask;\nimport android.os.BatteryManager;\nimport android.os.Bundle;\nimport android.os.Handler;\nimport android.util.Log;\n\nimport com.github.ignition.location.annotations.IgnitedLocation;\nimport com.github.ignition.location.annotations.IgnitedLocationActivity;\nimport com.github.ignition.location.receivers.IgnitedLocationChangedReceiver;\nimport com.github.ignition.location.receivers.IgnitedPassiveLocationChangedReceiver;\nimport com.github.ignition.location.tasks.IgnitedLastKnownLocationAsyncTask;\nimport com.github.ignition.location.templates.ILastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLastLocationFinder;\nimport com.github.ignition.location.templates.IgnitedAbstractLocationUpdateRequester;\nimport com.github.ignition.location.templates.OnIgnitedLocationChangedListener;\nimport com.github.ignition.location.utils.PlatformSpecificImplementationFactory;\nimport com.github.ignition.support.IgnitedDiagnostics;\n\n@SuppressAjWarnings\npublic aspect IgnitedLocationManager {\n    public static final String LOG_TAG = IgnitedLocationManager.class.getSimpleName();\n\n    declare parents : (@IgnitedLocationActivity *) implements OnIgnitedLocationChangedListener;\n\n    private Criteria defaultCriteria, lowPowerCriteria;\n    protected IgnitedAbstractLocationUpdateRequester locationUpdateRequester;\n    protected PendingIntent locationListenerPendingIntent, locationListenerPassivePendingIntent;\n    protected LocationManager locationManager;\n    protected IgnitedLocationListener bestInactiveLocationProviderListener;\n\n    private Context context;\n    private volatile Location currentLocation;\n\n    private AsyncTask<Void, Void, Location> ignitedLastKnownLocationTask;\n    private SharedPreferences prefs;\n    private Handler handler;\n\n    private long locationUpdatesInterval, passiveLocationUpdatesInterval;\n    private int locationUpdatesDistanceDiff;\n    private int passiveLocationUpdatesDistanceDiff;\n    private boolean requestLocationUpdates;\n    private boolean locationUpdatesDisabled = true;\n    \n    \/\/ Switch to another provider if gps doesn't return a location quickly enough.\n    private Runnable removeGpsUpdates = new Runnable() {\n        @Override\n        public void run() {\n            Log.d(LOG_TAG,\n                    \"It looks like GPS isn't available at this time (i.e.: maybe you're indoors). Removing GPS location updates and requesting network updates.\");\n\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, lowPowerCriteria());\n        }\n    };\n\n    \/**\n     * If the Location Provider we're using to receive location updates is disabled while the app is\n     * running, this Receiver will be notified, allowing us to re-register our Location Receivers\n     * using the best available Location Provider is still available.\n     *\/\n    protected BroadcastReceiver locationProviderDisabledReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            boolean providerDisabled = !intent.getBooleanExtra(\n                    LocationManager.KEY_PROVIDER_ENABLED, false);\n            \/\/ Re-register the location listeners using the best available\n            \/\/ Location Provider.\n            if (providerDisabled) {\n                disableLocationUpdates(false);\n                requestLocationUpdates(context, null);\n            }\n        }\n    };\n\n    \/**\n     * If the battery state is low disable the passive location update receiver.\n     *\/\n    protected BroadcastReceiver refreshLocationUpdatesReceiver = new BroadcastReceiver() {\n        @Override\n        public void onReceive(Context context, Intent intent) {\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, lowPowerCriteria());\n        }\n    };\n\n    after(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onCreate(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n\n        \/\/ Get a reference to the Context\n        this.context = context;\n        \/\/ Set pref file\n        prefs = context.getSharedPreferences(IgnitedLocationConstants.SHARED_PREFERENCE_FILE,\n                Context.MODE_PRIVATE);\n        \/\/ Get references to the managers\n        locationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);\n        handler = new Handler();\n\n        \/\/ Specify the Criteria to use when requesting location updates while\n        \/\/ the application is Active\n        if (defaultCriteria == null) {\n            defaultCriteria = new Criteria();\n        }\n        \/\/ Use gps if it's enabled and if battery level is at least 15%\n        boolean useGps = prefs.getBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS,\n                IgnitedLocationConstants.USE_GPS_DEFAULT);\n        if (useGps) {\n            defaultCriteria.setAccuracy(Criteria.ACCURACY_FINE);\n        } else {\n            defaultCriteria.setPowerRequirement(Criteria.POWER_LOW);\n        }\n\n        \/\/ Setup the location update Pending Intent\n        Intent activeIntent = new Intent(IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_ACTION);\n        locationListenerPendingIntent = PendingIntent.getBroadcast(context, 0, activeIntent,\n                PendingIntent.FLAG_UPDATE_CURRENT);\n        \/\/ Setup the passive location update Pending Intent\n        Intent passiveIntent = new Intent(context, IgnitedPassiveLocationChangedReceiver.class);\n        locationListenerPassivePendingIntent = PendingIntent.getBroadcast(context, 0,\n                passiveIntent, PendingIntent.FLAG_UPDATE_CURRENT);\n\n        \/\/ Instantiate a Location Update Requester class based on the available\n        \/\/ platform version. This will be used to request location updates.\n        locationUpdateRequester = PlatformSpecificImplementationFactory\n                .getLocationUpdateRequester(context);\n    }\n\n    private boolean isBatteryOk() {\n        IntentFilter filter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);\n        Intent intent = context.registerReceiver(null, filter);\n        double currentLevel = 100.0;\n        if (intent != null) {\n            currentLevel = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1);\n        }\n\n        return currentLevel >= prefs.getInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                IgnitedLocationConstants.MIN_BATTERY_LEVEL_DEFAULT);\n    }\n\n    before(Context context, IgnitedLocationActivity ignitedAnnotation) : \n        execution(* Activity.onResume(..)) && this(context)\n        && @this(ignitedAnnotation) && within(@IgnitedLocationActivity *) {\n        \/\/ Get a reference to the Context if this context is null\n        if (this.context == null) {\n            this.context = context;\n        }\n\n        saveToPreferences(context, ignitedAnnotation);\n\n        Log.d(LOG_TAG, \"Retrieving last known location...\");\n        \/\/ Get the last known location. This isn't directly affecting the UI, so put it on a\n        \/\/ worker thread.\n        ignitedLastKnownLocationTask = new IgnitedLastKnownLocationAsyncTask(\n                context, locationUpdatesDistanceDiff, locationUpdatesInterval);\n        ignitedLastKnownLocationTask.execute();\n    }\n\n    \/**\n     * Save last settings to preferences.\n     * \n     * @param context\n     * @param locationAnnotation\n     *\/\n    private void saveToPreferences(Context context, IgnitedLocationActivity locationAnnotation) {\n        requestLocationUpdates = locationAnnotation.requestLocationUpdates();\n        locationUpdatesDistanceDiff = locationAnnotation.locationUpdatesDistanceDiff();\n        locationUpdatesInterval = locationAnnotation.locationUpdatesInterval();\n        passiveLocationUpdatesDistanceDiff = locationAnnotation\n                .passiveLocationUpdatesDistanceDiff();\n        passiveLocationUpdatesInterval = locationAnnotation.passiveLocationUpdatesInterval();\n        boolean enablePassiveLocationUpdates = locationAnnotation.enablePassiveUpdates();\n        boolean useGps = locationAnnotation.useGps();\n\n        Editor editor = prefs.edit();\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_LOCATION_UPDATES,\n                requestLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                enablePassiveLocationUpdates);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_USE_GPS, useGps);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_DISTANCE_DIFF,\n                locationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_LOCATION_UPDATES_INTERVAL,\n                locationUpdatesInterval);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_DISTANCE_DIFF,\n                passiveLocationUpdatesDistanceDiff);\n        editor.putLong(IgnitedLocationConstants.SP_KEY_PASSIVE_LOCATION_UPDATES_INTERVAL,\n                passiveLocationUpdatesInterval);\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_RUN_ONCE, true);\n        editor.putInt(IgnitedLocationConstants.SP_KEY_MIN_BATTERY_LEVEL,\n                locationAnnotation.minBatteryLevel());\n        editor.putLong(IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                locationAnnotation.waitForGpsFix());\n        editor.putBoolean(IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                locationAnnotation.showWaitForLocationDialog());\n        editor.commit();\n\n    }\n\n    before(Activity activity, IgnitedLocationActivity ignitedAnnotation) : execution(* Activity.onPause(..)) \n        && @this(ignitedAnnotation) && this(activity)\n        && within(@IgnitedLocationActivity *) && if (ignitedAnnotation.requestLocationUpdates()) {\n\n        disableLocationUpdates(true);\n\n        handler.removeCallbacks(removeGpsUpdates);\n\n        boolean finishing = activity.isFinishing();\n        if (finishing) {\n            if (ignitedLastKnownLocationTask != null && ignitedLastKnownLocationTask.getStatus() != AsyncTask.Status.FINISHED) {\n                ignitedLastKnownLocationTask.cancel(true);\n            } else {\n                PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            }\n\n            context = null;\n        }\n    }\n\n    \/\/ after() : execution(* Activity.onDestroy(..)) && @this(IgnitedLocationActivity)\n    \/\/ && within(@IgnitedLocationActivity *) {\n    \/\/ }\n\n    Location around() : get(@IgnitedLocation Location *) {\n        return currentLocation;\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && within(IgnitedPassiveLocationChangedReceiver) && !adviceexecution() {\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, lng\/acc): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude() + \"\/\" + currentLocation.getAccuracy());\n    }\n\n    void around(Location freshLocation) : set(@IgnitedLocation Location *) && args(freshLocation) \n        && (within(IgnitedLocationChangedReceiver) || within(IgnitedAbstractLastLocationFinder)\n                || within(IgnitedLastKnownLocationAsyncTask)) && !adviceexecution() {\n\n        if (context == null) {\n            return;\n        }\n        final Activity activity = (Activity) context;\n        boolean showWaitForLocationDialog = prefs.getBoolean(\n                IgnitedLocationConstants.SP_KEY_SHOW_WAIT_FOR_LOCATION_DIALOG,\n                IgnitedLocationConstants.SHOW_WAIT_FOR_LOCATION_DIALOG_DEFAULT);\n        if (freshLocation == null && showWaitForLocationDialog) {\n            activity.showDialog(R.id.ign_loc_dialog_wait_for_fix);\n            return;\n        }\n\n        currentLocation = freshLocation;\n        Log.d(LOG_TAG, \"New location from \" + currentLocation.getProvider() + \" (lat, lng\/acc): \"\n                + currentLocation.getLatitude() + \", \" + currentLocation.getLongitude() + \"\/\" + currentLocation.getAccuracy());\n        boolean keepRequestingLocationUpdates = ((OnIgnitedLocationChangedListener) context)\n                .onIgnitedLocationChanged(currentLocation);\n        Bundle extras = freshLocation.getExtras();\n        if (!keepRequestingLocationUpdates) {\n            disableLocationUpdates(true);\n            PlatformSpecificImplementationFactory.getLastLocationFinder(context).cancel();\n            return;\n        } else if (requestLocationUpdates\n                && !extras.containsKey(ILastLocationFinder.LAST_LOCATION_TOO_OLD_EXTRA)) {\n            \/\/ If we requested location updates, turn them on here.\n            requestLocationUpdates(context, null);\n        }\n\n        \/\/ If gps is enabled location comes from gps, remove runnable that removes gps updates\n        boolean lastLocation = extras.containsKey(IgnitedLocationConstants.IGNITED_LAST_LOCATION_EXTRA);\n        if (!lastLocation && defaultCriteria.getAccuracy() == Criteria.ACCURACY_FINE\n                && currentLocation.getProvider().equals(LocationManager.GPS_PROVIDER)) {\n            handler.removeCallbacks(removeGpsUpdates);\n        }\n    }\n\n    \/**\n     * Start listening for location updates.\n     *\/\n    protected void requestLocationUpdates(Context context, Criteria criteria) {\n        if (!locationUpdatesDisabled) {\n            return;\n        }\n        Criteria locationUpdateCriteria = criteria;\n        if (criteria == null) {\n            if (isBatteryOk()) {\n                locationUpdateCriteria = defaultCriteria;\n            } else {\n                locationUpdateCriteria = lowPowerCriteria();\n            }\n        }\n        Log.d(LOG_TAG, \"Disabling passive location updates\");\n        locationManager.removeUpdates(locationListenerPassivePendingIntent);\n\n        Log.d(LOG_TAG, \"Requesting location updates\");\n        \/\/ Normal updates while activity is visible.\n        locationUpdateRequester.requestLocationUpdates(locationUpdatesInterval,\n                locationUpdatesDistanceDiff, locationUpdateCriteria, locationListenerPendingIntent);\n\n        \/\/ Register a receiver that listens for when the provider I'm using has\n        \/\/ been disabled.\n        IntentFilter locationProviderDisabledIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.ACTIVE_LOCATION_UPDATE_PROVIDER_DISABLED_ACTION);\n        context.registerReceiver(locationProviderDisabledReceiver,\n                locationProviderDisabledIntentFilter);\n\n        IntentFilter refreshLocationUpdatesIntentFilter = new IntentFilter(\n                IgnitedLocationConstants.UPDATE_LOCATION_UPDATES_CRITERIA_ACTION);\n        context.registerReceiver(refreshLocationUpdatesReceiver, refreshLocationUpdatesIntentFilter);\n\n        \/\/ Register a receiver that listens for when a better provider than I'm\n        \/\/ using becomes available.\n        String bestProvider = locationManager.getBestProvider(locationUpdateCriteria, false);\n        String bestAvailableProvider = locationManager.getBestProvider(locationUpdateCriteria, true);\n        if (bestProvider != null && !bestProvider.equals(bestAvailableProvider)) {\n            bestInactiveLocationProviderListener = new IgnitedLocationListener(context);\n            locationManager.requestLocationUpdates(bestProvider, 0, 0,\n                    bestInactiveLocationProviderListener, context.getMainLooper());\n        }\n\n        if (bestAvailableProvider.equals(LocationManager.GPS_PROVIDER)) {\n            Log.d(LOG_TAG, \"Posting delayed remove GPS updates message\");\n            \/\/ Post a runnable that will remove gps updates if no gps location is returned after 1\n            \/\/ minute in order to avoid draining the battery.\n            handler.postDelayed(removeGpsUpdates, prefs.getLong(\n                    IgnitedLocationConstants.SP_KEY_WAIT_FOR_GPS_FIX_INTERVAL,\n                    IgnitedLocationConstants.WAIT_FOR_GPS_FIX_INTERVAL_DEFAULT));\n        }\n\n        locationUpdatesDisabled = false;\n    }\n\n    \/**\n     * Stop listening for location updates\n     * \n     * @param enablePassiveLocationUpdates\n     *\/\n    protected void disableLocationUpdates(boolean requestPassiveLocationUpdates) {\n        if (locationUpdatesDisabled) {\n            return;\n        }\n\n        Log.d(LOG_TAG, \"Disabling location updates\");\n        context.unregisterReceiver(locationProviderDisabledReceiver);\n        context.unregisterReceiver(refreshLocationUpdatesReceiver);\n\n        locationUpdateRequester.removeLocationUpdates();\n        if (bestInactiveLocationProviderListener != null) {\n            locationManager.removeUpdates(bestInactiveLocationProviderListener);\n        }\n\n        boolean finishing = ((Activity) context).isFinishing();\n\n        if (requestPassiveLocationUpdates && !finishing) {\n            requestPassiveLocationUpdates();\n        }\n\n        locationUpdatesDisabled = true;\n    }\n\n    private void requestPassiveLocationUpdates() {\n        if (IgnitedDiagnostics.SUPPORTS_FROYO\n                && prefs.getBoolean(\n                        IgnitedLocationConstants.SP_KEY_ENABLE_PASSIVE_LOCATION_UPDATES,\n                        IgnitedLocationConstants.ENABLE_PASSIVE_LOCATION_UPDATES_DEFAULT)) {\n            Log.d(LOG_TAG, \"Requesting passive location updates\");\n            \/\/ Passive location updates from 3rd party apps when the Activity isn't\n            \/\/ visible. Only for Android 2.2+.\n            locationUpdateRequester.requestPassiveLocationUpdates(passiveLocationUpdatesInterval,\n                    passiveLocationUpdatesDistanceDiff, locationListenerPassivePendingIntent);\n        }\n    }\n\n    public boolean isLocationUpdatesDisabled() {\n        return locationUpdatesDisabled;\n    }\n\n    public Criteria lowPowerCriteria() {\n        if (lowPowerCriteria == null) {\n            lowPowerCriteria = new Criteria();\n            lowPowerCriteria.setPowerRequirement(Criteria.POWER_LOW);\n            lowPowerCriteria.setAccuracy(Criteria.NO_REQUIREMENT);\n        }\n        return lowPowerCriteria;\n    }\n\n    \/**\n     * If the best Location Provider (usually GPS) is not available when we request location\n     * updates, this listener will be notified if \/ when it becomes available. It calls\n     * requestLocationUpdates to re-register the location listeners using the better Location\n     * Provider.\n     *\/\n    private class IgnitedLocationListener implements LocationListener {\n        private Context context;\n\n        public IgnitedLocationListener(Context appContext) {\n            this.context = appContext;\n        }\n\n        @Override\n        public void onLocationChanged(Location l) {\n        }\n\n        @Override\n        public void onProviderDisabled(String provider) {\n        }\n\n        @Override\n        public void onStatusChanged(String provider, int status, Bundle extras) {\n        }\n\n        @Override\n        public void onProviderEnabled(String provider) {\n            \/\/ Re-register the location listeners using the better Location\n            \/\/ Provider.\n            disableLocationUpdates(false);\n            requestLocationUpdates(context, null);\n        }\n    }\n\n}\n","returncode":0,"stderr":"","license":"apache-2.0","lang":"AspectJ"}
{"commit":"17cc36416dec022aa0f8b3a1dadd9682b682f305","subject":"added AbstractPalavaAspect to allow createInjector interception","message":"added AbstractPalavaAspect to allow createInjector interception\n","repos":"palava\/palava-core,palava\/palava-core","old_file":"src\/main\/java\/de\/cosmocode\/palava\/core\/aop\/AbstractPalavaAspect.aj","new_file":"src\/main\/java\/de\/cosmocode\/palava\/core\/aop\/AbstractPalavaAspect.aj","new_contents":"package de.cosmocode.palava.core.aop;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Guice;\nimport com.google.inject.Injector;\n\npublic abstract aspect AbstractPalavaAspect {\n\n    private static final Logger LOG = LoggerFactory.getLogger(AbstractPalavaAspect.class);\n    \n    private boolean alreadyInjected = false;\n    \n    pointcut createInjector(): call(Injector Guice.createInjector(..));\n    \n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    after() returning (Injector injector): createInjector() {\n        LOG.trace(\"Injecting members on {}\", this);\n        Preconditions.checkState(!alreadyInjected, \"Members have been already injected on {}\", this);\n        injector.injectMembers(this);\n    }\n\n}\n","old_contents":"","returncode":1,"stderr":"error: pathspec 'src\/main\/java\/de\/cosmocode\/palava\/core\/aop\/AbstractPalavaAspect.aj' did not match any file(s) known to git\n","license":"apache-2.0","lang":"AspectJ"}
{"commit":"fad630727a306c15866adf9527cd5cddfd8908a3","subject":"renamed TransactionAspect to EntityTransactionAspect","message":"renamed TransactionAspect to EntityTransactionAspect\n","repos":"palava\/palava-jpa-aspectj","old_file":"src\/main\/java\/de\/cosmocode\/palava\/jpa\/aspectj\/EntityTransactionAspect.aj","new_file":"src\/main\/java\/de\/cosmocode\/palava\/jpa\/aspectj\/EntityTransactionAspect.aj","new_contents":"\/**\n * palava - a java-php-bridge\n * Copyright (C) 2007-2010  CosmoCode GmbH\n *\n * This program is free software; you can redistribute it and\/or\n * modify it under the terms of the GNU General Public License\n * as published by the Free Software Foundation; either version 2\n * of the License, or (at your option) any later version.\n *\n * This program is distributed in the hope that it will be useful,\n * but WITHOUT ANY WARRANTY; without even the implied warranty of\n * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n * GNU General Public License for more details.\n *\n * You should have received a copy of the GNU General Public License\n * along with this program; if not, write to the Free Software\n * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.\n *\/\n\npackage de.cosmocode.palava.jpa.aspectj;\n\nimport javax.persistence.EntityManager;\nimport javax.persistence.EntityTransaction;\nimport javax.persistence.PersistenceException;\n\nimport org.aspectj.lang.annotation.SuppressAjWarnings;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\nimport com.google.common.base.Preconditions;\nimport com.google.inject.Inject;\nimport com.google.inject.Provider;\n\nimport de.cosmocode.palava.core.aop.AbstractPalavaAspect;\nimport de.cosmocode.palava.jpa.Transactional;\n\npublic final aspect EntityTransactionAspect extends AbstractPalavaAspect issingleton() {\n\n    private static final Logger LOG = LoggerFactory.getLogger(EntityTransactionAspect.class);\n\n    private Provider<EntityManager> currentManager;\n    \n    @Inject\n    public void setProvider(Provider<EntityManager> manager) {\n        this.currentManager = Preconditions.checkNotNull(manager, \"Manager\");\n    }\n    \n    pointcut transactional(): execution(@Transactional * *.*(..));\n\n    @SuppressAjWarnings(\"adviceDidNotMatch\")\n    Object around(): transactional() {\n        final EntityManager manager = currentManager.get();\n        LOG.trace(\"Retrieved entitymanager {}\", manager);\n        final EntityTransaction tx = manager.getTransaction();\n        LOG.trace(\"Using transaction {}\", tx);\n        final boolean localTx = !tx.isActive();\n        \n        if (localTx) {\n            LOG.trace(\"Beginning automatic transaction\");\n            tx.begin();\n        } else {\n            LOG.trace(\"Transaction already active\");\n        }\n        \n        final Object returnValue;\n        \n        try {\n            returnValue = proceed();\n        } catch (RuntimeException e) {\n            LOG.error(\"Exception inside automatic transaction context\", e);\n            tx.rollback();\n            throw e;\n        }\n        \n        try {\n            if (localTx && tx.isActive()) {\n                tx.commit();\n                LOG.trace(\"Committed automatic transaction\");\n            }\n            return returnValue;\n        } catch (PersistenceException e) {\n            LOG.error(\"Commit in automatic transaction context failed\", e);\n            tx.rollback();\n            throw e;\n        }\n    }\n    \n}\n","old_contents":"","returncode":1,"stderr":"error: pathspec 'src\/main\/java\/de\/cosmocode\/palava\/jpa\/aspectj\/EntityTransactionAspect.aj' did not match any file(s) known to git\n","license":"apache-2.0","lang":"AspectJ"}
{"commit":"5afa2a2b59740f988f5c8f5fe816d0ef976615ca","subject":"Temporarily get the new AST to implement the old interface.","message":"Temporarily get the new AST to implement the old interface.\n","repos":"felixvf\/mirah,felixvf\/mirah,mirah\/mirah,mirah\/mirah-parser,uujava\/mirah-parser,mirah\/mirah,felixvf\/mirah-parser,felixvf\/mirah,uujava\/mirah-parser,uujava\/mirah-parser,mirah\/mirah-parser,felixvf\/mirah,felixvf\/mirah-parser,mirah\/mirah-parser,mirah\/mirah,mirah\/mirah,felixvf\/mirah-parser","old_file":"src\/DubyBootstrap.aj","new_file":"src\/DubyBootstrap.aj","new_contents":"import java.util.ArrayList;\nimport java.util.List;\nimport mirah.lang.ast.Node;\nimport mirah.lang.ast.NodeScanner;\nimport mirah.lang.ast.NodeImpl;\n\n\nclass ChildCollector extends NodeScanner {\n  private ArrayList<Node> children = new ArrayList<Node>();\n\n  @Override\n  public boolean enterDefault(Node node, Object arg) {\n    if (node == arg) {\n      return true;\n    } else {\n      children.add(node);\n      return false;\n    }\n  }\n\n  @Override\n  public Object enterNullChild(Object arg){\n    children.add(null);\n    return null;\n  }\n\n  public ArrayList<Node> children() {\n    return children;\n  }\n}\n\naspect DubyBootsrap {\n  declare parents: Node extends duby.lang.compiler.Node;\n\n  public List<Node> NodeImpl.child_nodes() {\n    ChildCollector c = new ChildCollector();\n    c.scan(this, this);\n    return c.children();\n  }\n}","old_contents":"","returncode":1,"stderr":"error: pathspec 'src\/DubyBootstrap.aj' did not match any file(s) known to git\n","license":"apache-2.0","lang":"AspectJ"}
{"commit":"ae2dcee7483c94e6a1f939b46a637cbb58ab13eb","subject":"disable Aspectj by default","message":"disable Aspectj by default\n","repos":"openvraas\/openvraas-undertow","old_file":"src\/main\/aspect\/com\/openvraas\/aop\/undertow\/HostThreadDataConnectionsAspect.aj","new_file":"src\/main\/aspect\/com\/openvraas\/aop\/undertow\/HostThreadDataConnectionsAspect.aj","new_contents":"","old_contents":"","returncode":128,"stderr":"remote: Support for password authentication was removed on August 13, 2021.\nremote: Please see https:\/\/docs.github.com\/en\/get-started\/getting-started-with-git\/about-remote-repositories#cloning-with-https-urls for information on currently recommended modes of authentication.\nfatal: Authentication failed for 'https:\/\/github.com\/openvraas\/openvraas-undertow.git\/'\n","license":"apache-2.0","lang":"AspectJ"}
{"commit":"61b85dba6face90e466cc2d7ec84db2720f5d1b2","subject":"Request tracing aspect v0","message":"Request tracing aspect v0\n","repos":"ties\/winstone","old_file":"winstone\/src\/main\/aspectj\/TraceRequestFlow.aj","new_file":"winstone\/src\/main\/aspectj\/TraceRequestFlow.aj","new_contents":"\/**\n * Created with IntelliJ IDEA.\n * User: kockt\n * Date: 13-01-13\n * Time: 17:09\n * To change this template use File | Settings | File Templates.\n *\/\npublic aspect TraceRequestFlow {\n\n    pointcut was_called(Object o):\n            target(o) && call(* *(..)) && within(net.winstone);\n\n    before() calling: was_called(o) {\n        System.out.println(o);\n    }\n\n}\n","old_contents":"","returncode":1,"stderr":"error: pathspec 'winstone\/src\/main\/aspectj\/TraceRequestFlow.aj' did not match any file(s) known to git\n","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"4ac6d0ac28ddd750d5b85b6ca1e3d613e1825046","subject":"Interceptor","message":"Interceptor","repos":"rashmishrm\/cmpe202-UMLParser,rashmishrm\/cmpe202-UMLParser","old_file":"UMLGenerator\/src\/main\/java\/com\/sjsu\/umlgenerator\/aspect\/MethodInterceptor.aj","new_file":"UMLGenerator\/src\/main\/java\/com\/sjsu\/umlgenerator\/aspect\/MethodInterceptor.aj","new_contents":"\n\npublic aspect MethodInterceptor {\n\n\t\/\/pointcut traced() : !within(MethodInterceptor) && execution(public * *.*(..)) ;\n\tpointcut traced() : !within(MethodInterceptor) && execution(* *.*(..)) ;\n\n\tbefore() : traced() {\n\t\tprint(\"Executing\", thisJoinPoint);\n\t}\n\n\t\n\n\tprivate void print(String prefix, Object message) {\n\n\t\tSystem.out.println(prefix + \": \" + message);\n\t}\n}","old_contents":"","returncode":1,"stderr":"error: pathspec 'UMLGenerator\/src\/main\/java\/com\/sjsu\/umlgenerator\/aspect\/MethodInterceptor.aj' did not match any file(s) known to git\n","license":"agpl-3.0","lang":"AspectJ"}
{"commit":"7c2abfa22bfcba63047debbe401365c770848311","subject":"budget and quota chnages","message":"budget and quota chnages\n","repos":"MCPTech\/mycp,MCPTech\/mycp","old_file":"src\/main\/java\/in\/mycp\/domain\/Company_Roo_JavaBean.aj","new_file":"src\/main\/java\/in\/mycp\/domain\/Company_Roo_JavaBean.aj","new_contents":"\/\/ WARNING: DO NOT EDIT THIS FILE. THIS FILE IS MANAGED BY SPRING ROO.\n\/\/ You may push code into the target .java compilation unit if you wish to edit any member(s).\n\npackage in.mycp.domain;\n\nimport in.mycp.domain.Company;\n\nprivileged aspect Company_Roo_JavaBean {\n    \n    public Integer Company.getQuota() {\n        return this.quota;\n    }\n    \n    public void Company.setQuota(Integer quota) {\n        this.quota = quota;\n    }\n    \n    public Integer Company.getMinBal() {\n        return this.minBal;\n    }\n    \n    public void Company.setMinBal(Integer minBal) {\n        this.minBal = minBal;\n    }\n    \n}\n","old_contents":"","returncode":1,"stderr":"error: pathspec 'src\/main\/java\/in\/mycp\/domain\/Company_Roo_JavaBean.aj' did not match any file(s) known to git\n","license":"agpl-3.0","lang":"AspectJ"}
{"commit":"40625df417032c8d0967238e059309f8524e49b4","subject":"\u6dfb\u52a0debug\u65f6\u53ef\u4ee5\u901a\u8fc7\u7ee7\u627f\u6765\u4f7f\u7528\u7684AbstractTrace.aj","message":"\u6dfb\u52a0debug\u65f6\u53ef\u4ee5\u901a\u8fc7\u7ee7\u627f\u6765\u4f7f\u7528\u7684AbstractTrace.aj\n\n\u65b0\u589e debug\u65f6\uff0c\u7528\u4e8e\u8ddf\u8e2a\u5f53\u524d\u6267\u884c\u4f4d\u7f6e\u7684AbstractTrace.aj\n     \u4f7f\u7528\u793a\u4f8b\uff1a\n\/\/ File\uff1aapp\/src\/debug\/java\/tracing\/lib\/TraceMyClasses.aj\npackage tracing.lib;\n\naspect TraceMyClasses extends AbstractTrace {\n        pointcut classes(): within(com.optimalorange.cooltechnologies.ui..*);\n        pointcut constructors(): execution(new(..));\n        pointcut methods(): execution(!abstract * *(..));\n}\n","repos":"Bai-Jie\/CoolTechnologies,Bai-Jie\/CoolTechnologies,OptimalOrange\/CoolTechnologies,OptimalOrange\/CoolTechnologies","old_file":"app\/src\/debug\/java\/tracing\/lib\/AbstractTrace.aj","new_file":"app\/src\/debug\/java\/tracing\/lib\/AbstractTrace.aj","new_contents":"\/*\n\nCopyright (c) Xerox Corporation 1998-2002.  All rights reserved.\n\nUse and copying of this software and preparation of derivative works based\nupon this software are permitted.  Any distribution of this software or\nderivative works must comply with all applicable United States export control\nlaws.\n\nThis software is made available AS IS, and Xerox Corporation makes no warranty\nabout the software, its performance or its conformity to any specification.\n\n|<---            this code is formatted to fit into 80 columns             --->|\n|<---            this code is formatted to fit into 80 columns             --->|\n|<---            this code is formatted to fit into 80 columns             --->|\n\n*\/\n\npackage tracing.lib;\n\nimport org.aspectj.lang.JoinPoint;\n\nimport java.io.PrintStream;\n\n\n\/**\n * This class provides support for printing trace messages into a stream.\n * The trace messages consist of the class name, method name (if method)\n * and the list of parameter types.<P>\n * The class is thread-safe. Different threads may use different output streams\n * by simply calling the method initStream(myStream).<P>\n * This class should be extended.\n * It defines 3 abstract crosscuts for injecting the tracing functionality\n * into any constructors and methods of any application classes.<P>\n *\n * One example of using this class might be\n * <PRE>\n * import tracing.lib.AbstractTrace;\n * aspect TraceMyClasses extends AbstractTrace of eachJVM() {\n *   pointcut classes(): within(TwoDShape) || within(Circle) || within(Square);\n *   pointcut constructors(): execution(new(..));\n *   pointcut methods(): execution(!abstract * *(..));\n * }\n * <\/PRE>\n * (Make sure ...\/aspectj\/examples is in your classpath)\n *\/\npublic abstract aspect AbstractTrace {\n\n    \/**\n     * Application classes - left unspecified.\n     * Subclasses should concretize this crosscut with class names.\n     *\/\n    abstract pointcut classes();\n    \/**\n     * Constructors - left unspecified.\n     * Subclasses should concretize this crosscut with constructors.\n     *\/\n    abstract pointcut constructors();\n    \/**\n     * Methods - left unspecified.\n     * Subclasses should concretize this crosscut with method names.\n     *\/\n    abstract pointcut methods();\n\n    before(): classes() && constructors() {\n        doTraceEntry(thisJoinPoint, true);\n    }\n    after(): classes() && constructors() {\n        doTraceExit(thisJoinPoint, true);\n    }\n\n    before(): classes() && methods() {\n        doTraceEntry(thisJoinPoint, false);\n    }\n    after(): classes() && methods() {\n        doTraceExit(thisJoinPoint, false);\n    }\n\n    \/*\n     * From here on, it's an ordinary class implementation.\n     * The static state is thread-safe by using ThreadLocal variables.\n     *\/\n\n    \/**\n     * This method initializes this thread's trace output stream.\n     * By default, the output stream is System.err, and it is the same for\n     * all threads. In multithreaded applications, you may want to define\n     * different output streams for the different threads. For doing it,\n     * simply call this method in the beginning of each thread's main loop,\n     * giving it different output streams.\n     *\/\n    public void initStream(PrintStream _stream) {\n        setStream(_stream);\n    }\n\n\n    private ThreadLocal stream = new ThreadLocal() {\n        protected Object initialValue() {\n            return System.err;\n        }\n    };\n\n    private ThreadLocal callDepth = new ThreadLocal() {\n        protected Object initialValue() {\n            return new Integer(0);\n        }\n    };\n\n    private PrintStream getStream() {\n        return (PrintStream) stream.get();\n    }\n\n    private void setStream(PrintStream s) {\n        stream.set(s);\n    }\n\n    private int getCallDepth() {\n        return ((Integer) (callDepth.get())).intValue();\n    }\n\n    private void setCallDepth(int n) {\n        callDepth.set(new Integer(n));\n    }\n\n    private void doTraceEntry(JoinPoint jp, boolean isConstructor) {\n        setCallDepth(getCallDepth() + 1);\n        printEntering(jp, isConstructor);\n    }\n\n    private void doTraceExit(JoinPoint jp, boolean isConstructor) {\n        printExiting(jp, isConstructor);\n        setCallDepth(getCallDepth() - 1);\n    }\n\n    private void printEntering(JoinPoint jp, boolean isConstructor) {\n        printIndent();\n        getStream().print(\"--> \");\n        getStream().print(jp);\n        \/\/        printParameterTypes(jp);\n        getStream().println();\n    }\n\n    private void printExiting(JoinPoint jp, boolean isConstructor) {\n        printIndent();\n        getStream().print(\"<--  \");\n        getStream().print(jp);\n        \/\/        printParameterTypes(jp);\n        getStream().println();\n    }\n\n\/\/      private void printParameterTypes(JoinPoint jp) {\n\/\/          Class[]  ptypes = jp.parameterTypes;\n\n\/\/          getStream().print(\"(\");\n\/\/          for (int i = 0; i < ptypes.length; i++) {\n\/\/              getStream().print(ptypes[i].getName());\n\/\/              if (i < ptypes.length - 1) getStream().print(\", \");\n\/\/          }\n\/\/          getStream().print(\")\");\n\/\/      }\n\n    private void printIndent() {\n        for (int i = 0; i < getCallDepth(); i++) {\n            getStream().print(\" \");\n        }\n    }\n\n    \/**\n     * This method is not being used.\n     * It's being included solely for illustrating how to access and use\n     * the information in JoinPoint.\n     * If you want, you can replace the calls to printParameterTypes (above)\n     * by calls to this method.\n     *\/\n\/\/      private void printParameters(JoinPoint jp) {\n\/\/          Class[]  ptypes = jp.parameterTypes;\n\/\/          String[] pnames = jp.parameterNames;\n\/\/          Object[] params = jp.parameters;\n\n\/\/          getStream().print(\"(\");\n\/\/          for (int i = 0; i < ptypes.length; i++) {\n\/\/              getStream().print(ptypes[i].getName() + \" \" +\n\/\/                                pnames[i]           + \"=\" +\n\/\/                                params[i]);\n\/\/              if (i < ptypes.length - 1) getStream().print(\", \");\n\/\/          }\n\/\/          getStream().print(\")\");\n\/\/      }\n\n}\n\n","old_contents":"","returncode":1,"stderr":"error: pathspec 'app\/src\/debug\/java\/tracing\/lib\/AbstractTrace.aj' did not match any file(s) known to git\n","license":"apache-2.0","lang":"AspectJ"}
{"commit":"07926ba3c2bfab5d345c027a25b857e4e36d9c40","subject":"Fixed null-pointer bug in DetectSwingSingleThreadRuleViolations.","message":"Fixed null-pointer bug in DetectSwingSingleThreadRuleViolations.\n\n","repos":"obraliar\/jabref,obraliar\/jabref,tobiasdiez\/jabref,tobiasdiez\/jabref,oscargus\/jabref,grimes2\/jabref,mredaelli\/jabref,motokito\/jabref,Mr-DLib\/jabref,mairdl\/jabref,jhshinn\/jabref,shitikanth\/jabref,grimes2\/jabref,grimes2\/jabref,shitikanth\/jabref,jhshinn\/jabref,Mr-DLib\/jabref,mairdl\/jabref,Siedlerchr\/jabref,ayanai1\/jabref,Siedlerchr\/jabref,tschechlovdev\/jabref,Siedlerchr\/jabref,mredaelli\/jabref,tschechlovdev\/jabref,Mr-DLib\/jabref,sauliusg\/jabref,obraliar\/jabref,tschechlovdev\/jabref,oscargus\/jabref,tschechlovdev\/jabref,obraliar\/jabref,motokito\/jabref,grimes2\/jabref,oscargus\/jabref,Braunch\/jabref,ayanai1\/jabref,bartsch-dev\/jabref,mairdl\/jabref,ayanai1\/jabref,bartsch-dev\/jabref,shitikanth\/jabref,bartsch-dev\/jabref,zellerdev\/jabref,mairdl\/jabref,Mr-DLib\/jabref,JabRef\/jabref,sauliusg\/jabref,tobiasdiez\/jabref,ayanai1\/jabref,tschechlovdev\/jabref,JabRef\/jabref,motokito\/jabref,mredaelli\/jabref,Mr-DLib\/jabref,zellerdev\/jabref,motokito\/jabref,motokito\/jabref,mairdl\/jabref,ayanai1\/jabref,jhshinn\/jabref,shitikanth\/jabref,tobiasdiez\/jabref,Braunch\/jabref,mredaelli\/jabref,oscargus\/jabref,jhshinn\/jabref,sauliusg\/jabref,zellerdev\/jabref,Siedlerchr\/jabref,Braunch\/jabref,JabRef\/jabref,mredaelli\/jabref,zellerdev\/jabref,jhshinn\/jabref,obraliar\/jabref,Braunch\/jabref,Braunch\/jabref,bartsch-dev\/jabref,shitikanth\/jabref,grimes2\/jabref,sauliusg\/jabref,bartsch-dev\/jabref,oscargus\/jabref,JabRef\/jabref,zellerdev\/jabref","old_file":"src\/java\/net\/sf\/jabref\/aspects\/violations\/DetectSwingSingleThreadRuleViolations.aj","new_file":"src\/java\/net\/sf\/jabref\/aspects\/violations\/DetectSwingSingleThreadRuleViolations.aj","new_contents":"\/*\n * Package package net.sf.jabref.aspects.violations;\n * Created on Nov 6, 2004\n * Author mspiegel\n *\n *\/\npackage net.sf.jabref.aspects.violations;\n\nimport java.awt.Component;\nimport java.awt.EventQueue;\n\npublic aspect DetectSwingSingleThreadRuleViolations {\n\n\tpointcut guiUpdates(Component component)\n\t\t:\tcall(* java..Component+.*(..)) && \n\t\t    !call(* net..jabref+.*(..)) && target(component);\t\t\t\n    \n\tpointcut safeGuiCalls()\n\t\t: call (* javax..JComponent.repaint(..))\n\t\t\t|| call(* javax..JComponent.revalidate(..))\n\t\t    || call(* javax..JComponent.invalidate(..))\n\t\t    || call(* javax..*.add*Listener(..))\n\t\t    || call(* javax..*.remove*Listener(..));\n\t\t        \n\tpointcut unsafeGuiCalls(Component component)\n\t\t: guiUpdates(component) && !safeGuiCalls();\n    \n    before(Component component) : unsafeGuiCalls(component) \n    \t&& if (!EventQueue.isDispatchThread() && (component != null) &&\n    \t        \tcomponent.isDisplayable() && !Thread.currentThread().getName().equals(\"main\")) {\n            System.err.println(\t\n                    \"Violation: Swing component method called from nonAWT thread\"\n                    + \"\\nCalled method: \" + thisJoinPointStaticPart.getSignature()\n                    + \"\\nCaller:\" + thisEnclosingJoinPointStaticPart.getSignature()\n                    + \"\\nSource Location:\" + thisJoinPointStaticPart.getSourceLocation()\n                    + \"\\nThread:\" + Thread.currentThread() \n                    + \"\\nChange code to use EventQueue.invokeLater() or EventQueue.invokeAndWait()\"\n                    + \"\\n\");\n    \t}\n    \n}\n","old_contents":"\/*\n * Package package net.sf.jabref.aspects.violations;\n * Created on Nov 6, 2004\n * Author mspiegel\n *\n *\/\npackage net.sf.jabref.aspects.violations;\n\nimport java.awt.Component;\nimport java.awt.EventQueue;\n\npublic aspect DetectSwingSingleThreadRuleViolations {\n\n\tpointcut guiUpdates(Component component)\n\t\t:\tcall(* java..Component+.*(..)) && \n\t\t    !call(* net..jabref+.*(..)) && target(component);\t\t\t\n    \n\tpointcut safeGuiCalls()\n\t\t: call (* javax..JComponent.repaint(..))\n\t\t\t|| call(* javax..JComponent.revalidate(..))\n\t\t    || call(* javax..JComponent.invalidate(..))\n\t\t    || call(* javax..*.add*Listener(..))\n\t\t    || call(* javax..*.remove*Listener(..));\n\t\t        \n\tpointcut unsafeGuiCalls(Component component)\n\t\t: guiUpdates(component) && !safeGuiCalls();\n    \n    before(Component component) : unsafeGuiCalls(component) \n    \t&& if (!EventQueue.isDispatchThread() && component.isDisplayable() &&\n    \t        \t!Thread.currentThread().getName().equals(\"main\")) {\n            System.err.println(\t\n                    \"Violation: Swing component method called from nonAWT thread\"\n                    + \"\\nCalled method: \" + thisJoinPointStaticPart.getSignature()\n                    + \"\\nCaller:\" + thisEnclosingJoinPointStaticPart.getSignature()\n                    + \"\\nSource Location:\" + thisJoinPointStaticPart.getSourceLocation()\n                    + \"\\nThread:\" + Thread.currentThread() \n                    + \"\\nChange code to use EventQueue.invokeLater() or EventQueue.invokeAndWait()\"\n                    + \"\\n\");\n    \t}\n    \n}\n","returncode":0,"stderr":"","license":"mit","lang":"AspectJ"}
{"commit":"7a7db633fef1a72f505662ac5e694fe1ef15d84b","subject":"+ aspect for injector","message":"+ aspect for injector","repos":"agentlab\/ru.agentlab.maia","old_file":"aspects\/ru.agentlab.maia.context.logs\/aj-src\/ru\/agentlab\/maia\/context\/logs\/AInjectorLogs.aj","new_file":"aspects\/ru.agentlab.maia.context.logs\/aj-src\/ru\/agentlab\/maia\/context\/logs\/AInjectorLogs.aj","new_contents":"package ru.agentlab.maia.context.logs;\n\npublic aspect AInjectorLogs {\n\n\/\/\tbefore(IMaiaContextFactory factory) : \n\/\/\t\tonCreateContext(factory) {\n\/\/\t\tLogger logger = LoggerFactory.getLogger(factory.getClass());\n\/\/\t\tlogger.info(\"Try to create context...\");\n\/\/\t}\n\/\/\n\/\/\tafter(IMaiaContextFactory factory) returning (IMaiaContext result): \n\/\/\t\tonCreateContext(factory) {\n\/\/\t\tLogger logger = LoggerFactory.getLogger(factory.getClass());\n\/\/\t\tlogger.info(\"Context [\" + result.getUuid() + \"] successfully created\");\n\/\/\t}\n}","old_contents":"","returncode":1,"stderr":"error: pathspec 'aspects\/ru.agentlab.maia.context.logs\/aj-src\/ru\/agentlab\/maia\/context\/logs\/AInjectorLogs.aj' did not match any file(s) known to git\n","license":"lgpl-2.1","lang":"AspectJ"}
{"commit":"879dbd0360f118e3edf47e0fa3ce0ae6282bcfee","subject":"Instrumentation added for property Java 4-3 (JavaMOP)","message":"Instrumentation added for property Java 4-3 (JavaMOP)","repos":"selig\/qea","old_file":"code\/qea\/src\/benchmark\/competition\/java\/javaMOP\/JavaMOPThreeAspect.aj","new_file":"code\/qea\/src\/benchmark\/competition\/java\/javaMOP\/JavaMOPThreeAspect.aj","new_contents":"package benchmark.competition.java.javaMOP;\n\nimport monitoring.impl.MonitorFactory;\nimport monitoring.intf.Monitor;\nimport properties.Property;\nimport properties.competition.JavaMOP;\nimport structure.impl.other.Verdict;\nimport structure.intf.QEA;\n\npublic aspect JavaMOPThreeAspect {\n\n\tprivate final Monitor monitor;\n\n\tprivate final int A = 1;\n\tprivate final int B = 2;\n\tprivate final int C = 3;\n\n\tpublic JavaMOPThreeAspect() {\n\t\tQEA qea = new JavaMOP().make(Property.JAVAMOP_THREE);\n\t\tmonitor = MonitorFactory.create(qea);\n\t}\n\t\n\tpointcut A() : call(void CThread2.A());\n\t\n\tpointcut B() : call(void CThread2.B());\n\t\n\tpointcut C() : call(void CThread2.C());\n\t\n\tbefore() : A() {\n\t\tVerdict verdict;\n\t\tsynchronized (monitor) {\n\t\t\tverdict = monitor.step(A);\n\t\t}\n\t\tif (verdict == Verdict.FAILURE) {\n\t\t\tSystem.err\n\t\t\t.println(\"Violation in JavaMOP 3. The functions A(), B(), C() must be called equal times.\");\n\t\t}\n\t}\n\t\n\tbefore() : B() {\n\t\tVerdict verdict;\n\t\tsynchronized (monitor) {\n\t\t\tverdict = monitor.step(B);\n\t\t}\n\t\tif (verdict == Verdict.FAILURE) {\n\t\t\tSystem.err\n\t\t\t.println(\"Violation in JavaMOP 3. The functions A(), B(), C() must be called equal times.\");\n\t\t}\n\t}\n\t\n\tbefore() : C() {\n\t\tVerdict verdict;\n\t\tsynchronized (monitor) {\n\t\t\tverdict = monitor.step(C);\n\t\t}\n\t\tif (verdict == Verdict.FAILURE) {\n\t\t\tSystem.err\n\t\t\t.println(\"Violation in JavaMOP 3. The functions A(), B(), C() must be called equal times.\");\n\t\t}\n\t}\n\t\n\n\tpointcut endOfProgram() : execution(void SRSTest.main(String[]));\n\n\tafter() : endOfProgram() {\n\t\tVerdict verdict = monitor.end();\n\t\tif (verdict == Verdict.FAILURE || verdict == Verdict.WEAK_FAILURE) {\n\t\t\tSystem.err\n\t\t\t\t\t.println(\"Violation in JavaMOP 3. The functions A(), B(), C() must be called equal times.\");\n\t\t} else {\n\t\t\tSystem.err.println(\"Property JavaMOP 3 satisfied\");\n\t\t}\n\t}\n}\n","old_contents":"","returncode":1,"stderr":"error: pathspec 'code\/qea\/src\/benchmark\/competition\/java\/javaMOP\/JavaMOPThreeAspect.aj' did not match any file(s) known to git\n","license":"mit","lang":"AspectJ"}