validate catalogItem.provider is present

Signed-off-by: Igor Fedorenko <[email protected]>

Author: ifedorenko

org.sonatype.m2e.discovery.publisher.maven-plugin/pom.xml

@@ -98,7 +98,7 @@
             <id>standard</id>
             <goals>
               <goal>java</goal>
-              <goal>xpp3-reader</goal>
+              <goal>xpp3-extended-reader</goal>
               <goal>xpp3-writer</goal>
             </goals>
             <configuration>

org.sonatype.m2e.discovery.publisher.maven-plugin/src/main/java/org/sonatype/m2e/discovery/publisher/M2eDiscoveryMetadataGeneratorMojo.java

@@ -67,9 +67,11 @@
 import org.sonatype.m2e.discovery.catalog.model.DiscoveryCategory;
 import org.sonatype.m2e.discovery.catalog.model.DiscoveryIcon;
 import org.sonatype.m2e.discovery.catalog.model.IUData;
+import org.sonatype.m2e.discovery.catalog.model.InputLocation;
+import org.sonatype.m2e.discovery.catalog.model.InputLocationTracker;
 import org.sonatype.m2e.discovery.catalog.model.MavenData;
 import org.sonatype.m2e.discovery.catalog.model.P2Data;
-import org.sonatype.m2e.discovery.catalog.model.io.xpp3.DiscoveryCatalogModelXpp3Reader;
+import org.sonatype.m2e.discovery.catalog.model.io.xpp3.DiscoveryCatalogModelXpp3ReaderEx;
 import org.sonatype.m2e.discovery.publisher.p2.facade.P2Facade;
 import org.sonatype.tycho.equinox.EquinoxServiceFactory;
 import org.sonatype.tycho.p2.facade.internal.P2ApplicationLauncher;
@@ -149,6 +151,9 @@ public void execute()
                     throw new RuntimeException( "Duplicate catalog item id " + catalogItem.getId() );
                 }
 
+                getLog().debug( "Processing catalog item with id " + catalogItem.getId() );
+                validateCatalogItem( catalog, catalogItem );
+
                 boolean hasLifecycleMappings = false;
                 LifecycleMappingMetadataSource mergedLifecycleMappingMetadataSource =
                     new LifecycleMappingMetadataSource();
@@ -275,6 +280,46 @@ else if ( mavenData != null )
         }
     }
 
+    private void validateCatalogItem( InputLocationTracker locationTracker, DiscoveryCatalogItem item )
+    {
+        List<String> messages = new ArrayList<String>();
+        if ( nv( item.getId() ) == null )
+        {
+            messages.add( "id must be specified" );
+        }
+        if ( nv( item.getProvider() ) == null )
+        {
+            messages.add( "provider must be specified" );
+        }
+
+        if ( !messages.isEmpty() )
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.append( "Problems with <catalogItem>" );
+
+            InputLocation location = item.getLocation( "" );
+            if ( location != null )
+            {
+                sb.append( '[' ).append( location.toString() ).append( ']' );
+            }
+
+            for ( String msg : messages )
+            {
+                sb.append( "\n   " ).append( msg );
+            }
+            throw new RuntimeException( sb.toString() );
+        }
+    }
+
+    private static String nv( String str )
+    {
+        if ( str != null && !"".equals( str.trim() ) )
+        {
+            return str;
+        }
+        return null;
+    }
+
     private void generateP2RepositoryMetadata( File p2RepositoryDirectory )
     {
         List<String> contentArgs = new ArrayList<String>();
@@ -632,7 +677,7 @@ private DiscoveryCatalog loadDiscoveryCatalog()
         InputStream is = new FileInputStream( catalogFile );
         try
         {
-            return new DiscoveryCatalogModelXpp3Reader().read( is );
+            return new DiscoveryCatalogModelXpp3ReaderEx().read( is, true );
         }
         finally
         {

org.sonatype.m2e.discovery.publisher.maven-plugin/src/main/mdo/catalog.xml

@@ -228,5 +228,23 @@
         </field>
       </fields>
     </class>
+
+    <class locationTracker="locations" java.clone="shallow">
+      <name>InputLocation</name>
+      <codeSegments>
+        <codeSegment>
+          <code>                                                                                                             
+              <![CDATA[                                                                                                        
+                                                                                                                               
+      @Override                                                                                                                
+      public String toString()                                                                                                 
+      {                                                                                                                        
+          return getLineNumber() + " : " + getColumnNumber();                                             
+      }                                                                                                                        
+              ]]>
+          </code>
+        </codeSegment>
+      </codeSegments>
+    </class>
   </classes>
 </model>